Fixes an issue where dynamic JsonPatchDocument did not follow JsonNam…

…ingPolicy for property names. Fixes #19
Havunen · Jul 16, 2023 · 4fca64a · 4fca64a
1 parent da51501
commit 4fca64a
Show file tree

Hide file tree

Showing 2 changed files with 58 additions and 4 deletions.
diff --git a/SystemTextJsonPatch.Tests/CustomNamingStrategyTests.cs b/SystemTextJsonPatch.Tests/CustomNamingStrategyTests.cs
@@ -1,6 +1,8 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Dynamic;
 using System.Text.Json;
+using SystemTextJsonPatch.Internal;
 using Xunit;
 
 namespace SystemTextJsonPatch;
@@ -157,6 +159,51 @@ public void ReplacePropertyValueForExpandoObjectWithCustomNamingStrategy()
 		Assert.Equal(2, targetObject.customTest);
 	}
 
+	[Fact]
+	public void PatchDocumentOfTPathPropertyShouldFollowNamingPolicy()
+	{
+		var serializerOptions = new JsonSerializerOptions
+		{
+			PropertyNamingPolicy = JsonNamingPolicy.CamelCase
+		};
+
+		var patch = new JsonPatchDocument<SimpleObject>(new(), serializerOptions);
+		patch.Replace((v) => v.StringProperty, "Bob");
+
+		var patchStr = JsonSerializer.Serialize(patch);
+
+		Assert.Equal("[{\"op\":\"replace\",\"path\":\"/stringProperty\",\"value\":\"Bob\"}]", patchStr);
+	}
+
+	[Fact]
+	public void PatchDocumentOfTPathPropertyShouldFollowNamingPolicyNested()
+	{
+		var serializerOptions = new JsonSerializerOptions
+		{
+			PropertyNamingPolicy = JsonNamingPolicy.CamelCase
+		};
+
+		var patch = new JsonPatchDocument<SimpleObjectWithNestedObject>(new(), serializerOptions);
+		patch.Replace((v) => v.NestedObject.StringProperty, "Bob");
+
+		var patchStr = JsonSerializer.Serialize(patch);
+
+		Assert.Equal("[{\"op\":\"replace\",\"path\":\"/nestedObject/stringProperty\",\"value\":\"Bob\"}]", patchStr);
+	}
+
+	[Fact]
+	public void PatchDocumentOfTPathPropertyShouldNotChangeWhenNoOptionsDefined()
+	{
+		var serializerOptions = new JsonSerializerOptions();
+
+		var patch = new JsonPatchDocument<SimpleObject>(new(), serializerOptions);
+		patch.Replace((v) => v.StringProperty, "Bob");
+
+		var patchStr = JsonSerializer.Serialize(patch);
+
+		Assert.Equal("[{\"op\":\"replace\",\"path\":\"/StringProperty\",\"value\":\"Bob\"}]", patchStr);
+	}
+
 	private class TestNamingStrategy : JsonNamingPolicy
 	{
 		public override string ConvertName(string name)

diff --git a/SystemTextJsonPatch/JsonPatchDocumentOfT.cs b/SystemTextJsonPatch/JsonPatchDocumentOfT.cs
@@ -830,7 +830,7 @@ private List<string> GetPathSegments(Expression expr)
                 var memberExpression = expr as MemberExpression;
                 listOfSegments.AddRange(GetPathSegments(memberExpression.Expression));
                 // Get property name, respecting JsonProperty attribute
-                listOfSegments.Add(JsonPatchDocument<TModel>.GetPropertyNameFromMemberExpression(memberExpression));
+                listOfSegments.Add(this.GetPropertyNameFromMemberExpression(memberExpression));
                 return listOfSegments;
 
             case ExpressionType.Parameter:
@@ -842,7 +842,7 @@ private List<string> GetPathSegments(Expression expr)
         }
     }
 
-    private static string GetPropertyNameFromMemberExpression(MemberExpression memberExpression)
+    private string GetPropertyNameFromMemberExpression(MemberExpression memberExpression)
     {
         var jsonPropertyNameAttr = memberExpression.Member.GetCustomAttribute<JsonPropertyNameAttribute>();
 
@@ -851,7 +851,14 @@ private static string GetPropertyNameFromMemberExpression(MemberExpression membe
             return jsonPropertyNameAttr.Name;
         }
 
-        return memberExpression.Member.Name;
+        var memberName = memberExpression.Member.Name;
+
+        if (this.Options?.PropertyNamingPolicy != null)
+		{
+			return this.Options.PropertyNamingPolicy.ConvertName(memberName);
+		}
+
+        return memberName;
     }