refactor: improve error handling and type safety in oooRequests

- Updated acknowledgeOooRequestController to remove unnecessary return statement.
- Enhanced acknowledgeOooRequestValidator to streamline Joi validation error handling.
- Improved type assertions in updateRequestValidator for better clarity and type safety.
- Refined transformRequestResponse logic to simplify request transformation based on environment conditions.

Author: RishiChaubey31

controllers/oooRequests.ts

@@ -180,6 +180,6 @@ export const acknowledgeOooRequestController = async (
     catch(error){
       logger.error(ERROR_WHILE_ACKNOWLEDGING_REQUEST, error);
       next(error);
-      return res;
+      return;
   }
 };

middlewares/validators/oooRequests.ts

@@ -88,17 +88,15 @@ export const acknowledgeOooRequestValidator = async (
     await paramsSchema.validateAsync(req.params, { abortEarly: false });
     return next();
   } catch (error: unknown) {
-    const isJoiValidationError = (err: unknown): err is joi.ValidationError => {
-      return Boolean(err) && typeof (err as any).isJoi === "boolean" && (err as any).isJoi === true && Array.isArray((err as any).details);
-    };
 
-    if (isJoiValidationError(error)) {
+    if (error instanceof joi.ValidationError) {
       const errorMessages = error.details.map((detail) => detail.message);
       logger.error(`${ERROR_WHILE_ACKNOWLEDGING_REQUEST}: ${errorMessages}`);
       return res.boom.badRequest(errorMessages);
     }
-    const genericMessage = typeof (error as any)?.message === "string" ? (error as any).message : String(error);
-    logger.error(`${ERROR_WHILE_ACKNOWLEDGING_REQUEST}: ${genericMessage}`);
+    
+    const errorMessage = error instanceof Error ? error.message : String(error);
+    logger.error(`${ERROR_WHILE_ACKNOWLEDGING_REQUEST}: ${errorMessage}`);
     return res.boom.badRequest([ERROR_WHILE_ACKNOWLEDGING_REQUEST]);
   }
 };

middlewares/validators/requests.ts

@@ -147,7 +147,7 @@ export const updateRequestValidator = async (
             res as OnboardingExtensionResponse, next);
           break;
       case REQUEST_TYPE.OOO:
-          await acknowledgeOooRequestValidator(req, res as OooRequestResponse, next);
+          await acknowledgeOooRequestValidator(req as AcknowledgeOooRequest, res as OooRequestResponse, next);
           break;
       default:
           return res.boom.badRequest("Invalid type");

services/oooRequest.ts

@@ -153,9 +153,10 @@ export const acknowledgeOooRequest = async (
         throw new NotFound("Request not found");
       }
 
-      const { type, status, from, until, requestedBy } = requestData as OooStatusRequest;
-  
-      await validateOooAcknowledgeRequest(type, status);
+      const { type, from, until, requestedBy } = requestData;
+      const status = 'status' in requestData ? requestData.status : (requestData as oldOooStatusRequest).state;
+  await validateOooAcknowledgeRequest(type, status);
+      
 
       const requestResult = await updateRequest(requestId, body, superUserId, REQUEST_TYPE.OOO);
       if (requestResult.error) {

utils/requests.ts

@@ -75,14 +75,14 @@ export const transformRequestResponse = (allRequests: (OooStatusRequest | oldOoo
       return request;
     }
 
-    if (dev) {
-      return 'status' in request 
-        ? oldOOOSchema(request as OooStatusRequest)
-        : request;
+    if (dev && 'status' in request) {
+      return oldOOOSchema(request as OooStatusRequest);
+    }
+    
+    if (!dev && 'state' in request) {
+      return newOOOSchema(request as oldOooStatusRequest);
     }
 
-    return 'state' in request 
-      ? newOOOSchema(request as oldOooStatusRequest)
-      : request;
+    return request;
   });
 };