v.1.7.9/webhook room cleanup update

functions/webhooks/cleanUpRoom.js

@@ -1,46 +0,0 @@
-const admin = require("firebase-admin");
-
-module.exports = async (partyName) => {
-  // DELETE MESSAGES
-  const partyMessagesRef = admin
-    .firestore()
-    .collection("rooms")
-    .doc(partyName)
-    .collection("messages");
-  const partyMessagesQuery = partyMessagesRef.orderBy("time").limit(200);
-  await deleteCollection(partyMessagesQuery);
-  // DELETE USERS
-  const partyUsersRef = admin
-    .firestore()
-    .collection("rooms")
-    .doc(partyName)
-    .collection("users");
-  const partyUsersQuery = partyUsersRef.limit(200);
-  await deleteCollection(partyUsersQuery);
-  // DELETE PARTY DOC
-  await admin.firestore().collection("rooms").doc(partyName).delete();
-};
-
-async function deleteCollection(query) {
-  const db = admin.firestore();
-  return new Promise((resolve, reject) => {
-    deleteQueryBatch(db, query, resolve).catch(reject);
-  });
-}
-
-async function deleteQueryBatch(db, query, resolve) {
-  const snapshot = await query.get();
-  const batchSize = snapshot.size;
-  if (batchSize === 0) {
-    resolve();
-    return;
-  }
-  const batch = admin.firestore().batch();
-  snapshot.docs.forEach((doc) => {
-    batch.delete(doc.ref);
-  });
-  await batch.commit();
-  process.nextTick(() => {
-    deleteQueryBatch(db, query, resolve);
-  });
-}

functions/webhooks/scheduledCleanUp.js

@@ -1,5 +1,5 @@
 const admin = require("firebase-admin");
-const cleanUpRoom = require("./cleanUpRoom");
+const firebase_tools = require("firebase-tools");
 
 const timeDiff = (ds1, ds2) => {
   const d1 = new Date(ds1);
@@ -9,9 +9,57 @@ const timeDiff = (ds1, ds2) => {
   return Math.abs(Math.round(diff));
 };
 
-module.exports = async (req, res) => {
+const roomIdList = async (refs) => {
   const startedTime = new Date();
+  return await admin
+    .firestore()
+    .getAll(...refs)
+    .then((roomDataList) =>
+      roomDataList.map((roomData) => {
+        if (
+          !roomData.exists ||
+          (timeDiff(roomData.createTime.toDate(), startedTime) >= 24 &&
+            timeDiff(roomData.updateTime.toDate(), startedTime) >= 4) ||
+          timeDiff(roomData.updateTime.toDate(), startedTime) >= 12
+        ) {
+          return roomData.id;
+        }
+      })
+    )
+    .then((ids) => ids.filter((v) => v !== undefined));
+};
+
+const batchDeleteRooms = async (roomList, totalNumber) => {
+  setTimeout(async () => {
+    if (roomList.length > 0) {
+      await firebase_tools.firestore
+        .delete(`rooms/${roomList.splice(0, 1)[0]}`, {
+          project: process.env.GCLOUD_PROJECT,
+          recursive: true,
+          yes: true,
+        })
+        .catch((err) =>
+          console.error(
+            `[ERROR]\tWEBHOOKS/Room Clean Up\t# OF ROOMS ${roomList.length} REMAINING,\tERROR:${err}`
+          )
+        );
+      console.info(
+        `[DONE]\tWEBHOOKS/Room Clean Up\t# OF ROOMS ${
+          totalNumber - roomList.length
+        }/${totalNumber}`
+      );
+      batchDeleteRooms(roomList, totalNumber);
+    } else {
+      console.info(
+        `[DONE]\tWEBHOOKS/Room Clean Up\tDeleted all ${totalNumber} rooms`
+      );
+    }
+  }, 1000);
+};
+
+module.exports = async (req, res) => {
   res.status(200).send({ message: "Started processing" });
+
   const roomList = await admin
     .firestore()
     .collection("rooms")
@@ -23,28 +71,9 @@ module.exports = async (req, res) => {
         err
       );
     });
-  roomList.forEach((roomRef) => {
-    roomRef
-      .get()
-      .then(async (roomSnap) => {
-        if (
-          // MORE THAN 24 HOURS AND NOT IN USE
-          (timeDiff(roomSnap.createTime.toDate(), startedTime) >= 24 &&
-            timeDiff(roomSnap.updateTime.toDate(), startedTime) >= 4) ||
-          // LESS THAN 24 HOURS BUT NOT IN USE
-          timeDiff(roomSnap.updateTime.toDate(), startedTime) >= 12
-        ) {
-          cleanUpRoom(roomSnap.id);
-          console.info(`Deleted room ${roomSnap.id} from auto cleanup`);
-        }
-        return;
-      })
-      .catch((err) => {
-        console.error(
-          `Failed to run auto clean up (get room snap) @ ${new Date().toLocaleTimeString()}`,
-          err
-        );
-      });
-  });
+
+  var ids = await roomIdList(roomList);
+  batchDeleteRooms(ids, ids.length);
+
   return;
 };