API update finished

Author: dengjun

.circleci/config.yml

@@ -76,7 +76,7 @@ workflows:
           filters:
             branches:
               only:
-                - dev
+                - gigs-filter
 
       # Production builds are exectuted only on tagged commits to the
       # master branch.

src/api/app-constants.js

@@ -11,6 +11,60 @@ const Scopes = {
   ALL_PROFILE: "all:earn-profile",
 };
 
+const MY_GIGS_JOB_STATUS = {
+  APPLIED: "applied",
+  SKILLS_TEST: "skills-test",
+  PHONE_SCREEN: "phone-screen",
+  SCREEN_PASS: "open",
+  INTERVIEW: "interview",
+  SELECTED: "selected",
+  OFFERED: "offered",
+  PLACED: "placed",
+  REJECTED_OTHER: "rejected - other",
+  REJECTED_PRE_SCREEN: "rejected-pre-screen",
+  CLIENT_REJECTED_INTERVIEW: "client rejected - interview",
+  CLIENT_REJECTED_SCREENING: "client rejected - screening",
+  JOB_CLOSED: "job-closed",
+};
+
+const JOB_APPLICATION_STATUS_MAPPER = {
+  open_jobs: {
+    statuses: [
+      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.PLACED,
+    ],
+  },
+  completed_jobs: {
+    statuses: [MY_GIGS_JOB_STATUS.PLACED],
+  },
+  archived_jobs: {
+    statuses: [
+      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,
+    ],
+  },
+};
+
+const MIN_HOUR_PER_WEEK_TO_WITHDRAW = 20;
+
 module.exports = {
   Scopes,
+  MY_GIGS_JOB_STATUS,
+  JOB_APPLICATION_STATUS_MAPPER,
+  MIN_HOUR_PER_WEEK_TO_WITHDRAW,
 };

src/api/common/helper.js

@@ -4,6 +4,7 @@
 
 const _ = require("lodash");
 const config = require("config");
+const constants = require("../app-constants");
 const logger = require("./logger");
 const httpStatus = require("http-status");
 const Interceptor = require("express-interceptor");
@@ -265,10 +266,18 @@ async function getCurrentUserDetails(token) {
  */
 async function getJobCandidates(criteria) {
   const token = await getM2MToken();
+  let body = { statuses: [] };
+  if (criteria.status) {
+    body = constants.JOB_APPLICATION_STATUS_MAPPER[criteria.status] || {
+      statuses: [],
+    };
+  }
+  delete criteria.status;
   const url = `${config.API.V5}/jobCandidates`;
   const res = await request
     .get(url)
     .query(criteria)
+    .send(body)
     .set("Authorization", `Bearer ${token}`)
     .set("Accept", "application/json");
   localLogger.debug({
@@ -283,6 +292,103 @@ async function getJobCandidates(criteria) {
   };
 }
 
+/**
+ *
+ * @param {*} jobCandidates
+ * @param {*} userId
+ * @returns
+ */
+async function handlePlacedJobCandidates(jobCandidates, userId) {
+  if (!jobCandidates || jobCandidates.length == 0 || !userId) {
+    return;
+  }
+  const placedJobs = jobCandidates.filter(
+    (item) => item.status == constants.MY_GIGS_JOB_STATUS.PLACED
+  );
+  if (placedJobs.length == 0) {
+    return;
+  }
+  const token = await getM2MToken();
+  const url = `${config.API.V5}/resourceBookings`;
+  const criteria = {
+    userId: userId,
+    page: 1,
+    perPage: placedJobs.length,
+  };
+  const body = {
+    jobIds: _.map(placedJobs, "jobId"),
+  };
+  const res = await request
+    .get(url)
+    .query(criteria)
+    .send(body)
+    .set("Authorization", `Bearer ${token}`)
+    .set("Accept", "application/json");
+  localLogger.debug({
+    context: "handlePlacedJobCandidates",
+    message: `response body: ${JSON.stringify(res.body)}`,
+  });
+  if (res.body && res.body.length == 0) {
+    return;
+  }
+  // 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 = new Date(rb.endDate) <= new Date();
+    }
+  });
+  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;
+    }
+  });
+
+  const openJobs = [
+    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 = !!jobCandidate.completed;
+    } else {
+      jobCandidate.withdraw = true;
+    }
+  });
+}
+
 /**
  * Return jobs by given criteria
  * @param {string} criteria the search criteria
@@ -467,6 +573,8 @@ module.exports = {
   getM2MToken,
   getCurrentUserDetails,
   getJobCandidates,
+  handlePlacedJobCandidates,
+  handleArchivedJobCandidates,
   getJobs,
   getMember,
   getMemberTraits,

src/api/docs/swagger.yaml

@@ -49,6 +49,12 @@ paths:
             type: string
             default: desc
             enum: ["desc", "asc"]
+        - in: query
+          name: status
+          required: false
+          schema:
+            type: string
+            enum: ["open_jobs", "completed_jobs", "archived_jobs"]
       responses:
         "200":
           description: OK

src/api/services/JobApplicationService.js

@@ -18,6 +18,7 @@ async function getMyJobApplications(currentUser, criteria) {
   const perPage = criteria.perPage;
   const sortBy = criteria.sortBy;
   const sortOrder = criteria.sortOrder;
+  const status = criteria.status || "";
   const emptyResult = {
     total: 0,
     page,
@@ -44,16 +45,32 @@ async function getMyJobApplications(currentUser, criteria) {
     perPage,
     sortBy,
     sortOrder,
+    status,
   });
   // if no candidates found then return empty result
   if (jobCandidates.result.length === 0) {
     return emptyResult;
   }
-  const jobIds = _.map(jobCandidates.result, "jobId");
+  let jcResult = jobCandidates.result;
+  // 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)
+    );
+  }
+
+  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") {
+    helper.handleArchivedJobCandidates(jcResult, jobs);
+    jcResult = jcResult.filter((item) => item.withdraw);
+  }
   // apply desired structure
-  const jobApplications = _.map(jobCandidates.result, (jobCandidate) => {
+  const jobApplications = _.map(jcResult, (jobCandidate) => {
     const job = _.find(jobs, ["id", jobCandidate.jobId]);
     return {
       title: job.title,
@@ -92,6 +109,11 @@ getMyJobApplications.schema = Joi.object()
         perPage: Joi.perPage(),
         sortBy: Joi.string().valid("id", "status").default("id"),
         sortOrder: Joi.string().valid("desc", "asc").default("desc"),
+        status: Joi.string().valid(
+          "open_jobs",
+          "completed_jobs",
+          "archived_jobs"
+        ),
       })
       .required(),
   })