EF6 assembly import done; associations work well

msawczyn · Dec 26, 2019 · 83325e5 · 83325e5
1 parent 2233931
commit 83325e5
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 3,732 deletions.
diff --git a/src/Dsl/CustomCode/Utilities/Import/AssemblyProcessor.cs b/src/Dsl/CustomCode/Utilities/Import/AssemblyProcessor.cs
@@ -123,20 +123,25 @@ private void ProcessClasses(ModelRoot modelRoot, List<ParsingModels.ModelClass>
             ProcessProperties(element, data.Properties);
          }
 
-         // Bidirectional associations can get duplicates creeping in, and it's better to clean them here than to rely on each parser version
-         foreach (ParsingModels.ModelClass modelClass in classDataList)
+         // Bidirectional associations get duplicates, and it's better to clean them here than to rely on each parser version
+         List<ModelBidirectionalAssociation> allBidirectionalAssociations = classDataList.SelectMany(cls => cls.BidirectionalAssociations).ToList();
+
+         for (int index = 0; index < allBidirectionalAssociations.Count; index++)
          {
-            foreach (ModelBidirectionalAssociation association in modelClass.BidirectionalAssociations)
+            ModelBidirectionalAssociation keeper = allBidirectionalAssociations[index];
+
+            ModelBidirectionalAssociation duplicate =
+               allBidirectionalAssociations.Skip(index)
+                                           .FirstOrDefault(a => a.SourcePropertyTypeName == keeper.TargetPropertyTypeName
+                                                             && a.SourcePropertyName == keeper.TargetPropertyName
+                                                             && a.TargetPropertyTypeName == keeper.SourcePropertyTypeName
+                                                             && a.TargetPropertyName == keeper.SourcePropertyName);
+
+            if (duplicate != null)
             {
-               ModelBidirectionalAssociation[] duplicates = modelClass.BidirectionalAssociations
-                                                                      .Where(a => a.SourcePropertyTypeName == association.TargetPropertyTypeName
-                                                                               && a.SourcePropertyName == association.TargetPropertyName
-                                                                               && a.TargetPropertyTypeName == association.SourcePropertyTypeName
-                                                                               && a.TargetPropertyName == association.SourcePropertyName)
-                                                                      .ToArray();
-
-               foreach (ModelBidirectionalAssociation duplicate in duplicates)
-                  modelClass.BidirectionalAssociations.Remove(duplicate);
+               ParsingModels.ModelClass duplicateOwner = classDataList.First(c=>c.FullName==duplicate.SourceClassFullName);
+               duplicateOwner.BidirectionalAssociations.Remove(duplicate);
+               allBidirectionalAssociations.Remove(duplicate);
             }
          }
 

diff --git a/src/DslPackage/CustomCode/Partials/EFModelDocData.cs b/src/DslPackage/CustomCode/Partials/EFModelDocData.cs
@@ -274,7 +274,7 @@ private void ValidateModelElement(ModelElement modelElement)
       {
          if (!ModelRoot.BatchUpdating && modelElement is IDisplaysWarning displaysWarningElement)
          {
-            StatusDisplay.Show($"Validating {modelElement}");
+            StatusDisplay.Show($"Validating {modelElement.GetDisplayText()}");
             displaysWarningElement.ResetWarning();
 
             ValidationCategories allCategories = ValidationCategories.Menu | ValidationCategories.Open | ValidationCategories.Save | ValidationCategories.Custom | ValidationCategories.Load;

diff --git a/src/Testing/Sandbox_EF6/IncludeContext.cs b/src/Testing/Sandbox_EF6/IncludeContext.cs
@@ -1,2 +1 @@
-
-
+