fix admin dashboard client registration conflict
TaxBaik CI/CD / build-and-deploy (push) Failing after 2m18s
TaxBaik CI/CD / build-and-deploy (push) Failing after 2m18s
This commit is contained in:
@@ -24,7 +24,6 @@ builder.Services.AddHttpClient<IApiClient, ApiClient>(client =>
|
|||||||
|
|
||||||
// 각 Browser API Client 등록
|
// 각 Browser API Client 등록
|
||||||
builder.Services.AddHttpClient<TaxBaik.Web.Client.Components.Admin.Services.IAdminDashboardClient, TaxBaik.Web.Client.Components.Admin.Services.AdminDashboardClient>(client => client.BaseAddress = new Uri(apiBaseUrl)).AddHttpMessageHandler<TokenRefreshHandler>();
|
builder.Services.AddHttpClient<TaxBaik.Web.Client.Components.Admin.Services.IAdminDashboardClient, TaxBaik.Web.Client.Components.Admin.Services.AdminDashboardClient>(client => client.BaseAddress = new Uri(apiBaseUrl)).AddHttpMessageHandler<TokenRefreshHandler>();
|
||||||
builder.Services.AddHttpClient<IAdminDashboardClient, AdminDashboardClient>(client => client.BaseAddress = new Uri(apiBaseUrl)).AddHttpMessageHandler<TokenRefreshHandler>();
|
|
||||||
builder.Services.AddHttpClient<IBlogBrowserClient, BlogBrowserClient>(client => client.BaseAddress = new Uri(apiBaseUrl)).AddHttpMessageHandler<TokenRefreshHandler>();
|
builder.Services.AddHttpClient<IBlogBrowserClient, BlogBrowserClient>(client => client.BaseAddress = new Uri(apiBaseUrl)).AddHttpMessageHandler<TokenRefreshHandler>();
|
||||||
builder.Services.AddHttpClient<ICategoryBrowserClient, CategoryBrowserClient>(client => client.BaseAddress = new Uri(apiBaseUrl));
|
builder.Services.AddHttpClient<ICategoryBrowserClient, CategoryBrowserClient>(client => client.BaseAddress = new Uri(apiBaseUrl));
|
||||||
builder.Services.AddHttpClient<IInquiryBrowserClient, InquiryBrowserClient>(client => client.BaseAddress = new Uri(apiBaseUrl)).AddHttpMessageHandler<TokenRefreshHandler>();
|
builder.Services.AddHttpClient<IInquiryBrowserClient, InquiryBrowserClient>(client => client.BaseAddress = new Uri(apiBaseUrl)).AddHttpMessageHandler<TokenRefreshHandler>();
|
||||||
|
|||||||
@@ -1,134 +0,0 @@
|
|||||||
using System.Net.Http;
|
|
||||||
using System.Net.Http.Json;
|
|
||||||
using TaxBaik.Application.Services;
|
|
||||||
using TaxBaik.Domain.Entities;
|
|
||||||
|
|
||||||
namespace TaxBaik.Web.Services;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Admin Dashboard API Client
|
|
||||||
/// SOLID: Single Responsibility - Dashboard API 호출만 담당
|
|
||||||
/// Dependency Inversion - 추상화된 인터페이스 사용
|
|
||||||
/// </summary>
|
|
||||||
public interface IAdminDashboardClient
|
|
||||||
{
|
|
||||||
Task<AdminDashboardSummary> GetSummaryAsync(CancellationToken ct = default);
|
|
||||||
Task<IEnumerable<TaxFiling>> GetUpcomingFilingsAsync(int days = 30, CancellationToken ct = default);
|
|
||||||
Task<IEnumerable<Inquiry>> GetRecentInquiriesAsync(int limit = 10, CancellationToken ct = default);
|
|
||||||
Task<object> GetMonthlyStatsAsync(string? month = null, CancellationToken ct = default);
|
|
||||||
}
|
|
||||||
|
|
||||||
public class AdminDashboardClient : IAdminDashboardClient
|
|
||||||
{
|
|
||||||
private readonly HttpClient _http;
|
|
||||||
private readonly ILogger<AdminDashboardClient> _logger;
|
|
||||||
private readonly ITokenStore _tokenStore;
|
|
||||||
|
|
||||||
public AdminDashboardClient(HttpClient http, ILogger<AdminDashboardClient> logger, ITokenStore tokenStore)
|
|
||||||
{
|
|
||||||
_http = http;
|
|
||||||
_logger = logger;
|
|
||||||
_tokenStore = tokenStore;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void EnsureAuthHeader()
|
|
||||||
{
|
|
||||||
if (!string.IsNullOrEmpty(_tokenStore.AccessToken))
|
|
||||||
_http.DefaultRequestHeaders.Authorization = new("Bearer", _tokenStore.AccessToken);
|
|
||||||
else
|
|
||||||
_http.DefaultRequestHeaders.Authorization = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
public async Task<AdminDashboardSummary> GetSummaryAsync(CancellationToken ct = default)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
EnsureAuthHeader();
|
|
||||||
var result = await _http.GetFromJsonAsync<AdminDashboardSummary>(
|
|
||||||
"admin-dashboard/summary", cancellationToken: ct);
|
|
||||||
return result ?? new(0, 0, 0, 0, []);
|
|
||||||
}
|
|
||||||
catch (HttpRequestException ex)
|
|
||||||
{
|
|
||||||
if (ex.StatusCode == System.Net.HttpStatusCode.Unauthorized)
|
|
||||||
{
|
|
||||||
_logger.LogDebug("Dashboard summary request returned 401; using empty summary");
|
|
||||||
return new(0, 0, 0, 0, []);
|
|
||||||
}
|
|
||||||
|
|
||||||
_logger.LogError(ex, "Failed to fetch dashboard summary");
|
|
||||||
return new(0, 0, 0, 0, []);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public async Task<IEnumerable<TaxFiling>> GetUpcomingFilingsAsync(int days = 30, CancellationToken ct = default)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
EnsureAuthHeader();
|
|
||||||
var result = await _http.GetFromJsonAsync<ApiResponse<TaxFiling>>(
|
|
||||||
$"admin-dashboard/upcoming-filings?days={days}", cancellationToken: ct);
|
|
||||||
return result?.Data ?? [];
|
|
||||||
}
|
|
||||||
catch (HttpRequestException ex)
|
|
||||||
{
|
|
||||||
if (ex.StatusCode == System.Net.HttpStatusCode.Unauthorized)
|
|
||||||
return [];
|
|
||||||
|
|
||||||
_logger.LogError(ex, "Failed to fetch upcoming filings");
|
|
||||||
return [];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public async Task<IEnumerable<Inquiry>> GetRecentInquiriesAsync(int limit = 10, CancellationToken ct = default)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
EnsureAuthHeader();
|
|
||||||
var result = await _http.GetFromJsonAsync<ApiResponse<Inquiry>>(
|
|
||||||
$"admin-dashboard/recent-inquiries?limit={limit}", cancellationToken: ct);
|
|
||||||
return result?.Data ?? [];
|
|
||||||
}
|
|
||||||
catch (HttpRequestException ex)
|
|
||||||
{
|
|
||||||
if (ex.StatusCode == System.Net.HttpStatusCode.Unauthorized)
|
|
||||||
return [];
|
|
||||||
|
|
||||||
_logger.LogError(ex, "Failed to fetch recent inquiries");
|
|
||||||
return [];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public async Task<object> GetMonthlyStatsAsync(string? month = null, CancellationToken ct = default)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
EnsureAuthHeader();
|
|
||||||
var url = "admin-dashboard/monthly-stats";
|
|
||||||
if (!string.IsNullOrEmpty(month))
|
|
||||||
url += $"?month={month}";
|
|
||||||
|
|
||||||
var result = await _http.GetFromJsonAsync<object>(url, cancellationToken: ct);
|
|
||||||
return result ?? new();
|
|
||||||
}
|
|
||||||
catch (HttpRequestException ex)
|
|
||||||
{
|
|
||||||
if (ex.StatusCode == System.Net.HttpStatusCode.Unauthorized)
|
|
||||||
return new { };
|
|
||||||
|
|
||||||
_logger.LogError(ex, "Failed to fetch monthly stats");
|
|
||||||
return new { };
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// API Response wrapper
|
|
||||||
/// </summary>
|
|
||||||
internal class ApiResponse<T>
|
|
||||||
{
|
|
||||||
public IEnumerable<T>? Data { get; set; }
|
|
||||||
public int Total { get; set; }
|
|
||||||
public int Page { get; set; }
|
|
||||||
public int PageSize { get; set; }
|
|
||||||
}
|
|
||||||
@@ -284,10 +284,6 @@ builder.Services.AddHttpClient<ICommonCodeBrowserClient, CommonCodeBrowserClient
|
|||||||
{
|
{
|
||||||
client.BaseAddress = new Uri(apiBaseUrl);
|
client.BaseAddress = new Uri(apiBaseUrl);
|
||||||
}).AddHttpMessageHandler<TokenRefreshHandler>();
|
}).AddHttpMessageHandler<TokenRefreshHandler>();
|
||||||
builder.Services.AddHttpClient<IAdminDashboardClient, AdminDashboardClient>(client =>
|
|
||||||
{
|
|
||||||
client.BaseAddress = new Uri(apiBaseUrl);
|
|
||||||
}).AddHttpMessageHandler<TokenRefreshHandler>();
|
|
||||||
builder.Services.AddHttpClient<IBlogBrowserClient, BlogBrowserClient>(client =>
|
builder.Services.AddHttpClient<IBlogBrowserClient, BlogBrowserClient>(client =>
|
||||||
{
|
{
|
||||||
client.BaseAddress = new Uri(apiBaseUrl);
|
client.BaseAddress = new Uri(apiBaseUrl);
|
||||||
@@ -313,30 +309,6 @@ builder.Services.AddHttpClient<IAnnouncementBrowserClient, AnnouncementBrowserCl
|
|||||||
client.BaseAddress = new Uri(apiBaseUrl);
|
client.BaseAddress = new Uri(apiBaseUrl);
|
||||||
}).AddHttpMessageHandler<TokenRefreshHandler>();
|
}).AddHttpMessageHandler<TokenRefreshHandler>();
|
||||||
|
|
||||||
builder.Services.AddHttpClient<IAdminDashboardClient, AdminDashboardClient>(client =>
|
|
||||||
{
|
|
||||||
client.BaseAddress = new Uri(apiBaseUrl);
|
|
||||||
}).AddHttpMessageHandler<TokenRefreshHandler>();
|
|
||||||
builder.Services.AddHttpClient<IInquiryBrowserClient, InquiryBrowserClient>(client =>
|
|
||||||
{
|
|
||||||
client.BaseAddress = new Uri(apiBaseUrl);
|
|
||||||
}).AddHttpMessageHandler<TokenRefreshHandler>();
|
|
||||||
builder.Services.AddHttpClient<IClientBrowserClient, ClientBrowserClient>(client =>
|
|
||||||
{
|
|
||||||
client.BaseAddress = new Uri(apiBaseUrl);
|
|
||||||
}).AddHttpMessageHandler<TokenRefreshHandler>();
|
|
||||||
builder.Services.AddHttpClient<ITaxFilingBrowserClient, TaxFilingBrowserClient>(client =>
|
|
||||||
{
|
|
||||||
client.BaseAddress = new Uri(apiBaseUrl);
|
|
||||||
}).AddHttpMessageHandler<TokenRefreshHandler>();
|
|
||||||
builder.Services.AddHttpClient<IFaqBrowserClient, FaqBrowserClient>(client =>
|
|
||||||
{
|
|
||||||
client.BaseAddress = new Uri(apiBaseUrl);
|
|
||||||
}).AddHttpMessageHandler<TokenRefreshHandler>();
|
|
||||||
builder.Services.AddHttpClient<IAnnouncementBrowserClient, AnnouncementBrowserClient>(client =>
|
|
||||||
{
|
|
||||||
client.BaseAddress = new Uri(apiBaseUrl);
|
|
||||||
}).AddHttpMessageHandler<TokenRefreshHandler>();
|
|
||||||
|
|
||||||
// Phase 5: Tax Accounting & CRM Browser Clients
|
// Phase 5: Tax Accounting & CRM Browser Clients
|
||||||
// (등록은 Client 프로젝트에서만 필요 - Server는 API만 제공)
|
// (등록은 Client 프로젝트에서만 필요 - Server는 API만 제공)
|
||||||
|
|||||||
Reference in New Issue
Block a user