fix bug in span equipment specification validation

DAXGRID · Feb 16, 2021 · 7feb848 · 7feb848
1 parent e4cf52d
commit 7feb848
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/OpenFTTH.UtilityGraphService.Business/SpanEquipment/SpanEquipmentSpecificationsAR.cs b/OpenFTTH.UtilityGraphService.Business/SpanEquipment/SpanEquipmentSpecificationsAR.cs
@@ -82,17 +82,23 @@ private static void ValidateSpanStructureLevelAndPosition(SpanEquipmentSpecifica
 
             while (childsToCheck.Length != 0)
             {
+                List<SpanStructureTemplate> nextLevelChildsToCheck = new List<SpanStructureTemplate>();
+
                 foreach (var childTemplate in childsToCheck)
                 {
                     if (childTemplate.Level != expectedChildLevel)
-                        throw new ArgumentException($"Expected level: {childTemplate.Level} in template referencing span structure specification: {childTemplate.SpanStructureSpecificationId}");
+                        throw new ArgumentException($"Expected level: {expectedChildLevel} in template referencing span structure specification: {childTemplate.SpanStructureSpecificationId}");
 
                     if (levelPositionUsed.Contains((childTemplate.Level, childTemplate.Position)))
                         throw new ArgumentException($"Level {childTemplate.Level} Position {childTemplate.Position} in template referencing span structure specification: {childTemplate.SpanStructureSpecificationId} is used more than once. Must be unique.");
 
                     levelPositionUsed.Add((childTemplate.Level, childTemplate.Position));
+
+                    nextLevelChildsToCheck.AddRange(childTemplate.ChildTemplates);
                 }
 
+                childsToCheck = nextLevelChildsToCheck.ToArray();                
+
                 expectedChildLevel++;
             }
         }

diff --git a/OpenFTTH.UtilityGraphService.Tests/UtilityNetwork/SpanEquipmentSpecificationTests.cs b/OpenFTTH.UtilityGraphService.Tests/UtilityNetwork/SpanEquipmentSpecificationTests.cs
@@ -59,6 +59,8 @@ public async void AddValidMultiLevelSpanEquipmentSpecification_ShouldSucceed()
             var spanEquipmentSpecification = new SpanEquipmentSpecification(Guid.NewGuid(), "Conduit", "Ø50 2x12",
                 new SpanStructureTemplate(outerConduitSpanStructureSpec1.Id, 1, 1,
                     new SpanStructureTemplate[] {
+                        new SpanStructureTemplate(innerConduitSpanStructureSpec1.Id, 2, 1, Array.Empty<SpanStructureTemplate>()),
+                        new SpanStructureTemplate(innerConduitSpanStructureSpec2.Id, 2, 2, Array.Empty<SpanStructureTemplate>())
                     }
                 )
             )