diff --git a/Client.Wasm/Components/StudentCard.razor b/Client.Wasm/Components/StudentCard.razor index 661f118..0efe9bf 100644 --- a/Client.Wasm/Components/StudentCard.razor +++ b/Client.Wasm/Components/StudentCard.razor @@ -1,13 +1,13 @@ - + Лабораторная работа - Номер №X "Название лабораторной" - Вариант №Х "Название варианта" - Выполнена Фамилией Именем 65ХХ - Ссылка на форк + Номер №2 "Балансировка" + Вариант №35 "Программный проект" + Выполнена Челаевым Петром 6512 + Ссылка на форк - + \ No newline at end of file diff --git a/Client.Wasm/wwwroot/appsettings.json b/Client.Wasm/wwwroot/appsettings.json index d1fe7ab..b598070 100644 --- a/Client.Wasm/wwwroot/appsettings.json +++ b/Client.Wasm/wwwroot/appsettings.json @@ -6,5 +6,5 @@ } }, "AllowedHosts": "*", - "BaseAddress": "" + "BaseAddress": "https://localhost:7190/api/projects" } diff --git a/CloudDevelopment.sln b/CloudDevelopment.sln index cb48241..c6acc42 100644 --- a/CloudDevelopment.sln +++ b/CloudDevelopment.sln @@ -5,6 +5,14 @@ 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 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProgramProject.Gateway", "ProgramProject.Gateway\ProgramProject.Gateway.csproj", "{0C26CAD8-F259-19D3-8E5B-FB32D481F591}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -15,6 +23,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 + {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 + {0C26CAD8-F259-19D3-8E5B-FB32D481F591}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0C26CAD8-F259-19D3-8E5B-FB32D481F591}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0C26CAD8-F259-19D3-8E5B-FB32D481F591}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0C26CAD8-F259-19D3-8E5B-FB32D481F591}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/ProgramProject.AppHost/AppHost.cs b/ProgramProject.AppHost/AppHost.cs new file mode 100644 index 0000000..5e2af48 --- /dev/null +++ b/ProgramProject.AppHost/AppHost.cs @@ -0,0 +1,23 @@ +var builder = DistributedApplication.CreateBuilder(args); + +var cache = builder.AddRedis("cache").WithRedisCommander(); + +// Сервис генерации теперь делится на 3 реплики +var generationService = builder.AddProject("generation-service") + .WithExternalHttpEndpoints() + .WithReference(cache) + .WaitFor(cache) + .WithReplicas(3); + +// Шлюз +var gateway = builder.AddProject("gateway") + .WithExternalHttpEndpoints() + .WithReference(generationService); + +// Клиент теперь связывается с генератором через шлюз +var client = builder.AddProject("client-wasm") + .WithExternalHttpEndpoints() + .WithReference(gateway) + .WaitFor(gateway); + +builder.Build().Run(); \ No newline at end of file diff --git a/ProgramProject.AppHost/ProgramProject.AppHost.csproj b/ProgramProject.AppHost/ProgramProject.AppHost.csproj new file mode 100644 index 0000000..ee87d83 --- /dev/null +++ b/ProgramProject.AppHost/ProgramProject.AppHost.csproj @@ -0,0 +1,24 @@ + + + + + + Exe + net8.0 + enable + enable + f95b6f17-c3f7-4ae5-a722-409a54dda80d + + + + + + + + + + + + + + diff --git a/ProgramProject.AppHost/Properties/launchSettings.json b/ProgramProject.AppHost/Properties/launchSettings.json new file mode 100644 index 0000000..9e7ac03 --- /dev/null +++ b/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" + } + } + } +} diff --git a/ProgramProject.AppHost/appsettings.Development.json b/ProgramProject.AppHost/appsettings.Development.json new file mode 100644 index 0000000..0c208ae --- /dev/null +++ b/ProgramProject.AppHost/appsettings.Development.json @@ -0,0 +1,8 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning" + } + } +} diff --git a/ProgramProject.AppHost/appsettings.json b/ProgramProject.AppHost/appsettings.json new file mode 100644 index 0000000..31c092a --- /dev/null +++ b/ProgramProject.AppHost/appsettings.json @@ -0,0 +1,9 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning", + "Aspire.Hosting.Dcp": "Warning" + } + } +} diff --git a/ProgramProject.Gateway/.filenesting.json b/ProgramProject.Gateway/.filenesting.json new file mode 100644 index 0000000..0b71966 --- /dev/null +++ b/ProgramProject.Gateway/.filenesting.json @@ -0,0 +1,3 @@ +{ + "help":"https://go.microsoft.com/fwlink/?linkid=866610" +} \ No newline at end of file diff --git a/ProgramProject.Gateway/LoadBalancers/QueryBasedLoadBalancer.cs b/ProgramProject.Gateway/LoadBalancers/QueryBasedLoadBalancer.cs new file mode 100644 index 0000000..f8e1f28 --- /dev/null +++ b/ProgramProject.Gateway/LoadBalancers/QueryBasedLoadBalancer.cs @@ -0,0 +1,47 @@ +using Ocelot.LoadBalancer.Interfaces; +using Ocelot.Responses; +using Ocelot.Values; + +namespace ProgramProject.Gateway.LoadBalancers; + +/// +/// Балансировщик для алгоритма Query Based +/// +public class QueryBasedLoadBalancer : ILoadBalancer +{ + private readonly List _services; + private readonly ILogger _logger; + private readonly string _queryParameterName; + + public QueryBasedLoadBalancer(List services, ILogger logger, string queryParameterName = "id") + { + _services = services; + _logger = logger; + _queryParameterName = queryParameterName; + } + + public string Type => nameof(QueryBasedLoadBalancer); + + public async Task> LeaseAsync(HttpContext httpContext) + { + var idValue = ExtractIdFromQuery(httpContext); + var replicaIndex = Math.Abs(idValue) % _services.Count; + var selectedService = _services[replicaIndex]; + + _logger.LogInformation("Запрос с id={Id} направлен на реплику {Index}", idValue, replicaIndex); + + return new OkResponse(selectedService.HostAndPort); + } + + private int ExtractIdFromQuery(HttpContext context) + { + if (context.Request.Query.TryGetValue(_queryParameterName, out var idString)) + { + if (int.TryParse(idString, out var id)) + return id; + } + return 0; + } + + public void Release(ServiceHostAndPort hostAndPort) { } +} \ No newline at end of file diff --git a/ProgramProject.Gateway/Program.cs b/ProgramProject.Gateway/Program.cs new file mode 100644 index 0000000..e5f094f --- /dev/null +++ b/ProgramProject.Gateway/Program.cs @@ -0,0 +1,32 @@ +using Ocelot.DependencyInjection; +using Ocelot.Middleware; +using Ocelot.Provider.Kubernetes; +using ProgramProject.Gateway.LoadBalancers; + +var builder = WebApplication.CreateBuilder(args); + +// Добавляем конфигурацию с Ocelot +builder.Configuration.AddJsonFile("ocelot.json", optional: false, reloadOnChange: true); + +// Регистрируем балансировщик +builder.Services.AddOcelot() + .AddKubernetes() // провайдер, с которым всё запускается + .AddCustomLoadBalancer((serviceProvider, route, serviceDiscoveryProvider) => + { + var logger = serviceProvider.GetRequiredService>(); + var services = serviceDiscoveryProvider.GetAsync().GetAwaiter().GetResult().ToList(); + + var queryParameterName = route.LoadBalancerOptions?.Key ?? "id"; + + return new QueryBasedLoadBalancer(services, logger, queryParameterName); + }); + +// Добавляем Service Discovery +builder.Services.AddServiceDiscovery(); + +var app = builder.Build(); + +// Обрабатываем все входящие запросы с помощью Ocelot +await app.UseOcelot(); + +app.Run(); \ No newline at end of file diff --git a/ProgramProject.Gateway/ProgramProject.Gateway.csproj b/ProgramProject.Gateway/ProgramProject.Gateway.csproj new file mode 100644 index 0000000..064877b --- /dev/null +++ b/ProgramProject.Gateway/ProgramProject.Gateway.csproj @@ -0,0 +1,20 @@ + + + + net8.0 + enable + enable + + + + + + + + + + + + + + diff --git a/ProgramProject.Gateway/Properties/launchSettings.json b/ProgramProject.Gateway/Properties/launchSettings.json new file mode 100644 index 0000000..20dfc15 --- /dev/null +++ b/ProgramProject.Gateway/Properties/launchSettings.json @@ -0,0 +1,41 @@ +{ + "$schema": "http://json.schemastore.org/launchsettings.json", + "iisSettings": { + "windowsAuthentication": false, + "anonymousAuthentication": true, + "iisExpress": { + "applicationUrl": "http://localhost:37101", + "sslPort": 44300 + } + }, + "profiles": { + "http": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": true, + "launchUrl": "swagger", + "applicationUrl": "http://localhost:5232", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + }, + "https": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": true, + "launchUrl": "swagger", + "applicationUrl": "https://localhost:7088;http://localhost:5232", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + }, + "IIS Express": { + "commandName": "IISExpress", + "launchBrowser": true, + "launchUrl": "swagger", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + } + } +} diff --git a/ProgramProject.Gateway/appsettings.Development.json b/ProgramProject.Gateway/appsettings.Development.json new file mode 100644 index 0000000..0c208ae --- /dev/null +++ b/ProgramProject.Gateway/appsettings.Development.json @@ -0,0 +1,8 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning" + } + } +} diff --git a/ProgramProject.Gateway/appsettings.json b/ProgramProject.Gateway/appsettings.json new file mode 100644 index 0000000..10f68b8 --- /dev/null +++ b/ProgramProject.Gateway/appsettings.json @@ -0,0 +1,9 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning" + } + }, + "AllowedHosts": "*" +} diff --git a/ProgramProject.Gateway/ocelot.json b/ProgramProject.Gateway/ocelot.json new file mode 100644 index 0000000..111ecaf --- /dev/null +++ b/ProgramProject.Gateway/ocelot.json @@ -0,0 +1,21 @@ +{ + "Routes": [ + { + "DownstreamPathTemplate": "/api/projects", + "DownstreamScheme": "http", + "UpstreamPathTemplate": "/api/projects", + "UpstreamHttpMethod": [ "GET" ], + "ServiceName": "generation-service", + "LoadBalancerOptions": { + "Type": "QueryBased", + "Key": "id" + } + } + ], + "GlobalConfiguration": { + "BaseUrl": "http://localhost:5232", + "ServiceDiscoveryProvider": { + "Type": "AppHost" + } + } +} \ No newline at end of file diff --git a/ProgramProject.GenerationService/Controllers/ProjectsController.cs b/ProgramProject.GenerationService/Controllers/ProjectsController.cs new file mode 100644 index 0000000..81560ad --- /dev/null +++ b/ProgramProject.GenerationService/Controllers/ProjectsController.cs @@ -0,0 +1,34 @@ +using Microsoft.AspNetCore.Mvc; +using ProgramProject.GenerationService.Models; +using ProgramProject.GenerationService.Services; + +namespace ProgramProject.GenerationService.Controllers; + +[Route("api/[controller]")] +[ApiController] +public class ProjectsController(IProjectService projectService, ILogger logger) : ControllerBase +{ + [HttpGet] + [ProducesResponseType(typeof(ProgramProjectModel), StatusCodes.Status200OK)] + [ProducesResponseType(StatusCodes.Status400BadRequest)] + [ProducesResponseType(StatusCodes.Status500InternalServerError)] + public async Task> GetProject([FromQuery] int id) + { + if (id <= 0) + { + return BadRequest("ID должен быть положительным числом"); + } + + try + { + logger.LogInformation("Запрос проекта с ID {ProjectId}", id); + var project = await projectService.GetProjectByIdAsync(id); + return Ok(project); + } + catch (Exception ex) + { + logger.LogError(ex, "Ошибка при обработке запроса проекта ID {ProjectId}", id); + return StatusCode(500, "Внутренняя ошибка сервера"); + } + } +} \ No newline at end of file diff --git a/ProgramProject.GenerationService/Generator/IProgramProjectFaker.cs b/ProgramProject.GenerationService/Generator/IProgramProjectFaker.cs new file mode 100644 index 0000000..639bb60 --- /dev/null +++ b/ProgramProject.GenerationService/Generator/IProgramProjectFaker.cs @@ -0,0 +1,8 @@ +using ProgramProject.GenerationService.Models; + +namespace ProgramProject.GenerationService.Generator; + +public interface IProgramProjectFaker +{ + public ProgramProjectModel Generate(); +} diff --git a/ProgramProject.GenerationService/Generator/ProgramProjectFaker.cs b/ProgramProject.GenerationService/Generator/ProgramProjectFaker.cs new file mode 100644 index 0000000..903997d --- /dev/null +++ b/ProgramProject.GenerationService/Generator/ProgramProjectFaker.cs @@ -0,0 +1,73 @@ +using Bogus; +using ProgramProject.GenerationService.Models; + +namespace ProgramProject.GenerationService.Generator; + +/// +/// Генератор нового проекта +/// +public class ProgramProjectFaker : IProgramProjectFaker +{ + private readonly Faker _faker; + + public ProgramProjectFaker() + { + _faker = new Faker("ru") + .RuleFor(p => p.Id, f => f.IndexVariable++) + + // Название проекта: комбинация из Commerce, Hacker, Finance, Lorem + .RuleFor(p => p.Name, f => + f.PickRandom( + f.Commerce.ProductName() + " " + f.Hacker.Abbreviation(), + "Project " + f.Hacker.Noun(), + f.Finance.AccountName() + " System", + f.Lorem.Word() + "-" + f.Lorem.Word() + )) + + // Заказчик — компания + .RuleFor(p => p.Customer, f => f.Company.CompanyName()) + + // Менеджер проекта — полное имя + .RuleFor(p => p.Manager, f => f.Name.FullName()) + + // Дата начала + .RuleFor(p => p.StartDate, f => + { + var start = f.Date.Past(5); + return DateOnly.FromDateTime(start); + }) + + // Плановая дата завершения: позже даты начала + .RuleFor(p => p.PlannedEndDate, (f, p) => + { + var planned = f.Date.Soon(180, p.StartDate.ToDateTime(TimeOnly.MinValue)); + return DateOnly.FromDateTime(planned); + }) + + // Бюджет: от 10k до 1M + .RuleFor(p => p.Budget, f => f.Finance.Amount(10000, 1000000, 2)) + + // Процент выполнения: от 0 до 100 + .RuleFor(p => p.CompletionPercentage, f => f.Random.Int(0, 100)) + + // Фактические затраты: пропорциональны бюджету (50-120%) + .RuleFor(p => p.ActualCost, (f, p) => + f.Finance.Amount(p.Budget * 0.5m, p.Budget * 1.2m, 2)) + + // Фактическая дата завершения: заполняется только если процент = 100 + .RuleFor(p => p.ActualEndDate, (f, p) => + { + if (p.CompletionPercentage == 100) + { + var actual = f.Date.Recent(30); + return DateOnly.FromDateTime(actual); + } + return null; + }); + } + /// + /// Метод вызова генерации + /// + public ProgramProjectModel Generate() => + _faker.Generate(); +} diff --git a/ProgramProject.GenerationService/Models/ProgramProjectModel.cs b/ProgramProject.GenerationService/Models/ProgramProjectModel.cs new file mode 100644 index 0000000..e7e95a1 --- /dev/null +++ b/ProgramProject.GenerationService/Models/ProgramProjectModel.cs @@ -0,0 +1,48 @@ +namespace ProgramProject.GenerationService.Models; + +/// +/// Модель программного проекта +/// +public class ProgramProjectModel +{ + /// + /// Идетификатор в системе + /// + public int Id { get; set; } + /// + /// Название проекта + /// + public string Name { get; set; } = string.Empty; + /// + /// Заказчик проекта + /// + public string Customer { get; set; } = string.Empty; + /// + /// Мененджер проекта + /// + public string Manager { get; set; } = string.Empty; + /// + /// Дата начала + /// + public DateOnly StartDate { get; set; } + /// + /// Плановая дата завершения + /// + public DateOnly PlannedEndDate { get; set; } + /// + /// Фактическая дата завершения + /// + public DateOnly? ActualEndDate { get; set; } + /// + /// Бюджет + /// + public decimal Budget { get; set; } + /// + /// Фактические затраты + /// + public decimal ActualCost { get; set; } + /// + /// Процент выполнения + /// + public int CompletionPercentage { get; set; } +} diff --git a/ProgramProject.GenerationService/Program.cs b/ProgramProject.GenerationService/Program.cs new file mode 100644 index 0000000..5593875 --- /dev/null +++ b/ProgramProject.GenerationService/Program.cs @@ -0,0 +1,58 @@ +using ProgramProject.GenerationService.Generator; +using ProgramProject.GenerationService.Services; +using ProgramProject.ServiceDefaults; + +var builder = WebApplication.CreateBuilder(args); + +// Починка кодировки в консоли +Console.OutputEncoding = System.Text.Encoding.UTF8; + +builder.AddServiceDefaults(); + +builder.AddRedisDistributedCache("cache"); + +builder.Services.AddCors(options => +{ + options.AddPolicy("AllowClient", policy => + { + policy.SetIsOriginAllowed(origin => + { + try + { + var uri = new Uri(origin); + return uri.Host == "localhost"; + } + catch + { + return false; + } + }) + .WithMethods("GET") + .AllowAnyHeader() + .AllowCredentials(); + }); +}); + +builder.Services.AddSingleton(); +builder.Services.AddScoped(); + +builder.Services.AddControllers(); +builder.Services.AddEndpointsApiExplorer(); +builder.Services.AddSwaggerGen(); + +var app = builder.Build(); + +app.MapDefaultEndpoints(); +app.UseCors("AllowClient"); + +if (app.Environment.IsDevelopment()) +{ + app.UseSwagger(); + app.UseSwaggerUI(); +} + +app.UseHttpsRedirection(); +app.UseAuthorization(); +app.MapControllers(); + +app.Run(); \ No newline at end of file diff --git a/ProgramProject.GenerationService/ProgramProject.GenerationService.csproj b/ProgramProject.GenerationService/ProgramProject.GenerationService.csproj new file mode 100644 index 0000000..c974543 --- /dev/null +++ b/ProgramProject.GenerationService/ProgramProject.GenerationService.csproj @@ -0,0 +1,19 @@ + + + + net8.0 + enable + enable + + + + + + + + + + + + + diff --git a/ProgramProject.GenerationService/Properties/launchSettings.json b/ProgramProject.GenerationService/Properties/launchSettings.json new file mode 100644 index 0000000..f4dd367 --- /dev/null +++ b/ProgramProject.GenerationService/Properties/launchSettings.json @@ -0,0 +1,41 @@ +{ + "$schema": "http://json.schemastore.org/launchsettings.json", + "iisSettings": { + "windowsAuthentication": false, + "anonymousAuthentication": true, + "iisExpress": { + "applicationUrl": "http://localhost:24595", + "sslPort": 44302 + } + }, + "profiles": { + "http": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": true, + "launchUrl": "swagger", + "applicationUrl": "http://localhost:5191", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + }, + "https": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": true, + "launchUrl": "swagger", + "applicationUrl": "https://localhost:7190;http://localhost:5191", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + }, + "IIS Express": { + "commandName": "IISExpress", + "launchBrowser": true, + "launchUrl": "swagger", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + } + } +} diff --git a/ProgramProject.GenerationService/Services/IProjectService.cs b/ProgramProject.GenerationService/Services/IProjectService.cs new file mode 100644 index 0000000..8464b3b --- /dev/null +++ b/ProgramProject.GenerationService/Services/IProjectService.cs @@ -0,0 +1,8 @@ +using ProgramProject.GenerationService.Models; + +namespace ProgramProject.GenerationService.Services; + +public interface IProjectService +{ + public Task GetProjectByIdAsync(int id, CancellationToken cancellationToken = default); +} diff --git a/ProgramProject.GenerationService/Services/ProjectService.cs b/ProgramProject.GenerationService/Services/ProjectService.cs new file mode 100644 index 0000000..cdbf2c0 --- /dev/null +++ b/ProgramProject.GenerationService/Services/ProjectService.cs @@ -0,0 +1,76 @@ +using Microsoft.Extensions.Caching.Distributed; +using ProgramProject.GenerationService.Generator; +using ProgramProject.GenerationService.Models; +using System.Text.Json; + +namespace ProgramProject.GenerationService.Services; + +/// +/// Сервис работы с кэшем и с объектами +/// +public class ProjectService : IProjectService +{ + private readonly IDistributedCache _cache; + private readonly IProgramProjectFaker _faker; + private readonly ILogger _logger; + private readonly DistributedCacheEntryOptions _cacheOptions; + + public ProjectService( + IDistributedCache cache, + IProgramProjectFaker faker, + ILogger logger, + IConfiguration configuration) + { + _cache = cache; + _faker = faker; + _logger = logger; + + var cacheMinutes = configuration.GetValue("Cache:ExpirationMinutes", 5); + _cacheOptions = new DistributedCacheEntryOptions() + .SetAbsoluteExpiration(TimeSpan.FromMinutes(cacheMinutes)); + } + + public async Task GetProjectByIdAsync(int id, CancellationToken cancellationToken = default) + { + var cacheKey = $"project:{id}"; + + try + { + // Получаем из кэша + var cachedBytes = await _cache.GetAsync(cacheKey, cancellationToken); + + if (cachedBytes != null) + { + var cachedProject = JsonSerializer.Deserialize(cachedBytes); + + if (cachedProject != null) + { + _logger.LogInformation("Проект с ID {ProjectId} найден в кэше", id); + return cachedProject; + } + + _logger.LogWarning("Проект с ID {ProjectId} найден в кэше, но повреждён. Удаляем.", id); + await _cache.RemoveAsync(cacheKey, cancellationToken); + } + + _logger.LogInformation("Проект с ID {ProjectId} не найден в кэше. Генерируем новый", id); + + // Генерируем новый проект + var newProject = _faker.Generate(); + newProject.Id = id; + + // Сораняем в кэш + var serializedProject = JsonSerializer.SerializeToUtf8Bytes(newProject); + await _cache.SetAsync(cacheKey, serializedProject, _cacheOptions, cancellationToken); + + _logger.LogInformation("Проект с ID {ProjectId} сгенерирован и сохранён в кэш", id); + + return newProject; + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка при получении проекта с ID {ProjectId}", id); + throw; + } + } +} \ No newline at end of file diff --git a/ProgramProject.GenerationService/appsettings.Development.json b/ProgramProject.GenerationService/appsettings.Development.json new file mode 100644 index 0000000..0c208ae --- /dev/null +++ b/ProgramProject.GenerationService/appsettings.Development.json @@ -0,0 +1,8 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning" + } + } +} diff --git a/ProgramProject.GenerationService/appsettings.json b/ProgramProject.GenerationService/appsettings.json new file mode 100644 index 0000000..d8bdcd8 --- /dev/null +++ b/ProgramProject.GenerationService/appsettings.json @@ -0,0 +1,12 @@ +{ + "Cache": { + "ExpirationMinutes": 5 + }, + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning" + } + }, + "AllowedHosts": "*" +} diff --git a/ProgramProject.ServiceDefaults/Extensions.cs b/ProgramProject.ServiceDefaults/Extensions.cs new file mode 100644 index 0000000..b59822f --- /dev/null +++ b/ProgramProject.ServiceDefaults/Extensions.cs @@ -0,0 +1,127 @@ +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Diagnostics.HealthChecks; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Diagnostics.HealthChecks; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Hosting; +using OpenTelemetry; +using OpenTelemetry.Metrics; +using OpenTelemetry.Trace; + +namespace ProgramProject.ServiceDefaults; + +// Adds common .NET Aspire services: service discovery, resilience, health checks, and OpenTelemetry. +// This project should be referenced by each service project in your solution. +// To learn more about using this project, see https://aka.ms/dotnet/aspire/service-defaults +public static class Extensions +{ + private const string HealthEndpointPath = "/health"; + private const string AlivenessEndpointPath = "/alive"; + + public static TBuilder AddServiceDefaults(this TBuilder builder) where TBuilder : IHostApplicationBuilder + { + builder.ConfigureOpenTelemetry(); + + builder.AddDefaultHealthChecks(); + + builder.Services.AddServiceDiscovery(); + + builder.Services.ConfigureHttpClientDefaults(http => + { + // Turn on resilience by default + http.AddStandardResilienceHandler(); + + // Turn on service discovery by default + http.AddServiceDiscovery(); + }); + + // Uncomment the following to restrict the allowed schemes for service discovery. + // builder.Services.Configure(options => + // { + // options.AllowedSchemes = ["https"]; + // }); + + return builder; + } + + public static TBuilder ConfigureOpenTelemetry(this TBuilder builder) where TBuilder : IHostApplicationBuilder + { + builder.Logging.AddOpenTelemetry(logging => + { + logging.IncludeFormattedMessage = true; + logging.IncludeScopes = true; + }); + + builder.Services.AddOpenTelemetry() + .WithMetrics(metrics => + { + metrics.AddAspNetCoreInstrumentation() + .AddHttpClientInstrumentation() + .AddRuntimeInstrumentation(); + }) + .WithTracing(tracing => + { + tracing.AddSource(builder.Environment.ApplicationName) + .AddAspNetCoreInstrumentation(tracing => + // Exclude health check requests from tracing + tracing.Filter = context => + !context.Request.Path.StartsWithSegments(HealthEndpointPath) + && !context.Request.Path.StartsWithSegments(AlivenessEndpointPath) + ) + // Uncomment the following line to enable gRPC instrumentation (requires the OpenTelemetry.Instrumentation.GrpcNetClient package) + //.AddGrpcClientInstrumentation() + .AddHttpClientInstrumentation(); + }); + + builder.AddOpenTelemetryExporters(); + + return builder; + } + + private static TBuilder AddOpenTelemetryExporters(this TBuilder builder) where TBuilder : IHostApplicationBuilder + { + var useOtlpExporter = !string.IsNullOrWhiteSpace(builder.Configuration["OTEL_EXPORTER_OTLP_ENDPOINT"]); + + if (useOtlpExporter) + { + builder.Services.AddOpenTelemetry().UseOtlpExporter(); + } + + // Uncomment the following lines to enable the Azure Monitor exporter (requires the Azure.Monitor.OpenTelemetry.AspNetCore package) + //if (!string.IsNullOrEmpty(builder.Configuration["APPLICATIONINSIGHTS_CONNECTION_STRING"])) + //{ + // builder.Services.AddOpenTelemetry() + // .UseAzureMonitor(); + //} + + return builder; + } + + public static TBuilder AddDefaultHealthChecks(this TBuilder builder) where TBuilder : IHostApplicationBuilder + { + builder.Services.AddHealthChecks() + // Add a default liveness check to ensure app is responsive + .AddCheck("self", () => HealthCheckResult.Healthy(), ["live"]); + + return builder; + } + + public static WebApplication MapDefaultEndpoints(this WebApplication app) + { + // Adding health checks endpoints to applications in non-development environments has security implications. + // See https://aka.ms/dotnet/aspire/healthchecks for details before enabling these endpoints in non-development environments. + if (app.Environment.IsDevelopment()) + { + // All health checks must pass for app to be considered ready to accept traffic after starting + app.MapHealthChecks(HealthEndpointPath); + + // Only health checks tagged with the "live" tag must pass for app to be considered alive + app.MapHealthChecks(AlivenessEndpointPath, new HealthCheckOptions + { + Predicate = r => r.Tags.Contains("live") + }); + } + + return app; + } +} diff --git a/ProgramProject.ServiceDefaults/ProgramProject.ServiceDefaults.csproj b/ProgramProject.ServiceDefaults/ProgramProject.ServiceDefaults.csproj new file mode 100644 index 0000000..5d5bb49 --- /dev/null +++ b/ProgramProject.ServiceDefaults/ProgramProject.ServiceDefaults.csproj @@ -0,0 +1,26 @@ + + + + net8.0 + enable + enable + true + + + + + + + + + + + + + + + + + + +