change task res.json

Author: vinit717

controllers/tasks.js

@@ -29,11 +29,14 @@ const addNewTask = async (req, res) => {
       dependsOn,
     };
     const taskDependency = await dependencyModel.addDependency(data);
+    const task = {
+      ...taskDetails,
+      dependsOn: taskDependency,
+      id: taskId,
+    };
     return res.json({
       message: "Task created successfully!",
-      task: taskDetails,
-      id: taskId,
-      dependsOn: taskDependency,
+      task,
     });
   } catch (err) {
     logger.error(`Error while creating new task: ${err}`);

middlewares/validators/tasks.js

@@ -23,7 +23,7 @@ const createTask = async (req, res, next) => {
       assignee: joi.string().optional(),
       priority: joi.string().required(),
       percentCompleted: joi.number().required(),
-      dependsOn: joi.array().items().optional(),
+      dependsOn: joi.array().items(joi.string()).optional(),
       participants: joi.array().items(joi.string()).optional(),
       category: joi.string().optional(),
       level: joi.number().optional(),
@@ -84,7 +84,7 @@ const updateTask = async (req, res, next) => {
         .optional(),
       assignee: joi.string().optional(),
       percentCompleted: joi.number().optional(),
-      dependsOn: joi.array().items().optional(),
+      dependsOn: joi.array().items(joi.string()).optional(),
       participants: joi.array().items(joi.string()).optional(),
       completionAward: joi
         .object()

models/tasks.js

@@ -1,8 +1,8 @@
 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 dependencyModel = firestore.collection("TaskDependencies");
 const { fromFirestoreData, toFirestoreData, buildTasks } = require("../utils/tasks");
 const { TASK_TYPE, TASK_STATUS, TASK_STATUS_OLD } = require("../constants/tasks");
 const { IN_PROGRESS, BLOCKED, SMOKE_TESTING, COMPLETED } = TASK_STATUS;
@@ -67,7 +67,8 @@ const addDependency = async (data) => {
 const fetchTasks = async () => {
   try {
     const tasksSnapshot = await tasksModel.get();
-    const tasks = buildTasks(tasksSnapshot);
+    const dependencySnapshot = await dependencyModel.get();
+    const tasks = buildTasks(tasksSnapshot, dependencySnapshot);
     const promises = tasks.map(async (task) => fromFirestoreData(task));
     const updatedTasks = await Promise.all(promises);
     const taskList = updatedTasks.map((task) => {