Merge pull request #2466 from Real-Dev-Squad/feature/user-ooo-create-requests

refactor: OOO request schema for requestedBy and userID field

Author: RishiChaubey31

controllers/oooRequests.ts

@@ -65,9 +65,9 @@ export const createOooRequestController = async (
     }
 
     const latestOooRequest: OooStatusRequest = await getRequestByKeyValues({
-        userId,
-        type: REQUEST_TYPE.OOO,
-        status: REQUEST_STATE.PENDING,
+      requestedBy: userId,
+      type: REQUEST_TYPE.OOO,
+      status: REQUEST_STATE.PENDING,
     });
 
     if (latestOooRequest) {

services/oooRequest.ts

@@ -66,8 +66,7 @@ export const createOooRequest = async (
             from: body.from,
             until: body.until,
             type: body.type,
-            requestedBy: username,
-            userId,
+            requestedBy: userId,
             reason: body.reason,
             comment: null,
             status: REQUEST_STATE.PENDING,

test/fixtures/oooRequest/oooRequest.ts

@@ -27,8 +27,7 @@ export const createdOOORequest = {
   reason: validOooStatusRequests.reason,
   status: "PENDING",
   lastModifiedBy: null,
-  requestedBy: "suraj-maity-1",
-  userId: "jCqqOYCnm93mcmaYuSsQ",
+  requestedBy: "jCqqOYCnm93mcmaYuSsQ",
   comment: null
 };
 

test/integration/requests.test.ts

@@ -188,11 +188,10 @@ describe("/requests OOO", function () {
           expect(res.body).to.not.have.property("data");
 
           await requestsQuery.getRequestByKeyValues({
-            userId: testUserId,
+            requestedBy: testUserId,
             type: REQUEST_TYPE.OOO,
             status: REQUEST_STATE.PENDING
           }).then((request) => {
-            expect(request).to.not.be.null;
             expect(request.reason).to.equal(validOooStatusRequests.reason);
             done();
           }).catch(done);

test/unit/services/oooRequest.test.ts

@@ -95,8 +95,7 @@ describe("Test OOO Request Service", function() {
             expect(response).to.deep.include({
                 ...createdOOORequest,
                 id: response.id,
-                requestedBy:testUserName,
-                userId: testUserId
+                requestedBy: testUserId
             });
         });