Merge pull request #2506 from Real-Dev-Squad/develop

Dev to Main Sync

Author: iamitprakash

config/custom-environment-variables.js

@@ -126,9 +126,7 @@ module.exports = {
     },
   },
 
-  routesCacheTTL: {
-    "/members": "ROUTESCACHETTL_MEMBERS",
-  },
+  routesCacheTTL: {},
 
   Event100ms: {
     APP_ACCESS_KEY: "EVENT_100MS_APP_ACCESS_KEY",

config/default.js

@@ -130,9 +130,7 @@ module.exports = {
     },
   },
 
-  routesCacheTTL: {
-    "/members": 900,
-  },
+  routesCacheTTL: {},
 
   Event100ms: {
     APP_ACCESS_KEY: "EVENT_100MS_APP_ACCESS_KEY",

constants/userStatus.ts

@@ -12,3 +12,5 @@ export const statusState = {
 };
 
 export const CANCEL_OOO = "cancelOoo";
+
+export const POST_OOO_GRACE_PERIOD_IN_DAYS = 3;

controllers/members.js

@@ -31,7 +31,7 @@ const {
   USERS_PATCH_HANDLER_SUCCESS_MESSAGES,
 } = require("../constants/users");
 const { addLog } = require("../models/logs");
-const { getUserStatus } = require("../models/userStatus");
+const { getUserStatus, runLastOooUntilMigration } = require("../models/userStatus");
 const config = require("config");
 const { generateUniqueUsername } = require("../services/users");
 const userService = require("../services/users");
@@ -80,6 +80,19 @@ const getUserById = async (req, res) => {
   });
 };
 
+const updateLastOooUntil = async (req, res) => {
+  try {
+    const summary = await runLastOooUntilMigration();
+    return res.status(200).json({
+      message: "lastOooUntil migration executed successfully",
+      data: summary,
+    });
+  } catch (error) {
+    logger.error(`Error while running lastOooUntil migration: ${error}`);
+    return res.boom.badImplementation(INTERNAL_SERVER_ERROR);
+  }
+};
+
 /**
  * Fetches the data about our users
  *
@@ -1185,5 +1198,6 @@ module.exports = {
   isDeveloper,
   getIdentityStats,
   updateUsernames,
+  updateLastOooUntil,
   updateProfile,
 };

controllers/recruiters.js

@@ -8,7 +8,8 @@ const { findSubscribedGroupIds } = require("../utils/helper");
 const { retrieveUsers } = require("../services/dataAccessLayer");
 const { BATCH_SIZE_IN_CLAUSE } = require("../constants/firebase");
 const { getAllUserStatus, getGroupRole, getUserStatus } = require("./userStatus");
-const { userState } = require("../constants/userStatus");
+const { normalizeTimestamp } = require("../utils/userStatus");
+const { userState, POST_OOO_GRACE_PERIOD_IN_DAYS } = require("../constants/userStatus");
 const { ONE_DAY_IN_MS, SIMULTANEOUS_WORKER_CALLS } = require("../constants/users");
 const userModel = firestore.collection("users");
 const photoVerificationModel = firestore.collection("photo-verification");
@@ -958,6 +959,7 @@ const getMissedProgressUpdatesUsers = async (options = {}) => {
   const stats = {
     tasks: 0,
     missedUpdatesTasks: 0,
+    filteredByOoo: 0,
   };
   try {
     const discordUsersPromise = discordService.getDiscordMembers();
@@ -1031,8 +1033,7 @@ const getMissedProgressUpdatesUsers = async (options = {}) => {
 
     const userIdChunks = chunks(Array.from(usersMap.keys()), FIRESTORE_IN_CLAUSE_SIZE);
     const userStatusSnapshotPromise = userIdChunks.map(
-      async (userIdList) =>
-        await userStatusModel.where("currentStatus.state", "==", userState.OOO).where("userId", "in", userIdList).get()
+      async (userIdList) => await userStatusModel.where("userId", "in", userIdList).get()
     );
     const userDetailsPromise = userIdChunks.map(
       async (userIdList) =>
@@ -1046,7 +1047,13 @@ const getMissedProgressUpdatesUsers = async (options = {}) => {
 
     userStatusChunks.forEach((userStatusList) =>
       userStatusList.forEach((doc) => {
-        usersMap.get(doc.data().userId).isOOO = true;
+        const userStatusData = doc.data();
+        const mappedUser = usersMap.get(userStatusData.userId);
+        if (!mappedUser) {
+          return;
+        }
+        mappedUser.isOOO = userStatusData.currentStatus?.state === userState.OOO;
+        mappedUser.lastOooUntil = userStatusData.lastOooUntil ?? null;
       })
     );
 
@@ -1083,9 +1090,18 @@ const getMissedProgressUpdatesUsers = async (options = {}) => {
 
     await Promise.all(progressCountPromise);
 
+    const gracePeriodCutoff = Date.now() - convertDaysToMilliseconds(POST_OOO_GRACE_PERIOD_IN_DAYS);
     for (const [userId, userData] of usersMap.entries()) {
       const discordUserData = discordUserMap.get(userData.discordId);
       const isDiscordMember = !!discordUserData;
+      const normalizedLastOooUntil = normalizeTimestamp(userData.lastOooUntil);
+      const isWithinGracePeriod = normalizedLastOooUntil !== null && normalizedLastOooUntil >= gracePeriodCutoff;
+
+      if (userData.latestProgressCount === 0 && (userData.isOOO || isWithinGracePeriod)) {
+        stats.filteredByOoo++;
+        usersMap.delete(userId);
+        continue;
+      }
       const shouldAddRole =
         userData.latestProgressCount === 0 &&
         !userData.isOOO &&