add active jobs

Author: LieutenantRoger

src/api/app-constants.js

@@ -30,6 +30,9 @@ const MY_GIGS_JOB_STATUS = {
 };
 
 const JOB_APPLICATION_STATUS_MAPPER = {
+  active_jobs: {
+    statuses: [MY_GIGS_JOB_STATUS.PLACED],
+  },
   open_jobs: {
     statuses: [
       MY_GIGS_JOB_STATUS.APPLIED,
@@ -39,7 +42,6 @@ const JOB_APPLICATION_STATUS_MAPPER = {
       MY_GIGS_JOB_STATUS.INTERVIEW,
       MY_GIGS_JOB_STATUS.SELECTED,
       MY_GIGS_JOB_STATUS.OFFERED,
-      MY_GIGS_JOB_STATUS.PLACED,
     ],
   },
   completed_jobs: {

src/api/docs/swagger.yaml

@@ -54,7 +54,7 @@ paths:
           required: false
           schema:
             type: string
-            enum: ["open_jobs", "completed_jobs", "archived_jobs"]
+            enum: ["active_jobs", "open_jobs", "completed_jobs", "archived_jobs"]
       responses:
         "200":
           description: OK

src/api/services/JobApplicationService.js

@@ -53,14 +53,14 @@ async function getMyJobApplications(currentUser, criteria) {
   }
   let jcResult = jobCandidates.result;
   // handle placed status for completed_jobs, archived_jobs query
-  if (status && status != "archived_jobs") {
+  if (status && (status == "active_jobs" || status == "completed_jobs")) {
     await helper.handlePlacedJobCandidates(jobCandidates.result, userId);
     if (status == "completed_jobs") {
       jcResult = jobCandidates.result.filter(
         (item) => item.status == "completed"
       );
     }
-    if (status == "open_jobs") {
+    if (status == "active_jobs") {
       jcResult = jobCandidates.result.filter(
         (item) => item.status != "completed"
       );
@@ -113,6 +113,7 @@ getMyJobApplications.schema = Joi.object()
         sortBy: Joi.string().valid("id", "status").default("id"),
         sortOrder: Joi.string().valid("desc", "asc").default("desc"),
         status: Joi.string().valid(
+          "active_jobs",
           "open_jobs",
           "completed_jobs",
           "archived_jobs"