diff --git a/Server/SchoolBusAPI/Hangfire/CcwJobService.cs b/Server/SchoolBusAPI/Hangfire/CcwJobService.cs index 5193a9c3..7f6088b4 100644 --- a/Server/SchoolBusAPI/Hangfire/CcwJobService.cs +++ b/Server/SchoolBusAPI/Hangfire/CcwJobService.cs @@ -160,6 +160,10 @@ public async Task UpdateCCWJob() bus.LicencePlateNumber = cCWData.ICBCLicencePlateNumber; } + // SB-429 + DateTime convertedLastUpdatedTimestamp = DateTime.SpecifyKind(bus.CCWData.LastUpdateTimestamp, DateTimeKind.Unspecified); + bus.CCWData.LastUpdateTimestamp = convertedLastUpdatedTimestamp; + _context.SaveChanges(); Log.Information($"[Hangfire] UpdateCCWJob - Saved bus record with the ID {data.Id}."); } diff --git a/Server/SchoolBusAPI/SchoolBusAPI.csproj b/Server/SchoolBusAPI/SchoolBusAPI.csproj index 7709346c..18d2d12b 100644 --- a/Server/SchoolBusAPI/SchoolBusAPI.csproj +++ b/Server/SchoolBusAPI/SchoolBusAPI.csproj @@ -9,7 +9,7 @@ Ministry of Transportation and Infrastructure The API server for the schoolbus inspection application. Copyright© 2017, Province of British Columbia. - 2.0.7 + 2.0.8 diff --git a/Server/SchoolBusAPI/Services/CCWNotificationService.cs b/Server/SchoolBusAPI/Services/CCWNotificationService.cs index d21cb3af..49f91a80 100644 --- a/Server/SchoolBusAPI/Services/CCWNotificationService.cs +++ b/Server/SchoolBusAPI/Services/CCWNotificationService.cs @@ -76,11 +76,15 @@ public List GetNotifications(DateTime dateFrom, DateTi dateFrom = DateUtils.ConvertPacificToUtcTime( new DateTime(dateFrom.Year, dateFrom.Month, dateFrom.Day, 0, 0, 0)); + dateFrom = DateTime.SpecifyKind(dateFrom, DateTimeKind.Unspecified); + + dateTo = DateUtils.ConvertPacificToUtcTime( new DateTime(dateTo.Year, dateTo.Month, dateTo.Day, 0, 0, 0)) .AddDays(1) .AddSeconds(-1); + dateTo = DateTime.SpecifyKind(dateTo, DateTimeKind.Unspecified); var notifications = data.SelectMany(x => x.CCWNotifications) .Include(x => x.CCWNotificationDetails) diff --git a/Server/SchoolBusCommon/VersionInfoExtensions.cs b/Server/SchoolBusCommon/VersionInfoExtensions.cs index 8d0eb27e..4cf0d29c 100644 --- a/Server/SchoolBusCommon/VersionInfoExtensions.cs +++ b/Server/SchoolBusCommon/VersionInfoExtensions.cs @@ -54,7 +54,7 @@ public static ApplicationVersionInfo GetApplicationVersionInfo(this Assembly ass Description = assembly.GetCustomAttribute().Description, FileVersion = assembly.GetCustomAttribute().Version, FileCreationTime = creationTime.ToString("O"), // Use the round trip format as it includes the time zone. - InformationalVersion = assembly.GetCustomAttribute().InformationalVersion, + InformationalVersion = assembly.GetCustomAttribute().InformationalVersion.Split('+')[0], TargetFramework = assembly.GetCustomAttribute().FrameworkName, Title = assembly.GetCustomAttribute().Title, ImageRuntimeVersion = assembly.ImageRuntimeVersion,