Merge branch 'develop' into feat/missed-progress-updates

Author: Ajeyakrishna-k

models/discordactions.js

@@ -479,7 +479,7 @@ const updateUsersNicknameStatus = async (lastNicknameUpdate) => {
 
     const today = new Date().getTime();
 
-    const nicknameUpdatePromises = [];
+    let successfulUpdates = 0;
     const nicknameUpdateBatches = [];
     const totalUsersStatus = usersStatusDocs.length;
 
@@ -514,14 +514,19 @@ const updateUsersNicknameStatus = async (lastNicknameUpdate) => {
         }
       });
 
-      const settledPromises = await Promise.all(promises);
-      nicknameUpdatePromises.push(...settledPromises);
+      const settledPromises = await Promise.allSettled(promises);
+
+      settledPromises.forEach((result) => {
+        if (result.status === "fulfilled" && !!result.value) {
+          successfulUpdates++;
+        } else {
+          logger.error(`Error while updating nickname: ${result.reason}`);
+        }
+      });
 
       await new Promise((resolve) => setTimeout(resolve, 5000));
     }
 
-    const successfulUpdates = nicknameUpdatePromises.length;
-
     const res = {
       totalUsersStatus,
       successfulNicknameUpdates: successfulUpdates,

test/integration/discordactions.test.js

@@ -40,7 +40,7 @@ const { updateUserStatus } = require("../../models/userStatus");
 const { generateUserStatusData } = require("../fixtures/userStatus/userStatus");
 const { getDiscordMembers } = require("../fixtures/discordResponse/discord-response");
 const { getOnboarding31DPlusMembers } = require("../fixtures/discordResponse/discord-response");
-
+const discordRolesModel = require("../../models/discordactions");
 chai.use(chaiHttp);
 const { userStatusDataForOooState } = require("../fixtures/userStatus/userStatus");
 const { generateCronJobToken } = require("../utils/generateBotToken");
@@ -392,7 +392,12 @@ describe("Discord actions", function () {
   describe("POST /discord-actions/nickname/status", function () {
     let jwtToken;
     beforeEach(async function () {
-      const { id } = await userModel.add({ ...userData[0] });
+      const userData2 = { ...userData[1] };
+      delete userData2.discordId;
+      const [{ id }, { id: userId2 }] = await Promise.all([
+        userModel.add({ ...userData[0] }),
+        userModel.add(userData2),
+      ]);
       const statusData = {
         ...userStatusDataForOooState,
         futureStatus: {
@@ -402,7 +407,17 @@ describe("Discord actions", function () {
         },
         userId: id,
       };
-      await userStatusModel.add(statusData);
+      const statusData2 = {
+        ...userStatusDataForOooState,
+        futureStatus: {
+          state: "ACTIVE",
+          updatedAt: 1668211200000,
+          from: 1668709800000,
+        },
+        userId: userId2,
+      };
+      await Promise.all([userStatusModel.add(statusData), userStatusModel.add(statusData2)]);
+
       jwtToken = generateCronJobToken({ name: CRON_JOB_HANDLER });
     });
 
@@ -435,19 +450,19 @@ describe("Discord actions", function () {
           expect(res.body).to.deep.equal({
             message: "Updated discord users nickname based on status",
             data: {
-              totalUsersStatus: 1,
+              totalUsersStatus: 2,
               successfulNicknameUpdates: 1,
-              unsuccessfulNicknameUpdates: 0,
+              unsuccessfulNicknameUpdates: 1,
             },
           });
           return done();
         });
     }).timeout(10000);
 
     it("should return object with 0 successful updates when user nickname changes", function (done) {
-      const response = "Error occurred while updating user's nickname";
-      fetchStub.returns(Promise.reject(response));
+      sinon.stub(discordRolesModel, "updateUsersNicknameStatus").throws(new Error());
 
+      sinon.stub();
       chai
         .request(app)
         .post("/discord-actions/nickname/status")
@@ -464,7 +479,7 @@ describe("Discord actions", function () {
           expect(res.body.message).to.equal("An internal server error occurred");
           return done();
         });
-    });
+    }).timeout(10000);
   });
   describe("POST /discord-actions/discord-roles", function () {
     before(async function () {

test/unit/models/discordactions.test.js

@@ -461,7 +461,6 @@ describe("discordactions", function () {
     beforeEach(async function () {
       fetchStub = sinon.stub(global, "fetch");
       dataAccessLayerStub = sinon.stub(dataAccessLayer, "retrieveUsers");
-
       addedUers.forEach(({ username, discordId, id }) => {
         dataAccessLayerStub.withArgs(sinon.match({ id })).resolves({
           user: {

utils/users.js

@@ -4,7 +4,7 @@ const userModel = firestore.collection("users");
 const { months, discordNicknameLength } = require("../constants/users");
 const dataAccessLayer = require("../services/dataAccessLayer");
 const discordService = require("../services/discordService");
-
+const ROLES = require("../constants/roles");
 const addUserToDBForTest = async (userData) => {
   await userModel.add(userData);
 };
@@ -271,10 +271,15 @@ const generateOOONickname = (username = "", from, until) => {
  */
 const updateNickname = async (userId, status = {}) => {
   try {
-    const { user: { discordId, username } = {} } = await dataAccessLayer.retrieveUsers({ id: userId });
-    if (!discordId || !username) {
-      throw new Error("Username or discordId unavailable");
+    const {
+      user: { discordId, username, roles = {} },
+      discordJoinedAt = {},
+    } = await dataAccessLayer.retrieveUsers({ id: userId });
+
+    if (!discordId || !username || !discordJoinedAt || roles[ROLES.ARCHIVED]) {
+      throw new Error("User details unavailable");
     }
+
     try {
       const nickname = generateOOONickname(username, status.from, status.until);