Merge pull request #45 from tieme-ndo/fix-other-statistics

Respond with totalNumberOfOtherFarmers
tieme-ndo · Sep 18, 2019 · 22c738e · 22c738e
2 parents 31a0107 + 14c476e
commit 22c738e
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@
 **[Production Deployment](https://t-ndo.herokuapp.com)** <br/>
 **[Staging Deployment](https://tndo-temp-staging.herokuapp.com/)**
 
-[![Run in Postman](https://run.pstmn.io/button.svg)](https://app.getpostman.com/run-collection/128f9cfdf87dd2eb709d)
+[![Run in Postman](https://run.pstmn.io/button.svg)](https://app.getpostman.com/run-collection/e0398fa3da81ee0a9ce2)
 
 ## Getting started
 
@@ -68,7 +68,7 @@ JWT_SECRET=<generated string>
 
 ## Endpoints
 
-**[View API Reference Here](https://documenter.getpostman.com/view/8821479/SVmtzfpW?version=latest)**
+**[View API Reference Here]https://documenter.getpostman.com/view/6785535/SVmvUeeT?version=latest**
 
 # Data Model
 

diff --git a/controllers/farmer/statistics.js b/controllers/farmer/statistics.js
@@ -23,6 +23,10 @@ const statistics = async (req, res, next) => {
       (farmer) => farmer.personalInfo.gender.toLowerCase() === 'male'
     ).length;
 
+    const totalNumOfOtherFarmers = allFarmers.filter(
+      (farmer) => farmer.personalInfo.gender.toLowerCase() === 'others'
+    ).length;
+
     const farmersAgeGreaterThanOrEqualThirtyFive = allFarmers.filter(
       (farmer) => calculateAge(farmer.personalInfo.date_of_birth) >= 35
     ).length;
@@ -35,6 +39,7 @@ const statistics = async (req, res, next) => {
       totalNumOfFarmers,
       totalNumOfMaleFarmers,
       totalNumOfFemaleFarmers,
+      totalNumOfOtherFarmers,
       farmersAgeGreaterThanOrEqualThirtyFive,
       farmersAgeLesserThanThirtyFive
     };

diff --git a/tests/farmers.test.js b/tests/farmers.test.js
@@ -155,6 +155,59 @@ describe('Farmer route', () => {
       });
   });
 
+  it('It should 200 on GET farmer statistics', (done) => {
+    chai
+      .request(server)
+      .get('/api/v1/farmers/statistic')
+      .set('Authorization', token)
+      .end((err, res) => {
+        res.should.have.status(200);
+        done(err);
+      });
+  });
+
+  it('It should return num of M/F/O farmers that add up to total number of farmers', (done) => {
+    chai
+      .request(server)
+      .get('/api/v1/farmers/statistic')
+      .set('Authorization', token)
+      .end((err, res) => {
+        const {
+          totalNumOfFarmers,
+          totalNumOfMaleFarmers,
+          totalNumOfFemaleFarmers,
+          totalNumOfOtherFarmers
+        } = res.body;
+
+        totalNumOfFarmers.should.equal(
+          totalNumOfMaleFarmers
+            + totalNumOfFemaleFarmers
+            + totalNumOfOtherFarmers
+        );
+        done(err);
+      });
+  });
+
+  it('It should return num of <35/>35 y/o farmers that add up to total number of farmers', (done) => {
+    chai
+      .request(server)
+      .get('/api/v1/farmers/statistic')
+      .set('Authorization', token)
+      .end((err, res) => {
+        const {
+          totalNumOfFarmers,
+          farmersAgeGreaterThanOrEqualThirtyFive,
+          farmersAgeLesserThanThirtyFive
+        } = res.body;
+
+        totalNumOfFarmers.should.equal(
+          farmersAgeGreaterThanOrEqualThirtyFive
+            + farmersAgeLesserThanThirtyFive
+        );
+        done(err);
+      });
+  });
+
   it('It should return 400 bad request and "Not a valid ID" message on bad farmer ID', (done) => {
     chai
       .request(server)