feat: add relink municipality

Informatievlaanderen · Jul 15, 2024 · 8ffe7f3 · 8ffe7f3
1 parent 702cf2f
commit 8ffe7f3
Show file tree

Hide file tree

Showing 34 changed files with 782 additions and 39 deletions.
diff --git a/paket.dependencies b/paket.dependencies
@@ -64,13 +64,13 @@ nuget Be.Vlaanderen.Basisregisters.Projector 15.0.0
 
 nuget Be.Vlaanderen.Basisregisters.Crab 4.0.0
 
-nuget Be.Vlaanderen.Basisregisters.GrAr.Common 21.0.0
-nuget Be.Vlaanderen.Basisregisters.GrAr.Contracts 21.0.0
-nuget Be.Vlaanderen.Basisregisters.GrAr.Import 21.0.0
-nuget Be.Vlaanderen.Basisregisters.GrAr.Legacy 21.0.0
-nuget Be.Vlaanderen.Basisregisters.GrAr.Oslo 21.0.0
-nuget Be.Vlaanderen.Basisregisters.GrAr.Provenance 21.0.0
-nuget Be.Vlaanderen.Basisregisters.GrAr.Extracts 21.0.0
+nuget Be.Vlaanderen.Basisregisters.GrAr.Common 21.10.0
+nuget Be.Vlaanderen.Basisregisters.GrAr.Contracts 21.10.0
+nuget Be.Vlaanderen.Basisregisters.GrAr.Import 21.10.0
+nuget Be.Vlaanderen.Basisregisters.GrAr.Legacy 21.10.0
+nuget Be.Vlaanderen.Basisregisters.GrAr.Oslo 21.10.0
+nuget Be.Vlaanderen.Basisregisters.GrAr.Provenance 21.10.0
+nuget Be.Vlaanderen.Basisregisters.GrAr.Extracts 21.10.0
 
 nuget Be.Vlaanderen.Basisregisters.MessageHandling.Kafka.Producer 5.0.1
 

diff --git a/paket.lock b/paket.lock
@@ -217,18 +217,16 @@ NUGET
       Autofac.Extensions.DependencyInjection (>= 9.0)
       Be.Vlaanderen.Basisregisters.EventHandling (5.0)
     Be.Vlaanderen.Basisregisters.Generators.Guid.Deterministic (4.0)
-    Be.Vlaanderen.Basisregisters.GrAr.Common (21.0)
+    Be.Vlaanderen.Basisregisters.GrAr.Common (21.10)
       Be.Vlaanderen.Basisregisters.AggregateSource (>= 9.0.1)
       Be.Vlaanderen.Basisregisters.CommandHandling (>= 9.0.1)
       NetTopologySuite (>= 2.5)
       NodaTime (>= 3.1.11)
-    Be.Vlaanderen.Basisregisters.GrAr.Contracts (21.0)
-      Be.Vlaanderen.Basisregisters.AggregateSource (>= 9.0.1)
-      NodaTime (>= 3.1.11)
-    Be.Vlaanderen.Basisregisters.GrAr.Extracts (21.0)
+    Be.Vlaanderen.Basisregisters.GrAr.Contracts (21.10)
+    Be.Vlaanderen.Basisregisters.GrAr.Extracts (21.10)
       Be.Vlaanderen.Basisregisters.Api (>= 21.0)
       Be.Vlaanderen.Basisregisters.Shaperon (>= 10.0.2)
-    Be.Vlaanderen.Basisregisters.GrAr.Import (21.0)
+    Be.Vlaanderen.Basisregisters.GrAr.Import (21.10)
       Autofac (>= 8.0)
       Be.Vlaanderen.Basisregisters.AggregateSource.SqlStreamStore (>= 9.0.1)
       Be.Vlaanderen.Basisregisters.CommandHandling (>= 9.0.1)
@@ -243,21 +241,21 @@ NUGET
       Serilog (>= 3.1.1)
       Serilog.Extensions.Logging (>= 8.0)
       System.Threading.Tasks.Dataflow (>= 8.0)
-    Be.Vlaanderen.Basisregisters.GrAr.Legacy (21.0)
-      Be.Vlaanderen.Basisregisters.GrAr.Common (21.0)
+    Be.Vlaanderen.Basisregisters.GrAr.Legacy (21.10)
+      Be.Vlaanderen.Basisregisters.GrAr.Common (21.10)
       Be.Vlaanderen.Basisregisters.Utilities.Rfc3339DateTimeOffset (>= 4.0)
       Newtonsoft.Json (>= 13.0.3)
-    Be.Vlaanderen.Basisregisters.GrAr.Oslo (21.0)
+    Be.Vlaanderen.Basisregisters.GrAr.Oslo (21.10)
       Be.Vlaanderen.Basisregisters.AspNetCore.Mvc.Formatters.Json (>= 5.0)
-      Be.Vlaanderen.Basisregisters.GrAr.Common (21.0)
+      Be.Vlaanderen.Basisregisters.GrAr.Common (21.10)
       Be.Vlaanderen.Basisregisters.Utilities.Rfc3339DateTimeOffset (>= 4.0)
       Microsoft.Extensions.Configuration (>= 8.0)
       Microsoft.Extensions.Http.Polly (>= 8.0.3)
       Newtonsoft.Json (>= 13.0.3)
-    Be.Vlaanderen.Basisregisters.GrAr.Provenance (21.0)
+    Be.Vlaanderen.Basisregisters.GrAr.Provenance (21.10)
       Be.Vlaanderen.Basisregisters.CommandHandling (>= 9.0.1)
       Be.Vlaanderen.Basisregisters.Crab (>= 4.0)
-      Be.Vlaanderen.Basisregisters.GrAr.Common (21.0)
+      Be.Vlaanderen.Basisregisters.GrAr.Common (21.10)
       Microsoft.CSharp (>= 4.7)
     Be.Vlaanderen.Basisregisters.MessageHandling.Kafka.Producer (5.0.1)
       Confluent.Kafka (>= 2.3)

diff --git a/src/PostalRegistry.Api.Import/Infrastructure/Modules/ApiModule.cs b/src/PostalRegistry.Api.Import/Infrastructure/Modules/ApiModule.cs
@@ -44,6 +44,11 @@ protected override void Load(ContainerBuilder builder)
                 new IdempotencyTableInfo(Schema.Import),
                 _loggerFactory);
 
+            builder.RegisterType<IdempotentCommandHandler>()
+                .As<IIdempotentCommandHandler>()
+                .AsSelf()
+                .InstancePerLifetimeScope();
+
             builder
                 .RegisterType<ProblemDetailsHelper>()
                 .AsSelf();

diff --git a/src/PostalRegistry.Api.Import/PostalInformationController-RelinkMunicipality.cs b/src/PostalRegistry.Api.Import/PostalInformationController-RelinkMunicipality.cs
@@ -0,0 +1,49 @@
+namespace PostalRegistry.Api.Import
+{
+    using System.Collections.Generic;
+    using System.Threading;
+    using System.Threading.Tasks;
+    using Be.Vlaanderen.Basisregisters.AggregateSource;
+    using Be.Vlaanderen.Basisregisters.Api.Exceptions;
+    using Be.Vlaanderen.Basisregisters.CommandHandling.Idempotency;
+    using FluentValidation;
+    using Microsoft.AspNetCore.Http;
+    using Microsoft.AspNetCore.Mvc;
+    using PostalInformation.Commands;
+    using Relink;
+
+    public sealed partial class PostalInformationController
+    {
+        [HttpPost("{postcode}/relink-municipality")]
+        public async Task<IActionResult> RelinkMunicipality(
+            [FromRoute(Name = "postcode")]string? postalCode,
+            [FromBody] RelinkMunicipalityRequest request,
+            [FromServices] IValidator<RelinkMunicipalityRequest> validator,
+            [FromServices] IIdempotentCommandHandler idempotentCommandHandler,
+            CancellationToken cancellationToken = default)
+        {
+            request.PostalCode = postalCode;
+            await validator.ValidateAndThrowAsync(request, cancellationToken: cancellationToken);
+
+            try
+            {
+                var command = new RelinkMunicipality(
+                    new PostalCode(postalCode!)
+                    , new NisCode(request.NewNisCode!)
+                    , CreateProvenance(request.Reason ?? string.Empty));
+
+                await idempotentCommandHandler.Dispatch(
+                    command.CreateCommandId(),
+                    command,
+                    new Dictionary<string, object>(),
+                    cancellationToken);
+
+                return Ok();
+            }
+            catch (AggregateNotFoundException)
+            {
+                throw new ApiException("Onbestaande postcode", StatusCodes.Status404NotFound);
+            }
+        }
+    }
+}
diff --git a/src/PostalRegistry.Api.Import/PostalInformationController.cs b/src/PostalRegistry.Api.Import/PostalInformationController.cs
@@ -0,0 +1,26 @@
+namespace PostalRegistry.Api.Import
+{
+    using Asp.Versioning;
+    using Be.Vlaanderen.Basisregisters.Api;
+    using Be.Vlaanderen.Basisregisters.GrAr.Provenance;
+    using Microsoft.AspNetCore.Mvc;
+    using NodaTime;
+
+    [ApiVersion("1.0")]
+    [AdvertiseApiVersions("1.0")]
+    [ApiRoute("import")]
+    [ApiExplorerSettings(GroupName = "Import")]
+    public sealed partial class PostalInformationController : ApiController
+    {
+        private Provenance CreateProvenance(string reason, Modification modification = Modification.Update)
+        {
+            return new Provenance(
+                SystemClock.Instance.GetCurrentInstant(),
+                Application.PostalRegistry,
+                new Reason(reason),
+                new Operator("OVO002949"),
+                modification,
+                Organisation.DigitaalVlaanderen);
+        }
+    }
+}
diff --git a/src/PostalRegistry.Api.Import/PostalRegistry.Api.Import.csproj.DotSettings b/src/PostalRegistry.Api.Import/PostalRegistry.Api.Import.csproj.DotSettings
diff --git a/src/PostalRegistry.Api.Import/Relink/RelinkMunicipalityRequest.cs b/src/PostalRegistry.Api.Import/Relink/RelinkMunicipalityRequest.cs
@@ -0,0 +1,10 @@
+namespace PostalRegistry.Api.Import.Relink
+{
+    public sealed class RelinkMunicipalityRequest
+    {
+        public string? PostalCode { get; set; }
+        public string? NewNisCode { get; set; }
+
+        public string? Reason { get; set; }
+    }
+}
diff --git a/src/PostalRegistry.Api.Import/Relink/RelinkMunicipalityRequestValidator.cs b/src/PostalRegistry.Api.Import/Relink/RelinkMunicipalityRequestValidator.cs
@@ -0,0 +1,17 @@
+namespace PostalRegistry.Api.Import.Relink
+{
+    using FluentValidation;
+
+    public sealed class RelinkMunicipalityRequestValidator : AbstractValidator<RelinkMunicipalityRequest>
+    {
+        public RelinkMunicipalityRequestValidator()
+        {
+            RuleFor(request => request.PostalCode)
+                .NotEmpty();
+
+            RuleFor(request => request.NewNisCode)
+                .NotEmpty()
+                .Length(5);
+        }
+    }
+}
diff --git a/src/PostalRegistry.Producer.Snapshot.Oslo/ProducerProjections.cs b/src/PostalRegistry.Producer.Snapshot.Oslo/ProducerProjections.cs
@@ -106,6 +106,20 @@ await snapshotManager.FindMatchingSnapshot(
                     message.Position,
                     ct);
             });
+
+            When<Envelope<MunicipalityWasRelinked>>(async (_, message, ct) =>
+            {
+                await FindAndProduce(async () =>
+                        await snapshotManager.FindMatchingSnapshot(
+                            message.Message.PostalCode,
+                            message.Message.Provenance.Timestamp,
+                            null,
+                            message.Position,
+                            throwStaleWhenGone: false,
+                            ct),
+                    message.Position,
+                    ct);
+            });
         }
 
         private async Task FindAndProduce(

diff --git a/src/PostalRegistry.Producer/Extensions/MessageExtensions.cs b/src/PostalRegistry.Producer/Extensions/MessageExtensions.cs
@@ -31,5 +31,8 @@ public static Contracts.PostalInformationPostalNameWasRemoved ToContract(this Do
 
         public static Contracts.MunicipalityWasAttached ToContract(this Domain.MunicipalityWasAttached message) =>
             new Contracts.MunicipalityWasAttached(message.PostalCode, message.NisCode, message.Provenance.ToContract());
+
+        public static Contracts.MunicipalityWasRelinked ToContract(this Domain.MunicipalityWasRelinked message) =>
+            new Contracts.MunicipalityWasRelinked(message.PostalCode, message.NewNisCode, message.PreviousNisCode, message.Provenance.ToContract());
     }
 }
diff --git a/src/PostalRegistry.Producer/ProducerProjections.cs b/src/PostalRegistry.Producer/ProducerProjections.cs
@@ -52,6 +52,11 @@ public ProducerProjections(IProducer producer)
             {
                 await Produce(message.Message.PostalCode, message.Message.ToContract(), message.Position, ct);
             });
+
+            When<Be.Vlaanderen.Basisregisters.ProjectionHandling.SqlStreamStore.Envelope<Domain.MunicipalityWasRelinked>>(async (_, message, ct) =>
+            {
+                await Produce(message.Message.PostalCode, message.Message.ToContract(), message.Position, ct);
+            });
         }
 
         private async Task Produce<T>(

diff --git a/src/PostalRegistry.Projections.Integration/PostalLatestItemProjections.cs b/src/PostalRegistry.Projections.Integration/PostalLatestItemProjections.cs
@@ -43,6 +43,18 @@ await context.FindAndUpdatePostal(
                     ct);
             });
 
+            When<Envelope<MunicipalityWasRelinked>>(async (context, message, ct) =>
+            {
+                await context.FindAndUpdatePostal(
+                    message.Message.PostalCode,
+                    postalInformation =>
+                    {
+                        postalInformation.NisCode = message.Message.NewNisCode;
+                        UpdateVersionTimestamp(postalInformation, message.Message.Provenance.Timestamp);
+                    },
+                    ct);
+            });
+
             When<Envelope<PostalInformationWasRealized>>(async (context, message, ct) =>
             {
                 await context.FindAndUpdatePostal(

diff --git a/src/PostalRegistry.Projections.LastChangedList/LastChangedListProjections.cs b/src/PostalRegistry.Projections.LastChangedList/LastChangedListProjections.cs
@@ -50,7 +50,16 @@ public LastChangedListProjections()
                 await GetLastChangedRecordsAndUpdatePosition(message.Message.PostalCode, message.Position, context, ct);
             });
 
-            When<Envelope<MunicipalityWasAttached>>(async (context, message, ct) => await DoNothing());
+            When<Envelope<MunicipalityWasAttached>>(async (context, message, ct) =>
+            {
+                await GetLastChangedRecordsAndUpdatePosition(message.Message.PostalCode, message.Position, context, ct);
+            });
+
+            When<Envelope<MunicipalityWasRelinked>>(async (context, message, ct) =>
+            {
+                await GetLastChangedRecordsAndUpdatePosition(message.Message.PostalCode, message.Position, context, ct);
+            });
+
             When<Envelope<PostalInformationWasImportedFromCrab>>(async (context, message, ct) => await DoNothing());
             When<Envelope<PostalInformationWasImportedFromBPost>>(async (context, message, ct) => await DoNothing());
         }

diff --git a/src/PostalRegistry.Projections.Legacy/PostalInformation/PostalInformationProjections.cs b/src/PostalRegistry.Projections.Legacy/PostalInformation/PostalInformationProjections.cs
@@ -41,6 +41,18 @@ await context.FindAndUpdatePostalInformation(
                     ct);
             });
 
+            When<Envelope<MunicipalityWasRelinked>>(async (context, message, ct) =>
+            {
+                await context.FindAndUpdatePostalInformation(
+                    message.Message.PostalCode,
+                    postalInformation =>
+                    {
+                        postalInformation.NisCode = message.Message.NewNisCode;
+                        UpdateVersionTimestamp(postalInformation, message.Message.Provenance.Timestamp);
+                    },
+                    ct);
+            });
+
             When<Envelope<PostalInformationWasRealized>>(async (context, message, ct) =>
             {
                 await context.FindAndUpdatePostalInformation(

diff --git a/...rojections.Legacy/PostalInformationSyndication/PostalInformationSyndicationProjections.cs b/...rojections.Legacy/PostalInformationSyndication/PostalInformationSyndicationProjections.cs
@@ -84,6 +84,15 @@ await context.CreateNewPostalInformationSyndicationItem(
                     ct);
             });
 
+            When<Envelope<MunicipalityWasRelinked>>(async (context, message, ct) =>
+            {
+                await context.CreateNewPostalInformationSyndicationItem(
+                    message.Message.PostalCode,
+                    message,
+                    x => x.MunicipalityNisCode = message.Message.NewNisCode,
+                    ct);
+            });
+
             When<Envelope<PostalInformationWasImportedFromCrab>>(async (context, message, ct) => await DoNothing());
             When<Envelope<PostalInformationWasImportedFromBPost>>(async (context, message, ct) => await DoNothing());
         }

diff --git a/src/PostalRegistry.Projections.Syndication/Municipality/MunicipalityEvent.cs b/src/PostalRegistry.Projections.Syndication/Municipality/MunicipalityEvent.cs
@@ -15,6 +15,7 @@ public enum MunicipalityEvent
         MunicipalityFacilityLanguageWasRemoved,
 
         MunicipalityWasDrawn,
+        MunicipalityWasMerged,
         MunicipalityGeometryWasCleared,
         MunicipalityGeometryWasCorrected,
         MunicipalityGeometryWasCorrectedToCleared,

diff --git a/src/PostalRegistry.Projections.Syndication/Municipality/MunicipalityLatestProjections.cs b/src/PostalRegistry.Projections.Syndication/Municipality/MunicipalityLatestProjections.cs
@@ -32,6 +32,7 @@ public MunicipalityLatestProjections()
             When(MunicipalityEvent.MunicipalityGeometryWasCorrectedToCleared, DoNothing);
             When(MunicipalityEvent.MunicipalityBecameCurrent, DoNothing);
             When(MunicipalityEvent.MunicipalityWasRetired, DoNothing);
+            When(MunicipalityEvent.MunicipalityWasMerged, DoNothing);
             When(MunicipalityEvent.MunicipalityWasCorrectedToCurrent, DoNothing);
             When(MunicipalityEvent.MunicipalityWasCorrectedToRetired, DoNothing);
         }

diff --git a/src/PostalRegistry/CommandHandlerModules.cs b/src/PostalRegistry/CommandHandlerModules.cs
@@ -2,6 +2,7 @@ namespace PostalRegistry
 {
     using Autofac;
     using Be.Vlaanderen.Basisregisters.CommandHandling;
+    using Be.Vlaanderen.Basisregisters.GrAr.Provenance;
     using PostalInformation;
 
     public static class CommandHandlerModules
@@ -16,6 +17,12 @@ public static void Register(ContainerBuilder containerBuilder)
                 .RegisterType<CrabPostalInformationProvenanceFactory>()
                 .SingleInstance();
 
+            containerBuilder
+                .RegisterType<PostalInformationProvenanceFactory>()
+                .As<IProvenanceFactory<PostalInformation.PostalInformation>>()
+                .AsSelf()
+                .SingleInstance();
+
             containerBuilder
                 .RegisterType<PostalInformationCommandHandlerModule>()
                 .Named<CommandHandlerModule>(typeof(PostalInformationCommandHandlerModule).FullName)

diff --git a/src/PostalRegistry/PostalInformation/Commands/RelinkMunicipality.cs b/src/PostalRegistry/PostalInformation/Commands/RelinkMunicipality.cs
@@ -0,0 +1,41 @@
+namespace PostalRegistry.PostalInformation.Commands
+{
+    using System;
+    using System.Collections.Generic;
+    using Be.Vlaanderen.Basisregisters.Generators.Guid;
+    using Be.Vlaanderen.Basisregisters.GrAr.Provenance;
+    using Be.Vlaanderen.Basisregisters.Utilities;
+
+    public sealed class RelinkMunicipality : IHasCommandProvenance
+    {
+        private static readonly Guid Namespace = new Guid("461f480c-75d9-4637-b98e-5fd66682d338");
+
+        public PostalCode PostalCode { get; }
+        public NisCode NewNisCode { get; }
+        public Provenance Provenance { get; }
+
+        public RelinkMunicipality(PostalCode postalCode, NisCode newNisCode, Provenance provenance)
+        {
+            PostalCode = postalCode;
+            NewNisCode = newNisCode;
+            Provenance = provenance;
+        }
+
+        public Guid CreateCommandId()
+            => Deterministic.Create(Namespace, $"RelinkMunicipality-{ToString()}");
+
+        public override string? ToString()
+            => ToStringBuilder.ToString(IdentityFields());
+
+        private IEnumerable<object> IdentityFields()
+        {
+            yield return PostalCode;
+            yield return NewNisCode;
+
+            foreach (var field in Provenance.GetIdentityFields())
+            {
+                yield return field;
+            }
+        }
+    }
+}