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

Dev to main sync

Author: prakashchoudhary07

controllers/tasks.js

@@ -12,6 +12,7 @@ const { getPaginatedLink } = require("../utils/helper");
 const { updateUserStatusOnTaskUpdate, updateStatusOnTaskCompletion } = require("../models/userStatus");
 const dataAccess = require("../services/dataAccessLayer");
 const { parseSearchQuery } = require("../utils/tasks");
+const { addTaskCreatedAtAndUpdatedAtFields } = require("../services/tasks");
 /**
  * Creates new task
  *
@@ -24,9 +25,12 @@ const addNewTask = async (req, res) => {
     const { id: createdBy } = req.userData;
     const dependsOn = req.body.dependsOn;
     let userStatusUpdate;
+    const timeStamp = Math.round(Date.now() / 1000);
     const body = {
       ...req.body,
       createdBy,
+      createdAt: timeStamp,
+      updatedAt: timeStamp,
     };
     delete body.dependsOn;
     const { taskId, taskDetails } = await tasks.updateTask(body);
@@ -270,7 +274,7 @@ const updateTask = async (req, res) => {
     if (!task.taskData) {
       return res.boom.notFound("Task not found");
     }
-    const requestData = { ...req.body };
+    const requestData = { ...req.body, updatedAt: Math.round(Date.now() / 1000) };
     if (requestData?.assignee) {
       const user = await dataAccess.retrieveUsers({ username: requestData.assignee });
       if (!user.userExists) {
@@ -310,8 +314,10 @@ const updateTask = async (req, res) => {
  */
 const updateTaskStatus = async (req, res, next) => {
   try {
+    req.body.updatedAt = Math.round(new Date().getTime() / 1000);
     let userStatusUpdate;
     const taskId = req.params.id;
+    const { userStatusFlag } = req.query;
     const { id: userId, username } = req.userData;
     const task = await tasks.fetchSelfTask(taskId, userId);
 
@@ -320,18 +326,34 @@ const updateTaskStatus = async (req, res, next) => {
     if (task.taskData.status === TASK_STATUS.VERIFIED || req.body.status === TASK_STATUS.MERGED)
       return res.boom.forbidden("Status cannot be updated. Please contact admin.");
 
-    if (task.taskData.status === TASK_STATUS.DONE && req.body.percentCompleted < 100) {
-      if (req.body.status === TASK_STATUS.DONE || !req.body.status) {
-        return res.boom.badRequest("Task percentCompleted can't updated as status is DONE");
+    if (userStatusFlag) {
+      if (task.taskData.status === TASK_STATUS.DONE && req.body.percentCompleted < 100) {
+        if (req.body.status === TASK_STATUS.DONE || !req.body.status) {
+          return res.boom.badRequest("Task percentCompleted can't updated as status is DONE");
+        }
+      }
+
+      if (
+        (req.body.status === TASK_STATUS.DONE || req.body.status === TASK_STATUS.VERIFIED) &&
+        task.taskData.percentCompleted !== 100
+      ) {
+        if (req.body.percentCompleted !== 100) {
+          return res.boom.badRequest("Status cannot be updated. Task is not done yet");
+        }
       }
     }
 
+    if (task.taskData.status === TASK_STATUS.COMPLETED && req.body.percentCompleted < 100) {
+      if (req.body.status === TASK_STATUS.COMPLETED || !req.body.status) {
+        return res.boom.badRequest("Task percentCompleted can't updated as status is COMPLETED");
+      }
+    }
     if (
-      (req.body.status === TASK_STATUS.DONE || req.body.status === TASK_STATUS.VERIFIED) &&
+      (req.body.status === TASK_STATUS.COMPLETED || req.body.status === TASK_STATUS.VERIFIED) &&
       task.taskData.percentCompleted !== 100
     ) {
       if (req.body.percentCompleted !== 100) {
-        return res.boom.badRequest("Status cannot be updated. Task is not done yet");
+        return res.boom.badRequest("Status cannot be updated. Task is not completed yet");
       }
     }
 
@@ -428,6 +450,11 @@ const assignTask = async (req, res) => {
 
 const updateStatus = async (req, res) => {
   try {
+    const { action, field } = req.body;
+    if (action === "ADD" && field === "CREATED_AT+UPDATED_AT") {
+      const updateStats = await addTaskCreatedAtAndUpdatedAtFields();
+      return res.json(updateStats);
+    }
     const response = await tasks.updateTaskStatus();
     return res.status(200).json(response);
   } catch (error) {

services/tasks.js

@@ -1,5 +1,8 @@
 const firestore = require("../utils/firestore");
 const tasksModel = firestore.collection("tasks");
+const { chunks } = require("../utils/array");
+const { DOCUMENT_WRITE_SIZE: FIRESTORE_BATCH_OPERATIONS_LIMIT } = require("../constants/constants");
+
 const updateTaskStatusToDone = async (tasksData) => {
   const batch = firestore.batch();
   const tasksBatch = [];
@@ -26,6 +29,61 @@ const updateTaskStatusToDone = async (tasksData) => {
     return { ...summary };
   }
 };
+
+const addTaskCreatedAtAndUpdatedAtFields = async () => {
+  const operationStats = {
+    totalTasks: 0,
+    totalTaskToBeUpdate: 0,
+    totalTasksUpdated: 0,
+    totalFailedTasks: 0,
+    failedTasksIds: [],
+  };
+  const updatedTasks = [];
+  const tasks = await tasksModel.get();
+
+  if (tasks.empty) {
+    return operationStats;
+  }
+
+  operationStats.totalTasks = tasks.size;
+
+  tasks.forEach((task) => {
+    const taskData = task.data();
+    let didAddField = false;
+    if (!taskData.createdAt) {
+      taskData.createdAt = task.createTime.seconds;
+      didAddField = true;
+    }
+    if (!taskData.updatedAt) {
+      taskData.updatedAt = task.updateTime.seconds;
+      didAddField = true;
+    }
+    if (didAddField) {
+      updatedTasks.push({ id: task.id, data: taskData });
+    }
+  });
+
+  operationStats.totalTaskToBeUpdate = updatedTasks.length;
+
+  const chunkedTasks = chunks(updatedTasks, FIRESTORE_BATCH_OPERATIONS_LIMIT);
+
+  chunkedTasks.forEach((tasks) => {
+    const batch = firestore.batch();
+    tasks.forEach(({ id, data }) => {
+      batch.update(tasksModel.doc(id), data);
+    });
+    try {
+      batch.commit();
+      operationStats.totalTasksUpdated += tasks.length;
+    } catch (error) {
+      operationStats.totalFailedTasks += tasks.length;
+      tasks.forEach(({ id }) => operationStats.failedTasksIds.push(id));
+    }
+  });
+  return operationStats;
+};
+
 module.exports = {
   updateTaskStatusToDone,
+  addTaskCreatedAtAndUpdatedAtFields,
 };

test/fixtures/tasks/tasks.js

@@ -14,6 +14,8 @@ module.exports = () => {
       type: "feature",
       assignee: "akshay",
       createdBy: "ankush",
+      createdAt: 1644753600,
+      updatedAt: 1644753600,
       status: "IN_PROGRESS",
       percentCompleted: 50,
       endsOn: 1647172800, // 13 march
@@ -25,6 +27,8 @@ module.exports = () => {
       type: "feature",
       assignee: "ankur",
       createdBy: "ankush",
+      createdAt: 1644753600,
+      updatedAt: 1644753600,
       status: "ASSIGNED",
       percentCompleted: 50,
       endsOn: 1647172800, // 13 march
@@ -36,6 +40,8 @@ module.exports = () => {
       type: "feature",
       assignee: "ankur",
       createdBy: "ankush",
+      createdAt: 1644753600,
+      updatedAt: 1644753600,
       status: "BLOCKED",
       percentCompleted: 50,
       endsOn: 1647172800,
@@ -51,6 +57,8 @@ module.exports = () => {
       percentCompleted: 50,
       endsOn: 1650032259,
       startedOn: 1644753600,
+      createdAt: 1644753600,
+      updatedAt: 1644753600,
     },
     {
       title: "Test task",
@@ -67,6 +75,8 @@ module.exports = () => {
       priority: "HIGH",
       isNoteworthy: true,
       assignee: false,
+      createdAt: 1644753600,
+      updatedAt: 1644753600,
     },
     {
       title: "Test task-dependency",
@@ -80,6 +90,8 @@ module.exports = () => {
       lossRate: { [DINERO]: 1 },
       isNoteworthy: true,
       assignee: false,
+      createdAt: 1644753600,
+      updatedAt: 1644753600,
     },
     {
       id: "P86Y1hVrS0zR5ZcVPwLZ",
@@ -102,6 +114,8 @@ module.exports = () => {
       status: "IN_PROGRESS",
       assigneeId: "WbceXEPcohuJ5IxHHecf",
       dependsOn: [],
+      createdAt: 1644753600,
+      updatedAt: 1644753600,
     },
     {
       id: "P86Y1fsvS0zR5ZcVPwLZ",
@@ -123,6 +137,8 @@ module.exports = () => {
       title: "Undefined status",
       assigneeId: "WbceXEPcdsuJ5IxHHecf",
       dependsOn: [],
+      createdAt: 1644753600,
+      updatedAt: 1644753600,
     },
   ];
 };