Merge pull request #1070 from Real-Dev-Squad/task-dependency-v2

Task dependency

Author: bhtibrewal

controllers/tasks.js

@@ -6,6 +6,7 @@ const { addOrUpdate, getRdsUserInfoByGitHubUsername } = require("../models/users
 const { OLD_ACTIVE, OLD_BLOCKED, OLD_PENDING } = TASK_STATUS_OLD;
 const { IN_PROGRESS, BLOCKED, SMOKE_TESTING, ASSIGNED } = TASK_STATUS;
 const { INTERNAL_SERVER_ERROR, SOMETHING_WENT_WRONG } = require("../constants/errorMessages");
+const dependencyModel = require("../models/tasks");
 /**
  * Creates new task
  *
@@ -16,17 +17,25 @@ const { INTERNAL_SERVER_ERROR, SOMETHING_WENT_WRONG } = require("../constants/er
 const addNewTask = async (req, res) => {
   try {
     const { id: createdBy } = req.userData;
+    const dependsOn = req.body.dependsOn;
     const body = {
       ...req.body,
       createdBy,
     };
-
-    const task = await tasks.updateTask(body);
-
+    delete body.dependsOn;
+    const { taskId, taskDetails } = await tasks.updateTask(body);
+    const data = {
+      taskId,
+      dependsOn,
+    };
+    const taskDependency = dependsOn && (await dependencyModel.addDependency(data));
     return res.json({
       message: "Task created successfully!",
-      task: task.taskDetails,
-      id: task.taskId,
+      task: {
+        ...taskDetails,
+        ...(taskDependency && { dependsOn: taskDependency }),
+        id: taskId,
+      },
     });
   } catch (err) {
     logger.error(`Error while creating new task: ${err}`);

models/tasks.js

@@ -1,6 +1,7 @@
 const firestore = require("../utils/firestore");
 const tasksModel = firestore.collection("tasks");
 const ItemModel = firestore.collection("itemTags");
+const dependencyModel = firestore.collection("taskDependencies");
 const userUtils = require("../utils/users");
 const { fromFirestoreData, toFirestoreData, buildTasks } = require("../utils/tasks");
 const { TASK_TYPE, TASK_STATUS, TASK_STATUS_OLD } = require("../constants/tasks");
@@ -32,13 +33,34 @@ const updateTask = async (taskData, taskId = null) => {
       taskId: taskInfo.id,
       taskDetails: await fromFirestoreData(taskData),
     };
-
     return result;
   } catch (err) {
     logger.error("Error in updating task", err);
     throw err;
   }
 };
+const addDependency = async (data) => {
+  try {
+    const { taskId, dependsOn } = data;
+    const batch = firestore.batch();
+    if (dependsOn.length > 500) {
+      throw new Error("Error cannot add more than 500 taskId");
+    }
+    for (const dependsId of dependsOn) {
+      const taskDependOn = {
+        taskId,
+        dependsId,
+      };
+      const docid = dependencyModel.doc();
+      batch.set(docid, taskDependOn);
+    }
+    await batch.commit();
+    return data.dependsOn;
+  } catch (err) {
+    logger.error("Error in creating dependency");
+    throw err;
+  }
+};
 
 /**
  * Fetch all tasks
@@ -352,5 +374,6 @@ module.exports = {
   fetchSelfTask,
   fetchSkillLevelTask,
   overdueTasks,
+  addDependency,
   fetchTaskByIssueId,
 };

test/integration/tasks.test.js

@@ -98,6 +98,7 @@ describe("Tasks", function () {
           lossRate: { [DINERO]: 1 },
           assignee: appOwner.username,
           participants: [],
+          dependsOn: [],
         })
         .end((err, res) => {
           if (err) {
@@ -106,11 +107,12 @@ describe("Tasks", function () {
           expect(res).to.have.status(200);
           expect(res.body).to.be.a("object");
           expect(res.body.message).to.equal("Task created successfully!");
-          expect(res.body.id).to.be.a("string");
           expect(res.body.task).to.be.a("object");
+          expect(res.body.task.id).to.be.a("string");
           expect(res.body.task.createdBy).to.equal(appOwner.username);
           expect(res.body.task.assignee).to.equal(appOwner.username);
           expect(res.body.task.participants).to.be.a("array");
+          expect(res.body.task.dependsOn).to.be.a("array");
           return done();
         });
     });

test/unit/models/tasks.test.js

@@ -10,6 +10,9 @@ const { expect } = chai;
 const cleanDb = require("../../utils/cleanDb");
 const tasksData = require("../../fixtures/tasks/tasks")();
 const tasks = require("../../../models/tasks");
+const { addDependency } = require("../../../models/tasks");
+const firestore = require("../../../utils/firestore");
+const dependencyModel = firestore.collection("TaskDependencies");
 
 describe("tasks", function () {
   afterEach(async function () {
@@ -40,4 +43,31 @@ describe("tasks", function () {
       });
     });
   });
+
+  describe("addDependency", function () {
+    it("should add dependencies to firestore and return dependsOn array", async function () {
+      const data = {
+        taskId: "taskId1",
+        dependsOn: ["taskId2", "taskId3"],
+      };
+      const result = await addDependency(data);
+      expect(result).to.deep.equal(data.dependsOn);
+    });
+
+    it("should throw an error if there is an error while creating dependencies", async function () {
+      const data = {
+        taskId: "taskId1",
+        dependsOn: ["taskId2", "taskId3"],
+      };
+      const expectedError = new Error("test error");
+      dependencyModel.doc = () => {
+        throw expectedError;
+      };
+      try {
+        await addDependency(data);
+      } catch (err) {
+        expect(err).to.deep.equal(expectedError);
+      }
+    });
+  });
 });