diff --git a/frontend/src/pages/AdminPage/tabs/ClubIntroEditTab/components/AwardEditor/AwardEditor.tsx b/frontend/src/pages/AdminPage/tabs/ClubIntroEditTab/components/AwardEditor/AwardEditor.tsx index 647490e0..57c89d9c 100644 --- a/frontend/src/pages/AdminPage/tabs/ClubIntroEditTab/components/AwardEditor/AwardEditor.tsx +++ b/frontend/src/pages/AdminPage/tabs/ClubIntroEditTab/components/AwardEditor/AwardEditor.tsx @@ -13,13 +13,13 @@ interface AwardEditorProps { const START_YEAR = 2020; const getSemesterSortValue = (award: Award): number => { - const semesterValue = award.semester === SemesterTerm.FIRST ? 1 : 2; + const semesterValue = award.semesterTerm === SemesterTerm.FIRST ? 1 : 2; return award.year * 10 + semesterValue; }; const formatSemesterLabel = (award: Award): string => { const semesterLabel = - award.semester === SemesterTerm.FIRST ? '1학기' : '2학기'; + award.semesterTerm === SemesterTerm.FIRST ? '1학기' : '2학기'; return `${award.year} ${semesterLabel}`; }; @@ -58,13 +58,13 @@ const AwardEditor = ({ awards, onChange }: AwardEditorProps) => { ); const getAwardKey = (award: Award, index: number): string => - `${award.year}-${award.semester}-${index}`; + `${award.year}-${award.semesterTerm}-${index}`; const handleAddSemester = () => { const year = parseInt(selectedYear, 10); const isDuplicate = awards.some( - (award) => award.year === year && award.semester === selectedSemester, + (award) => award.year === year && award.semesterTerm === selectedSemester, ); if (isDuplicate) { alert('이미 추가된 학기입니다.'); @@ -73,7 +73,7 @@ const AwardEditor = ({ awards, onChange }: AwardEditorProps) => { const newAward: Award = { year, - semester: selectedSemester, + semesterTerm: selectedSemester, achievements: [''], }; @@ -221,7 +221,7 @@ const AwardEditor = ({ awards, onChange }: AwardEditorProps) => { const originalIndex = awards.findIndex( (originalAward, idx) => originalAward.year === award.year && - originalAward.semester === award.semester && + originalAward.semesterTerm === award.semesterTerm && originalAward.achievements === award.achievements, ); const awardKey = getAwardKey(award, originalIndex); diff --git a/frontend/src/types/club.ts b/frontend/src/types/club.ts index 08d171de..0f32efbb 100644 --- a/frontend/src/types/club.ts +++ b/frontend/src/types/club.ts @@ -50,7 +50,7 @@ export type SemesterTermType = (typeof SemesterTerm)[keyof typeof SemesterTerm]; export interface Award { year: number; - semester: SemesterTermType; + semesterTerm: SemesterTermType; achievements: string[]; } diff --git a/frontend/src/utils/awardHelpers.test.ts b/frontend/src/utils/awardHelpers.test.ts index a62aa2f2..19b3fc1c 100644 --- a/frontend/src/utils/awardHelpers.test.ts +++ b/frontend/src/utils/awardHelpers.test.ts @@ -4,11 +4,11 @@ import { formatSemesterLabel, getAwardKey } from './awardHelpers'; describe('awardHelpers', () => { const createAward = ( year: number, - semester: SemesterTermType, + semesterTerm: SemesterTermType, achievements: string[] = [], ): Award => ({ year, - semester, + semesterTerm, achievements, }); @@ -28,14 +28,14 @@ describe('awardHelpers', () => { it('year가 없으면 null을 반환해야 한다', () => { const award: Partial = { - semester: SemesterTerm.FIRST, + semesterTerm: SemesterTerm.FIRST, achievements: [], }; expect(formatSemesterLabel(award as Award)).toBeNull(); }); - it('semester가 없으면 null을 반환해야 한다', () => { + it('semesterTerm이 없으면 null을 반환해야 한다', () => { const award: Partial = { year: 2024, achievements: [], @@ -44,7 +44,7 @@ describe('awardHelpers', () => { expect(formatSemesterLabel(award as Award)).toBeNull(); }); - it('year와 semester가 모두 없으면 null을 반환해야 한다', () => { + it('year와 semesterTerm이 모두 없으면 null을 반환해야 한다', () => { const award: Partial = { achievements: [], }; @@ -67,7 +67,7 @@ describe('awardHelpers', () => { }); describe('getAwardKey', () => { - it('year, semester, index를 조합한 고유 키를 생성해야 한다', () => { + it('year, semesterTerm, index를 조합한 고유 키를 생성해야 한다', () => { expect(getAwardKey(validAward2024First, 0)).toBe('2024-FIRST-0'); }); diff --git a/frontend/src/utils/awardHelpers.ts b/frontend/src/utils/awardHelpers.ts index 849f64ef..ebbc8ae1 100644 --- a/frontend/src/utils/awardHelpers.ts +++ b/frontend/src/utils/awardHelpers.ts @@ -1,13 +1,13 @@ import { Award, SemesterTerm } from '@/types/club'; export const formatSemesterLabel = (award: Award): string | null => { - if (award?.year && award?.semester) { + if (award?.year && award?.semesterTerm) { const semesterLabel = - award.semester === SemesterTerm.FIRST ? '1학기' : '2학기'; + award.semesterTerm === SemesterTerm.FIRST ? '1학기' : '2학기'; return `${award.year} ${semesterLabel}`; } return null; }; export const getAwardKey = (award: Award, index: number): string => - `${award.year}-${award.semester}-${index}`; + `${award.year}-${award.semesterTerm}-${index}`;