fix: review comments

Author: TanishqSingla

controllers/tasksRequests.js

@@ -28,10 +28,10 @@ const fetchTaskRequestById = async (req, res) => {
     const id = req.params.id;
     const data = await taskRequestsModel.fetchTaskRequestById(id);
 
-    if (data) {
+    if (data.taskRequestExists) {
       res.status(200).json({
         message: "Task request returned successfully",
-        data,
+        data: data.taskRequestData,
       });
     }
 

models/taskRequests.js

@@ -13,30 +13,34 @@ const userModel = require("./users");
 const fetchTaskRequests = async () => {
   const taskRequests = [];
 
-  const taskRequestsSnapshots = (await taskRequestsCollection.get()).docs;
+  try {
+    const taskRequestsSnapshots = (await taskRequestsCollection.get()).docs;
 
-  const taskPromises = [];
-  const userPromises = [];
+    const taskPromises = [];
+    const userPromises = [];
 
-  taskRequestsSnapshots.forEach((taskRequestsSnapshot) => {
-    const taskRequestData = taskRequestsSnapshot.data();
-    taskRequestData.id = taskRequestsSnapshot.id;
-    taskRequestData.url = new URL(`/taskRequests/${taskRequestData.id}`, config.get("services.rdsUi.baseUrl"));
-    const { requestors } = taskRequestData;
+    taskRequestsSnapshots.forEach((taskRequestsSnapshot) => {
+      const taskRequestData = taskRequestsSnapshot.data();
+      taskRequestData.id = taskRequestsSnapshot.id;
+      taskRequestData.url = new URL(`/taskRequests/${taskRequestData.id}`, config.get("services.rdsUi.baseUrl"));
+      const { requestors } = taskRequestData;
 
-    taskPromises.push(tasksModel.fetchTask(taskRequestData.taskId));
-    userPromises.push(Promise.all(requestors.map((requestor) => userModel.fetchUser({ userId: requestor }))));
+      taskPromises.push(tasksModel.fetchTask(taskRequestData.taskId));
+      userPromises.push(Promise.all(requestors.map((requestor) => userModel.fetchUser({ userId: requestor }))));
 
-    taskRequests.push(taskRequestData);
-  });
+      taskRequests.push(taskRequestData);
+    });
 
-  const tasks = await Promise.all(taskPromises);
-  const users = await Promise.all(userPromises);
+    const tasks = await Promise.all(taskPromises);
+    const users = await Promise.all(userPromises);
 
-  taskRequests.forEach((taskRequest, index) => {
-    taskRequest.task = tasks[+index].taskData;
-    taskRequest.requestors = users[+index];
-  });
+    taskRequests.forEach((taskRequest, index) => {
+      taskRequest.task = tasks[+index].taskData;
+      taskRequest.requestors = users[+index];
+    });
+  } catch (err) {
+    logger.error("Error in updating task", err);
+  }
 
   return taskRequests;
 };
@@ -48,14 +52,25 @@ const fetchTaskRequests = async () => {
  * @return Promise<{taskRequest: Object}>
  */
 const fetchTaskRequestById = async (taskRequestId) => {
-  const taskRequestSnapshot = await taskRequestsCollection.doc(taskRequestId).get();
-  const taskRequestData = taskRequestSnapshot.data();
+  try {
+    const taskRequestSnapshot = await taskRequestsCollection.doc(taskRequestId).get();
+    const taskRequestData = taskRequestSnapshot.data();
 
-  if (taskRequestData) {
-    taskRequestData.id = taskRequestSnapshot.id;
-    taskRequestData.url = new URL(`/taskRequests/${taskRequestData.id}`, config.get("services.rdsUi.baseUrl"));
+    if (taskRequestData) {
+      taskRequestData.id = taskRequestSnapshot.id;
+      taskRequestData.url = new URL(`/taskRequests/${taskRequestData.id}`, config.get("services.rdsUi.baseUrl"));
+    }
+    return {
+      taskRequestData,
+      taskRequestExists: true,
+    };
+  } catch (err) {
+    logger.error("Error in updating task", err);
   }
-  return taskRequestData;
+
+  return {
+    taskRequestExists: false,
+  };
 };
 
 /**