From ce69940b2289ea06d7281a78ca4b92160ce509b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?sanguu=28=EB=B0=95=EC=83=81=ED=98=84=29?=
 <sanguu516@naver.com>
Date: Tue, 11 Oct 2022 15:16:50 +0900
Subject: [PATCH] =?UTF-8?q?=EB=B9=84=ED=96=89=EC=9D=B4=EB=A0=A5=ED=98=84?=
 =?UTF-8?q?=ED=99=A9=ED=8E=98=EC=9D=B4=EC=A7=95-(=EC=84=9C=EB=B2=84=20?=
 =?UTF-8?q?=EC=9E=91=EC=97=85=20=EB=8C=80=EA=B8=B0)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../history/AnalysisHistoryDetailContainer.js     |  7 +++++--
 .../history/actions/analysisHistoryAction.ts      |  6 +++++-
 .../analysis/history/apis/annalysisHistoryApi.ts  |  6 +++++-
 .../history/reducers/analysisHitoryReducer.ts     |  2 --
 .../analysis/history/sagas/analysisHistorySaga.ts | 15 ++++++++++-----
 5 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/src/containers/analysis/history/AnalysisHistoryDetailContainer.js b/src/containers/analysis/history/AnalysisHistoryDetailContainer.js
index ff52503..bf42d67 100644
--- a/src/containers/analysis/history/AnalysisHistoryDetailContainer.js
+++ b/src/containers/analysis/history/AnalysisHistoryDetailContainer.js
@@ -12,7 +12,6 @@ export const AnalysisHistoryDetailContainer = () => {
 
   const dispatch = useDispatch();
   const { id } = useParams();
-
   const titleName = '비행이력';
 
   useEffect(() => {
@@ -20,9 +19,12 @@ export const AnalysisHistoryDetailContainer = () => {
   }, []);
 
   const handlerSearch = () => {
-    dispatch(Actions.detail.request(id));
+    dispatch(Actions.detail.request({ searchParams: { id, page: 1 } }));
   };
 
+  const handlerPageChange = page => {
+    dispatch(Actions.detail.request({ id, page }));
+  };
   const handlerInput = (type, val) => {
     if (type === 'search1') {
       setParams({ ...params, search1: val });
@@ -151,6 +153,7 @@ export const AnalysisHistoryDetailContainer = () => {
         excelHeaders={excelHeaders}
         count={log?.length}
         pagination={true}
+        handlerPageChange={handlerPageChange}
       />
     </CustomDetailLayout>
   );
diff --git a/src/modules/analysis/history/actions/analysisHistoryAction.ts b/src/modules/analysis/history/actions/analysisHistoryAction.ts
index 144a9b7..bd171ae 100644
--- a/src/modules/analysis/history/actions/analysisHistoryAction.ts
+++ b/src/modules/analysis/history/actions/analysisHistoryAction.ts
@@ -41,7 +41,11 @@ export const detail = createAsyncAction(
   DETAIL_REQUEST,
   DETAIL_SUCCESS,
   DETAIL_FAILURE
-)<string, { detail: AnalysisHistoryData }, AxiosError>();
+)<
+  AnalysisHistoryState,
+  { detail: AnalysisHistoryData; count: number; total: number },
+  AxiosError
+>();
 
 export const LIST_INITAL = createAction(LIST_INIT)();
 
diff --git a/src/modules/analysis/history/apis/annalysisHistoryApi.ts b/src/modules/analysis/history/apis/annalysisHistoryApi.ts
index c315b34..ff1be0e 100644
--- a/src/modules/analysis/history/apis/annalysisHistoryApi.ts
+++ b/src/modules/analysis/history/apis/annalysisHistoryApi.ts
@@ -14,7 +14,11 @@ export const analysisHistory = {
     return await axios.get(`/api/anls/hstry/list${queryString}&page=${page}`);
   },
   detail: async (id: string) => {
-    return await axios.get(`/api/anls/hstry/detail/${id}`);
+    const queryString = qs.stringify(id, {
+      addQueryPrefix: true,
+      arrayFormat: 'repeat'
+    });
+    return await axios.get(`/api/anls/hstry/detail/${queryString}`);
   },
 
   log: async (id: string) => {
diff --git a/src/modules/analysis/history/reducers/analysisHitoryReducer.ts b/src/modules/analysis/history/reducers/analysisHitoryReducer.ts
index 8bce08b..2e23e38 100644
--- a/src/modules/analysis/history/reducers/analysisHitoryReducer.ts
+++ b/src/modules/analysis/history/reducers/analysisHitoryReducer.ts
@@ -38,14 +38,12 @@ export const analysisHistoryReducer = createReducer<
   .handleAction(Actions.detail.success, (state, action) =>
     produce(state, draft => {
       const { detail } = action.payload;
-
       draft.detail = detail;
     })
   )
   .handleAction(Actions.log.success, (state, action) =>
     produce(state, draft => {
       const { log } = action.payload;
-
       draft.log = log;
     })
   )
diff --git a/src/modules/analysis/history/sagas/analysisHistorySaga.ts b/src/modules/analysis/history/sagas/analysisHistorySaga.ts
index 43a2257..7fa59fe 100644
--- a/src/modules/analysis/history/sagas/analysisHistorySaga.ts
+++ b/src/modules/analysis/history/sagas/analysisHistorySaga.ts
@@ -35,13 +35,18 @@ function* listSaga(action: ActionType<typeof Actions.list.request>) {
 
 function* detailSaga(action: ActionType<typeof Actions.detail.request>) {
   try {
-    const id = action.payload;
-    const res = yield call(Apis.analysisHistory.detail, id);
-    yield put(Actions.log.request(id));
-    const { data } = res;
+    const { searchParams } = action.payload;
+    const res = yield call(Apis.analysisHistory.detail, searchParams);
+    yield put(Actions.log.request(searchParams));
+    const {
+      data: { items, total },
+      count
+    } = res;
     yield put(
       Actions.detail.success({
-        detail: data
+        detail: items,
+        count,
+        total
       })
     );
   } catch (error) {