Do not amend local date time value from HMRC to UTC

Btms.Backend.Cli/Features/GenerateModels/ClassMaps/Bootstrap.cs

@@ -10,7 +10,6 @@ public static void GeneratorClassMaps()
         RegisterAlvsClassMaps();
         RegisterIpaffsClassMaps();
         RegisterIpaffsEnumMaps();
-
         RegisterVehicleMovementsClassMaps();
     }
 
@@ -24,8 +23,6 @@ public static void RegisterAlvsClassMaps()
             map.MapProperty("DeclarationUCR").SetName("DeclarationUcr");
         });
 
-
-
         GeneratorClassMap.RegisterClassMap("Check", map =>
         {
             map.AddProperty(new PropertyDescriptor("decisionCode", "decisionCode", "string",
@@ -40,13 +37,11 @@ public static void RegisterAlvsClassMaps()
                 "", false, true,
                 IpaffsDescriptorBuilder.ClassNamePrefix));
 
-
             map.MapProperty("MasterUCR").SetName("MasterUcr");
             map.MapProperty("SubmitterTURN").SetName("SubmitterTurn");
             map.MapProperty("DeclarationUCR").SetName("DeclarationUcr");
         });
 
-
         GeneratorClassMap.RegisterClassMap("ServiceHeader",
             map => { map.MapProperty("ServiceCallTimestamp").IsDateTime().SetInternalName("ServiceCalled"); });
 
@@ -142,7 +137,6 @@ public static void RegisterIpaffsClassMaps()
                 map.MapProperty("sampleTime").IsTime();
                 map.MapDateOnlyAndTimeOnlyToDateTimeProperty("sampleDate", "sampleTime", "sampledOn");
             });
-
 
         GeneratorClassMap.RegisterClassMap("BillingInformation",
             map =>
@@ -359,7 +353,6 @@ public static void RegisterIpaffsClassMaps()
             map.MapProperty("telephone").IsSensitive();
         });
 
-
         GeneratorClassMap.RegisterClassMap("Party", map =>
         {
             map.MapProperty("email").IsSensitive();
@@ -384,7 +377,6 @@ public static void RegisterIpaffsClassMaps()
         });
     }
 
-
     public static void RegisterVehicleMovementsClassMaps()
     {
         GeneratorClassMap.RegisterClassMap("GmrsByVRN",
@@ -397,7 +389,6 @@ public static void RegisterVehicleMovementsClassMaps()
             map.MapProperty("haulierEORI").SetName("haulierEori");
             map.MapProperty("vehicleRegNum").SetName("vehicleRegistrationNumber");
             map.MapProperty("updatedDateTime").SetName("updatedSource").IsDateTime();
-            map.MapProperty("localDateTimeOfDeparture").SetName("departsAt").IsDateTime();
             map.MapProperty("declarations").ExcludeFromInternal();
         });
 
@@ -413,18 +404,13 @@ public static void RegisterVehicleMovementsClassMaps()
 
         GeneratorClassMap.RegisterClassMap("searchGmrsResponse", map => { map.MapProperty("Gmrs").SetType("Gmr[]"); });
 
-
         GeneratorClassMap.RegisterClassMap("plannedCrossing",
-            map =>
-            {
-                map.MapProperty("localDateTimeOfArrival").IsDateTime().SetName("arrivesAt");
-                map.MapProperty("localDateTimeOfDeparture").IsDateTime().SetName("departsAt");
-            });
+            map => { map.MapProperty("localDateTimeOfDeparture").IsLocalDateTimeNoSeconds().SetName("departsAt"); });
 
         GeneratorClassMap.RegisterClassMap("actualCrossing",
-            map => { map.MapProperty("localDateTimeOfArrival").IsDateTime().SetName("arrivesAt"); });
+            map => { map.MapProperty("localDateTimeOfArrival").IsLocalDateTimeNoSeconds().SetName("arrivesAt"); });
 
         GeneratorClassMap.RegisterClassMap("checkedInCrossing",
-            map => { map.MapProperty("localDateTimeOfArrival").IsDateTime().SetName("arrivesAt"); });
+            map => { map.MapProperty("localDateTimeOfArrival").IsLocalDateTimeNoSeconds().SetName("arrivesAt"); });
     }
 }

Btms.Backend.Cli/Features/GenerateModels/ClassMaps/PropertyMap.cs

@@ -70,6 +70,12 @@ public PropertyMap IsDateTime()
         return this;
     }
 
+    public PropertyMap IsDateTimeOffset()
+    {
+        SetType("DateTimeOffset");
+        return this;
+    }
+
     public PropertyMap IsDate()
     {
         SetType("DateOnly");
@@ -182,4 +188,11 @@ public PropertyMap NoAttribute(Model model)
         NoAttributes = true;
         return this;
     }
+
+    public PropertyMap IsLocalDateTimeNoSeconds()
+    {
+        IsDateTimeOffset();
+        AddAttribute("[JsonConverter(typeof(LocalDateTimeNoSecondsJsonConverter))]", Model.Internal);
+        return this;
+    }
 }

Btms.Backend.IntegrationTests/GmrTests.cs

@@ -30,4 +30,29 @@ await Client.MakeSyncGmrsRequest(new SyncGmrsCommand
         jsonClientResponse.Data.Relationships?["customs"]?.Data.ManyValue?[0].Id.Should().Be("56GB123456789AB043");
         jsonClientResponse.Data.Relationships?["customs"]?.Data.ManyValue?[0].Type.Should().Be("import-notifications");
     }
+
+    [Fact]
+    public async Task GmrImport_PreservesLocalDateTimes()
+    {
+        await Client.ClearDb();
+        await Client.MakeSyncGmrsRequest(new SyncGmrsCommand
+        {
+            SyncPeriod = SyncPeriod.All,
+            RootFolder = "SmokeTest"
+        });
+
+        var result = await Client.AsHttpClient().GetStringAsync("api/gmrs/GMRAPOQSPDUG");
+
+        // The exact input provided by HMRC should be retained
+        result.Should().Contain("\"departsAt\": \"2024-11-11T00:25\"");
+
+        var gmr = Factory.GetDbContext().Gmrs
+            .FirstOrDefault(x => x.Id != null && x.Id.Equals("GMRAPOQSPDUG", StringComparison.OrdinalIgnoreCase));
+
+        // Strong DateTime should stay as Unspecified as that is how incoming values are deserialized and if it were
+        // Local it would serialize differently from the locale of this API.
+        gmr.Should().NotBeNull();
+        gmr?.PlannedCrossing.Should().NotBeNull();
+        gmr?.PlannedCrossing?.DepartsAt.GetValueOrDefault().DateTime.Kind.Should().Be(DateTimeKind.Unspecified);
+    }
 }

Btms.Model/Gvms/ActualCrossing.g.cs

@@ -35,7 +35,8 @@ public partial class ActualCrossing  //
         /// </summary>
     [Attr]
     [System.ComponentModel.Description("The planned date and time of arrival, in local time of the arrival port. Must not include seconds, time zone or UTC marker")]
-    public DateTime? ArrivesAt { get; set; }
+    [JsonConverter(typeof(LocalDateTimeNoSecondsJsonConverter))]
+    public DateTimeOffset? ArrivesAt { get; set; }
 
 	}
 

Btms.Model/Gvms/CheckedInCrossing.g.cs

@@ -35,7 +35,8 @@ public partial class CheckedInCrossing  //
         /// </summary>
     [Attr]
     [System.ComponentModel.Description("The planned date and time of arrival, in local time of the arrival port. Must not include seconds, time zone or UTC marker")]
-    public DateTime? ArrivesAt { get; set; }
+    [JsonConverter(typeof(LocalDateTimeNoSecondsJsonConverter))]
+    public DateTimeOffset? ArrivesAt { get; set; }
 
 	}
 

Btms.Model/Gvms/PlannedCrossing.g.cs

@@ -35,7 +35,8 @@ public partial class PlannedCrossing  //
         /// </summary>
     [Attr]
     [System.ComponentModel.Description("The planned date and time of departure, in local time of the departure port. Must not include seconds, time zone or UTC marker")]
-    public DateTime? DepartsAt { get; set; }
+    [JsonConverter(typeof(LocalDateTimeNoSecondsJsonConverter))]
+    public DateTimeOffset? DepartsAt { get; set; }
 
 	}
 

Btms.Model/LocalDateTimeNoSecondsJsonConverter.cs

@@ -0,0 +1,18 @@
+using System.Globalization;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace Btms.Model;
+
+public class LocalDateTimeNoSecondsJsonConverter : JsonConverter<DateTimeOffset>
+{
+    public override DateTimeOffset Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        throw new NotImplementedException();
+    }
+
+    public override void Write(Utf8JsonWriter writer, DateTimeOffset value, JsonSerializerOptions options)
+    {
+        writer.WriteStringValue(value.ToString("yyyy-MM-ddTHH:mm", CultureInfo.InvariantCulture));
+    }
+}

Btms.Types.Gvms.V1/ActualCrossing.g.cs

@@ -32,7 +32,7 @@ public partial class ActualCrossing  //
         /// The planned date and time of arrival, in local time of the arrival port. Must not include seconds, time zone or UTC marker
         /// </summary>
     [JsonPropertyName("localDateTimeOfArrival")]
-    public DateTime? ArrivesAt { get; set; }
+    public DateTimeOffset? ArrivesAt { get; set; }
 
 	}
 

Btms.Types.Gvms.V1/CheckedInCrossing.g.cs

@@ -32,7 +32,7 @@ public partial class CheckedInCrossing  //
         /// The planned date and time of arrival, in local time of the arrival port. Must not include seconds, time zone or UTC marker
         /// </summary>
     [JsonPropertyName("localDateTimeOfArrival")]
-    public DateTime? ArrivesAt { get; set; }
+    public DateTimeOffset? ArrivesAt { get; set; }
 
 	}
 

Btms.Types.Gvms.V1/PlannedCrossing.g.cs

@@ -32,7 +32,7 @@ public partial class PlannedCrossing  //
         /// The planned date and time of departure, in local time of the departure port. Must not include seconds, time zone or UTC marker
         /// </summary>
     [JsonPropertyName("localDateTimeOfDeparture")]
-    public DateTime? DepartsAt { get; set; }
+    public DateTimeOffset? DepartsAt { get; set; }
 
 	}
 

TestGenerator.IntegrationTesting.Backend/BtmsClient.cs

@@ -160,4 +160,6 @@ public JsonApiClient.JsonApiClient AsJsonApiClient()
     {
         return new JsonApiClient.JsonApiClient(client);
     }
+
+    public HttpClient AsHttpClient() => client;
 }