Merge pull request #195 from softeerbootcamp4th/fix/rush-event-date

[Fix] 이벤트 날짜 비교 삭제
softeerbootcamp4th · Aug 23, 2024 · f267a42 · f267a42
2 parents 138a0ab + 33ea0d4
commit f267a42
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 15 deletions.
diff --git a/client/src/features/RushGame/RushGameComponents/RushCountdown.tsx b/client/src/features/RushGame/RushGameComponents/RushCountdown.tsx
@@ -10,7 +10,6 @@ import { GetTotalRushEventsResponse } from "@/types/rushApi.ts";
 import { RUSH_ACTION } from "@/types/rushGame.ts";
 import { formatTime } from "@/utils/formatTime.ts";
 import { getMsTime } from "@/utils/getMsTime.ts";
-import parseIsoDateTime from "@/utils/parseIsoDateTime.ts";
 
 function TimeDisplay({ label, value }: { label: string; value: string }) {
     return (
@@ -38,11 +37,8 @@ export default function RushCountdown() {
 
     useEffect(() => {
         if (isSuccessRush && rushData) {
-            const serverDate = parseIsoDateTime(rushData.serverTime);
-
             const currentEvent = rushData.events.find((event) => {
-                const eventDate = parseIsoDateTime(event.startDateTime);
-                return eventDate === serverDate && event.rushEventId === rushData.todayEventId;
+                return event.rushEventId === rushData.todayEventId;
             });
 
             if (currentEvent) {

diff --git a/client/src/features/RushGame/RushGameSections/Countdown.tsx b/client/src/features/RushGame/RushGameSections/Countdown.tsx
@@ -14,7 +14,6 @@ import { GetTotalRushEventsResponse } from "@/types/rushApi.ts";
 import { RUSH_ACTION } from "@/types/rushGame.ts";
 import { formatTime } from "@/utils/formatTime.ts";
 import { getMsTime } from "@/utils/getMsTime.ts";
-import parseIsoDateTime from "@/utils/parseIsoDateTime.ts";
 
 interface CountdownTimerProps {
     initialPreCountdown: number | null;
@@ -81,11 +80,8 @@ export default function Countdown() {
 
     useEffect(() => {
         if (isSuccessRush && rushData) {
-            const serverDate = parseIsoDateTime(rushData.serverTime);
-
             const currentEvent = rushData.events.find((event) => {
-                const eventDate = parseIsoDateTime(event.startDateTime);
-                return eventDate === serverDate && event.rushEventId === rushData.todayEventId;
+                return event.rushEventId === rushData.todayEventId;
             });
 
             if (currentEvent) {

diff --git a/client/src/hooks/RushGame/useSetGamePhase.ts b/client/src/hooks/RushGame/useSetGamePhase.ts
@@ -4,18 +4,14 @@ import useRushGameDispatchContext from "@/hooks/Contexts/useRushGameDispatchCont
 import { GetTotalRushEventsResponse } from "@/types/rushApi.ts";
 import { RUSH_ACTION } from "@/types/rushGame.ts";
 import { getMsTime } from "@/utils/getMsTime.ts";
-import parseIsoDateTime from "@/utils/parseIsoDateTime.ts";
 
 export default function useSetGamePhase(rushData: GetTotalRushEventsResponse) {
     const dispatch = useRushGameDispatchContext();
 
     useEffect(() => {
         if (rushData) {
-            const serverDate = parseIsoDateTime(rushData.serverTime);
-
             const currentEvent = rushData.events.find((event) => {
-                const eventDate = parseIsoDateTime(event.startDateTime);
-                return eventDate === serverDate && event.rushEventId === rushData.todayEventId;
+                return event.rushEventId === rushData.todayEventId;
             });
 
             if (currentEvent) {