FUND-2188 merged zaakstatus date and time and other fields working correctly (#122)

heuvea · web-flow · commit 82d376a85202 · 2025-12-09T11:29:21.000+01:00
zaakstatus date and time and other fields working correctly
diff --git a/src/OneGround.ZGW.Common/Helpers/ProfileHelper.cs b/src/OneGround.ZGW.Common/Helpers/ProfileHelper.cs
@@ -8,12 +8,6 @@ namespace OneGround.ZGW.Common.Helpers;
 
 public static class ProfileHelper
 {
-    public static string SortableStringDateFromDate(DateTime date)
-    {
-        // Convert to UTC and format as ISO 8601 with 'Z' (Zulu/GMT)
-        return date != default ? date.ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ss", CultureInfo.InvariantCulture) + "Z" : null;
-    }
-
     public static string Fix0Period(Period period)
     {
         if (period == null)
@@ -35,9 +29,14 @@ public static string StringDateFromDateTime(DateTime? date, bool withTime = fals
 
     public static string StringDateFromDateTime(DateTime date, bool withTime = false)
     {
+        if (date == default)
+        {
+            return null;
+        }
+
         return withTime
-            ? date.ToString("yyyy-MM-ddTHH:mm:ssZ", CultureInfo.InvariantCulture)
-            : date.ToString("yyyy-MM-dd", CultureInfo.InvariantCulture);
+            ? date.ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ss", CultureInfo.InvariantCulture) + "Z"
+            : date.ToUniversalTime().ToString("yyyy-MM-dd", CultureInfo.InvariantCulture);
     }
 
     public static bool? BooleanFromString(string boolean)
diff --git a/src/OneGround.ZGW.Documenten.Contracts/v1/1/Responses/EnkelvoudigInformatieObjectResponseDto.cs b/src/OneGround.ZGW.Documenten.Contracts/v1/1/Responses/EnkelvoudigInformatieObjectResponseDto.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using Newtonsoft.Json;
 
@@ -13,7 +12,7 @@ public class EnkelvoudigInformatieObjectResponseDto : EnkelvoudigInformatieObjec
     public int Versie { get; set; }
 
     [JsonProperty(PropertyName = "beginRegistratie", Order = 71)]
-    public DateTime BeginRegistratie { get; set; }
+    public string BeginRegistratie { get; set; }
 
     [JsonProperty(PropertyName = "locked", Order = 72)]
     public bool Locked { get; set; }
diff --git a/src/OneGround.ZGW.Documenten.Contracts/v1/5/Responses/EnkelvoudigInformatieObjectResponseDto.cs b/src/OneGround.ZGW.Documenten.Contracts/v1/5/Responses/EnkelvoudigInformatieObjectResponseDto.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using Newtonsoft.Json;
 
@@ -13,7 +12,7 @@ public class EnkelvoudigInformatieObjectResponseDto : EnkelvoudigInformatieObjec
     public int Versie { get; set; }
 
     [JsonProperty(PropertyName = "beginRegistratie", Order = 71)]
-    public DateTime BeginRegistratie { get; set; }
+    public string BeginRegistratie { get; set; }
 
     [JsonProperty(PropertyName = "locked", Order = 72)]
     public bool Locked { get; set; }
diff --git a/src/OneGround.ZGW.Documenten.Contracts/v1/Responses/EnkelvoudiginformatieobjectResponseDto.cs b/src/OneGround.ZGW.Documenten.Contracts/v1/Responses/EnkelvoudiginformatieobjectResponseDto.cs
@@ -1,4 +1,3 @@
-using System;
 using Newtonsoft.Json;
 
 namespace OneGround.ZGW.Documenten.Contracts.v1.Responses;
@@ -12,7 +11,7 @@ public class EnkelvoudigInformatieObjectResponseDto : EnkelvoudigInformatieObjec
     public int Versie { get; set; }
 
     [JsonProperty(PropertyName = "beginRegistratie")]
-    public DateTime BeginRegistratie { get; set; }
+    public string BeginRegistratie { get; set; }
 
     [JsonProperty(PropertyName = "bestandsomvang")]
     public long Bestandsomvang { get; set; }
diff --git a/src/OneGround.ZGW.Documenten.Web/MappingProfiles/v1/1/DomainToResponseProfile.cs b/src/OneGround.ZGW.Documenten.Web/MappingProfiles/v1/1/DomainToResponseProfile.cs
@@ -40,6 +40,7 @@ public DomainToResponseProfile()
             .ForMember(dest => dest.Url, opt => opt.MapFrom<MemberUrlResolver, EnkelvoudigInformatieObject>(src => src.InformatieObject))
             .ForMember(dest => dest.CreatieDatum, opt => opt.MapFrom(src => ProfileHelper.StringDateFromDate(src.CreatieDatum)))
             .ForMember(dest => dest.OntvangstDatum, opt => opt.MapFrom(src => ProfileHelper.StringDateFromDate(src.OntvangstDatum)))
+            .ForMember(dest => dest.BeginRegistratie, opt => opt.MapFrom(src => ProfileHelper.StringDateFromDateTime(src.BeginRegistratie, true)))
             .ForMember(dest => dest.VerzendDatum, opt => opt.MapFrom(src => ProfileHelper.StringDateFromDate(src.VerzendDatum)))
             .ForMember(
                 dest => dest.Ondertekening,
@@ -60,6 +61,7 @@ public DomainToResponseProfile()
             .ForMember(dest => dest.Url, opt => opt.MapFrom<MemberUrlResolver, EnkelvoudigInformatieObject>(src => src.InformatieObject))
             .ForMember(dest => dest.CreatieDatum, opt => opt.MapFrom(src => ProfileHelper.StringDateFromDate(src.CreatieDatum)))
             .ForMember(dest => dest.OntvangstDatum, opt => opt.MapFrom(src => ProfileHelper.StringDateFromDate(src.OntvangstDatum)))
+            .ForMember(dest => dest.BeginRegistratie, opt => opt.MapFrom(src => ProfileHelper.StringDateFromDateTime(src.BeginRegistratie, true)))
             .ForMember(dest => dest.VerzendDatum, opt => opt.MapFrom(src => ProfileHelper.StringDateFromDate(src.VerzendDatum)))
             .ForMember(
                 dest => dest.Ondertekening,
diff --git a/src/OneGround.ZGW.Documenten.Web/MappingProfiles/v1/1/MapLatestEnkelvoudigInformatieObjectVersieResponse.cs b/src/OneGround.ZGW.Documenten.Web/MappingProfiles/v1/1/MapLatestEnkelvoudigInformatieObjectVersieResponse.cs
@@ -30,7 +30,7 @@ public void Process(EnkelvoudigInformatieObject src, EnkelvoudigInformatieObject
         dest.Bronorganisatie = latestVersion.Bronorganisatie;
         dest.Identificatie = latestVersion.Identificatie;
         dest.Bestandsomvang = latestVersion.Bestandsomvang;
-        dest.BeginRegistratie = latestVersion.BeginRegistratie;
+        dest.BeginRegistratie = ProfileHelper.StringDateFromDateTime(latestVersion.BeginRegistratie, withTime: true);
         dest.CreatieDatum = ProfileHelper.StringDateFromDate(latestVersion.CreatieDatum);
         dest.Titel = latestVersion.Titel;
         dest.Vertrouwelijkheidaanduiding = $"{latestVersion.Vertrouwelijkheidaanduiding}";
diff --git a/src/OneGround.ZGW.Documenten.Web/MappingProfiles/v1/5/DomainToResponseProfile.cs b/src/OneGround.ZGW.Documenten.Web/MappingProfiles/v1/5/DomainToResponseProfile.cs
@@ -43,6 +43,7 @@ public DomainToResponseProfile()
             .ForMember(dest => dest.Url, opt => opt.MapFrom<MemberUrlResolver, EnkelvoudigInformatieObject>(src => src.InformatieObject))
             .ForMember(dest => dest.CreatieDatum, opt => opt.MapFrom(src => ProfileHelper.StringDateFromDate(src.CreatieDatum)))
             .ForMember(dest => dest.OntvangstDatum, opt => opt.MapFrom(src => ProfileHelper.StringDateFromDate(src.OntvangstDatum)))
+            .ForMember(dest => dest.BeginRegistratie, opt => opt.MapFrom(src => ProfileHelper.StringDateFromDateTime(src.BeginRegistratie, true)))
             .ForMember(dest => dest.VerzendDatum, opt => opt.MapFrom(src => ProfileHelper.StringDateFromDate(src.VerzendDatum)))
             .ForMember(
                 dest => dest.Ondertekening,
@@ -65,6 +66,7 @@ public DomainToResponseProfile()
             .ForMember(dest => dest.Url, opt => opt.MapFrom<MemberUrlResolver, EnkelvoudigInformatieObject>(src => src.InformatieObject))
             .ForMember(dest => dest.CreatieDatum, opt => opt.MapFrom(src => ProfileHelper.StringDateFromDate(src.CreatieDatum)))
             .ForMember(dest => dest.OntvangstDatum, opt => opt.MapFrom(src => ProfileHelper.StringDateFromDate(src.OntvangstDatum)))
+            .ForMember(dest => dest.BeginRegistratie, opt => opt.MapFrom(src => ProfileHelper.StringDateFromDateTime(src.BeginRegistratie, true)))
             .ForMember(dest => dest.VerzendDatum, opt => opt.MapFrom(src => ProfileHelper.StringDateFromDate(src.VerzendDatum)))
             .ForMember(
                 dest => dest.Ondertekening,
diff --git a/src/OneGround.ZGW.Documenten.Web/MappingProfiles/v1/5/MapLatestEnkelvoudigInformatieObjectVersieResponse.cs b/src/OneGround.ZGW.Documenten.Web/MappingProfiles/v1/5/MapLatestEnkelvoudigInformatieObjectVersieResponse.cs
@@ -30,7 +30,7 @@ public void Process(EnkelvoudigInformatieObject src, EnkelvoudigInformatieObject
         dest.Bronorganisatie = latestVersion.Bronorganisatie;
         dest.Identificatie = latestVersion.Identificatie;
         dest.Bestandsomvang = latestVersion.Bestandsomvang;
-        dest.BeginRegistratie = latestVersion.BeginRegistratie;
+        dest.BeginRegistratie = ProfileHelper.StringDateFromDateTime(latestVersion.BeginRegistratie, withTime: true);
         dest.CreatieDatum = ProfileHelper.StringDateFromDate(latestVersion.CreatieDatum);
         dest.Titel = latestVersion.Titel;
         dest.Vertrouwelijkheidaanduiding = $"{latestVersion.Vertrouwelijkheidaanduiding}";
diff --git a/src/OneGround.ZGW.Documenten.Web/MappingProfiles/v1/DomainToResponseProfile.cs b/src/OneGround.ZGW.Documenten.Web/MappingProfiles/v1/DomainToResponseProfile.cs
@@ -44,6 +44,7 @@ public DomainToResponseProfile()
             .ForMember(dest => dest.Url, opt => opt.MapFrom<MemberUrlResolver, EnkelvoudigInformatieObject>(src => src.InformatieObject))
             .ForMember(dest => dest.CreatieDatum, opt => opt.MapFrom(src => ProfileHelper.StringDateFromDate(src.CreatieDatum)))
             .ForMember(dest => dest.OntvangstDatum, opt => opt.MapFrom(src => ProfileHelper.StringDateFromDate(src.OntvangstDatum)))
+            .ForMember(dest => dest.BeginRegistratie, opt => opt.MapFrom(src => ProfileHelper.StringDateFromDateTime(src.BeginRegistratie, true)))
             .ForMember(dest => dest.VerzendDatum, opt => opt.MapFrom(src => ProfileHelper.StringDateFromDate(src.VerzendDatum)))
             .ForMember(
                 dest => dest.Ondertekening,
@@ -62,6 +63,7 @@ public DomainToResponseProfile()
             .ForMember(dest => dest.Url, opt => opt.MapFrom<MemberUrlResolver, EnkelvoudigInformatieObject>(src => src.InformatieObject))
             .ForMember(dest => dest.CreatieDatum, opt => opt.MapFrom(src => ProfileHelper.StringDateFromDate(src.CreatieDatum)))
             .ForMember(dest => dest.OntvangstDatum, opt => opt.MapFrom(src => ProfileHelper.StringDateFromDate(src.OntvangstDatum)))
+            .ForMember(dest => dest.BeginRegistratie, opt => opt.MapFrom(src => ProfileHelper.StringDateFromDateTime(src.BeginRegistratie, true)))
             .ForMember(dest => dest.VerzendDatum, opt => opt.MapFrom(src => ProfileHelper.StringDateFromDate(src.VerzendDatum)))
             .ForMember(
                 dest => dest.Ondertekening,
diff --git a/src/OneGround.ZGW.Documenten.Web/MappingProfiles/v1/MapLatestEnkelvoudigInformatieObjectVersieResponse.cs b/src/OneGround.ZGW.Documenten.Web/MappingProfiles/v1/MapLatestEnkelvoudigInformatieObjectVersieResponse.cs
@@ -30,7 +30,7 @@ public void Process(EnkelvoudigInformatieObject src, EnkelvoudigInformatieObject
         dest.Bronorganisatie = latestVersion.Bronorganisatie;
         dest.Identificatie = latestVersion.Identificatie;
         dest.Bestandsomvang = latestVersion.Bestandsomvang;
-        dest.BeginRegistratie = latestVersion.BeginRegistratie;
+        dest.BeginRegistratie = ProfileHelper.StringDateFromDateTime(latestVersion.BeginRegistratie, withTime: true);
         dest.CreatieDatum = ProfileHelper.StringDateFromDate(latestVersion.CreatieDatum);
         dest.Titel = latestVersion.Titel;
         dest.Vertrouwelijkheidaanduiding = $"{latestVersion.Vertrouwelijkheidaanduiding}";
diff --git a/src/OneGround.ZGW.Zaken.Web/MappingProfiles/v1/5/DomainToResponseProfile.cs b/src/OneGround.ZGW.Zaken.Web/MappingProfiles/v1/5/DomainToResponseProfile.cs
@@ -103,13 +103,13 @@ public DomainToResponseProfile()
             .ForMember(dest => dest.Url, opt => opt.MapFrom<UrlResolver>())
             .ForMember(dest => dest.Uuid, opt => opt.MapFrom(src => src.Id))
             .ForMember(dest => dest.Zaak, opt => opt.MapFrom<MemberUrlResolver, Zaak>(src => src.Zaak))
-            .ForMember(dest => dest.DatumStatusGezet, opt => opt.MapFrom(src => ProfileHelper.SortableStringDateFromDate(src.DatumStatusGezet)));
+            .ForMember(dest => dest.DatumStatusGezet, opt => opt.MapFrom(src => ProfileHelper.StringDateFromDateTime(src.DatumStatusGezet, true)));
 
         CreateMap<ZaakStatus, ZaakStatusGetResponseDto>()
             .ForMember(dest => dest.Url, opt => opt.MapFrom<UrlResolver>())
             .ForMember(dest => dest.Uuid, opt => opt.MapFrom(src => src.Id))
             .ForMember(dest => dest.Zaak, opt => opt.MapFrom<MemberUrlResolver, Zaak>(src => src.Zaak))
-            .ForMember(dest => dest.DatumStatusGezet, opt => opt.MapFrom(src => ProfileHelper.SortableStringDateFromDate(src.DatumStatusGezet)))
+            .ForMember(dest => dest.DatumStatusGezet, opt => opt.MapFrom(src => ProfileHelper.StringDateFromDateTime(src.DatumStatusGezet, true)))
             .ForMember(
                 dest => dest.ZaakInformatieObjecten,
                 opt => opt.MapFrom<MemberUrlsResolver, IEnumerable<ZaakInformatieObject>>(src => src.Zaak.ZaakInformatieObjecten)
diff --git a/src/OneGround.ZGW.Zaken.Web/MappingProfiles/v1/DomainToResponseProfile.cs b/src/OneGround.ZGW.Zaken.Web/MappingProfiles/v1/DomainToResponseProfile.cs
@@ -86,7 +86,7 @@ public DomainToResponseProfile()
             .ForMember(dest => dest.Url, opt => opt.MapFrom<UrlResolver>())
             .ForMember(dest => dest.Uuid, opt => opt.MapFrom(src => src.Id))
             .ForMember(dest => dest.Zaak, opt => opt.MapFrom<MemberUrlResolver, Zaak>(src => src.Zaak))
-            .ForMember(dest => dest.DatumStatusGezet, opt => opt.MapFrom(src => ProfileHelper.SortableStringDateFromDate(src.DatumStatusGezet)));
+            .ForMember(dest => dest.DatumStatusGezet, opt => opt.MapFrom(src => ProfileHelper.StringDateFromDateTime(src.DatumStatusGezet, true)));
 
         //
         // 3. ZaakEigenschap
diff --git a/src/Tests/OneGround.ZGW.Common.UnitTests/ProfileHelperTests.cs b/src/Tests/OneGround.ZGW.Common.UnitTests/ProfileHelperTests.cs
@@ -1,4 +1,4 @@
-﻿using System;
+using System;
 using OneGround.ZGW.Common.Helpers;
 using Xunit;
 
@@ -29,7 +29,7 @@ public void ProfileHelper_maps_datetime_to_string_correctly()
         var regular = ProfileHelper.StringDateFromDateTime(regularDateTime, withTime: true);
 
         var expectedUtcString = utcDateTime.ToString(UtcFormat);
-        var expectedRegularString = regularDateTime.ToString(UtcFormat);
+        var expectedRegularString = regularDateTime.ToUniversalTime().ToString(UtcFormat);
 
         Assert.Equal(expectedUtcString, utc);
         Assert.Equal(expectedRegularString, regular);
diff --git a/src/Tests/OneGround.ZGW.Documenten.WebApi.UnitTests/MappingTests/DomainToResponseProfileTests.cs b/src/Tests/OneGround.ZGW.Documenten.WebApi.UnitTests/MappingTests/DomainToResponseProfileTests.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using AutoFixture;
 using AutoMapper;
@@ -23,6 +24,7 @@ public class ResponseToDomainProfileTests
     public ResponseToDomainProfileTests()
     {
         _fixture.Register<DateOnly>(() => DateOnly.FromDateTime(DateTime.UtcNow));
+        _fixture.Register<DateTime>(() => DateTime.UtcNow);
 
         var configuration = new MapperConfiguration(config =>
         {
@@ -77,7 +79,10 @@ public void EnkelvoudigInformatieObject_Maps_To_EnkelvoudiginformatieobjectGetRe
         Assert.Equal(value.Url, result.Url);
         Assert.Equal(latest.Versie, result.Versie);
 
-        Assert.Equal(latest.BeginRegistratie, result.BeginRegistratie);
+        Assert.Equal(
+            latest.BeginRegistratie.ToUniversalTime().ToString("yyyy-MM-dd'T'HH:mm:ss'Z'", CultureInfo.InvariantCulture),
+            result.BeginRegistratie
+        );
         Assert.Equal(latest.Bestandsomvang, result.Bestandsomvang);
 
         Assert.Equal(latest.Identificatie, result.Identificatie);
@@ -203,7 +208,7 @@ public void GebruiksRecht_Maps_To_GebruiksRechtResponseDto()
         // Assert
         Assert.Equal(value.InformatieObject.Url, result.InformatieObject);
         Assert.Equal(value.OmschrijvingVoorwaarden, result.OmschrijvingVoorwaarden);
-        Assert.Equal(value.Startdatum.ToString("yyyy-MM-ddTHH:mm:ssZ"), result.Startdatum);
+        Assert.Equal(value.Startdatum.ToUniversalTime().ToString("yyyy-MM-dd'T'HH:mm:ss'Z'", CultureInfo.InvariantCulture), result.Startdatum);
         Assert.Equal(value.Einddatum.Value.ToString("yyyy-MM-ddTHH:mm:ssZ"), result.Einddatum);
     }
 }
diff --git a/src/Tests/OneGround.ZGW.Zaken.WebApi.UnitTests/MappingTests/DomainToResponseProfileTests.cs b/src/Tests/OneGround.ZGW.Zaken.WebApi.UnitTests/MappingTests/DomainToResponseProfileTests.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using AutoFixture;
 using AutoMapper;
@@ -128,7 +128,10 @@ public void Zaak_Maps_To_ZaakResponseDto()
         Assert.Equal(value.EinddatumGepland?.ToString("yyyy-MM-dd"), result.EinddatumGepland);
         Assert.Equal(value.UiterlijkeEinddatumAfdoening?.ToString("yyyy-MM-dd"), result.UiterlijkeEinddatumAfdoening);
         Assert.Equal(value.Publicatiedatum?.ToString("yyyy-MM-dd"), result.Publicatiedatum);
-        Assert.Equal(value.LaatsteBetaaldatum?.ToString("yyyy-MM-ddTHH:mm:ssZ"), result.LaatsteBetaaldatum);
+        Assert.Equal(
+            value.LaatsteBetaaldatum?.ToUniversalTime().ToString("yyyy-MM-dd'T'HH:mm:ss'Z'", CultureInfo.InvariantCulture),
+            result.LaatsteBetaaldatum
+        );
         Assert.Equal(value.Archiefactiedatum?.ToString("yyyy-MM-dd"), result.Archiefactiedatum);
         Assert.Equal(value.Archiefnominatie.ToString(), result.Archiefnominatie);
         Assert.Equal(value.Archiefstatus.ToString(), result.Archiefstatus);
