fix: archived jobs

Author: LieutenantRoger

src/api/common/helper.js

@@ -334,13 +334,11 @@ async function handlePlacedJobCandidates(jobCandidates, userId) {
   // Handle placed job status with RB result
   const rbRes = res.body;
   _.each(rbRes, (rb) => {
-    const jc = jobCandidates.find(
-      (item) => item.userId == rb.userId && item.jobId == rb.jobId
-    );
-    if (jc) {
-      // jc.completed = (new Date(rb.endDate) <= new Date()) && rb.status == 'placed'
-      jc.completed = rb.endDate ? new Date(rb.endDate) <= new Date() : false;
-    }
+    _.each(jobCandidates, (jc) => {
+      if (rb.userId == jc.userId && rb.jobId == jc.userId) {
+        jc.completed = rb.endDate ? new Date(rb.endDate) <= new Date() : false;
+      }
+    });
   });
   return;
 }

src/api/services/JobApplicationService.js

@@ -55,17 +55,22 @@ async function getMyJobApplications(currentUser, criteria) {
   // handle placed status for completed_jobs, archived_jobs query
   if (status && status != "open_jobs") {
     await helper.handlePlacedJobCandidates(jobCandidates.result, userId);
-    jcResult = jobCandidates.result.filter(
-      (item) =>
-        item.status != "placed" || (item.status == "placed" && item.completed)
-    );
+    if (status == "completed_jobs") {
+      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);
   }