Merge branch '2.0.6' of https://github.com/bcgov/schoolbus into 2.0.6

bcgov · Oct 3, 2024 · 7675aab · 7675aab
2 parents ab79ea5 + 01e5ca0
commit 7675aab
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/Server/SchoolBusAPI/Services/InspectionService.cs b/Server/SchoolBusAPI/Services/InspectionService.cs
@@ -197,6 +197,9 @@ public virtual IActionResult InspectionsIdPutAsync(int id, Inspection item)
             var exists = _context.Inspections.Any(a => a.Id == id);
             if (exists && id == item.Id)
             {
+                item.CreatedDate = DateTime.SpecifyKind(item.CreatedDate, DateTimeKind.Unspecified);
+                item.InspectionDate = DateTime.SpecifyKind(item.InspectionDate, DateTimeKind.Unspecified);
+                item.PreviousNextInspectionDate = DateTime.SpecifyKind(item.PreviousNextInspectionDate.GetValueOrDefault(), DateTimeKind.Unspecified);
                 _context.Inspections.Update(item);
                 // Save the changes
                 _context.SaveChanges();
@@ -258,6 +261,7 @@ public virtual IActionResult InspectionsPostAsync(Inspection item)
                 }
 
                 var exists = _context.Inspections.Any(a => a.Id == item.Id);
+                item.InspectionDate = DateTime.SpecifyKind(item.InspectionDate, DateTimeKind.Unspecified);
                 if (exists)
                 {
                     _context.Inspections.Update(item);
@@ -269,6 +273,8 @@ public virtual IActionResult InspectionsPostAsync(Inspection item)
                 {
                     // Inspection has a special field, createdDate which is set to now.
                     item.CreatedDate = DateTime.UtcNow;
+                    // TH-120363
+                    item.CreatedDate = DateTime.SpecifyKind(item.CreatedDate, DateTimeKind.Unspecified);
                     _context.Inspections.Add(item);
                 }
                 _context.SaveChanges();

diff --git a/Server/SchoolBusAPI/Services/SchoolBusService.cs b/Server/SchoolBusAPI/Services/SchoolBusService.cs
@@ -292,6 +292,9 @@ private void AdjustSchoolBus(SchoolBus item)
                         item.CCWData = null;
                     }
                 }
+
+                item.NextInspectionDate = DateTime.SpecifyKind(item.NextInspectionDate.GetValueOrDefault(), DateTimeKind.Unspecified);
+                item.PermitIssueDate = DateTime.SpecifyKind(item.PermitIssueDate.GetValueOrDefault(), DateTimeKind.Unspecified);
             }
         }
 
@@ -844,6 +847,7 @@ public virtual IActionResult SchoolbusesIdNewpermitPutAsync(int id)
 
                 item.PermitNumber = permit;
                 item.PermitIssueDate = DateTime.UtcNow;
+                item.PermitIssueDate = DateTime.SpecifyKind(item.PermitIssueDate.GetValueOrDefault(), DateTimeKind.Unspecified);
 
                 _context.SchoolBuss.Update(item);
                 _context.SaveChanges();