feat: finally working

src/Rosie.Nutshell/Extensions/StringExtensions.cs

@@ -0,0 +1,9 @@
+namespace Rosie.Nutshell.Extensions;
+
+public static class StringExtensions
+{
+    public static string ToSnakeCase(this string str)
+    {
+        return string.Concat(str.Select((x, i) => i > 0 && char.IsUpper(x) ? "_" + x.ToString() : x.ToString())).ToLower();
+    }
+}

src/Rosie.Nutshell/Json/SnakeCaseNamingPolicy.cs

@@ -0,0 +1,11 @@
+using System.Text.Json;
+using Rosie.Nutshell.Extensions;
+
+namespace Rosie.Nutshell.Json;
+
+public class SnakeCaseNamingPolicy : JsonNamingPolicy
+{
+    public static SnakeCaseNamingPolicy Instance { get; } = new();
+
+    public override string ConvertName(string name) => name.ToSnakeCase();
+}

src/Rosie.Nutshell/NutshellGateway.cs

@@ -1,9 +1,10 @@
 using System.Net.Http.Headers;
-using System.Net.Http.Json;
 using System.Text;
 using System.Text.Json;
 using Microsoft.Extensions.Logging;
 using Rosie.Nutshell.Exceptions;
+using Rosie.Nutshell.Extensions;
+using Rosie.Nutshell.Json;
 using Rosie.Nutshell.Secrets;
 using Rosie.Nutshell.Types.Common;
 using Rosie.Nutshell.Types.Endpoint;
@@ -18,6 +19,18 @@ internal class NutshellGateway : INutshellGateway
     private readonly ILogger<NutshellGateway> _logger;
     private readonly AsyncLazy<HttpClient> _client;
     private static readonly Uri _endpointDiscoverUrl = new(Constants.DiscoveryEndpointUri);
+    private static Uri? _endpointUrl;
+
+    private static readonly JsonSerializerOptions _outputSerializerOptions = new()
+    {
+        PropertyNamingPolicy =  SnakeCaseNamingPolicy.Instance,
+        PropertyNameCaseInsensitive = true
+    };
+
+    private static readonly JsonSerializerOptions _inputSerializationOptions = new()
+    {
+        PropertyNamingPolicy = JsonNamingPolicy.CamelCase
+    };
 
     static NutshellGateway() => DotEnv.Load(".env");
 
@@ -56,6 +69,11 @@ private async Task<Uri> GetApiEndpointForUserAsync(string username)
     {
         try
         {
+            if (_endpointUrl is not null)
+            {
+                return _endpointUrl;
+            }
+
             var request = new GetEndpointRequest(username);
             using var httpClient = _httpClientFactory.CreateClient(nameof(NutshellGateway));
 
@@ -65,7 +83,8 @@ private async Task<Uri> GetApiEndpointForUserAsync(string username)
                 httpClient,
                 _endpointDiscoverUrl);
 
-            return new Uri($"https://{endpoint.Api}/api/v1/json");
+            _endpointUrl = new Uri($"https://{endpoint.Api}/api/v1/json");
+            return _endpointUrl;
         }
         catch(Exception ex)
         {
@@ -116,31 +135,31 @@ private async Task<TOut> GetResponseAsync<TOut, TIn>(
             var json = await response.Content.ReadAsStringAsync();
             _logger.LogInformation("Response content from Nutshell: {Response}", json);
 
-            if (!response.IsSuccessStatusCode)
-            {
-                throw new NutshellApiException($"Error while calling method `{method}`: {response.ReasonPhrase}");
-            }
-
-            var decoded = JsonSerializer.Deserialize<RpcResponse<TOut>>(json);
+            var decoded = JsonSerializer.Deserialize<RpcResponse<TOut>>(json, _outputSerializerOptions);
 
             if (decoded?.Error != null)
             {
                 throw new NutshellApiException(
-                    $"Error while calling method `{method}`: {decoded.Error.Message}",
+                    decoded.Error.Message,
                     decoded.Error.Code,
                     decoded.Error.Data);
             }
 
+            if (!response.IsSuccessStatusCode)
+            {
+                throw new NutshellApiException($"Error while calling method `{method.Name}`: {response.ReasonPhrase}");
+            }
+
             if (decoded is null || decoded.Result is null)
             {
-                throw new NutshellApiException("Error while calling method `{method}`: no response");
+                throw new NutshellApiException($"Error while calling method `{method.Name}`: no response");
             }
 
             return decoded.Result;
         }
         catch (Exception ex)
         {
-            _logger.LogError(ex, "Error while calling method `{Method}`", method);
+            _logger.LogError(ex, "Error while calling method `{Method}`", method.Name);
             throw;
         }
     }
@@ -167,12 +186,14 @@ private HttpRequestMessage CreateRequest(
             }
 
             request.Method = HttpMethod.Post;
-            request.Content = JsonContent.Create(payload);
+            var json = payload.ToJson(_inputSerializationOptions);
+            _logger.LogInformation("Request to Nutshell: {@Json}", json);
+            request.Content = new StringContent(json, Encoding.UTF8, mediaType: "application/json");
             return request;
         }
         catch (Exception ex)
         {
-            _logger.LogError(ex, "Error while creating request for method `{Method}`", method);
+            _logger.LogError(ex, "Error while creating request for method `{Method}`", method.Name);
             throw;
         }
     }

src/Rosie.Nutshell/Procedures/NutshellRpc.cs

@@ -63,7 +63,7 @@ public static class Backups
     public static class Common
     {
         public static readonly NutshellRpc<UniversalSearchResults, SearchRequest> SearchUniversal = new("searchUniversal");
-        public static readonly NutshellRpc<UniversalSearchResults, FindRequest<string>> SearchByEmail = new("searchByEmail");
+        public static readonly NutshellRpc<UniversalSearchResults, EmailAddressQuery> SearchByEmail = new("searchByEmail");
     }
 
     public static class Competitors
@@ -110,7 +110,7 @@ public static class Leads
         public static readonly NutshellRpc<NutshellMilestone[], FindRequest> FindMilestones = new("findMilestones");
         public static readonly NutshellRpc<NutshellLead, PatchLeadRequest> EditLead = new("editLead");
         public static readonly NutshellRpc<NutshellLead, GetLeadRequest> GetLead = new("getLead");
-        public static readonly NutshellRpc<NutshellLead, PatchLeadRequest> NewLead = new("newLead");
+        public static readonly NutshellRpc<NutshellLeadStub, PatchLeadRequest> NewLead = new("newLead");
         public static readonly NutshellRpc<bool, GetLeadRequest> DeleteLead = new("deleteLead");
     }
 

src/Rosie.Nutshell/Types/Account/NutshellAccount.cs

@@ -5,12 +5,9 @@
 
 namespace Rosie.Nutshell.Types.Account;
 
-public class NutshellAccount
+public class NutshellAccount : NutshellAccountStub
 {
-    public int Id { get; set; }
-    public string EntityType { get; set; } = "Accounts";
     public string Rev { get; set; } = null!;
-    public string Name { get; set; } = null!;
     public string Description { get; set; } = null!;
     public string LegacyId { get; set; } = null!;
 

src/Rosie.Nutshell/Types/Account/NutshellAccountStub.cs

@@ -0,0 +1,8 @@
+namespace Rosie.Nutshell.Types.Account;
+
+public class NutshellAccountStub
+{
+    public int Id { get; set; }
+    public string EntityType { get; set; } = "Accounts";
+    public string Name { get; set; } = null!;
+}

src/Rosie.Nutshell/Types/Common/EmailAddressQuery.cs

@@ -0,0 +1,3 @@
+namespace Rosie.Nutshell.Types.Common;
+
+public record EmailAddressQuery(string EmailAddressString);

src/Rosie.Nutshell/Types/Common/FindRequest.cs

@@ -1,5 +1,3 @@
-using System.ComponentModel;
-
 namespace Rosie.Nutshell.Types.Common;
 
 public record FindRequest(

src/Rosie.Nutshell/Types/Contact/NutshellContact.cs

@@ -6,12 +6,10 @@
 
 namespace Rosie.Nutshell.Types.Contact;
 
-public class NutshellContact
+public class NutshellContact : NutshellContactStub
 {
-    public int Id { get; init; }
-    public string EntityType { get; init; }
     public string Rev { get; init; }
-    public NutshellName Name { get; init; }
+    public new NutshellName Name { get; init; }
     public string HtmlUrl { get; init; }
     public string AvatarUrl { get; init; }
     public string Description { get; init; }

src/Rosie.Nutshell/Types/Contact/NutshellContactStub.cs

@@ -0,0 +1,8 @@
+namespace Rosie.Nutshell.Types.Contact;
+
+public class NutshellContactStub
+{
+    public int Id { get; init; }
+    public string EntityType { get; init; }
+    public string Name { get; init; }
+}

src/Rosie.Nutshell/Types/Contact/PatchContactRequest.cs

@@ -1,4 +1,3 @@
-using Rosie.Nutshell.Types.Channels;
 using Rosie.Nutshell.Types.Common;
 using Rosie.Nutshell.Types.Internal;
 
@@ -11,6 +10,8 @@ public interface IPatchKey
         string Name { get; }
     }
 
+    public override object GetProjection() => new { contact = base.GetProjection() };
+
     public static class Keys
     {
         public static readonly TypedPatchKey<string> Name = new("name");

src/Rosie.Nutshell/Types/Contact/UniversalSearchResults.cs

@@ -4,6 +4,6 @@ namespace Rosie.Nutshell.Types.Contact;
 
 public class UniversalSearchResults
 {
-    public NutshellContact[] Contacts { get; init; }
-    public NutshellAccount[] Accounts { get; init; }
+    public NutshellContactStub[] Contacts { get; init; }
+    public NutshellAccountStub[] Accounts { get; init; }
 }

src/Rosie.Nutshell/Types/Internal/PatchedEntity.cs

@@ -21,5 +21,5 @@ public TEntity Update<TPatchKey, TValue>(TPatchKey key, TValue value)
         return this is TEntity entity ? entity : throw new InvalidOperationException();
     }
 
-    public object GetProjection() => Values.ToDictionary(v => v.Key, v => v.Value);
+    public virtual object GetProjection() => Values.ToDictionary(v => v.Key, v => v.Value);
 }

src/Rosie.Nutshell/Types/Lead/NutshellLead.cs

@@ -4,12 +4,9 @@
 
 namespace Rosie.Nutshell.Types.Lead;
 
-public class NutshellLead
+public class NutshellLead : NutshellLeadStub
 {
-    public int Id { get; init; }
     public string EntityType { get; init; }
-    public string Rev { get; init; }
-    public string Name { get; init; }
     public string HtmlUrl { get; init; }
     public string AvatarUrl { get; init; }
     public string[] Tags { get; init; }

src/Rosie.Nutshell/Types/Lead/NutshellLeadStub.cs

@@ -0,0 +1,8 @@
+namespace Rosie.Nutshell.Types.Lead;
+
+public class NutshellLeadStub
+{
+    public int Id { get; set; }
+    public string Rev { get; set; }
+    public string Name { get; set; }
+}

src/Rosie.Nutshell/Types/Lead/PatchLeadRequest.cs

@@ -10,7 +10,9 @@ public interface IPatchKey
     {
         string Name { get; }
     }
-
+
+    public override object GetProjection() => new { lead = base.GetProjection() };
+
     public static class Keys
     {
         public static readonly TypedPatchKey<NutshellEntityId> PrimaryAccount = new("primaryAccount");
@@ -30,9 +32,11 @@ public static class Keys
         public static readonly TypedPatchKey<int?> MilestoneId = new("milestoneId");
         public static readonly TypedPatchKey<int?> StageSetId = new("stagesetId");
     }
-    
+
     public class TypedPatchKey<TValue> : PatchKey<PatchLeadRequest, TValue>, IPatchKey
     {
-        public TypedPatchKey(string name) : base(name) { }
+        public TypedPatchKey(string name) : base(name)
+        {
+        }
     }
 }