From acc5983c5f1ff8da73a9d756d39565103ea1b962 Mon Sep 17 00:00:00 2001
From: Dobromir Popov <dobromir.popov@gateway.one>
Date: Wed, 6 Mar 2024 10:00:49 +0200
Subject: [PATCH] schedule - skip empty shifts

---
 pages/api/schedule.ts | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pages/api/schedule.ts b/pages/api/schedule.ts
index d94d567..22ae3d9 100644
--- a/pages/api/schedule.ts
+++ b/pages/api/schedule.ts
@@ -95,6 +95,9 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
                         lt: toDate,
                     },
                 },
+                orderBy: {
+                    startTime: 'asc',
+                },
                 include: {
                     assignments: {
                         where: {},
@@ -147,7 +150,9 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
                             .join(", "),
                     };
 
-                    groupedShifts[day][time].push(shiftSchedule);
+                    if (shiftSchedule.names.length > 0) {
+                        groupedShifts[day][time].push(shiftSchedule);
+                    }
                 }
             } catch (err) {
                 console.log(err + " " + JSON.stringify(shifts[i]));
@@ -188,8 +193,9 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
 
                     dayEvent.shifts.push(...groupedShifts[day][time]);
                 }
-
-                monthlySchedule.events.push(dayEvent);
+                if (dayEvent) {
+                    monthlySchedule.events.push(dayEvent);
+                }
             }
 
             const outputPath = path.join(process.cwd(), 'public', 'content', 'output');