Челаев Петр Лаб. 1 Группа 6512

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>№35 "Программный проект"</Strong></UnorderedListItem>
+            <UnorderedListItem>Выполнена <Strong>Челаевым Петром 6512</Strong> </UnorderedListItem>
+            <UnorderedListItem><Link To="https://github.com/PripyatskyPrometheus/cloud-development">Ссылка на форк</Link></UnorderedListItem>
         </UnorderedList>
     </CardBody>
 </Card>

Client.Wasm/wwwroot/appsettings.json

@@ -6,5 +6,5 @@
     }
   },
   "AllowedHosts": "*",
-  "BaseAddress": ""
+  "BaseAddress": "https://localhost:7190/api/projects"
 }

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}") = "ProgramProject.AppHost", "ProgramProject.AppHost\ProgramProject.AppHost.csproj", "{7FA94C9A-CD2C-4D76-A42C-5C0EEDC6D68D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProgramProject.ServiceDefaults", "ProgramProject.ServiceDefaults\ProgramProject.ServiceDefaults.csproj", "{213F5ADB-6769-02BA-8BFA-17C924D27341}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProgramProject.GenerationService", "ProgramProject.GenerationService\ProgramProject.GenerationService.csproj", "{66DBD8A2-6672-889D-9A17-D156226DCB66}"
+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
+		{7FA94C9A-CD2C-4D76-A42C-5C0EEDC6D68D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7FA94C9A-CD2C-4D76-A42C-5C0EEDC6D68D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7FA94C9A-CD2C-4D76-A42C-5C0EEDC6D68D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7FA94C9A-CD2C-4D76-A42C-5C0EEDC6D68D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{213F5ADB-6769-02BA-8BFA-17C924D27341}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{213F5ADB-6769-02BA-8BFA-17C924D27341}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{213F5ADB-6769-02BA-8BFA-17C924D27341}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{213F5ADB-6769-02BA-8BFA-17C924D27341}.Release|Any CPU.Build.0 = Release|Any CPU
+		{66DBD8A2-6672-889D-9A17-D156226DCB66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{66DBD8A2-6672-889D-9A17-D156226DCB66}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{66DBD8A2-6672-889D-9A17-D156226DCB66}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{66DBD8A2-6672-889D-9A17-D156226DCB66}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

ProgramProject.AppHost/AppHost.cs

@@ -0,0 +1,15 @@
+var builder = DistributedApplication.CreateBuilder(args);
+
+var cache = builder.AddRedis("cache");
+
+var generationService = builder.AddProject<Projects.ProgramProject_GenerationService>("generation-service")
+    .WithExternalHttpEndpoints()
+    .WithReference(cache)
+    .WaitFor(cache);
+
+// ������� �������
+var client = builder.AddProject<Projects.Client_Wasm>("client-wasm")
+    .WithExternalHttpEndpoints()
+    .WithReference(generationService);
+
+builder.Build().Run();

ProgramProject.AppHost/ProgramProject.AppHost.csproj

@@ -0,0 +1,24 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <Sdk Name="Aspire.AppHost.Sdk" Version="9.3.1" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <UserSecretsId>f95b6f17-c3f7-4ae5-a722-409a54dda80d</UserSecretsId>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Client.Wasm\Client.Wasm.csproj" />
+    <ProjectReference Include="..\ProgramProject.GenerationService\ProgramProject.GenerationService.csproj" />
+    <ProjectReference Include="..\ProgramProject.ServiceDefaults\ProgramProject.ServiceDefaults.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Aspire.Hosting.AppHost" Version="13.1.1" />
+    <PackageReference Include="Aspire.Hosting.Redis" Version="13.1.1" />
+  </ItemGroup>
+
+</Project>

ProgramProject.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:17028;http://localhost:15016",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development",
+        "DOTNET_ENVIRONMENT": "Development",
+        "ASPIRE_DASHBOARD_OTLP_ENDPOINT_URL": "https://localhost:21209",
+        "ASPIRE_RESOURCE_SERVICE_ENDPOINT_URL": "https://localhost:22094"
+      }
+    },
+    "http": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": true,
+      "applicationUrl": "http://localhost:15016",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development",
+        "DOTNET_ENVIRONMENT": "Development",
+        "ASPIRE_DASHBOARD_OTLP_ENDPOINT_URL": "http://localhost:19079",
+        "ASPIRE_RESOURCE_SERVICE_ENDPOINT_URL": "http://localhost:20183"
+      }
+    }
+  }
+}

ProgramProject.AppHost/appsettings.Development.json

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

ProgramProject.AppHost/appsettings.json

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

ProgramProject.GenerationService/Controllers/ProjectsController.cs

@@ -0,0 +1,80 @@
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Caching.Distributed;
+using ProgramProject.GenerationService.Generator;
+using ProgramProject.GenerationService.Models;
+using System.Text.Json;
+
+namespace ProgramProject.GenerationService.Controllers;
+
+[Route("api/[controller]")]
+[ApiController]
+public class ProjectsController : ControllerBase
+{
+    private readonly IDistributedCache _cache;
+    private readonly ProgramProjectFaker _faker;
+    private readonly ILogger<ProjectsController> _logger;
+
+    public ProjectsController(
+        IDistributedCache cache,
+        ProgramProjectFaker faker,
+        ILogger<ProjectsController> logger)
+    {
+        _cache = cache;
+        _faker = faker;
+        _logger = logger;
+    }
+
+
+    [HttpGet]
+    public async Task<ActionResult<ProgramProjectModel>> GetProjects(
+        [FromQuery] int? id,
+        [FromQuery] int count = 5)
+    {
+        // Если передан id - возвращаем ОДИН объект
+        if (id.HasValue)
+        {
+            var cacheKey = $"project:{id.Value}";
+
+            _logger.LogInformation("Запрос проекта с ID {ProjectId} через query. Проверка кэша...", id);
+
+            var cachedBytes = await _cache.GetAsync(cacheKey);
+
+            if (cachedBytes != null)
+            {
+                var cachedProject = JsonSerializer.Deserialize<ProgramProjectModel>(cachedBytes);
+                _logger.LogInformation("Проект с ID {ProjectId} найден в кэше", id);
+                return Ok(cachedProject);
+            }
+
+            _logger.LogInformation("Проект с ID {ProjectId} не найден в кэше. Генерируем новый", id);
+
+            var newProject = _faker.Generate();
+            newProject.Id = id.Value;
+
+            var options = new DistributedCacheEntryOptions()
+                .SetAbsoluteExpiration(TimeSpan.FromMinutes(5));
+
+            var serializedProject = JsonSerializer.SerializeToUtf8Bytes(newProject);
+            await _cache.SetAsync(cacheKey, serializedProject, options);
+
+            _logger.LogInformation("Проект с ID {ProjectId} сгенерирован и сохранён в кэш", id);
+
+            return Ok(newProject);
+        }
+
+        // Если id не передан - возвращаем список проектов
+        if (count < 1 || count > 20)
+        {
+            return BadRequest("Количество проектов должно быть от 1 до 20");
+        }
+
+        var projects = _faker.Generate(count);
+        return Ok(projects);
+    }
+
+    [HttpGet("{id}")]
+    public async Task<ActionResult<ProgramProjectModel>> GetProject(int id)
+    {
+        return await GetProjects(id);
+    }
+}

ProgramProject.GenerationService/Generator/ProgramProjectFaker.cs

@@ -0,0 +1,105 @@
+using Bogus;
+using ProgramProject.GenerationService.Models;
+
+namespace ProgramProject.GenerationService.Generator;
+
+public class ProgramProjectFaker
+{
+    private readonly Faker<ProgramProjectModel> _faker;
+
+    public ProgramProjectFaker()
+    {
+        _faker = new Faker<ProgramProjectModel>("ru")
+            .RuleFor(p => p.Id, f => f.IndexVariable++)
+
+            /// <summary>
+            /// Название проекта: комбинация из Commerce, Hacker, Finance, Lorem
+            /// </summary>
+            .RuleFor(p => p.Name, f =>
+                f.PickRandom(new[]
+                {
+                    f.Commerce.ProductName() + " " + f.Hacker.Abbreviation(),
+                    "Project " + f.Hacker.Noun(),
+                    f.Finance.AccountName() + " System",
+                    f.Lorem.Word() + "-" + f.Lorem.Word()
+                }))
+
+            /// <summary>
+            /// Заказчик — компания
+            /// </summary>
+            .RuleFor(p => p.Customer, f => f.Company.CompanyName())
+
+            /// <summary>
+            /// Менеджер проекта — полное имя
+            /// </summary>
+            .RuleFor(p => p.Manager, f => f.Name.FullName())
+
+            /// <summary>
+            /// Дата начала
+            /// </summary>
+            .RuleFor(p => p.StartDate, f =>
+            {
+                var start = f.Date.Past(5);
+                return DateOnly.FromDateTime(start);
+            })
+
+            /// <summary>
+            /// Плановая дата завершения: позже даты начала
+            /// </summary>
+            .RuleFor(p => p.PlannedEndDate, (f, p) =>
+            {
+                var planned = f.Date.Soon(180, p.StartDate.ToDateTime(TimeOnly.MinValue));
+                return DateOnly.FromDateTime(planned);
+            })
+
+            /// <summary>
+            /// Бюджет: от 10k до 1M
+            /// </summary>
+            .RuleFor(p => p.Budget, f => f.Finance.Amount(10000, 1000000, 2))
+
+            /// <summary>
+            /// Процент выполнения: от 0 до 100
+            /// </summary>
+            .RuleFor(p => p.CompletionPercentage, f => f.Random.Int(0, 100))
+
+            /// <summary>
+            /// Фактические затраты: пропорциональны бюджету (50-120%)
+            /// </summary>
+            .RuleFor(p => p.ActualCost, (f, p) =>
+                f.Finance.Amount(p.Budget * 0.5m, p.Budget * 1.2m, 2))
+
+            /// <summary>
+            /// Фактическая дата завершения: заполняется только если процент = 100
+            /// </summary>
+            .RuleFor(p => p.ActualEndDate, (f, p) =>
+            {
+                if (p.CompletionPercentage == 100)
+                {
+                    var actual = f.Date.Recent(30);
+                    return DateOnly.FromDateTime(actual);
+                }
+                return null;
+            })
+
+            /// <summary>
+            /// Финальная корректировка: если есть ActualEndDate, процент должен быть 100
+            /// </summary>
+            .FinishWith((f, p) =>
+            {
+                if (p.ActualEndDate.HasValue)
+                {
+                    p.CompletionPercentage = 100;
+                }
+            });
+    }
+
+    public ProgramProjectModel Generate()
+    {
+        return _faker.Generate();
+    }
+
+    public List<ProgramProjectModel> Generate(int count)
+    {
+        return _faker.Generate(count);
+    }
+}

ProgramProject.GenerationService/Models/ProgramProjectModel.cs

@@ -0,0 +1,48 @@
+namespace ProgramProject.GenerationService.Models;
+
+/// <summary>
+/// Модель программного проекта
+/// </summary>
+public class ProgramProjectModel
+{
+    /// <summary>
+    /// Идетификатор в системе
+    /// </summary>
+    public int Id { get; set; }
+    /// <summary>
+    /// Название проекта
+    /// </summary>
+    public string Name { get; set; } = string.Empty;
+    /// <summary>
+    /// Заказчик проекта
+    /// </summary>
+    public string Customer { get; set; } = string.Empty;
+    /// <summary>
+    /// Мененджер проекта
+    /// </summary>
+    public string Manager { get; set; } = string.Empty;
+    /// <summary>
+    /// Дата начала
+    /// </summary>
+    public DateOnly StartDate { get; set; }
+    /// <summary>
+    /// Плановая дата завершения
+    /// </summary>
+    public DateOnly PlannedEndDate { get; set; }
+    /// <summary>
+    /// Фактическая дата завершения
+    /// </summary>
+    public DateOnly? ActualEndDate { get; set; }
+    /// <summary>
+    /// Бюджет
+    /// </summary>
+    public decimal Budget {  get; set; }
+    /// <summary>
+    /// Фактические затраты
+    /// </summary>
+    public decimal ActualCost { get; set; }
+    /// <summary>
+    /// Процент выполнения
+    /// </summary>
+    public int CompletionPercentage { get; set; }
+}