final changes done with testing

Real-Dev-Squad · Dec 2, 2022 · c37f067 · c37f067
1 parent 8b18479
commit c37f067
Show file tree

Hide file tree

Showing 7 changed files with 400 additions and 14 deletions.
diff --git a/controllers/extensionRequests.js b/controllers/extensionRequests.js
@@ -9,7 +9,7 @@ const { getUsername } = require("../utils/users");
  * @param req {Object} - Express request object
  * @param res {Object} - Express response object
  */
-const createETAExtension = async (req, res) => {
+const createTaskExtensionRequest = async (req, res) => {
  try {
  const extensionBody = req.body;
 
@@ -52,6 +52,7 @@ const createETAExtension = async (req, res) => {
  extensionRequestId: extensionRequest.id,
  oldEndsOn: task.endsOn,
  newEndsOn: extensionBody.newEndsOn,
+ assignee: extensionBody.assignee,
  },
  };
 
@@ -80,7 +81,7 @@ const fetchExtensionRequests = async (req, res) => {
 
  return res.json({
  message: "Extension Requests returned successfully!",
- extensionRequestData: allExtensionRequests.length > 0 ? allExtensionRequests : [],
+ extensionRequestData: allExtensionRequests.length ? allExtensionRequests : [],
  });
  } catch (err) {
  logger.error(`Error while fetching Extension Requests ${err}`);
@@ -94,16 +95,17 @@ const getExtensionRequest = async (req, res) => {
  const { extensionRequestData } = await extensionRequestsQuery.fetchExtensionRequest(extensionRequestId);
 
  if (!extensionRequestData) {
- return res.boom.notFound("extension request not found");
+ return res.boom.notFound("Extension Request not found");
  }
- return res.json({ message: "extension request returned successfully", extensionRequestData });
+ extensionRequestData.id = extensionRequestId;
+ return res.json({ message: "Extension Requests returned successfully!", extensionRequestData });
  } catch (err) {
  return res.boom.badImplementation("An internal server error occurred");
  }
 };
 
 module.exports = {
- createETAExtension,
+ createTaskExtensionRequest,
  fetchExtensionRequests,
  getExtensionRequest,
 };
diff --git a/middlewares/validators/extensionRequests.js b/middlewares/validators/extensionRequests.js
@@ -1,8 +1,6 @@
 const joi = require("joi");
 const { ETA_EXTENSION_REQUEST_STATUS } = require("../../constants/extensionRequests");
 
-const ETA_EXTENSION_REQUEST_STATUS_ENUM = Object.values(ETA_EXTENSION_REQUEST_STATUS);
-
 const createExtensionRequest = async (req, res, next) => {
  const schema = joi
  .object()
@@ -14,10 +12,7 @@ const createExtensionRequest = async (req, res, next) => {
  oldEndsOn: joi.number().required(),
  newEndsOn: joi.number().required(),
  reason: joi.string().required(),
- status: joi
- .string()
- .valid(...ETA_EXTENSION_REQUEST_STATUS_ENUM)
- .required(),
+ status: joi.string().valid(ETA_EXTENSION_REQUEST_STATUS.PENDING).required(),
  });
 
  try {

diff --git a/models/extensionRequests.js b/models/extensionRequests.js
@@ -1,6 +1,6 @@
 const firestore = require("../utils/firestore");
 const extensionRequestsModel = firestore.collection("extensionRequests");
-const { buildExtensionRequests, formatExtensionRequest } = require("../utils/extensionRequest");
+const { buildExtensionRequests, formatExtensionRequest } = require("../utils/extensionRequests");
 
 /**
  * Create Extension Request

diff --git a/routes/extensionRequests.js b/routes/extensionRequests.js
@@ -6,7 +6,7 @@ const authorizeRoles = require("../middlewares/authorizeRoles");
 const { SUPERUSER, APPOWNER } = require("../constants/roles");
 const { createExtensionRequest } = require("../middlewares/validators/extensionRequests");
 
-router.post("/", authenticate, createExtensionRequest, extensionRequests.createETAExtension);
+router.post("/", authenticate, createExtensionRequest, extensionRequests.createTaskExtensionRequest);
 router.get("/", authenticate, authorizeRoles([SUPERUSER, APPOWNER]), extensionRequests.fetchExtensionRequests);
 router.get("/:id", authenticate, authorizeRoles([SUPERUSER, APPOWNER]), extensionRequests.getExtensionRequest);
 

diff --git a/routes/index.js b/routes/index.js
@@ -17,6 +17,6 @@ app.use("/trade", require("./trading.js"));
 app.use("/users", require("./users.js"));
 app.use("/profileDiffs", require("./profileDiffs.js"));
 app.use("/wallet", require("./wallets.js"));
-app.use("/extensionRequests", require("./extensionRequest"));
+app.use("/extensionRequests", require("./extensionRequests"));
 
 module.exports = app;