Merge pull request #1195 from USDAForestService/980_season_date_bug

add 1 hour to compensate for moment timezones
USDAForestService · Feb 13, 2020 · 1f8a94d · 1f8a94d
2 parents d1c3092 + d29bf64
commit 1f8a94d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/server/src/controllers/christmas-tree/admin.es6 b/server/src/controllers/christmas-tree/admin.es6
@@ -196,11 +196,13 @@ christmasTreeAdmin.updateForestDetails = (req, res) => {
             cuttingAreas = req.body.cuttingAreas;
           }
           if (req.body.startDate && req.body.endDate) {
-            startDate = moment.tz(req.body.startDate, forest.timezone).format(util.datetimeFormat);
+            startDate = moment
+              .tz(req.body.startDate, forest.timezone)
+              .add(1, 'hours')
+              .format(util.datetimeFormat);
             endDate = moment
               .tz(req.body.endDate, forest.timezone)
-              .add(0, 'days')
-              .subtract(0, 'ms')
+              .add(1, 'hours')
               .format(util.datetimeFormat);
           }
           return forest

diff --git a/server/src/services/forest.service.es6 b/server/src/services/forest.service.es6
@@ -12,8 +12,8 @@ const forestService = {};
  * @return {Object} - formatted data object
  */
 forestService.translateForestFromDatabaseToClient = (input) => {
-  const startDate = moment(input.startDate);
-  const endDate = moment(input.endDate);
+  const startDate = moment(input.startDate).local();
+  const endDate = moment(input.endDate).local();
 
   return {
     id: input.id,
@@ -27,8 +27,8 @@ forestService.translateForestFromDatabaseToClient = (input) => {
     treeHeight: input.treeHeight,
     stumpHeight: input.stumpHeight,
     stumpDiameter: input.stumpDiameter,
-    startDate: startDate.tz(input.timezone).format('YYYY-MM-DD HH:mm:ss'),
-    endDate: endDate.tz(input.timezone).format('YYYY-MM-DD HH:mm:ss'),
+    startDate: startDate.format('YYYY-MM-DD HH:mm:ss'),
+    endDate: endDate.format('YYYY-MM-DD HH:mm:ss'),
     treeCost: input.treeCost,
     maxNumTrees: input.maxNumTrees,
     allowAdditionalHeight: input.allowAdditionalHeight,