.Net 10

Author: phongnguyend

src/EntityFrameworkCore.SqlServer.SimpleBulks.Tests/DbContextExtensions/GetPropertiesTests.cs

@@ -288,28 +288,37 @@ public void GetProperties_JsonComplexType_ReturnsCorrectColumnInformation()
 
         // 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

src/EntityFrameworkCore.SqlServer.SimpleBulks/ColumnInfor.cs

@@ -29,6 +29,31 @@ public class ColumnInfor
     public bool IsJson { get; set; }
 
     public IReadOnlyList<JsonPropertyWriter>? JsonPropertyWriters { get; init; }
+
+    public IReadOnlyDictionary<string, JsonPropertyWriter> GetFlattenedJsonPropertyWriters()
+    {
+        if (JsonPropertyWriters == null || JsonPropertyWriters.Count == 0)
+        {
+            return new Dictionary<string, JsonPropertyWriter>();
+        }
+
+        var result = new Dictionary<string, JsonPropertyWriter>();
+        FlattenJsonPropertyWriters(JsonPropertyWriters, result);
+        return result;
+    }
+
+    private static void FlattenJsonPropertyWriters(IReadOnlyList<JsonPropertyWriter> writers, Dictionary<string, JsonPropertyWriter> result)
+    {
+        foreach (var writer in writers)
+        {
+            result[writer.FullClrPropertyName] = writer;
+
+            if (writer.IsNestedComplexType)
+            {
+                FlattenJsonPropertyWriters(writer.NestedProperties, result);
+            }
+        }
+    }
 }
 
 public class JsonPropertyWriter
@@ -37,6 +62,10 @@ public class JsonPropertyWriter
 
     public string ClrPropertyName { get; init; }
 
+    public string FullJsonPath { get; init; }
+
+    public string FullClrPropertyName { get; init; }
+
     public Type PropertyType { get; init; }
 
     public JsonValueReaderWriter? ReaderWriter { get; init; }

src/EntityFrameworkCore.SqlServer.SimpleBulks/Extensions/DbContextExtensions.cs

@@ -211,7 +211,7 @@ private static void AddJsonComplexProperty(List<ColumnInfor> columnInfors, IComp
         });
     }
 
-    private static List<JsonPropertyWriter> BuildJsonPropertyWriters(IComplexType complexType)
+    private static List<JsonPropertyWriter> BuildJsonPropertyWriters(IComplexType complexType, string clrPrefix = "", string jsonPrefix = "")
     {
         var writers = new List<JsonPropertyWriter>();
 
@@ -225,6 +225,8 @@ private static List<JsonPropertyWriter> BuildJsonPropertyWriters(IComplexType co
             {
                 JsonPropertyName = jsonPropertyName,
                 ClrPropertyName = property.Name,
+                FullJsonPath = string.IsNullOrEmpty(jsonPrefix) ? jsonPropertyName : $"{jsonPrefix}.{jsonPropertyName}",
+                FullClrPropertyName = string.IsNullOrEmpty(clrPrefix) ? property.Name : $"{clrPrefix}.{property.Name}",
                 PropertyType = property.ClrType,
                 ReaderWriter = readerWriter,
                 NestedProperties = null
@@ -235,12 +237,16 @@ private static List<JsonPropertyWriter> BuildJsonPropertyWriters(IComplexType co
         foreach (var nestedComplexProperty in complexType.GetComplexProperties())
         {
             var jsonPropertyName = nestedComplexProperty.GetJsonPropertyName() ?? nestedComplexProperty.Name;
-            var nestedWriters = BuildJsonPropertyWriters(nestedComplexProperty.ComplexType);
+            var fullJsonPath = string.IsNullOrEmpty(jsonPrefix) ? jsonPropertyName : $"{jsonPrefix}.{jsonPropertyName}";
+            var fullClrPropertyName = string.IsNullOrEmpty(clrPrefix) ? nestedComplexProperty.Name : $"{clrPrefix}.{nestedComplexProperty.Name}";
+            var nestedWriters = BuildJsonPropertyWriters(nestedComplexProperty.ComplexType, fullClrPropertyName, fullJsonPath);
 
             writers.Add(new JsonPropertyWriter
             {
                 JsonPropertyName = jsonPropertyName,
                 ClrPropertyName = nestedComplexProperty.Name,
+                FullJsonPath = fullJsonPath,
+                FullClrPropertyName = fullClrPropertyName,
                 PropertyType = nestedComplexProperty.ClrType,
                 ReaderWriter = null,
                 NestedProperties = nestedWriters