Merge pull request #627 from bcgov/2.0.8

SB-429: converted latsUpdatedTimestamp to time zone unspecified
bcgov · Nov 19, 2024 · 828e4bd · 828e4bd
2 parents bfa6eb5 + a29a056
commit 828e4bd
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git 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
@@ -9,7 +9,7 @@
     <Company>Ministry of Transportation and Infrastructure</Company>
     <Description>The API server for the schoolbus inspection application.</Description>
     <Copyright>Copyright© 2017, Province of British Columbia.</Copyright>
-    <Version>2.0.7</Version>
+    <Version>2.0.8</Version>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

diff --git a/Server/SchoolBusAPI/Services/CCWNotificationService.cs b/Server/SchoolBusAPI/Services/CCWNotificationService.cs
@@ -76,11 +76,15 @@ public List<CCWNotificationViewModel> 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
@@ -54,7 +54,7 @@ public static ApplicationVersionInfo GetApplicationVersionInfo(this Assembly ass
                 Description = assembly.GetCustomAttribute<AssemblyDescriptionAttribute>().Description,
                 FileVersion = assembly.GetCustomAttribute<AssemblyFileVersionAttribute>().Version,
                 FileCreationTime = creationTime.ToString("O"), // Use the round trip format as it includes the time zone.
-                InformationalVersion = assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>().InformationalVersion,
+                InformationalVersion = assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>().InformationalVersion.Split('+')[0],
                 TargetFramework = assembly.GetCustomAttribute<TargetFrameworkAttribute>().FrameworkName,
                 Title = assembly.GetCustomAttribute<AssemblyTitleAttribute>().Title,
                 ImageRuntimeVersion = assembly.ImageRuntimeVersion,