From e3dbc5267665a9e6ad0f8ac19bf4911dea6cef08 Mon Sep 17 00:00:00 2001 From: Alex van Andel Date: Wed, 16 Jun 2021 22:50:29 +0000 Subject: [PATCH] Cleaned up loading the availability schedule --- pages/availability/event/[type].tsx | 29 ++++++++++------------------- 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/pages/availability/event/[type].tsx b/pages/availability/event/[type].tsx index acb86ef0..85d2006c 100644 --- a/pages/availability/event/[type].tsx +++ b/pages/availability/event/[type].tsx @@ -377,6 +377,7 @@ export async function getServerSideProps(context) { timeZone: true, startTime: true, endTime: true, + availability: true, } }); @@ -392,29 +393,19 @@ export async function getServerSideProps(context) { length: true, hidden: true, locations: true, + availability: true, } }); - let schedules = await prisma.schedule.findMany({ - where: { - eventTypeId: parseInt(context.query.type), - }, - }); + const getAvailability = (providesAvailability) => ( + providesAvailability.availability && providesAvailability.availability.length + ) ? providesAvailability.availability : null; - if (!schedules.length) { - schedules = await prisma.schedule.findMany({ - where: { - userId: user.id, - }, - }); - if (!schedules.length) { - schedules.push({ - days: [ 1, 2, 3, 4, 5, 6, 7 ], - startTime: user.startTime, - length: user.endTime >= 1440 ? 1439 : user.endTime, - }); - } - } + const schedules = getAvailability(eventType) || getAvailability(user) || [ { + days: [ 1, 2, 3, 4, 5, 6, 7 ], + startTime: user.startTime, + length: user.endTime >= 1440 ? 1439 : user.endTime, + } ]; return { props: {