feat: add overlapping outline validation GAWR-7047

ArneD · ArneD · commit cf88c334890e · 2025-09-30T10:40:30.000+02:00
diff --git a/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/BuildingGeometryContext.cs b/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/BuildingGeometryContext.cs
@@ -65,7 +65,35 @@ public ICollection<BuildingGeometryData> GetOverlappingBuildings(
                         || building.StatusAsString == BuildingStatus.Realized.Value)
                     && !building.IsRemoved
                     && boundingBox.Intersects(building.SysGeometry))
-                .ToList()
+                .AsEnumerable()
+                .Where(building => HasTooMuchOverlap(geometry, building.SysGeometry))
+                .ToList();
+
+            return overlappingBuildings;
+        }
+
+        public ICollection<BuildingGeometryData> GetOverlappingBuildingOutlines(
+            BuildingPersistentLocalId buildingPersistentLocalId,
+            ExtendedWkbGeometry extendedWkbGeometry)
+        {
+            var wkbReader = WKBReaderFactory.Create();
+            var geometry = wkbReader.Read(extendedWkbGeometry);
+            var fixedGeometry = NetTopologySuite.Geometries.Utilities.GeometryFixer.Fix(geometry);
+
+            var boundingBox = fixedGeometry.Factory.ToGeometry(fixedGeometry.EnvelopeInternal);
+            //check if bounding box is not clockwise otherwise reverse => must be counter clockwise oriented
+            if (boundingBox.Coordinates[0].X > boundingBox.Coordinates[1].X)
+            {
+                boundingBox = boundingBox.Reverse();
+            }
+
+            var overlappingBuildings = BuildingGeometries
+                .Where(building =>
+                    building.BuildingPersistentLocalId != buildingPersistentLocalId
+                    && building.GeometryMethod == BuildingGeometryMethod.Outlined
+                    && !building.IsRemoved
+                    && boundingBox.Intersects(building.SysGeometry))
+                .AsEnumerable()
                 .Where(building => HasTooMuchOverlap(geometry, building.SysGeometry))
                 .ToList();
 
diff --git a/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Handlers/Building/ChangeBuildingOutlineLambdaHandler.cs b/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Handlers/Building/ChangeBuildingOutlineLambdaHandler.cs
@@ -57,6 +57,7 @@ await IdempotentCommandHandler.Dispatch(
                 BuildingHasBuildingUnitsOutsideBuildingGeometryException => ValidationErrors.ChangeBuildingOutline.BuildingHasBuildingUnitsOutsideChangedGeometry.ToTicketError(),
                 PolygonIsInvalidException => ValidationErrors.Common.InvalidBuildingPolygonGeometry.ToTicketError(),
                 BuildingOutlineIsTooSmallException => ValidationErrors.Common.BuildingTooSmallGeometry.ToTicketError(),
+                BuildingGeometryOverlapsWithOutlinedBuildingException => ValidationErrors.RealizeBuilding.OverlappingOutlinedBuilding.ToTicketError(),
                 _ => null
             };
         }
diff --git a/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Handlers/Building/PlanBuildingLambdaHandler.cs b/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Handlers/Building/PlanBuildingLambdaHandler.cs
@@ -54,6 +54,7 @@ await IdempotentCommandHandler.Dispatch(
             {
                 PolygonIsInvalidException => ValidationErrors.Common.InvalidBuildingPolygonGeometry.ToTicketError(),
                 BuildingOutlineIsTooSmallException => ValidationErrors.Common.BuildingTooSmallGeometry.ToTicketError(),
+                BuildingGeometryOverlapsWithOutlinedBuildingException => ValidationErrors.RealizeBuilding.OverlappingOutlinedBuilding.ToTicketError(),
                 _ => null
             };
         }
diff --git a/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/NoOverlappingBuildingGeometries.cs b/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/NoOverlappingBuildingGeometries.cs
@@ -10,5 +10,10 @@ public ICollection<BuildingGeometryData> GetOverlappingBuildings(
         {
             return new List<BuildingGeometryData>();
         }
+
+        public ICollection<BuildingGeometryData> GetOverlappingBuildingOutlines(BuildingPersistentLocalId buildingPersistentLocalId, ExtendedWkbGeometry extendedWkbGeometry)
+        {
+            return new List<BuildingGeometryData>();
+        }
     }
 }
diff --git a/src/BuildingRegistry/Building/Building.cs b/src/BuildingRegistry/Building/Building.cs
@@ -38,11 +38,14 @@ public static Building MigrateBuilding(
         public static Building Plan(
             IBuildingFactory buildingFactory,
             BuildingPersistentLocalId buildingPersistentLocalId,
-            ExtendedWkbGeometry extendedWkbGeometry)
+            ExtendedWkbGeometry extendedWkbGeometry,
+            IBuildingGeometries buildingGeometries)
         {
             var geometry = WKBReaderFactory.Create().Read(extendedWkbGeometry);
 
             GuardOutline(geometry);
+            if (buildingGeometries.GetOverlappingBuildingOutlines(buildingPersistentLocalId, extendedWkbGeometry).Any())
+                throw new BuildingGeometryOverlapsWithOutlinedBuildingException();
 
             var newBuilding = buildingFactory.Create();
             newBuilding.ApplyChange(
@@ -226,7 +229,9 @@ public void RemoveMeasuredBuilding()
             ApplyChange(new BuildingWasRemovedV2(BuildingPersistentLocalId));
         }
 
-        public void ChangeOutliningConstruction(ExtendedWkbGeometry extendedWkbGeometry)
+        public void ChangeOutliningConstruction(
+            ExtendedWkbGeometry extendedWkbGeometry,
+            IBuildingGeometries buildingGeometries)
         {
             GuardRemovedBuilding();
 
@@ -245,6 +250,9 @@ public void ChangeOutliningConstruction(ExtendedWkbGeometry extendedWkbGeometry)
             var geometry = WKBReaderFactory.Create().Read(extendedWkbGeometry);
             GuardOutline(geometry);
 
+            if(buildingGeometries.GetOverlappingBuildingOutlines(BuildingPersistentLocalId, extendedWkbGeometry).Any())
+                throw new BuildingGeometryOverlapsWithOutlinedBuildingException();
+
             var newBuildingGeometry = new BuildingGeometry(extendedWkbGeometry, BuildingGeometryMethod.Outlined);
             var plannedOrRealizedBuildingUnits = _buildingUnits.PlannedBuildingUnits()
                 .Concat(_buildingUnits.RealizedBuildingUnits())
diff --git a/src/BuildingRegistry/Building/BuildingCommandHandlerModule.cs b/src/BuildingRegistry/Building/BuildingCommandHandlerModule.cs
@@ -80,7 +80,8 @@ public BuildingCommandHandlerModule(
                     var newBuilding = Building.Plan(
                         buildingFactory,
                         message.Command.BuildingPersistentLocalId,
-                        message.Command.Geometry);
+                        message.Command.Geometry,
+                        buildingGeometries);
 
                     buildingRepository().Add(streamId, newBuilding);
                 });
@@ -190,7 +191,7 @@ public BuildingCommandHandlerModule(
                     var streamId = new BuildingStreamId(message.Command.BuildingPersistentLocalId);
                     var building = await buildingRepository().GetAsync(streamId, ct);
 
-                    building.ChangeOutliningConstruction(message.Command.Geometry);
+                    building.ChangeOutliningConstruction(message.Command.Geometry, buildingGeometries);
                 });
 
             For<RealizeAndMeasureUnplannedBuilding>()
diff --git a/src/BuildingRegistry/Building/IBuildingGeometries.cs b/src/BuildingRegistry/Building/IBuildingGeometries.cs
@@ -8,6 +8,10 @@ public interface IBuildingGeometries
         ICollection<BuildingGeometryData> GetOverlappingBuildings(
             BuildingPersistentLocalId buildingPersistentLocalId,
             ExtendedWkbGeometry extendedWkbGeometry);
+
+        ICollection<BuildingGeometryData> GetOverlappingBuildingOutlines(
+            BuildingPersistentLocalId buildingPersistentLocalId,
+            ExtendedWkbGeometry extendedWkbGeometry);
     }
 
     public sealed class BuildingGeometryData
diff --git a/test/BuildingRegistry.Tests/AggregateTests/WhenChangingBuildingMeasurement/GivenBuildingExists.cs b/test/BuildingRegistry.Tests/AggregateTests/WhenChangingBuildingMeasurement/GivenBuildingExists.cs
@@ -3,6 +3,7 @@ namespace BuildingRegistry.Tests.AggregateTests.WhenChangingBuildingMeasurement
     using System;
     using System.Collections.Generic;
     using System.Linq;
+    using Api.BackOffice.Handlers.Lambda;
     using AutoFixture;
     using Be.Vlaanderen.Basisregisters.AggregateSource;
     using Be.Vlaanderen.Basisregisters.AggregateSource.Snapshotting;
@@ -122,7 +123,7 @@ public void
                     BuildingUnitStatus.Planned,
                     new BuildingUnitPersistentLocalId(2),
                     positionGeometryMethod: BuildingUnitPositionGeometryMethod.AppointedByAdministrator,
-                    extendedWkbGeometry: new BuildingRegistry.Legacy.ExtendedWkbGeometry(GeometryHelper.ValidPolygon.AsBinary()))
+                    extendedWkbGeometry: new BuildingRegistry.Legacy.ExtendedWkbGeometry(GeometryHelper.PointNotInPolygon.AsBinary()))
                 .WithBuildingUnit(
                     BuildingUnitStatus.Realized,
                     new BuildingUnitPersistentLocalId(3),
@@ -231,39 +232,6 @@ public void WithBuildingGeometryMethodIsOutlined_ThenThrowsBuildingHasInvalidBui
                 .Throws(new BuildingHasInvalidGeometryMethodException()));
         }
 
-        [Theory]
-        [InlineData("Planned")]
-        [InlineData("Realized")]
-        public void
-            WithBuildingUnitsOutsideOfChangedBuildingGeometry_ThenThrowsBuildingUnitPositionIsOutsideBuildingGeometryException(
-                string buildingUnitStatus)
-        {
-            var command = new ChangeBuildingOutline(
-                Fixture.Create<BuildingPersistentLocalId>(),
-                new ExtendedWkbGeometry(GeometryHelper.SecondValidPolygon.AsBinary()),
-                Fixture.Create<Provenance>());
-
-            var initialBuildingGeometry = new BuildingGeometry(
-                new ExtendedWkbGeometry(GeometryHelper.ValidPolygon.AsBinary()),
-                BuildingGeometryMethod.Outlined);
-
-            var buildingWasMigrated = new BuildingWasMigratedBuilder(Fixture)
-                .WithBuildingGeometry(initialBuildingGeometry)
-                .WithBuildingUnit(
-                    BuildingUnitStatus.Parse(buildingUnitStatus)!.Value,
-                    new BuildingUnitPersistentLocalId(1),
-                    positionGeometryMethod: BuildingUnitPositionGeometryMethod.AppointedByAdministrator,
-                    extendedWkbGeometry: new BuildingRegistry.Legacy.ExtendedWkbGeometry(GeometryHelper.PointNotInPolygon.AsBinary()))
-                .Build();
-
-            Assert(new Scenario()
-                .Given(
-                    new BuildingStreamId(Fixture.Create<BuildingPersistentLocalId>()),
-                    buildingWasMigrated)
-                .When(command)
-                .Throws(new BuildingHasBuildingUnitsOutsideBuildingGeometryException()));
-        }
-
         [Fact]
         public void StateCheck()
         {
@@ -302,7 +270,7 @@ public void StateCheck()
             sut.Initialize(new List<object> {buildingWasMigrated});
 
             // Act
-            sut.ChangeOutliningConstruction(changedBuildingGeometry);
+            sut.ChangeOutliningConstruction(changedBuildingGeometry, new NoOverlappingBuildingGeometries());
 
             // Assert
             sut.BuildingGeometry.Should()
diff --git a/test/BuildingRegistry.Tests/AggregateTests/WhenChangingBuildingOutline/GivenBuildingExists.cs b/test/BuildingRegistry.Tests/AggregateTests/WhenChangingBuildingOutline/GivenBuildingExists.cs
@@ -3,6 +3,7 @@ namespace BuildingRegistry.Tests.AggregateTests.WhenChangingBuildingOutline
     using System;
     using System.Collections.Generic;
     using System.Linq;
+    using Api.BackOffice.Handlers.Lambda;
     using AutoFixture;
     using Be.Vlaanderen.Basisregisters.AggregateSource;
     using Be.Vlaanderen.Basisregisters.AggregateSource.Snapshotting;
@@ -15,6 +16,7 @@ namespace BuildingRegistry.Tests.AggregateTests.WhenChangingBuildingOutline
     using Extensions;
     using Fixtures;
     using FluentAssertions;
+    using Moq;
     using Xunit;
     using Xunit.Abstractions;
     using BuildingUnitFunction = BuildingRegistry.Legacy.BuildingUnitFunction;
@@ -324,6 +326,38 @@ public void WithGeometryTooSmall_ThenBuildingTooSmallExceptionWasThrown()
                 .Throws(new BuildingOutlineIsTooSmallException()));
         }
 
+        [Fact]
+        public void WithOverlappingOutlinedBuilding_ThenThrowsBuildingGeometryOverlapsWithOutlinedBuildingException()
+        {
+            var command = Fixture.Create<ChangeBuildingOutline>();
+
+            FakeBuildingGeometries
+                .Setup(x => x.GetOverlappingBuildingOutlines(
+                    It.IsAny<BuildingPersistentLocalId>(),
+                    It.IsAny<ExtendedWkbGeometry>()))
+                .Returns(new[]
+                {
+                    new BuildingGeometryData(
+                        1,
+                        BuildingStatus.Planned,
+                        BuildingGeometryMethod.Outlined,
+                        GeometryHelper.ValidPolygon,
+                        false)
+                });
+
+            var buildingWasMigrated = new BuildingWasMigratedBuilder(Fixture)
+                .WithBuildingStatus(BuildingStatus.UnderConstruction)
+                .WithBuildingGeometry(new BuildingGeometry(ExtendedWkbGeometry.CreateEWkb(GeometryHelper.ValidPolygon.AsBinary()), BuildingGeometryMethod.Outlined))
+                .Build();
+
+            Assert(new Scenario()
+                .Given(
+                    new BuildingStreamId(Fixture.Create<BuildingPersistentLocalId>()),
+                    buildingWasMigrated)
+                .When(command)
+                .Throws(new BuildingGeometryOverlapsWithOutlinedBuildingException()));
+        }
+
         [Fact]
         public void StateCheck()
         {
@@ -360,7 +394,7 @@ public void StateCheck()
             sut.Initialize(new List<object> { buildingWasMigrated });
 
             // Act
-            sut.ChangeOutliningConstruction(changedBuildingGeometry);
+            sut.ChangeOutliningConstruction(changedBuildingGeometry, new NoOverlappingBuildingGeometries());
 
             // Assert
             sut.BuildingGeometry.Should()
diff --git a/test/BuildingRegistry.Tests/AggregateTests/WhenPlanningBuilding/GivenNoBuildingExists.cs b/test/BuildingRegistry.Tests/AggregateTests/WhenPlanningBuilding/GivenNoBuildingExists.cs
@@ -1,18 +1,17 @@
 namespace BuildingRegistry.Tests.AggregateTests.WhenPlanningBuilding
 {
+    using Api.BackOffice.Handlers.Lambda;
     using AutoFixture;
     using Be.Vlaanderen.Basisregisters.AggregateSource;
     using Be.Vlaanderen.Basisregisters.AggregateSource.Snapshotting;
     using Be.Vlaanderen.Basisregisters.AggregateSource.Testing;
-    using Be.Vlaanderen.Basisregisters.GrAr.Provenance;
     using Building;
     using Building.Commands;
-    using Building.Datastructures;
     using Building.Events;
     using Building.Exceptions;
     using Fixtures;
     using FluentAssertions;
-    using NetTopologySuite.IO;
+    using Moq;
     using Xunit;
     using Xunit.Abstractions;
 
@@ -61,6 +60,30 @@ public void WithGeometryTooSmall_ThenBuildingTooSmallExceptionWasThrown()
                 .Throws(new BuildingOutlineIsTooSmallException()));
         }
 
+        [Fact]
+        public void WithOverlappingOutlinedBuilding_ThenThrowsBuildingGeometryOverlapsWithMeasuredBuildingException()
+        {
+            var command = Fixture.Create<PlanBuilding>();
+
+            FakeBuildingGeometries
+                .Setup(x => x.GetOverlappingBuildingOutlines(
+                    command.BuildingPersistentLocalId,
+                    It.IsAny<ExtendedWkbGeometry>()))
+                .Returns([
+                    new BuildingGeometryData(
+                        command.BuildingPersistentLocalId + 1,
+                        BuildingStatus.Planned,
+                        BuildingGeometryMethod.Outlined,
+                        GeometryHelper.ValidPolygon,
+                        false)
+                ]);
+
+            Assert(new Scenario()
+                .GivenNone()
+                .When(command)
+                .Throws(new BuildingGeometryOverlapsWithOutlinedBuildingException()));
+        }
+
         [Fact]
         public void ThenBuildingStateWasCorrectlySet()
         {
@@ -70,7 +93,8 @@ public void ThenBuildingStateWasCorrectlySet()
             var result = Building.Plan(
                 new BuildingFactory(NoSnapshotStrategy.Instance),
                 command.BuildingPersistentLocalId,
-                command.Geometry);
+                command.Geometry,
+                new NoOverlappingBuildingGeometries());
 
             // Assert
             result.Should().NotBeNull();
diff --git a/test/BuildingRegistry.Tests/AggregateTests/WhenRealizingBuilding/GivenBuildingExists.cs b/test/BuildingRegistry.Tests/AggregateTests/WhenRealizingBuilding/GivenBuildingExists.cs
@@ -2,7 +2,6 @@ namespace BuildingRegistry.Tests.AggregateTests.WhenRealizingBuilding
 {
     using System.Collections.Generic;
     using System.Linq;
-    using Api.BackOffice.Abstractions;
     using Api.BackOffice.Handlers.Lambda;
     using AutoFixture;
     using Be.Vlaanderen.Basisregisters.AggregateSource;
diff --git a/test/BuildingRegistry.Tests/BackOffice/Lambda/Building/WhenPlanningBuilding.cs b/test/BuildingRegistry.Tests/BackOffice/Lambda/Building/WhenPlanningBuilding.cs
@@ -10,8 +10,6 @@ namespace BuildingRegistry.Tests.BackOffice.Lambda.Building
     using Be.Vlaanderen.Basisregisters.CommandHandling;
     using Be.Vlaanderen.Basisregisters.CommandHandling.Idempotency;
     using Be.Vlaanderen.Basisregisters.GrAr.Provenance;
-    using Be.Vlaanderen.Basisregisters.Sqs.Exceptions;
-    using Be.Vlaanderen.Basisregisters.Sqs.Lambda.Handlers;
     using Be.Vlaanderen.Basisregisters.Sqs.Responses;
     using BuildingRegistry.Api.BackOffice.Abstractions.Building.Requests;
     using BuildingRegistry.Api.BackOffice.Abstractions.Building.SqsRequests;
diff --git a/test/BuildingRegistry.Tests/BuildingRegistryTest.cs b/test/BuildingRegistry.Tests/BuildingRegistryTest.cs
@@ -122,6 +122,12 @@ protected override void ConfigureCommandHandling(ContainerBuilder builder)
                         It.IsAny<BuildingPersistentLocalId>(),
                         It.IsAny<ExtendedWkbGeometry>()))
                     .Returns(new List<BuildingGeometryData>());
+
+                FakeBuildingGeometries
+                    .Setup(x => x.GetOverlappingBuildingOutlines(
+                        It.IsAny<BuildingPersistentLocalId>(),
+                        It.IsAny<ExtendedWkbGeometry>()))
+                    .Returns(new List<BuildingGeometryData>());
             }
 
             builder

Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,7 @@ await IdempotentCommandHandler.Dispatch(`
`57`	`57`	`BuildingHasBuildingUnitsOutsideBuildingGeometryException => ValidationErrors.ChangeBuildingOutline.BuildingHasBuildingUnitsOutsideChangedGeometry.ToTicketError(),`
`58`	`58`	`PolygonIsInvalidException => ValidationErrors.Common.InvalidBuildingPolygonGeometry.ToTicketError(),`
`59`	`59`	`BuildingOutlineIsTooSmallException => ValidationErrors.Common.BuildingTooSmallGeometry.ToTicketError(),`
	`60`	`+ BuildingGeometryOverlapsWithOutlinedBuildingException => ValidationErrors.RealizeBuilding.OverlappingOutlinedBuilding.ToTicketError(),`
`60`	`61`	`_ => null`
`61`	`62`	`};`
`62`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,7 @@ await IdempotentCommandHandler.Dispatch(`
`54`	`54`	`{`
`55`	`55`	`PolygonIsInvalidException => ValidationErrors.Common.InvalidBuildingPolygonGeometry.ToTicketError(),`
`56`	`56`	`BuildingOutlineIsTooSmallException => ValidationErrors.Common.BuildingTooSmallGeometry.ToTicketError(),`
	`57`	`+ BuildingGeometryOverlapsWithOutlinedBuildingException => ValidationErrors.RealizeBuilding.OverlappingOutlinedBuilding.ToTicketError(),`
`57`	`58`	`_ => null`
`58`	`59`	`};`
`59`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,5 +10,10 @@ public ICollection<BuildingGeometryData> GetOverlappingBuildings(`
`10`	`10`	`{`
`11`	`11`	`return new List<BuildingGeometryData>();`
`12`	`12`	`}`
	`13`	`+`
	`14`	`+ public ICollection<BuildingGeometryData> GetOverlappingBuildingOutlines(BuildingPersistentLocalId buildingPersistentLocalId, ExtendedWkbGeometry extendedWkbGeometry)`
	`15`	`+ {`
	`16`	`+ return new List<BuildingGeometryData>();`
	`17`	`+ }`
`13`	`18`	`}`
`14`	`19`	`}`