add rounding to fluid ounces

frogermcs · Dec 18, 2017 · 621a1e5 · 621a1e5
1 parent b8f9138
commit 621a1e5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/functions/package.json b/functions/package.json
@@ -14,6 +14,7 @@
     "firebase-admin": "~5.4.0",
     "firebase-functions": "^0.7.0",
     "geo-tz": "^3.3.3",
+    "mathjs": "^3.18.0",
     "moment-timezone": "^0.5.14"
   },
   "devDependencies": {

diff --git a/functions/test/water-log-test.js b/functions/test/water-log-test.js
@@ -1,6 +1,8 @@
 const sinon = require('sinon');
 const chai = require('chai');
 
+const math = require('mathjs');
+
 const Constants = require('../constants.js');
 const WaterLog = require('../water-log.js');
 const TimeManager = require('../time-manager.js');
@@ -82,7 +84,7 @@ describe('WaterLog', () => {
         });
 
         it('Should save logged fl oz of water', (done) => {
-            const expectedMililiters = Constants.OZ_TO_ML;
+            const expectedMililiters = math.round(Constants.OZ_TO_ML);
             const loggedWaterInput = {unit: "fl oz", amount: 1};
             const expectedLoggedWater = {
                 userId: exampleUser.userId,

diff --git a/functions/water-log.js b/functions/water-log.js
@@ -1,4 +1,5 @@
 const Constants = require('./constants.js');
+const math = require('mathjs');
 
 class WaterLog {
     constructor(firebaseAdmin, timeManager) {
@@ -13,7 +14,7 @@ class WaterLog {
         } else if (loggedWater.unit === "ml") {
             mililiters = loggedWater.amount;
         } else if (loggedWater.unit === "fl oz") {
-            mililiters = loggedWater.amount * Constants.OZ_TO_ML;
+            mililiters = math.round(loggedWater.amount * Constants.OZ_TO_ML);
         }
 
         const waterLogData = {