fix: command provenance should be set after idempotency check

Informatievlaanderen · Jan 9, 2024 · cb8c11a · cb8c11a
1 parent 167f0d7
commit cb8c11a
Show file tree

Hide file tree

Showing 37 changed files with 104 additions and 128 deletions.
diff --git a/...uildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/Building/BuildingLambdaRequest.cs b/...uildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/Building/BuildingLambdaRequest.cs
@@ -14,13 +14,5 @@ protected BuildingLambdaRequest(
             IDictionary<string, object?> metadata)
             : base(messageGroupId, ticketId, ifMatchHeaderValue, provenance, metadata)
         { }
-
-        protected Provenance CommandProvenance => new Provenance(
-            SystemClock.Instance.GetCurrentInstant(),
-            Provenance.Application,
-            Provenance.Reason,
-            Provenance.Operator,
-            Provenance.Modification,
-            Provenance.Organisation);
     }
 }
diff --git a/...pi.BackOffice.Handlers.Lambda/Requests/Building/ChangeBuildingMeasurementLambdaRequest.cs b/...pi.BackOffice.Handlers.Lambda/Requests/Building/ChangeBuildingMeasurementLambdaRequest.cs
@@ -33,7 +33,7 @@ public ChangeBuildingMeasurement ToCommand()
                 new BuildingPersistentLocalId(BuildingPersistentLocalId),
                 Request.GrbData.GeometriePolygoon.ToExtendedWkbGeometry(),
                 Request.GrbData.ToBuildingGrbData(),
-                CommandProvenance);
+                Provenance);
         }
     }
 }
diff --git a/...ry.Api.BackOffice.Handlers.Lambda/Requests/Building/ChangeBuildingOutlineLambdaRequest.cs b/...ry.Api.BackOffice.Handlers.Lambda/Requests/Building/ChangeBuildingOutlineLambdaRequest.cs
@@ -31,7 +31,7 @@ public ChangeBuildingOutline ToCommand()
             return new ChangeBuildingOutline(
                 new BuildingPersistentLocalId(BuildingPersistentLocalId),
                 Request.GeometriePolygoon.ToExtendedWkbGeometry(),
-                CommandProvenance);
+                Provenance);
         }
     }
 }
diff --git a/...i.BackOffice.Handlers.Lambda/Requests/Building/CorrectBuildingMeasurementLambdaRequest.cs b/...i.BackOffice.Handlers.Lambda/Requests/Building/CorrectBuildingMeasurementLambdaRequest.cs
@@ -37,7 +37,7 @@ public CorrectBuildingMeasurement ToCommand()
                 new BuildingPersistentLocalId(BuildingPersistentLocalId),
                 Request.GrbData.GeometriePolygoon.ToExtendedWkbGeometry(),
                 Request.GrbData.ToBuildingGrbData(),
-                CommandProvenance);
+                Provenance);
         }
     }
 }
diff --git a/...ackOffice.Handlers.Lambda/Requests/Building/CorrectBuildingNotRealizationLambdaRequest.cs b/...ackOffice.Handlers.Lambda/Requests/Building/CorrectBuildingNotRealizationLambdaRequest.cs
@@ -26,7 +26,7 @@ public CorrectBuildingNotRealizationLambdaRequest(
         /// <returns>CorrectBuildingNotRealization.</returns>
         public CorrectBuildingNotRealization ToCommand()
         {
-            return new CorrectBuildingNotRealization(new BuildingPersistentLocalId(BuildingPersistentLocalId), CommandProvenance);
+            return new CorrectBuildingNotRealization(new BuildingPersistentLocalId(BuildingPersistentLocalId), Provenance);
         }
     }
 }
diff --git a/...i.BackOffice.Handlers.Lambda/Requests/Building/CorrectBuildingRealizationLambdaRequest.cs b/...i.BackOffice.Handlers.Lambda/Requests/Building/CorrectBuildingRealizationLambdaRequest.cs
@@ -26,7 +26,7 @@ public CorrectBuildingRealizationLambdaRequest(
         /// <returns>CorrectBuildingRealization.</returns>
         public CorrectBuildingRealization ToCommand()
         {
-            return new CorrectBuildingRealization(new BuildingPersistentLocalId(BuildingPersistentLocalId), CommandProvenance);
+            return new CorrectBuildingRealization(new BuildingPersistentLocalId(BuildingPersistentLocalId), Provenance);
         }
     }
 }
diff --git a/...e.Handlers.Lambda/Requests/Building/CorrectPlaceBuildingUnderConstructionLambdaRequest.cs b/...e.Handlers.Lambda/Requests/Building/CorrectPlaceBuildingUnderConstructionLambdaRequest.cs
@@ -26,7 +26,7 @@ public CorrectPlaceBuildingUnderConstructionLambdaRequest(
         /// <returns>CorrectBuildingPlaceUnderConstruction.</returns>
         public CorrectBuildingPlaceUnderConstruction ToCommand()
         {
-            return new CorrectBuildingPlaceUnderConstruction(new BuildingPersistentLocalId(BuildingPersistentLocalId), CommandProvenance);
+            return new CorrectBuildingPlaceUnderConstruction(new BuildingPersistentLocalId(BuildingPersistentLocalId), Provenance);
         }
     }
 }
diff --git a/...egistry.Api.BackOffice.Handlers.Lambda/Requests/Building/DemolishBuildingLambdaRequest.cs b/...egistry.Api.BackOffice.Handlers.Lambda/Requests/Building/DemolishBuildingLambdaRequest.cs
@@ -30,7 +30,7 @@ public DemolishBuilding ToCommand()
         {
             return new DemolishBuilding(new BuildingPersistentLocalId(BuildingPersistentLocalId),
                 Request.GrbData.ToBuildingGrbData(),
-                CommandProvenance);
+                Provenance);
         }
     }
 }
diff --git a/...Registry.Api.BackOffice.Handlers.Lambda/Requests/Building/MeasureBuildingLambdaRequest.cs b/...Registry.Api.BackOffice.Handlers.Lambda/Requests/Building/MeasureBuildingLambdaRequest.cs
@@ -37,7 +37,7 @@ public MeasureBuilding ToCommand()
                 new BuildingPersistentLocalId(BuildingPersistentLocalId),
                 Request.GrbData.GeometriePolygoon.ToExtendedWkbGeometry(),
                 Request.GrbData.ToBuildingGrbData(),
-                CommandProvenance);
+                Provenance);
         }
     }
 }
diff --git a/...gRegistry.Api.BackOffice.Handlers.Lambda/Requests/Building/MergeBuildingsLambdaRequest.cs b/...gRegistry.Api.BackOffice.Handlers.Lambda/Requests/Building/MergeBuildingsLambdaRequest.cs
@@ -35,7 +35,7 @@ public MergeBuildings ToCommand()
                 Request.GeometriePolygoon.ToExtendedWkbGeometry(),
                 Request.SamenvoegenGebouwen
                     .Select(x => new BuildingPersistentLocalId(Convert.ToInt32(x.AsIdentifier().Map(s => s).Value))),
-                CommandProvenance);
+                Provenance);
         }
     }
 }
diff --git a/...istry.Api.BackOffice.Handlers.Lambda/Requests/Building/NotRealizeBuildingLambdaRequest.cs b/...istry.Api.BackOffice.Handlers.Lambda/Requests/Building/NotRealizeBuildingLambdaRequest.cs
@@ -24,7 +24,7 @@ public NotRealizeBuildingLambdaRequest(string messageGroupId, NotRealizeBuilding
         /// <returns>NotRealizeBuilding.</returns>
         public NotRealizeBuilding ToCommand()
         {
-            return new NotRealizeBuilding(new BuildingPersistentLocalId(BuildingPersistentLocalId), CommandProvenance);
+            return new NotRealizeBuilding(new BuildingPersistentLocalId(BuildingPersistentLocalId), Provenance);
         }
     }
 }
diff --git a/...ckOffice.Handlers.Lambda/Requests/Building/PlaceBuildingUnderConstructionLambdaRequest.cs b/...ckOffice.Handlers.Lambda/Requests/Building/PlaceBuildingUnderConstructionLambdaRequest.cs
@@ -26,7 +26,7 @@ public PlaceBuildingUnderConstructionLambdaRequest(
         /// <returns>PlaceBuildingUnderConstruction.</returns>
         public PlaceBuildingUnderConstruction ToCommand()
         {
-            return new PlaceBuildingUnderConstruction(new BuildingPersistentLocalId(BuildingPersistentLocalId), CommandProvenance);
+            return new PlaceBuildingUnderConstruction(new BuildingPersistentLocalId(BuildingPersistentLocalId), Provenance);
         }
     }
 }
diff --git a/...ingRegistry.Api.BackOffice.Handlers.Lambda/Requests/Building/PlanBuildingLambdaRequest.cs b/...ingRegistry.Api.BackOffice.Handlers.Lambda/Requests/Building/PlanBuildingLambdaRequest.cs
@@ -29,7 +29,7 @@ public PlanBuilding ToCommand()
             return new PlanBuilding(
                 BuildingPersistentLocalId,
                 Request.GeometriePolygoon.ToExtendedWkbGeometry(),
-                CommandProvenance);
+                Provenance);
         }
     }
 }
diff --git a/...fice.Handlers.Lambda/Requests/Building/RealizeAndMeasureUnplannedBuildingLambdaRequest.cs b/...fice.Handlers.Lambda/Requests/Building/RealizeAndMeasureUnplannedBuildingLambdaRequest.cs
@@ -30,7 +30,7 @@ public RealizeAndMeasureUnplannedBuilding ToCommand()
                 new BuildingPersistentLocalId(BuildingPersistentLocalId),
                 Request.GrbData.GeometriePolygoon.ToExtendedWkbGeometry(),
                 Request.GrbData.ToBuildingGrbData(),
-                CommandProvenance);
+                Provenance);
         }
     }
 }
diff --git a/...Registry.Api.BackOffice.Handlers.Lambda/Requests/Building/RealizeBuildingLambdaRequest.cs b/...Registry.Api.BackOffice.Handlers.Lambda/Requests/Building/RealizeBuildingLambdaRequest.cs
@@ -26,7 +26,7 @@ public RealizeBuildingLambdaRequest(
         /// <returns>RealizeBuilding.</returns>
         public RealizeBuilding ToCommand()
         {
-            return new RealizeBuilding(new BuildingPersistentLocalId(BuildingPersistentLocalId), CommandProvenance);
+            return new RealizeBuilding(new BuildingPersistentLocalId(BuildingPersistentLocalId), Provenance);
         }
     }
 }
diff --git a/...gRegistry.Api.BackOffice.Handlers.Lambda/Requests/Building/RemoveBuildingLambdaRequest.cs b/...gRegistry.Api.BackOffice.Handlers.Lambda/Requests/Building/RemoveBuildingLambdaRequest.cs
@@ -28,7 +28,7 @@ public RemoveBuildingLambdaRequest(string messageGroupId, RemoveBuildingSqsReque
         /// <returns>RemoveBuilding.</returns>
         public RemoveBuilding ToCommand()
         {
-            return new RemoveBuilding(new BuildingPersistentLocalId(BuildingPersistentLocalId), CommandProvenance);
+            return new RemoveBuilding(new BuildingPersistentLocalId(BuildingPersistentLocalId), Provenance);
         }
     }
 }
diff --git a/...kOffice.Handlers.Lambda/Requests/BuildingUnit/AttachAddressToBuildingUnitLambdaRequest.cs b/...kOffice.Handlers.Lambda/Requests/BuildingUnit/AttachAddressToBuildingUnitLambdaRequest.cs
@@ -1,9 +1,8 @@
 namespace BuildingRegistry.Api.BackOffice.Handlers.Lambda.Requests.BuildingUnit
 {
+    using Abstractions.Building.Validators;
+    using Abstractions.BuildingUnit.Requests;
     using Abstractions.BuildingUnit.SqsRequests;
-    using BuildingRegistry.Api.BackOffice.Abstractions.Building.Validators;
-    using BuildingRegistry.Api.BackOffice.Abstractions.BuildingUnit.Requests;
-    using BuildingRegistry.Api.BackOffice.Abstractions.BuildingUnit.SqsRequests;
     using BuildingRegistry.Building;
     using BuildingRegistry.Building.Commands;
 
@@ -38,7 +37,7 @@ public AttachAddressToBuildingUnit ToCommand()
                 BuildingPersistentLocalId,
                 new BuildingUnitPersistentLocalId(BuildingUnitPersistentLocalId),
                 new AddressPersistentLocalId(addressPersistentLocalId),
-                CommandProvenance);
+                Provenance);
         }
     }
 }
diff --git a/...egistry.Api.BackOffice.Handlers.Lambda/Requests/BuildingUnit/BuildingUnitLambdaRequest.cs b/...egistry.Api.BackOffice.Handlers.Lambda/Requests/BuildingUnit/BuildingUnitLambdaRequest.cs
@@ -18,13 +18,5 @@ protected BuildingUnitLambdaRequest(
             IDictionary<string, object?> metadata)
             : base(messageGroupId, ticketId, ifMatchHeaderValue, provenance, metadata)
         { }
-
-        protected Provenance CommandProvenance => new Provenance(
-            SystemClock.Instance.GetCurrentInstant(),
-            Provenance.Application,
-            Provenance.Reason,
-            Provenance.Operator,
-            Provenance.Modification,
-            Provenance.Organisation);
     }
 }
diff --git a/...ice.Handlers.Lambda/Requests/BuildingUnit/CorrectBuildingUnitDeregulationLambdaRequest.cs b/...ice.Handlers.Lambda/Requests/BuildingUnit/CorrectBuildingUnitDeregulationLambdaRequest.cs
@@ -1,8 +1,7 @@
 namespace BuildingRegistry.Api.BackOffice.Handlers.Lambda.Requests.BuildingUnit
 {
+    using Abstractions.BuildingUnit.Requests;
     using Abstractions.BuildingUnit.SqsRequests;
-    using BuildingRegistry.Api.BackOffice.Abstractions.BuildingUnit.Requests;
-    using BuildingRegistry.Api.BackOffice.Abstractions.BuildingUnit.SqsRequests;
     using BuildingRegistry.Building;
     using BuildingRegistry.Building.Commands;
     using IHasBuildingUnitPersistentLocalId = Abstractions.IHasBuildingUnitPersistentLocalId;
@@ -32,7 +31,7 @@ public CorrectBuildingUnitDeregulation ToCommand()
             return new CorrectBuildingUnitDeregulation(
                 BuildingPersistentLocalId,
                 new BuildingUnitPersistentLocalId(BuildingUnitPersistentLocalId),
-                CommandProvenance);
+                Provenance);
         }
     }
 }
diff --git a/...e.Handlers.Lambda/Requests/BuildingUnit/CorrectBuildingUnitNotRealizationLambdaRequest.cs b/...e.Handlers.Lambda/Requests/BuildingUnit/CorrectBuildingUnitNotRealizationLambdaRequest.cs
@@ -1,9 +1,7 @@
 namespace BuildingRegistry.Api.BackOffice.Handlers.Lambda.Requests.BuildingUnit
 {
+    using Abstractions.BuildingUnit.Requests;
     using Abstractions.BuildingUnit.SqsRequests;
-    using Be.Vlaanderen.Basisregisters.GrAr.Provenance;
-    using BuildingRegistry.Api.BackOffice.Abstractions.BuildingUnit.Requests;
-    using BuildingRegistry.Api.BackOffice.Abstractions.BuildingUnit.SqsRequests;
     using BuildingRegistry.Building;
     using BuildingRegistry.Building.Commands;
     using IHasBuildingUnitPersistentLocalId = Abstractions.IHasBuildingUnitPersistentLocalId;
@@ -34,7 +32,7 @@ public CorrectBuildingUnitNotRealization ToCommand()
             return new CorrectBuildingUnitNotRealization(
                 BuildingPersistentLocalId,
                 new BuildingUnitPersistentLocalId(BuildingUnitPersistentLocalId),
-                CommandProvenance);
+                Provenance);
         }
     }
 }
diff --git a/...kOffice.Handlers.Lambda/Requests/BuildingUnit/CorrectBuildingUnitPositionLambdaRequest.cs b/...kOffice.Handlers.Lambda/Requests/BuildingUnit/CorrectBuildingUnitPositionLambdaRequest.cs
@@ -1,11 +1,9 @@
 namespace BuildingRegistry.Api.BackOffice.Handlers.Lambda.Requests.BuildingUnit
 {
+    using Abstractions.Building;
+    using Abstractions.BuildingUnit.Converters;
+    using Abstractions.BuildingUnit.Requests;
     using Abstractions.BuildingUnit.SqsRequests;
-    using Be.Vlaanderen.Basisregisters.GrAr.Provenance;
-    using BuildingRegistry.Api.BackOffice.Abstractions.Building;
-    using BuildingRegistry.Api.BackOffice.Abstractions.BuildingUnit.Converters;
-    using BuildingRegistry.Api.BackOffice.Abstractions.BuildingUnit.Requests;
-    using BuildingRegistry.Api.BackOffice.Abstractions.BuildingUnit.SqsRequests;
     using BuildingRegistry.Building;
     using BuildingRegistry.Building.Commands;
 
@@ -36,7 +34,7 @@ public CorrectBuildingUnitPosition ToCommand()
                 new BuildingUnitPersistentLocalId(BuildingUnitPersistentLocalId),
                 Request.PositieGeometrieMethode.Map(),
                 string.IsNullOrWhiteSpace(Request.Positie) ? null : Request.Positie.ToExtendedWkbGeometry(),
-                CommandProvenance);
+                Provenance);
         }
     }
 }
diff --git a/...fice.Handlers.Lambda/Requests/BuildingUnit/CorrectBuildingUnitRealizationLambdaRequest.cs b/...fice.Handlers.Lambda/Requests/BuildingUnit/CorrectBuildingUnitRealizationLambdaRequest.cs
@@ -1,9 +1,7 @@
 namespace BuildingRegistry.Api.BackOffice.Handlers.Lambda.Requests.BuildingUnit
 {
+    using Abstractions.BuildingUnit.Requests;
     using Abstractions.BuildingUnit.SqsRequests;
-    using Be.Vlaanderen.Basisregisters.GrAr.Provenance;
-    using BuildingRegistry.Api.BackOffice.Abstractions.BuildingUnit.Requests;
-    using BuildingRegistry.Api.BackOffice.Abstractions.BuildingUnit.SqsRequests;
     using BuildingRegistry.Building;
     using BuildingRegistry.Building.Commands;
     using IHasBuildingUnitPersistentLocalId = Abstractions.IHasBuildingUnitPersistentLocalId;
@@ -29,7 +27,7 @@ public CorrectBuildingUnitRealizationLambdaRequest(
         /// <returns>CorrectBuildingUnitRealization.</returns>
         public CorrectBuildingUnitRealization ToCommand()
         {
-            return new CorrectBuildingUnitRealization(BuildingPersistentLocalId, new BuildingUnitPersistentLocalId(BuildingUnitPersistentLocalId), CommandProvenance);
+            return new CorrectBuildingUnitRealization(BuildingPersistentLocalId, new BuildingUnitPersistentLocalId(BuildingUnitPersistentLocalId), Provenance);
         }
     }
 }
diff --git a/...e.Handlers.Lambda/Requests/BuildingUnit/CorrectBuildingUnitRegularizationLambdaRequest.cs b/...e.Handlers.Lambda/Requests/BuildingUnit/CorrectBuildingUnitRegularizationLambdaRequest.cs
@@ -1,8 +1,7 @@
 namespace BuildingRegistry.Api.BackOffice.Handlers.Lambda.Requests.BuildingUnit
 {
+    using Abstractions.BuildingUnit.Requests;
     using Abstractions.BuildingUnit.SqsRequests;
-    using BuildingRegistry.Api.BackOffice.Abstractions.BuildingUnit.Requests;
-    using BuildingRegistry.Api.BackOffice.Abstractions.BuildingUnit.SqsRequests;
     using BuildingRegistry.Building;
     using BuildingRegistry.Building.Commands;
     using IHasBuildingUnitPersistentLocalId = Abstractions.IHasBuildingUnitPersistentLocalId;
@@ -27,7 +26,10 @@ public CorrectBuildingUnitRegularizationLambdaRequest(
         /// <returns>CorrectBuildingUnitRealization.</returns>
         public CorrectBuildingUnitRegularization ToCommand()
         {
-            return new CorrectBuildingUnitRegularization(BuildingPersistentLocalId, new BuildingUnitPersistentLocalId(BuildingUnitPersistentLocalId), CommandProvenance);
+            return new CorrectBuildingUnitRegularization(
+                BuildingPersistentLocalId,
+                new BuildingUnitPersistentLocalId(BuildingUnitPersistentLocalId),
+                Provenance);
         }
     }
 }
diff --git a/...ffice.Handlers.Lambda/Requests/BuildingUnit/CorrectBuildingUnitRetirementLambdaRequest.cs b/...ffice.Handlers.Lambda/Requests/BuildingUnit/CorrectBuildingUnitRetirementLambdaRequest.cs
@@ -1,9 +1,7 @@
 namespace BuildingRegistry.Api.BackOffice.Handlers.Lambda.Requests.BuildingUnit
 {
+    using Abstractions.BuildingUnit.Requests;
     using Abstractions.BuildingUnit.SqsRequests;
-    using Be.Vlaanderen.Basisregisters.GrAr.Provenance;
-    using BuildingRegistry.Api.BackOffice.Abstractions.BuildingUnit.Requests;
-    using BuildingRegistry.Api.BackOffice.Abstractions.BuildingUnit.SqsRequests;
     using BuildingRegistry.Building;
     using BuildingRegistry.Building.Commands;
     using IHasBuildingUnitPersistentLocalId = Abstractions.IHasBuildingUnitPersistentLocalId;
@@ -29,7 +27,7 @@ public CorrectBuildingUnitRetirementLambdaRequest(
         /// <returns>CorrectBuildingUnitRetirement.</returns>
         public CorrectBuildingUnitRetirement ToCommand()
         {
-            return new CorrectBuildingUnitRetirement(BuildingPersistentLocalId, new BuildingUnitPersistentLocalId(BuildingUnitPersistentLocalId), CommandProvenance);
+            return new CorrectBuildingUnitRetirement(BuildingPersistentLocalId, new BuildingUnitPersistentLocalId(BuildingUnitPersistentLocalId), Provenance);
         }
     }
 }
diff --git a/...i.BackOffice.Handlers.Lambda/Requests/BuildingUnit/DeregulateBuildingUnitLambdaRequest.cs b/...i.BackOffice.Handlers.Lambda/Requests/BuildingUnit/DeregulateBuildingUnitLambdaRequest.cs
@@ -1,9 +1,7 @@
 namespace BuildingRegistry.Api.BackOffice.Handlers.Lambda.Requests.BuildingUnit
 {
+    using Abstractions.BuildingUnit.Requests;
     using Abstractions.BuildingUnit.SqsRequests;
-    using Be.Vlaanderen.Basisregisters.GrAr.Provenance;
-    using BuildingRegistry.Api.BackOffice.Abstractions.BuildingUnit.Requests;
-    using BuildingRegistry.Api.BackOffice.Abstractions.BuildingUnit.SqsRequests;
     using BuildingRegistry.Building;
     using BuildingRegistry.Building.Commands;
     using IHasBuildingUnitPersistentLocalId = Abstractions.IHasBuildingUnitPersistentLocalId;
@@ -29,7 +27,7 @@ public DeregulateBuildingUnitLambdaRequest(
         /// <returns>DeregulateBuildingUnit.</returns>
         public DeregulateBuildingUnit ToCommand()
         {
-            return new DeregulateBuildingUnit(BuildingPersistentLocalId, new BuildingUnitPersistentLocalId(BuildingUnitPersistentLocalId), CommandProvenance);
+            return new DeregulateBuildingUnit(BuildingPersistentLocalId, new BuildingUnitPersistentLocalId(BuildingUnitPersistentLocalId), Provenance);
         }
     }
 }
diff --git a/...ffice.Handlers.Lambda/Requests/BuildingUnit/DetachAddressFromBuildingUnitLambdaRequest.cs b/...ffice.Handlers.Lambda/Requests/BuildingUnit/DetachAddressFromBuildingUnitLambdaRequest.cs
@@ -1,9 +1,8 @@
 namespace BuildingRegistry.Api.BackOffice.Handlers.Lambda.Requests.BuildingUnit
 {
+    using Abstractions.Building.Validators;
+    using Abstractions.BuildingUnit.Requests;
     using Abstractions.BuildingUnit.SqsRequests;
-    using BuildingRegistry.Api.BackOffice.Abstractions.Building.Validators;
-    using BuildingRegistry.Api.BackOffice.Abstractions.BuildingUnit.Requests;
-    using BuildingRegistry.Api.BackOffice.Abstractions.BuildingUnit.SqsRequests;
     using BuildingRegistry.Building;
     using BuildingRegistry.Building.Commands;
 
@@ -38,7 +37,7 @@ public DetachAddressFromBuildingUnit ToCommand()
                 BuildingPersistentLocalId,
                 new BuildingUnitPersistentLocalId(BuildingUnitPersistentLocalId),
                 new AddressPersistentLocalId(addressPersistentLocalId),
-                CommandProvenance);
+                Provenance);
         }
     }
 }
diff --git a/...i.BackOffice.Handlers.Lambda/Requests/BuildingUnit/NotRealizeBuildingUnitLambdaRequest.cs b/...i.BackOffice.Handlers.Lambda/Requests/BuildingUnit/NotRealizeBuildingUnitLambdaRequest.cs
@@ -1,9 +1,7 @@
 namespace BuildingRegistry.Api.BackOffice.Handlers.Lambda.Requests.BuildingUnit
 {
+    using Abstractions.BuildingUnit.Requests;
     using Abstractions.BuildingUnit.SqsRequests;
-    using Be.Vlaanderen.Basisregisters.GrAr.Provenance;
-    using BuildingRegistry.Api.BackOffice.Abstractions.BuildingUnit.Requests;
-    using BuildingRegistry.Api.BackOffice.Abstractions.BuildingUnit.SqsRequests;
     using BuildingRegistry.Building;
     using BuildingRegistry.Building.Commands;
     using IHasBuildingUnitPersistentLocalId = Abstractions.IHasBuildingUnitPersistentLocalId;
@@ -32,7 +30,7 @@ public NotRealizeBuildingUnit ToCommand()
             return new NotRealizeBuildingUnit(
                 BuildingPersistentLocalId,
                 new BuildingUnitPersistentLocalId(BuildingUnitPersistentLocalId),
-                CommandProvenance);
+                Provenance);
         }
     }
 }
diff --git a/...try.Api.BackOffice.Handlers.Lambda/Requests/BuildingUnit/PlanBuildingUnitLambdaRequest.cs b/...try.Api.BackOffice.Handlers.Lambda/Requests/BuildingUnit/PlanBuildingUnitLambdaRequest.cs
@@ -1,10 +1,9 @@
 namespace BuildingRegistry.Api.BackOffice.Handlers.Lambda.Requests.BuildingUnit
 {
+    using Abstractions.Building;
+    using Abstractions.BuildingUnit.Converters;
+    using Abstractions.BuildingUnit.Requests;
     using Abstractions.BuildingUnit.SqsRequests;
-    using Be.Vlaanderen.Basisregisters.GrAr.Provenance;
-    using BuildingRegistry.Api.BackOffice.Abstractions.Building;
-    using BuildingRegistry.Api.BackOffice.Abstractions.BuildingUnit.Converters;
-    using BuildingRegistry.Api.BackOffice.Abstractions.BuildingUnit.Requests;
     using BuildingRegistry.Building;
     using BuildingRegistry.Building.Commands;
 
@@ -34,7 +33,7 @@ public PlanBuildingUnit ToCommand()
                 string.IsNullOrWhiteSpace(Request.Positie) ? null : Request.Positie.ToExtendedWkbGeometry(),
                 Request.Functie.Map(),
                 Request.AfwijkingVastgesteld,
-                CommandProvenance);
+                Provenance);
         }
     }
 }