Merge pull request #1135 from kenkoooo/pr/sin471/1131

fix isRatedContest()

Author: kenkoooo

atcoder-problems-frontend/src/api/APIClient.ts

@@ -198,16 +198,20 @@ export const useProblems = () => {
   return useSWRData(url, (url) => fetchTypedArray(url, isProblem)).data;
 };
 
-export const useContestToProblems = () => {
+const useContestProblemList = () => {
   const url = STATIC_API_BASE_URL + "/contest-problem.json";
-  const contestIdToProblemIdArray = useSWRData(url, (url) =>
+  return useSWRData(url, (url) =>
     fetchTypedArray(
       url,
       (obj): obj is { contest_id: ContestId; problem_id: ProblemId } =>
         hasPropertyAsType(obj, "contest_id", isString) &&
         hasPropertyAsType(obj, "problem_id", isString)
     )
   );
+};
+
+export const useContestToProblems = () => {
+  const contestIdToProblemIdArray = useContestProblemList();
   const problemMap = useProblemMap();
   return contestIdToProblemIdArray.data?.reduce(
     (map, { contest_id, problem_id }) => {
@@ -224,15 +228,7 @@ export const useContestToProblems = () => {
 };
 
 export const useContestToMergedProblems = () => {
-  const url = STATIC_API_BASE_URL + "/contest-problem.json";
-  const contestIdToProblemIdArray = useSWRData(url, (url) =>
-    fetchTypedArray(
-      url,
-      (obj): obj is { contest_id: ContestId; problem_id: ProblemId } =>
-        hasPropertyAsType(obj, "contest_id", isString) &&
-        hasPropertyAsType(obj, "problem_id", isString)
-    )
-  );
+  const contestIdToProblemIdArray = useContestProblemList();
   const { data: problemMap } = useMergedProblemMap();
   return contestIdToProblemIdArray.data?.reduce(
     (map, { contest_id, problem_id }) => {

atcoder-problems-frontend/src/pages/TablePage/ContestTable.tsx

@@ -115,7 +115,10 @@ export const ContestTable: React.FC<Props> = (props) => {
                             isExperimentalDifficulty={
                               model ? model.is_experimental : false
                             }
-                            showDifficultyUnavailable={isRatedContest(contest)}
+                            showDifficultyUnavailable={isRatedContest(
+                              contest,
+                              problemInfo.length
+                            )}
                             showDifficulty={props.showDifficulty}
                             problemId={problem.id}
                             problemTitle={problem.title}

atcoder-problems-frontend/src/pages/UserPage/AchievementBlock/index.tsx

@@ -77,8 +77,8 @@ export const AchievementBlock: React.FC<Props> = (props) => {
   const ratedProblemIds = new Set(
     contests
       .flatMap((contest) => {
-        const isRated = isRatedContest(contest);
         const contestProblems = contestToProblems.get(contest.id);
+        const isRated = isRatedContest(contest, contestProblems?.length ?? 0);
         return isRated && contestProblems ? contestProblems : [];
       })
       .map((problem) => problem.id)

atcoder-problems-frontend/src/utils/ContestClassifier.test.ts

@@ -14,7 +14,7 @@ describe("test function isRatedContest", () => {
       start_epoch_second: 1381579200,
       title: "AtCoder Beginner Contest 001",
     };
-    expect(isRatedContest(unratedContest)).toBe(false);
+    expect(isRatedContest(unratedContest, 4)).toBe(false);
   });
 
   it("when is rated", () => {
@@ -25,7 +25,18 @@ describe("test function isRatedContest", () => {
       start_epoch_second: 1469275200,
       title: "AtCoder Beginner Contest 042",
     };
-    expect(isRatedContest(ratedContest)).toBe(true);
+    expect(isRatedContest(ratedContest, 4)).toBe(true);
+  });
+
+  it("when is heuristic", () => {
+    const heuristicContest: Contest = {
+      duration_second: 6000,
+      id: "ahc999",
+      rate_change: "All",
+      start_epoch_second: 1469275200,
+      title: "AtCoder Heuristic Contest 999",
+    };
+    expect(isRatedContest(heuristicContest, 1)).toBe(false);
   });
 });
 

atcoder-problems-frontend/src/utils/ContestClassifier.ts

@@ -20,9 +20,14 @@ export type ContestCategory = typeof ContestCategories[number];
 
 export const AGC_001_START = 1468670400;
 
-export const isRatedContest = (contest: Contest): boolean => {
+export const isRatedContest = (
+  contest: Contest,
+  problemCount: number
+): boolean => {
   return (
-    contest.rate_change !== "-" && contest.start_epoch_second >= AGC_001_START
+    contest.rate_change !== "-" &&
+    contest.start_epoch_second >= AGC_001_START &&
+    problemCount >= 2
   );
 };
 
@@ -38,7 +43,10 @@ const classifyOtherRatedContest = (contest: Contest): ContestCategory => {
   return "ARC-Like";
 };
 
-export const classifyContest = (contest: Contest): ContestCategory => {
+export const classifyContest = (
+  contest: Contest,
+  problemCount = 100 // TODO: This function can not classify a non-AHC heuristic contest with this default parameter.
+): ContestCategory => {
   if (/^abc\d{3}$/.exec(contest.id)) {
     return "ABC";
   }
@@ -48,8 +56,11 @@ export const classifyContest = (contest: Contest): ContestCategory => {
   if (/^agc\d{3}$/.exec(contest.id)) {
     return "AGC";
   }
+  if (/^ahc\d{3}$/.exec(contest.id)) {
+    return "AHC";
+  }
 
-  if (isRatedContest(contest)) {
+  if (isRatedContest(contest, problemCount)) {
     return classifyOtherRatedContest(contest);
   }
 
@@ -63,9 +74,6 @@ export const classifyContest = (contest: Contest): ContestCategory => {
     return "JAG";
   }
 
-  if (/^ahc\d{3}$/.exec(contest.id)) {
-    return "AHC";
-  }
   if (
     /(^Chokudai Contest|ハーフマラソン|^HACK TO THE FUTURE|Asprova|Heuristics Contest)/.exec(
       contest.title