Котлярский Вадим. Лаб 1. Группа 6512

Client.Wasm/Components/DataCard.razor

@@ -4,7 +4,7 @@
 <CardDeck>
     <Card>
         <CardHeader>
-            <Heading Size="HeadingSize.Is5"><Icon Name="IconName.Table" />  Характеристики текущего объекта</Heading>
+            <Heading Size="HeadingSize.Is5"><Icon Name="IconName.Table" />  Характеристики медицинского пациента</Heading>
         </CardHeader>
         <CardBody>
             <Table Bordered >
@@ -26,13 +26,12 @@
                     }
                     else
                     {
-                        var array = Value.ToArray();
-                        foreach (var property in array)
+                        foreach (var property in GetDisplayRows())
                         {
                             <TableRow>
-                                <TableRowCell>@(Array.IndexOf(array, property)+1)</TableRowCell>
-                                <TableRowCell>@property.Key</TableRowCell>
-                                <TableRowCell>@property.Value?.ToString()</TableRowCell>
+                                <TableRowCell>@property.Number</TableRowCell>
+                                <TableRowCell>@property.Title</TableRowCell>
+                                <TableRowCell>@property.Value</TableRowCell>
                             </TableRow>
                         }
                     }
@@ -43,12 +42,12 @@
 
     <Card Margin="Margin.Is3.OnY">
         <CardHeader>
-            <Heading Size="HeadingSize.Is5"><Icon Name="IconName.Send" />  Запросить новый объект</Heading>
+            <Heading Size="HeadingSize.Is5"><Icon Name="IconName.Send" />  Запросить нового пациента</Heading>
         </CardHeader>
         <CardBody>
             <Row>
                 <Column ColumnSize="ColumnSize.Is4">
-                    <Text>Идентификатор нового объекта:</Text>
+                    <Text>Идентификатор пациента:</Text>
                 </Column>
                 <Column ColumnSize="ColumnSize.Is4">
                     <NumericEdit TValue="int" @bind-Value="@Id"/>
@@ -65,10 +64,72 @@
     private JsonObject? Value { get; set; }
     private int Id { get; set; }
 
+    private static readonly (string Key, string Title)[] PropertyOrder =
+    [
+        ("id", "Идентификатор в системе"),
+        ("fullName", "ФИО пациента"),
+        ("address", "Адрес проживания"),
+        ("birthDate", "Дата рождения"),
+        ("height", "Рост"),
+        ("weight", "Вес"),
+        ("bloodGroup", "Группа крови"),
+        ("rhFactor", "Резус-фактор"),
+        ("lastExaminationDate", "Дата последнего осмотра"),
+        ("isVaccinated", "Отметка о вакцинации")
+    ];
+
     private async Task RequestNewData()
     {
         var baseAddress = Configuration["BaseAddress"] ?? throw new KeyNotFoundException("Конфигурация клиента не содержит параметра BaseAddress");
         Value = await Client.GetFromJsonAsync<JsonObject>($"{baseAddress}?id={Id}", new JsonSerializerOptions { });
         StateHasChanged();
     }
+
+    private IEnumerable<(int Number, string Title, string Value)> GetDisplayRows()
+    {
+        if (Value is null)
+        {
+            yield break;
+        }
+
+        for (var i = 0; i < PropertyOrder.Length; i++)
+        {
+            var (key, title) = PropertyOrder[i];
+            var rawValue = Value[key];
+            yield return (i + 1, title, FormatValue(rawValue));
+        }
+    }
+
+    private static string FormatValue(JsonNode? node)
+    {
+        if (node is null)
+        {
+            return "нет данных";
+        }
+
+        if (node is JsonValue value)
+        {
+            if (value.TryGetValue<bool>(out var boolValue))
+            {
+                return boolValue ? "Да" : "Нет";
+            }
+
+            if (value.TryGetValue<double>(out var doubleValue))
+            {
+                return doubleValue.ToString("0.00");
+            }
+
+            if (value.TryGetValue<int>(out var intValue))
+            {
+                return intValue.ToString();
+            }
+
+            if (value.TryGetValue<string>(out var stringValue))
+            {
+                return stringValue;
+            }
+        }
+
+        return node.ToJsonString();
+    }
 }

Client.Wasm/Components/StudentCard.razor

@@ -4,10 +4,13 @@
     </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>"Медицинский пациент"</Strong></UnorderedListItem>
+            <UnorderedListItem>Балансировка <Strong>Weighted Random</Strong></UnorderedListItem>
+            <UnorderedListItem>Брокер <Strong>SNS</Strong></UnorderedListItem>
+            <UnorderedListItem>Хранилище <Strong>Minio</Strong></UnorderedListItem>
+            <UnorderedListItem>Выполнена <Strong>Котлряским Вадимом 6512</Strong> </UnorderedListItem>
+
         </UnorderedList>
     </CardBody>
 </Card>

Client.Wasm/wwwroot/appsettings.json

@@ -6,5 +6,5 @@
     }
   },
   "AllowedHosts": "*",
-  "BaseAddress": ""
+  "BaseAddress": "http://localhost:5179/api/patient"
 }

CloudDevelopment.sln

@@ -1,10 +1,17 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
-VisualStudioVersion = 17.14.36811.4
+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}") = "ProjectApp.Api", "ProjectApp.Api\ProjectApp.Api.csproj", "{E7D4CA8B-53EA-9676-D96D-BE2F0CB11054}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProjectApp.Domain", "ProjectApp.Domain\ProjectApp.Domain.csproj", "{CC5A9873-4CC3-4B71-83AF-E4FD09F7B1AD}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProjectApp.ServiceDefaults", "ProjectApp.ServiceDefaults\ProjectApp.ServiceDefaults.csproj", "{B2C3D4E5-F6A7-8901-BCDE-F12345678901}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProjectApp.AppHost", "ProjectApp.AppHost\ProjectApp.AppHost.csproj", "{2A5FB573-9376-4FEB-9289-A8387F435C13}"
+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
+		{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
+		{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

ProjectApp.Api/Controllers/PatientController.cs

@@ -0,0 +1,25 @@
+using Microsoft.AspNetCore.Mvc;
+using ProjectApp.Api.Services.ProjectGeneratorService;
+using ProjectApp.Domain.Entities;
+
+namespace ProjectApp.Api.Controllers;
+
+[Route("api/[controller]")]
+[ApiController]
+public class PatientController(
+    IMedicalPatientGeneratorService generatorService,
+    ILogger<PatientController> logger) : ControllerBase
+{
+    /// <summary>
+    /// Получить медицинского пациента по ID, если не найден в кэше, сгенерировать нового
+    /// </summary>
+    [HttpGet]
+    public async Task<ActionResult<MedicalPatient>> GetById([FromQuery] int id, CancellationToken cancellationToken)
+    {
+        logger.LogInformation("Received request to retrieve/generate patient {Id}", id);
+
+        var patient = await generatorService.GetByIdAsync(id, cancellationToken);
+
+        return Ok(patient);
+    }
+}

ProjectApp.Api/Program.cs

@@ -0,0 +1,59 @@
+using ProjectApp.Api.Services.ProjectGeneratorService;
+using ProjectApp.ServiceDefaults;
+
+var builder = WebApplication.CreateBuilder(args);
+
+builder.AddServiceDefaults();
+
+builder.AddRedisDistributedCache("cache");
+
+builder.Services.AddCors(options =>
+{
+    options.AddDefaultPolicy(policy =>
+    {
+        policy.WithOrigins("http://localhost:5127")
+              .WithMethods("GET")
+              .WithHeaders("Content-Type");
+    });
+});
+
+builder.Services.AddScoped<MedicalPatientGenerator>();
+builder.Services.AddScoped<IMedicalPatientGeneratorService, MedicalPatientGeneratorService>();
+
+builder.Services.AddControllers();
+builder.Services.AddEndpointsApiExplorer();
+builder.Services.AddSwaggerGen(options =>
+{
+    options.SwaggerDoc("v1", new Microsoft.OpenApi.OpenApiInfo
+    {
+        Title = "Medical Patient Generator 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, "ProjectApp.Domain.xml");
+    if (File.Exists(domainXmlPath))
+    {
+        options.IncludeXmlComments(domainXmlPath);
+    }
+});
+
+var app = builder.Build();
+
+if (app.Environment.IsDevelopment())
+{
+    app.UseSwagger();
+    app.UseSwaggerUI();
+}
+
+app.UseHttpsRedirection();
+app.UseCors();
+app.MapControllers();
+app.MapDefaultEndpoints();
+
+app.Run();

ProjectApp.Api/ProjectApp.Api.csproj

@@ -0,0 +1,23 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <NoWarn>$(NoWarn);1591</NoWarn>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Aspire.StackExchange.Redis.DistributedCaching" Version="9.5.2" />
+    <PackageReference Include="Bogus" Version="35.6.5" />
+    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.24" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="10.1.4" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\ProjectApp.Domain\ProjectApp.Domain.csproj" />
+    <ProjectReference Include="..\ProjectApp.ServiceDefaults\ProjectApp.ServiceDefaults.csproj" />
+  </ItemGroup>
+
+</Project>

ProjectApp.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:7170;http://localhost:5179",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": true,
+      "launchUrl": "swagger",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    }
+  }
+}

ProjectApp.Api/Services/ProjectGeneratorService/IMedicalPatientGeneratorService.cs

@@ -0,0 +1,11 @@
+using ProjectApp.Domain.Entities;
+
+namespace ProjectApp.Api.Services.ProjectGeneratorService;
+
+/// <summary>
+/// Сервис получения медицинского пациента
+/// </summary>
+public interface IMedicalPatientGeneratorService
+{
+    public Task<MedicalPatient> GetByIdAsync(int id, CancellationToken cancellationToken = default);
+}