✨ add room filtering

devlille · Apr 22, 2019 · 39c0b16 · 39c0b16
1 parent aeae3b6
commit 39c0b16
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/functions/src/talks/business/services/talks.service.ts b/functions/src/talks/business/services/talks.service.ts
@@ -2,14 +2,29 @@ import * as admin from 'firebase-admin';
 
 class TalksService {
 
-    public findAllActiveByEditionId(editionId: string): Promise<any> {
+    public findAllActiveByEditionId(editionId: string, roomId?: string): Promise<any> {
         return admin.firestore()
             .collection('talks')
             .where('edition', '==', editionId)
+            .orderBy('hour', 'asc')
             .get()
             .then(query => {
                 const talks = {};
                 query.forEach(doc => talks[doc.id] = doc.data());
+                return talks;
+            })
+            .then(talks => {
+                if (roomId) {
+                    const filteredTalks = {};
+                    Object.keys(talks).forEach(talkId => {
+                        if(talks[talkId].room === roomId) {
+                            filteredTalks[talkId] = talks[talkId];
+                        }
+                    });
+
+                    return filteredTalks;
+                }
+
                 return talks;
             });
     }

diff --git a/functions/src/talks/functions/find-all-active-talks.ts b/functions/src/talks/functions/find-all-active-talks.ts
@@ -3,7 +3,6 @@ import editionsService from '../../editions/business/services/editions.service';
 import speakersService from '../../speakers/business/services/speakers.service';
 
 import talksService from '../business/services/talks.service';
-import * as moment from 'moment';
 
 function disableCors(request, callback) {
     callback(null, true);
@@ -12,14 +11,16 @@ function disableCors(request, callback) {
 export default (request, response) => {
     cors(disableCors)(request, response, () => {
         const editionId = request.query.editionId;
+        const roomId = request.query.roomId;
         console.log('editionId', editionId);
+        console.log('roomId', roomId);
 
         if (editionId === undefined) {
             response.status(400).send({message: 'Required editionId field in the request.'});
         }
 
         return editionsService.findOne(editionId)
-            .then(() => Promise.all([talksService.findAllActiveByEditionId(editionId), speakersService.findAllActiveByEditionId(editionId)]))
+            .then(() => Promise.all([talksService.findAllActiveByEditionId(editionId, roomId), speakersService.findAllActiveByEditionId(editionId)]))
             .then(datas => {
                 const limitedTalks = {};