diff --git a/src/pages/common/register/api/index.ts b/src/pages/common/register/apis/index.ts similarity index 100% rename from src/pages/common/register/api/index.ts rename to src/pages/common/register/apis/index.ts diff --git a/src/pages/common/register/api/user-register.ts b/src/pages/common/register/apis/user-register.ts similarity index 100% rename from src/pages/common/register/api/user-register.ts rename to src/pages/common/register/apis/user-register.ts diff --git a/src/pages/common/register/hooks/useRegister.ts b/src/pages/common/register/hooks/useRegister.ts index 702d0c0b..154e8a60 100644 --- a/src/pages/common/register/hooks/useRegister.ts +++ b/src/pages/common/register/hooks/useRegister.ts @@ -2,7 +2,7 @@ import { useNavigate } from 'react-router-dom'; import { AxiosError } from 'axios'; -import { registerUser } from '../api'; +import { registerUser } from '../apis'; import { SignupApiResponse } from '../types'; import { RouterPath } from '@/app/routes/path'; import { authStorage } from '@/shared/utils/storage'; diff --git a/src/pages/common/register/index.ts b/src/pages/common/register/index.ts index e3a0e6e7..b16b707c 100644 --- a/src/pages/common/register/index.ts +++ b/src/pages/common/register/index.ts @@ -3,4 +3,4 @@ export * from './data'; export * from './components'; export * from './types'; export * from './hooks'; -export * from './api'; +export * from './apis'; diff --git a/src/pages/guard/guide-line/api/index.ts b/src/pages/guard/guide-line/api/index.ts deleted file mode 100644 index 4dfb9b4c..00000000 --- a/src/pages/guard/guide-line/api/index.ts +++ /dev/null @@ -1,5 +0,0 @@ -export { getViewSpecificGuideline } from './view-specific-guideline.api'; -export { getSeniorAllGuidelines } from './view-senior-all-guideline.api'; -export { modifyGuideline } from './modify-guideline.api'; -export { addGuideline } from './add-guideline.api'; -export { deleteGuideline } from './delete-guideline.api'; diff --git a/src/pages/guard/guide-line/api/add-guideline.api.ts b/src/pages/guard/guide-line/apis/add-guideline.api.ts similarity index 100% rename from src/pages/guard/guide-line/api/add-guideline.api.ts rename to src/pages/guard/guide-line/apis/add-guideline.api.ts diff --git a/src/pages/guard/guide-line/api/delete-guideline.api.ts b/src/pages/guard/guide-line/apis/delete-guideline.api.ts similarity index 100% rename from src/pages/guard/guide-line/api/delete-guideline.api.ts rename to src/pages/guard/guide-line/apis/delete-guideline.api.ts diff --git a/src/pages/guard/guide-line/apis/index.ts b/src/pages/guard/guide-line/apis/index.ts new file mode 100644 index 00000000..70f1b0e6 --- /dev/null +++ b/src/pages/guard/guide-line/apis/index.ts @@ -0,0 +1,5 @@ +export * from './view-specific-guideline.api'; +export * from './view-senior-all-guideline.api'; +export * from './modify-guideline.api'; +export * from './add-guideline.api'; +export * from './delete-guideline.api'; diff --git a/src/pages/guard/guide-line/api/modify-guideline.api.ts b/src/pages/guard/guide-line/apis/modify-guideline.api.ts similarity index 100% rename from src/pages/guard/guide-line/api/modify-guideline.api.ts rename to src/pages/guard/guide-line/apis/modify-guideline.api.ts diff --git a/src/pages/guard/guide-line/api/view-senior-all-guideline.api.ts b/src/pages/guard/guide-line/apis/view-senior-all-guideline.api.ts similarity index 100% rename from src/pages/guard/guide-line/api/view-senior-all-guideline.api.ts rename to src/pages/guard/guide-line/apis/view-senior-all-guideline.api.ts diff --git a/src/pages/guard/guide-line/api/view-specific-guideline.api.ts b/src/pages/guard/guide-line/apis/view-specific-guideline.api.ts similarity index 100% rename from src/pages/guard/guide-line/api/view-specific-guideline.api.ts rename to src/pages/guard/guide-line/apis/view-specific-guideline.api.ts diff --git a/src/pages/guard/guide-line/hooks/useAddGuideline.ts b/src/pages/guard/guide-line/hooks/useAddGuideline.ts index 20b6fb74..2be79987 100644 --- a/src/pages/guard/guide-line/hooks/useAddGuideline.ts +++ b/src/pages/guard/guide-line/hooks/useAddGuideline.ts @@ -1,4 +1,4 @@ -import { addGuideline } from '../api/add-guideline.api'; +import { addGuideline } from '../apis/'; import { AddGuidelineRequest } from '../types'; import { useMutation, UseMutationResult } from '@tanstack/react-query'; diff --git a/src/pages/guard/guide-line/hooks/useDeleteGuideline.ts b/src/pages/guard/guide-line/hooks/useDeleteGuideline.ts index 7124efce..46fd9869 100644 --- a/src/pages/guard/guide-line/hooks/useDeleteGuideline.ts +++ b/src/pages/guard/guide-line/hooks/useDeleteGuideline.ts @@ -1,4 +1,4 @@ -import { deleteGuideline } from '../api'; +import { deleteGuideline } from '../apis'; import { useMutation, UseMutationResult } from '@tanstack/react-query'; export const useDeleteGuideline = ( diff --git a/src/pages/guard/guide-line/hooks/useGetSeniorAllGuideines.ts b/src/pages/guard/guide-line/hooks/useGetSeniorAllGuideines.ts index 929dc138..6e793c4e 100644 --- a/src/pages/guard/guide-line/hooks/useGetSeniorAllGuideines.ts +++ b/src/pages/guard/guide-line/hooks/useGetSeniorAllGuideines.ts @@ -1,7 +1,7 @@ import { getSeniorAllGuidelines, getSeniorAllGuidelinesQueryKey, -} from '../api/view-senior-all-guideline.api'; +} from '../apis'; import { SeniorAllGuideLineResponse } from '../types'; import { useQuery } from '@tanstack/react-query'; diff --git a/src/pages/guard/guide-line/hooks/useGetViewSpecificGuideline.ts b/src/pages/guard/guide-line/hooks/useGetViewSpecificGuideline.ts index 61ea23e7..004ca9a8 100644 --- a/src/pages/guard/guide-line/hooks/useGetViewSpecificGuideline.ts +++ b/src/pages/guard/guide-line/hooks/useGetViewSpecificGuideline.ts @@ -1,7 +1,7 @@ import { - getViewSpecificGuideline, getViewSpecificGuidelineQueryKey, -} from '../api/view-specific-guideline.api'; + getViewSpecificGuideline, +} from '../apis'; import { ViewSpecificGuidelineResponse } from '../types'; import { useQuery } from '@tanstack/react-query'; diff --git a/src/pages/guard/guide-line/hooks/useModifyGuideline.ts b/src/pages/guard/guide-line/hooks/useModifyGuideline.ts index c6bc5a4f..b6ab0e0f 100644 --- a/src/pages/guard/guide-line/hooks/useModifyGuideline.ts +++ b/src/pages/guard/guide-line/hooks/useModifyGuideline.ts @@ -1,4 +1,4 @@ -import { modifyGuideline } from '../api/modify-guideline.api'; +import { modifyGuideline } from '../apis'; import { ModifyGuidelineRequest } from '../types'; import { useMutation, UseMutationResult } from '@tanstack/react-query'; diff --git a/src/pages/guard/guide-line/index.ts b/src/pages/guard/guide-line/index.ts index bf03cca1..cc7a5808 100644 --- a/src/pages/guard/guide-line/index.ts +++ b/src/pages/guard/guide-line/index.ts @@ -1,6 +1,6 @@ export { GuideLinePage } from './ui'; -export * from './api'; +export * from './apis'; export * from './components'; export * from './data'; export * from './hooks'; diff --git a/src/pages/guard/index.ts b/src/pages/guard/index.ts index c209766a..2a95df98 100644 --- a/src/pages/guard/index.ts +++ b/src/pages/guard/index.ts @@ -1,6 +1,5 @@ export * from './guide-line'; export * from './mypage'; -// export * from './point'; export * from './hello-call-apply'; export * from './register'; export * from './review'; diff --git a/src/pages/guard/mypage/api/index.ts b/src/pages/guard/mypage/api/index.ts deleted file mode 100644 index c7ba9826..00000000 --- a/src/pages/guard/mypage/api/index.ts +++ /dev/null @@ -1,5 +0,0 @@ -export { - getGuardInformation, - modifyGuardInformation, -} from './guard-information.api'; -export { getAllSeniorInfo } from './all-senior-info.api'; diff --git a/src/pages/guard/mypage/api/all-senior-info.api.ts b/src/pages/guard/mypage/apis/all-senior-info.api.ts similarity index 100% rename from src/pages/guard/mypage/api/all-senior-info.api.ts rename to src/pages/guard/mypage/apis/all-senior-info.api.ts diff --git a/src/pages/guard/mypage/api/guard-information.api.ts b/src/pages/guard/mypage/apis/guard-information.api.ts similarity index 100% rename from src/pages/guard/mypage/api/guard-information.api.ts rename to src/pages/guard/mypage/apis/guard-information.api.ts diff --git a/src/pages/guard/mypage/apis/index.ts b/src/pages/guard/mypage/apis/index.ts new file mode 100644 index 00000000..c58fe74c --- /dev/null +++ b/src/pages/guard/mypage/apis/index.ts @@ -0,0 +1,2 @@ +export * from './guard-information.api'; +export * from './all-senior-info.api'; diff --git a/src/pages/guard/mypage/hooks/useGetAllSeniorInfo.ts b/src/pages/guard/mypage/hooks/useGetAllSeniorInfo.ts index 87d5e28b..59f5f895 100644 --- a/src/pages/guard/mypage/hooks/useGetAllSeniorInfo.ts +++ b/src/pages/guard/mypage/hooks/useGetAllSeniorInfo.ts @@ -1,7 +1,4 @@ -import { - allSeniorInfoPath, - getAllSeniorInfo, -} from '../api/all-senior-info.api'; +import { allSeniorInfoPath, getAllSeniorInfo } from '../apis'; import { AllSeniorInfoResponse } from '../types'; import { useQuery } from '@tanstack/react-query'; diff --git a/src/pages/guard/mypage/hooks/useGetGuardInformation.ts b/src/pages/guard/mypage/hooks/useGetGuardInformation.ts index cbd75b05..90cb51c1 100644 --- a/src/pages/guard/mypage/hooks/useGetGuardInformation.ts +++ b/src/pages/guard/mypage/hooks/useGetGuardInformation.ts @@ -1,5 +1,4 @@ -import { getGuardInformation } from '../api'; -import { guardInformationPath } from '../api/guard-information.api'; +import { getGuardInformation, guardInformationPath } from '../apis'; import { GuardInformationResponse } from '../types'; import { useQuery } from '@tanstack/react-query'; diff --git a/src/pages/guard/mypage/hooks/useModifyGuardInfo.ts b/src/pages/guard/mypage/hooks/useModifyGuardInfo.ts index ebf2aeb3..45b3e154 100644 --- a/src/pages/guard/mypage/hooks/useModifyGuardInfo.ts +++ b/src/pages/guard/mypage/hooks/useModifyGuardInfo.ts @@ -1,4 +1,5 @@ -import { GuardInformationRequest, modifyGuardInformation } from '../'; +import { modifyGuardInformation } from '../apis'; +import { GuardInformationRequest } from '../types'; import { useMutation, UseMutationResult } from '@tanstack/react-query'; // 본인 정보 수정 diff --git a/src/pages/guard/mypage/index.ts b/src/pages/guard/mypage/index.ts index 916e1eb5..35a2fe25 100644 --- a/src/pages/guard/mypage/index.ts +++ b/src/pages/guard/mypage/index.ts @@ -1,5 +1,5 @@ export * from './ui'; export * from './components'; -export * from './api'; +export * from './apis'; export * from './hooks'; export * from './types'; diff --git a/src/pages/guard/register/api/index.ts b/src/pages/guard/register/api/index.ts deleted file mode 100644 index 7ad2a6f3..00000000 --- a/src/pages/guard/register/api/index.ts +++ /dev/null @@ -1,5 +0,0 @@ -export { - addSeniorInfo, - deleteSeniorInfo, - editSeniorInfo, -} from './senior-info.api'; diff --git a/src/pages/guard/register/apis/index.ts b/src/pages/guard/register/apis/index.ts new file mode 100644 index 00000000..33914d34 --- /dev/null +++ b/src/pages/guard/register/apis/index.ts @@ -0,0 +1 @@ +export * from './senior-info.api'; diff --git a/src/pages/guard/register/api/senior-info.api.ts b/src/pages/guard/register/apis/senior-info.api.ts similarity index 100% rename from src/pages/guard/register/api/senior-info.api.ts rename to src/pages/guard/register/apis/senior-info.api.ts diff --git a/src/pages/guard/register/hooks/useAddSeniorInfo.ts b/src/pages/guard/register/hooks/useAddSeniorInfo.ts index b5df8e40..55bda81d 100644 --- a/src/pages/guard/register/hooks/useAddSeniorInfo.ts +++ b/src/pages/guard/register/hooks/useAddSeniorInfo.ts @@ -1,6 +1,6 @@ import { AxiosError } from 'axios'; -import { addSeniorInfo } from '../api'; +import { addSeniorInfo } from '../apis'; import { SeniorRegisterRequest } from '../types'; import { useMutation } from '@tanstack/react-query'; diff --git a/src/pages/guard/register/hooks/useDeleteSeniorInfo.ts b/src/pages/guard/register/hooks/useDeleteSeniorInfo.ts index 211d8088..5a55e2a1 100644 --- a/src/pages/guard/register/hooks/useDeleteSeniorInfo.ts +++ b/src/pages/guard/register/hooks/useDeleteSeniorInfo.ts @@ -1,4 +1,4 @@ -import { deleteSeniorInfo } from '../api'; +import { deleteSeniorInfo } from '../apis'; import { useMutation, UseMutationResult } from '@tanstack/react-query'; // 시니어 삭제 훅 diff --git a/src/pages/guard/register/hooks/useEditSeniorInfo.ts b/src/pages/guard/register/hooks/useEditSeniorInfo.ts index 05c6fe9d..47ae00b8 100644 --- a/src/pages/guard/register/hooks/useEditSeniorInfo.ts +++ b/src/pages/guard/register/hooks/useEditSeniorInfo.ts @@ -1,4 +1,4 @@ -import { editSeniorInfo } from '../api'; +import { editSeniorInfo } from '../apis'; import { SeniorRegisterRequest } from '../types'; import { useMutation, UseMutationResult } from '@tanstack/react-query'; diff --git a/src/pages/guard/register/index.ts b/src/pages/guard/register/index.ts index d6b41744..549b6d5c 100644 --- a/src/pages/guard/register/index.ts +++ b/src/pages/guard/register/index.ts @@ -1,5 +1,5 @@ export * from './ui'; export * from './components'; export * from './data'; -export * from './api'; +export * from './apis'; export * from './hooks'; diff --git a/src/pages/guard/review/api/index.ts b/src/pages/guard/review/apis/index.ts similarity index 100% rename from src/pages/guard/review/api/index.ts rename to src/pages/guard/review/apis/index.ts diff --git a/src/pages/guard/review/api/review.api.ts b/src/pages/guard/review/apis/review.api.ts similarity index 100% rename from src/pages/guard/review/api/review.api.ts rename to src/pages/guard/review/apis/review.api.ts diff --git a/src/pages/guard/review/hooks/usePostReview.ts b/src/pages/guard/review/hooks/usePostReview.ts index a843220b..2487f63a 100644 --- a/src/pages/guard/review/hooks/usePostReview.ts +++ b/src/pages/guard/review/hooks/usePostReview.ts @@ -1,4 +1,4 @@ -import { postReview } from '../api'; +import { postReview } from '../apis'; import { ReviewRequest } from '../types'; import { useMutation, UseMutationResult } from '@tanstack/react-query'; diff --git a/src/pages/guard/review/index.ts b/src/pages/guard/review/index.ts index 0cdb4922..49885572 100644 --- a/src/pages/guard/review/index.ts +++ b/src/pages/guard/review/index.ts @@ -1,3 +1,3 @@ export * from './ui'; -export * from './api'; +export * from './apis'; export * from './hooks'; diff --git a/src/pages/guard/service-history/hooks/useCompleteCallback.ts b/src/pages/guard/service-history/hooks/useCompleteCallback.ts index 4a27045b..5f185ecd 100644 --- a/src/pages/guard/service-history/hooks/useCompleteCallback.ts +++ b/src/pages/guard/service-history/hooks/useCompleteCallback.ts @@ -1,19 +1,14 @@ -import { completeCallback, getCallbackHistoryQueryKey } from '../apis'; -import { queryClient } from '@/shared'; +import { completeCallback } from '../apis'; import { useMutation, UseMutationResult } from '@tanstack/react-query'; -export const useCompleteCallback = (): UseMutationResult< - string, - Error, - number -> => { +export const useCompleteCallback = ( + refetch: () => void +): UseMutationResult => { return useMutation({ mutationFn: (callbackId: number) => completeCallback(callbackId), - onSuccess: () => { + onSuccess: async () => { alert('콜백 서비스를 완료 처리하였습니다.'); - queryClient.invalidateQueries({ - queryKey: getCallbackHistoryQueryKey(1), - }); + refetch(); }, onError: (error: Error) => { console.error(error); diff --git a/src/pages/guard/service-history/hooks/useHistoryData.ts b/src/pages/guard/service-history/hooks/useHistoryData.ts index 21fa3c3e..7463d266 100644 --- a/src/pages/guard/service-history/hooks/useHistoryData.ts +++ b/src/pages/guard/service-history/hooks/useHistoryData.ts @@ -1,15 +1,14 @@ import { useGetCallbackHistory, useGetHelloHistoryList } from '../hooks'; export const useHistoryData = (currentPage: number, pageSize: number) => { - const { data: callbackHistory } = useGetCallbackHistory( - currentPage, - pageSize - ); + const { data: callbackHistory, refetch: refetchCallback } = + useGetCallbackHistory(currentPage, pageSize); const { data: helloCallHistory, refetch } = useGetHelloHistoryList(); return { callbackHistory, helloCallHistory, refetch, + refetchCallback, }; }; diff --git a/src/pages/guard/service-history/hooks/useServiceStatus.ts b/src/pages/guard/service-history/hooks/useServiceStatus.ts index 39248ee9..241fe901 100644 --- a/src/pages/guard/service-history/hooks/useServiceStatus.ts +++ b/src/pages/guard/service-history/hooks/useServiceStatus.ts @@ -1,8 +1,9 @@ -import { useCompleteCallback } from '../hooks'; +import { useCompleteCallback, useHistoryData } from '../hooks'; import { CallbackHistory } from '../types'; export const useServiceStatus = (historyData: CallbackHistory) => { - const completeCallbackMutation = useCompleteCallback(); + const { refetchCallback } = useHistoryData(0, 20); + const completeCallbackMutation = useCompleteCallback(refetchCallback); const serviceStatus = () => { if (historyData.status === 'COMPLETE') { diff --git a/src/pages/sinitto/mypage/api/index.ts b/src/pages/sinitto/mypage/apis/index.ts similarity index 100% rename from src/pages/sinitto/mypage/api/index.ts rename to src/pages/sinitto/mypage/apis/index.ts diff --git a/src/pages/sinitto/mypage/api/sinitto-information.api.ts b/src/pages/sinitto/mypage/apis/sinitto-information.api.ts similarity index 100% rename from src/pages/sinitto/mypage/api/sinitto-information.api.ts rename to src/pages/sinitto/mypage/apis/sinitto-information.api.ts diff --git a/src/pages/sinitto/mypage/hooks/useSinittoInfo.ts b/src/pages/sinitto/mypage/hooks/useSinittoInfo.ts index 00f97887..354856e9 100644 --- a/src/pages/sinitto/mypage/hooks/useSinittoInfo.ts +++ b/src/pages/sinitto/mypage/hooks/useSinittoInfo.ts @@ -4,7 +4,7 @@ import { modifySinittoBankInformation, modifySinittoInformation, registerSinittoBankInformation, -} from '../api/sinitto-information.api'; +} from '../apis'; import { SinittoBankInfo, SinittoInfoRequest, diff --git a/src/pages/sinitto/mypage/index.ts b/src/pages/sinitto/mypage/index.ts index 1c4cc14c..d383a292 100644 --- a/src/pages/sinitto/mypage/index.ts +++ b/src/pages/sinitto/mypage/index.ts @@ -1,5 +1,5 @@ export * from './components'; -export * from './api'; +export * from './apis'; export * from './data'; export * from './hooks'; export * from './ui'; diff --git a/src/pages/sinitto/point/.gitkeep b/src/pages/sinitto/point/.gitkeep deleted file mode 100644 index e69de29b..00000000