fix: AddValueObjectConverters must check inside a complex value objects not just for scalar but for complex properties as well

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.1</VersionPrefix>
+    <VersionPrefix>8.5.2</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

@@ -75,6 +75,13 @@ private static void AddNonKeyedValueObjectMembers(IConventionEntityTypeBuilder e
 
       foreach (var memberName in members)
       {
+#if COMPLEX_TYPES
+         var complexProperty = entity.FindComplexProperty(memberName);
+
+         if (complexProperty is not null)
+            continue;
+#endif
+
          var property = entity.FindProperty(memberName);
 
          if (property is null)

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

@@ -285,6 +285,13 @@ private static void AddNonKeyedValueObjectMembers(
 
       foreach (var memberName in members)
       {
+#if COMPLEX_TYPES
+         var complexProperty = entity.FindComplexProperty(memberName);
+
+         if (complexProperty is not null)
+            continue;
+#endif
+
          var property = entity.FindProperty(memberName);
 
          if (property is null)

test/Thinktecture.Runtime.Extensions.EntityFrameworkCore.Tests.Sources/EntityFrameworkCore/ValueConversion/ValueObjectValueConverterFactoryTests.cs

@@ -122,6 +122,25 @@ await _ctx.TestEntities_with_Enum_and_ValueObjects
                 .ToListAsync();
    }
 
+#if COMPLEX_TYPES
+   [Fact]
+   public async Task Should_roundtrip_complex_value_object_with_complex_property()
+   {
+      var entity = ComplexValueObjectWithComplexType.Create(
+         new Guid("00B7B411-A95E-41F7-91C8-29384431E21A"),
+         new TestComplexType { TestEnum = TestEnum.Item1 });
+
+      _ctx.Add(entity);
+      await _ctx.SaveChangesAsync();
+
+      _ctx.ChangeTracker.Clear();
+
+      var loadedEntity = await _ctx.ComplexValueObject_with_ComplexType.SingleAsync();
+      loadedEntity.Id.Should().Be(entity.Id);
+      loadedEntity.TestComplexType.Should().BeEquivalentTo(entity.TestComplexType);
+   }
+#endif
+
    public void Dispose()
    {
       _ctx.Dispose();

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

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

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

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

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

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

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

@@ -0,0 +1,41 @@
+#if COMPLEX_TYPES
+using System;
+using Microsoft.EntityFrameworkCore;
+
+namespace Thinktecture.Runtime.Tests.TestEntities;
+
+[ComplexValueObject]
+public partial class ComplexValueObjectWithComplexType
+{
+   public Guid Id { get; }
+   public TestComplexType TestComplexType { get; }
+
+   private ComplexValueObjectWithComplexType(Guid id)
+   {
+      Id = id;
+   }
+
+   public static void Configure(
+      ModelBuilder modelBuilder,
+      ValueConverterRegistration valueConverterRegistration)
+   {
+      modelBuilder.Entity<ComplexValueObjectWithComplexType>(builder =>
+      {
+         builder.Property(p => p.Id);
+         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/TestDbContext.cs

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