Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/CSharpApp.Api/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
// Add services to the container.
// Learn more about configuring OpenAPI at https://aka.ms/aspnet/openapi
builder.Services.AddOpenApi();
builder.Services.AddDefaultConfiguration();
builder.Services.AddHttpConfiguration();
builder.Services.AddDefaultConfiguration(builder.Configuration);
builder.Services.AddHttpConfiguration(builder.Configuration);
builder.Services.AddProblemDetails();
builder.Services.AddApiVersioning();

Expand Down
36 changes: 26 additions & 10 deletions src/CSharpApp.Application/Products/ProductsService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,38 @@ public class ProductsService : IProductsService
private readonly RestApiSettings _restApiSettings;
private readonly ILogger<ProductsService> _logger;

public ProductsService(IOptions<RestApiSettings> restApiSettings,
public ProductsService(HttpClient httpClient, IOptions<RestApiSettings> restApiSettings,
ILogger<ProductsService> logger)
{
_httpClient = new HttpClient();
_httpClient = httpClient;
_restApiSettings = restApiSettings.Value;
_logger = logger;
}

public async Task<IReadOnlyCollection<Product>> GetProducts()
{
_httpClient.BaseAddress = new Uri(_restApiSettings.BaseUrl!);
var response = await _httpClient.GetAsync(_restApiSettings.Products);
response.EnsureSuccessStatusCode();
var content = await response.Content.ReadAsStringAsync();
var res = JsonSerializer.Deserialize<List<Product>>(content);

return res.AsReadOnly();
try
{
// If Products path is set, request it; otherwise request root
var path = string.IsNullOrWhiteSpace(_restApiSettings.Products) ? string.Empty : _restApiSettings.Products;

var response = await _httpClient.GetAsync(path);
response.EnsureSuccessStatusCode();
var content = await response.Content.ReadAsStringAsync();

var options = new JsonSerializerOptions
{
PropertyNameCaseInsensitive = true
};

var res = JsonSerializer.Deserialize<List<Product>>(content, options) ?? new List<Product>();

return res.AsReadOnly();
}
catch (Exception ex)
{
_logger.LogError(ex, "Error fetching products from remote API");
throw;
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,11 @@ namespace CSharpApp.Infrastructure.Configuration;

public static class DefaultConfiguration
{
public static IServiceCollection AddDefaultConfiguration(this IServiceCollection services)
public static IServiceCollection AddDefaultConfiguration(this IServiceCollection services, IConfiguration configuration)
{
var serviceProvider = services.BuildServiceProvider();
var configuration = serviceProvider.GetService<IConfiguration>();

services.Configure<RestApiSettings>(configuration!.GetSection(nameof(RestApiSettings)));
services.Configure<RestApiSettings>(configuration.GetSection(nameof(RestApiSettings)));
services.Configure<HttpClientSettings>(configuration.GetSection(nameof(HttpClientSettings)));

services.AddSingleton<IProductsService, ProductsService>();

return services;
}
}
}
24 changes: 22 additions & 2 deletions src/CSharpApp.Infrastructure/Configuration/HttpConfiguration.cs
Original file line number Diff line number Diff line change
@@ -1,9 +1,29 @@
using Microsoft.Extensions.Options;

namespace CSharpApp.Infrastructure.Configuration;

public static class HttpConfiguration
{
public static IServiceCollection AddHttpConfiguration(this IServiceCollection services)
public static IServiceCollection AddHttpConfiguration(this IServiceCollection services, IConfiguration configuration)
{
// Register a typed HttpClient for ProductsService using IHttpClientFactory
services.AddHttpClient<IProductsService, ProductsService>((sp, client) =>
{
var rest = sp.GetRequiredService<IOptions<RestApiSettings>>().Value;
var httpSettings = sp.GetRequiredService<IOptions<HttpClientSettings>>().Value;

if (!string.IsNullOrWhiteSpace(rest.BaseUrl))
{
client.BaseAddress = new Uri(rest.BaseUrl);
}

// Configure timeout from settings (LifeTime is seconds)
if (httpSettings.LifeTime > 0)
{
client.Timeout = TimeSpan.FromSeconds(httpSettings.LifeTime);
}
});

return services;
}
}
}