ea447495d3
TaxBaik CI/CD / build-and-deploy (push) Successful in 2m7s
Groups the repo root into src (buildable source), docs (already existed), and everything else (db/, scripts/, tests/, deploy/ - deployment/ops/test assets that aren't compiled, already organized as their own folders). CI now only needs src/ to build: dotnet restore/build/test/publish all point at src/TaxBaik.sln, src/TaxBaik.Web/, src/TaxBaik.Proxy/. - git mv every project (Domain, Infrastructure, Application, Application.Tests, Web, Web.Client, Proxy) and TaxBaik.sln into src/ as a unit, so relative ProjectReference/.sln paths stay valid unchanged. - .gitea/workflows/deploy.yml: 6 dotnet restore/clean/build/test/publish invocations now point at src/. db/migrations and scripts/ stay at root (deploy_gb.sh and browser-e2e.yml only touch published output and the deployed URL, not source paths - verified, no changes needed there). - scripts/validate_admin_render.sh: admin render-mode file paths now src/TaxBaik.Web.Client/... - scripts/validate_kst_timestamps.sh: dropped deploy.sh from its target list - that script was removed in the prior cleanup commit (dead, no CI workflow referenced it) but this validator still expected it to exist. - CLAUDE.md, docs/ENGINEERING_HARNESS.md, docs/ADMIN_PATTERN_CRITIQUE_WBS.md: updated project-structure diagram, dotnet run/build commands, and grep targets to the new src/ paths (also fixed a pre-existing stale path in ADMIN_PATTERN_CRITIQUE_WBS.md that still said TaxBaik.Web/Components/Admin from before that ever moved to TaxBaik.Web.Client). - Added a Repo Root harness rule + Architecture Guardrail entries: new files belong under src/docs/tests/scripts/db/deploy, not loose at root; temp work stays outside the repo (or under a gitignored .scratch/) and is never committed. Verified locally: dotnet build/test src/TaxBaik.sln (26/26 tests), and all three scripts/validate_*.sh pass against the new layout. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
160 lines
6.0 KiB
C#
160 lines
6.0 KiB
C#
namespace TaxBaik.Web.Services.AdminClients;
|
|
|
|
using System.Text.Json;
|
|
using TaxBaik.Domain.Entities;
|
|
|
|
public interface IRevenueTrackingBrowserClient
|
|
{
|
|
Task<List<RevenueTracking>> GetAllAsync(CancellationToken ct = default);
|
|
Task<List<RevenueTracking>> GetByClientIdAsync(int clientId, CancellationToken ct = default);
|
|
Task<List<RevenueTracking>> GetPendingPaymentsAsync(CancellationToken ct = default);
|
|
Task<List<RevenueTracking>> GetMonthlyRevenueAsync(int year, int month, CancellationToken ct = default);
|
|
Task<decimal> GetTotalRevenueAsync(DateTime startDate, DateTime endDate, CancellationToken ct = default);
|
|
Task<int> CreateAsync(int clientId, string invoiceNumber, DateTime invoiceDate, decimal amount,
|
|
string? serviceType = null, DateTime? dueDate = null, CancellationToken ct = default);
|
|
Task MarkPaidAsync(int id, DateTime paymentDate, CancellationToken ct = default);
|
|
Task DeleteAsync(int id, CancellationToken ct = default);
|
|
}
|
|
|
|
public class RevenueTrackingBrowserClient(HttpClient httpClient, ITokenStore tokenStore, ILogger<RevenueTrackingBrowserClient> logger)
|
|
: IRevenueTrackingBrowserClient
|
|
{
|
|
private const string BaseUrl = "/api/revenuetracking";
|
|
|
|
private void EnsureAuthHeader()
|
|
{
|
|
if (!string.IsNullOrEmpty(tokenStore.AccessToken))
|
|
httpClient.DefaultRequestHeaders.Authorization = new("Bearer", tokenStore.AccessToken);
|
|
else
|
|
httpClient.DefaultRequestHeaders.Authorization = null;
|
|
}
|
|
|
|
public async Task<List<RevenueTracking>> GetAllAsync(CancellationToken ct = default)
|
|
{
|
|
try
|
|
{
|
|
EnsureAuthHeader();
|
|
return await httpClient.GetFromJsonAsync<List<RevenueTracking>>($"{BaseUrl}", ct) ?? [];
|
|
}
|
|
catch (Exception ex)
|
|
{
|
|
logger.LogError(ex, "Failed to get revenue tracking");
|
|
return [];
|
|
}
|
|
}
|
|
|
|
public async Task<List<RevenueTracking>> GetByClientIdAsync(int clientId, CancellationToken ct = default)
|
|
{
|
|
try
|
|
{
|
|
EnsureAuthHeader();
|
|
return await httpClient.GetFromJsonAsync<List<RevenueTracking>>($"{BaseUrl}/client/{clientId}", ct) ?? [];
|
|
}
|
|
catch (Exception ex)
|
|
{
|
|
logger.LogError(ex, "Failed to get revenue for client {ClientId}", clientId);
|
|
return [];
|
|
}
|
|
}
|
|
|
|
public async Task<List<RevenueTracking>> GetPendingPaymentsAsync(CancellationToken ct = default)
|
|
{
|
|
try
|
|
{
|
|
EnsureAuthHeader();
|
|
var response = await httpClient.GetFromJsonAsync<JsonElement>($"{BaseUrl}/pending", ct);
|
|
if (response.TryGetProperty("data", out var data))
|
|
return System.Text.Json.JsonSerializer.Deserialize<List<RevenueTracking>>(data.GetRawText()) ?? [];
|
|
return [];
|
|
}
|
|
catch (Exception ex)
|
|
{
|
|
logger.LogError(ex, "Failed to get pending payments");
|
|
return [];
|
|
}
|
|
}
|
|
|
|
public async Task<List<RevenueTracking>> GetMonthlyRevenueAsync(int year, int month, CancellationToken ct = default)
|
|
{
|
|
try
|
|
{
|
|
EnsureAuthHeader();
|
|
var response = await httpClient.GetFromJsonAsync<JsonElement>($"{BaseUrl}/monthly?year={year}&month={month}", ct);
|
|
if (response.TryGetProperty("data", out var data))
|
|
return System.Text.Json.JsonSerializer.Deserialize<List<RevenueTracking>>(data.GetRawText()) ?? [];
|
|
return [];
|
|
}
|
|
catch (Exception ex)
|
|
{
|
|
logger.LogError(ex, "Failed to get monthly revenue {Year}-{Month}", year, month);
|
|
return [];
|
|
}
|
|
}
|
|
|
|
public async Task<decimal> GetTotalRevenueAsync(DateTime startDate, DateTime endDate, CancellationToken ct = default)
|
|
{
|
|
try
|
|
{
|
|
EnsureAuthHeader();
|
|
var response = await httpClient.GetFromJsonAsync<JsonElement>(
|
|
$"{BaseUrl}/total?startDate={startDate:yyyy-MM-dd}&endDate={endDate:yyyy-MM-dd}", ct);
|
|
if (response.TryGetProperty("total", out var totalValue))
|
|
return System.Text.Json.JsonSerializer.Deserialize<decimal>(totalValue.GetRawText());
|
|
return 0;
|
|
}
|
|
catch (Exception ex)
|
|
{
|
|
logger.LogError(ex, "Failed to get total revenue");
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
public async Task<int> CreateAsync(int clientId, string invoiceNumber, DateTime invoiceDate, decimal amount,
|
|
string? serviceType = null, DateTime? dueDate = null, CancellationToken ct = default)
|
|
{
|
|
try
|
|
{
|
|
EnsureAuthHeader();
|
|
var request = new { clientId, invoiceNumber, invoiceDate, amount, serviceType, dueDate };
|
|
var response = await httpClient.PostAsJsonAsync(BaseUrl, request, ct);
|
|
response.EnsureSuccessStatusCode();
|
|
var result = await response.Content.ReadFromJsonAsync<JsonElement>(cancellationToken: ct);
|
|
return result.TryGetProperty("id", out var idProp) ? idProp.GetInt32() : 0;
|
|
}
|
|
catch (Exception ex)
|
|
{
|
|
logger.LogError(ex, "Failed to create revenue tracking");
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
public async Task MarkPaidAsync(int id, DateTime paymentDate, CancellationToken ct = default)
|
|
{
|
|
try
|
|
{
|
|
EnsureAuthHeader();
|
|
var request = new { paymentDate };
|
|
var response = await httpClient.PutAsJsonAsync($"{BaseUrl}/{id}/paid", request, ct);
|
|
response.EnsureSuccessStatusCode();
|
|
}
|
|
catch (Exception ex)
|
|
{
|
|
logger.LogError(ex, "Failed to mark payment {Id}", id);
|
|
}
|
|
}
|
|
|
|
public async Task DeleteAsync(int id, CancellationToken ct = default)
|
|
{
|
|
try
|
|
{
|
|
EnsureAuthHeader();
|
|
var response = await httpClient.DeleteAsync($"{BaseUrl}/{id}", ct);
|
|
response.EnsureSuccessStatusCode();
|
|
}
|
|
catch (Exception ex)
|
|
{
|
|
logger.LogError(ex, "Failed to delete revenue tracking {Id}", id);
|
|
}
|
|
}
|
|
}
|