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

Dev to main sync

Author: ankushdharkar

config/custom-environment-variables.js

@@ -45,6 +45,11 @@ module.exports = {
       },
     },
 
+    goalAPI: {
+      baseUrl: "GOALS_BASE_URL",
+      secretKey: "GOALS_SECRET_KEY",
+    },
+
     discordBot: {
       baseUrl: "DISCORD_BASE_URL",
     },

config/default.js

@@ -48,9 +48,9 @@ module.exports = {
         authRedirection: "/goto",
       },
       goalAPI: {
-        baseUrl: "",
-        secretKey: "",
-        cookieName: "",
+        baseUrl: "https://goal-api.realdevsquad.com",
+        secretKey: "<goalSecretKey>",
+        cookieName: `goals-session-${NODE_ENV}`,
       },
     },
     discordBot: {

config/development.js

@@ -24,9 +24,8 @@ module.exports = {
     },
 
     goalAPI: {
-      baseUrl: "",
-      secretKey: "",
-      cookieName: "",
+      baseUrl: "https://backend-goals-production.up.railway.app",
+      secretKey: "123456789",
     },
   },
 

config/staging.js

@@ -18,9 +18,8 @@ module.exports = {
       baseUrl: "https://staging-api.realdevsquad.com",
     },
     goalAPI: {
-      baseUrl: "",
-      secretKey: "",
-      cookieName: "",
+      baseUrl: "https://backend-goals-production.up.railway.app",
+      secretKey: "123456789",
     },
   },
 

config/test.js

@@ -36,9 +36,9 @@ module.exports = {
       baseUrl: "DISCORD_BASE_URL",
     },
     goalAPI: {
-      baseUrl: "https://goals-api.realdevsquad.com",
-      secretKey: "123456789",
-      cookieName: "goals_session",
+      baseUrl: "<goalBaseUrl>",
+      secretKey: "<goalSecretKey>",
+      cookieName: `goals-session-test`,
     },
   },
 

controllers/events.js

@@ -296,9 +296,15 @@ const kickoutPeer = async (req, res) => {
   };
 
   try {
+    const peer = await eventQuery.getPeerById(payload.peer_id);
     await apiService.post(`/active-rooms/${id}/remove-peers`, payload);
     await eventQuery.kickoutPeer({ eventId: id, peerId: payload.peer_id, reason: req.body.reason });
-    addLog(logType.EVENTS_REMOVE_PEER, { removed_by: req.userData.id }, payload);
+    addLog(
+      logType.EVENTS_REMOVE_PEER,
+      { removed_by_id: req.userData.id, removed_by_username: req.userData.username },
+      { ...payload, event_id: id, peer_name: peer.name }
+    );
+
     return res.status(200).json({
       message: `Selected Participant is removed from event.`,
     });

controllers/tasksRequests.js

@@ -1,5 +1,6 @@
 const { INTERNAL_SERVER_ERROR, SOMETHING_WENT_WRONG } = require("../constants/errorMessages");
 const { TASK_REQUEST_TYPE } = require("../constants/taskRequests");
+const { addLog } = require("../models/logs");
 const taskRequestsModel = require("../models/taskRequests");
 const tasksModel = require("../models/tasks.js");
 const { updateUserStatusOnTaskUpdate } = require("../models/userStatus");
@@ -95,12 +96,28 @@ const addTaskRequests = async (req, res) => {
       }
     }
     const newTaskRequest = await taskRequestsModel.createRequest(taskRequestData, req.userData.username);
+
     if (newTaskRequest.isCreationRequestApproved) {
       return res.boom.conflict("Task exists for the given issue.");
     }
     if (newTaskRequest.alreadyRequesting) {
       return res.boom.badRequest("Task was already requested");
     }
+
+    const taskRequestLog = {
+      type: "taskRequests",
+      meta: {
+        taskRequestId: newTaskRequest.id,
+        action: "create",
+        createdBy: req.userData.username,
+        createdAt: Date.now(),
+        lastModifiedBy: req.userData.username,
+        lastModifiedAt: Date.now(),
+      },
+      body: newTaskRequest.taskRequest,
+    };
+    await addLog(taskRequestLog.type, taskRequestLog.meta, taskRequestLog.body);
+
     const statusCode = newTaskRequest.isCreate ? 201 : 200;
     return res.status(statusCode).json({
       message: "Task request successful.",
@@ -168,8 +185,24 @@ const approveTaskRequest = async (req, res) => {
     if (response.isTaskRequestInvalid) {
       return res.boom.badRequest("Task request was previously approved or rejected.");
     }
+
     await updateUserStatusOnTaskUpdate(user.username);
 
+    const taskRequestLog = {
+      type: "taskRequests",
+      meta: {
+        taskRequestId: taskRequestId,
+        action: "update",
+        subAction: "approve",
+        createdBy: req.userData.username,
+        createdAt: Date.now(),
+        lastModifiedBy: req.userData.username,
+        lastModifiedAt: Date.now(),
+      },
+      body: response.taskRequest,
+    };
+    await addLog(taskRequestLog.type, taskRequestLog.meta, taskRequestLog.body);
+
     return res.status(200).json({
       message: `Task successfully assigned to user ${response.approvedTo}`,
       taskRequest: response.taskRequest,

controllers/users.js

@@ -15,7 +15,7 @@ const { getPaginationLink, getUsernamesFromPRs, getRoleToUpdate } = require("../
 const { setInDiscordFalseScript, setUserDiscordNickname } = require("../services/discordService");
 const { generateDiscordProfileImageUrl } = require("../utils/discord-actions");
 const { addRoleToUser, getDiscordMembers } = require("../services/discordService");
-const { fetchAllUsers, fetchUser } = require("../models/users");
+const { fetchAllUsers } = require("../models/users");
 const { getOverdueTasks } = require("../models/tasks");
 const { getQualifiers } = require("../utils/helper");
 const { parseSearchQuery } = require("../utils/users");
@@ -174,33 +174,36 @@ const getUsers = async (req, res) => {
     if (transformedQuery?.filterBy === OVERDUE_TASKS) {
       try {
         const tasksData = await getOverdueTasks(days);
+        if (!tasksData.length) {
+          return res.json({
+            message: "No users found",
+            users: [],
+          });
+        }
         const userIds = new Set();
         const usersData = [];
 
         tasksData.forEach((task) => {
-          userIds.add(task.assignee);
+          if (task.assignee) {
+            userIds.add(task.assignee);
+          }
         });
 
-        for (const userId of Array.from(userIds)) {
-          const userInfo = await fetchUser({ userId });
-
-          if (userInfo) {
-            const userTasks = tasksData.filter((task) => task.assignee === userId);
+        const userInfo = await dataAccess.retrieveUsers({ userIds: Array.from(userIds) });
+        userInfo.forEach((user) => {
+          if (!user.roles.archived) {
+            const userTasks = tasksData.filter((task) => task.assignee === user.id);
             const userData = {
-              id: userId,
-              discordId: userInfo.user.discordId,
-              username: userInfo.user.username,
+              id: user.id,
+              discordId: user.discordId,
+              username: user.username,
             };
-
             if (dev) {
               userData.tasks = userTasks;
             }
-
-            if (userInfo.user.roles.in_discord) {
-              usersData.push(userData);
-            }
+            usersData.push(userData);
           }
-        }
+        });
 
         return res.json({
           message: "Users returned successfully!",

middlewares/validators/user.js

@@ -22,7 +22,7 @@ const updateUser = async (req, res, next) => {
         .optional()
         .min(4)
         .max(20)
-        .regex(/^[a-zA-Z0-9]+$/)
+        .regex(/^[a-zA-Z0-9-]+$/)
         .message("Username must be between 4 and 20 characters long and contain only letters or numbers."),
       first_name: joi.string().optional(),
       last_name: joi.string().optional(),

models/discordactions.js

@@ -246,7 +246,7 @@ const enrichGroupDataWithMembershipInfo = async (discordId, groups = []) => {
     const subscribedGroupIds = findSubscribedGroupIds(discordId, groupsToUserMappings);
 
     return groups.map((group) => {
-      const groupCreator = groupCreatorsDetails[group.createdBy];
+      const groupCreator = groupCreatorsDetails.find((user) => user.id === group.createdBy);
       return {
         ...group,
         firstName: groupCreator?.first_name,