Merge pull request #294 from femyeda/readd-286-bugfix/cancellation-eventtype-null

Revert "Revert "Fixed cancellation bug: "cannot read property 'length…
pull/299/head
Bailey Pumfleet 2021-06-21 22:00:19 +01:00 committed by GitHub
commit 2471dcc402
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 35 deletions

View File

@ -134,38 +134,6 @@ export default function Type(props) {
}
export async function getServerSideProps(context) {
const user = await prisma.user.findFirst({
where: {
username: context.query.user,
},
select: {
id: true,
username: true,
name: true,
}
});
if (!user) {
return {
notFound: true,
}
}
const eventType = await prisma.eventType.findFirst({
where: {
userId: user.id,
slug: {
equals: context.query.type,
},
},
select: {
id: true,
title: true,
description: true,
length: true
}
});
const booking = await prisma.booking.findFirst({
where: {
uid: context.query.uid,
@ -176,7 +144,15 @@ export async function getServerSideProps(context) {
description: true,
startTime: true,
endTime: true,
attendees: true
attendees: true,
eventType: true,
user: {
select: {
id: true,
username: true,
name: true,
}
}
}
});
@ -188,8 +164,8 @@ export async function getServerSideProps(context) {
return {
props: {
user,
eventType,
user: booking.user,
eventType: booking.eventType,
booking: bookingObj
},
}