[PROD] Next Release

.circleci/config.yml

@@ -71,8 +71,6 @@ workflows:
             branches:
               only:
                 - dev
-                - dev-circleci
-                - feature/shapeup4-cqrs-update2
 
       # Production builds are exectuted only on tagged commits to the
       # master branch.

package.json

@@ -18,12 +18,13 @@
     "superagent": "^5.1.0"
   },
   "dependencies": {
-    "@hapi/joi": "^15.1.0",
+    "@joi/date": "^2.1.0",
     "async-mutex": "^0.2.4",
     "bluebird": "^3.5.5",
     "config": "^3.1.0",
     "dotenv": "^10.0.0",
     "get-parameter-names": "^0.3.0",
+    "joi": "^17.4.2",
     "lodash": "^4.17.20",
     "no-kafka": "^3.4.3",
     "tc-core-library-js": "^2.4.1",

src/bootstrap.js

@@ -1,4 +1,4 @@
-const Joi = require('@hapi/joi')
+const Joi = require('joi')
 const config = require('config')
 const constants = require('./common/constants')
 
@@ -8,6 +8,7 @@ Joi.rateType = () => Joi.string().valid('hourly', 'daily', 'weekly', 'monthly',
 Joi.jobStatus = () => Joi.string().valid('sourcing', 'in-review', 'assigned', 'closed', 'cancelled')
 Joi.jobCandidateStatus = () => Joi.string().valid('open', 'placed', 'selected', 'client rejected - screening', 'client rejected - interview', 'rejected - other', 'cancelled', 'interview', 'topcoder-rejected', 'applied', 'rejected-pre-screen', 'skills-test', 'skills-test', 'phone-screen', 'job-closed', 'offered', 'withdrawn', 'withdrawn-prescreen')
 Joi.workload = () => Joi.string().valid('full-time', 'fractional')
+Joi.jobTag = () => Joi.string().valid('New', '$$$', 'Hot').allow('')
 Joi.title = () => Joi.string().max(128)
 // Empty string is not allowed by Joi by default and must be enabled with allow('').
 // See https://joi.dev/api/?v=17.3.0#string fro details why it's like this.

src/common/logger.js

@@ -3,7 +3,7 @@
  */
 
 const _ = require('lodash')
-const Joi = require('@hapi/joi')
+const Joi = require('joi')
 const util = require('util')
 const config = require('config')
 const getParams = require('get-parameter-names')

src/services/JobCandidateProcessorService.js

@@ -2,7 +2,7 @@
  * Jobcandidate Processor Service
  */
 
-const Joi = require('@hapi/joi')
+const Joi = require('joi')
 const logger = require('../common/logger')
 const helper = require('../common/helper')
 const constants = require('../common/constants')
@@ -74,34 +74,35 @@ async function processUpdate (message, transactionId) {
   })
 }
 
-processUpdate.schema = {
-  message: Joi.object()
-    .keys({
-      topic: Joi.string().required(),
-      originator: Joi.string().required(),
-      timestamp: Joi.date().required(),
-      'mime-type': Joi.string().required(),
-      key: Joi.string().allow(null),
-      payload: Joi.object()
-        .keys({
-          id: Joi.string().uuid().required(),
-          jobId: Joi.string().uuid().required(),
-          userId: Joi.string().uuid().required(),
-          createdAt: Joi.date().required(),
-          createdBy: Joi.string().uuid().required(),
-          updatedAt: Joi.date().allow(null),
-          viewedByCustomer: Joi.boolean().required(),
-          updatedBy: Joi.string().uuid().allow(null),
-          status: Joi.jobCandidateStatus().required(),
-          externalId: Joi.string().allow(null),
-          resume: Joi.string().uri().allow(null).allow(''),
-          remark: Joi.stringAllowEmpty().allow(null)
-        })
-        .required()
-    })
-    .required(),
-  transactionId: Joi.string().required()
-}
+processUpdate.schema = Joi.object()
+  .keys({
+    message: Joi.object()
+      .keys({
+        topic: Joi.string().required(),
+        originator: Joi.string().required(),
+        timestamp: Joi.date().required(),
+        'mime-type': Joi.string().required(),
+        key: Joi.string().allow(null),
+        payload: Joi.object()
+          .keys({
+            id: Joi.string().uuid().required(),
+            jobId: Joi.string().uuid().required(),
+            userId: Joi.string().uuid().required(),
+            createdAt: Joi.date().required(),
+            createdBy: Joi.string().uuid().required(),
+            updatedAt: Joi.date().allow(null),
+            viewedByCustomer: Joi.boolean().required(),
+            updatedBy: Joi.string().uuid().allow(null),
+            status: Joi.jobCandidateStatus().required(),
+            externalId: Joi.string().allow(null),
+            resume: Joi.string().uri().allow(null).allow(''),
+            remark: Joi.stringAllowEmpty().allow(null)
+          })
+          .required()
+      })
+      .required(),
+    transactionId: Joi.string().required()
+  })
 
 module.exports = {
   processUpdate

src/services/JobProcessorService.js

@@ -2,7 +2,7 @@
  * Job Processor Service
  */
 
-const Joi = require('@hapi/joi')
+const Joi = require('joi').extend(require('@joi/date'))
 const logger = require('../common/logger')
 const helper = require('../common/helper')
 const constants = require('../common/constants')
@@ -50,49 +50,54 @@ async function processCreate (message, transactionId) {
   })
 }
 
-processCreate.schema = {
-  message: Joi.object()
-    .keys({
-      topic: Joi.string().required(),
-      originator: Joi.string().required(),
-      timestamp: Joi.date().required(),
-      'mime-type': Joi.string().required(),
-      payload: Joi.object()
-        .keys({
-          id: Joi.string().uuid().required(),
-          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(),
-          roles: Joi.array().items(Joi.string().uuid()).allow(null),
-          createdAt: Joi.date().required(),
-          createdBy: Joi.string().uuid().required(),
-          updatedAt: Joi.date().allow(null),
-          updatedBy: Joi.string().uuid().allow(null),
-          status: Joi.jobStatus().required(),
-          isApplicationPageActive: Joi.boolean().required(),
-          minSalary: Joi.number().integer().allow(null),
-          maxSalary: Joi.number().integer().allow(null),
-          hoursPerWeek: Joi.number().integer().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())
-            .allow(null)
-        })
-        .required()
-    })
-    .required(),
-  transactionId: Joi.string().required()
-}
+processCreate.schema = Joi.object()
+  .keys({
+    message: Joi.object()
+      .keys({
+        topic: Joi.string().required(),
+        originator: Joi.string().required(),
+        timestamp: Joi.date().required(),
+        'mime-type': Joi.string().required(),
+        payload: Joi.object()
+          .keys({
+            id: Joi.string().uuid().required(),
+            projectId: Joi.number().integer().required(),
+            externalId: Joi.string().allow(null),
+            description: Joi.stringAllowEmpty().allow(null),
+            title: Joi.title().required(),
+            startDate: Joi.date().format('YYYY-MM-DD').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(),
+            roles: Joi.array().items(Joi.string().uuid()).allow(null),
+            createdAt: Joi.date().required(),
+            createdBy: Joi.string().uuid().required(),
+            updatedAt: Joi.date().allow(null),
+            updatedBy: Joi.string().uuid().allow(null),
+            status: Joi.jobStatus().required(),
+            isApplicationPageActive: Joi.boolean().required(),
+            minSalary: Joi.number().integer().allow(null),
+            maxSalary: Joi.number().integer().allow(null),
+            hoursPerWeek: Joi.number().integer().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())
+              .allow(null),
+            showInHotList: Joi.boolean().default(false),
+            featured: Joi.boolean().default(false),
+            hotListExcerpt: Joi.stringAllowEmpty().default(''),
+            jobTag: Joi.jobTag().default('')
+          })
+          .required()
+      })
+      .required(),
+    transactionId: Joi.string().required()
+  })
 
 /**
  * Process update entity message