v1.6.2/mass message, filters

functions/admin/partyDashboard.js

@@ -1,14 +1,14 @@
 /* eslint-disable promise/no-nesting */
-const admin = require('firebase-admin');
-const Logger = require('../Logger');
-const mLogger = new Logger('admin', 'partyDashboard');
+const admin = require("firebase-admin");
+const Logger = require("../Logger");
+const mLogger = new Logger("admin", "partyDashboard");
 
 module.exports = async (req, res) => {
   mLogger.start();
 
   var partyData = await admin
     .firestore()
-    .collection('rooms')
+    .collection("rooms")
     .get()
     .then((roomSnapshot) => {
       const docData = [];
@@ -18,38 +18,43 @@ module.exports = async (req, res) => {
           createTime: doc.createTime.toDate().toUTCString(),
           updateTime: doc.updateTime.toDate().toUTCString(),
           source: doc.data().player.source,
-          onCall: doc.data().hasOwnProperty('conference'),
-          showName: doc.data().player.showName || '',
+          onCall: doc.data().hasOwnProperty("conference"),
+          showName: doc.data().player.showName || "",
           time: doc.data().player.time || 0,
-          status: doc.data().player.status || '',
+          status: doc.data().player.status || "",
         });
       });
       return docData;
     })
     .catch((err) => {
-      mLogger.error('FAILED TO RESOLVE PARTIES', err);
-      res.status(500).send({ message: 'Unable to get all parties', error: err });
+      mLogger.error("FAILED TO RESOLVE PARTIES", err);
+      res
+        .status(500)
+        .send({ message: "Unable to get all parties", error: err });
     });
 
-  await partyData.forEach((party) => {
-    const messageCount = admin
+  const p = await partyData.map(async (party) => {
+    const messageCount = await admin
       .firestore()
-      .collection('rooms')
+      .collection("rooms")
       .doc(party.id)
-      .collection('messages')
+      .collection("messages")
       .get()
       .then((snap) => snap.size);
-    const userCount = admin
+    const userCount = await admin
       .firestore()
-      .collection('rooms')
+      .collection("rooms")
       .doc(party.id)
-      .collection('users')
+      .collection("users")
       .get()
       .then((snap) => snap.size);
     party.messageCount = messageCount || 0;
     party.userCount = userCount || 0;
+    return party;
   });
 
-  mLogger.success('GOT ALL PARTIES', { parties: partyData.length });
-  return res.status(200).send({ partyData });
+  return Promise.all(p).then((v) => {
+    mLogger.success("GOT ALL PARTIES", { parties: partyData.length });
+    return res.status(200).send({ partyData });
+  });
 };