Merge pull request #106 from topcoder-platform/PM-5065_handle-approval-filter

PM-5065 - handle approval status filter

Author: vas3a

src/services/ChallengeService.js

@@ -1410,6 +1410,13 @@ async function searchChallenges(currentUser, criteria) {
     });
   }
 
+  // handle approvalStatus
+  if (!_.isNil(criteria.approvalStatus)) {
+    prismaFilter.where.AND.push({
+      approvalStatus: criteria.approvalStatus.toUpperCase(),
+    });
+  }
+
   _.forEach(_.keys(criteria), (key) => {
     if (_.toString(key).indexOf("meta.") > -1) {
       // Parse and use metadata key
@@ -2129,6 +2136,9 @@ searchChallenges.schema = {
       status: Joi.string()
         .valid(..._.values(ChallengeStatusEnum))
         .insensitive(),
+      approvalStatus: Joi.string()
+        .valid(..._.values(CHALLENGE_APPROVAL_STATUS))
+        .insensitive(),
       group: Joi.string(),
       startDateStart: Joi.date(),
       startDateEnd: Joi.date(),

test/unit/ChallengeService.test.js

@@ -1190,6 +1190,16 @@ describe("challenge service unit tests", () => {
       should.equal(result.result[0].name, data.challenge.name);
     });
 
+    it("search challenges by approvalStatus case-insensitively", async () => {
+      const result = await service.searchChallenges(
+        { isMachine: true },
+        { approvalStatus: "approved" },
+      );
+
+      should.equal(result.total > 0, true);
+      should.equal(result.result.every((challenge) => challenge.approvalStatus === "APPROVED"), true);
+    });
+
     it("search challenges successfully 3", async () => {
       const res = await service.searchChallenges(
         { isMachine: true },
@@ -1403,6 +1413,16 @@ describe("challenge service unit tests", () => {
       }
       throw new Error("should not reach here");
     });
+
+    it("search challenges - invalid approvalStatus", async () => {
+      try {
+        await service.searchChallenges({ isMachine: true }, { approvalStatus: "INVALID" });
+      } catch (e) {
+        should.equal(e.message.includes("approvalStatus") && e.message.includes("must be one of"), true);
+        return;
+      }
+      throw new Error("should not reach here");
+    });
   });
 
   describe("update challenge tests", () => {