Merge pull request #1214 from AtCoder-NoviSteps/#1165

✨ Add others to contest type (#1165)

Author: KATO-Hiro

prisma/ERD.md

@@ -20,6 +20,7 @@ JOI JOI
 TYPICAL90 TYPICAL90
 TESSOKU_BOOK TESSOKU_BOOK
 MATH_AND_ALGORITHM MATH_AND_ALGORITHM
+OTHERS OTHERS
         }
     
 

prisma/migrations/20240904092455_add_others_to_contest_type/migration.sql

@@ -0,0 +1,2 @@
+-- AlterEnum
+ALTER TYPE "ContestType" ADD VALUE 'OTHERS';

prisma/schema.prisma

@@ -215,6 +215,7 @@ enum ContestType {
   TYPICAL90 // 競プロ典型 90 問
   TESSOKU_BOOK // 競技プログラミングの鉄則
   MATH_AND_ALGORITHM // アルゴリズムと数学
+  OTHERS // その他
 }
 
 // 11Q(最も簡単)〜6D(最難関)。

src/lib/types/contest.ts

@@ -13,6 +13,7 @@ export const ContestType: { [key in ContestTypeOrigin]: key } = {
   TYPICAL90: 'TYPICAL90', // 競プロ典型 90 問
   TESSOKU_BOOK: 'TESSOKU_BOOK', // 競技プログラミングの鉄則
   MATH_AND_ALGORITHM: 'MATH_AND_ALGORITHM', // アルゴリズムと数学
+  OTHERS: 'OTHERS',
 } as const;
 
 // Re-exporting the original type with the original name.

src/lib/utils/contest.ts

@@ -48,10 +48,16 @@ export const classifyContest = (contest_id: string) => {
     return ContestType.MATH_AND_ALGORITHM;
   }
 
+  // HACK: 2024年9月上旬時点では、「Chokudai SpeedRun 001」と「Chokudai SpeedRun 002」のみ該当。
+  // 対象コンテストが増えた場合は、判定条件を見直す必要がある。
+  if (contest_id.startsWith('chokudai_S')) {
+    return ContestType.OTHERS;
+  }
+
   return null;
 };
 
-// priority: 0 (High) - 10 (Low)
+// priority: 0 (High) - 11 (Low)
 // See:
 // https://jsprimer.net/basic/map-and-set/
 export const contestTypePriorities: Map<ContestType, number> = new Map([
@@ -66,6 +72,7 @@ export const contestTypePriorities: Map<ContestType, number> = new Map([
   [ContestType.JOI, 8],
   [ContestType.TESSOKU_BOOK, 9],
   [ContestType.MATH_AND_ALGORITHM, 10],
+  [ContestType.OTHERS, 11],
 ]);
 
 export function getContestPriority(contestId: string): number {
@@ -112,5 +119,9 @@ export const getContestNameLabel = (contest_id: string) => {
     return 'アルゴリズムと数学';
   }
 
+  if (contest_id.startsWith('chokudai_S')) {
+    return contest_id.replace('chokudai_S', 'Chokudai SpeedRun ');
+  }
+
   return contest_id.toUpperCase();
 };

src/test/lib/utils/contest.test.ts

@@ -113,6 +113,17 @@ describe('Contest', () => {
       expect(classifyContest('math-and-algorithm')).toEqual(ContestType.MATH_AND_ALGORITHM);
     });
 
+    describe('when contest_id contains chokudai_S', () => {
+      const testCases = [
+        { contestId: 'chokudai_S001', expected: ContestType.OTHERS },
+        { contestId: 'chokudai_S002', expected: ContestType.OTHERS },
+      ];
+
+      runTests('classifyContest', testCases, ({ contestId, expected }: TestCaseForContestType) => {
+        expect(classifyContest(contestId)).toEqual(expected);
+      });
+    });
+
     function runTests(
       testName: string,
       testCases: TestCasesForContestType,
@@ -230,6 +241,21 @@ describe('Contest', () => {
       );
     });
 
+    describe('when contest_id contains chokudai_S', () => {
+      const testCases = [
+        { contestId: 'chokudai_S001', expected: ContestType.OTHERS },
+        { contestId: 'chokudai_S002', expected: ContestType.OTHERS },
+      ];
+
+      runTests(
+        'getContestPriority',
+        testCases,
+        ({ contestId, expected }: TestCaseForContestType) => {
+          expect(getContestPriority(contestId)).toEqual(contestTypePriorities.get(expected));
+        },
+      );
+    });
+
     function runTests(
       testName: string,
       testCases: TestCasesForContestType,
@@ -357,6 +383,21 @@ describe('Contest', () => {
       expect(getContestNameLabel('math-and-algorithm')).toEqual('アルゴリズムと数学');
     });
 
+    describe('when contest_id contains chokudai_S', () => {
+      const testCases = [
+        { contestId: 'chokudai_S001', expected: 'Chokudai SpeedRun 001' },
+        { contestId: 'chokudai_S002', expected: 'Chokudai SpeedRun 002' },
+      ];
+
+      runTests(
+        'getContestNameLabel',
+        testCases,
+        ({ contestId, expected }: TestCaseForContestNameLabel) => {
+          expect(getContestNameLabel(contestId)).toEqual(expected);
+        },
+      );
+    });
+
     function runTests(
       testName: string,
       testCases: TestCasesForContestNameLabel,