Merge branch 'release/1.0.3'

bbtsoftware · Aug 30, 2021 · fb1dc25 · fb1dc25
2 parents 043a72e + f9aead0
commit fb1dc25
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 8 deletions.
diff --git a/src/BBT.StructureTools.Tests/BBT.StructureTools.Tests.csproj b/src/BBT.StructureTools.Tests/BBT.StructureTools.Tests.csproj
@@ -21,14 +21,14 @@
 
   <ItemGroup>
     <PackageReference Include="BBT.StrategyPattern" Version="1.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
     <PackageReference Include="Moq" Version="4.16.1" />
     <PackageReference Include="Ninject" Version="3.3.4" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="FluentAssertions" Version="5.10.3">
+    <PackageReference Include="FluentAssertions" Version="6.1.0">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.2">

diff --git a/src/BBT.StructureTools.Tests/Convert/TestData/TargetBaseLeaf.cs b/src/BBT.StructureTools.Tests/Convert/TestData/TargetBaseLeaf.cs
@@ -10,9 +10,25 @@ namespace BBT.StructureTools.Tests.Convert.TestData
     /// </summary>
     public class TargetBaseLeaf
     {
+        private TargetRoot root;
+
         /// <summary>
-        /// Gets or sets TargetRoot.
+        /// Gets or sets Root.
         /// </summary>
-        public TargetRoot TargetRoot { get; set; }
+        public TargetRoot TargetRoot
+        {
+            get
+            {
+                return this.root;
+            }
+            set
+            {
+                this.root = value;
+                if (value != null)
+                {
+                    value.TargetLeafs.Add(this);
+                }
+            }
+        }
     }
 }
diff --git a/src/BBT.StructureTools.Tests/Convert/TestData/TargetTreeLeaf.cs b/src/BBT.StructureTools.Tests/Convert/TestData/TargetTreeLeaf.cs
@@ -8,6 +8,8 @@
     /// </summary>
     public class TargetTreeLeaf
     {
+        private TargetTree targetTree;
+
         /// <summary>
         /// Gets the Id.
         /// </summary>
@@ -16,7 +18,21 @@ public class TargetTreeLeaf
         /// <summary>
         /// Gets or sets TargetTree.
         /// </summary>
-        public TargetTree TargetTree { get; set; }
+        public TargetTree TargetTree
+        {
+            get
+            {
+                return this.targetTree;
+            }
+            set
+            {
+                this.targetTree = value;
+                if (value != null)
+                {
+                    value.TargetLeafs.Add(this);
+                }
+            }
+        }
 
         /// <summary>
         /// Gets or sets OriginLeaf.

diff --git a/...BT.StructureTools/Convert/Strategy/OperationConditionalCreateToManyWithReverseRelation.cs b/...BT.StructureTools/Convert/Strategy/OperationConditionalCreateToManyWithReverseRelation.cs
@@ -43,6 +43,7 @@ public OperationConditionalCreateToManyWithReverseRelation(
         public void Execute(TSource source, TTarget target, ICollection<IBaseAdditionalProcessing> additionalProcessings)
         {
             var sourceChildren = this.source.Invoke(source);
+            var childTargets = new List<TBaseTarget>();
             foreach (var sourceChildElement in sourceChildren)
             {
                 var instanceCreationStrategy = this.createInstanceStrategyProvider.GetStrategy(sourceChildElement);
@@ -53,10 +54,12 @@ public void Execute(TSource source, TTarget target, ICollection<IBaseAdditionalP
 
                 // set reverse relation
                 childTarget.SetPropertyValue(this.reverseRelationOnTarget, target);
-
-                // Add to target collection
-                this.targetParentExpression.Compile().Invoke(target).Add(childTarget);
+                childTargets.Add(childTarget);
             }
+
+            target.AddRangeFilterNullValues(
+                this.targetParentExpression,
+                childTargets);
         }
 
         /// <inheritdoc/>