From 08d42566fe6013e2d03af1798967cec19bd6eaf4 Mon Sep 17 00:00:00 2001 From: Ivan K Date: Mon, 16 Feb 2026 17:30:25 +0400 Subject: [PATCH 01/10] =?UTF-8?q?=D0=B3=D0=BE=D1=82=D0=BE=D0=B2=D0=B0?= =?UTF-8?q?=D1=8F=20=D0=BB=D1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Client.Wasm/Components/StudentCard.razor | 8 +- Client.Wasm/wwwroot/appsettings.json | 2 +- CloudDevelopment.sln | 29 ++++- CreditApp.Api/Controllers/CreditController.cs | 25 ++++ CreditApp.Api/CreditApp.Api.csproj | 22 ++++ CreditApp.Api/CreditApp.Api.http | 6 + CreditApp.Api/Program.cs | 30 +++++ CreditApp.Api/Properties/launchSettings.json | 41 +++++++ .../CreditApplicationGeneratorService.cs | 111 ++++++++++++++++++ .../ICreditApplicationGeneratorService.cs | 14 +++ CreditApp.Api/appsettings.Development.json | 8 ++ CreditApp.Api/appsettings.json | 9 ++ CreditApp.AppHost/CreditApp.AppHost.csproj | 20 ++++ CreditApp.AppHost/Program.cs | 11 ++ .../Properties/launchSettings.json | 31 +++++ .../appsettings.Development.json | 8 ++ CreditApp.AppHost/appsettings.json | 9 ++ CreditApp.Domain/CreditApp.Domain.csproj | 9 ++ .../Entities/CreditApplication.cs | 48 ++++++++ .../CreditApp.ServiceDefaults.csproj | 20 ++++ CreditApp.ServiceDefaults/Extensions.cs | 104 ++++++++++++++++ 21 files changed, 557 insertions(+), 8 deletions(-) create mode 100644 CreditApp.Api/Controllers/CreditController.cs create mode 100644 CreditApp.Api/CreditApp.Api.csproj create mode 100644 CreditApp.Api/CreditApp.Api.http create mode 100644 CreditApp.Api/Program.cs create mode 100644 CreditApp.Api/Properties/launchSettings.json create mode 100644 CreditApp.Api/Services/CreditGeneratorService/CreditApplicationGeneratorService.cs create mode 100644 CreditApp.Api/Services/CreditGeneratorService/ICreditApplicationGeneratorService.cs create mode 100644 CreditApp.Api/appsettings.Development.json create mode 100644 CreditApp.Api/appsettings.json create mode 100644 CreditApp.AppHost/CreditApp.AppHost.csproj create mode 100644 CreditApp.AppHost/Program.cs create mode 100644 CreditApp.AppHost/Properties/launchSettings.json create mode 100644 CreditApp.AppHost/appsettings.Development.json create mode 100644 CreditApp.AppHost/appsettings.json create mode 100644 CreditApp.Domain/CreditApp.Domain.csproj create mode 100644 CreditApp.Domain/Entities/CreditApplication.cs create mode 100644 CreditApp.ServiceDefaults/CreditApp.ServiceDefaults.csproj create mode 100644 CreditApp.ServiceDefaults/Extensions.cs diff --git a/Client.Wasm/Components/StudentCard.razor b/Client.Wasm/Components/StudentCard.razor index 661f118..55f96c6 100644 --- a/Client.Wasm/Components/StudentCard.razor +++ b/Client.Wasm/Components/StudentCard.razor @@ -4,10 +4,10 @@ - Номер №X "Название лабораторной" - Вариант №Х "Название варианта" - Выполнена Фамилией Именем 65ХХ - Ссылка на форк + Номер №1 Кэширование" + Вариант №9 "Кредитная заявка" + Выполнена Куненковым Иваном 6511 + Ссылка на форк diff --git a/Client.Wasm/wwwroot/appsettings.json b/Client.Wasm/wwwroot/appsettings.json index 4dda7c0..3f506eb 100644 --- a/Client.Wasm/wwwroot/appsettings.json +++ b/Client.Wasm/wwwroot/appsettings.json @@ -6,5 +6,5 @@ } }, "AllowedHosts": "*", - "BaseAddress": "https://localhost:7170/land-plot" + "BaseAddress": "https://localhost:7170/api/credit" } \ No newline at end of file diff --git a/CloudDevelopment.sln b/CloudDevelopment.sln index cb48241..c625a56 100644 --- a/CloudDevelopment.sln +++ b/CloudDevelopment.sln @@ -1,10 +1,17 @@ - Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.14.36811.4 +# Visual Studio Version 18 +VisualStudioVersion = 18.3.11505.172 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}") = "CreditApp.AppHost", "CreditApp.AppHost\CreditApp.AppHost.csproj", "{E2DE4A09-990C-4B72-A09D-CCE1C10AE9DD}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CreditApp.Api", "CreditApp.Api\CreditApp.Api.csproj", "{E7D4CA8B-53EA-9676-D96D-BE2F0CB11054}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CreditApp.Domain", "CreditApp.Domain\CreditApp.Domain.csproj", "{CC5A9873-4CC3-4B71-83AF-E4FD09F7B1AD}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CreditApp.ServiceDefaults", "CreditApp.ServiceDefaults\CreditApp.ServiceDefaults.csproj", "{B2C3D4E5-F6A7-8901-BCDE-F12345678901}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -15,6 +22,22 @@ 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 + {E2DE4A09-990C-4B72-A09D-CCE1C10AE9DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E2DE4A09-990C-4B72-A09D-CCE1C10AE9DD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E2DE4A09-990C-4B72-A09D-CCE1C10AE9DD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E2DE4A09-990C-4B72-A09D-CCE1C10AE9DD}.Release|Any CPU.Build.0 = Release|Any CPU + {E7D4CA8B-53EA-9676-D96D-BE2F0CB11054}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E7D4CA8B-53EA-9676-D96D-BE2F0CB11054}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E7D4CA8B-53EA-9676-D96D-BE2F0CB11054}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E7D4CA8B-53EA-9676-D96D-BE2F0CB11054}.Release|Any CPU.Build.0 = Release|Any CPU + {CC5A9873-4CC3-4B71-83AF-E4FD09F7B1AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {CC5A9873-4CC3-4B71-83AF-E4FD09F7B1AD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CC5A9873-4CC3-4B71-83AF-E4FD09F7B1AD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {CC5A9873-4CC3-4B71-83AF-E4FD09F7B1AD}.Release|Any CPU.Build.0 = Release|Any CPU + {B2C3D4E5-F6A7-8901-BCDE-F12345678901}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B2C3D4E5-F6A7-8901-BCDE-F12345678901}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B2C3D4E5-F6A7-8901-BCDE-F12345678901}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B2C3D4E5-F6A7-8901-BCDE-F12345678901}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/CreditApp.Api/Controllers/CreditController.cs b/CreditApp.Api/Controllers/CreditController.cs new file mode 100644 index 0000000..83dbc60 --- /dev/null +++ b/CreditApp.Api/Controllers/CreditController.cs @@ -0,0 +1,25 @@ +using CreditApp.Api.Services.CreditGeneratorService; +using Microsoft.AspNetCore.Mvc; + +namespace CreditApp.Api.Controllers; + +[Route("api/[controller]")] +[ApiController] +public class CreditController(ICreditApplicationGeneratorService _generatorService, ILogger _logger) : ControllerBase +{ + /// + /// Получить кредитную заявку по ID, если не найдена в кэше генерируем новую + /// + /// ID кредитной заявки + /// Токен отмены операции + /// Кредитная заявка + [HttpGet] + public async Task GetById([FromQuery] int id, CancellationToken cancellationToken) + { + _logger.LogInformation("Получен запрос на получение/генерацию заявки {Id}", id); + + var application = await _generatorService.GetByIdAsync(id, cancellationToken); + + return Ok(application); + } +} diff --git a/CreditApp.Api/CreditApp.Api.csproj b/CreditApp.Api/CreditApp.Api.csproj new file mode 100644 index 0000000..f59f159 --- /dev/null +++ b/CreditApp.Api/CreditApp.Api.csproj @@ -0,0 +1,22 @@ + + + + net8.0 + enable + enable + + + + + + + + + + + + + + + + diff --git a/CreditApp.Api/CreditApp.Api.http b/CreditApp.Api/CreditApp.Api.http new file mode 100644 index 0000000..d979e23 --- /dev/null +++ b/CreditApp.Api/CreditApp.Api.http @@ -0,0 +1,6 @@ +@CreditApp.Api_HostAddress = http://localhost:5179 + +GET {{CreditApp.Api_HostAddress}}/weatherforecast/ +Accept: application/json + +### diff --git a/CreditApp.Api/Program.cs b/CreditApp.Api/Program.cs new file mode 100644 index 0000000..d733952 --- /dev/null +++ b/CreditApp.Api/Program.cs @@ -0,0 +1,30 @@ +using CreditApp.Api.Services.CreditGeneratorService; +using CreditApp.ServiceDefaults; + +var builder = WebApplication.CreateBuilder(args); +builder.AddServiceDefaults(); +builder.AddRedisClient("cache"); +builder.Services.AddStackExchangeRedisCache(options => +{ + var connectionString = builder.Configuration.GetConnectionString("cache"); + options.Configuration = connectionString; +}); +builder.Services.AddScoped(); +builder.Services.AddControllers(); +builder.Services.AddEndpointsApiExplorer(); +builder.Services.AddSwaggerGen(); + +var app = builder.Build(); + +// Configure the HTTP request pipeline. +if (app.Environment.IsDevelopment()) +{ + app.UseSwagger(); + app.UseSwaggerUI(); +} + +app.UseHttpsRedirection(); +app.MapControllers(); +app.MapDefaultEndpoints(); + +app.Run(); \ No newline at end of file diff --git a/CreditApp.Api/Properties/launchSettings.json b/CreditApp.Api/Properties/launchSettings.json new file mode 100644 index 0000000..a3388c3 --- /dev/null +++ b/CreditApp.Api/Properties/launchSettings.json @@ -0,0 +1,41 @@ +{ + "$schema": "http://json.schemastore.org/launchsettings.json", + "iisSettings": { + "windowsAuthentication": false, + "anonymousAuthentication": true, + "iisExpress": { + "applicationUrl": "http://localhost:46825", + "sslPort": 44333 + } + }, + "profiles": { + "http": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": true, + "launchUrl": "swagger", + "applicationUrl": "http://localhost:5179", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + }, + "https": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": true, + "launchUrl": "swagger", + "applicationUrl": "https://localhost:7036;http://localhost:5179", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + }, + "IIS Express": { + "commandName": "IISExpress", + "launchBrowser": true, + "launchUrl": "swagger", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + } + } +} diff --git a/CreditApp.Api/Services/CreditGeneratorService/CreditApplicationGeneratorService.cs b/CreditApp.Api/Services/CreditGeneratorService/CreditApplicationGeneratorService.cs new file mode 100644 index 0000000..772cac4 --- /dev/null +++ b/CreditApp.Api/Services/CreditGeneratorService/CreditApplicationGeneratorService.cs @@ -0,0 +1,111 @@ +using Bogus; +using CreditApp.Domain.Entities; +using Microsoft.Extensions.Caching.Distributed; +using System.Text.Json; + +namespace CreditApp.Api.Services.CreditGeneratorService; + +public class CreditApplicationGeneratorService(IDistributedCache _cache, ILogger _logger) : ICreditApplicationGeneratorService +{ + private static readonly string[] _creditTypes = + [ + "Потребительский", + "Ипотека", + "Автокредит", + "Бизнес-кредит", + "Образовательный" + ]; + + private static readonly string[] _statuses = + [ + "Новая", + "В обработке", + "Одобрена", + "Отклонена" + ]; + + private static readonly string[] _terminalStatuses = ["Одобрена", "Отклонена"]; + + public async Task GetByIdAsync(int id, CancellationToken cancellationToken = default) + { + var cacheKey = $"credit-application-{id}"; + + _logger.LogInformation("Попытка получить заявку {Id} из кэша", id); + + var cachedData = await _cache.GetStringAsync(cacheKey, cancellationToken); + + if (cachedData != null) + { + _logger.LogInformation("Заявка {Id} найдена в кэше", id); + return JsonSerializer.Deserialize(cachedData)!; + } + + _logger.LogInformation("Заявка {Id} не найдена в кэше, генерируем новую", id); + var application = GenerateApplication(id); + var cacheOptions = new DistributedCacheEntryOptions + { + AbsoluteExpirationRelativeToNow = TimeSpan.FromMinutes(10) + }; + + await _cache.SetStringAsync( + cacheKey, + JsonSerializer.Serialize(application), + cacheOptions, + cancellationToken); + + _logger.LogInformation( + "Кредитная заявка сгенерирована и закэширована: Id={Id}, Тип={Type}, Сумма={Amount}, Статус={Status}", + application.Id, + application.Type, + application.Amount, + application.Status); + + return application; + } + + /// + /// Генерация кредитной заявки с указанным ID + /// + private static CreditApplication GenerateApplication(int id) + { + var faker = new Faker("ru") + .RuleFor(c => c.Id, f => id) + .RuleFor(c => c.Type, f => f.PickRandom(_creditTypes)) + .RuleFor(c => c.Amount, f => Math.Round(f.Finance.Amount(10000, 10000000), 2)) + .RuleFor(c => c.Term, f => f.Random.Int(6, 360)) + .RuleFor(c => c.InterestRate, f => Math.Round(f.Random.Double(16.0, 25.0), 2)) + .RuleFor(c => c.SubmissionDate, f => DateOnly.FromDateTime( + f.Date.Between(DateTime.Now.AddYears(-2), DateTime.Now))) + .RuleFor(c => c.RequiresInsurance, f => f.Random.Bool()) + .RuleFor(c => c.Status, f => f.PickRandom(_statuses)); + + var application = faker.Generate(); + + if (_terminalStatuses.Contains(application.Status)) + { + var submissionDate = application.SubmissionDate.ToDateTime(TimeOnly.MinValue); + var approvalDate = submissionDate.AddDays(new Random().Next(1, 60)); + + if (approvalDate > DateTime.Now) + { + approvalDate = DateTime.Now; + } + + application.ApprovalDate = DateOnly.FromDateTime(approvalDate); + } + + if (application.Status == "Одобрена") + { + var percentage = 0.8m + (decimal)new Random().NextDouble() * 0.3m; + var approvedAmount = application.Amount * percentage; + application.ApprovedAmount = Math.Round(approvedAmount, 2); + + if (application.ApprovedAmount > application.Amount) + { + application.ApprovedAmount = application.Amount; + } + } + + return application; + } +} diff --git a/CreditApp.Api/Services/CreditGeneratorService/ICreditApplicationGeneratorService.cs b/CreditApp.Api/Services/CreditGeneratorService/ICreditApplicationGeneratorService.cs new file mode 100644 index 0000000..da5e8ea --- /dev/null +++ b/CreditApp.Api/Services/CreditGeneratorService/ICreditApplicationGeneratorService.cs @@ -0,0 +1,14 @@ +using CreditApp.Domain.Entities; + +namespace CreditApp.Api.Services.CreditGeneratorService; + +public interface ICreditApplicationGeneratorService +{ + /// + /// Получить заявку по ID, если не найдена в кэше генерируем новую с указанным ID + /// + /// ID кредитной заявки + /// Токен отмены операции + /// Кредитная заявка + public Task GetByIdAsync(int id, CancellationToken cancellationToken = default); +} diff --git a/CreditApp.Api/appsettings.Development.json b/CreditApp.Api/appsettings.Development.json new file mode 100644 index 0000000..0c208ae --- /dev/null +++ b/CreditApp.Api/appsettings.Development.json @@ -0,0 +1,8 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning" + } + } +} diff --git a/CreditApp.Api/appsettings.json b/CreditApp.Api/appsettings.json new file mode 100644 index 0000000..10f68b8 --- /dev/null +++ b/CreditApp.Api/appsettings.json @@ -0,0 +1,9 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning" + } + }, + "AllowedHosts": "*" +} diff --git a/CreditApp.AppHost/CreditApp.AppHost.csproj b/CreditApp.AppHost/CreditApp.AppHost.csproj new file mode 100644 index 0000000..71a48b0 --- /dev/null +++ b/CreditApp.AppHost/CreditApp.AppHost.csproj @@ -0,0 +1,20 @@ + + + + Exe + net8.0 + enable + enable + 70e4a3f7-c299-47f6-9d51-144f31ab779b + + + + + + + + + + + + diff --git a/CreditApp.AppHost/Program.cs b/CreditApp.AppHost/Program.cs new file mode 100644 index 0000000..5853fa2 --- /dev/null +++ b/CreditApp.AppHost/Program.cs @@ -0,0 +1,11 @@ +var builder = DistributedApplication.CreateBuilder(args); + +var redis = builder.AddRedis("cache"); + +var api = builder.AddProject("creditapp-api") + .WithReference(redis); + +builder.AddProject("client") + .WithReference(api); + +builder.Build().Run(); diff --git a/CreditApp.AppHost/Properties/launchSettings.json b/CreditApp.AppHost/Properties/launchSettings.json new file mode 100644 index 0000000..2bcd68b --- /dev/null +++ b/CreditApp.AppHost/Properties/launchSettings.json @@ -0,0 +1,31 @@ +{ + "$schema": "https://json.schemastore.org/launchsettings.json", + "profiles": { + "https": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": true, + "applicationUrl": "https://localhost:17062;http://localhost:15086", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development", + "DOTNET_ENVIRONMENT": "Development", + "ASPIRE_DASHBOARD_OTLP_ENDPOINT_URL": "https://localhost:21219", + "ASPIRE_DASHBOARD_MCP_ENDPOINT_URL": "https://localhost:23298", + "ASPIRE_RESOURCE_SERVICE_ENDPOINT_URL": "https://localhost:22237" + } + }, + "http": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": true, + "applicationUrl": "http://localhost:15086", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development", + "DOTNET_ENVIRONMENT": "Development", + "ASPIRE_DASHBOARD_OTLP_ENDPOINT_URL": "http://localhost:19243", + "ASPIRE_DASHBOARD_MCP_ENDPOINT_URL": "http://localhost:18213", + "ASPIRE_RESOURCE_SERVICE_ENDPOINT_URL": "http://localhost:20039" + } + } + } +} diff --git a/CreditApp.AppHost/appsettings.Development.json b/CreditApp.AppHost/appsettings.Development.json new file mode 100644 index 0000000..0c208ae --- /dev/null +++ b/CreditApp.AppHost/appsettings.Development.json @@ -0,0 +1,8 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning" + } + } +} diff --git a/CreditApp.AppHost/appsettings.json b/CreditApp.AppHost/appsettings.json new file mode 100644 index 0000000..31c092a --- /dev/null +++ b/CreditApp.AppHost/appsettings.json @@ -0,0 +1,9 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning", + "Aspire.Hosting.Dcp": "Warning" + } + } +} diff --git a/CreditApp.Domain/CreditApp.Domain.csproj b/CreditApp.Domain/CreditApp.Domain.csproj new file mode 100644 index 0000000..fa71b7a --- /dev/null +++ b/CreditApp.Domain/CreditApp.Domain.csproj @@ -0,0 +1,9 @@ + + + + net8.0 + enable + enable + + + diff --git a/CreditApp.Domain/Entities/CreditApplication.cs b/CreditApp.Domain/Entities/CreditApplication.cs new file mode 100644 index 0000000..ca40117 --- /dev/null +++ b/CreditApp.Domain/Entities/CreditApplication.cs @@ -0,0 +1,48 @@ +namespace CreditApp.Domain.Entities; + +/// +/// Кредитная заявка +/// +public class CreditApplication +{ + /// + /// Идентификатор в системе + /// + public int Id { get; set; } + /// + /// Тип кредита + /// + public string Type { get; set; } = String.Empty; + /// + /// Запрашиваемая сумма + /// + public decimal Amount { get; set; } + /// + /// Срок в месяцах + /// + public int Term { get; set; } + /// + /// Процентная ставка + /// + public double InterestRate { get; set; } + /// + /// Дата подачи + /// + public DateOnly SubmissionDate { get; set; } + /// + /// Необходимость страховки + /// + public bool RequiresInsurance { get; set; } + /// + /// Статус заявки + /// + public string Status { get; set; } = String.Empty; + /// + /// Дата решения + /// + public DateOnly? ApprovalDate { get; set; } + /// + /// Одобренная сумма + /// + public decimal? ApprovedAmount { get; set; } +} diff --git a/CreditApp.ServiceDefaults/CreditApp.ServiceDefaults.csproj b/CreditApp.ServiceDefaults/CreditApp.ServiceDefaults.csproj new file mode 100644 index 0000000..6a65bdf --- /dev/null +++ b/CreditApp.ServiceDefaults/CreditApp.ServiceDefaults.csproj @@ -0,0 +1,20 @@ + + + + net8.0 + enable + enable + true + + + + + + + + + + + + + diff --git a/CreditApp.ServiceDefaults/Extensions.cs b/CreditApp.ServiceDefaults/Extensions.cs new file mode 100644 index 0000000..83beef7 --- /dev/null +++ b/CreditApp.ServiceDefaults/Extensions.cs @@ -0,0 +1,104 @@ +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 OpenTelemetry; +using OpenTelemetry.Metrics; +using OpenTelemetry.Trace; + +namespace CreditApp.ServiceDefaults; + +/// +/// Расширения для настройки сервисов Aspire (структурное логирование, телеметрия, health checks) +/// +public static class Extensions +{ + /// + /// Добавляет стандартные настройки Aspire для сервисов + /// + public static IHostApplicationBuilder AddServiceDefaults(this IHostApplicationBuilder builder) + { + builder.ConfigureOpenTelemetry(); + builder.AddDefaultHealthChecks(); + builder.Services.AddServiceDiscovery(); + + builder.Services.ConfigureHttpClientDefaults(http => + { + http.AddStandardResilienceHandler(); + http.AddServiceDiscovery(); + }); + + return builder; + } + + /// + /// Настройка OpenTelemetry для структурного логирования и телеметрии + /// + public static IHostApplicationBuilder ConfigureOpenTelemetry(this IHostApplicationBuilder builder) + { + builder.Logging.AddOpenTelemetry(logging => + { + logging.IncludeFormattedMessage = true; + logging.IncludeScopes = true; + }); + + builder.Services.AddOpenTelemetry() + .WithMetrics(metrics => + { + metrics.AddAspNetCoreInstrumentation() + .AddHttpClientInstrumentation() + .AddRuntimeInstrumentation(); + }) + .WithTracing(tracing => + { + tracing.AddAspNetCoreInstrumentation() + .AddHttpClientInstrumentation(); + }); + + builder.AddOpenTelemetryExporters(); + + return builder; + } + + private static IHostApplicationBuilder AddOpenTelemetryExporters(this IHostApplicationBuilder builder) + { + var useOtlpExporter = !string.IsNullOrWhiteSpace(builder.Configuration["OTEL_EXPORTER_OTLP_ENDPOINT"]); + + if (useOtlpExporter) + { + builder.Services.AddOpenTelemetry().UseOtlpExporter(); + } + + return builder; + } + + /// + /// Добавляет стандартные health checks + /// + public static IHostApplicationBuilder AddDefaultHealthChecks(this IHostApplicationBuilder builder) + { + builder.Services.AddHealthChecks() + .AddCheck("self", () => HealthCheckResult.Healthy(), ["live"]); + + return builder; + } + + /// + /// Настройка стандартных endpoints (health checks) + /// + public static WebApplication MapDefaultEndpoints(this WebApplication app) + { + if (app.Environment.IsDevelopment()) + { + app.MapHealthChecks("/health"); + app.MapHealthChecks("/alive", new HealthCheckOptions + { + Predicate = r => r.Tags.Contains("live") + }); + } + + return app; + } +} From 59cb056c0899850e659a7d59ad2b059a94a09fed Mon Sep 17 00:00:00 2001 From: Ivan K Date: Mon, 16 Feb 2026 17:52:00 +0400 Subject: [PATCH 02/10] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=20=D0=BF=D1=80?= =?UTF-8?q?=D0=BE=D0=B1=D0=BB=D0=B5=D0=BC=D1=8B=20=D1=81=20CORS?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Client.Wasm/Properties/launchSettings.json | 6 +++--- CreditApp.Api/Program.cs | 18 +++++++++++++++++- CreditApp.Api/Properties/launchSettings.json | 4 ++-- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/Client.Wasm/Properties/launchSettings.json b/Client.Wasm/Properties/launchSettings.json index 0d824ea..60120ec 100644 --- a/Client.Wasm/Properties/launchSettings.json +++ b/Client.Wasm/Properties/launchSettings.json @@ -12,7 +12,7 @@ "http": { "commandName": "Project", "dotnetRunMessages": true, - "launchBrowser": true, + "launchBrowser": false, "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}", "applicationUrl": "http://localhost:5127", "environmentVariables": { @@ -22,7 +22,7 @@ "https": { "commandName": "Project", "dotnetRunMessages": true, - "launchBrowser": true, + "launchBrowser": false, "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}", "applicationUrl": "https://localhost:7282;http://localhost:5127", "environmentVariables": { @@ -31,7 +31,7 @@ }, "IIS Express": { "commandName": "IISExpress", - "launchBrowser": true, + "launchBrowser": false, "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" diff --git a/CreditApp.Api/Program.cs b/CreditApp.Api/Program.cs index d733952..840fb21 100644 --- a/CreditApp.Api/Program.cs +++ b/CreditApp.Api/Program.cs @@ -2,21 +2,36 @@ using CreditApp.ServiceDefaults; var builder = WebApplication.CreateBuilder(args); + builder.AddServiceDefaults(); + builder.AddRedisClient("cache"); builder.Services.AddStackExchangeRedisCache(options => { var connectionString = builder.Configuration.GetConnectionString("cache"); options.Configuration = connectionString; }); + +builder.Services.AddCors(options => +{ + options.AddPolicy("AllowBlazorWasm", policy => + { + policy.AllowAnyOrigin() + .AllowAnyMethod() + .AllowAnyHeader(); + }); +}); + builder.Services.AddScoped(); + +// Add controllers builder.Services.AddControllers(); builder.Services.AddEndpointsApiExplorer(); builder.Services.AddSwaggerGen(); var app = builder.Build(); -// Configure the HTTP request pipeline. +// Configure the HTTP request pipeline if (app.Environment.IsDevelopment()) { app.UseSwagger(); @@ -24,6 +39,7 @@ } app.UseHttpsRedirection(); +app.UseCors("AllowBlazorWasm"); app.MapControllers(); app.MapDefaultEndpoints(); diff --git a/CreditApp.Api/Properties/launchSettings.json b/CreditApp.Api/Properties/launchSettings.json index a3388c3..bbe9ee6 100644 --- a/CreditApp.Api/Properties/launchSettings.json +++ b/CreditApp.Api/Properties/launchSettings.json @@ -1,4 +1,4 @@ -{ +{ "$schema": "http://json.schemastore.org/launchsettings.json", "iisSettings": { "windowsAuthentication": false, @@ -24,7 +24,7 @@ "dotnetRunMessages": true, "launchBrowser": true, "launchUrl": "swagger", - "applicationUrl": "https://localhost:7036;http://localhost:5179", + "applicationUrl": "https://localhost:7170;http://localhost:5179", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" } From 7867a56528ac987eeff6668a4746ef010ab34f3c Mon Sep 17 00:00:00 2001 From: Ivan K Date: Wed, 18 Feb 2026 13:00:47 +0400 Subject: [PATCH 03/10] =?UTF-8?q?=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20README?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 202 ++++++++++++++++++++---------------------------------- 1 file changed, 76 insertions(+), 126 deletions(-) diff --git a/README.md b/README.md index dcaa5eb..9bfc953 100644 --- a/README.md +++ b/README.md @@ -1,128 +1,78 @@ -# Современные технологии разработки программного обеспечения -[Таблица с успеваемостью](https://docs.google.com/spreadsheets/d/1an43o-iqlq4V_kDtkr_y7DC221hY9qdhGPrpII27sH8/edit?usp=sharing) +# Лабораторная работа №1 - "Кэширование" + +**Вариант**: №9 - "Кредитная заявка" + +**Выполнил**: Куненков Иван, группа 6511 + +**Предметная область**: Генерация кредитных заявок + + +## Реализованный функционал + +### Основные возможности: +- **Генерация кредитных заявок** с реалистичными данными (Bogus) +- **Интеллектное кэширование** в Redis с TTL 10 минут +- **REST API** для получения заявок +- **Blazor WebAssembly клиент** для работы с API +- **Структурное логирование** через OpenTelemetry +- **Мониторинг в реальном времени** через Aspire Dashboard + +## 🏗️ Архитектура + +``` +┌─────────────────────────────────────┐ +│ Client.Wasm (Blazor WASM) │ ← Пользовательский интерфейс +│ - Форма ввода ID │ +│ - Отображение данных │ +└──────────────┬──────────────────────┘ + │ HTTPS + CORS + ↓ +┌─────────────────────────────────────┐ +│ CreditApp.Api (ASP.NET Core) │ ← REST API +│ GET /api/credit?id={id} │ +│ - Проверка кэша │ +│ - Генерация (Bogus) │ +│ - Структурное логирование │ +└──────────────┬──────────────────────┘ + │ IDistributedCache + ↓ +┌─────────────────────────────────────┐ +│ Redis (Docker) │ ← Кэш +│ TTL: 10 минут │ +└─────────────────────────────────────┘ + ↑ + ┌──────────┴──────────┐ + │ Aspire AppHost │ ← Оркестрация + └─────────────────────┘ +``` + +## 📁 Структура проекта + +``` +cloud-development/ +├── CreditApp.AppHost/ # Aspire orchestrator +│ └── Program.cs # Конфигурация оркестрации +├── CreditApp.ServiceDefaults/ # Общие настройки +│ └── Extensions.cs # OpenTelemetry, health checks +├── CreditApp.Api/ # REST API +│ ├── Controllers/ +│ │ └── CreditController.cs # GET /api/credit?id={id} +│ ├── Services/ +│ │ └── CreditGeneratorService/ +│ │ ├── ICreditApplicationGeneratorService.cs +│ │ └── CreditApplicationGeneratorService.cs +│ └── Program.cs # Конфигурация (Redis, CORS, логирование) +├── CreditApp.Domain/ # Модели данных +│ └── Entities/ +│ └── CreditApplication.cs +├── Client.Wasm/ # Blazor WASM клиент +│ ├── Components/ +│ │ ├── DataCard.razor # UI для запроса заявок +│ │ └── StudentCard.razor # Информация о студенте +│ └── wwwroot/ +│ └── appsettings.json # Конфигурация API endpoint +├── screenshots/ # Скриншоты приложения +└── README.md # Этот файл +``` -## Задание -### Цель -Реализация проекта микросервисного бекенда. - -### Задачи -* Реализация межсервисной коммуникации, -* Изучение работы с брокерами сообщений, -* Изучение архитектурных паттернов, -* Изучение работы со средствами оркестрации на примере .NET Aspire, -* Повторение основ работы с системами контроля версий, -* Интеграционное тестирование. - -### Лабораторные работы -
-1. «Кэширование» - Реализация сервиса генерации контрактов, кэширование его ответов -
- -В рамках первой лабораторной работы необходимо: -* Реализовать сервис генерации контрактов на основе Bogus, -* Реализовать кеширование при помощи IDistributedCache и Redis, -* Реализовать структурное логирование сервиса генерации, -* Настроить оркестрацию Aspire. - -
-
-2. «Балансировка нагрузки» - Реализация апи гейтвея, настройка его работы -
- -В рамках второй лабораторной работы необходимо: -* Настроить оркестрацию на запуск нескольких реплик сервиса генерации, -* Реализовать апи гейтвей на основе Ocelot, -* Имплементировать алгоритм балансировки нагрузки согласно варианту. - -
-
-
-3. «Интеграционное тестирование» - Реализация файлового сервиса и объектного хранилища, интеграционное тестирование бекенда -
- -В рамках третьей лабораторной работы необходимо: -* Добавить в оркестрацию объектное хранилище, -* Реализовать файловый сервис, сериализующий сгенерированные данные в файлы и сохраняющий их в объектном хранилище, -* Реализовать отправку генерируемых данных в файловый сервис посредством брокера, -* Реализовать интеграционные тесты, проверяющие корректность работы всех сервисов бекенда вместе. - -
-
-
-4. (Опционально) «Переход на облачную инфраструктуру» - Перенос бекенда в Yandex Cloud -
- -В рамках четвертой лабораторной работы необходимо перенестиервисы на облако все ранее разработанные сервисы: -* Клиент - в хостинг через отдельный бакет Object Storage, -* Сервис генерации - в Cloud Function, -* Апи гейтвей - в Serverless Integration как API Gateway, -* Брокер сообщений - в Message Queue, -* Файловый сервис - в Cloud Function, -* Объектное хранилище - в отдельный бакет Object Storage, - -
-
- -## Задание. Общая часть -**Обязательно**: -* Реализация серверной части на [.NET 8](https://learn.microsoft.com/ru-ru/dotnet/core/whats-new/dotnet-8/overview). -* Оркестрация проектов при помощи [.NET Aspire](https://learn.microsoft.com/ru-ru/dotnet/aspire/get-started/aspire-overview). -* Реализация сервиса генерации данных при помощи [Bogus](https://github.com/bchavez/Bogus). -* Реализация тестов с использованием [xUnit](https://xunit.net/?tabs=cs). -* Создание минимальной документации к проекту: страница на GitHub с информацией о задании, скриншоты приложения и прочая информация. - -**Факультативно**: -* Перенос бекенда на облачную инфраструктуру Yandex Cloud - -Внимательно прочитайте [дискуссии](https://github.com/itsecd/cloud-development/discussions/1) о том, как работает автоматическое распределение на ревью. -Сразу корректно называйте свои pr, чтобы они попали на ревью нужному преподавателю. - -По итогу работы в семестре должна получиться следующая информационная система: -
-C4 диаграмма -Современные_технологии_разработки_ПО_drawio -
- -## Варианты заданий -Номер варианта задания присваивается в начале семестра. Изменить его нельзя. Каждый вариант имеет уникальную комбинацию из предметной области, базы данных и технологии для общения сервиса генерации данных и сервера апи. - -[Список вариантов](https://docs.google.com/document/d/1WGmLYwffTTaAj4TgFCk5bUyW3XKbFMiBm-DHZrfFWr4/edit?usp=sharing) -[Список предметных областей и алгоритмов балансировки](https://docs.google.com/document/d/1PLn2lKe4swIdJDZhwBYzxqFSu0AbY2MFY1SUPkIKOM4/edit?usp=sharing) - -## Схема сдачи - -На каждую из лабораторных работ необходимо сделать отдельный [Pull Request (PR)](https://docs.github.com/en/pull-requests). - -Общая схема: -1. Сделать форк данного репозитория -2. Выполнить задание -3. Сделать PR в данный репозиторий -4. Исправить замечания после code review -5. Получить approve - -## Критерии оценивания - -Конкурентный принцип. -Так как задания в первой лабораторной будут повторяться между студентами, то выделяются следующие показатели для оценки: -1. Скорость разработки -2. Качество разработки -3. Полнота выполнения задания - -Быстрее делаете PR - у вас преимущество. -Быстрее получаете Approve - у вас преимущество. -Выполните нечто немного выходящее за рамки проекта - у вас преимущество. -Не укладываетесь в дедлайн - получаете минимально возможный балл. - -### Шкала оценивания - -- **3 балла** за качество кода, из них: - - 2 балла - базовая оценка - - 1 балл (но не более) можно получить за выполнение любого из следующих пунктов: - - Реализация факультативного функционала - - Выполнение работы раньше других: первые 5 человек из каждой группы, которые сделали PR и получили approve, получают дополнительный балл - -## Вопросы и обратная связь по курсу - -Чтобы задать вопрос по лабораторной, воспользуйтесь [соответствующим разделом дискуссий](https://github.com/itsecd/cloud-development/discussions/categories/questions) или заведите [ишью](https://github.com/itsecd/cloud-development/issues/new). -Если у вас появились идеи/пожелания/прочие полезные мысли по преподаваемой дисциплине, их можно оставить [здесь](https://github.com/itsecd/cloud-development/discussions/categories/ideas). From af0760941d8f2d6620065932a5783cadaf401879 Mon Sep 17 00:00:00 2001 From: razzzenya <113578593+razzzenya@users.noreply.github.com> Date: Wed, 18 Feb 2026 13:01:50 +0400 Subject: [PATCH 04/10] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D1=81=D0=BA=D1=80=D0=B8=D0=BD=D1=8B=20=D0=BA=20README?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 9bfc953..13249e8 100644 --- a/README.md +++ b/README.md @@ -75,4 +75,7 @@ cloud-development/ └── README.md # Этот файл ``` +![aspire](https://github.com/user-attachments/assets/8eae0229-1476-43ce-92e9-7d00023edfa4) +![client](https://github.com/user-attachments/assets/78d9db61-05f4-4896-8e77-1e9cb79dcf67) +![logs](https://github.com/user-attachments/assets/eb133b16-da58-47b5-8f11-e74f656977dd) From c496c33c1fb4675119c9d15b3efec44b1942bce8 Mon Sep 17 00:00:00 2001 From: Ivan K Date: Wed, 18 Feb 2026 15:39:36 +0400 Subject: [PATCH 05/10] =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20?= =?UTF-8?q?=D0=BF=D0=BE=20=D0=BA=D0=BE=D0=B4=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CreditApp.Api/Controllers/CreditController.cs | 5 +- CreditApp.Api/CreditApp.Api.csproj | 2 + CreditApp.Api/CreditApp.Api.http | 6 -- CreditApp.Api/Program.cs | 25 ++++++- .../CreditApplicationGeneratorService.cs | 74 ++++++++++--------- .../ICreditApplicationGeneratorService.cs | 14 ---- CreditApp.Api/appsettings.Development.json | 4 + CreditApp.Api/appsettings.json | 5 +- CreditApp.AppHost/Program.cs | 6 +- CreditApp.Domain/CreditApp.Domain.csproj | 4 +- .../CreditApp.ServiceDefaults.csproj | 14 ++-- 11 files changed, 88 insertions(+), 71 deletions(-) delete mode 100644 CreditApp.Api/CreditApp.Api.http delete mode 100644 CreditApp.Api/Services/CreditGeneratorService/ICreditApplicationGeneratorService.cs diff --git a/CreditApp.Api/Controllers/CreditController.cs b/CreditApp.Api/Controllers/CreditController.cs index 83dbc60..e4f61a1 100644 --- a/CreditApp.Api/Controllers/CreditController.cs +++ b/CreditApp.Api/Controllers/CreditController.cs @@ -1,11 +1,12 @@ using CreditApp.Api.Services.CreditGeneratorService; +using CreditApp.Domain.Entities; using Microsoft.AspNetCore.Mvc; namespace CreditApp.Api.Controllers; [Route("api/[controller]")] [ApiController] -public class CreditController(ICreditApplicationGeneratorService _generatorService, ILogger _logger) : ControllerBase +public class CreditController(CreditApplicationGeneratorService _generatorService, ILogger _logger) : ControllerBase { /// /// Получить кредитную заявку по ID, если не найдена в кэше генерируем новую @@ -14,7 +15,7 @@ public class CreditController(ICreditApplicationGeneratorService _generatorServi /// Токен отмены операции /// Кредитная заявка [HttpGet] - public async Task GetById([FromQuery] int id, CancellationToken cancellationToken) + public async Task> GetById([FromQuery] int id, CancellationToken cancellationToken) { _logger.LogInformation("Получен запрос на получение/генерацию заявки {Id}", id); diff --git a/CreditApp.Api/CreditApp.Api.csproj b/CreditApp.Api/CreditApp.Api.csproj index f59f159..a7ce3f4 100644 --- a/CreditApp.Api/CreditApp.Api.csproj +++ b/CreditApp.Api/CreditApp.Api.csproj @@ -4,6 +4,8 @@ net8.0 enable enable + true + $(NoWarn);1591 diff --git a/CreditApp.Api/CreditApp.Api.http b/CreditApp.Api/CreditApp.Api.http deleted file mode 100644 index d979e23..0000000 --- a/CreditApp.Api/CreditApp.Api.http +++ /dev/null @@ -1,6 +0,0 @@ -@CreditApp.Api_HostAddress = http://localhost:5179 - -GET {{CreditApp.Api_HostAddress}}/weatherforecast/ -Accept: application/json - -### diff --git a/CreditApp.Api/Program.cs b/CreditApp.Api/Program.cs index 840fb21..ea5690a 100644 --- a/CreditApp.Api/Program.cs +++ b/CreditApp.Api/Program.cs @@ -22,16 +22,33 @@ }); }); -builder.Services.AddScoped(); +builder.Services.AddScoped(); -// Add controllers builder.Services.AddControllers(); builder.Services.AddEndpointsApiExplorer(); -builder.Services.AddSwaggerGen(); +builder.Services.AddSwaggerGen(options => +{ + options.SwaggerDoc("v1", new Microsoft.OpenApi.Models.OpenApiInfo + { + Title = "CreditApp API" + }); + + var xmlFilename = $"{System.Reflection.Assembly.GetExecutingAssembly().GetName().Name}.xml"; + var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFilename); + if (File.Exists(xmlPath)) + { + options.IncludeXmlComments(xmlPath); + } + + var domainXmlPath = Path.Combine(AppContext.BaseDirectory, "CreditApp.Domain.xml"); + if (File.Exists(domainXmlPath)) + { + options.IncludeXmlComments(domainXmlPath); + } +}); var app = builder.Build(); -// Configure the HTTP request pipeline if (app.Environment.IsDevelopment()) { app.UseSwagger(); diff --git a/CreditApp.Api/Services/CreditGeneratorService/CreditApplicationGeneratorService.cs b/CreditApp.Api/Services/CreditGeneratorService/CreditApplicationGeneratorService.cs index 772cac4..65e9806 100644 --- a/CreditApp.Api/Services/CreditGeneratorService/CreditApplicationGeneratorService.cs +++ b/CreditApp.Api/Services/CreditGeneratorService/CreditApplicationGeneratorService.cs @@ -5,7 +5,7 @@ namespace CreditApp.Api.Services.CreditGeneratorService; -public class CreditApplicationGeneratorService(IDistributedCache _cache, ILogger _logger) : ICreditApplicationGeneratorService +public class CreditApplicationGeneratorService(IDistributedCache _cache, IConfiguration _configuration, ILogger _logger) { private static readonly string[] _creditTypes = [ @@ -34,17 +34,27 @@ public async Task GetByIdAsync(int id, CancellationToken canc var cachedData = await _cache.GetStringAsync(cacheKey, cancellationToken); - if (cachedData != null) + if (!string.IsNullOrEmpty(cachedData)) { - _logger.LogInformation("Заявка {Id} найдена в кэше", id); - return JsonSerializer.Deserialize(cachedData)!; + var deserializedApplication = JsonSerializer.Deserialize(cachedData); + + if (deserializedApplication != null) + { + _logger.LogInformation("Заявка {Id} найдена в кэше", id); + return deserializedApplication; + } + + _logger.LogWarning("Заявка {Id} найдена в кэше, но не удалось десериализовать. Генерируем новую", id); } _logger.LogInformation("Заявка {Id} не найдена в кэше, генерируем новую", id); + var application = GenerateApplication(id); + + var expirationMinutes = _configuration.GetValue("CacheSettings:ExpirationMinutes", 10); var cacheOptions = new DistributedCacheEntryOptions { - AbsoluteExpirationRelativeToNow = TimeSpan.FromMinutes(10) + AbsoluteExpirationRelativeToNow = TimeSpan.FromMinutes(expirationMinutes) }; await _cache.SetStringAsync( @@ -74,38 +84,34 @@ private static CreditApplication GenerateApplication(int id) .RuleFor(c => c.Amount, f => Math.Round(f.Finance.Amount(10000, 10000000), 2)) .RuleFor(c => c.Term, f => f.Random.Int(6, 360)) .RuleFor(c => c.InterestRate, f => Math.Round(f.Random.Double(16.0, 25.0), 2)) - .RuleFor(c => c.SubmissionDate, f => DateOnly.FromDateTime( - f.Date.Between(DateTime.Now.AddYears(-2), DateTime.Now))) + .RuleFor(c => c.SubmissionDate, f => f.Date.PastDateOnly(2)) .RuleFor(c => c.RequiresInsurance, f => f.Random.Bool()) - .RuleFor(c => c.Status, f => f.PickRandom(_statuses)); - - var application = faker.Generate(); - - if (_terminalStatuses.Contains(application.Status)) - { - var submissionDate = application.SubmissionDate.ToDateTime(TimeOnly.MinValue); - var approvalDate = submissionDate.AddDays(new Random().Next(1, 60)); - - if (approvalDate > DateTime.Now) + .RuleFor(c => c.Status, f => f.PickRandom(_statuses)) + .RuleFor(c => c.ApprovalDate, (f, c) => { - approvalDate = DateTime.Now; - } - - application.ApprovalDate = DateOnly.FromDateTime(approvalDate); - } - - if (application.Status == "Одобрена") - { - var percentage = 0.8m + (decimal)new Random().NextDouble() * 0.3m; - var approvedAmount = application.Amount * percentage; - application.ApprovedAmount = Math.Round(approvedAmount, 2); - - if (application.ApprovedAmount > application.Amount) + if (!_terminalStatuses.Contains(c.Status)) + return null; + + var submissionDateTime = c.SubmissionDate.ToDateTime(TimeOnly.MinValue); + var daysAfterSubmission = f.Random.Int(1, 60); + var approvalDateTime = submissionDateTime.AddDays(daysAfterSubmission); + + if (approvalDateTime > DateTime.Now) + approvalDateTime = DateTime.Now; + + return DateOnly.FromDateTime(approvalDateTime); + }) + .RuleFor(c => c.ApprovedAmount, (f, c) => { - application.ApprovedAmount = application.Amount; - } - } + if (c.Status != "Одобрена") + return null; + + var percentage = f.Random.Decimal(0.7m, 1.0m); + var approvedAmount = c.Amount * percentage; + + return Math.Round(approvedAmount, 2); + }); - return application; + return faker.Generate(); } } diff --git a/CreditApp.Api/Services/CreditGeneratorService/ICreditApplicationGeneratorService.cs b/CreditApp.Api/Services/CreditGeneratorService/ICreditApplicationGeneratorService.cs deleted file mode 100644 index da5e8ea..0000000 --- a/CreditApp.Api/Services/CreditGeneratorService/ICreditApplicationGeneratorService.cs +++ /dev/null @@ -1,14 +0,0 @@ -using CreditApp.Domain.Entities; - -namespace CreditApp.Api.Services.CreditGeneratorService; - -public interface ICreditApplicationGeneratorService -{ - /// - /// Получить заявку по ID, если не найдена в кэше генерируем новую с указанным ID - /// - /// ID кредитной заявки - /// Токен отмены операции - /// Кредитная заявка - public Task GetByIdAsync(int id, CancellationToken cancellationToken = default); -} diff --git a/CreditApp.Api/appsettings.Development.json b/CreditApp.Api/appsettings.Development.json index 0c208ae..b642d7a 100644 --- a/CreditApp.Api/appsettings.Development.json +++ b/CreditApp.Api/appsettings.Development.json @@ -4,5 +4,9 @@ "Default": "Information", "Microsoft.AspNetCore": "Warning" } + }, + "AllowedHosts": "*", + "CacheSettings": { + "ExpirationMinutes": 10 } } diff --git a/CreditApp.Api/appsettings.json b/CreditApp.Api/appsettings.json index 10f68b8..b642d7a 100644 --- a/CreditApp.Api/appsettings.json +++ b/CreditApp.Api/appsettings.json @@ -5,5 +5,8 @@ "Microsoft.AspNetCore": "Warning" } }, - "AllowedHosts": "*" + "AllowedHosts": "*", + "CacheSettings": { + "ExpirationMinutes": 10 + } } diff --git a/CreditApp.AppHost/Program.cs b/CreditApp.AppHost/Program.cs index 5853fa2..440938e 100644 --- a/CreditApp.AppHost/Program.cs +++ b/CreditApp.AppHost/Program.cs @@ -3,9 +3,11 @@ var redis = builder.AddRedis("cache"); var api = builder.AddProject("creditapp-api") - .WithReference(redis); + .WithReference(redis) + .WaitFor(redis); builder.AddProject("client") - .WithReference(api); + .WithReference(api) + .WaitFor(api); builder.Build().Run(); diff --git a/CreditApp.Domain/CreditApp.Domain.csproj b/CreditApp.Domain/CreditApp.Domain.csproj index fa71b7a..fcfb265 100644 --- a/CreditApp.Domain/CreditApp.Domain.csproj +++ b/CreditApp.Domain/CreditApp.Domain.csproj @@ -1,9 +1,11 @@ - + net8.0 enable enable + true + $(NoWarn);1591 diff --git a/CreditApp.ServiceDefaults/CreditApp.ServiceDefaults.csproj b/CreditApp.ServiceDefaults/CreditApp.ServiceDefaults.csproj index 6a65bdf..bf9f33a 100644 --- a/CreditApp.ServiceDefaults/CreditApp.ServiceDefaults.csproj +++ b/CreditApp.ServiceDefaults/CreditApp.ServiceDefaults.csproj @@ -8,13 +8,13 @@ - - - - - - - + + + + + + + From ab4a3a3ba844b01eb344ac89e187c8b93ab6560a Mon Sep 17 00:00:00 2001 From: Ivan K Date: Wed, 18 Feb 2026 16:07:22 +0400 Subject: [PATCH 06/10] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D0=B2=D0=B5?= =?UTF-8?q?=D1=80=D1=81=D0=B8=D0=B9=20=D0=BF=D1=80=D0=BE=D0=B5=D0=BA=D1=82?= =?UTF-8?q?=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CloudDevelopment.sln | 16 ++++++++-------- CreditApp.Api/CreditApp.Api.csproj | 6 +++--- CreditApp.Api/Program.cs | 2 +- CreditApp.AppHost/CreditApp.AppHost.csproj | 10 +++++++--- CreditApp.AppHost/Program.cs | 2 ++ CreditApp.AppHost/Properties/launchSettings.json | 14 ++++++-------- 6 files changed, 27 insertions(+), 23 deletions(-) diff --git a/CloudDevelopment.sln b/CloudDevelopment.sln index c625a56..0ec1df7 100644 --- a/CloudDevelopment.sln +++ b/CloudDevelopment.sln @@ -1,17 +1,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 18 -VisualStudioVersion = 18.3.11505.172 +# Visual Studio Version 17 +VisualStudioVersion = 17.13.35931.197 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}") = "CreditApp.AppHost", "CreditApp.AppHost\CreditApp.AppHost.csproj", "{E2DE4A09-990C-4B72-A09D-CCE1C10AE9DD}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CreditApp.Api", "CreditApp.Api\CreditApp.Api.csproj", "{E7D4CA8B-53EA-9676-D96D-BE2F0CB11054}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CreditApp.Domain", "CreditApp.Domain\CreditApp.Domain.csproj", "{CC5A9873-4CC3-4B71-83AF-E4FD09F7B1AD}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CreditApp.ServiceDefaults", "CreditApp.ServiceDefaults\CreditApp.ServiceDefaults.csproj", "{B2C3D4E5-F6A7-8901-BCDE-F12345678901}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CreditApp.AppHost", "CreditApp.AppHost\CreditApp.AppHost.csproj", "{2A5FB573-9376-4FEB-9289-A8387F435C13}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -22,10 +22,6 @@ 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 - {E2DE4A09-990C-4B72-A09D-CCE1C10AE9DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E2DE4A09-990C-4B72-A09D-CCE1C10AE9DD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E2DE4A09-990C-4B72-A09D-CCE1C10AE9DD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E2DE4A09-990C-4B72-A09D-CCE1C10AE9DD}.Release|Any CPU.Build.0 = Release|Any CPU {E7D4CA8B-53EA-9676-D96D-BE2F0CB11054}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E7D4CA8B-53EA-9676-D96D-BE2F0CB11054}.Debug|Any CPU.Build.0 = Debug|Any CPU {E7D4CA8B-53EA-9676-D96D-BE2F0CB11054}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -38,6 +34,10 @@ Global {B2C3D4E5-F6A7-8901-BCDE-F12345678901}.Debug|Any CPU.Build.0 = Debug|Any CPU {B2C3D4E5-F6A7-8901-BCDE-F12345678901}.Release|Any CPU.ActiveCfg = Release|Any CPU {B2C3D4E5-F6A7-8901-BCDE-F12345678901}.Release|Any CPU.Build.0 = Release|Any CPU + {2A5FB573-9376-4FEB-9289-A8387F435C13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2A5FB573-9376-4FEB-9289-A8387F435C13}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2A5FB573-9376-4FEB-9289-A8387F435C13}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2A5FB573-9376-4FEB-9289-A8387F435C13}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/CreditApp.Api/CreditApp.Api.csproj b/CreditApp.Api/CreditApp.Api.csproj index a7ce3f4..a5d07fa 100644 --- a/CreditApp.Api/CreditApp.Api.csproj +++ b/CreditApp.Api/CreditApp.Api.csproj @@ -9,11 +9,11 @@ - + - - + + diff --git a/CreditApp.Api/Program.cs b/CreditApp.Api/Program.cs index ea5690a..54ae7a1 100644 --- a/CreditApp.Api/Program.cs +++ b/CreditApp.Api/Program.cs @@ -28,7 +28,7 @@ builder.Services.AddEndpointsApiExplorer(); builder.Services.AddSwaggerGen(options => { - options.SwaggerDoc("v1", new Microsoft.OpenApi.Models.OpenApiInfo + options.SwaggerDoc("v1", new Microsoft.OpenApi.OpenApiInfo { Title = "CreditApp API" }); diff --git a/CreditApp.AppHost/CreditApp.AppHost.csproj b/CreditApp.AppHost/CreditApp.AppHost.csproj index 71a48b0..8245630 100644 --- a/CreditApp.AppHost/CreditApp.AppHost.csproj +++ b/CreditApp.AppHost/CreditApp.AppHost.csproj @@ -1,15 +1,19 @@ - + + + Exe net8.0 enable enable - 70e4a3f7-c299-47f6-9d51-144f31ab779b + true + b8f3eae0-771a-4f3a-8df3-ef0a21b09b55 - + + diff --git a/CreditApp.AppHost/Program.cs b/CreditApp.AppHost/Program.cs index 440938e..670b651 100644 --- a/CreditApp.AppHost/Program.cs +++ b/CreditApp.AppHost/Program.cs @@ -1,3 +1,5 @@ +using Aspire.Hosting; + var builder = DistributedApplication.CreateBuilder(args); var redis = builder.AddRedis("cache"); diff --git a/CreditApp.AppHost/Properties/launchSettings.json b/CreditApp.AppHost/Properties/launchSettings.json index 2bcd68b..fa890ea 100644 --- a/CreditApp.AppHost/Properties/launchSettings.json +++ b/CreditApp.AppHost/Properties/launchSettings.json @@ -5,26 +5,24 @@ "commandName": "Project", "dotnetRunMessages": true, "launchBrowser": true, - "applicationUrl": "https://localhost:17062;http://localhost:15086", + "applicationUrl": "https://localhost:17214;http://localhost:15105", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development", "DOTNET_ENVIRONMENT": "Development", - "ASPIRE_DASHBOARD_OTLP_ENDPOINT_URL": "https://localhost:21219", - "ASPIRE_DASHBOARD_MCP_ENDPOINT_URL": "https://localhost:23298", - "ASPIRE_RESOURCE_SERVICE_ENDPOINT_URL": "https://localhost:22237" + "DOTNET_DASHBOARD_OTLP_ENDPOINT_URL": "https://localhost:21185", + "DOTNET_RESOURCE_SERVICE_ENDPOINT_URL": "https://localhost:22273" } }, "http": { "commandName": "Project", "dotnetRunMessages": true, "launchBrowser": true, - "applicationUrl": "http://localhost:15086", + "applicationUrl": "http://localhost:15105", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development", "DOTNET_ENVIRONMENT": "Development", - "ASPIRE_DASHBOARD_OTLP_ENDPOINT_URL": "http://localhost:19243", - "ASPIRE_DASHBOARD_MCP_ENDPOINT_URL": "http://localhost:18213", - "ASPIRE_RESOURCE_SERVICE_ENDPOINT_URL": "http://localhost:20039" + "DOTNET_DASHBOARD_OTLP_ENDPOINT_URL": "http://localhost:19190", + "DOTNET_RESOURCE_SERVICE_ENDPOINT_URL": "http://localhost:20136" } } } From edf7c1587c15f5cd6ca013f2f956a137fe3f30b4 Mon Sep 17 00:00:00 2001 From: Ivan K Date: Thu, 19 Feb 2026 20:14:21 +0400 Subject: [PATCH 07/10] =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CreditApp.Api/Controllers/CreditController.cs | 4 +- CreditApp.Api/CreditApp.Api.csproj | 3 +- CreditApp.Api/Program.cs | 11 +--- .../CreditApplicationGeneratorService.cs | 65 ++++++++----------- CreditApp.AppHost/Program.cs | 5 +- .../Entities/CreditApplication.cs | 8 +-- 6 files changed, 40 insertions(+), 56 deletions(-) diff --git a/CreditApp.Api/Controllers/CreditController.cs b/CreditApp.Api/Controllers/CreditController.cs index e4f61a1..7ae575f 100644 --- a/CreditApp.Api/Controllers/CreditController.cs +++ b/CreditApp.Api/Controllers/CreditController.cs @@ -18,9 +18,9 @@ public class CreditController(CreditApplicationGeneratorService _generatorServic public async Task> GetById([FromQuery] int id, CancellationToken cancellationToken) { _logger.LogInformation("Получен запрос на получение/генерацию заявки {Id}", id); - + var application = await _generatorService.GetByIdAsync(id, cancellationToken); - + return Ok(application); } } diff --git a/CreditApp.Api/CreditApp.Api.csproj b/CreditApp.Api/CreditApp.Api.csproj index a5d07fa..8b0828a 100644 --- a/CreditApp.Api/CreditApp.Api.csproj +++ b/CreditApp.Api/CreditApp.Api.csproj @@ -9,10 +9,9 @@ - + - diff --git a/CreditApp.Api/Program.cs b/CreditApp.Api/Program.cs index 54ae7a1..99a7768 100644 --- a/CreditApp.Api/Program.cs +++ b/CreditApp.Api/Program.cs @@ -5,12 +5,7 @@ builder.AddServiceDefaults(); -builder.AddRedisClient("cache"); -builder.Services.AddStackExchangeRedisCache(options => -{ - var connectionString = builder.Configuration.GetConnectionString("cache"); - options.Configuration = connectionString; -}); +builder.AddRedisDistributedCache("cache"); builder.Services.AddCors(options => { @@ -32,14 +27,14 @@ { Title = "CreditApp API" }); - + var xmlFilename = $"{System.Reflection.Assembly.GetExecutingAssembly().GetName().Name}.xml"; var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFilename); if (File.Exists(xmlPath)) { options.IncludeXmlComments(xmlPath); } - + var domainXmlPath = Path.Combine(AppContext.BaseDirectory, "CreditApp.Domain.xml"); if (File.Exists(domainXmlPath)) { diff --git a/CreditApp.Api/Services/CreditGeneratorService/CreditApplicationGeneratorService.cs b/CreditApp.Api/Services/CreditGeneratorService/CreditApplicationGeneratorService.cs index 65e9806..104b5e0 100644 --- a/CreditApp.Api/Services/CreditGeneratorService/CreditApplicationGeneratorService.cs +++ b/CreditApp.Api/Services/CreditGeneratorService/CreditApplicationGeneratorService.cs @@ -7,67 +7,68 @@ namespace CreditApp.Api.Services.CreditGeneratorService; public class CreditApplicationGeneratorService(IDistributedCache _cache, IConfiguration _configuration, ILogger _logger) { - private static readonly string[] _creditTypes = + private static readonly string[] _creditTypes = [ - "Потребительский", - "Ипотека", - "Автокредит", + "Потребительский", + "Ипотека", + "Автокредит", "Бизнес-кредит", "Образовательный" ]; - private static readonly string[] _statuses = + private static readonly string[] _statuses = [ - "Новая", - "В обработке", - "Одобрена", + "Новая", + "В обработке", + "Одобрена", "Отклонена" ]; private static readonly string[] _terminalStatuses = ["Одобрена", "Отклонена"]; + private readonly int _expirationMinutes = _configuration.GetValue("CacheSettings:ExpirationMinutes", 10); + public async Task GetByIdAsync(int id, CancellationToken cancellationToken = default) { var cacheKey = $"credit-application-{id}"; - + _logger.LogInformation("Попытка получить заявку {Id} из кэша", id); var cachedData = await _cache.GetStringAsync(cacheKey, cancellationToken); - + if (!string.IsNullOrEmpty(cachedData)) { var deserializedApplication = JsonSerializer.Deserialize(cachedData); - + if (deserializedApplication != null) { _logger.LogInformation("Заявка {Id} найдена в кэше", id); return deserializedApplication; } - + _logger.LogWarning("Заявка {Id} найдена в кэше, но не удалось десериализовать. Генерируем новую", id); } _logger.LogInformation("Заявка {Id} не найдена в кэше, генерируем новую", id); - + var application = GenerateApplication(id); - - var expirationMinutes = _configuration.GetValue("CacheSettings:ExpirationMinutes", 10); + var cacheOptions = new DistributedCacheEntryOptions { - AbsoluteExpirationRelativeToNow = TimeSpan.FromMinutes(expirationMinutes) + AbsoluteExpirationRelativeToNow = TimeSpan.FromMinutes(_expirationMinutes) }; - + await _cache.SetStringAsync( - cacheKey, - JsonSerializer.Serialize(application), + cacheKey, + JsonSerializer.Serialize(application), cacheOptions, cancellationToken); _logger.LogInformation( - "Кредитная заявка сгенерирована и закэширована: Id={Id}, Тип={Type}, Сумма={Amount}, Статус={Status}", - application.Id, - application.Type, - application.Amount, + "Кредитная заявка сгенерирована и закэширована: Id={Id}, Тип={Type}, Сумма={Amount}, Статус={Status}", + application.Id, + application.Type, + application.Amount, application.Status); return application; @@ -91,25 +92,15 @@ private static CreditApplication GenerateApplication(int id) { if (!_terminalStatuses.Contains(c.Status)) return null; - - var submissionDateTime = c.SubmissionDate.ToDateTime(TimeOnly.MinValue); - var daysAfterSubmission = f.Random.Int(1, 60); - var approvalDateTime = submissionDateTime.AddDays(daysAfterSubmission); - - if (approvalDateTime > DateTime.Now) - approvalDateTime = DateTime.Now; - - return DateOnly.FromDateTime(approvalDateTime); + + return f.Date.BetweenDateOnly(c.SubmissionDate, DateOnly.FromDateTime(DateTime.Today)); }) .RuleFor(c => c.ApprovedAmount, (f, c) => { if (c.Status != "Одобрена") return null; - - var percentage = f.Random.Decimal(0.7m, 1.0m); - var approvedAmount = c.Amount * percentage; - - return Math.Round(approvedAmount, 2); + + return Math.Round(c.Amount * f.Random.Decimal(0.7m, 1.0m), 2); }); return faker.Generate(); diff --git a/CreditApp.AppHost/Program.cs b/CreditApp.AppHost/Program.cs index 670b651..5f78550 100644 --- a/CreditApp.AppHost/Program.cs +++ b/CreditApp.AppHost/Program.cs @@ -1,8 +1,7 @@ -using Aspire.Hosting; - var builder = DistributedApplication.CreateBuilder(args); -var redis = builder.AddRedis("cache"); +var redis = builder.AddRedis("cache") + .WithRedisCommander(); var api = builder.AddProject("creditapp-api") .WithReference(redis) diff --git a/CreditApp.Domain/Entities/CreditApplication.cs b/CreditApp.Domain/Entities/CreditApplication.cs index ca40117..20e32b9 100644 --- a/CreditApp.Domain/Entities/CreditApplication.cs +++ b/CreditApp.Domain/Entities/CreditApplication.cs @@ -1,4 +1,4 @@ -namespace CreditApp.Domain.Entities; +namespace CreditApp.Domain.Entities; /// /// Кредитная заявка @@ -8,11 +8,11 @@ public class CreditApplication /// /// Идентификатор в системе /// - public int Id { get; set; } + public required int Id { get; set; } /// /// Тип кредита /// - public string Type { get; set; } = String.Empty; + public required string Type { get; set; } /// /// Запрашиваемая сумма /// @@ -36,7 +36,7 @@ public class CreditApplication /// /// Статус заявки /// - public string Status { get; set; } = String.Empty; + public required string Status { get; set; } /// /// Дата решения /// From 9c915c19fb28aff469ccd5227c1aec5f5e7a6ff2 Mon Sep 17 00:00:00 2001 From: Ivan K Date: Thu, 19 Feb 2026 20:47:13 +0400 Subject: [PATCH 08/10] =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20?= =?UTF-8?q?=D0=B2=D0=B5=D1=80=D1=81=D0=B8=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Client.Wasm/wwwroot/appsettings.json | 2 +- CreditApp.Api/CreditApp.Api.csproj | 2 +- CreditApp.AppHost/CreditApp.AppHost.csproj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Client.Wasm/wwwroot/appsettings.json b/Client.Wasm/wwwroot/appsettings.json index 3f506eb..839235a 100644 --- a/Client.Wasm/wwwroot/appsettings.json +++ b/Client.Wasm/wwwroot/appsettings.json @@ -6,5 +6,5 @@ } }, "AllowedHosts": "*", - "BaseAddress": "https://localhost:7170/api/credit" + "BaseAddress": "" } \ No newline at end of file diff --git a/CreditApp.Api/CreditApp.Api.csproj b/CreditApp.Api/CreditApp.Api.csproj index 8b0828a..527de1a 100644 --- a/CreditApp.Api/CreditApp.Api.csproj +++ b/CreditApp.Api/CreditApp.Api.csproj @@ -9,7 +9,7 @@ - + diff --git a/CreditApp.AppHost/CreditApp.AppHost.csproj b/CreditApp.AppHost/CreditApp.AppHost.csproj index 8245630..8d2bc5d 100644 --- a/CreditApp.AppHost/CreditApp.AppHost.csproj +++ b/CreditApp.AppHost/CreditApp.AppHost.csproj @@ -1,6 +1,6 @@ - + Exe From 2a542d6b58e1aac6b70f7bebe17f45e5c2fd8893 Mon Sep 17 00:00:00 2001 From: Ivan K Date: Thu, 19 Feb 2026 20:48:42 +0400 Subject: [PATCH 09/10] =?UTF-8?q?=D0=B2=D0=B5=D1=80=D0=BD=D1=83=D0=BB=20ba?= =?UTF-8?q?se=20address?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Client.Wasm/wwwroot/appsettings.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Client.Wasm/wwwroot/appsettings.json b/Client.Wasm/wwwroot/appsettings.json index d1fe7ab..3f506eb 100644 --- a/Client.Wasm/wwwroot/appsettings.json +++ b/Client.Wasm/wwwroot/appsettings.json @@ -6,5 +6,5 @@ } }, "AllowedHosts": "*", - "BaseAddress": "" -} + "BaseAddress": "https://localhost:7170/api/credit" +} \ No newline at end of file From 3737e0cbb514dda9c1146874719858a962267cdb Mon Sep 17 00:00:00 2001 From: Ivan K Date: Thu, 19 Feb 2026 21:23:41 +0400 Subject: [PATCH 10/10] =?UTF-8?q?=D0=BE=D0=B1=D0=B5=D1=80=D0=BD=D1=83?= =?UTF-8?q?=D0=BB=20=D0=BC=D0=B5=D1=82=D0=BE=D0=B4=20=D1=81=D0=B5=D1=80?= =?UTF-8?q?=D0=B2=D0=B8=D1=81=D0=B0=20=D0=B2=20try-catch?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CreditApplicationGeneratorService.cs | 74 ++++++++++--------- 1 file changed, 41 insertions(+), 33 deletions(-) diff --git a/CreditApp.Api/Services/CreditGeneratorService/CreditApplicationGeneratorService.cs b/CreditApp.Api/Services/CreditGeneratorService/CreditApplicationGeneratorService.cs index 104b5e0..f894c30 100644 --- a/CreditApp.Api/Services/CreditGeneratorService/CreditApplicationGeneratorService.cs +++ b/CreditApp.Api/Services/CreditGeneratorService/CreditApplicationGeneratorService.cs @@ -30,48 +30,56 @@ public class CreditApplicationGeneratorService(IDistributedCache _cache, IConfig public async Task GetByIdAsync(int id, CancellationToken cancellationToken = default) { - var cacheKey = $"credit-application-{id}"; - - _logger.LogInformation("Попытка получить заявку {Id} из кэша", id); + try + { + var cacheKey = $"credit-application-{id}"; - var cachedData = await _cache.GetStringAsync(cacheKey, cancellationToken); + _logger.LogInformation("Попытка получить заявку {Id} из кэша", id); - if (!string.IsNullOrEmpty(cachedData)) - { - var deserializedApplication = JsonSerializer.Deserialize(cachedData); + var cachedData = await _cache.GetStringAsync(cacheKey, cancellationToken); - if (deserializedApplication != null) + if (!string.IsNullOrEmpty(cachedData)) { - _logger.LogInformation("Заявка {Id} найдена в кэше", id); - return deserializedApplication; - } + var deserializedApplication = JsonSerializer.Deserialize(cachedData); - _logger.LogWarning("Заявка {Id} найдена в кэше, но не удалось десериализовать. Генерируем новую", id); - } + if (deserializedApplication != null) + { + _logger.LogInformation("Заявка {Id} найдена в кэше", id); + return deserializedApplication; + } - _logger.LogInformation("Заявка {Id} не найдена в кэше, генерируем новую", id); + _logger.LogWarning("Заявка {Id} найдена в кэше, но не удалось десериализовать. Генерируем новую", id); + } + + _logger.LogInformation("Заявка {Id} не найдена в кэше, генерируем новую", id); - var application = GenerateApplication(id); + var application = GenerateApplication(id); - var cacheOptions = new DistributedCacheEntryOptions + var cacheOptions = new DistributedCacheEntryOptions + { + AbsoluteExpirationRelativeToNow = TimeSpan.FromMinutes(_expirationMinutes) + }; + + await _cache.SetStringAsync( + cacheKey, + JsonSerializer.Serialize(application), + cacheOptions, + cancellationToken); + + _logger.LogInformation( + "Кредитная заявка сгенерирована и закэширована: Id={Id}, Тип={Type}, Сумма={Amount}, Статус={Status}", + application.Id, + application.Type, + application.Amount, + application.Status); + + return application; + } + catch (Exception ex) { - AbsoluteExpirationRelativeToNow = TimeSpan.FromMinutes(_expirationMinutes) - }; - - await _cache.SetStringAsync( - cacheKey, - JsonSerializer.Serialize(application), - cacheOptions, - cancellationToken); - - _logger.LogInformation( - "Кредитная заявка сгенерирована и закэширована: Id={Id}, Тип={Type}, Сумма={Amount}, Статус={Status}", - application.Id, - application.Type, - application.Amount, - application.Status); - - return application; + _logger.LogError(ex, "Ошибка при получении/генерации заявки {Id}", id); + throw; + } } ///