fix: prevent conflation of Symbol and Reflection TypeViewModel instances

IntelliTect · Nov 2, 2023 · 55bb555 · 55bb555
1 parent ac0f560
commit 55bb555
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/IntelliTect.Coalesce.Tests/Tests/Security/PropertySecurityTests.cs b/src/IntelliTect.Coalesce.Tests/Tests/Security/PropertySecurityTests.cs
@@ -77,7 +77,7 @@ public void UsageOfEntityWithInternalDbSet_IsTreatedLikeExternalType(ClassViewMo
         }
 
         [Theory]
-        [ClassViewModelData(typeof(ComplexModel))]
+        [ReflectionClassViewModelData(typeof(ComplexModel))]
         public void IncludeChildren_IncludesNonSuppressedMembers(ClassViewModelData data)
         {
             ClassViewModel vm = data;
@@ -95,8 +95,8 @@ public void IncludeChildren_IncludesNonSuppressedMembers(ClassViewModelData data
         }
 
         [Theory]
-        [ClassViewModelData(typeof(ComplexModel), nameof(ComplexModel.NoAutoIncludeReferenceNavigation))]
-        [ClassViewModelData(typeof(ComplexModel), nameof(ComplexModel.NoAutoIncludeByClassReferenceNavigation))]
+        [ReflectionClassViewModelData(typeof(ComplexModel), nameof(ComplexModel.NoAutoIncludeReferenceNavigation))]
+        [ReflectionClassViewModelData(typeof(ComplexModel), nameof(ComplexModel.NoAutoIncludeByClassReferenceNavigation))]
         public void IncludeChildren_DoesNotIncludedOptedOutMember(ClassViewModelData data, string propName)
         {
             ClassViewModel vm = data;

diff --git a/src/IntelliTect.Coalesce/TypeDefinition/TypeViewModel.cs b/src/IntelliTect.Coalesce/TypeDefinition/TypeViewModel.cs
@@ -418,7 +418,10 @@ public override bool Equals(object? obj)
         {
             if (!(obj is TypeViewModel that)) return false;
 
-            return this.VerboseFullyQualifiedName == that.VerboseFullyQualifiedName;
+            return 
+                this.VerboseFullyQualifiedName == that.VerboseFullyQualifiedName &&
+                // Ensure we don't conflate reflection and symbol types together:
+                this.GetType() == that.GetType();
         }
 
         public override int GetHashCode() => VerboseFullyQualifiedName.GetHashCode();