Allowed zero in budget, spentBudget, progress and duration

Author: Vikas Agarwal

src/routes/phases/create.js

@@ -16,10 +16,10 @@ const addProjectPhaseValidations = {
       status: Joi.string().required(),
       startDate: Joi.date().max(Joi.ref('endDate')).optional(),
       endDate: Joi.date().optional(),
-      duration: Joi.number().positive().optional(),
-      budget: Joi.number().positive().optional(),
-      spentBudget: Joi.number().positive().optional(),
-      progress: Joi.number().positive().optional(),
+      duration: Joi.number().min(0).optional(),
+      budget: Joi.number().min(0).optional(),
+      spentBudget: Joi.number().min(0).optional(),
+      progress: Joi.number().min(0).optional(),
       details: Joi.any().optional(),
     }).required(),
   },

src/routes/phases/create.spec.js

@@ -15,11 +15,22 @@ const body = {
   endDate: '2018-05-15T12:00:00Z',
   budget: 20.0,
   progress: 1.23456,
+  spentBudget: 10.0,
+  duration: 10,
   details: {
     message: 'This can be any json',
   },
 };
 
+const validatePhase = (resJson, expectedPhase) => {
+  should.exist(resJson);
+  resJson.name.should.be.eql(expectedPhase.name);
+  resJson.status.should.be.eql(expectedPhase.status);
+  resJson.budget.should.be.eql(expectedPhase.budget);
+  resJson.progress.should.be.eql(expectedPhase.progress);
+  resJson.details.should.be.eql(expectedPhase.details);
+};
+
 describe('Project Phases', () => {
   let projectId;
   const memberUser = {
@@ -190,12 +201,32 @@ describe('Project Phases', () => {
             done(err);
           } else {
             const resJson = res.body.result.content;
-            should.exist(resJson);
-            resJson.name.should.be.eql(body.name);
-            resJson.status.should.be.eql(body.status);
-            resJson.budget.should.be.eql(body.budget);
-            resJson.progress.should.be.eql(body.progress);
-            resJson.details.should.be.eql(body.details);
+            validatePhase(resJson, body);
+            done();
+          }
+        });
+    });
+
+    it('should return 201 if payload is valid (0 for non negative numbers)', (done) => {
+      const bodyWithZeros = _.cloneDeep(body);
+      bodyWithZeros.duration = 0;
+      bodyWithZeros.spentBudget = 0.0;
+      bodyWithZeros.budget = 0.0;
+      bodyWithZeros.progress = 0.0;
+      request(server)
+        .post(`/v4/projects/${projectId}/phases/`)
+        .set({
+          Authorization: `Bearer ${testUtil.jwts.copilot}`,
+        })
+        .send({ param: bodyWithZeros })
+        .expect('Content-Type', /json/)
+        .expect(201)
+        .end((err, res) => {
+          if (err) {
+            done(err);
+          } else {
+            const resJson = res.body.result.content;
+            validatePhase(resJson, bodyWithZeros);
             done();
           }
         });

src/routes/phases/update.js

@@ -17,10 +17,10 @@ const updateProjectPhaseValidation = {
       status: Joi.string().optional(),
       startDate: Joi.date().optional(),
       endDate: Joi.date().optional(),
-      duration: Joi.number().positive().optional(),
-      budget: Joi.number().positive().optional(),
-      spentBudget: Joi.number().positive().optional(),
-      progress: Joi.number().positive().optional(),
+      duration: Joi.number().min(0).optional(),
+      budget: Joi.number().min(0).optional(),
+      spentBudget: Joi.number().min(0).optional(),
+      progress: Joi.number().min(0).optional(),
       details: Joi.any().optional(),
     }).required(),
   },

src/routes/phases/update.spec.js

@@ -34,6 +34,15 @@ const updateBody = {
   },
 };
 
+const validatePhase = (resJson, expectedPhase) => {
+  should.exist(resJson);
+  resJson.name.should.be.eql(expectedPhase.name);
+  resJson.status.should.be.eql(expectedPhase.status);
+  resJson.budget.should.be.eql(expectedPhase.budget);
+  resJson.progress.should.be.eql(expectedPhase.progress);
+  resJson.details.should.be.eql(expectedPhase.details);
+};
+
 describe('Project Phases', () => {
   let projectId;
   let phaseId;
@@ -187,12 +196,32 @@ describe('Project Phases', () => {
             done(err);
           } else {
             const resJson = res.body.result.content;
-            should.exist(resJson);
-            resJson.name.should.be.eql(updateBody.name);
-            resJson.status.should.be.eql(updateBody.status);
-            resJson.budget.should.be.eql(updateBody.budget);
-            resJson.progress.should.be.eql(updateBody.progress);
-            resJson.details.should.be.eql(updateBody.details);
+            validatePhase(resJson, updateBody);
+            done();
+          }
+        });
+    });
+
+    it('should return updated phase when parameters are valid (0 for non -ve numbers)', (done) => {
+      const bodyWithZeros = _.cloneDeep(updateBody);
+      bodyWithZeros.duration = 0;
+      bodyWithZeros.spentBudget = 0.0;
+      bodyWithZeros.budget = 0.0;
+      bodyWithZeros.progress = 0.0;
+      request(server)
+        .patch(`/v4/projects/${projectId}/phases/${phaseId}`)
+        .set({
+          Authorization: `Bearer ${testUtil.jwts.copilot}`,
+        })
+        .send({ param: bodyWithZeros })
+        .expect('Content-Type', /json/)
+        .expect(200)
+        .end((err, res) => {
+          if (err) {
+            done(err);
+          } else {
+            const resJson = res.body.result.content;
+            validatePhase(resJson, bodyWithZeros);
             done();
           }
         });