Added fix for issue in "FindComplexProperty" (dotnet/efcore#32437)

Author: PawelGerr

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

@@ -254,8 +254,13 @@ private static void AddConverterToNonNavigation(
          return;
 
 #if COMPLEX_TYPES
+#if USE_FIND_COMPLEX_PROPERTY_FIX
+      var complexProperty = entity.FindComplexPropertyFix(propertyInfo);
+#else
+      var complexProperty = entity.FindComplexProperty(propertyInfo);
+#endif
       // wil be handled by AddConverterForScalarProperties
-      if (entity.FindComplexProperty(propertyInfo) is not null)
+      if (complexProperty is not null)
          return;
 #endif
 
@@ -286,8 +291,11 @@ private static void AddNonKeyedValueObjectMembers(
       foreach (var memberName in members)
       {
 #if COMPLEX_TYPES
+#if USE_FIND_COMPLEX_PROPERTY_FIX
+         var complexProperty = entity.FindComplexPropertyFix(memberName);
+#else
          var complexProperty = entity.FindComplexProperty(memberName);
-
+#endif
          if (complexProperty is not null)
             continue;
 #endif

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

@@ -0,0 +1,23 @@
+#if COMPLEX_TYPES
+
+using System.Reflection;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+namespace Thinktecture;
+
+internal static class MutableTypeBaseExtensions
+{
+   public static IMutableComplexProperty? FindComplexPropertyFix(
+      this IMutableTypeBase type,
+      MemberInfo memberInfo)
+   {
+      return type switch
+      {
+         IReadOnlyEntityType entityType => (IMutableComplexProperty?)entityType.FindComplexProperty(memberInfo),
+         IReadOnlyComplexType complexType => (IMutableComplexProperty?)complexType.FindComplexProperty(memberInfo),
+         _ => type.FindComplexProperty(memberInfo)
+      };
+   }
+}
+
+#endif

src/Thinktecture.Runtime.Extensions.EntityFrameworkCore8/Thinktecture.Runtime.Extensions.EntityFrameworkCore8.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Description>Extends Entity Framework Core to support some components from Thinktecture.Runtime.Extensions.</Description>
     <PackageTags>smart-enum;value-object;discriminated-union;EntityFrameworkCore</PackageTags>
-    <DefineConstants>$(DefineConstants);COMPLEX_TYPES</DefineConstants>
+    <DefineConstants>$(DefineConstants);COMPLEX_TYPES;USE_FIND_COMPLEX_PROPERTY_FIX;</DefineConstants>
     <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 

src/Thinktecture.Runtime.Extensions.EntityFrameworkCore9/Thinktecture.Runtime.Extensions.EntityFrameworkCore9.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Description>Extends Entity Framework Core to support some components from Thinktecture.Runtime.Extensions.</Description>
     <PackageTags>smart-enum;value-object;discriminated-union;EntityFrameworkCore</PackageTags>
-    <DefineConstants>$(DefineConstants);COMPLEX_TYPES</DefineConstants>
+    <DefineConstants>$(DefineConstants);COMPLEX_TYPES;USE_FIND_COMPLEX_PROPERTY_FIX;</DefineConstants>
     <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 

test/Thinktecture.Runtime.Extensions.EntityFrameworkCore.Tests.Sources/Extensions/EntityTypeBuilderExtensionsTests/AddValueObjectConverters.cs

@@ -68,6 +68,15 @@ public void Should_add_converters_for_complex_types_inside_complex_value_object(
 
          ValidateConverter(complexProperty.ComplexType, nameof(TestComplexType.TestEnum));
       }
+
+      [Fact]
+      public void Should_add_converters_for_complex_value_object_as_complex_type()
+      {
+         var entityType = _ctx.Model.FindEntityType(typeof(TestEntityWithComplexValueObjectAsComplexType)) ?? throw new Exception("Entity not found");
+         var complexProperty = entityType.FindComplexProperty(nameof(TestEntityWithComplexValueObjectAsComplexType.TestComplexType)) ?? throw new Exception("Complex type property not found");
+
+         ValidateConverter(complexProperty.ComplexType, nameof(TestComplexValueObject.TestEnum));
+      }
 #endif
 
       [Fact]

test/Thinktecture.Runtime.Extensions.EntityFrameworkCore.Tests.Sources/Extensions/ModelBuilderExtensionsTests/AddValueObjectConverters.cs

@@ -55,6 +55,15 @@ public void Should_add_converters_for_complex_types_inside_complex_value_object(
 
          ValidateConverter(complexProperty.ComplexType, nameof(TestComplexType.TestEnum));
       }
+
+      [Fact]
+      public void Should_add_converters_for_complex_value_object_as_complex_type()
+      {
+         var entityType = _ctx.Model.FindEntityType(typeof(TestEntityWithComplexValueObjectAsComplexType)) ?? throw new Exception("Entity not found");
+         var complexProperty = entityType.FindComplexProperty(nameof(TestEntityWithComplexValueObjectAsComplexType.TestComplexType)) ?? throw new Exception("Complex type property not found");
+
+         ValidateConverter(complexProperty.ComplexType, nameof(TestComplexValueObject.TestEnum));
+      }
 #endif
 
       [Fact]

test/Thinktecture.Runtime.Extensions.EntityFrameworkCore.Tests.Sources/Extensions/ValueObjectDbContextOptionsBuilderExtensionsTests/UseValueObjectValueConverter.cs

@@ -64,6 +64,15 @@ public void Should_add_converters_for_complex_types_inside_complex_value_object(
 
       ValidateConverter(complexProperty.ComplexType, nameof(TestComplexType.TestEnum));
    }
+
+   [Fact]
+   public void Should_add_converters_for_complex_value_object_as_complex_type()
+   {
+      var entityType = _ctx.Model.FindEntityType(typeof(TestEntityWithComplexValueObjectAsComplexType)) ?? throw new Exception("Entity not found");
+      var complexProperty = entityType.FindComplexProperty(nameof(TestEntityWithComplexValueObjectAsComplexType.TestComplexType)) ?? throw new Exception("Complex type property not found");
+
+      ValidateConverter(complexProperty.ComplexType, nameof(TestComplexValueObject.TestEnum));
+   }
 #endif
 
    [Fact]

test/Thinktecture.Runtime.Extensions.EntityFrameworkCore.Tests.Sources/TestEntities/TestComplexValueObject.cs

@@ -0,0 +1,9 @@
+using Thinktecture.Runtime.Tests.TestEnums;
+
+namespace Thinktecture.Runtime.Tests.TestEntities;
+
+[ComplexValueObject]
+public partial class TestComplexValueObject
+{
+   public TestEnum TestEnum { get; }
+}

test/Thinktecture.Runtime.Extensions.EntityFrameworkCore.Tests.Sources/TestEntities/TestDbContext.cs

@@ -13,6 +13,7 @@ public class TestDbContext : DbContext
 #if COMPLEX_TYPES
    public DbSet<TestEntityWithComplexType> TestEntities_with_ComplexType { get; set; }
    public DbSet<ComplexValueObjectWithComplexType> ComplexValueObject_with_ComplexType { get; set; }
+   public DbSet<TestEntityWithComplexValueObjectAsComplexType> TestEntities_with_ComplexValueObjectAsComplexType { get; set; }
 #endif
 
    public TestDbContext(
@@ -42,6 +43,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
 #if COMPLEX_TYPES
       TestEntityWithComplexType.Configure(modelBuilder, _valueConverterRegistration);
       ComplexValueObjectWithComplexType.Configure(modelBuilder, _valueConverterRegistration);
+      TestEntityWithComplexValueObjectAsComplexType.Configure(modelBuilder, _valueConverterRegistration);
 #endif
 
       if (_valueConverterRegistration == ValueConverterRegistration.OnModelCreating)

test/Thinktecture.Runtime.Extensions.EntityFrameworkCore.Tests.Sources/TestEntities/TestEntityWithComplexValueObjectAsComplexType.cs

@@ -0,0 +1,33 @@
+#if COMPLEX_TYPES
+using System;
+using Microsoft.EntityFrameworkCore;
+
+namespace Thinktecture.Runtime.Tests.TestEntities;
+
+public class TestEntityWithComplexValueObjectAsComplexType
+{
+   public Guid Id { get; set; }
+   public TestComplexValueObject TestComplexType { get; set; }
+
+   public static void Configure(
+      ModelBuilder modelBuilder,
+      ValueConverterRegistration valueConverterRegistration)
+   {
+      modelBuilder.Entity<TestEntityWithComplexValueObjectAsComplexType>(builder =>
+      {
+         builder.ComplexProperty(e => e.TestComplexType,
+                                 b =>
+                                 {
+                                    b.IsRequired();
+                                    b.Property(t => t.TestEnum);
+
+                                    if (valueConverterRegistration == ValueConverterRegistration.ComplexTypeConfiguration)
+                                       b.AddValueObjectConverters(true);
+                                 });
+
+         if (valueConverterRegistration == ValueConverterRegistration.EntityConfiguration)
+            builder.AddValueObjectConverters(true);
+      });
+   }
+}
+#endif

test/Thinktecture.Runtime.Extensions.EntityFrameworkCore.Tests.Sources/TestEntities/TestEntityWith_OwnTypes_and_ComplexType.cs

@@ -0,0 +1,10 @@
+#if COMPLEX_TYPES
+
+namespace Thinktecture.Runtime.Tests.TestEntities;
+
+public class Owned_with_ComplexType
+{
+   public TestComplexType TestComplexType { get; set; }
+}
+
+#endif