.Net 10

Author: phongnguyend

src/EntityFrameworkCore.SqlServer.SimpleBulks.Tests/Database/ComplexOwnedTypeOrder.cs

@@ -6,5 +6,14 @@ public class ComplexOwnedTypeOrder
 
     public ComplexTypeAddress ComplexShippingAddress { get; set; }
 
+    public OwnedTypeAddress OwnedShippingAddress { get; set; }
+}
+
+public class JsonComplexOwnedTypeOrder
+{
+    public int Id { get; set; }
+
+    public ComplexTypeAddress ComplexShippingAddress { get; set; }
+
     public OwnedTypeAddress OwnedShippingAddress { get; set; }
 }

src/EntityFrameworkCore.SqlServer.SimpleBulks.Tests/Database/ComplexTypeOrder.cs

@@ -23,4 +23,11 @@ public class ComplexTypeLocation
     public double Lat { get; set; }
 
     public double Lng { get; set; }
+}
+
+public class JsonComplexTypeOrder
+{
+    public int Id { get; set; }
+
+    public ComplexTypeAddress ShippingAddress { get; set; }
 }

src/EntityFrameworkCore.SqlServer.SimpleBulks.Tests/Database/JsonComplexTypeOrder.cs

@@ -23,4 +23,11 @@ public class OwnedTypeLocation
     public double Lat { get; set; }
 
     public double Lng { get; set; }
+}
+
+public class JsonOwnedTypeOrder
+{
+    public int Id { get; set; }
+
+    public OwnedTypeAddress ShippingAddress { get; set; }
 }

src/EntityFrameworkCore.SqlServer.SimpleBulks.Tests/Database/JsonOwnedTypeOrder.cs

@@ -25,6 +25,8 @@ public class TestDbContext : DbContext
 
     public DbSet<JsonOwnedTypeOrder> JsonOwnedTypeOrders { get; set; }
 
+    public DbSet<JsonComplexOwnedTypeOrder> JsonComplexOwnedTypeOrders { get; set; }
+
     public DbSet<Blog> Blogs { get; set; }
 
     public DbSet<RssBlog> RssBlogs { get; set; }
@@ -83,6 +85,26 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
             });
         });
 
+        modelBuilder.Entity<JsonComplexOwnedTypeOrder>().ComplexProperty(x => x.ComplexShippingAddress, x =>
+        {
+            x.ToJson();
+            //x.ToJson("xxx").HasColumnType("json");
+            x.ComplexProperty(y => y.Location, y =>
+            {
+                y.HasJsonPropertyName("xxx");
+            });
+        });
+
+        modelBuilder.Entity<JsonComplexOwnedTypeOrder>().OwnsOne(x => x.OwnedShippingAddress, x =>
+        {
+            x.ToJson();
+            //x.ToJson("xxx").HasColumnType("json");
+            x.OwnsOne(y => y.Location, y =>
+            {
+                y.HasJsonPropertyName("xxx");
+            });
+        });
+
         base.OnModelCreating(modelBuilder);
     }
 }

src/EntityFrameworkCore.SqlServer.SimpleBulks.Tests/Database/OwnedTypeOrder.cs

@@ -472,4 +472,156 @@ public void GetProperties_JsonOwnedType_ReturnsCorrectColumnInformation()
         Assert.Contains("Lat", json);
         Assert.Contains("Lng", json);
     }
+
+    [Fact]
+    public void GetProperties_JsonComplexOwnedType_ReturnsCorrectColumnInformation()
+    {
+        // Arrange
+        var dbContext = new TestDbContext("", "");
+
+        // Act
+        var properties = dbContext.GetProperties(typeof(JsonComplexOwnedTypeOrder));
+
+        // Assert
+        Assert.Equal(3, properties.Count);
+
+        var property = properties.First(p => p.PropertyName == "Id");
+        Assert.Equal(typeof(int), property.PropertyType);
+        Assert.Equal("Id", property.ColumnName);
+        Assert.Equal("int", property.ColumnType);
+        Assert.Equal(ValueGenerated.OnAdd, property.ValueGenerated);
+        Assert.Null(property.DefaultValueSql);
+        Assert.True(property.IsPrimaryKey);
+        Assert.False(property.IsRowVersion);
+
+        property = properties.First(p => p.PropertyName == "ComplexShippingAddress");
+        Assert.Equal(typeof(ComplexTypeAddress), property.PropertyType);
+        Assert.Equal("ComplexShippingAddress", property.ColumnName);
+        Assert.Equal("nvarchar(max)", property.ColumnType);
+        Assert.Equal(ValueGenerated.Never, property.ValueGenerated);
+        Assert.Null(property.DefaultValueSql);
+        Assert.False(property.IsPrimaryKey);
+        Assert.False(property.IsRowVersion);
+        Assert.True(property.IsJson);
+        Assert.NotNull(property.JsonPropertyWriters);
+
+        // Verify that the JsonPropertyWriters have correct structure
+        var writers = property.JsonPropertyWriters;
+        var flattenedWriters = property.GetFlattenedJsonPropertyWriters();
+        Assert.Equal(2, writers.Count); // Street and Location
+
+        var streetWriter = writers.FirstOrDefault(w => w.ClrPropertyName == "Street");
+        Assert.NotNull(streetWriter);
+        Assert.Equal("Street", streetWriter.JsonPropertyName);
+        Assert.Equal("Street", streetWriter.FullJsonPath);
+        Assert.Equal("Street", streetWriter.FullClrPropertyName);
+        Assert.Equal(typeof(string), streetWriter.PropertyType);
+        Assert.False(streetWriter.IsNestedComplexType);
+
+        var locationWriter = writers.FirstOrDefault(w => w.ClrPropertyName == "Location");
+        Assert.NotNull(locationWriter);
+        Assert.Equal("xxx", locationWriter.JsonPropertyName); // Mapped to "xxx" in TestDbContext
+        Assert.Equal("xxx", locationWriter.FullJsonPath);
+        Assert.Equal("Location", locationWriter.FullClrPropertyName);
+        Assert.Equal(typeof(ComplexTypeLocation), locationWriter.PropertyType);
+        Assert.True(locationWriter.IsNestedComplexType);
+        Assert.NotNull(locationWriter.NestedProperties);
+        Assert.Equal(2, locationWriter.NestedProperties.Count); // Lat and Lng
+
+        var latWriter = locationWriter.NestedProperties.FirstOrDefault(w => w.ClrPropertyName == "Lat");
+        Assert.NotNull(latWriter);
+        Assert.Equal("xxx.Lat", latWriter.FullJsonPath);
+        Assert.Equal("Location.Lat", latWriter.FullClrPropertyName);
+        Assert.Equal(typeof(double), latWriter.PropertyType);
+
+        var lngWriter = locationWriter.NestedProperties.FirstOrDefault(w => w.ClrPropertyName == "Lng");
+        Assert.NotNull(lngWriter);
+        Assert.Equal("xxx.Lng", lngWriter.FullJsonPath);
+        Assert.Equal("Location.Lng", lngWriter.FullClrPropertyName);
+        Assert.Equal(typeof(double), lngWriter.PropertyType);
+
+        // Verify serialization using JsonPropertyWriters
+        var testComplexAddress = new ComplexTypeAddress
+        {
+            Street = "123 Main St",
+            Location = new ComplexTypeLocation
+            {
+                Lat = 40.7128,
+                Lng = -74.0060
+            }
+        };
+
+        var json = SerializeWithJsonPropertyWriters(testComplexAddress, writers);
+        Assert.NotNull(json);
+        Assert.Contains("Street", json);
+        Assert.Contains("123 Main St", json);
+        Assert.Contains("xxx", json); // Location is mapped to "xxx"
+        Assert.Contains("Lat", json);
+        Assert.Contains("Lng", json);
+
+        property = properties.First(p => p.PropertyName == "OwnedShippingAddress");
+        Assert.Equal(typeof(OwnedTypeAddress), property.PropertyType);
+        Assert.Equal("OwnedShippingAddress", property.ColumnName);
+        Assert.Equal("nvarchar(max)", property.ColumnType);
+        Assert.Equal(ValueGenerated.Never, property.ValueGenerated);
+        Assert.Null(property.DefaultValueSql);
+        Assert.False(property.IsPrimaryKey);
+        Assert.False(property.IsRowVersion);
+        Assert.True(property.IsJson);
+        Assert.NotNull(property.JsonPropertyWriters);
+
+        // Verify that the JsonPropertyWriters have correct structure
+        writers = property.JsonPropertyWriters;
+        flattenedWriters = property.GetFlattenedJsonPropertyWriters();
+        Assert.Equal(3, writers.Count); // Street and Location
+
+        streetWriter = writers.FirstOrDefault(w => w.ClrPropertyName == "Street");
+        Assert.NotNull(streetWriter);
+        Assert.Equal("Street", streetWriter.JsonPropertyName);
+        Assert.Equal("Street", streetWriter.FullJsonPath);
+        Assert.Equal("Street", streetWriter.FullClrPropertyName);
+        Assert.Equal(typeof(string), streetWriter.PropertyType);
+        Assert.False(streetWriter.IsNestedComplexType);
+
+        locationWriter = writers.FirstOrDefault(w => w.ClrPropertyName == "Location");
+        Assert.NotNull(locationWriter);
+        Assert.Equal("xxx", locationWriter.JsonPropertyName); // Mapped to "xxx" in TestDbContext
+        Assert.Equal("xxx", locationWriter.FullJsonPath);
+        Assert.Equal("Location", locationWriter.FullClrPropertyName);
+        Assert.Equal(typeof(OwnedTypeLocation), locationWriter.PropertyType);
+        Assert.True(locationWriter.IsNestedComplexType);
+        Assert.NotNull(locationWriter.NestedProperties);
+        Assert.Equal(3, locationWriter.NestedProperties.Count); // Lat and Lng
+
+        latWriter = locationWriter.NestedProperties.FirstOrDefault(w => w.ClrPropertyName == "Lat");
+        Assert.NotNull(latWriter);
+        Assert.Equal("xxx.Lat", latWriter.FullJsonPath);
+        Assert.Equal("Location.Lat", latWriter.FullClrPropertyName);
+        Assert.Equal(typeof(double), latWriter.PropertyType);
+
+        lngWriter = locationWriter.NestedProperties.FirstOrDefault(w => w.ClrPropertyName == "Lng");
+        Assert.NotNull(lngWriter);
+        Assert.Equal("xxx.Lng", lngWriter.FullJsonPath);
+        Assert.Equal("Location.Lng", lngWriter.FullClrPropertyName);
+        Assert.Equal(typeof(double), lngWriter.PropertyType);
+
+        // Verify serialization using JsonPropertyWriters
+        var testOwnedAddress = new OwnedTypeAddress
+        {
+            Street = "123 Main St",
+            Location = new OwnedTypeLocation
+            {
+                Lat = 40.7128,
+                Lng = -74.0060
+            }
+        };
+
+        json = SerializeWithJsonPropertyWriters(testOwnedAddress, writers);
+        Assert.NotNull(json);
+        Assert.Contains("Street", json);
+        Assert.Contains("123 Main St", json);
+        Assert.Contains("xxx", json); // Location is mapped to "xxx"
+        Assert.Contains("Lat", json);
+        Assert.Contains("Lng", json);
+    }
 }