improved talk details retrieval during /publicEventStats

Author: fcamblor

cloud/functions/src/functions/firestore/services/schedule-utils.ts

@@ -0,0 +1,32 @@
+import {db} from "../../../firebase";
+import {
+    DailySchedule,
+    Talk,
+    TalksTimeSlot
+} from "../../../../../../shared/daily-schedule.firestore";
+import {ISODatetime} from "../../../../../../shared/type-utils";
+
+
+export type TimeslottedTalk = Talk & {start: ISODatetime, end: ISODatetime};
+
+export async function getTimeslottedTalks(eventId: string): Promise<TimeslottedTalk[]> {
+    const days = await db.collection(`events/${eventId}/days`).listDocuments()
+    const dailySchedules = await Promise.all(days.map(async dayRef => {
+        const dailySchedule = (await db.doc(`events/${eventId}/days/${dayRef.id}`).get()).data() as DailySchedule
+        return dailySchedule;
+    }))
+
+    const talkTimeslots = dailySchedules
+        .flatMap(dailySchedule => dailySchedule.timeSlots)
+        .filter(timeslot => timeslot.type === 'talks') as TalksTimeSlot[]
+
+    const timeslottedTalks: TimeslottedTalk[] = talkTimeslots.flatMap(timeslot => {
+        return timeslot.talks.map(talk => ({
+            ...talk,
+            start: timeslot.start,
+            end: timeslot.end
+        }))
+    })
+
+    return timeslottedTalks;
+}

cloud/functions/src/functions/firestore/services/talk-utils.ts

@@ -1,25 +1,13 @@
 import {db} from "../../../firebase";
-import {DetailedTalk} from "../../../../../../shared/daily-schedule.firestore";
 import {getSecretTokenRef} from "../firestore-utils";
 import {
     DailyTalkFeedbackRatings,
     PerPublicUserIdFeedbackRatings
 } from "../../../../../../shared/conference-organizer-space.firestore";
-import {ISOLocalDate} from "../../../../../../shared/type-utils";
 import {logPerf} from "../../http/utils";
+import {getTimeslottedTalks} from "./schedule-utils";
 
 
-export async function getTalkDetails(eventId: string) {
-    const talkRefs = await db
-        .collection("events").doc(eventId)
-        .collection("talks")
-        .listDocuments();
-
-    const talks  = await Promise.all(talkRefs.map(async talkRef => (await talkRef.get()).data() as DetailedTalk))
-
-    return talks;
-}
-
 type PerTalkPublicUserIdFeedbackRating = {
     talkId: string,
     perPublicUserIdRatings: PerPublicUserIdFeedbackRatings,
@@ -70,7 +58,7 @@ export async function getTalksDetailsWithRatings(eventId: string) {
         const organizerSpaceRef = await getSecretTokenRef(`/events/${eventId}/organizer-space`)
 
         const [ talks, everyRatings ] = await Promise.all([
-            getTalkDetails(eventId),
+            getTimeslottedTalks(eventId),
             getEveryRatingsForEvent(eventId, organizerSpaceRef.id)
         ]);
 

cloud/functions/src/functions/http/event/publicEventStats.ts

@@ -125,7 +125,7 @@ const publicEventStats = functions.https.onRequest(async (request, response) =>
                             format: talk.format.title,
                             language: talk.language,
                             room: talk.room.title, track: talk.track.title,
-                            tags: talk.tags,
+                            tags: [], // TODO: remove this once we're OK that it's not used by callers
                             averageRating: talk.averageRating,
                             numberOfVotes: talk.numberOfVotes
                         }))