AddValueObjectConverters must skip "ignored" members

Author: PawelGerr

Directory.Build.props

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Copyright>(c) $([System.DateTime]::Now.Year), Pawel Gerr. All rights reserved.</Copyright>
-    <VersionPrefix>8.5.2</VersionPrefix>
+    <VersionPrefix>8.5.3</VersionPrefix>
     <Authors>Pawel Gerr</Authors>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageProjectUrl>https://github.com/PawelGerr/Thinktecture.Runtime.Extensions</PackageProjectUrl>

src/Thinktecture.Runtime.Extensions.EntityFrameworkCore.Sources/EntityFrameworkCore/Conventions/ValueObjectConventionPlugin.cs

@@ -35,6 +35,9 @@ private void AddSmartEnumAndKeyedValueObjects(IConventionEntityTypeBuilder entit
 
       foreach (var propertyInfo in entity.ClrType.GetRuntimeProperties())
       {
+         if (entity.IsIgnored(propertyInfo.Name))
+            continue;
+
          var navigation = entity.FindNavigation(propertyInfo);
 
          if (navigation is not null)
@@ -73,19 +76,22 @@ private static void AddNonKeyedValueObjectMembers(IConventionEntityTypeBuilder e
       if (!entity.ClrType.TryGetAssignableMembers(out var members) || members.Count == 0)
          return;
 
-      foreach (var memberName in members)
+      foreach (var member in members)
       {
+         if (entity.IsIgnored(member.Name))
+            continue;
+
 #if COMPLEX_TYPES
-         var complexProperty = entity.FindComplexProperty(memberName);
+         var complexProperty = entity.FindComplexProperty(member);
 
          if (complexProperty is not null)
             continue;
 #endif
 
-         var property = entity.FindProperty(memberName);
+         var property = entity.FindProperty(member);
 
          if (property is null)
-            entity.AddProperty(memberName);
+            entity.AddProperty(member);
       }
    }
 

src/Thinktecture.Runtime.Extensions.EntityFrameworkCore.Sources/Extensions/EntityTypeBuilderExtensions.cs

@@ -249,6 +249,9 @@ private static void AddConverterToNonNavigation(
       Dictionary<Type, ValueConverter>? converterLookup,
       Action<IMutableProperty> configure)
    {
+      if (entity.IsIgnored(propertyInfo.Name))
+         return;
+
       // wil be handled by AddConverterForScalarProperties
       if (entity.FindProperty(propertyInfo) is not null)
          return;
@@ -288,22 +291,25 @@ private static void AddNonKeyedValueObjectMembers(
       if (!entity.ClrType.TryGetAssignableMembers(out var members))
          return;
 
-      foreach (var memberName in members)
+      foreach (var member in members)
       {
+         if (entity.IsIgnored(member.Name))
+            continue;
+
 #if COMPLEX_TYPES
 #if USE_FIND_COMPLEX_PROPERTY_FIX
-         var complexProperty = entity.FindComplexPropertyFix(memberName);
+         var complexProperty = entity.FindComplexPropertyFix(member);
 #else
          var complexProperty = entity.FindComplexProperty(memberName);
 #endif
          if (complexProperty is not null)
             continue;
 #endif
 
-         var property = entity.FindProperty(memberName);
+         var property = entity.FindProperty(member);
 
          if (property is null)
-            entity.AddProperty(memberName);
+            entity.AddProperty(member);
       }
    }