Flurl JSON serialization based on CouchSettings' PropertyCaseType.

Author: matteobortolazzo

CHANGELOG.md

@@ -1,4 +1,9 @@
-# 1.0.1-beta.4 (2019-04-25)
+# 1.0.1 (2019-04-27)
+
+## Bug Fixes
+* **Everywhere:** Flurl JSON serialization based on CouchSettings' PropertyCaseType.
+
+# 1.0.1-beta.4 (2019-04-25)
 
 ## Features
 * **CouchClient:** add FindManyAsync(ids) ([#PR33](https://github.com/matteobortolazzo/couchdb-net/pull/33)).

LATEST_CHANGE.md

@@ -1,8 +1,2 @@
-## Features
-* **CouchClient:** add FindManyAsync(ids) ([#PR33](https://github.com/matteobortolazzo/couchdb-net/pull/33)).
-* **CouchClient:** add QueryAsync(someMangoJson) ([#PR32](https://github.com/matteobortolazzo/couchdb-net/pull/32)).
-* **CouchClient:** add QueryAsync(someMangoObject) ([b4dd1b2](https://github.com/matteobortolazzo/couchdb-net/commit/b4dd1b2)).
-
-## Bug Fixes
-* **_find:** removed T : IComparable from In() and Contains() methods ([#PR31](https://github.com/matteobortolazzo/couchdb-net/pull/31)).
-* **_find:** fix single element array queries. ([#PR34](https://github.com/matteobortolazzo/couchdb-net/pull/34)).
+## Bug Fixes
+* **Everywhere:** Flurl JSON serialization based on CouchSettings' PropertyCaseType.

src/CouchDB.Driver/CouchClient.cs

@@ -12,6 +12,7 @@
 using CouchDB.Driver.Settings;
 using CouchDB.Driver.DTOs;
 using CouchDB.Driver.Exceptions;
+using Newtonsoft.Json;
 
 namespace CouchDB.Driver
 {
@@ -46,6 +47,10 @@ public CouchClient(string connectionString, Action<CouchSettings> couchSettingsF
             ConnectionString = connectionString;
             _flurlClient = new FlurlClient(connectionString).Configure(s =>
             {
+                s.JsonSerializer = new NewtonsoftJsonSerializer(new JsonSerializerSettings
+                {
+                    ContractResolver = new CouchContractResolver(_settings.PropertiesCase)
+                });
                 s.BeforeCall = OnBeforeCall;
                 if (_settings.ServerCertificateCustomValidationCallback != null)
                 {

src/CouchDB.Driver/Extensions/MemberInfoExtensions.cs

@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Text;
+using CouchDB.Driver.Settings;
+using Newtonsoft.Json;
+
+namespace CouchDB.Driver.Extensions
+{
+    internal static class MemberInfoExtensions
+    {
+        public static string GetCouchPropertyName(this MemberInfo memberInfo, PropertyCaseType propertyCaseType)
+        {
+            var jsonPropertyAttributes = memberInfo.GetCustomAttributes(typeof(JsonPropertyAttribute), true);
+            JsonPropertyAttribute jsonProperty = jsonPropertyAttributes.Length > 0 ? 
+                jsonPropertyAttributes[0] as JsonPropertyAttribute : null;
+
+            if (jsonProperty != null)
+            {
+                return jsonProperty.PropertyName;
+            }
+            return propertyCaseType.Convert(memberInfo.Name);
+        }
+    }
+}

src/CouchDB.Driver/Helpers/CouchContractResolver.cs

@@ -0,0 +1,27 @@
+using System.Reflection;
+using CouchDB.Driver.Extensions;
+using CouchDB.Driver.Settings;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Serialization;
+
+namespace CouchDB.Driver.Helpers
+{
+    public class CouchContractResolver : DefaultContractResolver
+    {
+        private readonly PropertyCaseType _propertyCaseType;
+
+        public CouchContractResolver(PropertyCaseType propertyCaseType)
+        {
+            _propertyCaseType = propertyCaseType;
+        }
+        protected override JsonProperty CreateProperty(MemberInfo member, MemberSerialization memberSerialization)
+        {
+            JsonProperty property = base.CreateProperty(member, memberSerialization);
+            if (property != null && !property.Ignored)
+            {
+                property.PropertyName = member.GetCouchPropertyName(_propertyCaseType);
+            }
+            return property;
+        }
+    }
+}

src/CouchDB.Driver/Settings/CouchSettings.cs

@@ -29,7 +29,7 @@ internal CouchSettings()
         {
             AuthenticationType = AuthenticationType.None;
             PluralizeEntitis = true;
-            DocumentsCaseType = (DocumentCaseType)DocumentCaseType.UnderscoreCase;
+            DocumentsCaseType = DocumentCaseType.UnderscoreCase;
             PropertiesCase = PropertyCaseType.CamelCase;
         }
 

src/CouchDB.Driver/Translators/MemberExpressionTranslator.cs

@@ -1,4 +1,6 @@
-using CouchDB.Driver.Types;
+using CouchDB.Driver.Extensions;
+using CouchDB.Driver.Settings;
+using CouchDB.Driver.Types;
 using Humanizer;
 using Newtonsoft.Json;
 using System.Collections.Generic;
@@ -11,25 +13,15 @@ internal partial class QueryTranslator
     {
         protected override Expression VisitMember(MemberExpression m)
         {
-            string GetPropertyName(MemberInfo memberInfo)
-            {
-                var jsonPropertyAttributes = memberInfo.GetCustomAttributes(typeof(JsonPropertyAttribute), true);
-                var jsonProperty = jsonPropertyAttributes.Length > 0 ? jsonPropertyAttributes[0] as JsonPropertyAttribute : null;
-
-                if (jsonProperty != null)
-                {
-                    return jsonProperty.PropertyName;
-                }
-                return _settings.PropertiesCase.Convert(memberInfo.Name);
-            }
+            PropertyCaseType caseType = _settings.PropertiesCase;
 
-            var members = new List<string> { GetPropertyName(m.Member) };
+            var members = new List<string> { m.Member.GetCouchPropertyName(caseType) };
 
             var currentExpression = m.Expression;
 
             while (currentExpression is MemberExpression cm)
             {
-                members.Add(GetPropertyName(cm.Member));
+                members.Add(cm.Member.GetCouchPropertyName(caseType));
                 currentExpression = cm.Expression;
             }