fix: or-1821 fix take over original municipality name adresmatch

Informatievlaanderen · Apr 25, 2024 · 21658a6 · 21658a6
1 parent 5c98ebe
commit 21658a6
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 2 deletions.
diff --git a/src/AssociationRegistry.Admin.Api/appsettings.development.json b/src/AssociationRegistry.Admin.Api/appsettings.development.json
@@ -58,7 +58,7 @@
     "Timeout": 30
   },
   "GrarOptions": {
-    "BaseUrl": "http://localhost:8080",
+    "BaseUrl": "https://api.basisregisters.test-vlaanderen.be",
     "Timeout": 30
   },
   "TemporaryMagdaVertegenwoordigers": "{\"TemporaryVertegenwoordigers\": [{\"Insz\": \"1234567890\",\"Voornaam\": \"Ikkeltje\",\"Achternaam\": \"Persoon\"},{\"Insz\": \"0987654321\",\"Voornaam\": \"Kramikkeltje\",\"Achternaam\": \"Persoon\"}]}"

diff --git a/src/AssociationRegistry/Events/AdresMatchUitAdressenregister.cs b/src/AssociationRegistry/Events/AdresMatchUitAdressenregister.cs
@@ -1,6 +1,7 @@
 namespace AssociationRegistry.Events;
 
 using Grar.Models;
+using System.Text.RegularExpressions;
 
 public record AdresMatchUitAdressenregister
 {
@@ -21,6 +22,8 @@ public AdresMatchUitAdressenregister DecorateWithPostalInformation(string origin
     {
         if (postalInformationResponse is null) return this;
 
+        var origineleGemeenteNaamClean = new Regex("\\(.*?\\)").Replace(origineleGemeentenaam, "").Trim();
+
         if (postalInformationResponse.Postnamen.Length == 1)
         {
             if (string.Equals(postalInformationResponse.Gemeentenaam, postalInformationResponse.Postnamen.Single(),
@@ -42,7 +45,7 @@ public AdresMatchUitAdressenregister DecorateWithPostalInformation(string origin
 
         var postNaam =
             postalInformationResponse.Postnamen.SingleOrDefault(
-                sod => sod.Equals(origineleGemeentenaam, StringComparison.InvariantCultureIgnoreCase));
+                sod => sod.Equals(origineleGemeenteNaamClean, StringComparison.InvariantCultureIgnoreCase));
         var origineleGemeentenaamKomtVoorInPostalInformationResult = postNaam is not null;
 
         if (origineleGemeentenaamKomtVoorInPostalInformationResult)

diff --git a/test/AssociationRegistry.Test/When_Decorating_PostalInformation/With_One_PostalName.cs b/test/AssociationRegistry.Test/When_Decorating_PostalInformation/With_One_PostalName.cs
@@ -32,4 +32,33 @@ public void And_MunicipalityName_Equals_PostalName_Then_Returns_MunicipalityName
 
         result.Adres.Gemeente.Should().Be("Ternat");
     }
+
+    [Theory]
+    [InlineData("Hekelgem (Affligem)")]
+    [InlineData("Hekelgem (afg)")]
+    [InlineData("Hekelgem")]
+    public void And_Municipality_Already_Correctly_Formatted(string origineleGemeentenaam)
+    {
+        var sut = new AdresMatchUitAdressenregister()
+        {
+            Adres = new Registratiedata.Adres("Fosselstraat", "12", "bus 101", "1740", "Hekelgem", "Belgie")
+        };
+
+        var result = sut.DecorateWithPostalInformation(origineleGemeentenaam, new PostalInformationResponse("1741", "Affligem", new[] { "Hekelgem" }));
+
+        result.Adres.Gemeente.Should().Be("Hekelgem (Affligem)");
+    }
+
+    [Fact]
+    public void And_Municipality_Already_Incorrectly_Formatted()
+    {
+        var sut = new AdresMatchUitAdressenregister()
+        {
+            Adres = new Registratiedata.Adres("Fosselstraat", "12", "bus 101", "1740", "Hekelgem", "Belgie")
+        };
+
+        var result = sut.DecorateWithPostalInformation("Hekelgem Affligem", new PostalInformationResponse("1741", "Affligem", new[] { "Hekelgem" }));
+
+        result.Adres.Gemeente.Should().Be("Hekelgem (Affligem)");
+    }
 }