event queries

devcon-api/src/controllers/speakers.ts

@@ -53,6 +53,13 @@ export async function GetSpeaker(req: Request, res: Response) {
     where: {
       OR: [{ id: req.params.id }, { sourceId: req.params.id }],
     },
+    include: {
+      sessions: {
+        include: {
+          slot_room: true,
+        },
+      },
+    },
   })
 
   if (!data) return res.status(404).send({ status: 404, message: 'Not Found' })

devcon-app/src/pages/speakers/[id].tsx

@@ -1,7 +1,7 @@
 import { AppLayout } from 'components/domain/app/Layout'
 import { SpeakerView, SpeakerSessions, cardClass } from 'components/domain/app/dc7/speakers/index'
 import React from 'react'
-import { fetchSessionsBySpeaker, fetchSpeaker, fetchSpeakers } from 'services/event-data'
+import { fetchSpeaker, fetchSpeakers } from 'services/event-data'
 import { SEO } from 'components/domain/seo'
 import cn from 'classnames'
 
@@ -47,13 +47,11 @@ export async function getStaticProps(context: any) {
     }
   }
 
-  const sessions = await fetchSessionsBySpeaker(speaker.id)
-
   return {
     props: {
       speaker: {
         ...speaker,
-        sessions,
+        sessions: speaker.sessions,
       },
     },
     revalidate: 60,

devcon-app/src/services/event-data.ts

@@ -196,14 +196,11 @@ export const fetchEvent = async (): Promise<any> => {
 }
 
 export const fetchSessionsBySpeaker = async (id: string): Promise<Array<SessionType>> => {
-  // return await get(`/speakers/${id}/sessions?event=${eventName}`)
-  // no endpoint exists, so fetches and filters all sessions recursively
-  return (await fetchSessions()).filter(i => i.speakers.some(x => x.id === id))
+  return await get(`/speakers/${id}/sessions?event=${eventName}`)
 }
 
 export const fetchSessionsByRoom = async (id: string): Promise<Array<SessionType>> => {
-  // return await get(`/sessions?room=${id}&event=${eventName}`)
-  return (await fetchSessions()).filter(i => i.room?.id === id)
+  return await get(`/sessions?room=${id}&event=${eventName}`)
 }
 
 export const fetchExpertiseLevels = async (): Promise<Array<string>> => {
@@ -265,7 +262,10 @@ export const fetchSpeaker = async (id: string): Promise<Speaker | undefined> =>
 
   if (!speaker || speaker.detail === 'Not found.') return undefined
 
-  return speaker
+  return {
+    ...speaker,
+    sessions: speaker.sessions?.filter((i: any) => i.eventId === eventName),
+  }
 }
 
 async function get(slug: string) {
@@ -283,7 +283,7 @@ async function get(slug: string) {
 
   // Extract nested items when using api.devcon.org
   if (response.data) data = response.data
-  if (response.data.items) data = response.data.items
+  if (response.data?.items) data = response.data.items
 
   cache.set(slug, data)