Merge pull request #1283 from AtCoder-NoviSteps/#1282

✨ Add agc to contest type (#1282)

Author: KATO-Hiro

prisma/ERD.md

@@ -21,6 +21,7 @@ TYPICAL90 TYPICAL90
 TESSOKU_BOOK TESSOKU_BOOK
 MATH_AND_ALGORITHM MATH_AND_ALGORITHM
 ARC ARC
+AGC AGC
 OTHERS OTHERS
         }
     

prisma/migrations/20240922115701_add_agc_to_contest_type/migration.sql

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

prisma/schema.prisma

@@ -216,6 +216,7 @@ enum ContestType {
   TESSOKU_BOOK // 競技プログラミングの鉄則
   MATH_AND_ALGORITHM // アルゴリズムと数学
   ARC // AtCoder Regular Contest
+  AGC // AtCoder Grand Contest
   OTHERS // その他
 }
 

src/lib/types/contest.ts

@@ -14,6 +14,7 @@ export const ContestType: { [key in ContestTypeOrigin]: key } = {
   TESSOKU_BOOK: 'TESSOKU_BOOK', // 競技プログラミングの鉄則
   MATH_AND_ALGORITHM: 'MATH_AND_ALGORITHM', // アルゴリズムと数学
   ARC: 'ARC', // AtCoder Regular Contest
+  AGC: 'AGC', // AtCoder Grand Contest
   OTHERS: 'OTHERS',
 } as const;
 

src/lib/utils/contest.ts

@@ -12,6 +12,10 @@ export const classifyContest = (contest_id: string) => {
     return ContestType.ARC;
   }
 
+  if (/^agc\d{3}$/.exec(contest_id)) {
+    return ContestType.AGC;
+  }
+
   if (contest_id.startsWith('APG4b')) {
     return ContestType.APG4B;
   }
@@ -61,8 +65,8 @@ export const classifyContest = (contest_id: string) => {
   return null;
 };
 
-// priority: 0 (High) - 12 (Low)
-// HACK: ARCの優先順位は暫定版
+// priority: 0 (High) - 13 (Low)
+// HACK: ARC、AGCの優先順位は暫定版
 //
 // See:
 // https://jsprimer.net/basic/map-and-set/
@@ -79,7 +83,8 @@ export const contestTypePriorities: Map<ContestType, number> = new Map([
   [ContestType.TESSOKU_BOOK, 9],
   [ContestType.MATH_AND_ALGORITHM, 10],
   [ContestType.ARC, 11],
-  [ContestType.OTHERS, 12],
+  [ContestType.AGC, 12],
+  [ContestType.OTHERS, 13],
 ]);
 
 export function getContestPriority(contestId: string): number {

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

@@ -143,6 +143,21 @@ describe('Contest', () => {
       });
     });
 
+    describe('when contest_id contains agc', () => {
+      const testCases = [
+        { contestId: 'agc001', expected: ContestType.AGC },
+        { contestId: 'agc002', expected: ContestType.AGC },
+        { contestId: 'agc009', expected: ContestType.AGC },
+        { contestId: 'agc010', expected: ContestType.AGC },
+        { contestId: 'agc011', expected: ContestType.AGC },
+        { contestId: 'agc066', expected: ContestType.AGC },
+        { contestId: 'agc067', expected: ContestType.AGC },
+      ];
+
+      runTests('classifyContest', testCases, ({ contestId, expected }: TestCaseForContestType) => {
+        expect(classifyContest(contestId)).toEqual(expected);
+      });
+    });
     describe('when contest_id contains chokudai_S', () => {
       const testCases = [
         { contestId: 'chokudai_S001', expected: ContestType.OTHERS },
@@ -296,6 +311,26 @@ describe('Contest', () => {
       );
     });
 
+    describe('when contest_id contains agc', () => {
+      const testCases = [
+        { contestId: 'agc001', expected: ContestType.AGC },
+        { contestId: 'agc002', expected: ContestType.AGC },
+        { contestId: 'agc009', expected: ContestType.AGC },
+        { contestId: 'agc010', expected: ContestType.AGC },
+        { contestId: 'agc011', expected: ContestType.AGC },
+        { contestId: 'agc066', expected: ContestType.AGC },
+        { contestId: 'agc067', expected: ContestType.AGC },
+      ];
+
+      runTests(
+        'getContestPriority',
+        testCases,
+        ({ contestId, expected }: TestCaseForContestType) => {
+          expect(getContestPriority(contestId)).toEqual(contestTypePriorities.get(expected));
+        },
+      );
+    });
+
     describe('when contest_id contains chokudai_S', () => {
       const testCases = [
         { contestId: 'chokudai_S001', expected: ContestType.OTHERS },
@@ -470,6 +505,26 @@ describe('Contest', () => {
       );
     });
 
+    describe('when contest_id contains agc', () => {
+      const testCases = [
+        { contestId: 'agc001', expected: 'AGC001' },
+        { contestId: 'agc002', expected: 'AGC002' },
+        { contestId: 'agc009', expected: 'AGC009' },
+        { contestId: 'agc010', expected: 'AGC010' },
+        { contestId: 'agc011', expected: 'AGC011' },
+        { contestId: 'agc066', expected: 'AGC066' },
+        { contestId: 'agc067', expected: 'AGC067' },
+      ];
+
+      runTests(
+        'getContestNameLabel',
+        testCases,
+        ({ contestId, expected }: TestCaseForContestNameLabel) => {
+          expect(getContestNameLabel(contestId)).toEqual(expected);
+        },
+      );
+    });
+
     describe('when contest_id contains chokudai_S', () => {
       const testCases = [
         { contestId: 'chokudai_S001', expected: 'Chokudai SpeedRun 001' },
@@ -680,6 +735,26 @@ describe('Contest', () => {
       );
     });
 
+    describe('when contest_id contains agc', () => {
+      const testCases = [
+        { contestId: 'agc001', taskTableIndex: 'A', expected: 'AGC001 - A' },
+        { contestId: 'agc002', taskTableIndex: 'B', expected: 'AGC002 - B' },
+        { contestId: 'agc009', taskTableIndex: 'C', expected: 'AGC009 - C' },
+        { contestId: 'agc010', taskTableIndex: 'D', expected: 'AGC010 - D' },
+        { contestId: 'agc011', taskTableIndex: 'E', expected: 'AGC011 - E' },
+        { contestId: 'agc066', taskTableIndex: 'F', expected: 'AGC066 - F' },
+        { contestId: 'agc067', taskTableIndex: 'E', expected: 'AGC067 - E' },
+      ];
+
+      runTests(
+        'addContestNameToTaskIndex',
+        testCases,
+        ({ contestId, taskTableIndex, expected }: TestCaseForContestNameAndTaskIndex) => {
+          expect(addContestNameToTaskIndex(contestId, taskTableIndex)).toEqual(expected);
+        },
+      );
+    });
+
     function runTests(
       testName: string,
       testCases: TestCasesForContestNameAndTaskIndex,