2005 reimplement orphan tasks filteration logic (#2013)

* Feat: filter orphan tasks while archiving users

* add: tests

* nit: batch update the task documents

* add DONE status while fetching task docs

* nit: remove extra line

controllers/external-accounts.js

@@ -5,6 +5,7 @@ const { addOrUpdate, getUsersByRole, updateUsersInBatch } = require("../models/u
 const { retrieveDiscordUsers, fetchUsersForKeyValues } = require("../services/dataAccessLayer");
 const { EXTERNAL_ACCOUNTS_POST_ACTIONS } = require("../constants/external-accounts");
 const logger = require("../utils/logger");
+const { markUnDoneTasksOfArchivedUsersBacklog } = require("../models/tasks");
 
 const addExternalAccountData = async (req, res) => {
   const createdOn = Date.now();
@@ -182,6 +183,7 @@ const newSyncExternalAccountData = async (req, res) => {
     discordUserData.forEach((discordUser) => discordUserIdSet.add(discordUser.user.id));
 
     let updateUserList = [];
+    const archiveUserList = [];
 
     for (const rdsUser of unArchivedRdsUsersData) {
       let userData = {};
@@ -210,10 +212,13 @@ const newSyncExternalAccountData = async (req, res) => {
             archived: true,
           },
         };
+        archiveUserList.push({ id: rdsUser.id }); // adding users which are to be archived
       }
       updateUserList.push(userData);
     }
     const unArchiveUsersInBatchPromise = updateUsersInBatch(updateUserList);
+    // Mark un done tasks assigned to archived users BACKLOG
+    const markTasksBacklogPromise = markUnDoneTasksOfArchivedUsersBacklog(archiveUserList);
 
     const archivedUsersInDiscordList = await fetchUsersForKeyValues("discordId", [...discordUserIdSet]);
     totalUsersProcessed += archivedUsersInDiscordList.length;
@@ -233,14 +238,19 @@ const newSyncExternalAccountData = async (req, res) => {
     }
     const archiveUsersInBatchPromise = updateUsersInBatch(updateUserList);
 
-    await Promise.all([unArchiveUsersInBatchPromise, archiveUsersInBatchPromise]);
+    const [, , backlogTasksCount] = await Promise.all([
+      unArchiveUsersInBatchPromise,
+      archiveUsersInBatchPromise,
+      markTasksBacklogPromise,
+    ]);
 
     return res.json({
       message: "Data Sync Complete",
       usersArchivedCount: usersArchivedCount,
       usersUnArchivedCount: usersUnArchivedCount,
       totalUsersProcessed: totalUsersProcessed,
       rdsDiscordServerUsers: discordUserData.length,
+      backlogTasksCount: backlogTasksCount,
     });
   } catch (err) {
     logger.error("Error in syncing users discord joined at");

models/tasks.js

@@ -9,8 +9,18 @@ const { chunks } = require("../utils/array");
 const { DOCUMENT_WRITE_SIZE } = require("../constants/constants");
 const { fromFirestoreData, toFirestoreData, buildTasks } = require("../utils/tasks");
 const { TASK_TYPE, TASK_STATUS, TASK_STATUS_OLD, TASK_SIZE } = require("../constants/tasks");
-const { IN_PROGRESS, NEEDS_REVIEW, IN_REVIEW, ASSIGNED, BLOCKED, SMOKE_TESTING, COMPLETED, SANITY_CHECK, BACKLOG } =
-  TASK_STATUS;
+const {
+  IN_PROGRESS,
+  NEEDS_REVIEW,
+  IN_REVIEW,
+  ASSIGNED,
+  BLOCKED,
+  SMOKE_TESTING,
+  COMPLETED,
+  SANITY_CHECK,
+  BACKLOG,
+  DONE,
+} = TASK_STATUS;
 const { OLD_ACTIVE, OLD_BLOCKED, OLD_PENDING, OLD_COMPLETED } = TASK_STATUS_OLD;
 const { INTERNAL_SERVER_ERROR } = require("../constants/errorMessages");
 
@@ -667,6 +677,30 @@ const updateOrphanTasksStatus = async (lastOrphanTasksFilterationTimestamp) => {
   }
 };
 
+const markUnDoneTasksOfArchivedUsersBacklog = async (users) => {
+  try {
+    let orphanTasksUpdatedCount = 0;
+    const batch = firestore.batch();
+    for (const user of users) {
+      const tasksQuerySnapshot = await tasksModel
+        .where("assigneeId", "==", user.id)
+        .where("status", "not-in", [COMPLETED, DONE, BACKLOG])
+        .get();
+      tasksQuerySnapshot.forEach(async (taskDoc) => {
+        orphanTasksUpdatedCount++;
+        const taskRef = tasksModel.doc(taskDoc.id);
+        batch.update(taskRef, { status: BACKLOG, updated_at: Date.now() });
+      });
+    }
+
+    await batch.commit();
+    return orphanTasksUpdatedCount;
+  } catch (error) {
+    logger.error("Error marking tasks as backlog:", error);
+    throw error;
+  }
+};
+
 module.exports = {
   updateTask,
   fetchTasks,
@@ -685,4 +719,5 @@ module.exports = {
   getOverdueTasks,
   updateTaskStatus,
   updateOrphanTasksStatus,
+  markUnDoneTasksOfArchivedUsersBacklog,
 };

test/fixtures/discordResponse/discord-response.js

@@ -135,6 +135,7 @@ const usersFromRds = [
       in_discord: false,
       archived: false,
     },
+    id: "nonArchivedAndNotInDiscord",
   },
 ];
 

test/integration/external-accounts.test.js

@@ -15,6 +15,7 @@ const { INTERNAL_SERVER_ERROR } = require("../../constants/errorMessages");
 const firestore = require("../../utils/firestore");
 const userData = require("../fixtures/user/user")();
 const userModel = firestore.collection("users");
+const tasksModel = firestore.collection("tasks");
 const { EXTERNAL_ACCOUNTS_POST_ACTIONS } = require("../../constants/external-accounts");
 chai.use(chaiHttp);
 const cookieName = config.get("userToken.cookieName");
@@ -309,6 +310,21 @@ describe("External Accounts", function () {
     it("Should Archive Users With Archived as False and Not in RDS Discord Server", async function () {
       await userModel.add(usersFromRds[4]); // nonArchivedAndNotInDiscord
 
+      const userId = usersFromRds[4].id;
+      const task1 = {
+        assigneeId: userId,
+        status: "ACTIVE",
+      };
+      const task2 = {
+        assigneeId: userId,
+        status: "COMPLETED",
+      };
+      const task3 = {
+        assigneeId: userId,
+        status: "IN_PROGRESS",
+      };
+      await Promise.all([tasksModel.add(task1), tasksModel.add(task2), tasksModel.add(task3)]);
+
       fetchStub.returns(
         Promise.resolve({
           status: 200,
@@ -329,6 +345,7 @@ describe("External Accounts", function () {
         usersUnArchivedCount: 0,
         totalUsersProcessed: 2,
         rdsDiscordServerUsers: 3,
+        backlogTasksCount: 2,
       });
     });
 
@@ -354,6 +371,7 @@ describe("External Accounts", function () {
         usersUnArchivedCount: 0,
         totalUsersProcessed: 2,
         rdsDiscordServerUsers: 3,
+        backlogTasksCount: 0,
       });
     });
 
@@ -379,6 +397,7 @@ describe("External Accounts", function () {
         usersUnArchivedCount: 1,
         totalUsersProcessed: 2,
         rdsDiscordServerUsers: 3,
+        backlogTasksCount: 0,
       });
     });
 
@@ -404,6 +423,7 @@ describe("External Accounts", function () {
         usersUnArchivedCount: 0,
         totalUsersProcessed: 1,
         rdsDiscordServerUsers: 3,
+        backlogTasksCount: 0,
       });
     });