From 032e1af5e55591e5d672d904636a12d6d9a160b2 Mon Sep 17 00:00:00 2001 From: Michael Simard Date: Tue, 16 Jun 2020 20:32:11 -0500 Subject: [PATCH] force calendar to use UTC --- Sources/App/Controllers/StatsController.swift | 61 +++++++++---------- 1 file changed, 30 insertions(+), 31 deletions(-) diff --git a/Sources/App/Controllers/StatsController.swift b/Sources/App/Controllers/StatsController.swift index c11e503..b5cb9cf 100644 --- a/Sources/App/Controllers/StatsController.swift +++ b/Sources/App/Controllers/StatsController.swift @@ -126,6 +126,7 @@ struct StatsController: RouteCollection { private func getStartOfMonth(month:Int, year:Int) -> Date { let calendar = Calendar.current var components = DateComponents() + components.timeZone = TimeZone(identifier: "GMT") components.day = 1 components.month = month components.year = year @@ -138,6 +139,7 @@ struct StatsController: RouteCollection { let calendar = Calendar.current var components = DateComponents() components.day = -1 + components.timeZone = TimeZone(identifier: "GMT") components.month = month + 1 components.year = year components.hour = 23 @@ -149,6 +151,8 @@ struct StatsController: RouteCollection { private func getStartOfDay(day:Int, month:Int, year:Int) -> Date { let calendar = Calendar.current var components = DateComponents() + components.timeZone = TimeZone(identifier: "GMT") + components.day = day components.month = month components.year = year @@ -160,6 +164,7 @@ struct StatsController: RouteCollection { private func getEndOfDay(day:Int, month:Int, year:Int) -> Date { let calendar = Calendar.current var components = DateComponents() + components.timeZone = TimeZone(identifier: "GMT") components.day = day components.month = month components.year = year @@ -168,6 +173,31 @@ struct StatsController: RouteCollection { return calendar.date(from: components)! } + private func getStartDate() -> Date { + + let calendar = Calendar.current + var components = DateComponents() + components.timeZone = TimeZone(identifier: "GMT") + components.day = 20 + components.month = 03 + components.year = 2020 + components.hour = 0 + components.minute = 0 + return calendar.date(from: components)! + } + + private func createDate(day:Int, month:Int, year:Int) -> Date { + let calendar = Calendar.current + + var components = DateComponents() + components.timeZone = TimeZone(identifier: "GMT") + components.day = day + components.month = month + components.year = year + return calendar.date(from: components)! + } + + @@ -357,37 +387,6 @@ struct StatsController: RouteCollection { return getRatios(Array(previousDays)[0.. Date { - - let calendar = Calendar.current - - var components = DateComponents() - components.timeZone = TimeZone(identifier: "America/New_York")! - components.day = 20 - components.month = 03 - components.year = 2020 - components.hour = 0 - components.minute = 0 - - return calendar.date(from: components)! - } - - private func createDate(day:Int, month:Int, year:Int) -> Date { - let calendar = Calendar.current - - - var components = DateComponents() - components.day = day - components.month = month - components.year = year - - - return calendar.date(from: components)! - } - - }