iilj · iilj · Aug 9, 2021 · Aug 9, 2021
diff --git a/src/interfaces/Problem.ts b/src/interfaces/Problem.ts
@@ -32,18 +32,7 @@ export const ProblemTypes = [
 
 /** 問題レベルのリスト */
 export const ProblemLevels = [
-  0,
-  1,
-  1.5,
-  2,
-  2.5,
-  3,
-  3.5,
-  4,
-  4.5,
-  5,
-  5.5,
-  6,
+  0, 1, 1.5, 2, 2.5, 3, 3.5, 4, 4.5, 5, 5.5, 6,
 ] as const;
 
 /** 問題レベル */

diff --git a/src/pages/ListPage/index.tsx b/src/pages/ListPage/index.tsx
@@ -107,7 +107,8 @@ export const ListPage: React.FC = () => {
         TypedCachedApiClient.cachedGolferRankingPureProblemMap(),
         DifficultyDataClient.cachedDifficultyData(),
       ]);
-      const problemContestMap = await TypedCachedApiClient.cachedProblemContestMap();
+      const problemContestMap =
+        await TypedCachedApiClient.cachedProblemContestMap();
 
       if (!unmounted) {
         setUniversalState({
@@ -210,18 +211,16 @@ export const ListPage: React.FC = () => {
     'Level'
   );
 
-  const [statusFilterState, setStatusFilterState] = useState<FilterState>(
-    'All'
-  );
+  const [statusFilterState, setStatusFilterState] =
+    useState<FilterState>('All');
   const [fromDifficultyLevel, setFromDifficultyLevel] = useState<
     ProblemLevel | -1
   >(-1);
   const [toDifficultyLevel, setToDifficultyLevel] = useState<
     ProblemLevel | 100
   >(INF_LEVEL);
-  const [showTagsOfTryingProblems, setShowTagsOfTryingProblems] = useState(
-    false
-  );
+  const [showTagsOfTryingProblems, setShowTagsOfTryingProblems] =
+    useState(false);
   const [fromDate, setFromDate] = useState(INITIAL_FROM_DATE);
   const [toDate, setToDate] = useState(INITIAL_TO_DATE);
   const [problemTypeFilterState, setProblemTypeFilterState] = useState<

diff --git a/src/pages/ProblemDetailPage/index.tsx b/src/pages/ProblemDetailPage/index.tsx
@@ -103,8 +103,10 @@ export const ProblemDetailPage: React.FC = () => {
       )}. `
     : '';
 
-  const shortestRankingProblem = golferProblemMap.get(problemId);
-  const pureShortestRankingProblem = golferPureProblemMap.get(problemId);
+  const shortestRankingProblem =
+    problem.No !== null ? golferProblemMap.get(problem.No) : undefined;
+  const pureShortestRankingProblem =
+    problem.No !== null ? golferPureProblemMap.get(problem.No) : undefined;
 
   const [colorMode, setColorMode] = useLocalStorage<ProblemLinkColorMode>(
     'TablePage_colorMode',

diff --git a/src/pages/UserPage/index.tsx b/src/pages/UserPage/index.tsx
@@ -126,15 +126,13 @@ export const UserPage: React.FC = () => {
     let unmounted = false;
     const getUserInfo = async () => {
       setUserStateLoaded(false);
-      const [
-        userInfo,
-        solvedProblems,
-        firstSolvedProblems,
-      ] = await Promise.all([
-        TypedCachedApiClient.cachedUserInfo(param, user),
-        TypedCachedApiClient.cachedSolvedProblemArray(param, user),
-        TypedCachedApiClient.cachedFirstSolvedProblemArray(param, user),
-      ]);
+      const [userInfo, solvedProblems, firstSolvedProblems] = await Promise.all(
+        [
+          TypedCachedApiClient.cachedUserInfo(param, user),
+          TypedCachedApiClient.cachedSolvedProblemArray(param, user),
+          TypedCachedApiClient.cachedFirstSolvedProblemArray(param, user),
+        ]
+      );
       const [solvedProblemsMap, firstSolvedProblemsMap] = await Promise.all([
         TypedCachedApiClient.cachedSolvedProblemMap(param, user),
         TypedCachedApiClient.cachedFirstSolvedProblemMap(param, user),

diff --git a/src/utils/MergeProcs.ts b/src/utils/MergeProcs.ts
@@ -34,75 +34,36 @@ export const mergeSolveStatus = (
     });
     return map;
   }, new Map<ProblemId, number>());
-  const mergedProblems = problems.map(
-    (problem): MergedProblem => {
-      const DateNum = Date.parse(problem.Date as string);
-      const contestId = problemContestMap.get(problem.ProblemId);
-      const extendedContest = contestId
-        ? extendedContestMap.get(contestId)
+  const mergedProblems = problems.map((problem): MergedProblem => {
+    const DateNum = Date.parse(problem.Date as string);
+    const contestId = problemContestMap.get(problem.ProblemId);
+    const extendedContest = contestId
+      ? extendedContestMap.get(contestId)
+      : undefined;
+    const solvedProblem = solvedProblemsMap.get(problem.ProblemId);
+    const firstSolvedProblem = firstSolvedProblemsMap.get(problem.ProblemId);
+    const Difficulty =
+      problem.ProblemId in difficulties
+        ? difficulties[problem.ProblemId][0]
         : undefined;
-      const solvedProblem = solvedProblemsMap.get(problem.ProblemId);
-      const firstSolvedProblem = firstSolvedProblemsMap.get(problem.ProblemId);
-      const Difficulty =
-        problem.ProblemId in difficulties
-          ? difficulties[problem.ProblemId][0]
-          : undefined;
-      const Augmented =
-        problem.ProblemId in difficulties
-          ? difficulties[problem.ProblemId][3]
-          : undefined;
-      if (!extendedContest) {
-        // コンテスト情報なし，ACしたかどうかのみ
-        const SolveDate = solvedProblem?.Date;
-        const SolveDateNum = SolveDate ? Date.parse(SolveDate) : undefined;
-        const FirstSolveDate = firstSolvedProblem?.Date;
-        const FirstSolveDateNum = FirstSolveDate
-          ? Date.parse(FirstSolveDate)
-          : undefined;
-        const SolveStatus =
-          solvedProblem || FirstSolveDate
-            ? ProblemSolveStatus.Solved
-            : ProblemSolveStatus.Trying;
-        return {
-          ...problem,
-          DateNum,
-          SolveDate,
-          SolveDateNum,
-          FirstSolveDate,
-          FirstSolveDateNum,
-          SolveStatus,
-          Difficulty,
-          Augmented,
-          Index: undefined,
-        };
-      }
-      // assert コンテスト情報あり
-      if (!firstSolvedProblem) {
-        // 未 AC
-        return {
-          ...problem,
-          Contest: extendedContest,
-          DateNum,
-          SolveStatus: ProblemSolveStatus.Trying,
-          Difficulty,
-          Augmented,
-          Index: problemIndexMap.get(problem.ProblemId),
-        };
-      }
-      // assert AC 済み
+    const Augmented =
+      problem.ProblemId in difficulties
+        ? difficulties[problem.ProblemId][3]
+        : undefined;
+    if (!extendedContest) {
+      // コンテスト情報なし，ACしたかどうかのみ
       const SolveDate = solvedProblem?.Date;
       const SolveDateNum = SolveDate ? Date.parse(SolveDate) : undefined;
-      const FirstSolveDate = firstSolvedProblem.Date;
-      const FirstSolveDateNum = Date.parse(FirstSolveDate);
+      const FirstSolveDate = firstSolvedProblem?.Date;
+      const FirstSolveDateNum = FirstSolveDate
+        ? Date.parse(FirstSolveDate)
+        : undefined;
       const SolveStatus =
-        FirstSolveDateNum > extendedContest.EndDateNum
+        solvedProblem || FirstSolveDate
           ? ProblemSolveStatus.Solved
-          : FirstSolveDateNum >= extendedContest.DateNum
-          ? ProblemSolveStatus.Intime
-          : ProblemSolveStatus.BeforeContest;
+          : ProblemSolveStatus.Trying;
       return {
         ...problem,
-        Contest: extendedContest,
         DateNum,
         SolveDate,
         SolveDateNum,
@@ -111,10 +72,47 @@ export const mergeSolveStatus = (
         SolveStatus,
         Difficulty,
         Augmented,
+        Index: undefined,
+      };
+    }
+    // assert コンテスト情報あり
+    if (!firstSolvedProblem) {
+      // 未 AC
+      return {
+        ...problem,
+        Contest: extendedContest,
+        DateNum,
+        SolveStatus: ProblemSolveStatus.Trying,
+        Difficulty,
+        Augmented,
         Index: problemIndexMap.get(problem.ProblemId),
       };
     }
-  );
+    // assert AC 済み
+    const SolveDate = solvedProblem?.Date;
+    const SolveDateNum = SolveDate ? Date.parse(SolveDate) : undefined;
+    const FirstSolveDate = firstSolvedProblem.Date;
+    const FirstSolveDateNum = Date.parse(FirstSolveDate);
+    const SolveStatus =
+      FirstSolveDateNum > extendedContest.EndDateNum
+        ? ProblemSolveStatus.Solved
+        : FirstSolveDateNum >= extendedContest.DateNum
+        ? ProblemSolveStatus.Intime
+        : ProblemSolveStatus.BeforeContest;
+    return {
+      ...problem,
+      Contest: extendedContest,
+      DateNum,
+      SolveDate,
+      SolveDateNum,
+      FirstSolveDate,
+      FirstSolveDateNum,
+      SolveStatus,
+      Difficulty,
+      Augmented,
+      Index: problemIndexMap.get(problem.ProblemId),
+    };
+  });
   return mergedProblems;
 };
 
@@ -133,33 +131,31 @@ export const mergeRanking = (
   golferProblemMap: Map<ProblemNo, RankingProblem>,
   golferPureProblemMap: Map<ProblemNo, RankingProblem>
 ): RankingMergedProblem[] =>
-  mergedProblems.map(
-    (mergedProblem): RankingMergedProblem => {
-      const FastestRankingProblem =
-        typeof mergedProblem.No === 'number'
-          ? speederProblemMap.get(mergedProblem.No)
-          : undefined;
-      const ShortestRankingProblem =
-        typeof mergedProblem.No === 'number'
-          ? golferProblemMap.get(mergedProblem.No)
-          : undefined;
-      const PureShortestRankingProblem =
-        typeof mergedProblem.No === 'number'
-          ? golferPureProblemMap.get(mergedProblem.No)
-          : undefined;
-      const ContestName = mergedProblem.Contest?.Name;
-      const FastestRankingUserName = FastestRankingProblem?.UserName;
-      const ShortestRankingUserName = ShortestRankingProblem?.UserName;
-      const PureShortestRankingUserName = PureShortestRankingProblem?.UserName;
-      return {
-        ...mergedProblem,
-        FastestRankingProblem,
-        ShortestRankingProblem,
-        PureShortestRankingProblem,
-        ContestName,
-        FastestRankingUserName,
-        ShortestRankingUserName,
-        PureShortestRankingUserName,
-      };
-    }
-  );
+  mergedProblems.map((mergedProblem): RankingMergedProblem => {
+    const FastestRankingProblem =
+      typeof mergedProblem.No === 'number'
+        ? speederProblemMap.get(mergedProblem.No)
+        : undefined;
+    const ShortestRankingProblem =
+      typeof mergedProblem.No === 'number'
+        ? golferProblemMap.get(mergedProblem.No)
+        : undefined;
+    const PureShortestRankingProblem =
+      typeof mergedProblem.No === 'number'
+        ? golferPureProblemMap.get(mergedProblem.No)
+        : undefined;
+    const ContestName = mergedProblem.Contest?.Name;
+    const FastestRankingUserName = FastestRankingProblem?.UserName;
+    const ShortestRankingUserName = ShortestRankingProblem?.UserName;
+    const PureShortestRankingUserName = PureShortestRankingProblem?.UserName;
+    return {
+      ...mergedProblem,
+      FastestRankingProblem,
+      ShortestRankingProblem,
+      PureShortestRankingProblem,
+      ContestName,
+      FastestRankingUserName,
+      ShortestRankingUserName,
+      PureShortestRankingUserName,
+    };
+  });
diff --git a/src/utils/OpenContest.ts b/src/utils/OpenContest.ts
@@ -11,18 +11,7 @@ export const OpenContests: Contest[] = [
     Date: '2020-03-19T20:30:00+09:00',
     EndDate: '2020-03-19T23:00:00+09:00',
     ProblemIdList: [
-      4951,
-      4952,
-      4954,
-      4956,
-      4957,
-      4958,
-      4959,
-      4960,
-      4961,
-      4962,
-      4963,
-      4964,
+      4951, 4952, 4954, 4956, 4957, 4958, 4959, 4960, 4961, 4962, 4963, 4964,
       4965,
     ],
   },
@@ -37,24 +26,8 @@ export const OpenContests: Contest[] = [
     Date: '2019-10-14T13:30:00+09:00',
     EndDate: '2019-10-14T17:30:00+09:00',
     ProblemIdList: [
-      4600,
-      4825,
-      -1,
-      4560,
-      4748,
-      4826,
-      4827,
-      -1,
-      -1,
-      4776,
-      4777,
-      -1,
-      4746,
-      -1,
-      4778,
-      -1,
-      -1,
-      4750,
+      4600, 4825, -1, 4560, 4748, 4826, 4827, -1, -1, 4776, 4777, -1, 4746, -1,
+      4778, -1, -1, 4750,
     ],
   },
   // https://www.hackerrank.com/ysf1

diff --git a/src/utils/index.test.ts b/src/utils/index.test.ts
@@ -4,18 +4,7 @@ import { getLevelList, range, mapToObject, getHeader } from './index';
 describe('getLevelList()', () => {
   test('problem level list should be [0] + [1, 1.5, 2, ..., 6.0]', () => {
     expect(getLevelList()).toEqual([
-      0,
-      1,
-      1.5,
-      2,
-      2.5,
-      3,
-      3.5,
-      4,
-      4.5,
-      5,
-      5.5,
-      6,
+      0, 1, 1.5, 2, 2.5, 3, 3.5, 4, 4.5, 5, 5.5, 6,
     ] as ProblemLevel[]);
   });
 });