Merge pull request #285 from emrysal/bugfix/throw-404-when-eventType-missing

pages/[user]/[type].tsx

@@ -370,50 +370,52 @@ export default function Type(props) {
 }
 
 export async function getServerSideProps(context) {
-    const user = await prisma.user.findFirst({
+  const user = await prisma.user.findFirst({
-        where: {
+    where: {
-          username: context.query.user,
+      username: context.query.user,
-        },
+    },
-        select: {
+    select: {
-            id: true,
+      id: true,
-            username: true,
+      username: true,
-            name: true,
+      name: true,
-            email: true,
+      email: true,
-            bio: true,
+      bio: true,
-            avatar: true,
+      avatar: true,
-            eventTypes: true,
+      eventTypes: true,
-            startTime: true,
+      startTime: true,
-            timeZone: true,
+      timeZone: true,
-            endTime: true,
+      endTime: true,
-            weekStart: true,
+      weekStart: true,
-        }
-    });
-
-    if (!user) {
-        return {
-            notFound: true,
-        }
     }
+  });
 
+  if (user) {
     const eventType = await prisma.eventType.findFirst({
-        where: {
+      where: {
-            userId: user.id,
+        userId: user.id,
-            slug: {
+        slug: {
-                equals: context.query.type,
+          equals: context.query.type,
-            },
         },
-        select: {
+      },
-            id: true,
+      select: {
-            title: true,
+        id: true,
-            description: true,
+        title: true,
-            length: true
+        description: true,
-        }
+        length: true
+      }
     });
+  }
 
+  if (!user || !eventType) {
     return {
-        props: {
+      notFound: true,
-            user,
-            eventType,
-        },
     }
+  }
+
+  return {
+    props: {
+      user,
+      eventType,
+    },
+  }
 }