From 1f5582f224b1f592f4ecdb803f2c5060cb1e304f Mon Sep 17 00:00:00 2001 From: manNomi Date: Tue, 3 Feb 2026 01:55:21 +0900 Subject: [PATCH 1/5] =?UTF-8?q?fix:=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20?= =?UTF-8?q?=ED=9B=84=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=EB=A6=AC=EB=8B=A4?= =?UTF-8?q?=EC=9D=B4=EB=A0=89=EC=85=98=20=ED=83=80=EC=9D=B4=EB=B0=8D=20?= =?UTF-8?q?=EC=9D=B4=EC=8A=88=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Zustand persist middleware가 localStorage에 토큰을 저장하기 전에 라우터가 리다이렉트되는 타이밍 이슈 해결 Closes #404 --- apps/web/src/apis/Auth/postEmailLogin.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/apps/web/src/apis/Auth/postEmailLogin.ts b/apps/web/src/apis/Auth/postEmailLogin.ts index 1597a15c..ec02db46 100644 --- a/apps/web/src/apis/Auth/postEmailLogin.ts +++ b/apps/web/src/apis/Auth/postEmailLogin.ts @@ -29,7 +29,12 @@ const usePostEmailAuth = () => { const safeRedirect = validateSafeRedirect(redirectParam); toast.success("로그인에 성공했습니다."); - router.replace(safeRedirect); + + // Zustand persist middleware가 localStorage에 저장할 시간을 보장 + // 토큰 저장 후 리다이렉트하여 타이밍 이슈 방지 + setTimeout(() => { + router.push(safeRedirect); + }, 100); }, }); }; From d642a7536fc08a286636a05b2cf6d0ce69500a67 Mon Sep 17 00:00:00 2001 From: manNomi Date: Tue, 3 Feb 2026 01:56:38 +0900 Subject: [PATCH 2/5] =?UTF-8?q?fix:=20=EB=A9=98=ED=86=A0=20=EC=95=8C?= =?UTF-8?q?=EB=A6=BC=20API=20=EB=B6=88=ED=95=84=EC=9A=94=ED=95=9C=20?= =?UTF-8?q?=ED=98=B8=EC=B6=9C=20=EB=B0=A9=EC=A7=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 인증 상태 초기화 전에 멘토 알림 API가 호출되는 문제 해결 isLoading 대신 isInitialized를 사용하여 정확한 인증 상태 확인 Closes #403 --- .../mentor/MentorApplyCountContent/index.tsx | 100 +++++++++--------- 1 file changed, 52 insertions(+), 48 deletions(-) diff --git a/apps/web/src/components/mentor/MentorApplyCountContent/index.tsx b/apps/web/src/components/mentor/MentorApplyCountContent/index.tsx index ceb33b64..24aeb0b5 100644 --- a/apps/web/src/components/mentor/MentorApplyCountContent/index.tsx +++ b/apps/web/src/components/mentor/MentorApplyCountContent/index.tsx @@ -8,54 +8,58 @@ import { UserRole } from "@/types/mentor"; import { tokenParse } from "@/utils/jwtUtils"; const MentorApplyCountContent = () => { - // 로그인 된경우에만 신규 신청 카운트 모달 표시 - const { accessToken, isLoading } = useAuthStore(); - const isMentor = - tokenParse(accessToken)?.role === UserRole.MENTOR || tokenParse(accessToken)?.role === UserRole.ADMIN; - - const { data: count, isSuccess } = useGetMentoringUncheckedCount(!!accessToken && isMentor && !isLoading); - - const [isModalOpen, setIsModalOpen] = useState(true); - - // 신규 신청 없으면 표시 - if (!isMentor || isLoading || !isSuccess || !isModalOpen || count === 0) return null; - - return ( -
- {/* close button */} - - setIsModalOpen(false)}> -
- {/* left: message */} -
-

알림

-

새로운 요청이 들어왔어요!

-

어서 요청을 수락해주세요.

-
- - {/* divider */} -
- - {/* right: count */} -
- 신규 신청 -
{count}명
-
-
- -
- ); + // 로그인 된경우에만 신규 신청 카운트 모달 표시 + const { accessToken, isInitialized } = useAuthStore(); + const isMentor = + tokenParse(accessToken)?.role === UserRole.MENTOR || + tokenParse(accessToken)?.role === UserRole.ADMIN; + + const { data: count, isSuccess } = useGetMentoringUncheckedCount( + isInitialized && !!accessToken && isMentor, + ); + + const [isModalOpen, setIsModalOpen] = useState(true); + + // 신규 신청 없으면 표시 + if (!isInitialized || !isMentor || !isSuccess || !isModalOpen || count === 0) + return null; + + return ( +
+ {/* close button */} + + setIsModalOpen(false)}> +
+ {/* left: message */} +
+

알림

+

새로운 요청이 들어왔어요!

+

어서 요청을 수락해주세요.

+
+ + {/* divider */} +
+ + {/* right: count */} +
+ 신규 신청 +
{count}명
+
+
+ +
+ ); }; export default MentorApplyCountContent; From 598498832a5341e1ceb1ddcd2bca899bd72cd4b5 Mon Sep 17 00:00:00 2001 From: manNomi Date: Tue, 3 Feb 2026 01:58:20 +0900 Subject: [PATCH 3/5] =?UTF-8?q?fix:=20=ED=9A=8C=EC=9B=90=EA=B0=80=EC=9E=85?= =?UTF-8?q?=20=EB=B0=8F=20OAuth=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=ED=9B=84?= =?UTF-8?q?=20=ED=86=A0=ED=81=B0=20=EC=A0=80=EC=9E=A5=20=ED=83=80=EC=9D=B4?= =?UTF-8?q?=EB=B0=8D=20=EC=9D=B4=EC=8A=88=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 이메일/카카오/애플 회원가입 및 로그인 완료 후 리다이렉트 시 Zustand persist middleware의 토큰 저장을 보장하도록 개선 Closes #387 --- apps/web/src/apis/Auth/postAppleAuth.ts | 51 +-- apps/web/src/apis/Auth/postKakaoAuth.ts | 53 +-- .../components/login/signup/SignupSurvey.tsx | 305 +++++++++--------- 3 files changed, 214 insertions(+), 195 deletions(-) diff --git a/apps/web/src/apis/Auth/postAppleAuth.ts b/apps/web/src/apis/Auth/postAppleAuth.ts index c62cfdd9..900d27d5 100644 --- a/apps/web/src/apis/Auth/postAppleAuth.ts +++ b/apps/web/src/apis/Auth/postAppleAuth.ts @@ -11,33 +11,36 @@ import { type AppleAuthRequest, type AppleAuthResponse, authApi } from "./api"; * @description 애플 로그인을 위한 useMutation 커스텀 훅 */ const usePostAppleAuth = () => { - const router = useRouter(); - const searchParams = useSearchParams(); + const router = useRouter(); + const searchParams = useSearchParams(); - return useMutation({ - mutationFn: (data) => authApi.postAppleAuth(data), - onSuccess: (data) => { - if (data.isRegistered) { - // 기존 회원일 시 - Zustand persist가 자동으로 localStorage에 저장 - // refreshToken은 서버에서 HTTP-only 쿠키로 자동 설정됨 - useAuthStore.getState().setAccessToken(data.accessToken); + return useMutation({ + mutationFn: (data) => authApi.postAppleAuth(data), + onSuccess: (data) => { + if (data.isRegistered) { + // 기존 회원일 시 - Zustand persist가 자동으로 localStorage에 저장 + // refreshToken은 서버에서 HTTP-only 쿠키로 자동 설정됨 + useAuthStore.getState().setAccessToken(data.accessToken); - // 안전한 리다이렉트 처리 - 오픈 리다이렉트 방지 - const redirectParam = searchParams.get("redirect"); - const safeRedirect = validateSafeRedirect(redirectParam); + // 안전한 리다이렉트 처리 - 오픈 리다이렉트 방지 + const redirectParam = searchParams.get("redirect"); + const safeRedirect = validateSafeRedirect(redirectParam); - toast.success("로그인에 성공했습니다."); - router.replace(safeRedirect); - } else { - // 새로운 회원일 시 - 회원가입 페이지로 이동 - router.push(`/sign-up?token=${data.signUpToken}`); - } - }, - onError: () => { - toast.error("애플 로그인 중 오류가 발생했습니다. 다시 시도해주세요."); - router.push("/login"); - }, - }); + toast.success("로그인에 성공했습니다."); + + setTimeout(() => { + router.push(safeRedirect); + }, 100); + } else { + // 새로운 회원일 시 - 회원가입 페이지로 이동 + router.push(`/sign-up?token=${data.signUpToken}`); + } + }, + onError: () => { + toast.error("애플 로그인 중 오류가 발생했습니다. 다시 시도해주세요."); + router.push("/login"); + }, + }); }; export default usePostAppleAuth; diff --git a/apps/web/src/apis/Auth/postKakaoAuth.ts b/apps/web/src/apis/Auth/postKakaoAuth.ts index ee5e22b6..40894959 100644 --- a/apps/web/src/apis/Auth/postKakaoAuth.ts +++ b/apps/web/src/apis/Auth/postKakaoAuth.ts @@ -11,34 +11,37 @@ import { authApi, type KakaoAuthRequest, type KakaoAuthResponse } from "./api"; * @description 카카오 로그인을 위한 useMutation 커스텀 훅 */ const usePostKakaoAuth = () => { - const { setAccessToken } = useAuthStore(); - const router = useRouter(); - const searchParams = useSearchParams(); + const { setAccessToken } = useAuthStore(); + const router = useRouter(); + const searchParams = useSearchParams(); - return useMutation({ - mutationFn: (data) => authApi.postKakaoAuth(data), - onSuccess: (data) => { - if (data.isRegistered) { - // 기존 회원일 시 - Zustand persist가 자동으로 localStorage에 저장 - // refreshToken은 서버에서 HTTP-only 쿠키로 자동 설정됨 - setAccessToken(data.accessToken); + return useMutation({ + mutationFn: (data) => authApi.postKakaoAuth(data), + onSuccess: (data) => { + if (data.isRegistered) { + // 기존 회원일 시 - Zustand persist가 자동으로 localStorage에 저장 + // refreshToken은 서버에서 HTTP-only 쿠키로 자동 설정됨 + setAccessToken(data.accessToken); - // 안전한 리다이렉트 처리 - 오픈 리다이렉트 방지 - const redirectParam = searchParams.get("redirect"); - const safeRedirect = validateSafeRedirect(redirectParam); + // 안전한 리다이렉트 처리 - 오픈 리다이렉트 방지 + const redirectParam = searchParams.get("redirect"); + const safeRedirect = validateSafeRedirect(redirectParam); - toast.success("로그인에 성공했습니다."); - router.replace(safeRedirect); - } else { - // 새로운 회원일 시 - 회원가입 페이지로 이동 - router.push(`/sign-up?token=${data.signUpToken}`); - } - }, - onError: () => { - toast.error("카카오 로그인 중 오류가 발생했습니다. 다시 시도해주세요."); - router.push("/login"); - }, - }); + toast.success("로그인에 성공했습니다."); + + setTimeout(() => { + router.push(safeRedirect); + }, 100); + } else { + // 새로운 회원일 시 - 회원가입 페이지로 이동 + router.push(`/sign-up?token=${data.signUpToken}`); + } + }, + onError: () => { + toast.error("카카오 로그인 중 오류가 발생했습니다. 다시 시도해주세요."); + router.push("/login"); + }, + }); }; export default usePostKakaoAuth; diff --git a/apps/web/src/components/login/signup/SignupSurvey.tsx b/apps/web/src/components/login/signup/SignupSurvey.tsx index a5bd7c72..fb59fab5 100644 --- a/apps/web/src/components/login/signup/SignupSurvey.tsx +++ b/apps/web/src/components/login/signup/SignupSurvey.tsx @@ -16,154 +16,167 @@ import SignupProfileScreen from "./SignupProfileScreen"; import SignupRegionScreen from "./SignupRegionScreen"; type SignupSurveyProps = { - baseNickname: string; - baseEmail: string; - baseProfileImageUrl: string; + baseNickname: string; + baseEmail: string; + baseProfileImageUrl: string; }; -const SignupSurvey = ({ baseNickname, baseEmail, baseProfileImageUrl }: SignupSurveyProps) => { - const router = useRouter(); - const searchParams = useSearchParams(); - - const signUpToken = searchParams?.get("token"); - if (!signUpToken) { - router.push("/login"); - } - const { setAccessToken } = useAuthStore(); - const [curStage, setCurStage] = useState(1); - const [curProgress, setCurProgress] = useState(0); - - const [curPreparation, setCurPreparation] = useState(null); - - const [region, setRegion] = useState(null); - const [countries, setCountries] = useState([]); - - const [nickname, setNickname] = useState(baseNickname); - const [profileImageFile, setProfileImageFile] = useState(null); - - const signUpMutation = usePostSignUp(); - const uploadImageMutation = useUploadProfileImagePublic(); - - useEffect(() => { - setCurProgress(((curStage - 1) / 3) * 100); - }, [curStage]); - - const createRegisterRequest = async (): Promise => { - const submitRegion: RegionKo[] = region === "아직 잘 모르겠어요" ? [] : [region as RegionKo]; - - if (!curPreparation) { - throw new Error("준비 단계를 선택해주세요"); - } - - let imageUrl: string | null = baseProfileImageUrl; - - if (profileImageFile) { - try { - const result = await uploadImageMutation.mutateAsync(profileImageFile); - imageUrl = result.fileUrl; - } catch (err: unknown) { - const error = err as { message?: string }; - console.error("Error", error.message); - // toast.error는 hook의 onError에서 이미 처리되므로 중복 호출 제거 - } - } - - return { - signUpToken: signUpToken as string, - interestedRegions: submitRegion, - interestedCountries: countries, - preparationStatus: curPreparation, - nickname, - profileImageUrl: imageUrl, - }; - }; - - const submitRegisterRequest = async () => { - try { - const registerRequest = await createRegisterRequest(); - signUpMutation.mutate(registerRequest, { - onSuccess: (data) => { - setAccessToken(data.accessToken); - toast.success("회원가입이 완료되었습니다."); - router.push("/"); - }, - onError: (error: unknown) => { - const axiosError = error as { - response?: { data?: { message?: string } }; - message?: string; - }; - if (axiosError.response) { - console.error("Axios response error", axiosError.response); - toast.error(axiosError.response.data?.message || "회원가입에 실패했습니다."); - } else { - console.error("Error", axiosError.message); - toast.error(axiosError.message || "회원가입에 실패했습니다."); - } - }, - }); - } catch (err: unknown) { - const error = err as { message?: string }; - console.error("Error", error.message); - toast.error(error.message || "회원가입에 실패했습니다."); - } - }; - - const renderCurrentSurvey = () => { - switch (curStage) { - case 1: - return ( - { - setCurStage(2); - }} - /> - ); - case 2: - return ( - { - setCurStage(3); - }} - /> - ); - case 3: - return ( - { - setCurStage(4); - }} - /> - ); - case 4: - return ( - - ); - default: - return
회원 가입이 완료되었습니다
; - } - }; - - return ( -
-
- -
- {renderCurrentSurvey()} -
- ); +const SignupSurvey = ({ + baseNickname, + baseEmail, + baseProfileImageUrl, +}: SignupSurveyProps) => { + const router = useRouter(); + const searchParams = useSearchParams(); + + const signUpToken = searchParams?.get("token"); + if (!signUpToken) { + router.push("/login"); + } + const { setAccessToken } = useAuthStore(); + const [curStage, setCurStage] = useState(1); + const [curProgress, setCurProgress] = useState(0); + + const [curPreparation, setCurPreparation] = + useState(null); + + const [region, setRegion] = useState( + null, + ); + const [countries, setCountries] = useState([]); + + const [nickname, setNickname] = useState(baseNickname); + const [profileImageFile, setProfileImageFile] = useState(null); + + const signUpMutation = usePostSignUp(); + const uploadImageMutation = useUploadProfileImagePublic(); + + useEffect(() => { + setCurProgress(((curStage - 1) / 3) * 100); + }, [curStage]); + + const createRegisterRequest = async (): Promise => { + const submitRegion: RegionKo[] = + region === "아직 잘 모르겠어요" ? [] : [region as RegionKo]; + + if (!curPreparation) { + throw new Error("준비 단계를 선택해주세요"); + } + + let imageUrl: string | null = baseProfileImageUrl; + + if (profileImageFile) { + try { + const result = await uploadImageMutation.mutateAsync(profileImageFile); + imageUrl = result.fileUrl; + } catch (err: unknown) { + const error = err as { message?: string }; + console.error("Error", error.message); + // toast.error는 hook의 onError에서 이미 처리되므로 중복 호출 제거 + } + } + + return { + signUpToken: signUpToken as string, + interestedRegions: submitRegion, + interestedCountries: countries, + preparationStatus: curPreparation, + nickname, + profileImageUrl: imageUrl, + }; + }; + + const submitRegisterRequest = async () => { + try { + const registerRequest = await createRegisterRequest(); + signUpMutation.mutate(registerRequest, { + onSuccess: (data) => { + setAccessToken(data.accessToken); + toast.success("회원가입이 완료되었습니다."); + + setTimeout(() => { + router.push("/"); + }, 100); + }, + onError: (error: unknown) => { + const axiosError = error as { + response?: { data?: { message?: string } }; + message?: string; + }; + if (axiosError.response) { + console.error("Axios response error", axiosError.response); + toast.error( + axiosError.response.data?.message || "회원가입에 실패했습니다.", + ); + } else { + console.error("Error", axiosError.message); + toast.error(axiosError.message || "회원가입에 실패했습니다."); + } + }, + }); + } catch (err: unknown) { + const error = err as { message?: string }; + console.error("Error", error.message); + toast.error(error.message || "회원가입에 실패했습니다."); + } + }; + + const renderCurrentSurvey = () => { + switch (curStage) { + case 1: + return ( + { + setCurStage(2); + }} + /> + ); + case 2: + return ( + { + setCurStage(3); + }} + /> + ); + case 3: + return ( + { + setCurStage(4); + }} + /> + ); + case 4: + return ( + + ); + default: + return
회원 가입이 완료되었습니다
; + } + }; + + return ( +
+
+ +
+ {renderCurrentSurvey()} +
+ ); }; export default SignupSurvey; From 4d3d590e391b24703f7766862eecdb384fa90c09 Mon Sep 17 00:00:00 2001 From: manNomi Date: Tue, 3 Feb 2026 01:59:33 +0900 Subject: [PATCH 4/5] =?UTF-8?q?fix:=20=EC=96=B4=EB=93=9C=EB=AF=BC=20role?= =?UTF-8?q?=20=EC=B2=98=EB=A6=AC=20=EA=B0=9C=EC=84=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - MentorClient에서 isInitialized 사용으로 정확한 인증 상태 확인 - ModifyContent에서 어드민 role 표시 및 수학학교 정보 표시 추가 Closes #370 --- .../app/my/modify/_ui/ModifyContent/index.tsx | 119 +++++++++++------- 1 file changed, 71 insertions(+), 48 deletions(-) diff --git a/apps/web/src/app/my/modify/_ui/ModifyContent/index.tsx b/apps/web/src/app/my/modify/_ui/ModifyContent/index.tsx index 517cc3ae..197ca9d7 100644 --- a/apps/web/src/app/my/modify/_ui/ModifyContent/index.tsx +++ b/apps/web/src/app/my/modify/_ui/ModifyContent/index.tsx @@ -11,62 +11,85 @@ import InputField from "./_ui/InputFiled"; import ReadOnlyField from "./_ui/ReadOnlyField"; const ModifyContent = () => { - const { methods, myInfo, onSubmit } = useModifyUserHookform(); + const { methods, myInfo, onSubmit } = useModifyUserHookform(); - const defaultUniversity: string = - myInfo?.role === UserRole.MENTOR && myInfo.attendedUniversity ? myInfo.attendedUniversity : "인하대학교"; + const defaultUniversity: string = + (myInfo?.role === UserRole.MENTOR || myInfo?.role === UserRole.ADMIN) && + myInfo.attendedUniversity + ? myInfo.attendedUniversity + : "인하대학교"; - const { - handleSubmit, - formState: { isValid, isDirty }, - } = methods; + const { + handleSubmit, + formState: { isValid, isDirty }, + } = methods; - if (!myInfo) { - return ; - } - return ( - -
-
- {/* Profile Image Section */} - + if (!myInfo) { + return ; + } + return ( + +
+ + {/* Profile Image Section */} + - {/* Form Fields */} -
- {/* 닉네임 - 수정 가능 */} - + {/* Form Fields */} +
+ {/* 닉네임 - 수정 가능 */} + - {/* 출신학교 - 읽기 전용 */} - + {/* 출신학교 - 읽기 전용 */} + - {/* 수학 학교 - 읽기 전용 */} - + {/* 수학 학교 - 읽기 전용 */} + - {/* 사용자 유형 - 읽기 전용 */} - -
+ {/* 사용자 유형 - 읽기 전용 */} + +
- {/* Submit Button */} -
- -
- -
- - ); + {/* Submit Button */} +
+ +
+ +
+ + ); }; export default ModifyContent; From 9c7d49bb6496d4943d9aefa7db56f568efec3e77 Mon Sep 17 00:00:00 2001 From: manNomi Date: Tue, 3 Feb 2026 02:01:36 +0900 Subject: [PATCH 5/5] =?UTF-8?q?fix:=20=ED=95=99=EA=B5=90=20=EC=A0=95?= =?UTF-8?q?=EB=B3=B4=20=EB=A1=9C=EB=94=A9=20=EC=8B=A4=ED=8C=A8=20=EC=8B=9C?= =?UTF-8?q?=20=EC=97=90=EB=9F=AC=20=EB=A1=9C=EA=B9=85=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 서버 사이드 대학교 정보 조회 API 실패 시 콘솔 에러 로깅 추가로 디버깅 및 문제 해결을 위한 가시성 개선 Closes #366 --- .../server/getRecommendedUniversity.ts | 11 ++- .../server/getSearchUniversitiesByFilter.ts | 74 ++++++++++-------- .../server/getSearchUniversitiesByText.ts | 76 +++++++++++-------- .../server/getUniversityDetail.ts | 5 ++ 4 files changed, 100 insertions(+), 66 deletions(-) diff --git a/apps/web/src/apis/universities/server/getRecommendedUniversity.ts b/apps/web/src/apis/universities/server/getRecommendedUniversity.ts index c58305df..3950cfe5 100644 --- a/apps/web/src/apis/universities/server/getRecommendedUniversity.ts +++ b/apps/web/src/apis/universities/server/getRecommendedUniversity.ts @@ -4,10 +4,15 @@ import serverFetch from "@/utils/serverFetchUtil"; type GetRecommendedUniversityResponse = { recommendedUniversities: ListUniversity[] }; const getRecommendedUniversity = async () => { - const endpoint = "/univ-apply-infos/recommend"; + const endpoint = "/univ-apply-infos/recommend"; - const res = await serverFetch(endpoint); - return res; + const res = await serverFetch(endpoint); + + if (!res.ok) { + console.error(`Failed to fetch recommended universities:`, res.error); + } + + return res; }; export default getRecommendedUniversity; diff --git a/apps/web/src/apis/universities/server/getSearchUniversitiesByFilter.ts b/apps/web/src/apis/universities/server/getSearchUniversitiesByFilter.ts index cfd8f204..2b6ba386 100644 --- a/apps/web/src/apis/universities/server/getSearchUniversitiesByFilter.ts +++ b/apps/web/src/apis/universities/server/getSearchUniversitiesByFilter.ts @@ -3,48 +3,60 @@ import type { CountryCode, LanguageTestType, ListUniversity } from "@/types/univ import serverFetch from "@/utils/serverFetchUtil"; interface UniversitySearchResponse { - univApplyInfoPreviews: ListUniversity[]; + univApplyInfoPreviews: ListUniversity[]; } /** * 필터 검색에 사용될 파라미터 타입 */ export interface UniversitySearchFilterParams { - languageTestType?: LanguageTestType; - testScore?: number; - countryCode?: CountryCode[]; + languageTestType?: LanguageTestType; + testScore?: number; + countryCode?: CountryCode[]; } export const getSearchUniversitiesByFilter = async ( - filters: UniversitySearchFilterParams, + filters: UniversitySearchFilterParams, ): Promise => { - const params = new URLSearchParams(); - - if (filters.languageTestType) { - params.append("languageTestType", filters.languageTestType); - } - if (filters.testScore !== undefined) { - params.append("testScore", String(filters.testScore)); - } - // countryCode는 여러 개일 수 있으므로 각각 append 해줍니다. - if (filters.countryCode) { - filters.countryCode.forEach((code) => params.append("countryCode", code)); - } - - // 필터 값이 하나도 없으면 빈 배열을 반환합니다. - if (params.size === 0) { - return []; - } - - const endpoint = `/univ-apply-infos/search/filter?${params.toString()}`; - const response = await serverFetch(endpoint); - - return response.ok ? response.data.univApplyInfoPreviews : []; + const params = new URLSearchParams(); + + if (filters.languageTestType) { + params.append("languageTestType", filters.languageTestType); + } + if (filters.testScore !== undefined) { + params.append("testScore", String(filters.testScore)); + } + // countryCode는 여러 개일 수 있으므로 각각 append 해줍니다. + if (filters.countryCode) { + filters.countryCode.forEach((code) => params.append("countryCode", code)); + } + + // 필터 값이 하나도 없으면 빈 배열을 반환합니다. + if (params.size === 0) { + return []; + } + + const endpoint = `/univ-apply-infos/search/filter?${params.toString()}`; + const response = await serverFetch(endpoint); + + if (!response.ok) { + console.error(`Failed to search universities by filter:`, response.error); + return []; + } + + return response.data.univApplyInfoPreviews; }; -export const getSearchUniversitiesAllRegions = async (): Promise => { - const endpoint = `/univ-apply-infos/search/filter`; - const response = await serverFetch(endpoint); +export const getSearchUniversitiesAllRegions = async (): Promise< + ListUniversity[] +> => { + const endpoint = `/univ-apply-infos/search/filter`; + const response = await serverFetch(endpoint); - return response.ok ? response.data.univApplyInfoPreviews : []; + if (!response.ok) { + console.error(`Failed to fetch all regions universities:`, response.error); + return []; + } + + return response.data.univApplyInfoPreviews; }; diff --git a/apps/web/src/apis/universities/server/getSearchUniversitiesByText.ts b/apps/web/src/apis/universities/server/getSearchUniversitiesByText.ts index d8a63904..92f4b362 100644 --- a/apps/web/src/apis/universities/server/getSearchUniversitiesByText.ts +++ b/apps/web/src/apis/universities/server/getSearchUniversitiesByText.ts @@ -3,42 +3,54 @@ import serverFetch from "@/utils/serverFetchUtil"; // --- 타입 정의 --- interface UniversitySearchResponse { - univApplyInfoPreviews: ListUniversity[]; + univApplyInfoPreviews: ListUniversity[]; } -export const getUniversitiesByText = async (value: string): Promise => { - if (value === null || value === undefined) { - return []; - } - const endpoint = `/univ-apply-infos/search/text?value=${encodeURIComponent(value)}`; - const response = await serverFetch(endpoint); - return response.ok ? response.data.univApplyInfoPreviews : []; +export const getUniversitiesByText = async ( + value: string, +): Promise => { + if (value === null || value === undefined) { + return []; + } + const endpoint = `/univ-apply-infos/search/text?value=${encodeURIComponent(value)}`; + const response = await serverFetch(endpoint); + + if (!response.ok) { + console.error( + `Failed to search universities by text (value: "${value}"):`, + response.error, + ); + return []; + } + + return response.data.univApplyInfoPreviews; }; export const getAllUniversities = async (): Promise => { - return getUniversitiesByText(""); + return getUniversitiesByText(""); }; -export const getCategorizedUniversities = async (): Promise => { - // 1. 단 한 번의 API 호출로 모든 대학 데이터를 가져옵니다. - const allUniversities = await getAllUniversities(); - - const categorizedList: AllRegionsUniversityList = { - [RegionEnumExtend.ALL]: allUniversities, - [RegionEnumExtend.AMERICAS]: [], - [RegionEnumExtend.EUROPE]: [], - [RegionEnumExtend.ASIA]: [], - [RegionEnumExtend.CHINA]: [], - }; - if (!allUniversities) return categorizedList; - - for (const university of allUniversities) { - const region = university.region as RegionEnumExtend; // API 응답의 region 타입을 enum으로 간주 - - if (region && Object.hasOwn(categorizedList, region)) { - categorizedList[region].push(university); - } - } - - return categorizedList; -}; +export const getCategorizedUniversities = + async (): Promise => { + // 1. 단 한 번의 API 호출로 모든 대학 데이터를 가져옵니다. + const allUniversities = await getAllUniversities(); + + const categorizedList: AllRegionsUniversityList = { + [RegionEnumExtend.ALL]: allUniversities, + [RegionEnumExtend.AMERICAS]: [], + [RegionEnumExtend.EUROPE]: [], + [RegionEnumExtend.ASIA]: [], + [RegionEnumExtend.CHINA]: [], + }; + if (!allUniversities) return categorizedList; + + for (const university of allUniversities) { + const region = university.region as RegionEnumExtend; // API 응답의 region 타입을 enum으로 간주 + + if (region && Object.hasOwn(categorizedList, region)) { + categorizedList[region].push(university); + } + } + + return categorizedList; + }; diff --git a/apps/web/src/apis/universities/server/getUniversityDetail.ts b/apps/web/src/apis/universities/server/getUniversityDetail.ts index 9990fec4..785c151c 100644 --- a/apps/web/src/apis/universities/server/getUniversityDetail.ts +++ b/apps/web/src/apis/universities/server/getUniversityDetail.ts @@ -4,5 +4,10 @@ import serverFetch from "@/utils/serverFetchUtil"; export const getUniversityDetail = async (universityInfoForApplyId: number): Promise => { const result = await serverFetch(`/univ-apply-infos/${universityInfoForApplyId}`); + if (!result.ok) { + console.error(`Failed to fetch university detail (ID: ${universityInfoForApplyId}):`, result.error); + return undefined; + } + return result.data; };