fix: command provenance should be set after idempotency check

Informatievlaanderen · Jan 9, 2024 · 6e2f232 · 6e2f232
1 parent cafbbeb
commit 6e2f232
Show file tree

Hide file tree

Showing 23 changed files with 83 additions and 76 deletions.
diff --git a/src/AddressRegistry.Api.BackOffice.Handlers.Lambda/Handlers/ReaddressLambdaHandler.cs b/src/AddressRegistry.Api.BackOffice.Handlers.Lambda/Handlers/ReaddressLambdaHandler.cs
@@ -122,7 +122,7 @@ await IdempotentCommandHandler.Dispatch(
                             addressPersistentLocalId,
                             destinationAddress.AddressPersistentLocalId,
                             destinationBoxNumbers,
-                            request.CommandProvenance);
+                            request.Provenance);
 
                         await scope.Resolve<IIdempotentCommandHandler>().Dispatch(
                             rejectOrRetireAddresses.CreateCommandId(),

diff --git a/src/AddressRegistry.Api.BackOffice.Handlers.Lambda/Requests/AddressLambdaRequest.cs b/src/AddressRegistry.Api.BackOffice.Handlers.Lambda/Requests/AddressLambdaRequest.cs
@@ -14,13 +14,5 @@ protected AddressLambdaRequest(
             IDictionary<string, object?> metadata)
             : base(messageGroupId, ticketId, ifMatchHeaderValue, provenance, metadata)
         { }
-
-        internal Provenance CommandProvenance => new Provenance(
-            SystemClock.Instance.GetCurrentInstant(),
-            Provenance.Application,
-            Provenance.Reason,
-            Provenance.Operator,
-            Provenance.Modification,
-            Provenance.Organisation);
     }
 }
diff --git a/src/AddressRegistry.Api.BackOffice.Handlers.Lambda/Requests/ApproveAddressLambdaRequest.cs b/src/AddressRegistry.Api.BackOffice.Handlers.Lambda/Requests/ApproveAddressLambdaRequest.cs
@@ -2,14 +2,14 @@ namespace AddressRegistry.Api.BackOffice.Handlers.Lambda.Requests
 {
     using Abstractions.Requests;
     using Abstractions.SqsRequests;
-    using Be.Vlaanderen.Basisregisters.Sqs.Lambda.Requests;
     using StreetName;
     using StreetName.Commands;
+    using IHasAddressPersistentLocalId = Abstractions.IHasAddressPersistentLocalId;
 
     public sealed record ApproveAddressLambdaRequest :
         AddressLambdaRequest,
         IHasBackOfficeRequest<ApproveAddressRequest>,
-        Abstractions.IHasAddressPersistentLocalId
+        IHasAddressPersistentLocalId
     {
         public ApproveAddressLambdaRequest(string groupId, ApproveAddressSqsRequest sqsRequest)
             : base(
@@ -32,7 +32,7 @@ public ApproveAddressLambdaRequest(string groupId, ApproveAddressSqsRequest sqsR
         /// <returns>ApproveAddress.</returns>
         public ApproveAddress ToCommand()
         {
-            return new ApproveAddress(this.StreetNamePersistentLocalId(), new AddressPersistentLocalId(AddressPersistentLocalId), CommandProvenance);
+            return new ApproveAddress(this.StreetNamePersistentLocalId(), new AddressPersistentLocalId(AddressPersistentLocalId), Provenance);
         }
     }
 }
diff --git a/...essRegistry.Api.BackOffice.Handlers.Lambda/Requests/ChangeAddressPositionLambdaRequest.cs b/...essRegistry.Api.BackOffice.Handlers.Lambda/Requests/ChangeAddressPositionLambdaRequest.cs
@@ -4,14 +4,14 @@ namespace AddressRegistry.Api.BackOffice.Handlers.Lambda.Requests
     using Abstractions.Converters;
     using Abstractions.Requests;
     using Abstractions.SqsRequests;
-    using Be.Vlaanderen.Basisregisters.Sqs.Lambda.Requests;
     using StreetName;
     using StreetName.Commands;
+    using IHasAddressPersistentLocalId = Abstractions.IHasAddressPersistentLocalId;
 
     public sealed record ChangeAddressPositionLambdaRequest :
         AddressLambdaRequest,
         IHasBackOfficeRequest<ChangeAddressPositionRequest>,
-        Abstractions.IHasAddressPersistentLocalId
+        IHasAddressPersistentLocalId
     {
         public ChangeAddressPositionLambdaRequest(
             string groupId,
@@ -43,7 +43,7 @@ public ChangeAddressPosition ToCommand()
                 Request.PositieGeometrieMethode.Map(),
                 Request.PositieSpecificatie.Map(),
                 Request.Positie.ToExtendedWkbGeometry(),
-                CommandProvenance);
+                Provenance);
         }
     }
 }
diff --git a/...sRegistry.Api.BackOffice.Handlers.Lambda/Requests/ChangeAddressPostalCodeLambdaRequest.cs b/...sRegistry.Api.BackOffice.Handlers.Lambda/Requests/ChangeAddressPostalCodeLambdaRequest.cs
@@ -3,14 +3,14 @@ namespace AddressRegistry.Api.BackOffice.Handlers.Lambda.Requests
     using Abstractions.Requests;
     using Abstractions.SqsRequests;
     using Be.Vlaanderen.Basisregisters.GrAr.Common.Oslo.Extensions;
-    using Be.Vlaanderen.Basisregisters.Sqs.Lambda.Requests;
     using StreetName;
     using StreetName.Commands;
+    using IHasAddressPersistentLocalId = Abstractions.IHasAddressPersistentLocalId;
 
     public sealed record ChangeAddressPostalCodeLambdaRequest :
         AddressLambdaRequest,
         IHasBackOfficeRequest<ChangeAddressPostalCodeRequest>,
-        Abstractions.IHasAddressPersistentLocalId
+        IHasAddressPersistentLocalId
     {
         public ChangeAddressPostalCodeLambdaRequest(string groupId, ChangeAddressPostalCodeSqsRequest sqsRequest)
             : base(
@@ -43,7 +43,7 @@ public ChangeAddressPostalCode ToCommand()
                 this.StreetNamePersistentLocalId(),
                 new AddressPersistentLocalId(AddressPersistentLocalId),
                 postalCode,
-                CommandProvenance);
+                Provenance);
         }
     }
 }
diff --git a/...ssRegistry.Api.BackOffice.Handlers.Lambda/Requests/CorrectAddressApprovalLambdaRequest.cs b/...ssRegistry.Api.BackOffice.Handlers.Lambda/Requests/CorrectAddressApprovalLambdaRequest.cs
@@ -2,14 +2,14 @@ namespace AddressRegistry.Api.BackOffice.Handlers.Lambda.Requests
 {
     using Abstractions.Requests;
     using Abstractions.SqsRequests;
-    using Be.Vlaanderen.Basisregisters.Sqs.Lambda.Requests;
     using StreetName;
     using StreetName.Commands;
+    using IHasAddressPersistentLocalId = Abstractions.IHasAddressPersistentLocalId;
 
     public sealed record CorrectAddressApprovalLambdaRequest :
         AddressLambdaRequest,
         IHasBackOfficeRequest<CorrectAddressApprovalRequest>,
-        Abstractions.IHasAddressPersistentLocalId
+        IHasAddressPersistentLocalId
     {
         public CorrectAddressApprovalLambdaRequest(string groupId, CorrectAddressApprovalSqsRequest sqsRequest)
             : base(
@@ -32,7 +32,7 @@ public CorrectAddressApprovalLambdaRequest(string groupId, CorrectAddressApprova
         /// <returns>CorrectAddressApproval.</returns>
         public CorrectAddressApproval ToCommand()
         {
-            return new CorrectAddressApproval(this.StreetNamePersistentLocalId(), new AddressPersistentLocalId(AddressPersistentLocalId), CommandProvenance);
+            return new CorrectAddressApproval(this.StreetNamePersistentLocalId(), new AddressPersistentLocalId(AddressPersistentLocalId), Provenance);
         }
     }
 }
diff --git a/...sRegistry.Api.BackOffice.Handlers.Lambda/Requests/CorrectAddressBoxNumberLambdaRequest.cs b/...sRegistry.Api.BackOffice.Handlers.Lambda/Requests/CorrectAddressBoxNumberLambdaRequest.cs
@@ -2,14 +2,14 @@ namespace AddressRegistry.Api.BackOffice.Handlers.Lambda.Requests
 {
     using Abstractions.Requests;
     using Abstractions.SqsRequests;
-    using Be.Vlaanderen.Basisregisters.Sqs.Lambda.Requests;
     using StreetName;
     using StreetName.Commands;
+    using IHasAddressPersistentLocalId = Abstractions.IHasAddressPersistentLocalId;
 
     public sealed record CorrectAddressBoxNumberLambdaRequest :
         AddressLambdaRequest,
         IHasBackOfficeRequest<CorrectAddressBoxNumberRequest>,
-        Abstractions.IHasAddressPersistentLocalId
+        IHasAddressPersistentLocalId
     {
         public CorrectAddressBoxNumberLambdaRequest(string groupId, CorrectAddressBoxNumberSqsRequest sqsRequest)
             : base(
@@ -37,7 +37,7 @@ public CorrectAddressBoxNumber ToCommand()
                 this.StreetNamePersistentLocalId(),
                 new AddressPersistentLocalId(AddressPersistentLocalId),
                 BoxNumber.Create(Request.Busnummer),
-                CommandProvenance);
+                Provenance);
         }
     }
 }
diff --git a/...gistry.Api.BackOffice.Handlers.Lambda/Requests/CorrectAddressDeregulationLambdaRequest.cs b/...gistry.Api.BackOffice.Handlers.Lambda/Requests/CorrectAddressDeregulationLambdaRequest.cs
@@ -2,14 +2,14 @@ namespace AddressRegistry.Api.BackOffice.Handlers.Lambda.Requests
 {
     using Abstractions.Requests;
     using Abstractions.SqsRequests;
-    using Be.Vlaanderen.Basisregisters.Sqs.Lambda.Requests;
     using StreetName;
     using StreetName.Commands;
+    using IHasAddressPersistentLocalId = Abstractions.IHasAddressPersistentLocalId;
 
     public sealed record CorrectAddressDeregulationLambdaRequest :
         AddressLambdaRequest,
         IHasBackOfficeRequest<CorrectAddressDeregulationRequest>,
-        Abstractions.IHasAddressPersistentLocalId
+        IHasAddressPersistentLocalId
     {
         public CorrectAddressDeregulationLambdaRequest(string groupId, CorrectAddressDeregulationSqsRequest regularizationSqsRequest)
             : base(
@@ -35,7 +35,7 @@ public CorrectAddressDeregulation ToCommand()
             return new CorrectAddressDeregulation(
                 this.StreetNamePersistentLocalId(),
                 new AddressPersistentLocalId(AddressPersistentLocalId),
-                CommandProvenance);
+                Provenance);
         }
     }
 }
diff --git a/...egistry.Api.BackOffice.Handlers.Lambda/Requests/CorrectAddressHouseNumberLambdaRequest.cs b/...egistry.Api.BackOffice.Handlers.Lambda/Requests/CorrectAddressHouseNumberLambdaRequest.cs
@@ -2,14 +2,14 @@ namespace AddressRegistry.Api.BackOffice.Handlers.Lambda.Requests
 {
     using Abstractions.Requests;
     using Abstractions.SqsRequests;
-    using Be.Vlaanderen.Basisregisters.Sqs.Lambda.Requests;
     using StreetName;
     using StreetName.Commands;
+    using IHasAddressPersistentLocalId = Abstractions.IHasAddressPersistentLocalId;
 
     public sealed record CorrectAddressHouseNumberLambdaRequest :
         AddressLambdaRequest,
         IHasBackOfficeRequest<CorrectAddressHouseNumberRequest>,
-        Abstractions.IHasAddressPersistentLocalId
+        IHasAddressPersistentLocalId
     {
         public CorrectAddressHouseNumberLambdaRequest(string groupId, CorrectAddressHouseNumberSqsRequest sqsRequest)
             : base(
@@ -37,7 +37,7 @@ public CorrectAddressHouseNumber ToCommand()
                 this.StreetNamePersistentLocalId(),
                 new AddressPersistentLocalId(AddressPersistentLocalId),
                 HouseNumber.Create(Request.Huisnummer),
-                CommandProvenance);
+                Provenance);
         }
     }
 }
diff --git a/...ssRegistry.Api.BackOffice.Handlers.Lambda/Requests/CorrectAddressPositionLambdaRequest.cs b/...ssRegistry.Api.BackOffice.Handlers.Lambda/Requests/CorrectAddressPositionLambdaRequest.cs
@@ -4,14 +4,14 @@ namespace AddressRegistry.Api.BackOffice.Handlers.Lambda.Requests
     using Abstractions.Converters;
     using Abstractions.Requests;
     using Abstractions.SqsRequests;
-    using Be.Vlaanderen.Basisregisters.Sqs.Lambda.Requests;
     using StreetName;
     using StreetName.Commands;
+    using IHasAddressPersistentLocalId = Abstractions.IHasAddressPersistentLocalId;
 
     public sealed record CorrectAddressPositionLambdaRequest :
         AddressLambdaRequest,
         IHasBackOfficeRequest<CorrectAddressPositionRequest>,
-        Abstractions.IHasAddressPersistentLocalId
+        IHasAddressPersistentLocalId
     {
         public CorrectAddressPositionLambdaRequest(string groupId, CorrectAddressPositionSqsRequest sqsRequest)
             : base(
@@ -41,7 +41,7 @@ public CorrectAddressPosition ToCommand()
                 Request.PositieGeometrieMethode.Map(),
                 Request.PositieSpecificatie.Map(),
                 Request.Positie.ToExtendedWkbGeometry(),
-                CommandProvenance);
+                Provenance);
         }
     }
 }
diff --git a/...Registry.Api.BackOffice.Handlers.Lambda/Requests/CorrectAddressPostalCodeLambdaRequest.cs b/...Registry.Api.BackOffice.Handlers.Lambda/Requests/CorrectAddressPostalCodeLambdaRequest.cs
@@ -3,14 +3,14 @@ namespace AddressRegistry.Api.BackOffice.Handlers.Lambda.Requests
     using Abstractions.Requests;
     using Abstractions.SqsRequests;
     using Be.Vlaanderen.Basisregisters.GrAr.Common.Oslo.Extensions;
-    using Be.Vlaanderen.Basisregisters.Sqs.Lambda.Requests;
     using StreetName;
     using StreetName.Commands;
+    using IHasAddressPersistentLocalId = Abstractions.IHasAddressPersistentLocalId;
 
     public sealed record CorrectAddressPostalCodeLambdaRequest :
         AddressLambdaRequest,
         IHasBackOfficeRequest<CorrectAddressPostalCodeRequest>,
-        Abstractions.IHasAddressPersistentLocalId
+        IHasAddressPersistentLocalId
     {
         public CorrectAddressPostalCodeLambdaRequest(string groupId, CorrectAddressPostalCodeSqsRequest sqsRequest)
             : base(
@@ -44,7 +44,7 @@ public CorrectAddressPostalCode ToCommand(MunicipalityId municipalityId)
                 new AddressPersistentLocalId(AddressPersistentLocalId),
                 postalCode,
                 municipalityId,
-                CommandProvenance);
+                Provenance);
         }
     }
 }
diff --git a/...stry.Api.BackOffice.Handlers.Lambda/Requests/CorrectAddressRegularizationLambdaRequest.cs b/...stry.Api.BackOffice.Handlers.Lambda/Requests/CorrectAddressRegularizationLambdaRequest.cs
@@ -2,14 +2,14 @@ namespace AddressRegistry.Api.BackOffice.Handlers.Lambda.Requests
 {
     using Abstractions.Requests;
     using Abstractions.SqsRequests;
-    using Be.Vlaanderen.Basisregisters.Sqs.Lambda.Requests;
     using StreetName;
     using StreetName.Commands;
+    using IHasAddressPersistentLocalId = Abstractions.IHasAddressPersistentLocalId;
 
     public sealed record CorrectAddressRegularizationLambdaRequest :
         AddressLambdaRequest,
         IHasBackOfficeRequest<CorrectAddressRegularizationRequest>,
-        Abstractions.IHasAddressPersistentLocalId
+        IHasAddressPersistentLocalId
     {
         public CorrectAddressRegularizationLambdaRequest(string groupId, CorrectAddressRegularizationSqsRequest regularizationSqsRequest)
             : base(
@@ -35,7 +35,7 @@ public CorrectAddressRegularization ToCommand()
             return new CorrectAddressRegularization(
                 this.StreetNamePersistentLocalId(),
                 new AddressPersistentLocalId(AddressPersistentLocalId),
-                CommandProvenance);
+                Provenance);
         }
     }
 }
diff --git a/...sRegistry.Api.BackOffice.Handlers.Lambda/Requests/CorrectAddressRejectionLambdaRequest.cs b/...sRegistry.Api.BackOffice.Handlers.Lambda/Requests/CorrectAddressRejectionLambdaRequest.cs
@@ -2,14 +2,14 @@ namespace AddressRegistry.Api.BackOffice.Handlers.Lambda.Requests
 {
     using Abstractions.Requests;
     using Abstractions.SqsRequests;
-    using Be.Vlaanderen.Basisregisters.Sqs.Lambda.Requests;
     using StreetName;
     using StreetName.Commands;
+    using IHasAddressPersistentLocalId = Abstractions.IHasAddressPersistentLocalId;
 
     public sealed record CorrectAddressRejectionLambdaRequest :
         AddressLambdaRequest,
         IHasBackOfficeRequest<CorrectAddressRejectionRequest>,
-        Abstractions.IHasAddressPersistentLocalId
+        IHasAddressPersistentLocalId
     {
         public CorrectAddressRejectionLambdaRequest(string groupId, CorrectAddressRejectionSqsRequest sqsRequest)
             : base(
@@ -35,7 +35,7 @@ public CorrectAddressRejection ToCommand()
             return new CorrectAddressRejection(
                 this.StreetNamePersistentLocalId(),
                 new AddressPersistentLocalId(AddressPersistentLocalId),
-                CommandProvenance);
+                Provenance);
         }
     }
 }
diff --git a/...Registry.Api.BackOffice.Handlers.Lambda/Requests/CorrectAddressRetirementLambdaRequest.cs b/...Registry.Api.BackOffice.Handlers.Lambda/Requests/CorrectAddressRetirementLambdaRequest.cs
@@ -2,14 +2,14 @@ namespace AddressRegistry.Api.BackOffice.Handlers.Lambda.Requests
 {
     using Abstractions.Requests;
     using Abstractions.SqsRequests;
-    using Be.Vlaanderen.Basisregisters.Sqs.Lambda.Requests;
     using StreetName;
     using StreetName.Commands;
+    using IHasAddressPersistentLocalId = Abstractions.IHasAddressPersistentLocalId;
 
     public sealed record CorrectAddressRetirementLambdaRequest :
         AddressLambdaRequest,
         IHasBackOfficeRequest<CorrectAddressRetirementRequest>,
-        Abstractions.IHasAddressPersistentLocalId
+        IHasAddressPersistentLocalId
     {
         public CorrectAddressRetirementLambdaRequest(string groupId, CorrectAddressRetirementSqsRequest sqsRequest)
             : base(
@@ -32,7 +32,7 @@ public CorrectAddressRetirementLambdaRequest(string groupId, CorrectAddressRetir
         /// <returns>CorrectAddressRetirement.</returns>
         public CorrectAddressRetirement ToCommand()
         {
-            return new CorrectAddressRetirement(this.StreetNamePersistentLocalId(), new AddressPersistentLocalId(AddressPersistentLocalId), CommandProvenance);
+            return new CorrectAddressRetirement(this.StreetNamePersistentLocalId(), new AddressPersistentLocalId(AddressPersistentLocalId), Provenance);
         }
     }
 }
diff --git a/...AddressRegistry.Api.BackOffice.Handlers.Lambda/Requests/DeregulateAddressLambdaRequest.cs b/...AddressRegistry.Api.BackOffice.Handlers.Lambda/Requests/DeregulateAddressLambdaRequest.cs
@@ -2,14 +2,14 @@ namespace AddressRegistry.Api.BackOffice.Handlers.Lambda.Requests
 {
     using Abstractions.Requests;
     using Abstractions.SqsRequests;
-    using Be.Vlaanderen.Basisregisters.Sqs.Lambda.Requests;
     using StreetName;
     using StreetName.Commands;
+    using IHasAddressPersistentLocalId = Abstractions.IHasAddressPersistentLocalId;
 
     public sealed record DeregulateAddressLambdaRequest :
         AddressLambdaRequest,
         IHasBackOfficeRequest<DeregulateAddressRequest>,
-        Abstractions.IHasAddressPersistentLocalId
+        IHasAddressPersistentLocalId
     {
         public DeregulateAddressLambdaRequest(string groupId, DeregulateAddressSqsRequest sqsRequest)
             : base(
@@ -35,7 +35,7 @@ public DeregulateAddress ToCommand()
             return new DeregulateAddress(
                 this.StreetNamePersistentLocalId(),
                 new AddressPersistentLocalId(AddressPersistentLocalId),
-                CommandProvenance);
+                Provenance);
         }
     }
 }
diff --git a/src/AddressRegistry.Api.BackOffice.Handlers.Lambda/Requests/ProposeAddressLambdaRequest.cs b/src/AddressRegistry.Api.BackOffice.Handlers.Lambda/Requests/ProposeAddressLambdaRequest.cs
@@ -4,7 +4,6 @@ namespace AddressRegistry.Api.BackOffice.Handlers.Lambda.Requests
     using Abstractions.Converters;
     using Abstractions.Requests;
     using Abstractions.SqsRequests;
-    using Be.Vlaanderen.Basisregisters.Sqs.Lambda.Requests;
     using StreetName;
     using StreetName.Commands;
 
@@ -46,7 +45,7 @@ public ProposeAddress ToCommand(
                 Request.PositieGeometrieMethode.Map(),
                 Request.PositieSpecificatie.Map(),
                 Request.Positie.ToExtendedWkbGeometry(),
-                CommandProvenance);
+                Provenance);
         }
     }
 }
diff --git a/src/AddressRegistry.Api.BackOffice.Handlers.Lambda/Requests/ReaddressLambdaRequest.cs b/src/AddressRegistry.Api.BackOffice.Handlers.Lambda/Requests/ReaddressLambdaRequest.cs
@@ -2,7 +2,6 @@ namespace AddressRegistry.Api.BackOffice.Handlers.Lambda.Requests
 {
     using Abstractions.Requests;
     using Abstractions.SqsRequests;
-    using Be.Vlaanderen.Basisregisters.Sqs.Lambda.Requests;
     using StreetName.Commands;
 
     public sealed record ReaddressLambdaRequest :
@@ -32,7 +31,7 @@ public Readdress ToCommand(List<ReaddressAddressItem> readdressAddressItems, Lis
                 this.StreetNamePersistentLocalId(),
                 readdressAddressItems,
                 retireAddressItems,
-                CommandProvenance);
+                Provenance);
         }
     }
 }