now checks shadow table if route element was created by gdb-integrator (

#110)
DAXGRID · May 11, 2023 · 38edb47 · 38edb47
1 parent be21689
commit 38edb47
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 16 deletions.
diff --git a/src/OpenFTTH.GDBIntegrator.GeoDatabase/IGeoDatabase.cs b/src/OpenFTTH.GDBIntegrator.GeoDatabase/IGeoDatabase.cs
@@ -7,7 +7,9 @@ namespace OpenFTTH.GDBIntegrator.GeoDatabase
 {
     public interface IGeoDatabase
     {
+        Task<bool> RouteNodeInShadowTableExists(Guid mrid);
         Task<RouteNode> GetRouteNodeShadowTable(Guid mrid, bool includeDeleted = false);
+        Task<bool> RouteSegmentInShadowTableExists(Guid mrid);
         Task<RouteSegment> GetRouteSegmentShadowTable(Guid mrid, bool includeDeleted = false);
         Task<List<RouteNode>> GetIntersectingStartRouteNodes(RouteSegment routeSegment);
         Task<List<RouteNode>> GetIntersectingStartRouteNodes(byte[] coord);

diff --git a/src/OpenFTTH.GDBIntegrator.GeoDatabase/Postgres/Postgis.cs b/src/OpenFTTH.GDBIntegrator.GeoDatabase/Postgres/Postgis.cs
@@ -67,6 +67,13 @@ public async Task RollbackTransaction()
             await DisposeConnection();
         }
 
+        public async Task<bool> RouteNodeInShadowTableExists(Guid mrid)
+        {
+            var connection = GetNpgsqlConnection();
+            var query = @"SELECT exists(SELECT 1 FROM route_network_integrator.route_node WHERE mrid = @mrid)";
+            return await connection.QueryFirstAsync<bool>(query, new { mrid });
+        }
+
         public async Task<RouteNode> GetRouteNodeShadowTable(Guid mrid, bool includeDeleted = false)
         {
             var connection = GetNpgsqlConnection();
@@ -146,6 +153,13 @@ naming_description AS namingDescription
             return routeNodes.FirstOrDefault();
         }
 
+        public async Task<bool> RouteSegmentInShadowTableExists(Guid mrid)
+        {
+            var connection = GetNpgsqlConnection();
+            var query = @"SELECT exists(SELECT 1 FROM route_network_integrator.route_segment WHERE mrid = @mrid)";
+            return await connection.QueryFirstAsync<bool>(query, new { mrid });
+        }
+
         public async Task<RouteSegment> GetRouteSegmentShadowTable(Guid mrid, bool includeDeleted = false)
         {
             var connection = GetNpgsqlConnection();

diff --git a/src/OpenFTTH.GDBIntegrator.Integrator/Factories/RouteNodeCommandFactory.cs b/src/OpenFTTH.GDBIntegrator.Integrator/Factories/RouteNodeCommandFactory.cs
@@ -74,8 +74,11 @@ public async Task<List<INotification>> CreateDigitizedEvent(RouteNode routeNode)
             if (routeNode is null)
                 throw new ArgumentNullException($"Parameter {nameof(routeNode)} cannot be null");
 
-            if (IsCreatedByApplication(routeNode))
+            // If we find the route node is in the shadow table, it means that it was created by the application and we therefore do nothing.
+            if (await _geoDatabase.RouteNodeInShadowTableExists(routeNode.Mrid))
+            {
                 return new List<INotification> { new DoNothing($"{nameof(RouteNode)} with id: '{routeNode.Mrid}' was created by {routeNode.ApplicationName} therefore do nothing.") };
+            }
 
             await _geoDatabase.InsertRouteNodeShadowTable(routeNode);
 
@@ -121,9 +124,6 @@ private async Task<bool> IsValidNodeUpdate(RouteNode shadowTableNode, RouteNode
         private bool AlreadyUpdated(RouteNode routeNode, RouteNode routeNodeShadowTable)
             => routeNode.MarkAsDeleted == routeNodeShadowTable.MarkAsDeleted && routeNode.GetGeoJsonCoordinate() == routeNodeShadowTable.GetGeoJsonCoordinate();
 
-        private bool IsCreatedByApplication(RouteNode routeNode)
-            => routeNode.ApplicationName == _applicationSettings.ApplicationName;
-
         private bool IsModifiedDistanceLessThanTolerance(RouteNode shadowTableNode, RouteNode after)
         {
             var distance = after.GetPoint().Distance(shadowTableNode.GetPoint());

diff --git a/src/OpenFTTH.GDBIntegrator.Integrator/Factories/RouteSegmentCommandFactory.cs b/src/OpenFTTH.GDBIntegrator.Integrator/Factories/RouteSegmentCommandFactory.cs
@@ -107,8 +107,11 @@ public async Task<IEnumerable<INotification>> CreateDigitizedEvent(RouteSegment
             if (routeSegment is null)
                 throw new ArgumentNullException($"Parameter {nameof(routeSegment)} must not be null");
 
-            if (IsCreatedByApplication(routeSegment))
+            // If we find the route segment is in the shadow table, it means that it was created by the application and we therefore do nothing.
+            if (await _geoDatabase.RouteSegmentInShadowTableExists(routeSegment.Mrid))
+            {
                 return new List<INotification>();
+            }
 
             // Update integrator "shadow table" with the used digitized segment
             await _geoDatabase.InsertRouteSegmentShadowTable(routeSegment);
@@ -164,11 +167,6 @@ private bool AlreadyUpdated(RouteSegment routeSegment, RouteSegment shadowTableR
             return routeSegment.MarkAsDeleted == shadowTableRouteSegment.MarkAsDeleted && routeSegment.GetGeoJsonCoordinate() == shadowTableRouteSegment.GetGeoJsonCoordinate();
         }
 
-        private bool IsCreatedByApplication(RouteSegment routeSegment)
-        {
-            return routeSegment.ApplicationName == _applicationSettings.ApplicationName;
-        }
-
         private RouteSegmentDeleted CreateRouteSegmentDeleted(RouteSegment routeSegment)
         {
             return new RouteSegmentDeleted

diff --git a/test/OpenFTTH.GDBIntegrator.Integrator.Tests/Factories/RouteNodeCommandFactoryTest.cs b/test/OpenFTTH.GDBIntegrator.Integrator.Tests/Factories/RouteNodeCommandFactoryTest.cs
@@ -39,13 +39,14 @@ public async Task CreateDigitizedEvent_ShouldReturnDoNothing_OnRouteNodeApplicat
             var applicationSetting = A.Fake<IOptions<ApplicationSetting>>();
             var geoDatabase = A.Fake<IGeoDatabase>();
             var routeNodeValidator = A.Fake<IRouteNodeValidator>();
+            var routeNodeMrid = Guid.NewGuid();
 
-            A.CallTo(() => applicationSetting.Value).Returns(
-                new ApplicationSetting { ApplicationName = "GDB_INTEGRATOR" });
+            A.CallTo(() => geoDatabase.RouteNodeInShadowTableExists(routeNodeMrid))
+                .Returns(true);
 
             var factory = new RouteNodeCommandFactory(applicationSetting, geoDatabase, routeNodeValidator);
 
-            var routeNode = new RouteNode(Guid.Empty, null, Guid.Empty, String.Empty, "GDB_INTEGRATOR");
+            var routeNode = new RouteNode(routeNodeMrid, null, Guid.Empty, String.Empty, "GDB_INTEGRATOR");
             var result = (DoNothing)((await factory.CreateDigitizedEvent(routeNode)).First());
 
             result.Should().BeOfType<DoNothing>();

diff --git a/test/OpenFTTH.GDBIntegrator.Integrator.Tests/Factories/RouteSegmentCommandFactoryTest.cs b/test/OpenFTTH.GDBIntegrator.Integrator.Tests/Factories/RouteSegmentCommandFactoryTest.cs
@@ -43,10 +43,10 @@ public async Task CreateDigitizedEvent_ShouldReturnNull_OnRouteSegmentApplicatio
             var routeSegmentValidator = A.Fake<IRouteSegmentValidator>();
             var geoDatabase = A.Fake<IGeoDatabase>();
             var routeNodeFactory = A.Fake<IRouteNodeFactory>();
-            var routeSegment = new RouteSegment { ApplicationName = "GDB_INTEGRATOR" };
+            var routeSegment = new RouteSegment { Mrid = Guid.NewGuid(), ApplicationName = "GDB_INTEGRATOR" };
 
-            A.CallTo(() => applicationSettings.Value)
-                .Returns(new ApplicationSetting { ApplicationName = "GDB_INTEGRATOR" });
+            A.CallTo(() => geoDatabase.RouteSegmentInShadowTableExists(routeSegment.Mrid))
+                .Returns(true);
 
             var factory = new RouteSegmentCommandFactory(applicationSettings, routeSegmentValidator, geoDatabase, routeNodeFactory);