From 3b90128927dd8f30bfec6549c867fa38893752a2 Mon Sep 17 00:00:00 2001
From: Dobromir Popov <dobromir.popov@gateway.one>
Date: Sat, 4 May 2024 16:19:31 +0300
Subject: [PATCH] fix missing shifts in myshifts; fix serialization error

---
 pages/cart/publishers/myschedule.tsx | 14 ++++++++------
 pages/dash.tsx                       | 23 +++++++++++++++++------
 src/helpers/data.js                  |  7 +++----
 3 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/pages/cart/publishers/myschedule.tsx b/pages/cart/publishers/myschedule.tsx
index 10b953f..97b66d0 100644
--- a/pages/cart/publishers/myschedule.tsx
+++ b/pages/cart/publishers/myschedule.tsx
@@ -168,10 +168,12 @@ export const getServerSideProps = async (context) => {
     }
 
     const prisma = common.getPrismaClient();
-    const monthInfo = common.getMonthInfo(new Date());
-    //minus 1 day from the firstMonday to get the last Sunday
-    const lastSunday = new Date(monthInfo.firstMonday);
-    lastSunday.setDate(lastSunday.getDate() - 1);
+    let today = new Date();
+    today.setHours(0, 0, 0, 0);
+    // const monthInfo = common.getMonthInfo(today);
+    // //minus 1 day from the firstMonday to get the last Sunday
+    // const lastSunday = new Date(monthInfo.firstMonday);
+    // lastSunday.setDate(lastSunday.getDate() - 1);
     const publisher = await prisma.publisher.findUnique({
         where: {
             id: session.user.id,
@@ -179,7 +181,7 @@ export const getServerSideProps = async (context) => {
                 some: {
                     shift: {
                         startTime: {
-                            gte: lastSunday,
+                            gte: today,
                         },
                     },
                 },
@@ -208,7 +210,7 @@ export const getServerSideProps = async (context) => {
         },
     });
 
-    const assignments = publisher?.assignments.filter(a => a.shift.startTime >= lastSunday && a.shift.isPublished) || [];
+    const assignments = publisher?.assignments.filter(a => a.shift.startTime >= today && a.shift.isPublished) || [];
 
 
     const transformedAssignments = assignments?.sort((a, b) => a.shift.startTime - b.shift.startTime)
diff --git a/pages/dash.tsx b/pages/dash.tsx
index 4ba7281..8dee455 100644
--- a/pages/dash.tsx
+++ b/pages/dash.tsx
@@ -204,13 +204,24 @@ export const getServerSideProps = async (context) => {
     var items = await dataHelper.getCalendarEvents(session.user.id);
     // common.convertDatesToISOStrings(items);
     //serializable dates
-    items = items.map(item => ({
-        ...item,
-        startTime: item.startTime.toISOString(),
-        endTime: item.endTime.toISOString(),
-        date: item.date.toISOString(),
-    }));
+    items = items.map(item => {
+        const updatedItem = {
+            ...item,
+            startTime: item.startTime.toISOString(),
+            endTime: item.endTime.toISOString(),
+            date: item.date.toISOString()
+        };
 
+        if (updatedItem.shift) {
+            updatedItem.shift = {
+                ...updatedItem.shift,
+                startTime: updatedItem.shift.startTime.toISOString(),
+                endTime: updatedItem.shift.endTime.toISOString()
+            };
+        }
+
+        return updatedItem;
+    });
 
     return {
         props: {
diff --git a/src/helpers/data.js b/src/helpers/data.js
index c344a39..79a5079 100644
--- a/src/helpers/data.js
+++ b/src/helpers/data.js
@@ -647,6 +647,7 @@ async function getCalendarEvents(publisherId, date, availabilities = true, assig
             assignments: {
                 select: {
                     id: true,
+                    // publisherId: true,
                     shift: {
                         select: {
                             id: true,
@@ -689,15 +690,13 @@ async function getCalendarEvents(publisherId, date, availabilities = true, assig
                     date: new Date(item.shift.startTime),
                     startTime: new Date(item.shift.startTime),
                     endTime: new Date(item.shift.endTime),
-                    publisherId: item.publisherid,
+                    // publisherId: item.publisherId,
+                    publisherId: publisher.id,
                     type: "assignment",
                 });
             });
-
         }
     }
-
-
     return result;
 }