fix: try getting municipality geometry by new niscode first

Informatievlaanderen · Oct 29, 2024 · a5c1d3e · a5c1d3e
1 parent 9f4283b
commit a5c1d3e
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 5 deletions.
diff --git a/src/MunicipalityRegistry.Api.Import/Merger/MergerController-Propose.cs b/src/MunicipalityRegistry.Api.Import/Merger/MergerController-Propose.cs
@@ -92,12 +92,21 @@ await idempotentCommandHandler.Dispatch(
             return registerMunicipalityCommand.MunicipalityId;
         }
 
-        private static async Task<MultiPolygon> BuildMunicipalityGeometry(ProposeMergerRequest municipality, IMunicipalityGeometryReader municipalityGeometryReader)
+        private static async Task<Geometry> BuildMunicipalityGeometry(ProposeMergerRequest municipality, IMunicipalityGeometryReader municipalityGeometryReader)
         {
             var geometryFactory = GeometryConfiguration.CreateGeometryFactory();
 
-            var municipalityGeometriesToMerge = await Task.WhenAll(municipality.MergerOf.Select(municipalityGeometryReader.GetGeometry));
-            var newMunicipalityGeometry = new MultiPolygon(
+            try
+            {
+                var newMunicipalityGeometry = await municipalityGeometryReader.GetGeometry(municipality.NisCode);
+                return newMunicipalityGeometry;
+            }
+            catch (InvalidPolygonException)
+            { }
+
+            var municipalityGeometriesToMerge =
+                await Task.WhenAll(municipality.MergerOf.Select(municipalityGeometryReader.GetGeometry));
+            var newMunicipalityCombinedGeometry = new MultiPolygon(
                 municipalityGeometriesToMerge.SelectMany(geometry =>
                     {
                         return geometry switch
@@ -112,7 +121,8 @@ private static async Task<MultiPolygon> BuildMunicipalityGeometry(ProposeMergerR
             {
                 SRID = geometryFactory.SRID
             };
-            return newMunicipalityGeometry;
+
+            return newMunicipalityCombinedGeometry;
         }
 
         private static Language ToLanguage(Taal taal)

diff --git a/test/MunicipalityRegistry.Tests/ImportApi/Merger/Propose/WhenProposingMerger.cs b/test/MunicipalityRegistry.Tests/ImportApi/Merger/Propose/WhenProposingMerger.cs
@@ -7,6 +7,7 @@
     using System.Threading.Tasks;
     using Autofac;
     using Be.Vlaanderen.Basisregisters.GrAr.Legacy;
+    using Exceptions;
     using FluentAssertions;
     using FluentValidation;
     using Moq;
@@ -82,6 +83,9 @@ public async Task GivenValidRequestWithNewDestinationMunicipality_ThenMunicipali
             };
 
             var municipalityGeometryReaderMock = new Mock<IMunicipalityGeometryReader>();
+            municipalityGeometryReaderMock
+                .Setup(x => x.GetGeometry("10000"))
+                .Throws(() => new InvalidPolygonException());
             municipalityGeometryReaderMock
                 .Setup(x => x.GetGeometry("10001"))
                 .Returns(() => Task.FromResult(new WKTReader().Read("SRID=31370;POLYGON((0 0,0 1,1 1,1 0,0 0))")));
@@ -102,7 +106,7 @@ await _controller.Propose(
             streamIds.Count.Should().Be(1);
             var newMunicipalityId = streamIds.Single();
 
-            municipalityGeometryReaderMock.Invocations.Count.Should().Be(2);
+            municipalityGeometryReaderMock.Invocations.Count.Should().Be(3);
 
             ImportContext.MunicipalityMergers.Count().Should().Be(2);
             var merge1 = ImportContext.MunicipalityMergers.ToList()[0];