feat: 반영 안 되는 오류 픽스

Yuseong-AllowancePayments · Dec 25, 2023 · 5469037 · 5469037
1 parent 7ec865e
commit 5469037
Show file tree

Hide file tree

Showing 11 changed files with 109 additions and 20 deletions.
diff --git a/src/App.tsx b/src/App.tsx
@@ -13,7 +13,7 @@ function App() {
                 keepPreviousData: true,
                 refetchOnWindowFocus: true,
                 refetchOnMount: true,
-                staleTime: 2000,
+                staleTime: 60000,
                 retry: 1,
             },
         },

diff --git a/src/components/main/Excel.tsx b/src/components/main/Excel.tsx
@@ -25,7 +25,7 @@ const Excel = () => {
             {data && !data[excelTab]?.length ? (
                 <NoData />
             ) : (
-                <ExcelBody data={data!} />
+                <ExcelBody data={data!} refetch={refetch} />
             )}
         </Container>
     );

diff --git a/src/components/main/ExcelCashPaymentTabBody.tsx b/src/components/main/ExcelCashPaymentTabBody.tsx
@@ -5,7 +5,13 @@ import ExcelValue from "./ExcelValue";
 import { useEditExcelCash } from "../../utils/api/Allowance";
 import { debounce } from "lodash";
 
-const ExcelCashPaymentTabBody = ({ data }: { data: cashPaymentTabType }) => {
+const ExcelCashPaymentTabBody = ({
+    data,
+    refetch,
+}: {
+    data: cashPaymentTabType;
+    refetch: () => void;
+}) => {
     const { form, setForm, handleChange } = useForm({
         address: "",
         depositType: "",
@@ -39,7 +45,11 @@ const ExcelCashPaymentTabBody = ({ data }: { data: cashPaymentTabType }) => {
     }, []);
 
     const { id, ...rest } = form;
-    const { mutate } = useEditExcelCash({ id: data.id, excelLine: rest });
+    const { mutate } = useEditExcelCash({
+        id: data.id,
+        excelLine: rest,
+        refetch,
+    });
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
     const editExcelForm = useCallback(

diff --git a/src/components/main/ExcelMainBody.tsx b/src/components/main/ExcelMainBody.tsx
@@ -19,7 +19,13 @@ import NewComerHonorableAllowanceTabBody from "./NewComerHonorableAllowanceTabBo
 import ExcelPaymentStoppedTabBody from "./ExcelPaymentStoppedTabBody";
 import ExcelPaymentTargetTabBody from "./ExcelPaymentTargetTabBody";
 
-const ExcelMainBody = ({ data }: { data: getExcelResponseDto }) => {
+const ExcelMainBody = ({
+    data,
+    refetch,
+}: {
+    data: getExcelResponseDto;
+    refetch: () => void;
+}) => {
     const { excelTab } = useExcelTabTypeState();
     const { excelType } = useExcelTypeState();
 
@@ -32,6 +38,7 @@ const ExcelMainBody = ({ data }: { data: getExcelResponseDto }) => {
                             data &&
                             data[excelTab].map((item, idx) => (
                                 <NewComerWarVeteranTabBody
+                                    refetch={refetch}
                                     key={idx}
                                     data={item}
                                 />
@@ -42,6 +49,7 @@ const ExcelMainBody = ({ data }: { data: getExcelResponseDto }) => {
                             data &&
                             data[excelTab].map((item, idx) => (
                                 <NewComerHonorableAllowanceTabBody
+                                    refetch={refetch}
                                     key={idx}
                                     data={item}
                                 />
@@ -52,6 +60,7 @@ const ExcelMainBody = ({ data }: { data: getExcelResponseDto }) => {
                             data &&
                             data[excelTab].map((item, idx) => (
                                 <NewComerWarVeteranSpouseTabBody
+                                    refetch={refetch}
                                     key={idx}
                                     data={item}
                                 />
@@ -62,6 +71,7 @@ const ExcelMainBody = ({ data }: { data: getExcelResponseDto }) => {
                             data &&
                             data[excelTab].map((item, idx) => (
                                 <NewComerWarVeteranTabBody
+                                    refetch={refetch}
                                     key={idx}
                                     data={item}
                                 />
@@ -72,21 +82,33 @@ const ExcelMainBody = ({ data }: { data: getExcelResponseDto }) => {
                 return (
                     data &&
                     data[excelTab].map((item, idx) => (
-                        <ExcelPaymentStoppedTabBody key={idx} data={item} />
+                        <ExcelPaymentStoppedTabBody
+                            key={idx}
+                            data={item}
+                            refetch={refetch}
+                        />
                     ))
                 );
             case "paymentTargetTab":
                 return (
                     data &&
                     data[excelTab].map((item, idx) => (
-                        <ExcelPaymentTargetTabBody key={idx} data={item} />
+                        <ExcelPaymentTargetTabBody
+                            key={idx}
+                            data={item}
+                            refetch={refetch}
+                        />
                     ))
                 );
             case "cashPaymentTab":
                 return (
                     data &&
                     data[excelTab].map((item, idx) => (
-                        <ExcelCashPaymentTabBody key={idx} data={item} />
+                        <ExcelCashPaymentTabBody
+                            key={idx}
+                            data={item}
+                            refetch={refetch}
+                        />
                     ))
                 );
         }

diff --git a/src/components/main/ExcelPaymentStoppedTabBody.tsx b/src/components/main/ExcelPaymentStoppedTabBody.tsx
@@ -7,8 +7,10 @@ import { useEditExcelStopped } from "../../utils/api/Allowance";
 
 const ExcelPaymentStoppedTabBody = ({
     data,
+    refetch,
 }: {
     data: paymentStoppedTabType;
+    refetch: () => void;
 }) => {
     const { form, setForm, handleChange } = useForm({
         accountHolder: "",
@@ -51,7 +53,11 @@ const ExcelPaymentStoppedTabBody = ({
     }, []);
 
     const { id, ...rest } = form;
-    const { mutate } = useEditExcelStopped({ id: data.id, excelLine: rest });
+    const { mutate } = useEditExcelStopped({
+        id: data.id,
+        excelLine: rest,
+        refetch,
+    });
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
     const editExcelForm = useCallback(

diff --git a/src/components/main/ExcelPaymentTargetTabBody.tsx b/src/components/main/ExcelPaymentTargetTabBody.tsx
@@ -5,7 +5,13 @@ import ExcelValue from "./ExcelValue";
 import { useEditExcelTarget } from "../../utils/api/Allowance";
 import { debounce } from "lodash";
 
-const ExcelPaymentTargetTabBody = ({ data }: { data: paymentTargetTabType }) => {
+const ExcelPaymentTargetTabBody = ({
+    data,
+    refetch,
+}: {
+    data: paymentTargetTabType;
+    refetch: () => void;
+}) => {
     const { form, setForm, handleChange } = useForm({
         accountHolder: "",
         address: "",
@@ -40,7 +46,11 @@ const ExcelPaymentTargetTabBody = ({ data }: { data: paymentTargetTabType }) =>
     } = form;
 
     const { id, ...rest } = form;
-    const { mutate } = useEditExcelTarget({ id: data.id, excelLine: rest });
+    const { mutate } = useEditExcelTarget({
+        id: data.id,
+        excelLine: rest,
+        refetch,
+    });
 
     useEffect(() => {
         setForm(data);

diff --git a/src/components/main/NewComerHonorableAllowanceTabBody.tsx b/src/components/main/NewComerHonorableAllowanceTabBody.tsx
@@ -7,8 +7,10 @@ import { useEditExcelNewcomer } from "../../utils/api/Allowance";
 
 const NewComerHonorableAllowanceTabBody = ({
     data,
+    refetch,
 }: {
     data: newComerTabType;
+    refetch: () => void;
 }) => {
     const { form, setForm, handleChange } = useForm({
         accountHolder: "",
@@ -61,6 +63,7 @@ const NewComerHonorableAllowanceTabBody = ({
     const { mutate } = useEditExcelNewcomer({
         id: data.id,
         excelLine: rest as any,
+        refetch,
     });
 
     // eslint-disable-next-line react-hooks/exhaustive-deps

diff --git a/src/components/main/NewComerWarVeteranSpouseTabBody.tsx b/src/components/main/NewComerWarVeteranSpouseTabBody.tsx
@@ -8,8 +8,10 @@ import { useEditExcelNewcomer } from "../../utils/api/Allowance";
 // 전입일 < 신청일
 const NewComerWarVeteranSpouseTabBody = ({
     data,
+    refetch,
 }: {
     data: newComerTabType;
+    refetch: () => void;
 }) => {
     const { form, setForm, handleChange } = useForm({
         accountHolder: "",
@@ -60,6 +62,7 @@ const NewComerWarVeteranSpouseTabBody = ({
     const { mutate } = useEditExcelNewcomer({
         id: data.id,
         excelLine: rest as any,
+        refetch,
     });
 
     // eslint-disable-next-line react-hooks/exhaustive-deps

diff --git a/src/components/main/NewComerWarVeteranTabBody.tsx b/src/components/main/NewComerWarVeteranTabBody.tsx
@@ -5,7 +5,13 @@ import { newComerTabType } from "../../models/response";
 import { useEditExcelNewcomer } from "../../utils/api/Allowance";
 import { debounce } from "lodash";
 
-const NewComerWarVeteranTabBody = ({ data }: { data: newComerTabType }) => {
+const NewComerWarVeteranTabBody = ({
+    data,
+    refetch,
+}: {
+    data: newComerTabType;
+    refetch: () => void;
+}) => {
     const { form, setForm, handleChange } = useForm({
         id: 0,
         serialNumber: "",
@@ -49,6 +55,7 @@ const NewComerWarVeteranTabBody = ({ data }: { data: newComerTabType }) => {
     const { mutate } = useEditExcelNewcomer({
         id: data.id,
         excelLine: rest as any,
+        refetch
     });
 
     // eslint-disable-next-line react-hooks/exhaustive-deps

diff --git a/src/models/request/index.ts b/src/models/request/index.ts
@@ -24,20 +24,24 @@ export interface userLoginRequestDto {
 
 export interface editExcelTargetRequestDto {
     excelLine: Omit<paymentTargetTabType, "id">;
+    refetch: () => void;
     id: number;
 }
 
 export interface editExcelCashRequestDto {
     excelLine: Omit<cashPaymentTabType, "id">;
+    refetch: () => void;
     id: number;
 }
 
 export interface editExcelNewcomerRequestDto {
     excelLine: Omit<newComerTabType, "id">;
+    refetch: () => void;
     id: number;
 }
 
 export interface editExcelStoppedRequestDto {
     excelLine: Omit<paymentStoppedTabType, "id">;
+    refetch: () => void;
     id: number;
 }
diff --git a/src/utils/api/Allowance.ts b/src/utils/api/Allowance.ts
@@ -97,38 +97,62 @@ export const useExportExcel = (type: excelFileType) => {
 export const useEditExcelTarget = ({
     id,
     excelLine,
+    refetch,
 }: editExcelTargetRequestDto) => {
-    return useMutation(async () =>
-        instance.patch(`${path}/target/${id}`, excelLine)
+    return useMutation(
+        async () => instance.patch(`${path}/target/${id}`, excelLine),
+        {
+            onSuccess: () => {
+                refetch();
+            },
+        }
     );
 };
 
 //보훈수당 엑셀 파일 수정-현금 지급
 export const useEditExcelCash = ({
     id,
     excelLine,
+    refetch,
 }: editExcelCashRequestDto) => {
-    return useMutation(async () =>
-        instance.patch(`${path}/cash/${id}`, excelLine)
+    return useMutation(
+        async () => instance.patch(`${path}/cash/${id}`, excelLine),
+        {
+            onSuccess: () => {
+                refetch();
+            },
+        }
     );
 };
 
 //보훈수당 엑셀 파일 수정-신규자
 export const useEditExcelNewcomer = ({
     id,
     excelLine,
+    refetch,
 }: editExcelNewcomerRequestDto) => {
-    return useMutation(async () =>
-        instance.patch(`${path}/newcomer/${id}`, excelLine)
+    return useMutation(
+        async () => instance.patch(`${path}/newcomer/${id}`, excelLine),
+        {
+            onSuccess: () => {
+                refetch();
+            },
+        }
     );
 };
 
 //보훈수당 엑셀 파일 수정-지급중지자
 export const useEditExcelStopped = ({
     id,
     excelLine,
+    refetch,
 }: editExcelStoppedRequestDto) => {
-    return useMutation(async () =>
-        instance.patch(`${path}/stopped/${id}`, excelLine)
+    return useMutation(
+        async () => instance.patch(`${path}/stopped/${id}`, excelLine),
+        {
+            onSuccess: () => {
+                refetch();
+            },
+        }
     );
 };