Merge pull request #28 from imcaizheng/fix-last-week-day-calulation

weeklycount: fix calculation of last week day

Author: nkumar-topcoder

package-lock.json

@@ -24,6 +24,7 @@
     "aws-sdk": "^2.787.0",
     "config": "^3.3.2",
     "cors": "^2.8.5",
+    "date-fns": "^2.16.1",
     "dotenv": "^8.2.0",
     "express": "^4.17.1",
     "express-interceptor": "^1.2.0",

package.json

@@ -4,6 +4,7 @@
 
 const _ = require('lodash')
 const Joi = require('joi')
+const dateFNS = require('date-fns')
 const helper = require('../common/helper')
 const logger = require('../common/logger')
 const JobService = require('./JobService')
@@ -65,13 +66,9 @@ async function getTeamDetail (currentUser, projects, isSearch = true) {
 
   // Get first week day and last week day
   const curr = new Date()
-  curr.setHours(0, 0, 0, 0)
-  const first = curr.getDate() - curr.getDay()
-  const last = first + 6
+  const firstDay = dateFNS.startOfWeek(curr)
+  const lastDay = dateFNS.endOfWeek(curr)
 
-  const firstDay = new Date(curr.setDate(first))
-  const lastDay = new Date(curr.setDate(last))
-  lastDay.setHours(23, 59, 59, 59) // the end of the day
   logger.debug({ component: 'TeamService', context: 'getTeamDetail', message: `week started: ${firstDay}, week ended: ${lastDay}` })
 
   const result = []