Address PR feedback

Author: eerhardt

src/ApiGateways/Mobile.Bff.Shopping/aggregator/Services/OrderApiClient.cs

@@ -23,6 +23,6 @@ public async Task<OrderData> GetOrderDraftFromBasketAsync(BasketData basket)
 
         var ordersDraftResponse = await response.Content.ReadAsStringAsync();
 
-        return JsonSerializer.Deserialize<OrderData>(ordersDraftResponse, JsonHelper.CaseInsensitiveOptions);
+        return JsonSerializer.Deserialize<OrderData>(ordersDraftResponse, JsonDefaults.CaseInsensitiveOptions);
     }
 }

src/ApiGateways/Web.Bff.Shopping/aggregator/Services/OrderApiClient.cs

@@ -23,6 +23,6 @@ public async Task<OrderData> GetOrderDraftFromBasketAsync(BasketData basket)
 
         var ordersDraftResponse = await response.Content.ReadAsStringAsync();
 
-        return JsonSerializer.Deserialize<OrderData>(ordersDraftResponse, JsonHelper.CaseInsensitiveOptions);
+        return JsonSerializer.Deserialize<OrderData>(ordersDraftResponse, JsonDefaults.CaseInsensitiveOptions);
     }
 }

src/Services/Basket/Basket.API/Repositories/RedisBasketRepository.cs

@@ -35,12 +35,12 @@ public async Task<CustomerBasket> GetBasketAsync(string customerId)
             return null;
         }
 
-        return JsonSerializer.Deserialize<CustomerBasket>(data, JsonHelper.CaseInsensitiveOptions);
+        return JsonSerializer.Deserialize<CustomerBasket>(data, JsonDefaults.CaseInsensitiveOptions);
     }
 
     public async Task<CustomerBasket> UpdateBasketAsync(CustomerBasket basket)
     {
-        var created = await _database.StringSetAsync(basket.BuyerId, JsonSerializer.Serialize(basket, JsonHelper.CaseInsensitiveOptions));
+        var created = await _database.StringSetAsync(basket.BuyerId, JsonSerializer.Serialize(basket, JsonDefaults.CaseInsensitiveOptions));
 
         if (!created)
         {

src/Services/Services.Common/JsonHelper.cs renamed to src/Services/Services.Common/JsonDefaults.cs

@@ -2,7 +2,7 @@
 
 namespace Services.Common;
 
-public static class JsonHelper
+public static class JsonDefaults
 {
     public static readonly JsonSerializerOptions CaseInsensitiveOptions = new()
     {

src/Web/WebMVC/Services/BasketService.cs

@@ -29,7 +29,7 @@ public async Task<Basket> GetBasket(ApplicationUser user)
         var responseString = await response.Content.ReadAsStringAsync();
         return string.IsNullOrEmpty(responseString) ?
             new Basket() { BuyerId = user.Id } :
-            JsonSerializer.Deserialize<Basket>(responseString, JsonHelper.CaseInsensitiveOptions);
+            JsonSerializer.Deserialize<Basket>(responseString, JsonDefaults.CaseInsensitiveOptions);
     }
 
     public async Task<Basket> UpdateBasket(Basket basket)
@@ -79,7 +79,7 @@ public async Task<Basket> SetQuantities(ApplicationUser user, Dictionary<string,
 
         var jsonResponse = await response.Content.ReadAsStringAsync();
 
-        return JsonSerializer.Deserialize<Basket>(jsonResponse, JsonHelper.CaseInsensitiveOptions);
+        return JsonSerializer.Deserialize<Basket>(jsonResponse, JsonDefaults.CaseInsensitiveOptions);
     }
 
     public async Task<Order> GetOrderDraft(string basketId)
@@ -88,7 +88,7 @@ public async Task<Order> GetOrderDraft(string basketId)
 
         var responseString = await _apiClient.GetStringAsync(uri);
 
-        var response = JsonSerializer.Deserialize<Order>(responseString, JsonHelper.CaseInsensitiveOptions);
+        var response = JsonSerializer.Deserialize<Order>(responseString, JsonDefaults.CaseInsensitiveOptions);
 
         return response;
     }

src/Web/WebMVC/Services/CatalogService.cs

@@ -23,7 +23,7 @@ public async Task<Catalog> GetCatalogItems(int page, int take, int? brand, int?
 
         var responseString = await _httpClient.GetStringAsync(uri);
 
-        var catalog = JsonSerializer.Deserialize<Catalog>(responseString, JsonHelper.CaseInsensitiveOptions);
+        var catalog = JsonSerializer.Deserialize<Catalog>(responseString, JsonDefaults.CaseInsensitiveOptions);
 
         return catalog;
     }

src/Web/WebMVC/Services/OrderingService.cs

@@ -23,7 +23,7 @@ async public Task<Order> GetOrder(ApplicationUser user, string id)
 
         var responseString = await _httpClient.GetStringAsync(uri);
 
-        var response = JsonSerializer.Deserialize<Order>(responseString, JsonHelper.CaseInsensitiveOptions);
+        var response = JsonSerializer.Deserialize<Order>(responseString, JsonDefaults.CaseInsensitiveOptions);
 
         return response;
     }
@@ -34,7 +34,7 @@ async public Task<List<Order>> GetMyOrders(ApplicationUser user)
 
         var responseString = await _httpClient.GetStringAsync(uri);
 
-        var response = JsonSerializer.Deserialize<List<Order>>(responseString, JsonHelper.CaseInsensitiveOptions);
+        var response = JsonSerializer.Deserialize<List<Order>>(responseString, JsonDefaults.CaseInsensitiveOptions);
 
         return response;
     }

src/Web/WebhookClient/Services/WebhooksClient.cs

@@ -14,7 +14,7 @@ public async Task<IEnumerable<WebhookResponse>> LoadWebhooks()
         var client = _httpClientFactory.CreateClient("GrantClient");
         var response = await client.GetAsync(_options.WebhooksUrl + "/api/v1/webhooks");
         var json = await response.Content.ReadAsStringAsync();
-        var subscriptions = JsonSerializer.Deserialize<IEnumerable<WebhookResponse>>(json, JsonHelper.CaseInsensitiveOptions);
+        var subscriptions = JsonSerializer.Deserialize<IEnumerable<WebhookResponse>>(json, JsonDefaults.CaseInsensitiveOptions);
         return subscriptions;
     }
 }