startDate endDate validation fix for null case

optional direct project id and billing account id

Author: Vikas Agarwal

src/routes/phaseProducts/create.js

@@ -15,7 +15,9 @@ const addPhaseProductValidations = {
     param: Joi.object().keys({
       name: Joi.string().required(),
       type: Joi.string().required(),
-      templateId: Joi.number().optional(),
+      templateId: Joi.number().positive().optional(),
+      directProjectId: Joi.number().positive().optional(),
+      billingAccountId: Joi.number().positive().optional(),
       estimatedPrice: Joi.number().positive().optional(),
       actualPrice: Joi.number().positive().optional(),
       details: Joi.any().optional(),

src/routes/phases/update.js

@@ -62,16 +62,16 @@ module.exports = [
         if (updatedProps.startDate) {
           startDate = new Date(updatedProps.startDate);
         } else {
-          startDate = new Date(existing.startDate);
+          startDate = existing.startDate !== null ? new Date(existing.startDate) : null;
         }
 
         if (updatedProps.endDate) {
           endDate = new Date(updatedProps.endDate);
         } else {
-          endDate = new Date(existing.endDate);
+          endDate = existing.endDate !== null ? new Date(existing.endDate) : null;
         }
 
-        if (startDate >= endDate) {
+        if (startDate !== null && endDate !== null && startDate >= endDate) {
           const err = new Error('startDate must be before endDate.');
           err.status = 400;
           reject(err);

src/routes/projects/list.js

@@ -29,6 +29,14 @@ const PROJECT_ATTACHMENT_ATTRIBUTES = _.without(
   _.keys(models.ProjectAttachment.rawAttributes),
   'deletedAt',
 );
+const PROJECT_PHASE_ATTRIBUTES = _.without(
+  _.keys(models.ProjectPhase.rawAttributes),
+  'deletedAt',
+);
+const PROJECT_PHASE_PRODUCTS_ATTRIBUTES = _.without(
+  _.keys(models.PhaseProduct.rawAttributes),
+  'deletedAt',
+);
 
 
 const escapeEsKeyword = keyword => keyword.replace(/[+-=><!|(){}[&\]^"~*?:\\/]/g, '\\\\$&');
@@ -60,6 +68,14 @@ const parseElasticSearchCriteria = (criteria, fields, order) => {
     const memberFields = _.get(fields, 'project_members');
     sourceInclude = sourceInclude.concat(_.map(memberFields, single => `members.${single}`));
   }
+  if (_.get(fields, 'project_phases', null)) {
+    const phaseFields = _.get(fields, 'project_phases');
+    sourceInclude = sourceInclude.concat(_.map(phaseFields, single => `phases.${single}`));
+  }
+  if (_.get(fields, 'project_phases_products', null)) {
+    const phaseFields = _.get(fields, 'project_phases_products');
+    sourceInclude = sourceInclude.concat(_.map(phaseFields, single => `phases.products.${single}`));
+  }
   sourceInclude = sourceInclude.concat(_.map(PROJECT_ATTACHMENT_ATTRIBUTES, single => `attachments.${single}`));
 
   if (sourceInclude) {
@@ -180,6 +196,8 @@ const retrieveProjects = (req, criteria, sort, ffields) => {
   fields = util.parseFields(fields, {
     projects: PROJECT_ATTRIBUTES,
     project_members: PROJECT_MEMBER_ATTRIBUTES,
+    project_phases: PROJECT_PHASE_ATTRIBUTES,
+    project_phases_products: PROJECT_PHASE_PRODUCTS_ATTRIBUTES,
   });
   // make sure project.id is part of fields
   if (_.indexOf(fields.projects, 'id') < 0) {