Merge pull request #49 from NewWays-TechForImpactKAIST/44-국회의원-agetex…

…t-fix
NewWays-TechForImpactKAIST · Nov 30, 2023 · f6b936f · f6b936f
2 parents 3999b8a + 32776ae
commit f6b936f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 39 deletions.
diff --git a/src/components/molecules/NationalCouncilReportText/AgeText.tsx b/src/components/molecules/NationalCouncilReportText/AgeText.tsx
@@ -1,5 +1,4 @@
 import { Typography } from "antd";
-import { type MetroID } from "static/MapSVGData";
 
 const { Paragraph, Text } = Typography;
 
@@ -28,16 +27,6 @@ export interface AgeTextData {
     electedCount: number;
     firstQuintile: number;
     lastQuintile: number;
-    divArea: {
-      metroId: number;
-      firstQuintile: number;
-      lastQuintile: number;
-    };
-    uniArea: {
-      metroId: number;
-      firstQuintile: number;
-      lastQuintile: number;
-    };
   };
 }
 
@@ -46,14 +35,9 @@ interface Props {
   variation?: AgeTextVariation;
   /** text에 들어갈 데이터입니다. */
   data?: AgeTextData;
-  getNameFromId: (id: number) => MetroID | undefined;
 }
 
-export const AgeText = ({
-  variation = 1,
-  data = undefined,
-  getNameFromId,
-}: Props) => {
+export const AgeText = ({ variation = 1, data = undefined }: Props) => {
   if (!data) return <Paragraph>데이터를 불러오는 중입니다..</Paragraph>;
 
   const {
@@ -72,23 +56,6 @@ export const AgeText = ({
         <Text strong>{ageHistogramParagraph.lastQuintile}</Text>세 이상이에요.
         <br />
         <br />
-        참고로 다양성 지표 전국 1위는 전체 인원의 20%가{" "}
-        <Text strong>{ageHistogramParagraph.divArea.firstQuintile}</Text>세{" "}
-        이하, 20%가{" "}
-        <Text strong>{ageHistogramParagraph.divArea.lastQuintile}</Text>세{" "}
-        이상인{" "}
-        <Text strong>
-          {getNameFromId(ageHistogramParagraph.divArea.metroId)}
-        </Text>
-        , 전국 뒤에서 1위는 전체 인원의 20%가{" "}
-        <Text strong>{ageHistogramParagraph.uniArea.firstQuintile}</Text>세
-        이하, 20%가{" "}
-        <Text strong>{ageHistogramParagraph.uniArea.lastQuintile}</Text>세
-        이상인{" "}
-        <Text strong>
-          {getNameFromId(ageHistogramParagraph.uniArea.metroId)}
-        </Text>
-        예요.
       </Paragraph>
     );
   return <Paragraph>존재하지 않는 템플릿입니다.</Paragraph>;

diff --git a/src/components/organisms/NationalCouncilReport.tsx b/src/components/organisms/NationalCouncilReport.tsx
@@ -10,6 +10,7 @@ import {
   type AgeTextData,
   type GenderTextData,
   type PartyTextData,
+  AgeText,
 } from "@/components/molecules/NationalCouncilReportText";
 import {
   Histogram,
@@ -71,7 +72,7 @@ const NationalCouncilReport = ({
   const nationalElectionYears = useNationalElectionYears();
 
   const [ageHistogramData, setAgeHistogramData] = useState<BinData[]>();
-  const [, setAgeTextData] = useState<AgeTextData>();
+  const [ageTextData, setAgeTextData] = useState<AgeTextData>();
 
   const [genderTextData, setGenderTextData] = useState<GenderTextData>();
   const [sgType, setSgType] = useState<"elected" | "candidate">("elected");
@@ -87,8 +88,6 @@ const NationalCouncilReport = ({
     useState<Map<string, string>>();
   const [partyTextData, setPartyTextData] = useState<PartyTextData>();
 
-  // const getNameFromId = useGetMetroNameFromId(idMap);
-
   // 백엔드로부터 텍스트 데이터를 가져옵니다.
   const fetchTextData = () => {
     axios
@@ -153,7 +152,7 @@ const NationalCouncilReport = ({
   // 백엔드로부터 그래프 데이터를 가져옵니다.
   const fetchGraphData = () => {
     axios
-      .get(`age-hist?ageHistType=elected&year=${sgYear}&method=equal`)
+      .get(`age-hist/?ageHistType=elected&year=${sgYear}&method=equal`)
       .then(response => {
         const data = response.data as AgeHistogramDataAPIResponse;
         const newAgeHistogramData: BinData[] = [];
@@ -270,7 +269,7 @@ const NationalCouncilReport = ({
       </Flex>
       <Title level={3}>연령 다양성</Title>
       {ageHistogramData ? <Histogram data={ageHistogramData} /> : null}
-      {/* <AgeText data={ageTextData} getNameFromId={getNameFromId} /> */}
+      <AgeText data={ageTextData} />
       <Title level={3}>성별 다양성</Title>
       {genderPieChartData && genderPieChartColorMap ? (
         <PieChart data={genderPieChartData} colorMap={genderPieChartColorMap} />