#74 ensuring speaker id is a valid key when trying to store/access it

Author: fcamblor

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

@@ -9,6 +9,7 @@ import {AllInOneTalkStats} from "../../../../../../shared/event-stats";
 import {getEventTalks} from "./talk-utils";
 import {detailedTalksToSpeakersLineup} from "../../../models/Event";
 import {DetailedTalk} from "../../../../../../shared/daily-schedule.firestore";
+import {toValidFirebaseKey} from "../../../../../../shared/utilities/firebase.utils";
 
 
 export async function getAllEventsDocs(opts: { includePrivateSpaces: boolean } = { includePrivateSpaces: false }) {
@@ -58,7 +59,7 @@ export async function createAllSpeakers(eventTalks: DetailedTalk[], maybeSpaceTo
 
   // delete all then re-create all
   await Promise.all(existingSpeakerDocs.map(speakerDoc => speakerDoc.delete()))
-  await Promise.all(lineupSpeakers.map(lineupSpeaker => db.doc(`${eventRootPath}/speakers/${lineupSpeaker.id}`).set(lineupSpeaker)))
+  await Promise.all(lineupSpeakers.map(lineupSpeaker => db.doc(`${eventRootPath}/speakers/${toValidFirebaseKey(lineupSpeaker.id)}`).set(lineupSpeaker)))
 
   return { createdSpeakers: lineupSpeakers }
 }

mobile/src/state/useEventSpeakers.ts

@@ -13,6 +13,7 @@ import {checkCache} from "@/services/Cachings";
 import {Temporal} from "temporal-polyfill";
 import {PERF_LOGGER} from "@/services/Logger";
 import {loadSpeakerUrl} from "@/state/useEventTalk";
+import {toValidFirebaseKey} from "../../../shared/utilities/firebase.utils";
 
 export function useLineupSpeakers(eventDescriptorRef: Ref<VoxxrinConferenceDescriptor|undefined>, searchTermsRef: Ref<string|undefined>) {
 
@@ -88,7 +89,7 @@ export function eventLineupSpeakerDocument(eventDescriptor: VoxxrinConferenceDes
   }
 
   return doc(db,
-    `${resolvedEventFirestorePath(eventDescriptor.id.value, eventDescriptor.spaceToken?.value)}/speakers/${speakerId.value}`
+    `${resolvedEventFirestorePath(eventDescriptor.id.value, eventDescriptor.spaceToken?.value)}/speakers/${toValidFirebaseKey(speakerId.value)}`
     ) as DocumentReference<LineupSpeaker>;
 }