From 79d46578b0a9a2e8e4eb422e869175c894bc7fa7 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Fri, 15 Dec 2017 12:24:32 -0500 Subject: [PATCH] handle UTC dates properly for events --- src/Api/Controllers/EventsController.cs | 17 +++-------------- src/Core/Utilities/CoreHelpers.cs | 2 +- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/src/Api/Controllers/EventsController.cs b/src/Api/Controllers/EventsController.cs index a866cbf9fc..fbd99d95b9 100644 --- a/src/Api/Controllers/EventsController.cs +++ b/src/Api/Controllers/EventsController.cs @@ -58,23 +58,12 @@ namespace Bit.Api.Controllers private Tuple GetDateRange(DateTime? start, DateTime? end) { - var endSet = false; - if(!end.HasValue) + if(!end.HasValue || !start.HasValue) { - endSet = true; end = DateTime.UtcNow.Date.AddDays(1).AddMilliseconds(-1); + start = DateTime.UtcNow.Date.AddDays(-30); } - - if(!start.HasValue) - { - start = end.Value.AddDays(-30); - if(endSet) - { - start = start.Value.AddMilliseconds(1); - } - } - - if(start.Value > end.Value) + else if(start.Value > end.Value) { var newEnd = start; start = end; diff --git a/src/Core/Utilities/CoreHelpers.cs b/src/Core/Utilities/CoreHelpers.cs index 486adfc6d3..325187629d 100644 --- a/src/Core/Utilities/CoreHelpers.cs +++ b/src/Core/Utilities/CoreHelpers.cs @@ -417,7 +417,7 @@ namespace Bit.Core.Utilities date = DateTime.UtcNow; } - return date.Value.ToString("yyyy-MM-dd HH:mm:ss.fff"); + return date.Value.ToUniversalTime().ToString("yyyy-MM-dd HH:mm:ss.fff"); } } }