Merge pull request #145 from imcaizheng/job-replace-end-date-with-duration

Remove `endDate` from Job and add `duration` to Job

Author: nkumar-topcoder

docs/Topcoder-bookings-api.postman_collection.json

@@ -91,7 +91,7 @@ paths:
           schema:
             type: string
             default: id
-            enum: ['id','createdAt','startDate','endDate','rateType','status']
+            enum: ['id','createdAt','startDate','rateType','status']
           description: The sort by column.
         - in: query
           name: sortOrder
@@ -139,13 +139,6 @@ paths:
             type: string
             format: date-time
           description: The job start date.
-        - in: query
-          name: endDate
-          required: false
-          schema:
-            type: string
-            format: date-time
-          description: The job end date.
         - in: query
           name: resourceType
           required: false
@@ -1683,11 +1676,10 @@ components:
           format: date-time
           example: "2020-09-27T04:17:23.131Z"
           description: "The job start date."
-        endDate:
-          type: string
-          format: date-time
-          example: "2020-09-27T04:17:23.131Z"
-          description: "The job end date."
+        duration:
+          type: integer
+          example: 1
+          description: "The duration in weeks"
         numPositions:
           type: integer
           example: 13
@@ -1770,11 +1762,10 @@ components:
           format: date-time
           example: "2020-09-27T04:17:23.131Z"
           description: "The job start date."
-        endDate:
-          type: string
-          format: date-time
-          example: "2020-09-27T04:17:23.131Z"
-          description: "The job end date."
+        duration:
+          type: integer
+          example: 1
+          description: "The duration in weeks"
         numPositions:
           type: integer
           example: 13
@@ -1900,11 +1891,10 @@ components:
           format: date-time
           example: "2020-09-27T04:17:23.131Z"
           description: "The job start date."
-        endDate:
-          type: string
-          format: date-time
-          example: "2020-09-27T04:17:23.131Z"
-          description: "The job end date."
+        duration:
+          type: integer
+          example: 1
+          description: "The duration in weeks"
         numPositions:
           type: integer
           example: 13
@@ -2315,11 +2305,10 @@ components:
           format: date-time
           example: "2020-09-27T04:17:23.131Z"
           description: "The job start date."
-        endDate:
-          type: string
-          format: date-time
-          example: "2020-09-27T04:17:23.131Z"
-          description: "The job end date."
+        duration:
+          type: integer
+          example: 1
+          description: "The duration in weeks"
         numPositions:
           type: integer
           example: 13

docs/swagger.yaml

@@ -0,0 +1,18 @@
+/*
+ * Replace endData with duration in Job model.
+ */
+
+module.exports = {
+  up: queryInterface => {
+    return Promise.all([
+      queryInterface.sequelize.query('ALTER TABLE bookings.jobs DROP end_date'),
+      queryInterface.sequelize.query('ALTER TABLE bookings.jobs ADD duration INTEGER')
+    ])
+  },
+  down: queryInterface => {
+    return Promise.all([
+      queryInterface.sequelize.query('ALTER TABLE bookings.jobs ADD end_date DATE'),
+      queryInterface.sequelize.query('ALTER TABLE bookings.jobs DROP duration')
+    ])
+  }
+}

migrations/2021-02-10-job-replace-end-date-with-duration.js

@@ -60,7 +60,7 @@ esIndexPropertyMapping[config.get('esConfig.ES_INDEX_JOB')] = {
   description: { type: 'text' },
   title: { type: 'text' },
   startDate: { type: 'date' },
-  endDate: { type: 'date' },
+  duration: { type: 'integer' },
   numPositions: { type: 'integer' },
   resourceType: { type: 'keyword' },
   rateType: { type: 'keyword' },

src/common/helper.js

@@ -69,9 +69,9 @@ module.exports = (sequelize) => {
         field: 'start_date',
         type: Sequelize.DATE
       },
-      endDate: {
-        field: 'end_date',
-        type: Sequelize.DATE
+      duration: {
+        field: 'duration',
+        type: Sequelize.INTEGER
       },
       numPositions: {
         field: 'num_positions',
@@ -109,7 +109,7 @@ module.exports = (sequelize) => {
       },
       createdAt: {
         field: 'created_at',
-        type: Sequelize.DATE,
+        type: Sequelize.DATE
       },
       updatedAt: {
         field: 'updated_at',

src/models/Job.js

@@ -70,7 +70,7 @@ module.exports = (sequelize) => {
       },
       createdAt: {
         field: 'created_at',
-        type: Sequelize.DATE,
+        type: Sequelize.DATE
       },
       updatedAt: {
         field: 'updated_at',

src/models/JobCandidate.js

@@ -87,7 +87,7 @@ module.exports = (sequelize) => {
       },
       createdAt: {
         field: 'created_at',
-        type: Sequelize.DATE,
+        type: Sequelize.DATE
       },
       updatedAt: {
         field: 'updated_at',

src/models/ResourceBooking.js

@@ -166,7 +166,7 @@ createJob.schema = Joi.object().keys({
     description: Joi.stringAllowEmpty().allow(null),
     title: Joi.title().required(),
     startDate: Joi.date().allow(null),
-    endDate: 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),
@@ -227,7 +227,7 @@ partiallyUpdateJob.schema = Joi.object().keys({
     description: Joi.stringAllowEmpty().allow(null),
     title: Joi.title(),
     startDate: Joi.date().allow(null),
-    endDate: 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),
@@ -256,7 +256,7 @@ fullyUpdateJob.schema = Joi.object().keys({
     description: Joi.stringAllowEmpty().allow(null),
     title: Joi.title().required(),
     startDate: Joi.date().allow(null),
-    endDate: 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),
@@ -344,7 +344,6 @@ async function searchJobs (currentUser, criteria, options = { returnAll: false }
       'externalId',
       'description',
       'startDate',
-      'endDate',
       'resourceType',
       'skill',
       'rateType',
@@ -414,7 +413,6 @@ async function searchJobs (currentUser, criteria, options = { returnAll: false }
     'projectId',
     'externalId',
     'startDate',
-    'endDate',
     'resourceType',
     'rateType',
     'workload',
@@ -462,14 +460,13 @@ searchJobs.schema = Joi.object().keys({
   criteria: Joi.object().keys({
     page: Joi.number().integer(),
     perPage: Joi.number().integer(),
-    sortBy: Joi.string().valid('id', 'createdAt', 'startDate', 'endDate', 'rateType', 'status'),
+    sortBy: Joi.string().valid('id', 'createdAt', 'startDate', 'rateType', 'status'),
     sortOrder: Joi.string().valid('desc', 'asc'),
     projectId: Joi.number().integer(),
     externalId: Joi.string(),
     description: Joi.string(),
     title: Joi.title(),
     startDate: Joi.date(),
-    endDate: Joi.date(),
     resourceType: Joi.string(),
     skill: Joi.string().uuid(),
     rateType: Joi.rateType(),

src/services/JobService.js

@@ -188,7 +188,7 @@ async function getTeamDetail (currentUser, projects, isSearch = true) {
         }
       } else {
         res.jobs = _.map(jobsTmp, job => {
-          return _.pick(job, ['id', 'description', 'startDate', 'endDate', 'numPositions', 'rateType', 'skills', 'customerRate', 'status', 'title'])
+          return _.pick(job, ['id', 'description', 'startDate', 'duration', 'numPositions', 'rateType', 'skills', 'customerRate', 'status', 'title'])
         })
       }
     }