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

Dev to Main Sync

Author: iamitprakash

test/integration/taskRequests.test.js

@@ -106,6 +106,15 @@ describe("Task Requests", function () {
             return res;
           });
       });
+
+      it("should fetch the task request when some user field is missing", async function () {
+        const userId = await addUser(userData[19]);
+        const taskId = (await tasksModel.updateTask(taskData[0])).taskId;
+        await taskRequestsModel.addOrUpdate(taskId, userId);
+        const res = await chai.request(app).get(`/taskRequests`).set("cookie", `${cookieName}=${jwt}`);
+        expect(res).to.have.status(200);
+        expect(res.body.message).to.be.equal("Task requests returned successfully");
+      });
     });
 
     describe("When the user is not a super user", function () {

utils/task-requests.ts

@@ -42,8 +42,13 @@ const transformTaskRequests = async (taskRequestsList: TaskRequestType[]) => {
   const usersMap = new Map<string, User>(userList.map((data) => [data.id, data]));
   taskRequestsList.forEach((data) => {
     data.users = data.users.map((userData) => {
-      const { username, first_name: firstName, last_name: lastName, picture }: any = usersMap.get(userData.userId);
-      return { ...userData, username: username, first_name: firstName, last_name: lastName, picture };
+      const user = usersMap.get(userData.userId);
+      const username = user?.username || 'Undefined';
+      const firstName = user?.first_name || 'Undefined';
+      const lastName = user?.last_name || 'Undefined';
+      const picture = user?.picture || null;
+
+      return { ...userData, username, first_name: firstName, last_name: lastName, picture };
     });
   });
 };