fix: Add changes under dev flag and fix failing tests

Real-Dev-Squad · Jan 9, 2025 · f5bb6a0 · f5bb6a0
1 parent 51e56a2
commit f5bb6a0
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/models/requests.ts b/models/requests.ts
@@ -71,6 +71,8 @@ export const updateRequest = async (id: string, body: any, lastModifiedBy: strin
 
 export const getRequests = async (query: any) => {
   let { id, type, requestedBy, state, prev, next, page, size = SIZE } = query;
+  const dev = query.dev === "true";
+
   size = parseInt(size);
   page = parseInt(page);
   try {
@@ -86,11 +88,15 @@ export const getRequests = async (query: any) => {
         ...requestDoc.data(),
       };
     }
-
-    if (requestedBy) {
+
+    if(requestedBy && dev){
+      requestQuery = requestQuery.where("requestedBy", "==", requestedBy);
+    }
+    else if (requestedBy) {
       const requestedByUserId = await getUserId(requestedBy);
-      requestQuery = requestQuery.where("requestedBy", "in", [requestedByUserId, requestedBy]);
+      requestQuery = requestQuery.where("requestedBy", "==", requestedByUserId);
     }
+
     if (type) {
       requestQuery = requestQuery.where("type", "==", type);
     }

diff --git a/test/integration/onboardingExtension.test.ts b/test/integration/onboardingExtension.test.ts
@@ -327,7 +327,7 @@ describe("/requests Onboarding Extension", () => {
         it("should fetch onboarding extension request by requestedBy field", (done) =>  {
             requestsQuery.createRequest({ type: REQUEST_TYPE.ONBOARDING, requestedBy: username });
             chai.request(app)
-            .get(`${getEndpoint}?requestedBy=${username}&type=ONBOARDING`)
+            .get(`${getEndpoint}?requestedBy=${username}&type=ONBOARDING&dev=true`)
             .end((err, res) => {
                 if (err) return done(err);
                 expect(res.statusCode).to.equal(200);

diff --git a/test/unit/models/requests.test.ts b/test/unit/models/requests.test.ts
@@ -130,7 +130,7 @@ describe("models/oooRequests", () => {
     it("Should return a list of all the requests by specific user ", async () => {
       const oooRequestBodyData = { ...createOooRequests, requestedBy: testUserId };
       await createRequest(oooRequestBodyData);
-      const query = { dev: "true", requestedBy: userData[16].username };
+      const query = { requestedBy: userData[16].username };
       const oooRequestData = await getRequests(query);
       expect(oooRequestData.allRequests).to.have.lengthOf(1);
       expect(oooRequestData.allRequests[0].requestedBy).to.be.equal(testUserId);