fix: issue 131

Author: dengjun

config/default.js

@@ -12,7 +12,7 @@ module.exports = {
     COMMUNITY_APP: "https://community-app.topcoder-dev.com",
     PLATFORM_WEBSITE_URL: "https://platform.topcoder-dev.com",
   },
-  RECRUIT_API: "https://www.topcoder-dev.com",
+  RECRUIT_API: process.env.RECRUIT_API || "https://www.topcoder-dev.com",
   // the server api base path
   API_BASE_PATH: process.env.API_BASE_PATH || "/earn-app/api/my-gigs",
   // the log level, default is 'debug'

config/development.js

@@ -11,5 +11,5 @@ module.exports = {
     COMMUNITY_APP: "https://community-app.topcoder-dev.com",
     PLATFORM_WEBSITE_URL: "https://platform.topcoder-dev.com",
   },
-  RECRUIT_API: "https://www.topcoder-dev.com",
+  RECRUIT_API: process.env.RECRUIT_API || "https://www.topcoder-dev.com",
 };

config/production.js

@@ -11,5 +11,5 @@ module.exports = {
     COMMUNITY_APP: "https://community-app.topcoder.com",
     PLATFORM_WEBSITE_URL: "https://platform.topcoder.com",
   },
-  RECRUIT_API: "https://www.topcoder.com",
+  RECRUIT_API: process.env.RECRUIT_API || "https://www.topcoder.com",
 };

src/api/common/helper.js

@@ -335,6 +335,26 @@ async function getMember(handle, query) {
   return res.body;
 }
 
+/**
+ * Get member traits info
+ * @param {string} handle the handle of the user
+ * @param {string} query the query criteria
+ * @returns the object of member traitsdetails
+ */
+async function getMemberTraits(handle, query) {
+  const token = await getM2MToken();
+  const url = `${config.API.V5}/members/${handle}/traits`;
+  const res = await request
+    .get(url)
+    .query(query)
+    .set("Authorization", `Bearer ${token}`)
+    .set("Accept", "application/json");
+  localLogger.debug({
+    context: "getMemberTraits",
+    message: `response body: ${JSON.stringify(res.body)}`,
+  });
+  return res.body;
+}
 /**
  * Update member details
  * @param {string} handle the handle of the user
@@ -357,6 +377,28 @@ async function updateMember(currentUser, data) {
   return res.body;
 }
 
+/**
+ * Update member traits
+ * @param {string} handle the handle of the user
+ * @param {object} data the data to be updated
+ * @return {object} the object of updated member details
+ */
+async function updateMemberTraits(currentUser, data) {
+  const token = currentUser.jwtToken;
+  const url = `${config.API.V5}/members/${currentUser.handle}/traits`;
+  const res = await request
+    .put(url)
+    .set("Authorization", token)
+    .set("Content-Type", "application/json")
+    .set("Accept", "application/json")
+    .send(data);
+  localLogger.debug({
+    context: "updateMemberTraits",
+    message: `response body: ${JSON.stringify(res.body)}`,
+  });
+  return res.body;
+}
+
 /**
  * Get Recruit CRM profile details
  * @param {object} currentUser the user who performs the operation
@@ -412,7 +454,9 @@ module.exports = {
   getJobCandidates,
   getJobs,
   getMember,
+  getMemberTraits,
   updateMember,
+  updateMemberTraits,
   getRCRMProfile,
   updateRCRMProfile,
 };

src/api/services/ProfileService.js

@@ -75,32 +75,65 @@ async function updateMyProfile(currentUser, files, data) {
     "fields=addresses,competitionCountryCode,homeCountryCode"
   );
   const update = {};
+  let shouldUpdateTrait = false;
   // update member data if city is different from existing one
   if (_.get(member, "addresses[0].city") !== data.city) {
     update.addresses = _.cloneDeep(member.addresses);
     if (!_.isEmpty(update.addresses)) {
       update.addresses[0].city = data.city;
       delete update.addresses[0].createdAt;
       delete update.addresses[0].updatedAt;
+      update.addresses[0].streetAddr1 = update.addresses[0].streetAddr1
+        ? update.addresses[0].streetAddr1
+        : " ";
+      update.addresses[0].type = update.addresses[0].type
+        ? update.addresses[0].type
+        : "HOME";
+      update.addresses[0].stateCode = update.addresses[0].stateCode
+        ? update.addresses[0].stateCode
+        : "000";
+      update.addresses[0].zip = update.addresses[0].zip
+        ? update.addresses[0].zip
+        : "000";
     } else {
       update.addresses = [
         {
           city: data.city,
+          type: "HOME",
+          stateCode: "000",
+          zip: "000",
         },
       ];
     }
   }
   // update member data if competitionCountryCode is different from existing one
   if (_.get(member, "competitionCountryCode") !== data.country) {
     update.competitionCountryCode = data.country;
+    shouldUpdateTrait = true;
   }
   if (_.get(member, "homeCountryCode") !== data.country) {
     update.homeCountryCode = data.country;
+    shouldUpdateTrait = true;
   }
   // avoid unnecessary api calls
   if (!_.isEmpty(update)) {
     await helper.updateMember(currentUser, update);
   }
+  if (shouldUpdateTrait) {
+    const memberTraits = await helper.getMemberTraits(
+      currentUser.handle,
+      `traitIds=basic_info`
+    );
+    if (memberTraits && memberTraits.length) {
+      memberTraits[0]["traits"].data[0].country = data.countryName;
+      delete memberTraits[0].createdAt;
+      delete memberTraits[0].createdBy;
+      delete memberTraits[0].updatedAt;
+      delete memberTraits[0].updatedBy;
+      delete memberTraits[0].userId;
+      await helper.updateMemberTraits(currentUser, memberTraits);
+    }
+  }
   await helper.updateRCRMProfile(currentUser, files.resume, {
     phone: data.phone,
     availability: data.availability,
@@ -119,6 +152,7 @@ updateMyProfile.schema = Joi.object()
       .keys({
         city: Joi.string().required(),
         country: Joi.string().required(),
+        countryName: Joi.string().required(),
         phone: Joi.string().required(),
         availability: Joi.boolean().required(),
       })

src/services/myGigs.js

@@ -129,6 +129,7 @@ async function updateProfile(profile) {
   const payload = {
     city: profile.city,
     country: profile.countryCode,
+    countryName: profile.country,
     phone: profile.phone,
     availability: profile.status === GIG_STATUS.AVAILABLE ? true : false,
     resume: profile.file,