feat: acknowledge OOO request

Author: surajmaity1

controllers/oooRequests.ts

@@ -138,18 +138,18 @@ export const acknowledgeOOORequestController = async (
     const requestBody = req.body;
     const userId = req.userData.id;
     const requestId = req.params.id;
-    const isSuperuser = req.userData.roles.super_user === true;
+    const isSuperuser = req.userData.roles.super_user;
 
-    if (isSuperuser === false) {
+    if (!isSuperuser) {
       return res.boom.unauthorized(UNAUTHORIZED_TO_ACKNOWLEDGE_OOO_REQUEST);
     }
 
     try {
 
-      const response = acknowledgeOOORequest(requestId, requestBody, userId);
+      const response = await acknowledgeOOORequest(requestId, requestBody, userId);
 
       return res.status(200).json({
-              message: (await response).message,
+        message: response.message,
       });
     }
     catch(error){

controllers/requests.ts

@@ -123,12 +123,10 @@ export const getRequestsController = async (req: any, res: any) => {
 export const updateRequestBeforeAcknowledgedController = async (req: Request, res: CustomResponse, next: NextFunction) => {
   const type = req.body.type;
 
-  if (type === undefined) {
-      await acknowledgeOOORequestController(req as AcknowledgeOOORequest, res as OooRequestResponse, next);
-      return;
-    }
-
   switch(type){
+    case REQUEST_TYPE.OOO:
+      await acknowledgeOOORequestController(req as AcknowledgeOOORequest, res as OooRequestResponse, next);
+      break;
     case REQUEST_TYPE.ONBOARDING:
       await updateOnboardingExtensionRequestController(req as UpdateOnboardingExtensionRequest, res as OnboardingExtensionResponse);
       break;

middlewares/validators/oooRequests.ts

@@ -58,7 +58,10 @@ export const acknowledgeOOORequestsValidator = async (
       .required()
       .messages({
         "any.only": "status must be APPROVED or REJECTED",
-      })
+      }),
+    type: joi.string().equal(REQUEST_TYPE.OOO).required().messages({
+      "type.any": "type is required",
+    })
   });
 
   try {
@@ -67,6 +70,6 @@ export const acknowledgeOOORequestsValidator = async (
   } catch (error) {
     const errorMessages = error.details.map((detail:any) => detail.message);
     logger.error(`Error while validating request payload : ${errorMessages}`);
-    res.boom.badRequest(errorMessages);
+    return res.boom.badRequest(errorMessages);
   }
 };

middlewares/validators/requests.ts

@@ -125,7 +125,7 @@ export const getRequestsMiddleware = async (req: OooRequestCreateRequest, res: O
 /**
  * Validates update requests based on their type.
  * 
- * @param {UpdateOnboardingExtensionRequest} req - Request object.
+ * @param {UpdateOnboardingExtensionRequest | AcknowledgeOOORequest} req - Request object.
  * @param {CustomResponse} res - Response object.
  * @param {NextFunction} next - Next middleware if valid.
  * @returns {Promise<void>} Resolves or sends errors.
@@ -137,12 +137,12 @@ export const updateRequestValidator = async (
   ): Promise<void> => {
   const type = req.body.type;
 
-  if (type === undefined) {
-    await acknowledgeOOORequestsValidator(req, res as OooRequestResponse, next);
-    return;
-  }
-
   switch (type) {
+      case REQUEST_TYPE.OOO:
+          await acknowledgeOOORequestsValidator(
+            req,
+            res as OooRequestResponse, next);
+          break;
       case REQUEST_TYPE.ONBOARDING:
           await updateOnboardingExtensionRequestValidator(
             req, 

services/oooRequest.ts

@@ -76,7 +76,7 @@ export const acknowledgeOOORequest = async (
 
         const requestData = request.data();
 
-        await validateOOOAcknowledgeRequest(requestId, requestData.type,  requestData.status);
+        await validateOOOAcknowledgeRequest(requestId, requestData.type, requestData.status);
 
         const requestResult = await updateRequest(requestId, body, userId, REQUEST_TYPE.OOO);
 

test/fixtures/oooRequest/oooRequest.ts

@@ -13,8 +13,8 @@ export const createOooStatusRequests = {
 
 export const validOooStatusRequests = {
   type: "OOO",
-  from: Date.now() + 100000,
-  until: Date.now() + 200000,
+  from: Date.now() + 1 * 24 * 60 * 60 * 1000,
+  until: Date.now() + 5 * 24 * 60 * 60 * 1000,
   message: "Out of office for personal reasons.",
   state: REQUEST_STATE.PENDING,
 };

test/integration/onboardingExtension.test.ts

@@ -39,6 +39,7 @@ describe("/requests Onboarding Extension", () => {
         let testUserId: string;
         let testUserIdForInvalidDiscordJoinedDate: string;
         let testUserDiscordIdForInvalidDiscordJoinedDate: string = "54321";
+        let botToken: string;
 
         const testUserDiscordId: string = "654321";
         const extensionRequest = {
@@ -47,15 +48,16 @@ describe("/requests Onboarding Extension", () => {
             requestNumber: 1
         };
         const postEndpoint = "/requests";
-        const botToken = generateToken({name: CLOUDFLARE_WORKER})
         const body: CreateOnboardingExtensionBody = {
             type: REQUEST_TYPE.ONBOARDING,
             numberOfDays: 5,
             reason: "This is the reason",
             userId: testUserDiscordId,
         };
-
+        
         beforeEach(async () => {
+          botToken = generateToken({name: CLOUDFLARE_WORKER});
+
             testUserId = await addUser({
                 ...userData[6], 
                 discordId: testUserDiscordId,