Merge branch 'develop' of https://github.com/ravikumar1002/website-backend into feat/github-created-at

Author: ravikumar1002

controllers/tasks.js

@@ -11,6 +11,7 @@ const { transformQuery } = require("../utils/tasks");
 const { getPaginatedLink } = require("../utils/helper");
 const { updateUserStatusOnTaskUpdate, updateStatusOnTaskCompletion } = require("../models/userStatus");
 const dataAccess = require("../services/dataAccessLayer");
+const { parseSearchQuery } = require("../utils/tasks");
 /**
  * Creates new task
  *
@@ -20,9 +21,6 @@ const dataAccess = require("../services/dataAccessLayer");
  */
 const addNewTask = async (req, res) => {
   try {
-    // userStatusFlag is the Feature flag for status update based on task status. This flag is temporary and will be removed once the feature becomes stable.
-    const { userStatusFlag } = req.query;
-    const isUserStatusEnabled = userStatusFlag === "true";
     const { id: createdBy } = req.userData;
     const dependsOn = req.body.dependsOn;
     let userStatusUpdate;
@@ -37,7 +35,7 @@ const addNewTask = async (req, res) => {
       dependsOn,
     };
     const taskDependency = dependsOn && (await dependencyModel.addDependency(data));
-    if (isUserStatusEnabled && req.body.assignee) {
+    if (req.body.assignee) {
       userStatusUpdate = await updateUserStatusOnTaskUpdate(req.body.assignee);
     }
     return res.json({
@@ -128,7 +126,7 @@ const fetchPaginatedTasks = async (query) => {
 
 const fetchTasks = async (req, res) => {
   try {
-    const { dev, status, page, size, prev, next } = req.query;
+    const { dev, status, page, size, prev, next, q: queryString } = req.query;
     const transformedQuery = transformQuery(dev, status, size, page);
 
     if (dev) {
@@ -139,12 +137,39 @@ const fetchTasks = async (req, res) => {
       });
     }
 
+    if (queryString !== undefined) {
+      const searchParams = parseSearchQuery(queryString);
+      if (!searchParams.searchTerm) {
+        return res.status(404).json({
+          message: "No tasks found.",
+          tasks: [],
+        });
+      }
+      const filterTasks = await tasks.fetchTasks(searchParams.searchTerm);
+      const tasksWithRdsAssigneeInfo = await fetchTasksWithRdsAssigneeInfo(filterTasks);
+      if (tasksWithRdsAssigneeInfo.length === 0) {
+        return res.status(404).json({
+          message: "No tasks found.",
+          tasks: [],
+        });
+      }
+      return res.json({
+        message: "Filter tasks returned successfully!",
+        tasks: tasksWithRdsAssigneeInfo,
+      });
+    }
+
     const allTasks = await tasks.fetchTasks();
     const tasksWithRdsAssigneeInfo = await fetchTasksWithRdsAssigneeInfo(allTasks);
-
+    if (tasksWithRdsAssigneeInfo.length === 0) {
+      return res.status(404).json({
+        message: "No tasks found",
+        tasks: [],
+      });
+    }
     return res.json({
       message: "Tasks returned successfully!",
-      tasks: tasksWithRdsAssigneeInfo.length > 0 ? tasksWithRdsAssigneeInfo : [],
+      tasks: tasksWithRdsAssigneeInfo,
     });
   } catch (err) {
     logger.error(`Error while fetching tasks ${err}`);
@@ -241,9 +266,6 @@ const getTask = async (req, res) => {
  */
 const updateTask = async (req, res) => {
   try {
-    // userStatusFlag is the Feature flag for status update based on task status. This flag is temporary and will be removed once the feature becomes stable.
-    const { userStatusFlag } = req.query;
-    const isUserStatusEnabled = userStatusFlag === "true";
     const task = await tasks.fetchTask(req.params.id);
     if (!task.taskData) {
       return res.boom.notFound("Task not found");
@@ -255,15 +277,14 @@ const updateTask = async (req, res) => {
       }
     }
     await tasks.updateTask(req.body, req.params.id);
-    if (isUserStatusEnabled && req.body.assignee) {
+    if (req.body.assignee) {
       // New Assignee Status Update
       await updateUserStatusOnTaskUpdate(req.body.assignee);
       // Old Assignee Status Update if available
       if (task.taskData.assigneeId) {
         await updateStatusOnTaskCompletion(task.taskData.assigneeId);
       }
     }
-
     return res.status(204).send();
   } catch (err) {
     if (err.message.includes("Invalid dependency passed")) {
@@ -283,9 +304,6 @@ const updateTask = async (req, res) => {
  */
 const updateTaskStatus = async (req, res, next) => {
   try {
-    // userStatusFlag is the Feature flag for status update based on task status. This flag is temporary and will be removed once the feature becomes stable.
-    const { userStatusFlag } = req.query;
-    const isUserStatusEnabled = userStatusFlag === "true";
     let userStatusUpdate;
     const taskId = req.params.id;
     const { dev } = req.query;
@@ -346,7 +364,7 @@ const updateTaskStatus = async (req, res, next) => {
       }
     }
 
-    if (isUserStatusEnabled && req.body.status) {
+    if (req.body.status) {
       userStatusUpdate = await updateStatusOnTaskCompletion(userId);
     }
     return res.json({

controllers/tasksRequests.js

@@ -6,8 +6,8 @@ const fetchTaskRequests = async (_, res) => {
   try {
     const data = await taskRequestsModel.fetchTaskRequests();
 
-    if (data || data.length > 0) {
-      res.status(200).json({
+    if (data.length > 0) {
+      return res.status(200).json({
         message: "Task requests returned successfully",
         data,
       });
@@ -23,6 +23,26 @@ const fetchTaskRequests = async (_, res) => {
   }
 };
 
+const fetchTaskRequestById = async (req, res) => {
+  try {
+    const id = req.params.id;
+    const data = await taskRequestsModel.fetchTaskRequestById(id);
+
+    if (!data.taskRequestExists) {
+      return res.status(404).json({
+        message: "Task request not found",
+      });
+    }
+    return res.status(200).json({
+      message: "Task request returned successfully",
+      data: data.taskRequestData,
+    });
+  } catch (err) {
+    logger.error("Error while fetching task requests", err);
+    return res.boom.badImplementation(INTERNAL_SERVER_ERROR);
+  }
+};
+
 const addOrUpdate = async (req, res) => {
   try {
     const { taskId, userId } = req.body;
@@ -81,4 +101,5 @@ module.exports = {
   approveTaskRequest,
   addOrUpdate,
   fetchTaskRequests,
+  fetchTaskRequestById,
 };

middlewares/validators/tasks.js

@@ -164,6 +164,19 @@ const getTasksValidator = async (req, res, next) => {
         })
       ),
     size: joi.number().integer().positive().min(1).max(100).optional(),
+    q: joi
+      .string()
+      .optional()
+      .custom((value, helpers) => {
+        if (value && value.includes(":")) {
+          const [key] = value.split(":");
+          const allowedKeywords = ["searchterm"];
+          if (!allowedKeywords.includes(key.toLowerCase())) {
+            return helpers.error("any.invalid");
+          }
+        }
+        return value;
+      }, "Invalid query format"),
   });
 
   try {

middlewares/validators/user.js

@@ -39,6 +39,14 @@ const updateUser = async (req, res, next) => {
         .valid(...Object.values(USER_STATUS))
         .optional(),
       discordId: joi.string().optional(),
+      roles: joi.object().keys({
+        archived: joi.boolean().required(),
+        in_discord: joi.boolean().required(),
+        developer: joi.boolean().optional(),
+        designer: joi.boolean().optional(),
+        maven: joi.boolean().optional(),
+        productmanager: joi.boolean().optional(),
+      }),
     });
 
   try {

middlewares/validators/userStatus.js

@@ -3,14 +3,7 @@ const { userState, CANCEL_OOO } = require("../../constants/userStatus");
 const threeDaysInMilliseconds = 172800000;
 
 const validateUserStatusData = async (todaysTime, req, res, next) => {
-  // userStatusFlag is the Feature flag for status update based on task status. This flag is temporary and will be removed once the feature becomes stable.
-  const { userStatusFlag } = req.query;
-  const isUserStatusEnabled = userStatusFlag === "true";
-  let validUserStates = [userState.OOO, userState.ONBOARDING, userState.IDLE, userState.ACTIVE];
-
-  if (isUserStatusEnabled) {
-    validUserStates = [userState.OOO, userState.ONBOARDING];
-  }
+  const validUserStates = [userState.OOO, userState.ONBOARDING];
 
   const statusSchema = Joi.object({
     currentStatus: Joi.object().keys({

models/taskRequests.js

@@ -13,32 +13,66 @@ 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();
-    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;
 };
 
+/**
+ * Fetches task request by id
+ *
+ * @param taskRequestId { string }: id of task request
+ * @return Promise<{taskRequest: Object}>
+ */
+const fetchTaskRequestById = async (taskRequestId) => {
+  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"));
+    }
+    return {
+      taskRequestData,
+      taskRequestExists: true,
+    };
+  } catch (err) {
+    logger.error("Error in updating task", err);
+  }
+
+  return {
+    taskRequestExists: false,
+  };
+};
+
 /**
  * Creates a task request
  *
@@ -73,11 +107,12 @@ const addOrUpdate = async (taskId, userId) => {
       taskId,
     };
 
-    await taskRequestsCollection.add(newTaskRequest);
+    const newTaskRequestRef = await taskRequestsCollection.add(newTaskRequest);
 
     return {
       isCreate: true,
       taskRequest: newTaskRequest,
+      id: newTaskRequestRef.id,
     };
   } catch (err) {
     logger.error("Error in updating task", err);
@@ -117,6 +152,7 @@ const approveTaskRequest = async (taskRequestId, user) => {
 
 module.exports = {
   fetchTaskRequests,
+  fetchTaskRequestById,
   addOrUpdate,
   approveTaskRequest,
 };

models/tasks.js

@@ -96,10 +96,14 @@ const addDependency = async (data) => {
  * @return {Promise<tasks|Array>}
  */
 
-const getBuiltTasks = async (tasksSnapshot) => {
+const getBuiltTasks = async (tasksSnapshot, searchTerm) => {
   const tasks = buildTasks(tasksSnapshot);
   const promises = tasks.map(async (task) => fromFirestoreData(task));
-  const updatedTasks = await Promise.all(promises);
+  let updatedTasks = await Promise.all(promises);
+
+  if (searchTerm) {
+    updatedTasks = updatedTasks.filter((task) => task.title.toLowerCase().includes(searchTerm.toLowerCase()));
+  }
   const taskPromises = updatedTasks.map(async (task) => {
     task.status = TASK_STATUS[task.status.toUpperCase()] || task.status;
     const taskId = task.id;
@@ -159,10 +163,10 @@ const fetchPaginatedTasks = async ({ status = "", size = TASK_SIZE, page, next,
   }
 };
 
-const fetchTasks = async () => {
+const fetchTasks = async (searchTerm) => {
   try {
     const tasksSnapshot = await tasksModel.get();
-    const taskList = await getBuiltTasks(tasksSnapshot);
+    const taskList = await getBuiltTasks(tasksSnapshot, searchTerm);
     return taskList;
   } catch (err) {
     logger.error("error getting tasks", err);
@@ -469,4 +473,5 @@ module.exports = {
   addDependency,
   fetchTaskByIssueId,
   fetchPaginatedTasks,
+  getBuiltTasks,
 };

routes/taskRequests.js

@@ -8,6 +8,7 @@ const { cacheResponse } = require("../utils/cache");
 const { validateUser } = require("../middlewares/taskRequests");
 
 router.get("/", authenticate, authorizeRoles([SUPERUSER]), cacheResponse(), taskRequests.fetchTaskRequests);
+router.get("/:id", authenticate, authorizeRoles([SUPERUSER]), taskRequests.fetchTaskRequestById);
 router.post("/addOrUpdate", authenticate, validateUser, taskRequests.addOrUpdate);
 router.patch("/approve", authenticate, authorizeRoles([SUPERUSER]), validateUser, taskRequests.approveTaskRequest);
 

routes/users.js

@@ -19,7 +19,7 @@ router.get("/self", authenticate, users.getSelfDetails);
 router.get("/isUsernameAvailable/:username", authenticate, users.getUsernameAvailabilty);
 router.get("/chaincode", authenticate, users.generateChaincode);
 router.get("/search", userValidator.validateUserQueryParams, users.filterUsers);
-router.patch("/remove-tokens", authenticate, authorizeRoles([SUPERUSER]), users.removeTokens);
+router.post("/tokens", authenticate, authorizeRoles([SUPERUSER]), users.removeTokens);
 
 router.get("/:username", users.getUser);
 router.get("/:userId/intro", authenticate, authorizeRoles([SUPERUSER]), users.getUserIntro);