fix: add support to fetch onboarding extension by requestedBy field

Real-Dev-Squad · Jan 2, 2025 · b7170b8 · b7170b8
1 parent 8101a05
commit b7170b8
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/constants/requests.ts b/constants/requests.ts
@@ -15,6 +15,7 @@ export const REQUEST_TYPE = {
   EXTENSION: "EXTENSION",
   TASK: "TASK",
   ALL: "ALL",
+  ONBOARDING: "ONBOARDING"
 };
 
 export const REQUEST_LOG_TYPE = {

diff --git a/middlewares/validators/requests.ts b/middlewares/validators/requests.ts
@@ -79,7 +79,7 @@ export const getRequestsMiddleware = async (req: OooRequestCreateRequest, res: O
     id: joi.string().optional(),
     type: joi
       .string()
-      .valid(REQUEST_TYPE.OOO, REQUEST_TYPE.EXTENSION, REQUEST_TYPE.TASK, REQUEST_TYPE.ALL)
+      .valid(REQUEST_TYPE.OOO, REQUEST_TYPE.EXTENSION, REQUEST_TYPE.TASK, REQUEST_TYPE.ALL, REQUEST_TYPE.ONBOARDING)
       .optional(),
     requestedBy: joi.string().insensitive().optional(),
     state: joi

diff --git a/models/requests.ts b/models/requests.ts
@@ -89,7 +89,7 @@ export const getRequests = async (query: any) => {
 
     if (requestedBy) {
       const requestedByUserId = await getUserId(requestedBy);
-      requestQuery = requestQuery.where("requestedBy", "==", requestedByUserId);
+      requestQuery = requestQuery.where("requestedBy", "in", [requestedByUserId, requestedBy]);
     }
     if (type) {
       requestQuery = requestQuery.where("type", "==", type);

diff --git a/test/integration/requests.test.ts b/test/integration/requests.test.ts
@@ -356,7 +356,7 @@ describe("/requests OOO", function () {
         .end(function (err, res) {
           expect(res).to.have.status(400);
           expect(res.body.error).to.equal("Bad Request");
-          expect(res.body.message).to.equal('"type" must be one of [OOO, EXTENSION, TASK, ALL]');
+          expect(res.body.message).to.equal('"type" must be one of [OOO, EXTENSION, TASK, ALL, ONBOARDING]');
           done();
         });
     });