Merge branch 'feature/#441' of https://github.com/woowacourse-teams/2…

…024-haeng-dong into feature/#441
woowacourse-teams · Aug 21, 2024 · ad1f45a · ad1f45a
2 parents 3105dd0 + ffc0c34
commit ad1f45a
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/...mponents/Modal/SetActionModal/PutAndDeleteBillActionModal/PutAndDeleteBillActionModal.tsx b/...mponents/Modal/SetActionModal/PutAndDeleteBillActionModal/PutAndDeleteBillActionModal.tsx
@@ -6,6 +6,7 @@ import validatePurchase from '@utils/validate/validatePurchase';
 import useRequestGetStepList from '@hooks/queries/useRequestGetStepList';
 import useMemberReportListInAction from '@hooks/useMemberReportListInAction/useMemberReportListInAction';
 import useMemberReportInput from '@hooks/useMemberReportListInAction/useMemberReportInput';
+import {useToast} from '@hooks/useToast/useToast';
 
 import usePutAndDeleteBillAction from '@hooks/usePutAndDeleteBillAction';
 
@@ -64,6 +65,8 @@ const PutAndDeleteBillActionModal = ({
     actions.find(({actionId}) => actionId === billAction.actionId),
   )[0].members;
 
+  const {showToast} = useToast();
+
   return (
     <BottomSheet isOpened={isBottomSheetOpened} onClose={() => setIsBottomSheetOpened(false)}>
       <form

diff --git a/client/src/hooks/queries/useRequestPutBillAction.ts b/client/src/hooks/queries/useRequestPutBillAction.ts
@@ -10,18 +10,26 @@ interface PutBillActionMutationProps {
   actionId: number;
   title: string;
   price: number;
+  onSuccessCallback?: () => void; // 콜백 함수 타입을 정의
 }
 
 const useRequestPutBillAction = () => {
   const eventId = getEventIdByUrl();
   const queryClient = useQueryClient();
 
   return useMutation({
-    mutationFn: ({actionId, title, price}: PutBillActionMutationProps) =>
-      requestPutBillAction({eventId, actionId, title, price}),
-    onSuccess: () => {
+    mutationFn: async ({actionId, title, price}: PutBillActionMutationProps) => {
+      const response = await requestPutBillAction({eventId, actionId, title, price});
+      return response; // response를 반환하여 onSuccess에서 접근할 수 있게 함
+    },
+    onSuccess: (data, variables) => {
       queryClient.invalidateQueries({queryKey: [QUERY_KEYS.stepList]});
       queryClient.invalidateQueries({queryKey: [QUERY_KEYS.memberReport]});
+
+      // 콜백 함수가 전달되었다면 실행
+      if (variables.onSuccessCallback) {
+        variables.onSuccessCallback();
+      }
     },
   });
 };

diff --git a/client/src/hooks/usePutAndDeleteBillAction.ts b/client/src/hooks/usePutAndDeleteBillAction.ts
@@ -83,12 +83,13 @@ const usePutAndDeleteBillAction = (
     setErrorInfo(errorInfo ?? {title: false, price: false});
   };
 
-  const onSubmit = async (event: React.FormEvent<HTMLFormElement>, inputPair: InputPair, actionId: number) => {
+  const onSubmit = (event: React.FormEvent<HTMLFormElement>, inputPair: InputPair, actionId: number) => {
     event.preventDefault();
 
     const {title, price} = inputPair;
 
-    await putBillAction({actionId, title, price: Number(price)});
+    putBillAction({actionId, title, price: Number(price)});
+
     onClose();
   };