Merge branch 'develop'

Author: fcamblor

.idea/icon.svg

@@ -4,7 +4,7 @@
     "lint": "eslint --ext .js,.ts .",
     "build": "tsc",
     "build:watch": "tsc --watch",
-    "serve": "npm run build && firebase emulators:start  --import data --export-on-exit --inspect-functions",
+    "serve": "npm run build && MIGRATION_TOKEN=42 firebase emulators:start  --import data --export-on-exit --inspect-functions",
     "shell": "npm run build && firebase functions:shell",
     "start": "npm run shell",
     "deploy": "firebase deploy --only functions",
@@ -24,9 +24,11 @@
     "firebase-functions": "^4.2.0",
     "lodash": "^4.17.21",
     "ts-pattern": "4.3.0",
+    "uuid": "9.0.0",
     "zod": "3.21.4"
   },
   "devDependencies": {
+    "@types/uuid": "9.0.2",
     "@typescript-eslint/eslint-plugin": "^5.12.0",
     "@typescript-eslint/parser": "^5.12.0",
     "eslint": "^8.9.0",

cloud/functions/package-lock.json

@@ -4,10 +4,9 @@ import {
     BreakTimeSlot,
     DailySchedule, DetailedTalk, ScheduleTimeSlot,
     Speaker, TalksTimeSlot,
-} from "../../../../../shared/dayly-schedule.firestore";
+} from "../../../../../shared/daily-schedule.firestore";
 import * as cheerio from 'cheerio';
 import {ConferenceDescriptor} from "../../../../../shared/conference-descriptor.firestore";
-import {Day} from "../../../../../shared/event-list.firestore";
 import axios from "axios";
 import {
     BREAK_PARSER,
@@ -179,6 +178,7 @@ export const CAMPING_DES_SPEAKERS_CRAWLER: CrawlerKind<typeof CAMPING_DES_SPEAKE
                 language: descriptor.supportedTalkLanguages.find(lang => lang.id === rawTalk!.lang)!.id,
                 start: rawTalk!.start,
                 end: rawTalk!.end,
+                tags: []
             };
             return detailedTalk;
         });

cloud/functions/package.json

@@ -9,6 +9,9 @@ import {WEB2DAY_CRAWLER} from "./web2day/crawler";
 import {Temporal} from "@js-temporal/polyfill";
 import {CAMPING_DES_SPEAKERS_CRAWLER} from "./camping-des-speakers/crawler";
 import {DEVOXX_SCALA_CRAWLER} from "./devoxx-scala/crawler";
+import {match} from "ts-pattern";
+import {v4 as uuidv4} from "uuid"
+import {ConferenceOrganizerSpace} from "../../../../shared/conference-organizer-space.firestore";
 const axios = require('axios');
 
 export type CrawlerKind<ZOD_TYPE extends z.ZodType> = {
@@ -106,6 +109,28 @@ const saveEvent = async function(event: FullEvent) {
     await db.collection("events").doc(event.id).set(event.info)
 
     const firestoreEvent = await db.collection("events").doc(event.id);
+    const organizerSpaceEntries = await firestoreEvent
+        .collection('organizer-space')
+        .listDocuments();
+
+    const { organizerSpaceContent, organizerSecretToken }  = await match(organizerSpaceEntries.length)
+        .with(0, async () => {
+            const organizerSecretToken = uuidv4();
+            const organizerSpaceContent: ConferenceOrganizerSpace = {
+                organizerSecretToken,
+                talkFeedbackViewerTokens: []
+            }
+
+            await firestoreEvent.collection('organizer-space').doc(organizerSecretToken).set(organizerSpaceContent)
+            return {organizerSecretToken, organizerSpaceContent};
+        }).with(1, async () => {
+            const organizerSecretToken = await organizerSpaceEntries[0].id;
+            const organizerSpaceContent = (await firestoreEvent.collection('organizer-space').doc(organizerSecretToken).get()).data() as ConferenceOrganizerSpace;
+            return {organizerSecretToken, organizerSpaceContent};
+        }).otherwise(async () => {
+            throw new Error(`More than 1 organizer-space entries detected (${organizerSpaceEntries.length}) for event ${event.id}`);
+        })
+
     await Promise.all(event.daySchedules.map(async daySchedule => {
         try {
             await firestoreEvent
@@ -121,6 +146,26 @@ const saveEvent = async function(event: FullEvent) {
             await firestoreEvent
                 .collection("talks").doc(talk.id)
                 .set(talk)
+
+            const existingTalkFeedbackViewerToken = organizerSpaceContent.talkFeedbackViewerTokens
+                .find(tfvt => tfvt.eventId === event.id && tfvt.talkId === talk.id)
+
+            // If token already exists for the talk, let's not add it
+            if(!existingTalkFeedbackViewerToken) {
+                const talkFeedbackViewerSecretToken = uuidv4();
+
+                await firestoreEvent
+                    .collection("talks").doc(talk.id)
+                    .collection("feedbacks-access").doc(talkFeedbackViewerSecretToken)
+                    // Creating a fake entry so that feedbacks-access/{secretToken} node is created
+                    .collection('_empty').add({ _: 42 })
+
+                organizerSpaceContent.talkFeedbackViewerTokens.push({
+                    eventId: event.id,
+                    talkId: talk.id,
+                    secretToken: talkFeedbackViewerSecretToken
+                });
+            }
         }catch(e) {
             error(`Error while saving talk ${talk.id}: ${e?.toString()}`)
         }
@@ -133,6 +178,12 @@ const saveEvent = async function(event: FullEvent) {
     }catch(e) {
         error(`Error while storing conference descriptor ${event.conferenceDescriptor.id}: ${e?.toString()}`)
     }
+
+    try {
+        await firestoreEvent.collection('organizer-space').doc(organizerSecretToken).set(organizerSpaceContent)
+    }catch(e) {
+        error(`Error while storing event's organizer-space content`)
+    }
 }
 
 export default crawlAll;

cloud/functions/src/crawlers/camping-des-speakers/crawler.ts

@@ -163,7 +163,8 @@ export const DETAILED_TALK_PARSER =  TALK_PARSER.extend({
     start: ISO_DATETIME_PARSER,
     end: ISO_DATETIME_PARSER,
     summary: z.string(),
-    description: z.string()
+    description: z.string(),
+    tags: z.array(z.string())
 })
 
 export const TIME_SLOT_BASE_PARSER = z.object({

cloud/functions/src/crawlers/crawl.ts

@@ -13,7 +13,7 @@ import {
     DetailedTalk, ScheduleTimeSlot,
     Speaker,
     TalksTimeSlot, ThemedTalkFormat, ThemedTrack
-} from "../../../../../shared/dayly-schedule.firestore"
+} from "../../../../../shared/daily-schedule.firestore"
 import { FullEvent } from "../../models/Event";
 import { ISODatetime } from "../../../../../shared/type-utils";
 import { ListableEvent } from "../../../../../shared/event-list.firestore";
@@ -204,7 +204,8 @@ export const DEVOXX_SCALA_CRAWLER: CrawlerKind<typeof DEVOXX_SCALA_DESCRIPTOR_PA
                             },
                             room,
                             summary: talk.summaryAsHtml,
-                            description: talk.summaryAsHtml
+                            description: talk.summaryAsHtml,
+                            tags: []
                         }
 
                         talks.push(detailedTalk);

cloud/functions/src/crawlers/crawler-parsers.ts

@@ -12,7 +12,7 @@ import {
     DetailedTalk,
     Speaker,
     Talk
-} from "../../../../../shared/dayly-schedule.firestore"
+} from "../../../../../shared/daily-schedule.firestore"
 import {TalkStats} from "../../../../../shared/feedbacks.firestore";
 import { FullEvent } from "../../models/Event";
 import { ISODatetime, ISOLocalDate } from "../../../../../shared/type-utils";
@@ -190,7 +190,8 @@ const crawlDevoxxDay = async (eventId: string, day: string) => {
             start: start as ISODatetime,
             end: end as ISODatetime,
             summary: item.proposal.summary || "",
-            description: item.proposal.description || ""
+            description: item.proposal.description || "",
+            tags: item.proposal.tags.map(t => t.name)
         };
 
         return { talk, detailedTalk };

cloud/functions/src/crawlers/devoxx-scala/crawler.ts

@@ -11,7 +11,7 @@ import {
     Talk,
     TalkFormat,
     TalksTimeSlot,
-} from "../../../../../shared/dayly-schedule.firestore";
+} from "../../../../../shared/daily-schedule.firestore";
 import * as cheerio from 'cheerio';
 import {match, P} from "ts-pattern";
 import {ConferenceDescriptor} from "../../../../../shared/conference-descriptor.firestore";
@@ -179,7 +179,8 @@ export const LA_PRODUCT_CONF_CRAWLER: CrawlerKind<typeof LA_PRODUCT_CONF_DESCRIP
                         },
                         room: descriptor.rooms[tabIdx],
                         summary: '',
-                        description: ''
+                        description: '',
+                        tags: []
                     };
 
                     talks.push(detailedTalk);

cloud/functions/src/crawlers/devoxx/crawler.ts

@@ -4,7 +4,7 @@ import {
     BreakTimeSlot,
     DailySchedule, DetailedTalk, ScheduleTimeSlot,
     Speaker, TalksTimeSlot,
-} from "../../../../../shared/dayly-schedule.firestore";
+} from "../../../../../shared/daily-schedule.firestore";
 import * as cheerio from 'cheerio';
 import {ConferenceDescriptor} from "../../../../../shared/conference-descriptor.firestore";
 import {Day} from "../../../../../shared/event-list.firestore";
@@ -216,6 +216,7 @@ export const WEB2DAY_CRAWLER: CrawlerKind<typeof WEB2DAY_PARSER> = {
                 language: descriptor.supportedTalkLanguages.find(lang => lang.id === rawTalk!.lang)!.id,
                 start: rawTalk!.start,
                 end: rawTalk!.end,
+                tags: []
             };
             return detailedTalk;
         });