From fcff68df0a1f33a31f5aaffe71b18f89062405c1 Mon Sep 17 00:00:00 2001 From: acebiscuits <27roter72@gmail.com> Date: Mon, 16 Feb 2026 23:51:53 +0400 Subject: [PATCH 1/6] fix: cards info --- Client.Wasm/Components/DataCard.razor | 1 + Client.Wasm/Components/StudentCard.razor | 8 ++++---- Client.Wasm/wwwroot/appsettings.json | 16 ++++++++-------- CloudDevelopment.sln | 18 ++++++++++++++++++ 4 files changed, 31 insertions(+), 12 deletions(-) diff --git a/Client.Wasm/Components/DataCard.razor b/Client.Wasm/Components/DataCard.razor index c646a83..8341889 100644 --- a/Client.Wasm/Components/DataCard.razor +++ b/Client.Wasm/Components/DataCard.razor @@ -68,6 +68,7 @@ private async Task RequestNewData() { var baseAddress = Configuration["BaseAddress"] ?? throw new KeyNotFoundException("Конфигурация клиента не содержит параметра BaseAddress"); + Console.WriteLine($"{baseAddress}?id={Id}"); Value = await Client.GetFromJsonAsync($"{baseAddress}?id={Id}", new JsonSerializerOptions { }); StateHasChanged(); } diff --git a/Client.Wasm/Components/StudentCard.razor b/Client.Wasm/Components/StudentCard.razor index 661f118..4158ced 100644 --- a/Client.Wasm/Components/StudentCard.razor +++ b/Client.Wasm/Components/StudentCard.razor @@ -4,10 +4,10 @@ - Номер №X "Название лабораторной" - Вариант №Х "Название варианта" - Выполнена Фамилией Именем 65ХХ - Ссылка на форк + Номер №1 "«Кэширование» - Реализация сервиса генерации контрактов, кэширование его ответов" + Вариант №41 "Кредитная заявка " + Выполнена Кадниковым Егором 6513 + Ссылка на форк diff --git a/Client.Wasm/wwwroot/appsettings.json b/Client.Wasm/wwwroot/appsettings.json index 4dda7c0..13f5dcd 100644 --- a/Client.Wasm/wwwroot/appsettings.json +++ b/Client.Wasm/wwwroot/appsettings.json @@ -1,10 +1,10 @@ { - "Logging": { - "LogLevel": { - "Default": "Information", - "Microsoft.AspNetCore": "Warning" - } - }, - "AllowedHosts": "*", - "BaseAddress": "https://localhost:7170/land-plot" + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning" + } + }, + "AllowedHosts": "*", + "BaseAddress": "https://localhost:7240/credit-orders" } \ No newline at end of file diff --git a/CloudDevelopment.sln b/CloudDevelopment.sln index cb48241..514c42d 100644 --- a/CloudDevelopment.sln +++ b/CloudDevelopment.sln @@ -5,6 +5,12 @@ VisualStudioVersion = 17.14.36811.4 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Client.Wasm", "Client.Wasm\Client.Wasm.csproj", "{AE7EEA74-2FE0-136F-D797-854FD87E022A}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Generator", "Generator\Generator.csproj", "{5F162047-71C4-A730-10F2-8456E4D1F966}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CloudDevelopment.AppHost", "CloudDevelopment.AppHost\CloudDevelopment.AppHost.csproj", "{359B77C3-1D6B-4E58-A926-C907812424A8}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CloudDevelopment.ServiceDefaults", "CloudDevelopment.ServiceDefaults\CloudDevelopment.ServiceDefaults.csproj", "{DC017A15-5E73-C618-2A78-CD0D64478DC9}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -15,6 +21,18 @@ Global {AE7EEA74-2FE0-136F-D797-854FD87E022A}.Debug|Any CPU.Build.0 = Debug|Any CPU {AE7EEA74-2FE0-136F-D797-854FD87E022A}.Release|Any CPU.ActiveCfg = Release|Any CPU {AE7EEA74-2FE0-136F-D797-854FD87E022A}.Release|Any CPU.Build.0 = Release|Any CPU + {5F162047-71C4-A730-10F2-8456E4D1F966}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5F162047-71C4-A730-10F2-8456E4D1F966}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5F162047-71C4-A730-10F2-8456E4D1F966}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5F162047-71C4-A730-10F2-8456E4D1F966}.Release|Any CPU.Build.0 = Release|Any CPU + {359B77C3-1D6B-4E58-A926-C907812424A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {359B77C3-1D6B-4E58-A926-C907812424A8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {359B77C3-1D6B-4E58-A926-C907812424A8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {359B77C3-1D6B-4E58-A926-C907812424A8}.Release|Any CPU.Build.0 = Release|Any CPU + {DC017A15-5E73-C618-2A78-CD0D64478DC9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DC017A15-5E73-C618-2A78-CD0D64478DC9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DC017A15-5E73-C618-2A78-CD0D64478DC9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DC017A15-5E73-C618-2A78-CD0D64478DC9}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE From efca344404a70778a020f4e111bd2e8481f8e46b Mon Sep 17 00:00:00 2001 From: acebiscuits <27roter72@gmail.com> Date: Mon, 16 Feb 2026 23:53:08 +0400 Subject: [PATCH 2/6] add: credit order generator --- .../Controllers/CreditOrderController.cs | 32 ++++++++ Generator/Dto/CreditOrderDto.cs | 15 ++++ Generator/Generator.csproj | 19 +++++ Generator/Generator.http | 6 ++ Generator/Program.cs | 51 ++++++++++++ Generator/Properties/launchSettings.json | 41 ++++++++++ Generator/Services/CreditOrderGenerator.cs | 56 +++++++++++++ Generator/Services/CreditOrderService.cs | 79 +++++++++++++++++++ Generator/appsettings.Development.json | 8 ++ Generator/appsettings.json | 9 +++ 10 files changed, 316 insertions(+) create mode 100644 Generator/Controllers/CreditOrderController.cs create mode 100644 Generator/Dto/CreditOrderDto.cs create mode 100644 Generator/Generator.csproj create mode 100644 Generator/Generator.http create mode 100644 Generator/Program.cs create mode 100644 Generator/Properties/launchSettings.json create mode 100644 Generator/Services/CreditOrderGenerator.cs create mode 100644 Generator/Services/CreditOrderService.cs create mode 100644 Generator/appsettings.Development.json create mode 100644 Generator/appsettings.json diff --git a/Generator/Controllers/CreditOrderController.cs b/Generator/Controllers/CreditOrderController.cs new file mode 100644 index 0000000..ce8d579 --- /dev/null +++ b/Generator/Controllers/CreditOrderController.cs @@ -0,0 +1,32 @@ +using Generator.Dto; +using Generator.Services; +using Microsoft.AspNetCore.Mvc; + +namespace Generator.Controllers; + + +[ApiController] +[Route("credit-orders")] +public sealed class CreditOrderController : ControllerBase +{ + private readonly ILogger _logger; + private readonly CreditOrderService _service; + + public CreditOrderController(CreditOrderService service, ILogger logger) + { + _service = service; + _logger = logger; + } + + [HttpGet] + public async Task> Get([FromQuery] int id, CancellationToken ct) + { + _logger.LogInformation("HTTP GET /credit-orders requested: {OrderId}", id); + + var order = await _service.GetByIdAsync(id, ct); + + _logger.LogInformation("HTTP GET /credit-orders completed: {OrderId} {Status}", order.Id, order.OrderStatus); + + return Ok(order); + } +} diff --git a/Generator/Dto/CreditOrderDto.cs b/Generator/Dto/CreditOrderDto.cs new file mode 100644 index 0000000..68f4855 --- /dev/null +++ b/Generator/Dto/CreditOrderDto.cs @@ -0,0 +1,15 @@ +namespace Generator.Dto; + +public class CreditOrderDto +{ + public int Id { get; set; } + public string CreditType { get; set; } = ""; + public decimal RequestedSum { get; set; } + public int MonthsDuration { get; set; } + public double InterestRate { get; set; } + public DateOnly FilingDate { get; set; } + public bool IsInsuranceNeeded { get; set; } + public string OrderStatus { get; set; } = ""; + public DateOnly? DecisionDate { get; set; } + public decimal? ApprovedSum { get; set; } +} diff --git a/Generator/Generator.csproj b/Generator/Generator.csproj new file mode 100644 index 0000000..410d35b --- /dev/null +++ b/Generator/Generator.csproj @@ -0,0 +1,19 @@ + + + + net8.0 + enable + enable + + + + + + + + + + + + + diff --git a/Generator/Generator.http b/Generator/Generator.http new file mode 100644 index 0000000..fdc1acb --- /dev/null +++ b/Generator/Generator.http @@ -0,0 +1,6 @@ +@Generator_HostAddress = http://localhost:5291 + +GET {{Generator_HostAddress}}/weatherforecast/ +Accept: application/json + +### diff --git a/Generator/Program.cs b/Generator/Program.cs new file mode 100644 index 0000000..48d6154 --- /dev/null +++ b/Generator/Program.cs @@ -0,0 +1,51 @@ +using CloudDevelopment.ServiceDefaults; +using Generator.Services; + +var builder = WebApplication.CreateBuilder(args); + +builder.AddServiceDefaults(); + +// Add services to the container. + +builder.Services.AddControllers(); +// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle +builder.Services.AddEndpointsApiExplorer(); +builder.Services.AddSwaggerGen(); + +builder.Services.AddCors(o => +{ + o.AddPolicy("wasm", p => p + .AllowAnyOrigin() + .AllowAnyHeader() + .AllowAnyMethod()); +}); + +builder.Services.AddStackExchangeRedisCache(options => +{ + options.Configuration = builder.Configuration.GetConnectionString("redis"); + options.InstanceName = "generator:"; +}); + +builder.Services.AddScoped(); +builder.Services.AddScoped(); + +var app = builder.Build(); + +app.MapDefaultEndpoints(); + +// Configure the HTTP request pipeline. +if (app.Environment.IsDevelopment()) +{ + app.UseSwagger(); + app.UseSwaggerUI(); +} + +app.UseHttpsRedirection(); + +app.UseAuthorization(); + +app.UseCors("wasm"); + +app.MapControllers(); + +app.Run(); diff --git a/Generator/Properties/launchSettings.json b/Generator/Properties/launchSettings.json new file mode 100644 index 0000000..f60d307 --- /dev/null +++ b/Generator/Properties/launchSettings.json @@ -0,0 +1,41 @@ +{ + "$schema": "http://json.schemastore.org/launchsettings.json", + "iisSettings": { + "windowsAuthentication": false, + "anonymousAuthentication": true, + "iisExpress": { + "applicationUrl": "http://localhost:6127", + "sslPort": 44325 + } + }, + "profiles": { + "http": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": true, + "launchUrl": "swagger", + "applicationUrl": "http://localhost:5291", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + }, + "https": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": true, + "launchUrl": "swagger", + "applicationUrl": "https://localhost:7240;http://localhost:5291", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + }, + "IIS Express": { + "commandName": "IISExpress", + "launchBrowser": true, + "launchUrl": "swagger", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + } + } +} diff --git a/Generator/Services/CreditOrderGenerator.cs b/Generator/Services/CreditOrderGenerator.cs new file mode 100644 index 0000000..4e2e304 --- /dev/null +++ b/Generator/Services/CreditOrderGenerator.cs @@ -0,0 +1,56 @@ +namespace Generator.Services; + +using Bogus; +using Generator.Dto; + +public class CreditOrderGenerator +{ + + private static readonly string[] _сreditTypes = { "Потребительский", "Ипотека", "Автокредит", "Микрозайм" }; + + private static readonly string[] _statuses = { "Новая", "В обработке", "Одобрена", "Отклонена" }; + public CreditOrderDto Generate(int id) + { + var faker = new Faker("ru") + .RuleFor(x => x.Id, _ => id) + .RuleFor(x => x.CreditType, f => f.PickRandom(_сreditTypes)) + .RuleFor(x => x.RequestedSum, f => Math.Round(f.Finance.Amount(1_000_000m, 100_000_000m), 2)) + .RuleFor(x => x.MonthsDuration, f => f.Random.Int(1, 360)) + .RuleFor(x => x.InterestRate, f => Math.Round(f.Random.Double(15.6, 20.0), 2)) + .RuleFor(x => x.FilingDate, f => DateOnly.FromDateTime(f.Date.Past(2))) + .RuleFor(x => x.IsInsuranceNeeded, f => f.Random.Bool()) + .RuleFor(x => x.OrderStatus, f => f.PickRandom(_statuses)) + .RuleFor(x => x.DecisionDate, _ => null) + .RuleFor(x => x.ApprovedSum, _ => null); + + var order = faker.Generate(); + + ApplyDependencies(order); + + return order; + } + + private static void ApplyDependencies(CreditOrderDto order) + { + + if(order.OrderStatus is "Одобрена") + { + order.DecisionDate = order.FilingDate.AddDays(Random.Shared.Next(0, 31)); + + var k = Random.Shared.NextDouble() * 0.4 + 0.6; + var approved = order.RequestedSum * (decimal)k; + order.ApprovedSum = Math.Round(approved, 2); + } + else if (order.OrderStatus is "Отклонена") + { + order.DecisionDate = order.FilingDate.AddDays(Random.Shared.Next(0, 31)); + order.ApprovedSum = null; + } + else + { + order.DecisionDate = null; + order.ApprovedSum = null; + } + + } +} diff --git a/Generator/Services/CreditOrderService.cs b/Generator/Services/CreditOrderService.cs new file mode 100644 index 0000000..440e20c --- /dev/null +++ b/Generator/Services/CreditOrderService.cs @@ -0,0 +1,79 @@ +using Generator.Dto; +using Microsoft.Extensions.Caching.Distributed; +using System.Text.Json; + +namespace Generator.Services; + +public sealed class CreditOrderService +{ + + private static readonly DistributedCacheEntryOptions _cacheOptions = new() + { + AbsoluteExpirationRelativeToNow = TimeSpan.FromMinutes(1) + }; + + private readonly IDistributedCache _cache; + private readonly CreditOrderGenerator _generator; + private readonly ILogger _logger; + + private static readonly JsonSerializerOptions _jsonOptions = new(JsonSerializerDefaults.Web); + + public CreditOrderService( + IDistributedCache cache, + CreditOrderGenerator generator, + ILogger logger) + { + _cache = cache; + _generator = generator; + _logger = logger; + } + public async Task GetByIdAsync(int id, CancellationToken ct) + { + if (id <= 0) + throw new ArgumentOutOfRangeException(nameof(id), "invalid id"); + + var cacheKey = BuildCacheKey(id); + + try + { + var cachedJson = await _cache.GetStringAsync(cacheKey, ct); + if (!string.IsNullOrWhiteSpace(cachedJson)) + { + var cached = JsonSerializer.Deserialize(cachedJson, _jsonOptions); + if (cached is not null) + { + _logger.LogInformation("Cache HIT: {CacheKey} {OrderId}", cacheKey, id); + return cached; + } + + _logger.LogWarning("Cache DESERIALIZE FAIL: {CacheKey} {OrderId}", cacheKey, id); + } + else + { + _logger.LogInformation("Cache MISS: {CacheKey} {OrderId}", cacheKey, id); + } + + var order = _generator.Generate(id); + + var json = JsonSerializer.Serialize(order, _jsonOptions); + await _cache.SetStringAsync(cacheKey, json, _cacheOptions, ct); + + _logger.LogInformation("Cache SET: {CacheKey} {OrderId}", cacheKey, id); + + return order; + } + catch (OperationCanceledException) + { + _logger.LogInformation("Request canceled: {CacheKey} {OrderId}", cacheKey, id); + throw; + } + catch (Exception ex) + { + _logger.LogError(ex, "CreditOrderService failed: {CacheKey} {OrderId}", cacheKey, id); + throw; + } + + } + + private static string BuildCacheKey(int id) => $"credit-order:{id}"; +} diff --git a/Generator/appsettings.Development.json b/Generator/appsettings.Development.json new file mode 100644 index 0000000..0c208ae --- /dev/null +++ b/Generator/appsettings.Development.json @@ -0,0 +1,8 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning" + } + } +} diff --git a/Generator/appsettings.json b/Generator/appsettings.json new file mode 100644 index 0000000..10f68b8 --- /dev/null +++ b/Generator/appsettings.json @@ -0,0 +1,9 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning" + } + }, + "AllowedHosts": "*" +} From 11954332800b70963d8758687ceb20bf15a14861 Mon Sep 17 00:00:00 2001 From: acebiscuits <27roter72@gmail.com> Date: Mon, 16 Feb 2026 23:54:34 +0400 Subject: [PATCH 3/6] add: Aspire --- CloudDevelopment.AppHost/AppHost.cs | 7 + .../CloudDevelopment.AppHost.csproj | 22 +++ .../Properties/launchSettings.json | 29 ++++ .../appsettings.Development.json | 8 ++ CloudDevelopment.AppHost/appsettings.json | 9 ++ .../CloudDevelopment.ServiceDefaults.csproj | 22 +++ .../Extensions.cs | 128 ++++++++++++++++++ 7 files changed, 225 insertions(+) create mode 100644 CloudDevelopment.AppHost/AppHost.cs create mode 100644 CloudDevelopment.AppHost/CloudDevelopment.AppHost.csproj create mode 100644 CloudDevelopment.AppHost/Properties/launchSettings.json create mode 100644 CloudDevelopment.AppHost/appsettings.Development.json create mode 100644 CloudDevelopment.AppHost/appsettings.json create mode 100644 CloudDevelopment.ServiceDefaults/CloudDevelopment.ServiceDefaults.csproj create mode 100644 CloudDevelopment.ServiceDefaults/Extensions.cs diff --git a/CloudDevelopment.AppHost/AppHost.cs b/CloudDevelopment.AppHost/AppHost.cs new file mode 100644 index 0000000..a5e533d --- /dev/null +++ b/CloudDevelopment.AppHost/AppHost.cs @@ -0,0 +1,7 @@ +var builder = DistributedApplication.CreateBuilder(args); + +var redis = builder.AddRedis("redis"); + +builder.AddProject("generator").WithReference(redis); + +builder.Build().Run(); diff --git a/CloudDevelopment.AppHost/CloudDevelopment.AppHost.csproj b/CloudDevelopment.AppHost/CloudDevelopment.AppHost.csproj new file mode 100644 index 0000000..fb780e4 --- /dev/null +++ b/CloudDevelopment.AppHost/CloudDevelopment.AppHost.csproj @@ -0,0 +1,22 @@ + + + + + + Exe + net8.0 + enable + enable + 2f419979-4dcb-43a3-bf86-3b5579f994b9 + + + + + + + + + + + + diff --git a/CloudDevelopment.AppHost/Properties/launchSettings.json b/CloudDevelopment.AppHost/Properties/launchSettings.json new file mode 100644 index 0000000..b5c6a54 --- /dev/null +++ b/CloudDevelopment.AppHost/Properties/launchSettings.json @@ -0,0 +1,29 @@ +{ + "$schema": "https://json.schemastore.org/launchsettings.json", + "profiles": { + "https": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": true, + "applicationUrl": "https://localhost:17129;http://localhost:15221", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development", + "DOTNET_ENVIRONMENT": "Development", + "ASPIRE_DASHBOARD_OTLP_ENDPOINT_URL": "https://localhost:21101", + "ASPIRE_RESOURCE_SERVICE_ENDPOINT_URL": "https://localhost:22255" + } + }, + "http": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": true, + "applicationUrl": "http://localhost:15221", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development", + "DOTNET_ENVIRONMENT": "Development", + "ASPIRE_DASHBOARD_OTLP_ENDPOINT_URL": "http://localhost:19083", + "ASPIRE_RESOURCE_SERVICE_ENDPOINT_URL": "http://localhost:20274" + } + } + } +} diff --git a/CloudDevelopment.AppHost/appsettings.Development.json b/CloudDevelopment.AppHost/appsettings.Development.json new file mode 100644 index 0000000..0c208ae --- /dev/null +++ b/CloudDevelopment.AppHost/appsettings.Development.json @@ -0,0 +1,8 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning" + } + } +} diff --git a/CloudDevelopment.AppHost/appsettings.json b/CloudDevelopment.AppHost/appsettings.json new file mode 100644 index 0000000..31c092a --- /dev/null +++ b/CloudDevelopment.AppHost/appsettings.json @@ -0,0 +1,9 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning", + "Aspire.Hosting.Dcp": "Warning" + } + } +} diff --git a/CloudDevelopment.ServiceDefaults/CloudDevelopment.ServiceDefaults.csproj b/CloudDevelopment.ServiceDefaults/CloudDevelopment.ServiceDefaults.csproj new file mode 100644 index 0000000..1b6e209 --- /dev/null +++ b/CloudDevelopment.ServiceDefaults/CloudDevelopment.ServiceDefaults.csproj @@ -0,0 +1,22 @@ + + + + net8.0 + enable + enable + true + + + + + + + + + + + + + + + diff --git a/CloudDevelopment.ServiceDefaults/Extensions.cs b/CloudDevelopment.ServiceDefaults/Extensions.cs new file mode 100644 index 0000000..8b1a2b0 --- /dev/null +++ b/CloudDevelopment.ServiceDefaults/Extensions.cs @@ -0,0 +1,128 @@ +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Diagnostics.HealthChecks; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Diagnostics.HealthChecks; +using Microsoft.Extensions.Hosting; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.ServiceDiscovery; +using OpenTelemetry; +using OpenTelemetry.Metrics; +using OpenTelemetry.Trace; + +namespace CloudDevelopment.ServiceDefaults; + +// Adds common Aspire services: service discovery, resilience, health checks, and OpenTelemetry. +// This project should be referenced by each service project in your solution. +// To learn more about using this project, see https://aka.ms/dotnet/aspire/service-defaults +public static class Extensions +{ + private const string HealthEndpointPath = "/health"; + private const string AlivenessEndpointPath = "/alive"; + + public static TBuilder AddServiceDefaults(this TBuilder builder) where TBuilder : IHostApplicationBuilder + { + builder.ConfigureOpenTelemetry(); + + builder.AddDefaultHealthChecks(); + + builder.Services.AddServiceDiscovery(); + + builder.Services.ConfigureHttpClientDefaults(http => + { + // Turn on resilience by default + http.AddStandardResilienceHandler(); + + // Turn on service discovery by default + http.AddServiceDiscovery(); + }); + + // Uncomment the following to restrict the allowed schemes for service discovery. + // builder.Services.Configure(options => + // { + // options.AllowedSchemes = ["https"]; + // }); + + return builder; + } + + public static TBuilder ConfigureOpenTelemetry(this TBuilder builder) where TBuilder : IHostApplicationBuilder + { + builder.Logging.AddOpenTelemetry(logging => + { + logging.IncludeFormattedMessage = true; + logging.IncludeScopes = true; + }); + + builder.Services.AddOpenTelemetry() + .WithMetrics(metrics => + { + metrics.AddAspNetCoreInstrumentation() + .AddHttpClientInstrumentation() + .AddRuntimeInstrumentation(); + }) + .WithTracing(tracing => + { + tracing.AddSource(builder.Environment.ApplicationName) + .AddAspNetCoreInstrumentation(tracing => + // Exclude health check requests from tracing + tracing.Filter = context => + !context.Request.Path.StartsWithSegments(HealthEndpointPath) + && !context.Request.Path.StartsWithSegments(AlivenessEndpointPath) + ) + // Uncomment the following line to enable gRPC instrumentation (requires the OpenTelemetry.Instrumentation.GrpcNetClient package) + //.AddGrpcClientInstrumentation() + .AddHttpClientInstrumentation(); + }); + + builder.AddOpenTelemetryExporters(); + + return builder; + } + + private static TBuilder AddOpenTelemetryExporters(this TBuilder builder) where TBuilder : IHostApplicationBuilder + { + var useOtlpExporter = !string.IsNullOrWhiteSpace(builder.Configuration["OTEL_EXPORTER_OTLP_ENDPOINT"]); + + if (useOtlpExporter) + { + builder.Services.AddOpenTelemetry().UseOtlpExporter(); + } + + // Uncomment the following lines to enable the Azure Monitor exporter (requires the Azure.Monitor.OpenTelemetry.AspNetCore package) + //if (!string.IsNullOrEmpty(builder.Configuration["APPLICATIONINSIGHTS_CONNECTION_STRING"])) + //{ + // builder.Services.AddOpenTelemetry() + // .UseAzureMonitor(); + //} + + return builder; + } + + public static TBuilder AddDefaultHealthChecks(this TBuilder builder) where TBuilder : IHostApplicationBuilder + { + builder.Services.AddHealthChecks() + // Add a default liveness check to ensure app is responsive + .AddCheck("self", () => HealthCheckResult.Healthy(), ["live"]); + + return builder; + } + + public static WebApplication MapDefaultEndpoints(this WebApplication app) + { + // Adding health checks endpoints to applications in non-development environments has security implications. + // See https://aka.ms/dotnet/aspire/healthchecks for details before enabling these endpoints in non-development environments. + if (app.Environment.IsDevelopment()) + { + // All health checks must pass for app to be considered ready to accept traffic after starting + app.MapHealthChecks(HealthEndpointPath); + + // Only health checks tagged with the "live" tag must pass for app to be considered alive + app.MapHealthChecks(AlivenessEndpointPath, new HealthCheckOptions + { + Predicate = r => r.Tags.Contains("live") + }); + } + + return app; + } +} From 503532ef217e8834ed15f0954ff49b094ba03682 Mon Sep 17 00:00:00 2001 From: acebiscuits <27roter72@gmail.com> Date: Tue, 17 Feb 2026 12:42:48 +0400 Subject: [PATCH 4/6] fix: small orchestration fix --- CloudDevelopment.AppHost/AppHost.cs | 6 +++++- CloudDevelopment.AppHost/CloudDevelopment.AppHost.csproj | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CloudDevelopment.AppHost/AppHost.cs b/CloudDevelopment.AppHost/AppHost.cs index a5e533d..eaddb7a 100644 --- a/CloudDevelopment.AppHost/AppHost.cs +++ b/CloudDevelopment.AppHost/AppHost.cs @@ -1,7 +1,11 @@ +using Projects; + var builder = DistributedApplication.CreateBuilder(args); var redis = builder.AddRedis("redis"); -builder.AddProject("generator").WithReference(redis); +var generator = builder.AddProject("generator").WithReference(redis); + +var client = builder.AddProject("client").WithReference(generator); builder.Build().Run(); diff --git a/CloudDevelopment.AppHost/CloudDevelopment.AppHost.csproj b/CloudDevelopment.AppHost/CloudDevelopment.AppHost.csproj index fb780e4..fa9c3fe 100644 --- a/CloudDevelopment.AppHost/CloudDevelopment.AppHost.csproj +++ b/CloudDevelopment.AppHost/CloudDevelopment.AppHost.csproj @@ -17,6 +17,7 @@ + From f02af22e343c88fba837db2923120b7f1ea7d2ba Mon Sep 17 00:00:00 2001 From: acebiscuits <27roter72@gmail.com> Date: Thu, 19 Feb 2026 23:12:08 +0400 Subject: [PATCH 5/6] fix: some cock-ups --- Client.Wasm/Components/DataCard.razor | 1 - CloudDevelopment.AppHost/AppHost.cs | 11 ++- .../CloudDevelopment.AppHost.csproj | 4 +- .../Controllers/CreditOrderController.cs | 37 ++++---- Generator/Dto/CreditOrderDto.cs | 26 ++++++ Generator/Generator.csproj | 2 +- Generator/Generator.http | 6 -- Generator/Program.cs | 33 ++++--- Generator/Services/CreditOrderGenerator.cs | 61 ++++++------- Generator/Services/CreditOrderService.cs | 87 ++++++++++++------- Generator/appsettings.json | 18 ++-- 11 files changed, 169 insertions(+), 117 deletions(-) delete mode 100644 Generator/Generator.http diff --git a/Client.Wasm/Components/DataCard.razor b/Client.Wasm/Components/DataCard.razor index 8341889..c646a83 100644 --- a/Client.Wasm/Components/DataCard.razor +++ b/Client.Wasm/Components/DataCard.razor @@ -68,7 +68,6 @@ private async Task RequestNewData() { var baseAddress = Configuration["BaseAddress"] ?? throw new KeyNotFoundException("Конфигурация клиента не содержит параметра BaseAddress"); - Console.WriteLine($"{baseAddress}?id={Id}"); Value = await Client.GetFromJsonAsync($"{baseAddress}?id={Id}", new JsonSerializerOptions { }); StateHasChanged(); } diff --git a/CloudDevelopment.AppHost/AppHost.cs b/CloudDevelopment.AppHost/AppHost.cs index eaddb7a..9d824f5 100644 --- a/CloudDevelopment.AppHost/AppHost.cs +++ b/CloudDevelopment.AppHost/AppHost.cs @@ -2,10 +2,15 @@ var builder = DistributedApplication.CreateBuilder(args); -var redis = builder.AddRedis("redis"); +var cache = builder.AddRedis("credit-order-cache") + .WithRedisInsight(containerName: "credit-order-insight"); -var generator = builder.AddProject("generator").WithReference(redis); +var generator = builder.AddProject("generator") + .WithReference(cache, "RedisCache") + .WaitFor(cache); -var client = builder.AddProject("client").WithReference(generator); +var client = builder.AddProject("credit-order-wasm") + .WithReference(generator) + .WaitFor(generator); builder.Build().Run(); diff --git a/CloudDevelopment.AppHost/CloudDevelopment.AppHost.csproj b/CloudDevelopment.AppHost/CloudDevelopment.AppHost.csproj index fa9c3fe..8269821 100644 --- a/CloudDevelopment.AppHost/CloudDevelopment.AppHost.csproj +++ b/CloudDevelopment.AppHost/CloudDevelopment.AppHost.csproj @@ -11,8 +11,8 @@ - - + + diff --git a/Generator/Controllers/CreditOrderController.cs b/Generator/Controllers/CreditOrderController.cs index ce8d579..ae4c24d 100644 --- a/Generator/Controllers/CreditOrderController.cs +++ b/Generator/Controllers/CreditOrderController.cs @@ -4,29 +4,34 @@ namespace Generator.Controllers; - +/// +/// HTTP API для получения кредитной заявки по идентификатору. +/// Использует для получения данных (кэш + генерация). +/// [ApiController] [Route("credit-orders")] -public sealed class CreditOrderController : ControllerBase +public class CreditOrderController ( + CreditOrderService service, + ILogger logger + ) : ControllerBase { - private readonly ILogger _logger; - private readonly CreditOrderService _service; - - public CreditOrderController(CreditOrderService service, ILogger logger) - { - _service = service; - _logger = logger; - } + /// + /// Возвращает кредитную заявку по из query string. + /// + /// Идентификатор заявки (должен быть больше 0). + /// Токен отмены запроса. + /// DTO кредитной заявки. + /// Заявка успешно получена. + /// Некорректный идентификатор (id <= 0). [HttpGet] public async Task> Get([FromQuery] int id, CancellationToken ct) { - _logger.LogInformation("HTTP GET /credit-orders requested: {OrderId}", id); - - var order = await _service.GetByIdAsync(id, ct); - - _logger.LogInformation("HTTP GET /credit-orders completed: {OrderId} {Status}", order.Id, order.OrderStatus); - + logger.LogInformation("HTTP GET /credit-orders requested: {OrderId}", id); + if (id <= 0) + return BadRequest("id must be greater than 0"); + var order = await service.GetByIdAsync(id, ct); + logger.LogInformation("HTTP GET /credit-orders completed: {OrderId} {Status}", order.Id, order.OrderStatus); return Ok(order); } } diff --git a/Generator/Dto/CreditOrderDto.cs b/Generator/Dto/CreditOrderDto.cs index 68f4855..23121d3 100644 --- a/Generator/Dto/CreditOrderDto.cs +++ b/Generator/Dto/CreditOrderDto.cs @@ -1,15 +1,41 @@ namespace Generator.Dto; +/// +/// DTO кредитной заявки, возвращаемый HTTP API. +/// public class CreditOrderDto { + /// Идентификатор заявки. public int Id { get; set; } + + /// Тип кредита (например: Потребительский, Ипотека). public string CreditType { get; set; } = ""; + + /// Запрошенная сумма кредита. public decimal RequestedSum { get; set; } + + /// Срок кредита в месяцах. public int MonthsDuration { get; set; } + + /// Процентная ставка (годовых). public double InterestRate { get; set; } + + /// Дата подачи заявки. public DateOnly FilingDate { get; set; } + + /// Признак необходимости страховки. public bool IsInsuranceNeeded { get; set; } + + /// Статус заявки: Новая / В обработке / Одобрена / Отклонена. public string OrderStatus { get; set; } = ""; + + /// + /// Дата принятия решения. Заполняется только для конечных статусов (например, Одобрена/Отклонена). + /// public DateOnly? DecisionDate { get; set; } + + /// + /// Одобренная сумма. Заполняется только при статусе "Одобрена". + /// public decimal? ApprovedSum { get; set; } } diff --git a/Generator/Generator.csproj b/Generator/Generator.csproj index 410d35b..c40abc6 100644 --- a/Generator/Generator.csproj +++ b/Generator/Generator.csproj @@ -8,7 +8,7 @@ - + diff --git a/Generator/Generator.http b/Generator/Generator.http deleted file mode 100644 index fdc1acb..0000000 --- a/Generator/Generator.http +++ /dev/null @@ -1,6 +0,0 @@ -@Generator_HostAddress = http://localhost:5291 - -GET {{Generator_HostAddress}}/weatherforecast/ -Accept: application/json - -### diff --git a/Generator/Program.cs b/Generator/Program.cs index 48d6154..b3d53ed 100644 --- a/Generator/Program.cs +++ b/Generator/Program.cs @@ -5,35 +5,40 @@ builder.AddServiceDefaults(); -// Add services to the container. - builder.Services.AddControllers(); -// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle builder.Services.AddEndpointsApiExplorer(); builder.Services.AddSwaggerGen(); -builder.Services.AddCors(o => +builder.Services.AddCors(options => { - o.AddPolicy("wasm", p => p - .AllowAnyOrigin() - .AllowAnyHeader() - .AllowAnyMethod()); + options.AddDefaultPolicy(policy => + policy.SetIsOriginAllowed(origin => + { + try + { + var uri = new Uri(origin); + return uri.Host == "localhost"; + } + catch + { + return false; + } + }) + .WithMethods("GET") + .AllowAnyHeader()); }); -builder.Services.AddStackExchangeRedisCache(options => -{ - options.Configuration = builder.Configuration.GetConnectionString("redis"); - options.InstanceName = "generator:"; -}); +builder.AddRedisDistributedCache(connectionName: "RedisCache"); builder.Services.AddScoped(); builder.Services.AddScoped(); var app = builder.Build(); +app.UseCors(); + app.MapDefaultEndpoints(); -// Configure the HTTP request pipeline. if (app.Environment.IsDevelopment()) { app.UseSwagger(); diff --git a/Generator/Services/CreditOrderGenerator.cs b/Generator/Services/CreditOrderGenerator.cs index 4e2e304..d169cee 100644 --- a/Generator/Services/CreditOrderGenerator.cs +++ b/Generator/Services/CreditOrderGenerator.cs @@ -1,14 +1,22 @@ -namespace Generator.Services; - -using Bogus; +using Bogus; using Generator.Dto; +namespace Generator.Services; + +/// +/// Генератор псевдослучайных кредитных заявок для демо/тестирования. +/// Включает простые зависимости между статусом и полями решения. +/// public class CreditOrderGenerator { - private static readonly string[] _сreditTypes = { "Потребительский", "Ипотека", "Автокредит", "Микрозайм" }; - private static readonly string[] _statuses = { "Новая", "В обработке", "Одобрена", "Отклонена" }; + + /// + /// Генерирует кредитную заявку для заданного с реалистичными полями. + /// + /// Идентификатор заявки. + /// Сгенерированная заявка. public CreditOrderDto Generate(int id) { var faker = new Faker("ru") @@ -21,36 +29,21 @@ public CreditOrderDto Generate(int id) .RuleFor(x => x.IsInsuranceNeeded, f => f.Random.Bool()) .RuleFor(x => x.OrderStatus, f => f.PickRandom(_statuses)) .RuleFor(x => x.DecisionDate, _ => null) - .RuleFor(x => x.ApprovedSum, _ => null); - - var order = faker.Generate(); - - ApplyDependencies(order); - - return order; - } - - private static void ApplyDependencies(CreditOrderDto order) - { - - if(order.OrderStatus is "Одобрена") + .RuleFor(x => x.ApprovedSum, _ => null) + .RuleFor(x => x.DecisionDate, (f, o) => + o.OrderStatus is "Одобрена" or "Отклонена" + ? o.FilingDate.AddDays(f.Random.Int(0, 31)) + : null) + .RuleFor(x => x.ApprovedSum, (f, o) => { - order.DecisionDate = order.FilingDate.AddDays(Random.Shared.Next(0, 31)); + if (o.OrderStatus is not "Одобрена") + return null; - var k = Random.Shared.NextDouble() * 0.4 + 0.6; - var approved = order.RequestedSum * (decimal)k; - order.ApprovedSum = Math.Round(approved, 2); - } - else if (order.OrderStatus is "Отклонена") - { - order.DecisionDate = order.FilingDate.AddDays(Random.Shared.Next(0, 31)); - order.ApprovedSum = null; - } - else - { - order.DecisionDate = null; - order.ApprovedSum = null; - } - + var k = f.Random.Double(0.6, 1.0); + var approved = o.RequestedSum * (decimal)k; + return Math.Round(approved, 2); + }); + + return faker.Generate(); } } diff --git a/Generator/Services/CreditOrderService.cs b/Generator/Services/CreditOrderService.cs index 440e20c..532c6f0 100644 --- a/Generator/Services/CreditOrderService.cs +++ b/Generator/Services/CreditOrderService.cs @@ -4,76 +4,97 @@ namespace Generator.Services; -public sealed class CreditOrderService +/// +/// Сервис получения кредитной заявки по идентификатору. +/// Сначала пытается вернуть данные из распределённого кэша, при отсутствии данных в кэше — генерирует заявку и кэширует результат. +/// +public class CreditOrderService( + IDistributedCache cache, + CreditOrderGenerator generator, + IConfiguration cfg, + ILogger logger + ) { - private static readonly DistributedCacheEntryOptions _cacheOptions = new() - { - AbsoluteExpirationRelativeToNow = TimeSpan.FromMinutes(1) - }; - - private readonly IDistributedCache _cache; - private readonly CreditOrderGenerator _generator; - private readonly ILogger _logger; - private static readonly JsonSerializerOptions _jsonOptions = new(JsonSerializerDefaults.Web); - public CreditOrderService( - IDistributedCache cache, - CreditOrderGenerator generator, - ILogger logger) - { - _cache = cache; - _generator = generator; - _logger = logger; - } + /// + /// Возвращает заявку по : + /// 1) читает из кэша по ключу credit-order:{id}; + /// 2) при отсутствии данных в кэше генерирует через ; + /// 3) сохраняет в кэш с TTL (AbsoluteExpirationRelativeToNow). + /// + /// Идентификатор заявки (должен быть больше 0). + /// Токен отмены. + /// DTO заявки. + /// Если <= 0. + /// Если запрос был отменён. public async Task GetByIdAsync(int id, CancellationToken ct) { if (id <= 0) throw new ArgumentOutOfRangeException(nameof(id), "invalid id"); + var ttlSeconds = cfg.GetValue("CreditOrderCache:TtlSeconds", 300); + if (ttlSeconds <= 0) ttlSeconds = 300; + var cacheKey = BuildCacheKey(id); try { - var cachedJson = await _cache.GetStringAsync(cacheKey, ct); + var cachedJson = await cache.GetStringAsync(cacheKey, ct); if (!string.IsNullOrWhiteSpace(cachedJson)) { var cached = JsonSerializer.Deserialize(cachedJson, _jsonOptions); if (cached is not null) { - _logger.LogInformation("Cache HIT: {CacheKey} {OrderId}", cacheKey, id); + logger.LogInformation("Cache HIT: {CacheKey} {OrderId}", cacheKey, id); return cached; } - _logger.LogWarning("Cache DESERIALIZE FAIL: {CacheKey} {OrderId}", cacheKey, id); + logger.LogWarning("Cache DESERIALIZE FAIL: {CacheKey} {OrderId}", cacheKey, id); } else { - _logger.LogInformation("Cache MISS: {CacheKey} {OrderId}", cacheKey, id); + logger.LogInformation("Cache MISS: {CacheKey} {OrderId}", cacheKey, id); } + } + catch (OperationCanceledException) + { + logger.LogInformation("Request canceled: {CacheKey} {OrderId}", cacheKey, id); + throw; + } + catch (Exception ex) + { + logger.LogWarning(ex, "Cache READ FAIL: {CacheKey} {OrderId}", cacheKey, id); + } - var order = _generator.Generate(id); + var order = generator.Generate(id); + try + { + var cacheTtl = new DistributedCacheEntryOptions + { + AbsoluteExpirationRelativeToNow = TimeSpan.FromSeconds(ttlSeconds) + }; var json = JsonSerializer.Serialize(order, _jsonOptions); - await _cache.SetStringAsync(cacheKey, json, _cacheOptions, ct); - - _logger.LogInformation("Cache SET: {CacheKey} {OrderId}", cacheKey, id); - - return order; + await cache.SetStringAsync(cacheKey, json, cacheTtl, ct); + logger.LogInformation("Cache SET: {CacheKey} {OrderId}", cacheKey, id); } catch (OperationCanceledException) { - _logger.LogInformation("Request canceled: {CacheKey} {OrderId}", cacheKey, id); + logger.LogInformation("Request canceled: {CacheKey} {OrderId}", cacheKey, id); throw; } catch (Exception ex) { - _logger.LogError(ex, "CreditOrderService failed: {CacheKey} {OrderId}", cacheKey, id); - throw; + logger.LogWarning(ex, "Cache WRITE FAIL: {CacheKey} {OrderId}", cacheKey, id); } - + return order; } + /// + /// Формирует ключ кэша для заявки по идентификатору. + /// Формат: credit-order:{id}. + /// private static string BuildCacheKey(int id) => $"credit-order:{id}"; } diff --git a/Generator/appsettings.json b/Generator/appsettings.json index 10f68b8..5490bdb 100644 --- a/Generator/appsettings.json +++ b/Generator/appsettings.json @@ -1,9 +1,13 @@ { - "Logging": { - "LogLevel": { - "Default": "Information", - "Microsoft.AspNetCore": "Warning" - } - }, - "AllowedHosts": "*" + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning" + } + }, + "CreditOrderCache": { + "Enabled": true, + "TtlSeconds": 60 + }, + "AllowedHosts": "*" } From 47399ee875e2b7df8baee02a0d7d593003648356 Mon Sep 17 00:00:00 2001 From: acebiscuits <27roter72@gmail.com> Date: Fri, 20 Feb 2026 18:56:54 +0400 Subject: [PATCH 6/6] fix: some cock-ups --- Generator/Generator.csproj | 2 +- Generator/Services/CreditOrderService.cs | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/Generator/Generator.csproj b/Generator/Generator.csproj index c40abc6..02ccc60 100644 --- a/Generator/Generator.csproj +++ b/Generator/Generator.csproj @@ -8,7 +8,7 @@ - + diff --git a/Generator/Services/CreditOrderService.cs b/Generator/Services/CreditOrderService.cs index 532c6f0..3c1e03d 100644 --- a/Generator/Services/CreditOrderService.cs +++ b/Generator/Services/CreditOrderService.cs @@ -31,9 +31,6 @@ ILogger logger /// Если запрос был отменён. public async Task GetByIdAsync(int id, CancellationToken ct) { - if (id <= 0) - throw new ArgumentOutOfRangeException(nameof(id), "invalid id"); - var ttlSeconds = cfg.GetValue("CreditOrderCache:TtlSeconds", 300); if (ttlSeconds <= 0) ttlSeconds = 300;