refac: timerのロジックのリファクタリング

biome.json

@@ -23,6 +23,6 @@
     "lineWidth": 120
   },
   "files": {
-    "ignore": ["src/routeTree.gen.ts"]
+    "ignore": ["src/routeTree.gen.ts", "src/Rhythmate-Service/*"]
   }
 }

src/features/common/hooks/useInterval.tsx

@@ -1,11 +1,9 @@
 import { useEffect } from "react";
 
-const useInterval = (callback: any, delay?: number | null) => {
+const useInterval = (callback: () => void, delay: number) => {
   useEffect(() => {
-    if (delay !== null) {
-      const interval = setInterval(() => callback(), delay || 0);
-      return () => clearInterval(interval);
-    }
+    const interval = setInterval(() => callback(), delay || 0);
+    return () => clearInterval(interval);
   }, [callback, delay]);
 };
 

src/features/quests/components/QuestBoard.tsx

@@ -29,7 +29,6 @@ export const QuestBoard: FC<Props> = (props) => {
     currentQuest.minutes,
     currentQuest.startedAt,
   );
-
   const [questStatus, setQuestStatus] = useState<QuestStatus>(status);
 
   useInterval(() => {
@@ -42,19 +41,16 @@ export const QuestBoard: FC<Props> = (props) => {
 
     const { diffHH, diffMM, diffSS } = calcDiffTimeBetweenNowAndTargetTime(baseTime);
 
-    if (status === FORCE_STOP && questStatus !== FORCE_STOP) {
+    // クエスト強制終了へ切り替える
+    if (status === FORCE_STOP) {
       setQuestStatus(FORCE_STOP);
     }
     // クエスト解放へ切り替える
-    if (diffHH === diffMM && diffMM === diffSS && questStatus === CLOSED) {
+    if (diffHH === 0 && diffMM === 0 && diffSS === 0 && questStatus === CLOSED) {
       setQuestStatus(OPEN);
     }
-    // クエスト集中へ切り替える
-    if (diffHH === diffMM && diffMM === diffSS && questStatus === OPEN) {
-      setQuestStatus(ENGAGED);
-    }
     // クエスト終了へ切り替える
-    if (diffHH === diffMM && diffMM === diffSS && questStatus === ENGAGED) {
+    if (diffHH === 0 && diffMM === 0 && diffSS === 0 && questStatus === ENGAGED) {
       setQuestStatus(DONE);
     }
   }, 1000);