Merge pull request #248 from manNomi/refactor/applicant

Refactor/applicant

Author: manNomi

src/api/mentor/client/useGetMentoringUncheckedCount.ts

@@ -21,7 +21,6 @@ const useGetMentoringUncheckedCount = (isEnable: boolean) =>
     queryFn: getMentoringUncheckedCount,
     enabled: isEnable,
     refetchInterval: 1000 * 60 * 10, // ⏱️ 10분마다 자동 재요청
-    refetchOnWindowFocus: true, // 탭 돌아올 때도 최신화
     staleTime: 1000 * 60 * 5, // fresh 상태 유지
     select: (data) => data.uncheckedCount, // 필요한 데이터만 반환
   });

src/api/reports/client/usePostReport.ts

@@ -25,7 +25,7 @@ const usePostReports = () => {
     mutationFn: postReports,
     onSuccess: () => {
       alert("신고가 성공적으로 등록되었습니다.");
-      router.push("/mentor"); // 신고 후 리다이렉트
+      router.back(); // 신고 후 뒤로 이동
     },
     onError: (error) => {
       alert("신고 등록에 실패했습니다. 잠시 후 다시 시도해주세요.");

src/api/score.ts

@@ -16,7 +16,7 @@ export const postGpaScoreApi = (request: SubmitGpaScoreRequest): Promise<AxiosRe
     new Blob([JSON.stringify(request.gpaScoreRequest)], { type: "application/json" }),
   );
   convertedRequest.append("file", request.file);
-  return axiosInstance.post("/scores/gpas", convertedRequest, { headers: { "Content-Type": "multipart/form-data" } });
+  return axiosInstance.post("/scores/gpas", convertedRequest);
 };
 
 export const postLanguageTestScoreApi = (request: SubmitLanguageTestScoreRequest): Promise<AxiosResponse<null>> => {
@@ -26,9 +26,7 @@ export const postLanguageTestScoreApi = (request: SubmitLanguageTestScoreRequest
     new Blob([JSON.stringify(request.languageTestScoreRequest)], { type: "application/json" }),
   );
   convertedRequest.append("file", request.file);
-  return axiosInstance.post("/scores/language-tests", convertedRequest, {
-    headers: { "Content-Type": "multipart/form-data" },
-  });
+  return axiosInstance.post("/scores/language-tests", convertedRequest);
 };
 
 export const getMyGpaScoreApi = (): Promise<AxiosResponse<MyGpaScoreResponse>> => axiosInstance.get("/scores/gpas");

src/api/score/client/usePostGpaScore.ts

@@ -0,0 +1,44 @@
+import { AxiosResponse } from "axios";
+
+import { axiosInstance } from "@/utils/axiosInstance";
+
+import { QueryKeys } from "./queryKey";
+
+import { useMutation, useQueryClient } from "@tanstack/react-query";
+
+interface UsePostGpaScoreRequest {
+  gpaScoreRequest: {
+    gpa: number;
+    gpaCriteria: number;
+    issueDate: string; // yyyy-MM-dd
+  };
+  file: Blob;
+}
+
+export const postGpaScore = (request: UsePostGpaScoreRequest): Promise<AxiosResponse<null>> => {
+  const convertedRequest: FormData = new FormData();
+  convertedRequest.append(
+    "gpaScoreRequest",
+    new Blob([JSON.stringify(request.gpaScoreRequest)], { type: "application/json" }),
+  );
+  convertedRequest.append("file", request.file);
+  return axiosInstance.post("/scores/gpas", convertedRequest);
+};
+
+export const usePostGpaScore = () => {
+  const queryClient = useQueryClient();
+
+  return useMutation({
+    mutationFn: (request: UsePostGpaScoreRequest) => postGpaScore(request),
+
+    onSuccess: () => {
+      alert("학점 정보가 성공적으로 제출되었습니다.");
+      queryClient.invalidateQueries({ queryKey: [QueryKeys.myGpaScore] });
+    },
+
+    onError: (error) => {
+      console.error("학점 제출 중 오류 발생:", error);
+      alert("오류가 발생했습니다. 다시 시도해주세요.");
+    },
+  });
+};

src/api/score/client/usePostLanguageTestScore.ts

@@ -0,0 +1,53 @@
+import { useRouter } from "next/navigation";
+
+import { AxiosResponse } from "axios";
+
+import { axiosInstance } from "@/utils/axiosInstance";
+
+// 예시: 성공 후 페이지 이동
+import { QueryKeys } from "./queryKey";
+
+import { LanguageTestEnum } from "@/types/score";
+
+import { useMutation, useQueryClient } from "@tanstack/react-query";
+
+// QueryKeys가 정의된 경로로 수정해주세요.
+
+interface UsePostLanguageTestScoreRequest {
+  languageTestScoreRequest: {
+    languageTestType: LanguageTestEnum;
+    languageTestScore: string;
+    issueDate: string; // yyyy-MM-dd
+  };
+  file: File;
+}
+
+export const postLanguageTestScore = (request: UsePostLanguageTestScoreRequest): Promise<AxiosResponse<null>> => {
+  const convertedRequest: FormData = new FormData();
+  convertedRequest.append(
+    "languageTestScoreRequest",
+    new Blob([JSON.stringify(request.languageTestScoreRequest)], { type: "application/json" }),
+  );
+  convertedRequest.append("file", request.file);
+  return axiosInstance.post("/scores/language-tests", convertedRequest);
+};
+/**
+ * 공인 어학 점수를 제출(POST)하기 위한 useMutation 훅입니다.
+ */
+export const usePostLanguageTestScore = () => {
+  const queryClient = useQueryClient();
+
+  return useMutation({
+    mutationFn: (request: UsePostLanguageTestScoreRequest) => postLanguageTestScore(request),
+
+    onSuccess: () => {
+      alert("어학 성적이 성공적으로 제출되었습니다.");
+      queryClient.invalidateQueries({ queryKey: [QueryKeys.myLanguageTestScore] });
+    },
+
+    onError: (error) => {
+      console.error("어학 성적 제출 중 오류 발생:", error);
+      alert("오류가 발생했습니다. 다시 시도해주세요.");
+    },
+  });
+};

src/api/university/client/useGetUniversitySearchByText.ts

@@ -28,12 +28,12 @@ const getUniversitySearchByText = async (value: string): Promise<UniversitySearc
 
 // --- 커스텀 훅 ---
 const useGetUniversitySearchByText = (searchValue: string) => {
+  const staleTime = searchValue === "" ? Infinity : 1000 * 60 * 5;
+
   return useQuery<UniversitySearchTextResponse, Error, ListUniversity[]>({
     queryKey: [QueryKeys.universitySearchText, searchValue],
     queryFn: () => getUniversitySearchByText(searchValue),
-    // 검색어가 있을 때만 쿼리를 실행합니다.
-    enabled: !!searchValue && searchValue.trim().length > 0,
-    // 실제 컴포넌트에는 univApplyInfoPreviews 배열만 전달합니다.
+    staleTime,
     select: (data) => data.univApplyInfoPreviews,
   });
 };

src/api/university/server/getSearchUniversitiesByText.ts

@@ -1,19 +1,45 @@
 import serverFetch from "@/utils/serverFetchUtil";
 
-import { ListUniversity } from "@/types/university";
+import { AllRegionsUniversityList, ListUniversity, RegionEnumExtend } from "@/types/university";
 
+// --- 타입 정의 ---
 interface UniversitySearchResponse {
   univApplyInfoPreviews: ListUniversity[];
 }
 
-export const getSearchUniversitiesByText = async (value: string): Promise<ListUniversity[]> => {
-  // 검색어가 없으면 빈 배열을 반환하여 불필요한 요청을 막습니다.
-  if (!value || value.trim() === "") {
+export const getUniversitiesByText = async (value: string): Promise<ListUniversity[]> => {
+  if (value === null || value === undefined) {
     return [];
   }
-
   const endpoint = `/univ-apply-infos/search/text?value=${encodeURIComponent(value)}`;
   const response = await serverFetch<UniversitySearchResponse>(endpoint);
-
   return response.ok ? response.data.univApplyInfoPreviews : [];
 };
+
+export const getAllUniversities = async (): Promise<ListUniversity[]> => {
+  return getUniversitiesByText("");
+};
+
+export const getCategorizedUniversities = async (): Promise<AllRegionsUniversityList> => {
+  // 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 && categorizedList.hasOwnProperty(region)) {
+      categorizedList[region].push(university);
+    }
+  }
+
+  return categorizedList;
+};

src/api/university/server/getUniversitiesByAllRegion.ts

@@ -8,7 +8,7 @@ import PopularUniversitySection from "./_ui/PopularUniversitySection";
 import UniversityList from "./_ui/UniversityList";
 
 import getRecommendedUniversity from "@/api/university/server/getRecommendedUniversity";
-import { getUniversitiesByAllRegion } from "@/api/university/server/getUniversitiesByAllRegion";
+import { getCategorizedUniversities } from "@/api/university/server/getSearchUniversitiesByText";
 import { fetchAllNews } from "@/lib/firebaseNews";
 import { IconIdCard, IconMagnifyingGlass, IconMuseum, IconPaper } from "@/public/svgs/home";
 
@@ -30,14 +30,14 @@ const HomePage = async () => {
   const { data } = await getRecommendedUniversity();
   const recommendedUniversities = data?.recommendedUniversities || [];
   // 권역별 전체 대학 리스트를 미리 가져와 빌드합니다
-  const allRegionsUniversityList = await getUniversitiesByAllRegion();
+  const allRegionsUniversityList = await getCategorizedUniversities();
 
   return (
     <>
       <FindLastYearScoreBar />
       <div className="flex flex-col gap-2.5 px-5 py-3.5">
         <div className="flex gap-2">
-          <Link className="h-26 flex flex-1 flex-col gap-2 rounded-lg bg-[#F0F5FF] p-2.5" href="/search">
+          <Link className="h-26 flex flex-1 flex-col gap-2 rounded-lg bg-[#F0F5FF] p-2.5" href="/university">
             <div className="flex flex-col">
               <span className="text-sm font-bold text-secondary">학교 검색하기</span>
               <span className="text-xs font-medium leading-tight text-k-700">모든 학교 목록을 확인해보세요</span>
@@ -46,7 +46,7 @@ const HomePage = async () => {
               <IconMagnifyingGlass />
             </div>
           </Link>
-          <Link className="h-26 flex flex-1 flex-col gap-2 rounded-lg bg-[#EBF8FF] p-2.5" href="/score">
+          <Link className="h-26 flex flex-1 flex-col gap-2 rounded-lg bg-[#EBF8FF] p-2.5" href="/university/score">
             <div className="flex flex-col">
               <span className="text-sm font-bold text-sub-a">성적 입력하기</span>
               <span className="text-xs font-medium leading-tight text-k-700">성적을 입력해보세요</span>