Кадников Егор Лаб. 1 Группа 6513

Client.Wasm/Components/StudentCard.razor

@@ -4,10 +4,10 @@
     </CardHeader>
     <CardBody>
         <UnorderedList Unstyled>
-            <UnorderedListItem>Номер <Strong>№X "Название лабораторной"</Strong></UnorderedListItem>
-            <UnorderedListItem>Вариант <Strong>№Х "Название варианта"</Strong></UnorderedListItem>
-            <UnorderedListItem>Выполнена <Strong>Фамилией Именем 65ХХ</Strong> </UnorderedListItem>
-            <UnorderedListItem><Link To="https://puginarug.com/">Ссылка на форк</Link></UnorderedListItem>
+            <UnorderedListItem>Номер <Strong>№1 "«Кэширование» - Реализация сервиса генерации контрактов, кэширование его ответов"</Strong></UnorderedListItem>
+            <UnorderedListItem>Вариант <Strong>№41 "Кредитная заявка    "</Strong></UnorderedListItem>
+            <UnorderedListItem>Выполнена <Strong>Кадниковым Егором 6513</Strong> </UnorderedListItem>
+            <UnorderedListItem><Link To="https://github.com/acebiscuits/cloud-development">Ссылка на форк</Link></UnorderedListItem>
         </UnorderedList>
     </CardBody>
 </Card>

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"
 }

CloudDevelopment.AppHost/AppHost.cs

@@ -0,0 +1,16 @@
+using Projects;
+
+var builder = DistributedApplication.CreateBuilder(args);
+
+var cache = builder.AddRedis("credit-order-cache")
+    .WithRedisInsight(containerName: "credit-order-insight");
+
+var generator = builder.AddProject<Projects.Generator>("generator")
+    .WithReference(cache, "RedisCache")
+    .WaitFor(cache);
+
+var client = builder.AddProject<Projects.Client_Wasm>("credit-order-wasm")
+    .WithReference(generator)
+    .WaitFor(generator);
+
+builder.Build().Run();

CloudDevelopment.AppHost/CloudDevelopment.AppHost.csproj

@@ -0,0 +1,23 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <Sdk Name="Aspire.AppHost.Sdk" Version="9.5.0" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <UserSecretsId>2f419979-4dcb-43a3-bf86-3b5579f994b9</UserSecretsId>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Aspire.Hosting.AppHost" Version="9.5.0" />
+    <PackageReference Include="Aspire.Hosting.Redis" Version="9.5.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Generator\Generator.csproj" />
+	<ProjectReference Include="..\Client.Wasm\Client.Wasm.csproj" />
+  </ItemGroup>
+
+</Project>

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"
+      }
+    }
+  }
+}

CloudDevelopment.AppHost/appsettings.Development.json

@@ -0,0 +1,8 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  }
+}

CloudDevelopment.AppHost/appsettings.json

@@ -0,0 +1,9 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning",
+      "Aspire.Hosting.Dcp": "Warning"
+    }
+  }
+}

CloudDevelopment.ServiceDefaults/CloudDevelopment.ServiceDefaults.csproj

@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <IsAspireSharedProject>true</IsAspireSharedProject>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <FrameworkReference Include="Microsoft.AspNetCore.App" />
+
+    <PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="9.9.0" />
+    <PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="9.5.0" />
+    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.9.0" />
+    <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.9.0" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.9.0" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.9.0" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.9.0" />
+  </ItemGroup>
+
+</Project>

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<TBuilder>(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<ServiceDiscoveryOptions>(options =>
+        // {
+        //     options.AllowedSchemes = ["https"];
+        // });
+
+        return builder;
+    }
+
+    public static TBuilder ConfigureOpenTelemetry<TBuilder>(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<TBuilder>(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<TBuilder>(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;
+    }
+}

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

Generator/Controllers/CreditOrderController.cs

@@ -0,0 +1,37 @@
+using Generator.Dto;
+using Generator.Services;
+using Microsoft.AspNetCore.Mvc;
+
+namespace Generator.Controllers;
+
+/// <summary>
+/// HTTP API для получения кредитной заявки по идентификатору.
+/// Использует <see cref="Services.CreditOrderService"/> для получения данных (кэш + генерация).
+/// </summary>
+[ApiController]
+[Route("credit-orders")]
+public class CreditOrderController (
+    CreditOrderService service,
+    ILogger<CreditOrderController> logger
+    ) : ControllerBase
+{
+
+    /// <summary>
+    /// Возвращает кредитную заявку по <paramref name="id"/> из query string.
+    /// </summary>
+    /// <param name="id">Идентификатор заявки (должен быть больше 0).</param>
+    /// <param name="ct">Токен отмены запроса.</param>
+    /// <returns>DTO кредитной заявки.</returns>
+    /// <response code="200">Заявка успешно получена.</response>
+    /// <response code="400">Некорректный идентификатор (id &lt;= 0).</response>
+    [HttpGet]
+    public async Task<ActionResult<CreditOrderDto>> Get([FromQuery] int id, CancellationToken ct)
+    {
+        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);
+    }
+}

Generator/Dto/CreditOrderDto.cs

@@ -0,0 +1,41 @@
+namespace Generator.Dto;
+
+/// <summary>
+/// DTO кредитной заявки, возвращаемый HTTP API.
+/// </summary>
+public class CreditOrderDto
+{
+    /// <summary>Идентификатор заявки.</summary>
+    public int Id { get; set; }
+
+    /// <summary>Тип кредита (например: Потребительский, Ипотека).</summary>
+    public string CreditType { get; set; } = "";
+
+    /// <summary>Запрошенная сумма кредита.</summary>
+    public decimal RequestedSum { get; set; }
+
+    /// <summary>Срок кредита в месяцах.</summary>
+    public int MonthsDuration { get; set; }
+
+    /// <summary>Процентная ставка (годовых).</summary>
+    public double InterestRate { get; set; }
+
+    /// <summary>Дата подачи заявки.</summary>
+    public DateOnly FilingDate { get; set; }
+
+    /// <summary>Признак необходимости страховки.</summary>
+    public bool IsInsuranceNeeded { get; set; }
+
+    /// <summary>Статус заявки: Новая / В обработке / Одобрена / Отклонена.</summary>
+    public string OrderStatus { get; set; } = "";
+
+    /// <summary>
+    /// Дата принятия решения. Заполняется только для конечных статусов (например, Одобрена/Отклонена).
+    /// </summary>
+    public DateOnly? DecisionDate { get; set; }
+
+    /// <summary>
+    /// Одобренная сумма. Заполняется только при статусе "Одобрена".
+    /// </summary>
+    public decimal? ApprovedSum { get; set; }
+}