feat: 포인트 api 모두 연동

Central-MakeUs · Feb 8, 2024 · b742ba9 · b742ba9
1 parent 98faba4
commit b742ba9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 12 deletions.
diff --git a/src/components/organisms/point/CumulatedPointHistory.tsx b/src/components/organisms/point/CumulatedPointHistory.tsx
@@ -5,20 +5,17 @@ import {
 	PointHistoryTitle,
 } from '@components/molecules';
 import { useGetCumulatedPoint } from '@hooks/apis/point';
-//import { mockPastPointHistory } from '@mocks/pointList';
 
 const CumulatedPointHistory = () => {
-	// TODO: Past Point History get api 연결
 	const { data: pointList } = useGetCumulatedPoint();
-	//const pointList = mockPastPointHistory;
 
 	const title = '역대 누적 포인트';
 
 	return (
 		<PointHistory>
 			<PointHistoryTitle title={title} />
-			<HistoryTotalPoint totalPoint={pointList.totalPoint} />
-			<PointList {...pointList} />
+			<HistoryTotalPoint totalPoint={String(pointList.totalPoint)} />
+			<PointList pointList={pointList.buyResponses} />
 		</PointHistory>
 	);
 };

diff --git a/src/components/organisms/point/ExpectedPointHistory.tsx b/src/components/organisms/point/ExpectedPointHistory.tsx
@@ -5,12 +5,9 @@ import {
 	PointHistoryTitle,
 } from '@components/molecules';
 import { useGetExpectedPoint } from '@hooks/apis/point';
-//import { mockCurrentPointHistory } from '@mocks/pointList';
 
 const ExpectedPointHistory = () => {
-	// TODO: current Point History get api 연결
 	const { data: pointList } = useGetExpectedPoint();
-	//const pointList = mockCurrentPointHistory;
 
 	const title = '이번달 예상 누적 포인트';
 	const description =
@@ -19,8 +16,8 @@ const ExpectedPointHistory = () => {
 	return (
 		<PointHistory>
 			<PointHistoryTitle title={title} description={description} />
-			<HistoryTotalPoint totalPoint={pointList.totalPoint} />
-			<PointList {...pointList} />
+			<HistoryTotalPoint totalPoint={String(pointList.totalPoint)} />
+			<PointList pointList={pointList.buyResponses} />
 		</PointHistory>
 	);
 };

diff --git a/src/models/point/response/pointHistoryResponseDTO.ts b/src/models/point/response/pointHistoryResponseDTO.ts
@@ -1,6 +1,6 @@
-import { PointHistory } from '@models/point/entity/point';
+import { PointHistoryList } from '@models/point/entity/point';
 
 export type PointHistoryResponseDTO = {
 	totalPoint: number;
-	buyResponses: PointHistory[];
+	buyResponses: PointHistoryList;
 };