adjust archived filter

Author: LieutenantRoger

src/api/app-constants.js

@@ -25,6 +25,8 @@ const MY_GIGS_JOB_STATUS = {
   CLIENT_REJECTED_INTERVIEW: "client rejected - interview",
   CLIENT_REJECTED_SCREENING: "client rejected - screening",
   JOB_CLOSED: "job-closed",
+  WITHDRAWN: "withdrawn",
+  WITHDRAWN_PRESCREEN: "withdrawn-prescreen",
 };
 
 const JOB_APPLICATION_STATUS_MAPPER = {
@@ -45,19 +47,14 @@ const JOB_APPLICATION_STATUS_MAPPER = {
   },
   archived_jobs: {
     statuses: [
-      MY_GIGS_JOB_STATUS.APPLIED,
-      MY_GIGS_JOB_STATUS.SKILLS_TEST,
-      MY_GIGS_JOB_STATUS.PHONE_SCREEN,
-      MY_GIGS_JOB_STATUS.SCREEN_PASS,
-      MY_GIGS_JOB_STATUS.INTERVIEW,
-      MY_GIGS_JOB_STATUS.SELECTED,
-      MY_GIGS_JOB_STATUS.OFFERED,
       MY_GIGS_JOB_STATUS.JOB_CLOSED,
       MY_GIGS_JOB_STATUS.REJECTED_OTHER,
       MY_GIGS_JOB_STATUS.REJECTED_PRE_SCREEN,
       MY_GIGS_JOB_STATUS.CLIENT_REJECTED_INTERVIEW,
       MY_GIGS_JOB_STATUS.CLIENT_REJECTED_SCREENING,
       MY_GIGS_JOB_STATUS.PLACED,
+      MY_GIGS_JOB_STATUS.WITHDRAWN,
+      MY_GIGS_JOB_STATUS.WITHDRAWN_PRESCREEN,
     ],
   },
 };

src/api/common/helper.js

@@ -293,6 +293,7 @@ async function getJobCandidates(criteria) {
 }
 
 /**
+ * Process placed job candidate to calculate the completed status
  *
  * @param {*} jobCandidates
  * @param {*} userId
@@ -345,51 +346,6 @@ async function handlePlacedJobCandidates(jobCandidates, userId) {
   return;
 }
 
-function handleArchivedJobCandidates(jobCandidates, jobs) {
-  if (
-    !jobCandidates ||
-    jobCandidates.length == 0 ||
-    !jobs ||
-    jobs.length == 0
-  ) {
-    return;
-  }
-  // find at least one placed jobCandidate whose job is having hoursPerWeek >= 20
-  // if true, assign all open application with a withdraw status = true
-  // else, assign all open application with a withdraw status = false
-  let assignWithDraw = false;
-  const jcs = jobCandidates.filter(
-    (item) =>
-      item.status == constants.MY_GIGS_JOB_STATUS.PLACED && !item.completed
-  );
-  _.each(jcs, (jc) => {
-    const job = _.find(jobs, ["id", jc.jobId]);
-    if (job.hoursPerWeek >= constants.MIN_HOUR_PER_WEEK_TO_WITHDRAW) {
-      assignWithDraw = true;
-      return false;
-    }
-  });
-
-  const openJobs = [
-    constants.MY_GIGS_JOB_STATUS.APPLIED,
-    constants.MY_GIGS_JOB_STATUS.SKILLS_TEST,
-    constants.MY_GIGS_JOB_STATUS.PHONE_SCREEN,
-    constants.MY_GIGS_JOB_STATUS.SCREEN_PASS,
-    constants.MY_GIGS_JOB_STATUS.INTERVIEW,
-    constants.MY_GIGS_JOB_STATUS.SELECTED,
-    constants.MY_GIGS_JOB_STATUS.OFFERED,
-  ];
-  _.each(jobCandidates, (jobCandidate) => {
-    if (openJobs.indexOf(jobCandidate.status) >= 0) {
-      jobCandidate.withdraw = assignWithDraw;
-    } else if (jobCandidate.status == constants.MY_GIGS_JOB_STATUS.PLACED) {
-      jobCandidate.withdraw = false;
-    } else {
-      jobCandidate.withdraw = true;
-    }
-  });
-}
-
 /**
  * Return jobs by given criteria
  * @param {string} criteria the search criteria
@@ -575,7 +531,6 @@ module.exports = {
   getCurrentUserDetails,
   getJobCandidates,
   handlePlacedJobCandidates,
-  handleArchivedJobCandidates,
   getJobs,
   getMember,
   getMemberTraits,

src/api/services/JobApplicationService.js

@@ -53,27 +53,17 @@ async function getMyJobApplications(currentUser, criteria) {
   }
   let jcResult = jobCandidates.result;
   // handle placed status for completed_jobs, archived_jobs query
-  if (status && status != "open_jobs") {
+  if (status && status == "completed_jobs") {
     await helper.handlePlacedJobCandidates(jobCandidates.result, userId);
-    if (status == "completed_jobs") {
-      jcResult = jobCandidates.result.filter(
-        (item) => item.status == "placed" && item.completed
-      );
-    }
+    jcResult = jobCandidates.result.filter(
+      (item) => item.status == "placed" && item.completed
+    );
   }
 
   const jobIds = _.map(jcResult, "jobId");
   // get jobs of current user by calling taas-api
   const { result: jobs } = await helper.getJobs({ jobIds, page: 1, perPage });
 
-  if (status && status == "archived_jobs") {
-    jcResult = jobCandidates.result.filter(
-      (item) =>
-        item.status != "placed" || (item.status == "placed" && !item.completed)
-    );
-    helper.handleArchivedJobCandidates(jcResult, jobs);
-    jcResult = jcResult.filter((item) => item.withdraw);
-  }
   // apply desired structure
   const jobApplications = _.map(jcResult, (jobCandidate) => {
     const job = _.find(jobs, ["id", jobCandidate.jobId]);