From 0b8bf4f083b1bf8f2a3a7e268441fbfb2b2ac7c9 Mon Sep 17 00:00:00 2001 From: whqtker Date: Sat, 27 Jun 2026 16:09:13 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20=ED=95=99=EA=B8=B0=20ID=20=EC=83=81?= =?UTF-8?q?=EC=88=98=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/university-web/src/apis/universities/api.ts | 3 +-- .../server/getSearchUniversitiesByFilter.ts | 12 ++++++------ .../server/getSearchUniversitiesByText.ts | 12 ++++++------ apps/university-web/src/constants/university.ts | 3 --- apps/web/src/apis/universities/api.ts | 3 +-- .../server/getSearchUniversitiesByFilter.ts | 12 ++++++------ .../server/getSearchUniversitiesByText.ts | 12 ++++++------ apps/web/src/constants/university.ts | 3 --- 8 files changed, 26 insertions(+), 34 deletions(-) diff --git a/apps/university-web/src/apis/universities/api.ts b/apps/university-web/src/apis/universities/api.ts index 9585b4f8..91bccb09 100644 --- a/apps/university-web/src/apis/universities/api.ts +++ b/apps/university-web/src/apis/universities/api.ts @@ -1,11 +1,10 @@ -import { DEFAULT_UNIVERSITY_TERM_ID } from "@/constants/university"; import type { HomeUniversityName } from "@/types/university"; import { axiosInstance, publicAxiosInstance } from "@/utils/axiosInstance"; const getClientUniversityTermId = () => { const termId = Number(process.env.NEXT_PUBLIC_UNIVERSITY_TERM_ID); - return Number.isInteger(termId) && termId > 0 ? termId : DEFAULT_UNIVERSITY_TERM_ID; + return Number.isInteger(termId) && termId > 0 ? termId : undefined; }; const normalizePositiveInt = (value: unknown) => { diff --git a/apps/university-web/src/apis/universities/server/getSearchUniversitiesByFilter.ts b/apps/university-web/src/apis/universities/server/getSearchUniversitiesByFilter.ts index 19c1e707..d02de53a 100644 --- a/apps/university-web/src/apis/universities/server/getSearchUniversitiesByFilter.ts +++ b/apps/university-web/src/apis/universities/server/getSearchUniversitiesByFilter.ts @@ -1,5 +1,4 @@ import { URLSearchParams } from "node:url"; -import { DEFAULT_UNIVERSITY_TERM_ID } from "@/constants/university"; import type { CountryCode, LanguageTestType, ListUniversity } from "@/types/university"; import serverFetch from "@/utils/serverFetchUtil"; import { assertUniversitySsgResponse } from "./assertUniversitySsgResponse"; @@ -22,7 +21,7 @@ export interface UniversitySearchFilterParams { const getUniversityTermId = () => { const termId = Number(process.env.UNIVERSITY_TERM_ID ?? process.env.NEXT_PUBLIC_UNIVERSITY_TERM_ID); - return Number.isInteger(termId) && termId > 0 ? termId : DEFAULT_UNIVERSITY_TERM_ID; + return Number.isInteger(termId) && termId > 0 ? termId : undefined; }; const normalizePositiveInt = (value: unknown) => { @@ -78,10 +77,11 @@ export const getSearchUniversitiesAllRegions = async ( params: Pick = {}, ): Promise => { const termId = params.termId === undefined ? getUniversityTermId() : assertPositiveInt("termId", params.termId); - const searchParams = new URLSearchParams({ - value: "", - termId: String(termId), - }); + const searchParams = new URLSearchParams({ value: "" }); + + if (termId !== undefined) { + searchParams.set("termId", String(termId)); + } if (params.homeUniversityId !== undefined) { searchParams.set("homeUniversityId", String(assertPositiveInt("homeUniversityId", params.homeUniversityId))); diff --git a/apps/university-web/src/apis/universities/server/getSearchUniversitiesByText.ts b/apps/university-web/src/apis/universities/server/getSearchUniversitiesByText.ts index 89fb4049..036decd8 100644 --- a/apps/university-web/src/apis/universities/server/getSearchUniversitiesByText.ts +++ b/apps/university-web/src/apis/universities/server/getSearchUniversitiesByText.ts @@ -1,5 +1,4 @@ import { URLSearchParams } from "node:url"; -import { DEFAULT_UNIVERSITY_TERM_ID } from "@/constants/university"; import { type AllRegionsUniversityList, type ListUniversity, RegionEnumExtend } from "@/types/university"; import serverFetch from "@/utils/serverFetchUtil"; import { assertUniversitySsgResponse } from "./assertUniversitySsgResponse"; @@ -17,7 +16,7 @@ export interface UniversitySearchTextParams { const getUniversityTermId = () => { const termId = Number(process.env.UNIVERSITY_TERM_ID ?? process.env.NEXT_PUBLIC_UNIVERSITY_TERM_ID); - return Number.isInteger(termId) && termId > 0 ? termId : DEFAULT_UNIVERSITY_TERM_ID; + return Number.isInteger(termId) && termId > 0 ? termId : undefined; }; const normalizePositiveInt = (value: unknown) => { @@ -38,10 +37,11 @@ const assertPositiveInt = (name: string, value: unknown) => { const createSearchTextEndpoint = (value: string, params: UniversitySearchTextParams = {}) => { const termId = params.termId === undefined ? getUniversityTermId() : assertPositiveInt("termId", params.termId); - const searchParams = new URLSearchParams({ - value, - termId: String(termId), - }); + const searchParams = new URLSearchParams({ value }); + + if (termId !== undefined) { + searchParams.set("termId", String(termId)); + } if (params.homeUniversityId !== undefined) { searchParams.set("homeUniversityId", String(assertPositiveInt("homeUniversityId", params.homeUniversityId))); diff --git a/apps/university-web/src/constants/university.ts b/apps/university-web/src/constants/university.ts index 7ef79805..4d2de055 100644 --- a/apps/university-web/src/constants/university.ts +++ b/apps/university-web/src/constants/university.ts @@ -61,9 +61,6 @@ export const HOME_UNIVERSITY_LIST: HomeUniversityInfo[] = [ }, ]; -// 배포 환경에서 UNIVERSITY_TERM_ID를 주입하지 못했을 때 사용하는 현재 학기 fallback입니다. -export const DEFAULT_UNIVERSITY_TERM_ID = 13; - /** * 슬러그로 홈 대학교 정보 조회 */ diff --git a/apps/web/src/apis/universities/api.ts b/apps/web/src/apis/universities/api.ts index 9585b4f8..91bccb09 100644 --- a/apps/web/src/apis/universities/api.ts +++ b/apps/web/src/apis/universities/api.ts @@ -1,11 +1,10 @@ -import { DEFAULT_UNIVERSITY_TERM_ID } from "@/constants/university"; import type { HomeUniversityName } from "@/types/university"; import { axiosInstance, publicAxiosInstance } from "@/utils/axiosInstance"; const getClientUniversityTermId = () => { const termId = Number(process.env.NEXT_PUBLIC_UNIVERSITY_TERM_ID); - return Number.isInteger(termId) && termId > 0 ? termId : DEFAULT_UNIVERSITY_TERM_ID; + return Number.isInteger(termId) && termId > 0 ? termId : undefined; }; const normalizePositiveInt = (value: unknown) => { diff --git a/apps/web/src/apis/universities/server/getSearchUniversitiesByFilter.ts b/apps/web/src/apis/universities/server/getSearchUniversitiesByFilter.ts index c98051b6..4296c7e1 100644 --- a/apps/web/src/apis/universities/server/getSearchUniversitiesByFilter.ts +++ b/apps/web/src/apis/universities/server/getSearchUniversitiesByFilter.ts @@ -1,5 +1,4 @@ import { URLSearchParams } from "node:url"; -import { DEFAULT_UNIVERSITY_TERM_ID } from "@/constants/university"; import type { CountryCode, LanguageTestType, ListUniversity } from "@/types/university"; import serverFetch from "@/utils/serverFetchUtil"; @@ -21,7 +20,7 @@ export interface UniversitySearchFilterParams { const getUniversityTermId = () => { const termId = Number(process.env.UNIVERSITY_TERM_ID ?? process.env.NEXT_PUBLIC_UNIVERSITY_TERM_ID); - return Number.isInteger(termId) && termId > 0 ? termId : DEFAULT_UNIVERSITY_TERM_ID; + return Number.isInteger(termId) && termId > 0 ? termId : undefined; }; const normalizePositiveInt = (value: unknown) => { @@ -81,10 +80,11 @@ export const getSearchUniversitiesAllRegions = async ( params: Pick = {}, ): Promise => { const termId = params.termId === undefined ? getUniversityTermId() : assertPositiveInt("termId", params.termId); - const searchParams = new URLSearchParams({ - value: "", - termId: String(termId), - }); + const searchParams = new URLSearchParams({ value: "" }); + + if (termId !== undefined) { + searchParams.set("termId", String(termId)); + } if (params.homeUniversityId !== undefined) { searchParams.set("homeUniversityId", String(assertPositiveInt("homeUniversityId", params.homeUniversityId))); diff --git a/apps/web/src/apis/universities/server/getSearchUniversitiesByText.ts b/apps/web/src/apis/universities/server/getSearchUniversitiesByText.ts index 6cb17f5a..1df4a9ea 100644 --- a/apps/web/src/apis/universities/server/getSearchUniversitiesByText.ts +++ b/apps/web/src/apis/universities/server/getSearchUniversitiesByText.ts @@ -1,5 +1,4 @@ import { URLSearchParams } from "node:url"; -import { DEFAULT_UNIVERSITY_TERM_ID } from "@/constants/university"; import { type AllRegionsUniversityList, type ListUniversity, RegionEnumExtend } from "@/types/university"; import serverFetch from "@/utils/serverFetchUtil"; @@ -16,7 +15,7 @@ export interface UniversitySearchTextParams { const getUniversityTermId = () => { const termId = Number(process.env.UNIVERSITY_TERM_ID ?? process.env.NEXT_PUBLIC_UNIVERSITY_TERM_ID); - return Number.isInteger(termId) && termId > 0 ? termId : DEFAULT_UNIVERSITY_TERM_ID; + return Number.isInteger(termId) && termId > 0 ? termId : undefined; }; const normalizePositiveInt = (value: unknown) => { @@ -37,10 +36,11 @@ const assertPositiveInt = (name: string, value: unknown) => { const createSearchTextEndpoint = (value: string, params: UniversitySearchTextParams = {}) => { const termId = params.termId === undefined ? getUniversityTermId() : assertPositiveInt("termId", params.termId); - const searchParams = new URLSearchParams({ - value, - termId: String(termId), - }); + const searchParams = new URLSearchParams({ value }); + + if (termId !== undefined) { + searchParams.set("termId", String(termId)); + } if (params.homeUniversityId !== undefined) { searchParams.set("homeUniversityId", String(assertPositiveInt("homeUniversityId", params.homeUniversityId))); diff --git a/apps/web/src/constants/university.ts b/apps/web/src/constants/university.ts index 13f95ea4..1244df98 100644 --- a/apps/web/src/constants/university.ts +++ b/apps/web/src/constants/university.ts @@ -66,9 +66,6 @@ export const HOME_UNIVERSITY_LIST: HomeUniversityInfo[] = [ }, ]; -// 배포 환경에서 UNIVERSITY_TERM_ID를 주입하지 못했을 때 사용하는 현재 학기 fallback입니다. -export const DEFAULT_UNIVERSITY_TERM_ID = 13; - /** * 슬러그로 홈 대학교 정보 조회 */