From 5d13c097d39a7cdbc7fca8f7516e4e437b6a83b2 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Tue, 13 Jun 2023 14:41:55 -0500 Subject: [PATCH] Address PR feedback --- .../aggregator/Services/OrderApiClient.cs | 2 +- .../Web.Bff.Shopping/aggregator/Services/OrderApiClient.cs | 2 +- .../Basket/Basket.API/Repositories/RedisBasketRepository.cs | 4 ++-- .../Services.Common/{JsonHelper.cs => JsonDefaults.cs} | 2 +- src/Web/WebMVC/Services/BasketService.cs | 6 +++--- src/Web/WebMVC/Services/CatalogService.cs | 2 +- src/Web/WebMVC/Services/OrderingService.cs | 4 ++-- src/Web/WebhookClient/Services/WebhooksClient.cs | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) rename src/Services/Services.Common/{JsonHelper.cs => JsonDefaults.cs} (85%) diff --git a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Services/OrderApiClient.cs b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Services/OrderApiClient.cs index 19f47e4b6..34d00da5a 100644 --- a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Services/OrderApiClient.cs +++ b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Services/OrderApiClient.cs @@ -23,6 +23,6 @@ public class OrderApiClient : IOrderApiClient var ordersDraftResponse = await response.Content.ReadAsStringAsync(); - return JsonSerializer.Deserialize(ordersDraftResponse, JsonHelper.CaseInsensitiveOptions); + return JsonSerializer.Deserialize(ordersDraftResponse, JsonDefaults.CaseInsensitiveOptions); } } diff --git a/src/ApiGateways/Web.Bff.Shopping/aggregator/Services/OrderApiClient.cs b/src/ApiGateways/Web.Bff.Shopping/aggregator/Services/OrderApiClient.cs index 4ff678b63..9a237e673 100644 --- a/src/ApiGateways/Web.Bff.Shopping/aggregator/Services/OrderApiClient.cs +++ b/src/ApiGateways/Web.Bff.Shopping/aggregator/Services/OrderApiClient.cs @@ -23,6 +23,6 @@ public class OrderApiClient : IOrderApiClient var ordersDraftResponse = await response.Content.ReadAsStringAsync(); - return JsonSerializer.Deserialize(ordersDraftResponse, JsonHelper.CaseInsensitiveOptions); + return JsonSerializer.Deserialize(ordersDraftResponse, JsonDefaults.CaseInsensitiveOptions); } } diff --git a/src/Services/Basket/Basket.API/Repositories/RedisBasketRepository.cs b/src/Services/Basket/Basket.API/Repositories/RedisBasketRepository.cs index bc503d607..c8a6e3ee3 100644 --- a/src/Services/Basket/Basket.API/Repositories/RedisBasketRepository.cs +++ b/src/Services/Basket/Basket.API/Repositories/RedisBasketRepository.cs @@ -35,12 +35,12 @@ public class RedisBasketRepository : IBasketRepository return null; } - return JsonSerializer.Deserialize(data, JsonHelper.CaseInsensitiveOptions); + return JsonSerializer.Deserialize(data, JsonDefaults.CaseInsensitiveOptions); } public async Task 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) { diff --git a/src/Services/Services.Common/JsonHelper.cs b/src/Services/Services.Common/JsonDefaults.cs similarity index 85% rename from src/Services/Services.Common/JsonHelper.cs rename to src/Services/Services.Common/JsonDefaults.cs index e62dc42dd..5798a4a86 100644 --- a/src/Services/Services.Common/JsonHelper.cs +++ b/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() { diff --git a/src/Web/WebMVC/Services/BasketService.cs b/src/Web/WebMVC/Services/BasketService.cs index e26f1399d..0cfcb408f 100644 --- a/src/Web/WebMVC/Services/BasketService.cs +++ b/src/Web/WebMVC/Services/BasketService.cs @@ -29,7 +29,7 @@ public class BasketService : IBasketService var responseString = await response.Content.ReadAsStringAsync(); return string.IsNullOrEmpty(responseString) ? new Basket() { BuyerId = user.Id } : - JsonSerializer.Deserialize(responseString, JsonHelper.CaseInsensitiveOptions); + JsonSerializer.Deserialize(responseString, JsonDefaults.CaseInsensitiveOptions); } public async Task UpdateBasket(Basket basket) @@ -79,7 +79,7 @@ public class BasketService : IBasketService var jsonResponse = await response.Content.ReadAsStringAsync(); - return JsonSerializer.Deserialize(jsonResponse, JsonHelper.CaseInsensitiveOptions); + return JsonSerializer.Deserialize(jsonResponse, JsonDefaults.CaseInsensitiveOptions); } public async Task GetOrderDraft(string basketId) @@ -88,7 +88,7 @@ public class BasketService : IBasketService var responseString = await _apiClient.GetStringAsync(uri); - var response = JsonSerializer.Deserialize(responseString, JsonHelper.CaseInsensitiveOptions); + var response = JsonSerializer.Deserialize(responseString, JsonDefaults.CaseInsensitiveOptions); return response; } diff --git a/src/Web/WebMVC/Services/CatalogService.cs b/src/Web/WebMVC/Services/CatalogService.cs index 0e7042934..41e375424 100644 --- a/src/Web/WebMVC/Services/CatalogService.cs +++ b/src/Web/WebMVC/Services/CatalogService.cs @@ -23,7 +23,7 @@ public class CatalogService : ICatalogService var responseString = await _httpClient.GetStringAsync(uri); - var catalog = JsonSerializer.Deserialize(responseString, JsonHelper.CaseInsensitiveOptions); + var catalog = JsonSerializer.Deserialize(responseString, JsonDefaults.CaseInsensitiveOptions); return catalog; } diff --git a/src/Web/WebMVC/Services/OrderingService.cs b/src/Web/WebMVC/Services/OrderingService.cs index b5089efe3..fee7bbee6 100644 --- a/src/Web/WebMVC/Services/OrderingService.cs +++ b/src/Web/WebMVC/Services/OrderingService.cs @@ -23,7 +23,7 @@ public class OrderingService : IOrderingService var responseString = await _httpClient.GetStringAsync(uri); - var response = JsonSerializer.Deserialize(responseString, JsonHelper.CaseInsensitiveOptions); + var response = JsonSerializer.Deserialize(responseString, JsonDefaults.CaseInsensitiveOptions); return response; } @@ -34,7 +34,7 @@ public class OrderingService : IOrderingService var responseString = await _httpClient.GetStringAsync(uri); - var response = JsonSerializer.Deserialize>(responseString, JsonHelper.CaseInsensitiveOptions); + var response = JsonSerializer.Deserialize>(responseString, JsonDefaults.CaseInsensitiveOptions); return response; } diff --git a/src/Web/WebhookClient/Services/WebhooksClient.cs b/src/Web/WebhookClient/Services/WebhooksClient.cs index efdbe71e2..c6ff2c818 100644 --- a/src/Web/WebhookClient/Services/WebhooksClient.cs +++ b/src/Web/WebhookClient/Services/WebhooksClient.cs @@ -14,7 +14,7 @@ public class WebhooksClient : IWebhooksClient 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>(json, JsonHelper.CaseInsensitiveOptions); + var subscriptions = JsonSerializer.Deserialize>(json, JsonDefaults.CaseInsensitiveOptions); return subscriptions; } }