Refactor services to remove ApiOptions dependency
Simplified `DocReceiverElementService` and `EnvelopeService` by removing the `ApiOptions` dependency. Updated constructors to eliminate the `IOptions<ApiOptions>` parameter and switched to using relative URLs directly for API requests. Removed unused `BaseUrl` and `UsePredefinedReports` properties from `ApiOptions`. Cleaned up redundant fields, constructor logic, and unused `using` directives in affected services. Registered `EnvelopeService` in `Program.cs` with `AddScoped`. These changes improve maintainability, reduce configuration overhead, and make the services more self-contained.
This commit is contained in:
@@ -1,28 +1,17 @@
|
||||
using System.Net.Http.Json;
|
||||
using System.Text.Json;
|
||||
using EnvelopeGenerator.Application.Common.Dto;
|
||||
using EnvelopeGenerator.Server.Client.Models;
|
||||
using EnvelopeGenerator.Server.Client.Options;
|
||||
using Microsoft.AspNetCore.WebUtilities;
|
||||
using Microsoft.Extensions.Options;
|
||||
|
||||
namespace EnvelopeGenerator.Server.Client.Services;
|
||||
|
||||
/// <summary>
|
||||
/// Retrieves <see cref="EnvelopeDto"/>s from the API.
|
||||
/// </summary>
|
||||
public class EnvelopeService
|
||||
public class EnvelopeService(HttpClient http)
|
||||
{
|
||||
private readonly HttpClient _http;
|
||||
private readonly ApiOptions _apiOptions;
|
||||
private static readonly JsonSerializerOptions _jsonOptions = new(JsonSerializerDefaults.Web);
|
||||
|
||||
public EnvelopeService(HttpClient http, IOptions<ApiOptions> apiOptions)
|
||||
{
|
||||
_http = http;
|
||||
_apiOptions = apiOptions.Value;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Fetches envelopes from the API with optional filters.
|
||||
/// </summary>
|
||||
@@ -34,7 +23,7 @@ public class EnvelopeService
|
||||
bool? onlyCompleted = null,
|
||||
CancellationToken cancel = default)
|
||||
{
|
||||
var baseUrl = $"{_apiOptions.BaseUrl}/api/Envelope";
|
||||
var baseUrl = $"/api/Envelope";
|
||||
var queryParams = new Dictionary<string, string?>();
|
||||
|
||||
if (id.HasValue)
|
||||
@@ -56,7 +45,7 @@ public class EnvelopeService
|
||||
|
||||
var url = QueryHelpers.AddQueryString(baseUrl, queryParams);
|
||||
|
||||
var response = await _http.GetAsync(url, cancel);
|
||||
var response = await http.GetAsync(url, cancel);
|
||||
|
||||
if (!response.IsSuccessStatusCode)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user