Merge pull request #335 from topcoder-platform/change-validatations-in-job-jc

Change validatations in job jc

Author: sushilshinde

.circleci/config.yml

@@ -68,6 +68,7 @@ workflows:
             branches:
               only:
                 - dev
+                - change-validatations-in-job-jc
 
       # Production builds are exectuted only on tagged commits to the
       # master branch.

docs/swagger.yaml

@@ -174,7 +174,7 @@ paths:
           required: false
           schema:
             type: string
-            enum: ["hourly", "daily", "weekly", "monthly"]
+            enum: ["hourly", "daily", "weekly", "monthly","annual"]
           description: The rate type.
         - in: query
           name: status

src/bootstrap.js

@@ -11,7 +11,7 @@ const allowedXAITemplate = _.keys(Interviews.XaiTemplate)
 
 Joi.page = () => Joi.number().integer().min(1).default(1)
 Joi.perPage = () => Joi.number().integer().min(1).default(20)
-Joi.rateType = () => Joi.string().valid('hourly', 'daily', 'weekly', 'monthly')
+Joi.rateType = () => Joi.string().valid('hourly', 'daily', 'weekly', 'monthly','annual')
 Joi.jobStatus = () => Joi.string().valid('sourcing', 'in-review', 'assigned', 'closed', 'cancelled')
 Joi.resourceBookingStatus = () => Joi.string().valid('placed', 'closed', 'cancelled')
 Joi.workload = () => Joi.string().valid('full-time', 'fractional')

src/services/JobCandidateService.js

@@ -203,8 +203,8 @@ fullyUpdateJobCandidate.schema = Joi.object().keys({
     userId: Joi.string().uuid().required(),
     status: Joi.jobCandidateStatus().default('open'),
     externalId: Joi.string().allow(null).default(null),
-    resume: Joi.string().uri().allow(null).default(null),
-    remark: Joi.string().allow(null).default(null)
+    resume: Joi.string().uri().allow('').allow(null).default(null),
+    remark: Joi.string().allow('').allow(null).default(null)
   }).required()
 }).required()
 

src/services/JobService.js

@@ -187,31 +187,35 @@ async function createJob (currentUser, job) {
   return created.toJSON()
 }
 
-createJob.schema = Joi.object().keys({
-  currentUser: Joi.object().required(),
-  job: Joi.object().keys({
-    status: Joi.jobStatus().default('sourcing'),
-    projectId: Joi.number().integer().required(),
-    externalId: Joi.string().allow(null),
-    description: Joi.stringAllowEmpty().allow(null),
-    title: Joi.title().required(),
-    startDate: Joi.date().allow(null),
-    duration: Joi.number().integer().min(1).allow(null),
-    numPositions: Joi.number().integer().min(1).required(),
-    resourceType: Joi.stringAllowEmpty().allow(null),
-    rateType: Joi.rateType().allow(null),
-    workload: Joi.workload().allow(null),
-    skills: Joi.array().items(Joi.string().uuid()).required(),
-    isApplicationPageActive: Joi.boolean(),
-    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),
-    roleIds: Joi.array().items(Joi.string().uuid().required())
-  }).required()
-}).required()
+createJob.schema = Joi.object()
+  .keys({
+    currentUser: Joi.object().required(),
+    job: Joi.object()
+      .keys({
+        status: Joi.jobStatus().default("sourcing"),
+        projectId: Joi.number().integer().required(),
+        externalId: Joi.string().allow(null),
+        description: Joi.stringAllowEmpty().allow(null),
+        title: Joi.title().required(),
+        startDate: Joi.date().allow(null),
+        duration: Joi.number().integer().min(1).allow(null),
+        numPositions: Joi.number().integer().min(1).required(),
+        resourceType: Joi.stringAllowEmpty().allow(null),
+        rateType: Joi.rateType().allow(null),
+        workload: Joi.workload().allow(null),
+        skills: Joi.array().items(Joi.string().uuid()).required(),
+        isApplicationPageActive: Joi.boolean(),
+        minSalary: Joi.number().integer().allow(null),
+        maxSalary: Joi.number().integer().allow(null),
+        hoursPerWeek: Joi.number().integer().allow(null),
+        jobLocation: Joi.string().allow(null).allow(''),
+        jobTimezone: Joi.string().allow(null).allow(''),
+        currency: Joi.string().allow(null).allow(''),
+        roleIds: Joi.array().items(Joi.string().uuid().required()),
+      })
+      .required(),
+  })
+  .required();
 
 /**
  * Update job. Normal user can only update the job he/she created.