From 46011a3c70f8570557a3a77b4b24964a73a3cd34 Mon Sep 17 00:00:00 2001
From: Sushil Shinde <shinde.sushil@gmail.com>
Date: Fri, 18 Jun 2021 13:18:04 +0530
Subject: [PATCH 1/2] fix: allow empty string

---
 src/services/JobCandidateService.js |  4 +-
 src/services/JobService.js          | 60 +++++++++++++++--------------
 2 files changed, 34 insertions(+), 30 deletions(-)

diff --git a/src/services/JobCandidateService.js b/src/services/JobCandidateService.js
index d25b2375..cb174fe4 100644
--- a/src/services/JobCandidateService.js
+++ b/src/services/JobCandidateService.js
@@ -178,7 +178,7 @@ partiallyUpdateJobCandidate.schema = Joi.object().keys({
     status: Joi.jobCandidateStatus(),
     externalId: Joi.string().allow(null),
     resume: Joi.string().uri().allow(null),
-    remark: Joi.string().allow(null)
+    remark: Joi.stringAllowEmpty().allow(null)
   }).required()
 }).required()
 
@@ -206,7 +206,7 @@ fullyUpdateJobCandidate.schema = Joi.object()
         status: Joi.jobCandidateStatus().default("open"),
         externalId: Joi.string().allow(null).default(null),
         resume: Joi.string().uri().allow("").allow(null).default(null),
-        remark: Joi.stringAllowEmpty().allow(null),
+        remark: Joi.stringAllowEmpty().allow(null)
       })
       .required(),
   })
diff --git a/src/services/JobService.js b/src/services/JobService.js
index 02636480..b4a50665 100644
--- a/src/services/JobService.js
+++ b/src/services/JobService.js
@@ -270,31 +270,35 @@ async function partiallyUpdateJob (currentUser, id, data) {
   return updateJob(currentUser, id, data, false)
 }
 
-partiallyUpdateJob.schema = Joi.object().keys({
-  currentUser: Joi.object().required(),
-  id: Joi.string().guid().required(),
-  data: Joi.object().keys({
-    status: Joi.jobStatus(),
-    externalId: Joi.string().allow(null),
-    description: Joi.stringAllowEmpty().allow(null),
-    title: Joi.title(),
-    startDate: Joi.date().allow(null),
-    duration: Joi.number().integer().min(1).allow(null),
-    numPositions: Joi.number().integer().min(1),
-    resourceType: Joi.stringAllowEmpty().allow(null),
-    rateType: Joi.rateType().allow(null),
-    workload: Joi.workload().allow(null),
-    skills: Joi.array().items(Joi.string().uuid()),
-    isApplicationPageActive: Joi.boolean(),
-    minSalary: Joi.number().integer(),
-    maxSalary: Joi.number().integer(),
-    hoursPerWeek: Joi.number().integer(),
-    jobLocation: Joi.string(),
-    jobTimezone: Joi.string(),
-    currency: Joi.string(),
-    roleIds: Joi.array().items(Joi.string().uuid().required()).allow(null)
-  }).required()
-}).required()
+partiallyUpdateJob.schema = Joi.object()
+  .keys({
+    currentUser: Joi.object().required(),
+    id: Joi.string().guid().required(),
+    data: Joi.object()
+      .keys({
+        status: Joi.jobStatus(),
+        externalId: Joi.string().allow(null),
+        description: Joi.stringAllowEmpty().allow(null),
+        title: Joi.title(),
+        startDate: Joi.date().allow(null),
+        duration: Joi.number().integer().min(1).allow(null),
+        numPositions: Joi.number().integer().min(1),
+        resourceType: Joi.stringAllowEmpty().allow(null),
+        rateType: Joi.rateType().allow(null),
+        workload: Joi.workload().allow(null),
+        skills: Joi.array().items(Joi.string().uuid()),
+        isApplicationPageActive: Joi.boolean(),
+        minSalary: Joi.number().integer(),
+        maxSalary: Joi.number().integer(),
+        hoursPerWeek: Joi.number().integer(),
+        jobLocation: Joi.stringAllowEmpty().allow(null),
+        jobTimezone: Joi.stringAllowEmpty().allow(null),
+        currency: Joi.stringAllowEmpty().allow(null),
+        roleIds: Joi.array().items(Joi.string().uuid().required()).allow(null),
+      })
+      .required(),
+  })
+  .required();
 
 /**
  * Fully update job by id
@@ -327,9 +331,9 @@ fullyUpdateJob.schema = Joi.object().keys({
     minSalary: Joi.number().integer().allow(null),
     maxSalary: Joi.number().integer().allow(null),
     hoursPerWeek: Joi.number().integer().allow(null),
-    jobLocation: Joi.string().allow(null),
-    jobTimezone: Joi.string().allow(null),
-    currency: Joi.string().allow(null),
+    jobLocation: Joi.stringAllowEmpty().allow(null),
+    jobTimezone: Joi.stringAllowEmpty().allow(null),
+    currency: Joi.stringAllowEmpty().allow(null),
     roleIds: Joi.array().items(Joi.string().uuid().required()).default(null)
   }).required()
 }).required()

From 98a5c600f9d448eb8b2c070544ef9520dbc1465a Mon Sep 17 00:00:00 2001
From: Sushil Shinde <shinde.sushil@gmail.com>
Date: Fri, 18 Jun 2021 13:22:52 +0530
Subject: [PATCH 2/2] fix: allow empty string

---
 src/services/JobCandidateService.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/services/JobCandidateService.js b/src/services/JobCandidateService.js
index cb174fe4..33ba9aa5 100644
--- a/src/services/JobCandidateService.js
+++ b/src/services/JobCandidateService.js
@@ -131,7 +131,7 @@ createJobCandidate.schema = Joi.object().keys({
     userId: Joi.string().uuid().required(),
     externalId: Joi.string().allow(null),
     resume: Joi.string().uri().allow(null),
-    remark: Joi.string().allow(null)
+    remark: Joi.stringAllowEmpty().allow(null)
   }).required()
 }).required()