fix: command provenance should be set after idempotency check

src/StreetNameRegistry.Api.BackOffice.Handlers.Lambda/Requests/ApproveStreetNameLambdaRequest.cs

@@ -35,7 +35,7 @@ public ApproveStreetName ToCommand()
             return new ApproveStreetName(
                 this.MunicipalityPersistentLocalId(),
                 new PersistentLocalId(StreetNamePersistentLocalId),
-                CommandProvenance);
+                Provenance);
         }
     }
 }

src/StreetNameRegistry.Api.BackOffice.Handlers.Lambda/Requests/ChangeStreetNameNamesLambdaRequest.cs

@@ -41,7 +41,7 @@ public ChangeStreetNameNames ToCommand()
                 this.MunicipalityPersistentLocalId(),
                 new PersistentLocalId(StreetNamePersistentLocalId),
                 names,
-                CommandProvenance);
+                Provenance);
         }
     }
 }

src/StreetNameRegistry.Api.BackOffice.Handlers.Lambda/Requests/CorrectStreetNameApprovalLambdaRequest.cs

@@ -35,7 +35,7 @@ public CorrectStreetNameApproval ToCommand()
             return new CorrectStreetNameApproval(
                 this.MunicipalityPersistentLocalId(),
                 new PersistentLocalId(StreetNamePersistentLocalId),
-                CommandProvenance);
+                Provenance);
         }
     }
 }

src/StreetNameRegistry.Api.BackOffice.Handlers.Lambda/Requests/CorrectStreetNameHomonymAdditionsLambdaRequest.cs

@@ -49,7 +49,7 @@ public CorrectStreetNameHomonymAdditions ToCommand()
                 new PersistentLocalId(StreetNamePersistentLocalId),
                 homonymAdditionsToCorrect,
                 homonymsToRemove,
-                CommandProvenance);
+                Provenance);
         }
     }
 }

src/StreetNameRegistry.Api.BackOffice.Handlers.Lambda/Requests/CorrectStreetNameNamesLambdaRequest.cs

@@ -41,7 +41,7 @@ public CorrectStreetNameNames ToCommand()
                 this.MunicipalityPersistentLocalId(),
                 new PersistentLocalId(StreetNamePersistentLocalId),
                 names,
-                CommandProvenance);
+                Provenance);
         }
     }
 }

src/StreetNameRegistry.Api.BackOffice.Handlers.Lambda/Requests/CorrectStreetNameRejectionLambdaRequest.cs

@@ -35,7 +35,7 @@ public CorrectStreetNameRejection ToCommand()
             return new CorrectStreetNameRejection(
                 this.MunicipalityPersistentLocalId(),
                 new PersistentLocalId(StreetNamePersistentLocalId),
-                CommandProvenance);
+                Provenance);
         }
     }
 }

src/StreetNameRegistry.Api.BackOffice.Handlers.Lambda/Requests/CorrectStreetNameRetirementLambdaRequest.cs

@@ -35,7 +35,7 @@ public CorrectStreetNameRetirement ToCommand()
             return new CorrectStreetNameRetirement(
                 this.MunicipalityPersistentLocalId(),
                 new PersistentLocalId(StreetNamePersistentLocalId),
-                CommandProvenance);
+                Provenance);
         }
     }
 }

src/StreetNameRegistry.Api.BackOffice.Handlers.Lambda/Requests/ProposeStreetNameLambdaRequest.cs

@@ -39,7 +39,7 @@ public ProposeStreetName ToCommand()
                 this.MunicipalityPersistentLocalId(),
                 names,
                 PersistentLocalId,
-                CommandProvenance);
+                Provenance);
         }
     }
 }

src/StreetNameRegistry.Api.BackOffice.Handlers.Lambda/Requests/RejectStreetNameLambdaRequest.cs

@@ -35,7 +35,7 @@ public RejectStreetName ToCommand(PersistentLocalId streetNamePersistentLocalId)
             return new RejectStreetName(
                 this.MunicipalityPersistentLocalId(),
                 streetNamePersistentLocalId,
-                CommandProvenance);
+                Provenance);
         }
     }
 }

src/StreetNameRegistry.Api.BackOffice.Handlers.Lambda/Requests/RemoveStreetNameLambdaRequest.cs

@@ -35,7 +35,7 @@ public RemoveStreetName ToCommand()
             return new RemoveStreetName(
                 this.MunicipalityPersistentLocalId(),
                 new PersistentLocalId(StreetNamePersistentLocalId),
-                CommandProvenance);
+                Provenance);
         }
     }
 }

src/StreetNameRegistry.Api.BackOffice.Handlers.Lambda/Requests/RenameStreetNameLambdaRequest.cs

@@ -42,7 +42,7 @@ public RenameStreetName ToCommand()
                 this.MunicipalityPersistentLocalId(),
                 new PersistentLocalId(StreetNamePersistentLocalId),
                 new PersistentLocalId(identifier.Value),
-                CommandProvenance);
+                Provenance);
         }
     }
 }

src/StreetNameRegistry.Api.BackOffice.Handlers.Lambda/Requests/RetireStreetNameLambdaRequest.cs

@@ -35,7 +35,7 @@ public RetireStreetName ToCommand(PersistentLocalId streetNamePersistentLocalId)
             return new RetireStreetName(
                 this.MunicipalityPersistentLocalId(),
                 streetNamePersistentLocalId,
-                CommandProvenance);
+                Provenance);
         }
     }
 }

src/StreetNameRegistry.Api.BackOffice.Handlers.Lambda/Requests/StreetNameLambdaRequest.cs

@@ -2,7 +2,6 @@
 {
     using Be.Vlaanderen.Basisregisters.GrAr.Provenance;
     using Be.Vlaanderen.Basisregisters.Sqs.Lambda.Requests;
-    using NodaTime;
 
     public abstract record StreetNameLambdaRequest : SqsLambdaRequest
     {
@@ -14,13 +13,5 @@ protected StreetNameLambdaRequest(
             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);
     }
 }

src/StreetNameRegistry/Municipality/StreetNameProvenanceFactory.cs

@@ -2,6 +2,7 @@ namespace StreetNameRegistry.Municipality
 {
     using System;
     using Be.Vlaanderen.Basisregisters.GrAr.Provenance;
+    using NodaTime;
 
     public sealed class StreetNameProvenanceFactory : IProvenanceFactory<Municipality>
     {
@@ -14,7 +15,13 @@ public Provenance CreateFrom(object provenanceHolder, Municipality aggregate)
                 throw new InvalidOperationException($"Cannot create provenance from {provenanceHolder.GetType().Name}");
             }
 
-            return provenance.Provenance;
+            return new Provenance(
+                SystemClock.Instance.GetCurrentInstant(),
+                provenance.Provenance.Application,
+                provenance.Provenance.Reason,
+                provenance.Provenance.Operator,
+                provenance.Provenance.Modification,
+                provenance.Provenance.Organisation);
         }
     }
 }

test/StreetNameRegistry.Tests/AggregateTests/SnapshotTests/GivenMunicipality.cs

@@ -16,6 +16,7 @@ namespace StreetNameRegistry.Tests.AggregateTests.SnapshotTests
     using Municipality.Events;
     using Newtonsoft.Json;
     using Extensions;
+    using NodaTime;
     using Testing;
     using Xunit;
     using Xunit.Abstractions;
@@ -69,6 +70,18 @@ public async Task ThenSnapshotWasCreated()
                 proposeNewStreetName.PersistentLocalId);
             ((ISetProvenance)newStreetNameWasProposed).SetProvenance(provenance);
 
+            Assert(new Scenario()
+                .Given(_streamId,
+                    municipalityWasImported,
+                    municipalityBecameCurrent,
+                    officialLanguageWasAdded,
+                    officialLanguageWasAdded2,
+                    facilityLanguageWasAdded,
+                    existingStreetNameWasProposed)
+                .When(proposeNewStreetName)
+                .Then(new Fact(_streamId,
+                    newStreetNameWasProposed)));
+
             var existingStreetName = new MunicipalityStreetName(o => { });
             existingStreetName.Route(existingStreetNameWasProposed);
             var newStreetName = new MunicipalityStreetName(o => { });
@@ -82,33 +95,22 @@ public async Task ThenSnapshotWasCreated()
                 new List<Language> { Language.English },
                 new MunicipalityStreetNames
                 {
-                   existingStreetName,
-                   newStreetName
+                    existingStreetName,
+                    newStreetName
                 });
 
-            Assert(new Scenario()
-                .Given(_streamId,
-                    municipalityWasImported,
-                    municipalityBecameCurrent,
-                    officialLanguageWasAdded,
-                    officialLanguageWasAdded2,
-                    facilityLanguageWasAdded,
-                    existingStreetNameWasProposed)
-                .When(proposeNewStreetName)
-                .Then(new Fact(_streamId,
-                    newStreetNameWasProposed)));
-
             var snapshotStore = (ISnapshotStore)Container.Resolve(typeof(ISnapshotStore));
             var latestSnapshot = await snapshotStore.FindLatestSnapshotAsync(_streamId, CancellationToken.None);
 
             latestSnapshot.Should().NotBeNull();
-            latestSnapshot
-                .Should()
-                .BeEquivalentTo(
-                    Build(
-                        expectedSnapshot,
-                        6,
-                        EventSerializerSettings));
+            var snapshot = JsonConvert.DeserializeObject<MunicipalitySnapshot>(latestSnapshot!.Data, EventSerializerSettings);
+
+            snapshot.Should().BeEquivalentTo(expectedSnapshot, options =>
+            {
+                options.Excluding(x => x.Path.EndsWith("LastEventHash"));
+                options.Excluding(x => x.Type == typeof(Instant));
+                return options;
+            });
         }
 
         private static SnapshotContainer Build(