Browse Source

Address PR feedback

pull/2123/head
Eric Erhardt 1 year ago
parent
commit
5d13c097d3
8 changed files with 12 additions and 12 deletions
  1. +1
    -1
      src/ApiGateways/Mobile.Bff.Shopping/aggregator/Services/OrderApiClient.cs
  2. +1
    -1
      src/ApiGateways/Web.Bff.Shopping/aggregator/Services/OrderApiClient.cs
  3. +2
    -2
      src/Services/Basket/Basket.API/Repositories/RedisBasketRepository.cs
  4. +1
    -1
      src/Services/Services.Common/JsonDefaults.cs
  5. +3
    -3
      src/Web/WebMVC/Services/BasketService.cs
  6. +1
    -1
      src/Web/WebMVC/Services/CatalogService.cs
  7. +2
    -2
      src/Web/WebMVC/Services/OrderingService.cs
  8. +1
    -1
      src/Web/WebhookClient/Services/WebhooksClient.cs

+ 1
- 1
src/ApiGateways/Mobile.Bff.Shopping/aggregator/Services/OrderApiClient.cs View File

@ -23,6 +23,6 @@ public class OrderApiClient : IOrderApiClient
var ordersDraftResponse = await response.Content.ReadAsStringAsync();
return JsonSerializer.Deserialize<OrderData>(ordersDraftResponse, JsonHelper.CaseInsensitiveOptions);
return JsonSerializer.Deserialize<OrderData>(ordersDraftResponse, JsonDefaults.CaseInsensitiveOptions);
}
}

+ 1
- 1
src/ApiGateways/Web.Bff.Shopping/aggregator/Services/OrderApiClient.cs View File

@ -23,6 +23,6 @@ public class OrderApiClient : IOrderApiClient
var ordersDraftResponse = await response.Content.ReadAsStringAsync();
return JsonSerializer.Deserialize<OrderData>(ordersDraftResponse, JsonHelper.CaseInsensitiveOptions);
return JsonSerializer.Deserialize<OrderData>(ordersDraftResponse, JsonDefaults.CaseInsensitiveOptions);
}
}

+ 2
- 2
src/Services/Basket/Basket.API/Repositories/RedisBasketRepository.cs View File

@ -35,12 +35,12 @@ public class RedisBasketRepository : IBasketRepository
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 → src/Services/Services.Common/JsonDefaults.cs View File

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

+ 3
- 3
src/Web/WebMVC/Services/BasketService.cs View File

@ -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<Basket>(responseString, JsonHelper.CaseInsensitiveOptions);
JsonSerializer.Deserialize<Basket>(responseString, JsonDefaults.CaseInsensitiveOptions);
}
public async Task<Basket> UpdateBasket(Basket basket)
@ -79,7 +79,7 @@ public class BasketService : IBasketService
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 class BasketService : IBasketService
var responseString = await _apiClient.GetStringAsync(uri);
var response = JsonSerializer.Deserialize<Order>(responseString, JsonHelper.CaseInsensitiveOptions);
var response = JsonSerializer.Deserialize<Order>(responseString, JsonDefaults.CaseInsensitiveOptions);
return response;
}


+ 1
- 1
src/Web/WebMVC/Services/CatalogService.cs View File

@ -23,7 +23,7 @@ public class CatalogService : ICatalogService
var responseString = await _httpClient.GetStringAsync(uri);
var catalog = JsonSerializer.Deserialize<Catalog>(responseString, JsonHelper.CaseInsensitiveOptions);
var catalog = JsonSerializer.Deserialize<Catalog>(responseString, JsonDefaults.CaseInsensitiveOptions);
return catalog;
}


+ 2
- 2
src/Web/WebMVC/Services/OrderingService.cs View File

@ -23,7 +23,7 @@ public class OrderingService : IOrderingService
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 @@ public class OrderingService : IOrderingService
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;
}


+ 1
- 1
src/Web/WebhookClient/Services/WebhooksClient.cs View File

@ -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<IEnumerable<WebhookResponse>>(json, JsonHelper.CaseInsensitiveOptions);
var subscriptions = JsonSerializer.Deserialize<IEnumerable<WebhookResponse>>(json, JsonDefaults.CaseInsensitiveOptions);
return subscriptions;
}
}

Loading…
Cancel
Save