fix: fix fetch sprint error

chingu-x · Sep 27, 2024 · c2120b1 · c2120b1
1 parent 14d5f26
commit c2120b1
Show file tree

Hide file tree

Showing 13 changed files with 45 additions and 37 deletions.
diff --git a/src/app/(main)/dashboard/components/voyage-dashboard/getDashboardData.ts b/src/app/(main)/dashboard/components/voyage-dashboard/getDashboardData.ts
@@ -200,7 +200,7 @@ export const getDashboardData = async (
     .map((sprint) =>
       fetchMeeting({
         sprintNumber: sprint.number,
-        meetingId: sprint.teamMeetings[0]?.id,
+        meetingId: sprint.teamMeetings[0],
       }),
     );
 

diff --git a/src/app/(main)/my-voyage/[teamId]/sprints/components/EmptySprintWrapper.tsx b/src/app/(main)/my-voyage/[teamId]/sprints/components/EmptySprintWrapper.tsx
@@ -24,8 +24,8 @@ import ErrorComponent from "@/components/Error";
 function getMeeting(sprints: Sprint[], sprintNumber: number) {
   const sprint = sprints.find((sprint) => sprint.number === sprintNumber);
 
-  if (sprint?.teamMeetings && sprint?.teamMeetings.length > 0)
-    return sprint.teamMeetings[0];
+  if (sprint?.teamMeetingsData && sprint?.teamMeetingsData.length > 0)
+    return sprint.teamMeetingsData[0];
   return null;
 }
 

diff --git a/src/app/(main)/my-voyage/[teamId]/sprints/components/ProgressStepper.tsx b/src/app/(main)/my-voyage/[teamId]/sprints/components/ProgressStepper.tsx
@@ -31,7 +31,7 @@ export default function ProgressStepper({
 
   function handleClick(sprintNumber: number) {
     const meetingId = sprints.find((sprint) => sprint.number === sprintNumber)!
-      .teamMeetings[0]?.id;
+      .teamMeetings[0];
 
     if (meetingId) {
       router.push(

diff --git a/src/app/(main)/my-voyage/[teamId]/sprints/components/RedirectToCurrentSprintWrapper.tsx b/src/app/(main)/my-voyage/[teamId]/sprints/components/RedirectToCurrentSprintWrapper.tsx
@@ -51,7 +51,6 @@ export default async function RedirectToCurrentSprintWrapper({
   const teamId = Number(params.teamId);
 
   let currentSprintNumber: number;
-  let currentMeetingId: number;
 
   const [user, error] = await getUser();
 
@@ -110,13 +109,11 @@ export default async function RedirectToCurrentSprintWrapper({
       );
     }
     const { teamMeetings, number } = getCurrentSprint(res!.sprints) as Sprint;
+
     currentSprintNumber = number;
-    currentMeetingId = teamMeetings[0]?.id;
 
-    if (currentMeetingId) {
-      redirect(
-        `/my-voyage/${teamId}/sprints/${currentSprintNumber}/meeting/${currentMeetingId}`,
-      );
+    if (teamMeetings.length !== 0) {
+      redirect(`/my-voyage/${teamId}/sprints/${currentSprintNumber}/meeting/4`);
     } else {
       redirect(`/my-voyage/${teamId}/sprints/${currentSprintNumber}`);
     }

diff --git a/src/app/(main)/my-voyage/[teamId]/sprints/components/SprintWrapper.tsx b/src/app/(main)/my-voyage/[teamId]/sprints/components/SprintWrapper.tsx
@@ -125,7 +125,7 @@ export default async function SprintWrapper({ params }: SprintWrapperProps) {
 
   const correspondingMeetingId = voyageData.sprints.find(
     (sprint) => sprint.number === sprintNumber,
-  )?.teamMeetings[0]?.id;
+  )?.teamMeetings[0];
 
   if (meetingId === correspondingMeetingId) {
     const [res, error] = await fetchMeeting({ sprintNumber, meetingId });

diff --git a/src/app/(main)/my-voyage/[teamId]/sprints/components/forms/AgendaTopicForm.tsx b/src/app/(main)/my-voyage/[teamId]/sprints/components/forms/AgendaTopicForm.tsx
@@ -160,9 +160,13 @@ export default function AgendaTopicForm() {
 
   useEffect(() => {
     if (sprintNumber && agendaId) {
-      const topic = sprints
-        .find((sprint) => sprint.number === sprintNumber)
-        ?.teamMeetings[0].agendas?.find((topic) => topic.id === agendaId);
+      const sprint = sprints.find((sprint) => sprint.number === sprintNumber);
+
+      const topic =
+        sprint?.teamMeetingsData &&
+        sprint.teamMeetingsData[0].agendas?.find(
+          (topic) => topic.id === agendaId,
+        );
 
       setTopicData(topic);
       setEditMode(true);

diff --git a/src/app/(main)/my-voyage/[teamId]/sprints/components/forms/MeetingForm.tsx b/src/app/(main)/my-voyage/[teamId]/sprints/components/forms/MeetingForm.tsx
@@ -177,8 +177,10 @@ export default function MeetingForm() {
   useEffect(() => {
     if (params.meetingId) {
       const meeting = sprints.find(
-        (sprint) => sprint.teamMeetings[0]?.id === +params.meetingId,
-      )?.teamMeetings[0];
+        (sprint) =>
+          sprint.teamMeetingsData &&
+          sprint.teamMeetingsData[0].id === +params.meetingId,
+      );
 
       setMeetingData(meeting as Meeting);
       setEditMode(true);

diff --git a/src/app/(main)/my-voyage/[teamId]/sprints/components/sections/Notes.tsx b/src/app/(main)/my-voyage/[teamId]/sprints/components/sections/Notes.tsx
@@ -43,7 +43,10 @@ export default function Notes() {
   } = useSprint();
 
   useEffect(() => {
-    setData(sprints[sprintNumber - 1].teamMeetings[0].notes);
+    const sprint = sprints[sprintNumber - 1];
+    if (sprint.teamMeetingsData && sprint.teamMeetingsData.length) {
+      setData(sprint.teamMeetingsData[0].notes);
+    }
   }, [sprints, sprintNumber]);
 
   const {

diff --git a/src/app/(main)/my-voyage/[teamId]/sprints/components/sections/Planning.tsx b/src/app/(main)/my-voyage/[teamId]/sprints/components/sections/Planning.tsx
@@ -52,11 +52,14 @@ export default function Planning() {
   } = useSprint();
 
   useEffect(() => {
-    setData(
-      sprints[sprintNumber - 1].teamMeetings[0].formResponseMeeting?.find(
-        (form) => form.form.id === Number(Forms.planning),
-      ),
-    );
+    const sprint = sprints[sprintNumber - 1];
+    if (sprint.teamMeetingsData && sprint.teamMeetingsData.length) {
+      setData(
+        sprint.teamMeetingsData[0].formResponseMeeting?.find(
+          (form) => form.form.id === Number(Forms.planning),
+        ),
+      );
+    }
   }, [sprints, sprintNumber]);
 
   const goal = data?.responseGroup.responses.find(

diff --git a/src/app/(main)/my-voyage/[teamId]/sprints/components/sections/Review.tsx b/src/app/(main)/my-voyage/[teamId]/sprints/components/sections/Review.tsx
@@ -56,11 +56,14 @@ export default function Review() {
   } = useSprint();
 
   useEffect(() => {
-    setData(
-      sprints[sprintNumber - 1].teamMeetings[0].formResponseMeeting?.find(
-        (form) => form.form.id === Number(Forms.review),
-      ),
-    );
+    const sprint = sprints[sprintNumber - 1];
+    if (sprint.teamMeetingsData && sprint.teamMeetingsData.length) {
+      setData(
+        sprint.teamMeetingsData[0].formResponseMeeting?.find(
+          (form) => form.form.id === Number(Forms.review),
+        ),
+      );
+    }
   }, [sprints, sprintNumber]);
 
   const what_right = data?.responseGroup.responses.find(

diff --git a/src/app/(main)/my-voyage/[teamId]/sprints/sprintsService.ts b/src/app/(main)/my-voyage/[teamId]/sprints/sprintsService.ts
@@ -95,7 +95,7 @@ export interface SprintsResponse {
     number: number;
     startDate: string;
     endDate: string;
-    teamMeetings: { id: number }[];
+    teamMeetings: number[];
   }[];
 }
 

diff --git a/src/store/features/sprint/sprintSlice.ts b/src/store/features/sprint/sprintSlice.ts
@@ -45,7 +45,8 @@ export interface Sprint {
   number: number;
   startDate: string;
   endDate: string;
-  teamMeetings: Meeting[];
+  teamMeetings: number[];
+  teamMeetingsData?: Meeting[];
 }
 
 export interface Voyage {
@@ -89,16 +90,11 @@ export const sprintSlice = createSlice({
 
       const updatedSprints = state.voyage.sprints.map((sprint) => {
         if (sprint.id === sprintId) {
-          const updatedMeetings = sprint.teamMeetings.map((meeting) => {
-            if (meeting.id === action.payload.id) {
-              return action.payload;
-            }
-            return meeting;
-          });
-          return { ...sprint, teamMeetings: updatedMeetings };
+          return { ...sprint, teamMeetingsData: [action.payload] };
         }
         return sprint;
       });
+
       state.voyage.sprints = updatedSprints;
       state.loading = true;
     },

diff --git a/src/utils/getCurrentSprint.ts b/src/utils/getCurrentSprint.ts
@@ -4,7 +4,7 @@ import { type Sprint } from "@/store/features/sprint/sprintSlice";
 
 export const currentDate =
   process.env.NODE_ENV === "development"
-    ? new Date(2024, 5, 10, 12)
+    ? new Date(2024, 5, 1, 12)
     : new Date();
 
 export function getCurrentSprint(sprints: Sprint[]) {