make fields startDate, endDate, memberRate and customerRate optional

Author: imcaizheng

docs/swagger.yaml

@@ -1861,10 +1861,6 @@ components:
         - projectId
         - userId
         - status
-        - startDate
-        - endDate
-        - memberRate
-        - customerRate
         - rateType
         - createdAt
         - createdBy
@@ -1935,10 +1931,6 @@ components:
         - projectId
         - userId
         - status
-        - startDate
-        - endDate
-        - memberRate
-        - customerRate
         - rateType
       properties:
         projectId:

src/models/ResourceBooking.js

@@ -61,23 +61,19 @@ module.exports = (sequelize) => {
       },
       startDate: {
         field: 'start_date',
-        type: Sequelize.DATE,
-        allowNull: false
+        type: Sequelize.DATE
       },
       endDate: {
         field: 'end_date',
-        type: Sequelize.DATE,
-        allowNull: false
+        type: Sequelize.DATE
       },
       memberRate: {
         field: 'member_rate',
-        type: Sequelize.FLOAT,
-        allowNull: false
+        type: Sequelize.FLOAT
       },
       customerRate: {
         field: 'customer_rate',
-        type: Sequelize.FLOAT,
-        allowNull: false
+        type: Sequelize.FLOAT
       },
       rateType: {
         field: 'rate_type',

src/services/ResourceBookingService.js

@@ -121,10 +121,10 @@ createResourceBooking.schema = Joi.object().keys({
     projectId: Joi.number().integer().required(),
     userId: Joi.string().uuid().required(),
     jobId: Joi.string().uuid(),
-    startDate: Joi.date().required(),
-    endDate: Joi.date().required(),
-    memberRate: Joi.number().required(),
-    customerRate: Joi.number().required(),
+    startDate: Joi.date(),
+    endDate: Joi.date(),
+    memberRate: Joi.number(),
+    customerRate: Joi.number(),
     rateType: Joi.rateType().required()
   }).required()
 }).required()
@@ -225,10 +225,10 @@ fullyUpdateResourceBooking.schema = Joi.object().keys({
     projectId: Joi.number().integer().required(),
     userId: Joi.string().uuid().required(),
     jobId: Joi.string().uuid(),
-    startDate: Joi.date().required(),
-    endDate: Joi.date().required(),
-    memberRate: Joi.number().required(),
-    customerRate: Joi.number().required(),
+    startDate: Joi.date(),
+    endDate: Joi.date(),
+    memberRate: Joi.number(),
+    customerRate: Joi.number(),
     rateType: Joi.rateType().required(),
     status: Joi.jobStatus().required()
   }).required()

src/services/TeamService.js

@@ -125,6 +125,10 @@ async function getTeamDetail (currentUser, projects, isSearch = true) {
 
       // Count weekly rate
       for (const item of rbs) {
+        // ignore any resourceBooking that has customerRate missed
+        if (!item.customerRate) {
+          continue
+        }
         const startDate = new Date(item.startDate)
         const endDate = new Date(item.endDate)