ci:optional resume

Author: dengjun

src/api/common/helper.js

@@ -421,23 +421,36 @@ async function getRCRMProfile(currentUser) {
 /**
  * Update Recruit CRM profile details
  * @param {object} currentUser the user who performs the operation
- * @param {object} file the resume file
  * @param {object} data the data to be updated
+ * @param {object} file the resume file
  * @return {object} the returned object
  */
-async function updateRCRMProfile(currentUser, file, data) {
+async function updateRCRMProfile(currentUser, data, file) {
   const token = currentUser.jwtToken;
   const url = `${config.RECRUIT_API}/api/recruit/profile`;
-  const res = await request
-    .post(url)
-    .set("Authorization", token)
-    .set("Content-Type", "multipart/form-data")
-    .set("Accept", "application/json")
-    .field("phone", data.phone)
-    .field("availability", data.availability)
-    .field("city", data.city)
-    .field("countryName", data.countryName)
-    .attach("resume", file.data, file.name);
+  let res = null;
+  if (file) {
+    res = await request
+      .post(url)
+      .set("Authorization", token)
+      .set("Content-Type", "multipart/form-data")
+      .set("Accept", "application/json")
+      .field("phone", data.phone)
+      .field("availability", data.availability)
+      .field("city", data.city)
+      .field("countryName", data.countryName)
+      .attach("resume", file.data, file.name);
+  } else {
+    res = await request
+      .post(url)
+      .set("Authorization", token)
+      .set("Content-Type", "multipart/form-data")
+      .set("Accept", "application/json")
+      .field("phone", data.phone)
+      .field("availability", data.availability)
+      .field("city", data.city)
+      .field("countryName", data.countryName);
+  }
   localLogger.debug({
     context: "updateRCRMProfile",
     message: `response body: ${JSON.stringify(res.body)}`,

src/api/controllers/ProfileController.js

@@ -19,7 +19,7 @@ async function getMyProfile(req, res) {
  * @param res the response
  */
 async function updateMyProfile(req, res) {
-  await service.updateMyProfile(req.authUser, req.files, req.body);
+  await service.updateMyProfile(req.authUser, req.body, req.files);
   res.status(204).end();
 }
 

src/api/services/ProfileService.js

@@ -49,13 +49,13 @@ getMyProfile.schema = Joi.object()
  * @param {object} currentUser the user who perform this operation.
  * @param {object} data the data to be updated
  */
-async function updateMyProfile(currentUser, files, data) {
+async function updateMyProfile(currentUser, data, files) {
   // we expect logged-in users
   if (currentUser.isMachine) {
     return;
   }
   // check if file was truncated
-  if (files.resume.truncated) {
+  if (files && files.resume.truncated) {
     throw new errors.BadRequestError(
       `Maximum allowed file size is ${config.MAX_ALLOWED_FILE_SIZE_MB} MB`
     );
@@ -65,7 +65,7 @@ async function updateMyProfile(currentUser, files, data) {
     `^.*\.(${_.join(config.ALLOWED_FILE_TYPES, "|")})$`,
     "i"
   );
-  if (!regex.test(files.resume.name)) {
+  if (files && !regex.test(files.resume.name)) {
     throw new errors.BadRequestError(
       `Allowed file types are: ${_.join(config.ALLOWED_FILE_TYPES, ",")}`
     );
@@ -142,33 +142,30 @@ async function updateMyProfile(currentUser, files, data) {
       await helper.updateMemberTraits(currentUser, memberTraits);
     }
   }
-  await helper.updateRCRMProfile(currentUser, files.resume, {
-    phone: data.phone,
-    availability: data.availability,
-    city: data.city,
-    countryName: data.countryName,
-  });
+  await helper.updateRCRMProfile(
+    currentUser,
+    {
+      phone: data.phone,
+      availability: data.availability,
+      city: data.city,
+      countryName: data.countryName,
+    },
+    files && files.resume
+  );
 }
 
-updateMyProfile.schema = Joi.object()
-  .keys({
-    currentUser: Joi.object().required(),
-    files: Joi.object()
-      .keys({
-        resume: Joi.object().required(),
-      })
-      .required(),
-    data: Joi.object()
-      .keys({
-        city: Joi.string().required(),
-        country: Joi.string().required(),
-        countryName: Joi.string().required(),
-        phone: Joi.string().required(),
-        availability: Joi.boolean().required(),
-      })
-      .required(),
-  })
-  .required();
+updateMyProfile.schema = Joi.object({
+  currentUser: Joi.object().required(),
+  data: Joi.object()
+    .keys({
+      city: Joi.string().required(),
+      country: Joi.string().required(),
+      countryName: Joi.string().required(),
+      phone: Joi.string().required(),
+      availability: Joi.boolean().required(),
+    })
+    .required(),
+}).unknown();
 
 module.exports = {
   getMyProfile,

src/services/myGigs.js

@@ -134,8 +134,10 @@ async function updateProfile(profile) {
     countryName: profile.countryName,
     phone: profile.phone,
     availability: profile.status === GIG_STATUS.AVAILABLE ? true : false,
-    resume: profile.file,
   };
+  if (profile.file) {
+    payload.resume = profile.file;
+  }
 
   // add info to formData to send to server
   const formData = new FormData();