agg API update

Author: LieutenantRoger

src/api/common/helper.js

@@ -6,7 +6,6 @@ const _ = require("lodash");
 const config = require("config");
 const constants = require("../app-constants");
 const logger = require("./logger");
-const { weekDiff } = require("./utils");
 const httpStatus = require("http-status");
 const Interceptor = require("express-interceptor");
 const m2mAuth = require("tc-core-library-js").auth.m2m;
@@ -300,7 +299,7 @@ async function getJobCandidates(criteria) {
  * @param {*} userId
  * @returns
  */
-async function handlePlacedJobCandidates(jobCandidates, userId) {
+async function handlePlacedJobCandidates(jobCandidates, userId, userHandle) {
   if (!jobCandidates || jobCandidates.length == 0 || !userId) {
     return;
   }
@@ -346,17 +345,71 @@ async function handlePlacedJobCandidates(jobCandidates, userId) {
           new Date(rb.endDate).toDateString() != new Date().toDateString()
         ) {
           jc.status = "completed";
-          jc.rbPay = rb.memberRate;
           jc.rbStartDate = rb.startDate;
           jc.rbEndDate = rb.endDate;
-          jc.rbDuration = weekDiff(rb.startDate, rb.endDate);
+          jc.rbId = rb.id;
+          jc.userHandle = userHandle;
         }
       }
     }
   });
+  await getWorkingPeriods(jobCandidates, userHandle, rbRes);
   return;
 }
 
+/**
+ * Get payment Total for working period
+ *
+ * @param {*} jobCandidates job candidates we will process
+ * @param {*} userHandle the user's handle
+ * @param {*} resourceBookings the resource booking belongs to this user
+ * @returns
+ */
+async function getWorkingPeriods(jobCandidates, userHandle, resourceBookings) {
+  if (
+    !userHandle ||
+    !resourceBookings ||
+    resourceBookings.length == 0 ||
+    !jobCandidates ||
+    jobCandidates.length == 0
+  ) {
+    return;
+  }
+  const rbIds = resourceBookings.map((item) => item.id);
+  const token = await getM2MToken();
+  const url = `${config.API.V5}/work-periods`;
+  const criteria = {
+    userHandle: userHandle,
+    resourceBookingIds: rbIds.join(","),
+  };
+  const res = await request
+    .get(url)
+    .query(criteria)
+    .set("Authorization", `Bearer ${token}`)
+    .set("Accept", "application/json");
+  localLogger.debug({
+    context: "getWorkingPeriods",
+    message: `response body: ${JSON.stringify(res.body)}`,
+  });
+  if (res.body && res.body.length == 0) {
+    return;
+  }
+  // All the working periods for the rbs.
+  const wpRes = res.body;
+  _.each(rbIds, (rbId) => {
+    const wps = wpRes.filter(
+      (wp) => wp.userHandle == userHandle && wp.resourceBookingId == rbId
+    );
+    const paymentTotal = wps.reduce((total, wp) => total + wp.paymentTotal, 0);
+    const jc = jobCandidates.find(
+      (item) => item.rbId == rbId && item.userHandle == userHandle
+    );
+    if (jc) {
+      jc.paymentTotal = paymentTotal;
+    }
+  });
+}
+
 /**
  * Return jobs by given criteria
  * @param {string} criteria the search criteria

src/api/common/utils.js

@@ -30,12 +30,12 @@ async function getMyJobApplications(currentUser, criteria) {
     return emptyResult;
   }
   // get user id by calling taas-api with current user's token
-  const { id: userId } = await helper.getCurrentUserDetails(
+  const { id: userId, handle: userHandle } = await helper.getCurrentUserDetails(
     currentUser.jwtToken
   );
-  if (!userId) {
+  if (!userId || !userHandle) {
     throw new errors.NotFoundError(
-      `Id for user: ${currentUser.userId} not found`
+      `Id for user: ${currentUser.userId} or handle for user: ${currentUser.handle} not found`
     );
   }
   // get jobCandidates of current user by calling taas-api
@@ -54,7 +54,11 @@ async function getMyJobApplications(currentUser, criteria) {
   let jcResult = jobCandidates.result;
   // handle placed status for completed_jobs, archived_jobs query
   if (status && (status == "active_jobs" || status == "completed_jobs")) {
-    await helper.handlePlacedJobCandidates(jobCandidates.result, userId);
+    await helper.handlePlacedJobCandidates(
+      jobCandidates.result,
+      userId,
+      userHandle
+    );
     if (status == "completed_jobs") {
       jcResult = jobCandidates.result.filter(
         (item) => item.status == "completed"
@@ -76,11 +80,9 @@ async function getMyJobApplications(currentUser, criteria) {
     const job = _.find(jobs, ["id", jobCandidate.jobId]);
     return {
       title: job.title,
-      description: job.description,
-      rbPay: jobCandidate.rbPay,
+      paymentTotal: jobCandidate.paymentTotal,
       rbStartDate: jobCandidate.rbStartDate,
       rbEndDate: jobCandidate.rbEndDate,
-      rbDuration: jobCandidate.rbDuration,
       payment: {
         min: job.minSalary,
         max: job.maxSalary,