diff --git a/Client.Wasm/Components/StudentCard.razor b/Client.Wasm/Components/StudentCard.razor index 661f1181..a470fb50 100644 --- a/Client.Wasm/Components/StudentCard.razor +++ b/Client.Wasm/Components/StudentCard.razor @@ -4,10 +4,10 @@ - Номер №X "Название лабораторной" - Вариант №Х "Название варианта" - Выполнена Фамилией Именем 65ХХ - Ссылка на форк + Номер №3 "Интеграционное тестирование" + Вариант №43 "Сотрудник компании" + Выполнена Казаковым Андреем 6513 + Ссылка на форк diff --git a/Client.Wasm/wwwroot/appsettings.json b/Client.Wasm/wwwroot/appsettings.json index d1fe7ab3..cc67cbd9 100644 --- a/Client.Wasm/wwwroot/appsettings.json +++ b/Client.Wasm/wwwroot/appsettings.json @@ -6,5 +6,5 @@ } }, "AllowedHosts": "*", - "BaseAddress": "" + "BaseAddress": "https://localhost:7000/api/employee" } diff --git a/CloudDevelopment.sln b/CloudDevelopment.sln index cb48241d..e318f998 100644 --- a/CloudDevelopment.sln +++ b/CloudDevelopment.sln @@ -5,16 +5,126 @@ 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}") = "CompanyEmployee.AppHost", "CompanyEmployee.AppHost\CompanyEmployee.AppHost.csproj", "{069756DA-EFFA-4835-B69C-0849C48BE473}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CompanyEmployee.ServiceDefaults", "CompanyEmployee.ServiceDefaults\CompanyEmployee.ServiceDefaults.csproj", "{60C547C0-C951-4270-1D2E-4BB68A5739B6}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CompanyEmployee.Domain", "CompanyEmployee.Domain\CompanyEmployee.Domain.csproj", "{FD5B46C8-0F5C-493A-B5FF-708AEA44AD3D}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CompanyEmployee.Api", "CompanyEmployee.Api\CompanyEmployee.Api.csproj", "{EEC6E8C9-9951-4CE6-DBC8-FEDF498A759B}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CompanyEmployee.Gateway", "CompanyEmployee.Gateway\CompanyEmployee.Gateway.csproj", "{73C5B926-EAC3-32E1-1AD5-911888B0E715}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CompanyEmployee.FileService", "CompanyEmployee.FileService\CompanyEmployee.FileService.csproj", "{A276F6D0-18D6-4A2B-A8FE-C03CA0694DEE}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CompanyEmployee.IntegrationTests", "CompanyEmployee.IntegrationTests\CompanyEmployee.IntegrationTests.csproj", "{5B3E2130-4B0A-414D-B075-7AF50B7D9B55}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU + Release|x64 = Release|x64 + Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {AE7EEA74-2FE0-136F-D797-854FD87E022A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {AE7EEA74-2FE0-136F-D797-854FD87E022A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {AE7EEA74-2FE0-136F-D797-854FD87E022A}.Debug|x64.ActiveCfg = Debug|Any CPU + {AE7EEA74-2FE0-136F-D797-854FD87E022A}.Debug|x64.Build.0 = Debug|Any CPU + {AE7EEA74-2FE0-136F-D797-854FD87E022A}.Debug|x86.ActiveCfg = Debug|Any CPU + {AE7EEA74-2FE0-136F-D797-854FD87E022A}.Debug|x86.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 + {AE7EEA74-2FE0-136F-D797-854FD87E022A}.Release|x64.ActiveCfg = Release|Any CPU + {AE7EEA74-2FE0-136F-D797-854FD87E022A}.Release|x64.Build.0 = Release|Any CPU + {AE7EEA74-2FE0-136F-D797-854FD87E022A}.Release|x86.ActiveCfg = Release|Any CPU + {AE7EEA74-2FE0-136F-D797-854FD87E022A}.Release|x86.Build.0 = Release|Any CPU + {069756DA-EFFA-4835-B69C-0849C48BE473}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {069756DA-EFFA-4835-B69C-0849C48BE473}.Debug|Any CPU.Build.0 = Debug|Any CPU + {069756DA-EFFA-4835-B69C-0849C48BE473}.Debug|x64.ActiveCfg = Debug|Any CPU + {069756DA-EFFA-4835-B69C-0849C48BE473}.Debug|x64.Build.0 = Debug|Any CPU + {069756DA-EFFA-4835-B69C-0849C48BE473}.Debug|x86.ActiveCfg = Debug|Any CPU + {069756DA-EFFA-4835-B69C-0849C48BE473}.Debug|x86.Build.0 = Debug|Any CPU + {069756DA-EFFA-4835-B69C-0849C48BE473}.Release|Any CPU.ActiveCfg = Release|Any CPU + {069756DA-EFFA-4835-B69C-0849C48BE473}.Release|Any CPU.Build.0 = Release|Any CPU + {069756DA-EFFA-4835-B69C-0849C48BE473}.Release|x64.ActiveCfg = Release|Any CPU + {069756DA-EFFA-4835-B69C-0849C48BE473}.Release|x64.Build.0 = Release|Any CPU + {069756DA-EFFA-4835-B69C-0849C48BE473}.Release|x86.ActiveCfg = Release|Any CPU + {069756DA-EFFA-4835-B69C-0849C48BE473}.Release|x86.Build.0 = Release|Any CPU + {60C547C0-C951-4270-1D2E-4BB68A5739B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {60C547C0-C951-4270-1D2E-4BB68A5739B6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {60C547C0-C951-4270-1D2E-4BB68A5739B6}.Debug|x64.ActiveCfg = Debug|Any CPU + {60C547C0-C951-4270-1D2E-4BB68A5739B6}.Debug|x64.Build.0 = Debug|Any CPU + {60C547C0-C951-4270-1D2E-4BB68A5739B6}.Debug|x86.ActiveCfg = Debug|Any CPU + {60C547C0-C951-4270-1D2E-4BB68A5739B6}.Debug|x86.Build.0 = Debug|Any CPU + {60C547C0-C951-4270-1D2E-4BB68A5739B6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {60C547C0-C951-4270-1D2E-4BB68A5739B6}.Release|Any CPU.Build.0 = Release|Any CPU + {60C547C0-C951-4270-1D2E-4BB68A5739B6}.Release|x64.ActiveCfg = Release|Any CPU + {60C547C0-C951-4270-1D2E-4BB68A5739B6}.Release|x64.Build.0 = Release|Any CPU + {60C547C0-C951-4270-1D2E-4BB68A5739B6}.Release|x86.ActiveCfg = Release|Any CPU + {60C547C0-C951-4270-1D2E-4BB68A5739B6}.Release|x86.Build.0 = Release|Any CPU + {FD5B46C8-0F5C-493A-B5FF-708AEA44AD3D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FD5B46C8-0F5C-493A-B5FF-708AEA44AD3D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FD5B46C8-0F5C-493A-B5FF-708AEA44AD3D}.Debug|x64.ActiveCfg = Debug|Any CPU + {FD5B46C8-0F5C-493A-B5FF-708AEA44AD3D}.Debug|x64.Build.0 = Debug|Any CPU + {FD5B46C8-0F5C-493A-B5FF-708AEA44AD3D}.Debug|x86.ActiveCfg = Debug|Any CPU + {FD5B46C8-0F5C-493A-B5FF-708AEA44AD3D}.Debug|x86.Build.0 = Debug|Any CPU + {FD5B46C8-0F5C-493A-B5FF-708AEA44AD3D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FD5B46C8-0F5C-493A-B5FF-708AEA44AD3D}.Release|Any CPU.Build.0 = Release|Any CPU + {FD5B46C8-0F5C-493A-B5FF-708AEA44AD3D}.Release|x64.ActiveCfg = Release|Any CPU + {FD5B46C8-0F5C-493A-B5FF-708AEA44AD3D}.Release|x64.Build.0 = Release|Any CPU + {FD5B46C8-0F5C-493A-B5FF-708AEA44AD3D}.Release|x86.ActiveCfg = Release|Any CPU + {FD5B46C8-0F5C-493A-B5FF-708AEA44AD3D}.Release|x86.Build.0 = Release|Any CPU + {EEC6E8C9-9951-4CE6-DBC8-FEDF498A759B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {EEC6E8C9-9951-4CE6-DBC8-FEDF498A759B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {EEC6E8C9-9951-4CE6-DBC8-FEDF498A759B}.Debug|x64.ActiveCfg = Debug|Any CPU + {EEC6E8C9-9951-4CE6-DBC8-FEDF498A759B}.Debug|x64.Build.0 = Debug|Any CPU + {EEC6E8C9-9951-4CE6-DBC8-FEDF498A759B}.Debug|x86.ActiveCfg = Debug|Any CPU + {EEC6E8C9-9951-4CE6-DBC8-FEDF498A759B}.Debug|x86.Build.0 = Debug|Any CPU + {EEC6E8C9-9951-4CE6-DBC8-FEDF498A759B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {EEC6E8C9-9951-4CE6-DBC8-FEDF498A759B}.Release|Any CPU.Build.0 = Release|Any CPU + {EEC6E8C9-9951-4CE6-DBC8-FEDF498A759B}.Release|x64.ActiveCfg = Release|Any CPU + {EEC6E8C9-9951-4CE6-DBC8-FEDF498A759B}.Release|x64.Build.0 = Release|Any CPU + {EEC6E8C9-9951-4CE6-DBC8-FEDF498A759B}.Release|x86.ActiveCfg = Release|Any CPU + {EEC6E8C9-9951-4CE6-DBC8-FEDF498A759B}.Release|x86.Build.0 = Release|Any CPU + {73C5B926-EAC3-32E1-1AD5-911888B0E715}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {73C5B926-EAC3-32E1-1AD5-911888B0E715}.Debug|Any CPU.Build.0 = Debug|Any CPU + {73C5B926-EAC3-32E1-1AD5-911888B0E715}.Debug|x64.ActiveCfg = Debug|Any CPU + {73C5B926-EAC3-32E1-1AD5-911888B0E715}.Debug|x64.Build.0 = Debug|Any CPU + {73C5B926-EAC3-32E1-1AD5-911888B0E715}.Debug|x86.ActiveCfg = Debug|Any CPU + {73C5B926-EAC3-32E1-1AD5-911888B0E715}.Debug|x86.Build.0 = Debug|Any CPU + {73C5B926-EAC3-32E1-1AD5-911888B0E715}.Release|Any CPU.ActiveCfg = Release|Any CPU + {73C5B926-EAC3-32E1-1AD5-911888B0E715}.Release|Any CPU.Build.0 = Release|Any CPU + {73C5B926-EAC3-32E1-1AD5-911888B0E715}.Release|x64.ActiveCfg = Release|Any CPU + {73C5B926-EAC3-32E1-1AD5-911888B0E715}.Release|x64.Build.0 = Release|Any CPU + {73C5B926-EAC3-32E1-1AD5-911888B0E715}.Release|x86.ActiveCfg = Release|Any CPU + {73C5B926-EAC3-32E1-1AD5-911888B0E715}.Release|x86.Build.0 = Release|Any CPU + {A276F6D0-18D6-4A2B-A8FE-C03CA0694DEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A276F6D0-18D6-4A2B-A8FE-C03CA0694DEE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A276F6D0-18D6-4A2B-A8FE-C03CA0694DEE}.Debug|x64.ActiveCfg = Debug|Any CPU + {A276F6D0-18D6-4A2B-A8FE-C03CA0694DEE}.Debug|x64.Build.0 = Debug|Any CPU + {A276F6D0-18D6-4A2B-A8FE-C03CA0694DEE}.Debug|x86.ActiveCfg = Debug|Any CPU + {A276F6D0-18D6-4A2B-A8FE-C03CA0694DEE}.Debug|x86.Build.0 = Debug|Any CPU + {A276F6D0-18D6-4A2B-A8FE-C03CA0694DEE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A276F6D0-18D6-4A2B-A8FE-C03CA0694DEE}.Release|Any CPU.Build.0 = Release|Any CPU + {A276F6D0-18D6-4A2B-A8FE-C03CA0694DEE}.Release|x64.ActiveCfg = Release|Any CPU + {A276F6D0-18D6-4A2B-A8FE-C03CA0694DEE}.Release|x64.Build.0 = Release|Any CPU + {A276F6D0-18D6-4A2B-A8FE-C03CA0694DEE}.Release|x86.ActiveCfg = Release|Any CPU + {A276F6D0-18D6-4A2B-A8FE-C03CA0694DEE}.Release|x86.Build.0 = Release|Any CPU + {5B3E2130-4B0A-414D-B075-7AF50B7D9B55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5B3E2130-4B0A-414D-B075-7AF50B7D9B55}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5B3E2130-4B0A-414D-B075-7AF50B7D9B55}.Debug|x64.ActiveCfg = Debug|Any CPU + {5B3E2130-4B0A-414D-B075-7AF50B7D9B55}.Debug|x64.Build.0 = Debug|Any CPU + {5B3E2130-4B0A-414D-B075-7AF50B7D9B55}.Debug|x86.ActiveCfg = Debug|Any CPU + {5B3E2130-4B0A-414D-B075-7AF50B7D9B55}.Debug|x86.Build.0 = Debug|Any CPU + {5B3E2130-4B0A-414D-B075-7AF50B7D9B55}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5B3E2130-4B0A-414D-B075-7AF50B7D9B55}.Release|Any CPU.Build.0 = Release|Any CPU + {5B3E2130-4B0A-414D-B075-7AF50B7D9B55}.Release|x64.ActiveCfg = Release|Any CPU + {5B3E2130-4B0A-414D-B075-7AF50B7D9B55}.Release|x64.Build.0 = Release|Any CPU + {5B3E2130-4B0A-414D-B075-7AF50B7D9B55}.Release|x86.ActiveCfg = Release|Any CPU + {5B3E2130-4B0A-414D-B075-7AF50B7D9B55}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/CompanyEmployee.Api/CompanyEmployee.Api.csproj b/CompanyEmployee.Api/CompanyEmployee.Api.csproj new file mode 100644 index 00000000..93740694 --- /dev/null +++ b/CompanyEmployee.Api/CompanyEmployee.Api.csproj @@ -0,0 +1,24 @@ + + + + net8.0 + enable + enable + + + + + + + + + + + + + + + + + + diff --git a/CompanyEmployee.Api/Controllers/EmployeeController.cs b/CompanyEmployee.Api/Controllers/EmployeeController.cs new file mode 100644 index 00000000..baa925d2 --- /dev/null +++ b/CompanyEmployee.Api/Controllers/EmployeeController.cs @@ -0,0 +1,55 @@ +using CompanyEmployee.Api.Services; +using CompanyEmployee.Domain.Entity; +using Microsoft.AspNetCore.Mvc; + +namespace CompanyEmployee.Api.Controllers; + +/// +/// Контроллер для работы с сотрудниками. +/// +/// Сервис для получения сотрудников с кэшированием. +/// Логгер для записи информации о запросах. +[ApiController] +[Route("api/[controller]")] +public class EmployeeController( + IEmployeeService employeeService, + ILogger logger) : ControllerBase +{ + /// + /// Получить сотрудника по идентификатору. + /// + /// Идентификатор сотрудника. + /// Токен отмены операции. + /// Объект сотрудника. + [HttpGet] + [ProducesResponseType(typeof(Employee), StatusCodes.Status200OK)] + [ProducesResponseType(StatusCodes.Status400BadRequest)] + [ProducesResponseType(StatusCodes.Status404NotFound)] + [ProducesResponseType(StatusCodes.Status500InternalServerError)] + public async Task> GetEmployee([FromQuery] int id, CancellationToken cancellationToken) + { + try + { + logger.LogInformation("Запрос на получение сотрудника с id: {Id}", id); + + if (id <= 0) + { + return BadRequest("ID должен быть положительным числом"); + } + + var employee = await employeeService.GetEmployeeAsync(id, cancellationToken); + + if (employee == null) + { + return NotFound($"Сотрудник с ID {id} не найден"); + } + + return Ok(employee); + } + catch (Exception ex) + { + logger.LogError(ex, "Ошибка при получении сотрудника с id: {Id}", id); + return StatusCode(500, "Внутренняя ошибка сервера"); + } + } +} \ No newline at end of file diff --git a/CompanyEmployee.Api/Program.cs b/CompanyEmployee.Api/Program.cs new file mode 100644 index 00000000..fb110e9c --- /dev/null +++ b/CompanyEmployee.Api/Program.cs @@ -0,0 +1,48 @@ +using Amazon.SimpleNotificationService; +using CompanyEmployee.Api.Services; +using CompanyEmployee.ServiceDefaults; + +var builder = WebApplication.CreateBuilder(args); + +builder.AddServiceDefaults(); +builder.AddRedisDistributedCache("redis"); + +builder.Services.AddSingleton(); +builder.Services.AddSingleton(); +builder.Services.AddScoped(); + +var awsServiceUrl = builder.Configuration["AWS:ServiceURL"] ?? "http://localhost:4566"; +var awsRegion = builder.Configuration["AWS:Region"] ?? "us-east-1"; +var awsAccessKey = builder.Configuration["AWS:AccessKeyId"] ?? "test"; +var awsSecretKey = builder.Configuration["AWS:SecretAccessKey"] ?? "test"; + +var snsConfig = new AmazonSimpleNotificationServiceConfig +{ + ServiceURL = awsServiceUrl, + AuthenticationRegion = awsRegion, + UseHttp = true +}; + +builder.Services.AddSingleton(_ => + new AmazonSimpleNotificationServiceClient(awsAccessKey, awsSecretKey, snsConfig)); + +builder.Services.AddSingleton(); + +builder.Services.AddControllers(); +builder.Services.AddEndpointsApiExplorer(); +builder.Services.AddSwaggerGen(); + +var app = builder.Build(); + +if (app.Environment.IsDevelopment()) +{ + app.UseSwagger(); + app.UseSwaggerUI(); +} + +app.MapDefaultEndpoints(); +app.UseHttpsRedirection(); +app.UseAuthorization(); +app.MapControllers(); + +app.Run(); \ No newline at end of file diff --git a/CompanyEmployee.Api/Properties/launchSettings.json b/CompanyEmployee.Api/Properties/launchSettings.json new file mode 100644 index 00000000..d5306a4e --- /dev/null +++ b/CompanyEmployee.Api/Properties/launchSettings.json @@ -0,0 +1,41 @@ +{ + "$schema": "http://json.schemastore.org/launchsettings.json", + "iisSettings": { + "windowsAuthentication": false, + "anonymousAuthentication": true, + "iisExpress": { + "applicationUrl": "http://localhost:56739", + "sslPort": 44378 + } + }, + "profiles": { + "http": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": false, + "launchUrl": "swagger", + "applicationUrl": "http://localhost:6001", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + }, + "https": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": false, + "launchUrl": "swagger", + "applicationUrl": "https://localhost:6001", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + }, + "IIS Express": { + "commandName": "IISExpress", + "launchBrowser": true, + "launchUrl": "swagger", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + } + } +} \ No newline at end of file diff --git a/CompanyEmployee.Api/Services/EmployeeGenerator.cs b/CompanyEmployee.Api/Services/EmployeeGenerator.cs new file mode 100644 index 00000000..100cc7e2 --- /dev/null +++ b/CompanyEmployee.Api/Services/EmployeeGenerator.cs @@ -0,0 +1,78 @@ +using Bogus; +using Bogus.DataSets; +using CompanyEmployee.Domain.Entity; + +namespace CompanyEmployee.Api.Services; + +/// +/// Генератор сотрудников. +/// +/// Логгер. +public class EmployeeGenerator(ILogger logger) : IEmployeeGenerator +{ + private readonly string[] _professions = { "Developer", "Manager", "Analyst", "Designer", "QA" }; + private readonly string[] _suffixes = { "Junior", "Middle", "Senior" }; + + /// + public Employee Generate(int id) + { + Randomizer.Seed = new Random(id); + var faker = new Faker("ru"); + var employee = new Faker("ru") + .RuleFor(e => e.Id, id) + .RuleFor(e => e.FullName, f => + { + var gender = f.PickRandom(); + var firstName = f.Name.FirstName(gender); + var lastName = f.Name.LastName(gender); + var fatherName = f.Name.FirstName(Name.Gender.Male); + var patronymic = gender == Name.Gender.Male + ? fatherName.EndsWith("й") || fatherName.EndsWith("ь") + ? fatherName[..^1] + "евич" + : fatherName + "ович" + : fatherName.EndsWith("й") || fatherName.EndsWith("ь") + ? fatherName[..^1] + "евна" + : fatherName + "овна"; + + return $"{lastName} {firstName} {patronymic}"; + }) + .RuleFor(e => e.Position, f => + { + var profession = f.PickRandom(_professions); + var suffix = f.PickRandom(_suffixes); + return $"{profession} {suffix}"; + }) + .RuleFor(e => e.Department, f => f.Commerce.Department()) + .RuleFor(e => e.HireDate, f => + DateOnly.FromDateTime(f.Date.Past(10).ToUniversalTime())) + .RuleFor(e => e.Salary, f => + { + var suffix = f.PickRandom(_suffixes); + var salary = suffix switch + { + "Junior" => f.Random.Decimal(30000, 60000), + "Middle" => f.Random.Decimal(60000, 100000), + "Senior" => f.Random.Decimal(100000, 180000), + _ => f.Random.Decimal(40000, 80000) + }; + return Math.Round(salary, 2); + }) + .RuleFor(e => e.Email, (f, e) => + { + var nameParts = e.FullName.Split(' '); + return f.Internet.Email(nameParts[1], nameParts[0], "company.ru"); + }) + .RuleFor(e => e.Phone, f => f.Phone.PhoneNumber("+7(###)###-##-##")) + .RuleFor(e => e.IsTerminated, f => f.Random.Bool(0.1f)) + .RuleFor(e => e.TerminationDate, (f, e) => + e.IsTerminated + ? DateOnly.FromDateTime(f.Date.Between( + e.HireDate.ToDateTime(TimeOnly.MinValue), + DateTime.Now)) + : null) + .Generate(); + + logger.LogInformation("Сгенерирован сотрудник ID {Id}: {FullName}", employee.Id, employee.FullName); + return employee; + } +} \ No newline at end of file diff --git a/CompanyEmployee.Api/Services/EmployeeService.cs b/CompanyEmployee.Api/Services/EmployeeService.cs new file mode 100644 index 00000000..87b8331d --- /dev/null +++ b/CompanyEmployee.Api/Services/EmployeeService.cs @@ -0,0 +1,71 @@ +using System.Text.Json; +using CompanyEmployee.Domain.Entity; +using Microsoft.Extensions.Caching.Distributed; + +namespace CompanyEmployee.Api.Services; + +/// +/// Сервис для работы с сотрудниками. +/// +/// Генератор сотрудников. +/// Кэш Redis. +/// Публикатор SNS. +/// Логгер. +public class EmployeeService( + IEmployeeGenerator generator, + IDistributedCache cache, + SnsPublisherService snsPublisher, + ILogger logger) : IEmployeeService +{ + private readonly DistributedCacheEntryOptions _cacheOptions = new() + { + AbsoluteExpirationRelativeToNow = TimeSpan.FromMinutes(5) + }; + + public async Task GetEmployeeAsync(int id, CancellationToken cancellationToken = default) + { + var cacheKey = $"employee:{id}"; + Employee? employee = null; + + try + { + var cachedJson = await cache.GetStringAsync(cacheKey, cancellationToken); + if (cachedJson != null) + { + logger.LogInformation("Сотрудник с ID {Id} найден в кэше", id); + employee = JsonSerializer.Deserialize(cachedJson); + return employee; + } + } + catch (Exception ex) + { + logger.LogError(ex, "Ошибка при получении данных из кэша"); + } + + try + { + logger.LogInformation("Сотрудник с ID {Id} не найден в кэше, генерация нового", id); + employee = generator.Generate(id); + } + catch (Exception ex) + { + logger.LogError(ex, "Ошибка при генерации сотрудника с ID {Id}", id); + return null; + } + + try + { + var serialized = JsonSerializer.Serialize(employee); + await cache.SetStringAsync(cacheKey, serialized, _cacheOptions, cancellationToken); + logger.LogDebug("Сотрудник с ID {Id} сохранён в кэш", id); + + await snsPublisher.PublishEmployeeAsync(employee, cancellationToken); + } + catch (Exception ex) + { + logger.LogWarning(ex, "Не удалось отправить сотрудника {Id} в SNS", id); + } + + return employee; + } +} \ No newline at end of file diff --git a/CompanyEmployee.Api/Services/ICacheService.cs b/CompanyEmployee.Api/Services/ICacheService.cs new file mode 100644 index 00000000..523bf771 --- /dev/null +++ b/CompanyEmployee.Api/Services/ICacheService.cs @@ -0,0 +1,22 @@ +using Microsoft.Extensions.Caching.Distributed; + +namespace CompanyEmployee.Api.Services; + +/// +/// Сервис для работы с распределённым кэшем. +/// +public interface ICacheService +{ + /// Получает данные из кэша по ключу. + /// Ключ кэша. + /// Токен отмены. + /// Данные из кэша или default. + public Task GetAsync(string key, CancellationToken cancellationToken = default); + + /// Сохраняет данные в кэш. + /// Ключ кэша. + /// Данные для сохранения. + /// Опции кэширования. + /// Токен отмены. + public Task SetAsync(string key, T value, DistributedCacheEntryOptions? options = null, CancellationToken cancellationToken = default); +} \ No newline at end of file diff --git a/CompanyEmployee.Api/Services/IEmployeeGenerator.cs b/CompanyEmployee.Api/Services/IEmployeeGenerator.cs new file mode 100644 index 00000000..812b2340 --- /dev/null +++ b/CompanyEmployee.Api/Services/IEmployeeGenerator.cs @@ -0,0 +1,16 @@ +using CompanyEmployee.Domain.Entity; + +namespace CompanyEmployee.Api.Services; + +/// +/// Генератор данных сотрудников. +/// +public interface IEmployeeGenerator +{ + /// + /// Генерирует сотрудника по идентификатору. + /// + /// Идентификатор. + /// Сгенерированный сотрудник. + public Employee Generate(int id); +} \ No newline at end of file diff --git a/CompanyEmployee.Api/Services/IEmployeeService.cs b/CompanyEmployee.Api/Services/IEmployeeService.cs new file mode 100644 index 00000000..000463b8 --- /dev/null +++ b/CompanyEmployee.Api/Services/IEmployeeService.cs @@ -0,0 +1,17 @@ +using CompanyEmployee.Domain.Entity; + +namespace CompanyEmployee.Api.Services; + +/// +/// Сервис для работы с сотрудниками. +/// +public interface IEmployeeService +{ + /// + /// Получает сотрудника по идентификатору с использованием кэширования. + /// + /// Идентификатор сотрудника. + /// Токен отмены. + /// Сотрудник или null. + public Task GetEmployeeAsync(int id, CancellationToken cancellationToken = default); +} \ No newline at end of file diff --git a/CompanyEmployee.Api/Services/RedisCacheService.cs b/CompanyEmployee.Api/Services/RedisCacheService.cs new file mode 100644 index 00000000..e9c68aab --- /dev/null +++ b/CompanyEmployee.Api/Services/RedisCacheService.cs @@ -0,0 +1,59 @@ +using System.Text.Json; +using Microsoft.Extensions.Caching.Distributed; + +namespace CompanyEmployee.Api.Services; + +/// +/// Реализация кэширования в Redis. +/// +/// Redis Distributed Cache. +/// Логгер. +public class RedisCacheService( + IDistributedCache cache, + ILogger logger) : ICacheService +{ + /// + public async Task GetAsync(string key, CancellationToken cancellationToken = default) + { + try + { + logger.LogDebug("Получение из кэша по ключу {Key}", key); + var cachedJson = await cache.GetStringAsync(key, cancellationToken); + + if (cachedJson == null) + { + logger.LogDebug("Данные по ключу {Key} не найдены", key); + return default; + } + + return JsonSerializer.Deserialize(cachedJson); + } + catch (Exception ex) + { + logger.LogError(ex, "Ошибка при получении данных из кэша по ключу {Key}", key); + return default; + } + } + + /// + public async Task SetAsync(string key, T value, DistributedCacheEntryOptions? options = null, CancellationToken cancellationToken = default) + { + try + { + logger.LogDebug("Сохранение в кэш по ключу {Key}", key); + var serialized = JsonSerializer.Serialize(value); + + await cache.SetStringAsync( + key, + serialized, + options ?? new DistributedCacheEntryOptions(), + cancellationToken); + + logger.LogDebug("Данные сохранены в кэш по ключу {Key}", key); + } + catch (Exception ex) + { + logger.LogWarning(ex, "Не удалось сохранить данные в кэш по ключу {Key}", key); + } + } +} \ No newline at end of file diff --git a/CompanyEmployee.Api/Services/SnsPublisherService.cs b/CompanyEmployee.Api/Services/SnsPublisherService.cs new file mode 100644 index 00000000..6cdc1b03 --- /dev/null +++ b/CompanyEmployee.Api/Services/SnsPublisherService.cs @@ -0,0 +1,71 @@ +using Amazon.SimpleNotificationService; +using Amazon.SimpleNotificationService.Model; +using CompanyEmployee.Domain.Entity; +using System.Text.Json; + +namespace CompanyEmployee.Api.Services; + +/// +/// Сервис для публикации сообщений в SNS. +/// +/// SNS клиент. +/// Конфигурация. +/// Логгер. +public class SnsPublisherService( + IAmazonSimpleNotificationService snsClient, + IConfiguration configuration, + ILogger logger) +{ + private readonly string? _topicArn = configuration["SNS:TopicArn"] ?? "arn:aws:sns:us-east-1:000000000000:employee-events"; + + public async Task PublishEmployeeAsync(Employee employee, CancellationToken cancellationToken = default) + { + if (string.IsNullOrEmpty(_topicArn)) + { + logger.LogWarning("SNS TopicArn не настроен, публикация пропущена"); + return; + } + + try + { + var message = JsonSerializer.Serialize(employee); + var publishRequest = new PublishRequest + { + TopicArn = _topicArn, + Message = message, + Subject = $"Employee-{employee.Id}" + }; + var response = await snsClient.PublishAsync(publishRequest, cancellationToken); + logger.LogInformation("Сотрудник {Id} опубликован в SNS, MessageId: {MessageId}", employee.Id, response.MessageId); + } + catch (NotFoundException) + { + logger.LogWarning("Топик SNS не существует, попытка создать"); + try + { + var createTopicRequest = new CreateTopicRequest { Name = "employee-events" }; + var createResponse = await snsClient.CreateTopicAsync(createTopicRequest, cancellationToken); + var createdTopicArn = createResponse.TopicArn; + logger.LogInformation("Топик SNS создан: {TopicArn}", createdTopicArn); + + var message = JsonSerializer.Serialize(employee); + var publishRequest = new PublishRequest + { + TopicArn = createdTopicArn, + Message = message, + Subject = $"Employee-{employee.Id}" + }; + var response = await snsClient.PublishAsync(publishRequest, cancellationToken); + logger.LogInformation("Сотрудник {Id} опубликован в SNS после создания топика, MessageId: {MessageId}", employee.Id, response.MessageId); + } + catch (Exception ex) + { + logger.LogError(ex, "Не удалось создать топик SNS и опубликовать сообщение"); + } + } + catch (Exception ex) + { + logger.LogError(ex, "Ошибка при публикации в SNS"); + } + } +} \ No newline at end of file diff --git a/CompanyEmployee.Api/appsettings.Development.json b/CompanyEmployee.Api/appsettings.Development.json new file mode 100644 index 00000000..0c208ae9 --- /dev/null +++ b/CompanyEmployee.Api/appsettings.Development.json @@ -0,0 +1,8 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning" + } + } +} diff --git a/CompanyEmployee.Api/appsettings.json b/CompanyEmployee.Api/appsettings.json new file mode 100644 index 00000000..10f16843 --- /dev/null +++ b/CompanyEmployee.Api/appsettings.json @@ -0,0 +1,17 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning" + } + }, + "AWS": { + "ServiceURL": "http://localhost:4566", + "Region": "us-east-1", + "AccessKeyId": "test", + "SecretAccessKey": "test" + }, + "SNS": { + "TopicArn": "arn:aws:sns:us-east-1:000000000000:employee-events" + } +} \ No newline at end of file diff --git a/CompanyEmployee.AppHost/AppHost.cs b/CompanyEmployee.AppHost/AppHost.cs new file mode 100644 index 00000000..77afb095 --- /dev/null +++ b/CompanyEmployee.AppHost/AppHost.cs @@ -0,0 +1,66 @@ +using Aspire.Hosting; + +var builder = DistributedApplication.CreateBuilder(args); + +var redis = builder.AddRedis("redis") + .WithRedisCommander(); + +var minio = builder.AddContainer("minio", "minio/minio") + .WithArgs("server", "/data", "--console-address", ":9001") + .WithEnvironment("MINIO_ROOT_USER", "minioadmin") + .WithEnvironment("MINIO_ROOT_PASSWORD", "minioadmin") + .WithEndpoint(port: 9000, targetPort: 9000, name: "api", scheme: "http") + .WithEndpoint(port: 9001, targetPort: 9001, name: "console", scheme: "http"); + +var localstack = builder.AddContainer("localstack", "localstack/localstack:3.8.0") + .WithEndpoint(port: 4566, targetPort: 4566, name: "localstack", scheme: "http") + .WithEnvironment("SERVICES", "sns") + .WithEnvironment("AWS_ACCESS_KEY_ID", "test") + .WithEnvironment("AWS_SECRET_ACCESS_KEY", "test") + .WithEnvironment("AWS_DEFAULT_REGION", "us-east-1"); + +var gateway = builder.AddProject("gateway") + .WithEndpoint("https", e => e.Port = 7000) + .WithExternalHttpEndpoints(); + +const int startApiPort = 6001; +const int replicaCount = 5; +var apiReplicas = new List>(); + +for (var i = 0; i < replicaCount; i++) +{ + var port = startApiPort + i; + var api = builder.AddProject($"api-{i + 1}") + .WithReference(redis) + .WithEndpoint("https", e => e.Port = port) + .WithEnvironment("ASPNETCORE_ENVIRONMENT", "Development") + .WithEnvironment("AWS__ServiceURL", "http://localhost:4566") + .WithEnvironment("AWS__Region", "us-east-1") + .WithEnvironment("AWS__AccessKeyId", "test") + .WithEnvironment("AWS__SecretAccessKey", "test") + .WithEnvironment("SNS__TopicArn", "arn:aws:sns:us-east-1:000000000000:employee-events") + .WaitFor(redis) + .WaitFor(localstack); + + apiReplicas.Add(api); + gateway.WaitFor(api); +} + +var fileService = builder.AddProject("fileservice") + .WaitFor(minio) + .WaitFor(localstack) + .WithEnvironment("MinIO__Endpoint", "http://localhost:9000") + .WithEnvironment("MinIO__AccessKey", "minioadmin") + .WithEnvironment("MinIO__SecretKey", "minioadmin") + .WithEnvironment("MinIO__BucketName", "employee-data"); + +foreach (var replica in apiReplicas) +{ + gateway.WithReference(replica); +} + +var client = builder.AddProject("client") + .WithReference(gateway) + .WaitFor(gateway); + +builder.Build().Run(); \ No newline at end of file diff --git a/CompanyEmployee.AppHost/CompanyEmployee.AppHost.csproj b/CompanyEmployee.AppHost/CompanyEmployee.AppHost.csproj new file mode 100644 index 00000000..6a08073b --- /dev/null +++ b/CompanyEmployee.AppHost/CompanyEmployee.AppHost.csproj @@ -0,0 +1,27 @@ + + + + + + Exe + net8.0 + enable + enable + 78f7593b-e0aa-4c9f-9165-d722e0a4dde4 + + + + + + + + + + + + + + + + + diff --git a/CompanyEmployee.AppHost/Properties/launchSettings.json b/CompanyEmployee.AppHost/Properties/launchSettings.json new file mode 100644 index 00000000..6c680ac5 --- /dev/null +++ b/CompanyEmployee.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:17057;http://localhost:15121", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development", + "DOTNET_ENVIRONMENT": "Development", + "ASPIRE_DASHBOARD_OTLP_ENDPOINT_URL": "https://localhost:21201", + "ASPIRE_RESOURCE_SERVICE_ENDPOINT_URL": "https://localhost:22004" + } + }, + "http": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": true, + "applicationUrl": "http://localhost:15121", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development", + "DOTNET_ENVIRONMENT": "Development", + "ASPIRE_DASHBOARD_OTLP_ENDPOINT_URL": "http://localhost:19103", + "ASPIRE_RESOURCE_SERVICE_ENDPOINT_URL": "http://localhost:20107" + } + } + } +} diff --git a/CompanyEmployee.AppHost/appsettings.Development.json b/CompanyEmployee.AppHost/appsettings.Development.json new file mode 100644 index 00000000..0c208ae9 --- /dev/null +++ b/CompanyEmployee.AppHost/appsettings.Development.json @@ -0,0 +1,8 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning" + } + } +} diff --git a/CompanyEmployee.AppHost/appsettings.json b/CompanyEmployee.AppHost/appsettings.json new file mode 100644 index 00000000..31c092aa --- /dev/null +++ b/CompanyEmployee.AppHost/appsettings.json @@ -0,0 +1,9 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning", + "Aspire.Hosting.Dcp": "Warning" + } + } +} diff --git a/CompanyEmployee.AppHost/setup-sns.ps1 b/CompanyEmployee.AppHost/setup-sns.ps1 new file mode 100644 index 00000000..b6dfd06a --- /dev/null +++ b/CompanyEmployee.AppHost/setup-sns.ps1 @@ -0,0 +1,32 @@ +Write-Host "Initializing LocalStack for SNS" + +$maxAttempts = 30 +$attempt = 0 +while ($attempt -lt $maxAttempts) { + try { + awslocal sns list-topics 2>$null + if ($LASTEXITCODE -eq 0) { + Write-Host "LocalStack is ready!" + break + } + } catch {} + $attempt++ + Write-Host "Waiting for LocalStack (attempt $attempt/$maxAttempts)" + Start-Sleep -Seconds 1 +} + +if ($attempt -eq $maxAttempts) { + Write-Host "ERROR: LocalStack failed to start" + exit 1 +} + +Write-Host "Creating SNS topic..." +awslocal sns create-topic --name employee-events + +Write-Host "Subscribing FileService to SNS topic..." +awslocal sns subscribe ` + --topic-arn arn:aws:sns:us-east-1:000000000000:employee-events ` + --protocol http ` + --notification-endpoint http://host.docker.internal:7277/api/sns/notification + +Write-Host "SNS topic created and FileService subscribed successfully" \ No newline at end of file diff --git a/CompanyEmployee.Domain/CompanyEmployee.Domain.csproj b/CompanyEmployee.Domain/CompanyEmployee.Domain.csproj new file mode 100644 index 00000000..fa71b7ae --- /dev/null +++ b/CompanyEmployee.Domain/CompanyEmployee.Domain.csproj @@ -0,0 +1,9 @@ + + + + net8.0 + enable + enable + + + diff --git a/CompanyEmployee.Domain/Entity/Employee.cs b/CompanyEmployee.Domain/Entity/Employee.cs new file mode 100644 index 00000000..88b7935e --- /dev/null +++ b/CompanyEmployee.Domain/Entity/Employee.cs @@ -0,0 +1,57 @@ +namespace CompanyEmployee.Domain.Entity; + +/// +/// Представляет сотрудника компании со всеми характеристиками. +/// +public class Employee +{ + /// + /// Идентификатор сотрудника в системе + /// + public int Id { get; set; } + + /// + /// ФИО + /// + public string FullName { get; set; } = string.Empty; + + /// + /// Должность + /// + public string Position { get; set; } = string.Empty; + + /// + /// Отдел + /// + public string Department { get; set; } = string.Empty; + + /// + /// Дата приема + /// + public DateOnly HireDate { get; set; } + + /// + /// Зарплата + /// + public decimal Salary { get; set; } + + /// + /// Электронная почта + /// + public string Email { get; set; } = string.Empty; + + /// + /// Телефон + /// + public string Phone { get; set; } = string.Empty; + + /// + /// Индикатор увольнения + /// + public bool IsTerminated { get; set; } + + /// + /// Дата увольнения + /// + public DateOnly? TerminationDate { get; set; } +} \ No newline at end of file diff --git a/CompanyEmployee.FileService/CompanyEmployee.FileService.csproj b/CompanyEmployee.FileService/CompanyEmployee.FileService.csproj new file mode 100644 index 00000000..059f3c75 --- /dev/null +++ b/CompanyEmployee.FileService/CompanyEmployee.FileService.csproj @@ -0,0 +1,19 @@ + + + + net8.0 + enable + enable + + + + + + + + + + + + + diff --git a/CompanyEmployee.FileService/Program.cs b/CompanyEmployee.FileService/Program.cs new file mode 100644 index 00000000..77b49f54 --- /dev/null +++ b/CompanyEmployee.FileService/Program.cs @@ -0,0 +1,111 @@ +using CompanyEmployee.Domain.Entity; +using CompanyEmployee.FileService.Services; +using CompanyEmployee.ServiceDefaults; +using Minio; +using Minio.DataModel.Args; +using System.Text; +using System.Text.Json; + +var builder = WebApplication.CreateBuilder(args); +builder.AddServiceDefaults(); + +builder.AddMinioClient("minio"); + +var bucketName = builder.Configuration["MinIO:BucketName"] ?? "employee-data"; + +builder.Services.AddSingleton(); +builder.Services.AddSingleton(bucketName); + +builder.Services.AddControllers(); +builder.Services.AddEndpointsApiExplorer(); +builder.Services.AddSwaggerGen(); + +var app = builder.Build(); + +using (var scope = app.Services.CreateScope()) +{ + var minioClient = scope.ServiceProvider.GetRequiredService(); + var bucket = bucketName; + + var bucketExists = await minioClient.BucketExistsAsync(new BucketExistsArgs().WithBucket(bucket)); + if (!bucketExists) + { + await minioClient.MakeBucketAsync(new MakeBucketArgs().WithBucket(bucket)); + Console.WriteLine($" {bucket} "); + } +} + +app.MapDefaultEndpoints(); + +if (app.Environment.IsDevelopment()) +{ + app.UseSwagger(); + app.UseSwaggerUI(); +} + +app.UseHttpsRedirection(); +app.MapControllers(); + +app.MapPost("/api/sns/notification", async (HttpRequest request, IStorageService storage, ILogger logger) => +{ + using var reader = new StreamReader(request.Body); + var body = await reader.ReadToEndAsync(); + + using var doc = JsonDocument.Parse(body); + var type = doc.RootElement.GetProperty("Type").GetString(); + + if (type == "SubscriptionConfirmation") + { + var subscribeUrl = doc.RootElement.GetProperty("SubscribeURL").GetString(); + logger.LogInformation(" : {Url}", subscribeUrl); + + using var client = new HttpClient(); + await client.GetAsync(subscribeUrl); + + return Results.Ok(new { message = "Subscription confirmed" }); + } + + if (type == "Notification") + { + var messageJson = doc.RootElement.GetProperty("Message").GetString(); + var employee = JsonSerializer.Deserialize(messageJson, new JsonSerializerOptions { PropertyNameCaseInsensitive = true }); + + if (employee != null) + { + var fileName = $"employee_{employee.Id}.json"; + var content = JsonSerializer.SerializeToUtf8Bytes(employee); + await storage.SaveFileAsync(bucketName, fileName, content); + logger.LogInformation(" {Id} MinIO", employee.Id); + } + } + + return Results.Ok(); +}); + +app.MapGet("/api/files", async (IStorageService storage) => +{ + var files = await storage.ListFilesAsync(bucketName); + return Results.Ok(new { count = files.Count(), files }); +}); + +app.MapGet("/api/files/{fileName}", async (string fileName, IStorageService storage) => +{ + var content = await storage.GetFileAsync(bucketName, fileName); + if (content == null) return Results.NotFound(); + var json = Encoding.UTF8.GetString(content); + return Results.Text(json, "application/json"); +}); + +app.MapGet("/api/files/exists/{fileName}", async (string fileName, IStorageService storage) => +{ + var exists = await storage.FileExistsAsync(bucketName, fileName); + return exists ? Results.Ok() : Results.NotFound(); +}); + +app.MapGet("/api/files/{fileName}/metadata", async (string fileName, IStorageService storage) => +{ + var metadata = await storage.GetFileMetadataAsync(bucketName, fileName); + return metadata != null ? Results.Ok(metadata) : Results.NotFound(); +}); + +app.Run(); \ No newline at end of file diff --git a/CompanyEmployee.FileService/Properties/launchSettings.json b/CompanyEmployee.FileService/Properties/launchSettings.json new file mode 100644 index 00000000..7927ee78 --- /dev/null +++ b/CompanyEmployee.FileService/Properties/launchSettings.json @@ -0,0 +1,38 @@ +{ + "$schema": "http://json.schemastore.org/launchsettings.json", + "iisSettings": { + "windowsAuthentication": false, + "anonymousAuthentication": true, + "iisExpress": { + "applicationUrl": "http://localhost:1928", + "sslPort": 44325 + } + }, + "profiles": { + "http": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": true, + "applicationUrl": "http://localhost:5194", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + }, + "https": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": false, + "applicationUrl": "https://localhost:7277;http://localhost:5194", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + }, + "IIS Express": { + "commandName": "IISExpress", + "launchBrowser": true, + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + } + } +} diff --git a/CompanyEmployee.FileService/Services/IStorageService.cs b/CompanyEmployee.FileService/Services/IStorageService.cs new file mode 100644 index 00000000..af21ce81 --- /dev/null +++ b/CompanyEmployee.FileService/Services/IStorageService.cs @@ -0,0 +1,37 @@ +namespace CompanyEmployee.FileService.Services; + +/// +/// Интерфейс для работы с объектным хранилищем. +/// +public interface IStorageService +{ + /// + /// Сохраняет файл в хранилище. + /// + public Task SaveFileAsync(string bucketName, string key, byte[] content); + + /// + /// Проверяет существование файла. + /// + public Task FileExistsAsync(string bucketName, string key); + + /// + /// Возвращает список всех файлов в бакете. + /// + public Task> ListFilesAsync(string bucketName); + + /// + /// Возвращает содержимое файла. + /// + public Task GetFileAsync(string bucketName, string key); + + /// + /// Возвращает метаданные файла. + /// + public Task GetFileMetadataAsync(string bucketName, string key); +} + +/// +/// Метаданные файла. +/// +public record FileMetadata(string Name, long Size, DateTime LastModified); \ No newline at end of file diff --git a/CompanyEmployee.FileService/Services/MinioStorageService.cs b/CompanyEmployee.FileService/Services/MinioStorageService.cs new file mode 100644 index 00000000..af9f7e61 --- /dev/null +++ b/CompanyEmployee.FileService/Services/MinioStorageService.cs @@ -0,0 +1,120 @@ +using Minio; +using Minio.DataModel.Args; + +namespace CompanyEmployee.FileService.Services; + +/// +/// Реализация хранилища через MinIO. +/// +/// Клиент MinIO. +/// Логгер. +public class MinioStorageService( + IMinioClient minioClient, + ILogger logger) : IStorageService +{ + public async Task SaveFileAsync(string bucketName, string key, byte[] content) + { + try + { + var bucketExists = await minioClient.BucketExistsAsync(new BucketExistsArgs().WithBucket(bucketName)); + if (!bucketExists) + { + await minioClient.MakeBucketAsync(new MakeBucketArgs().WithBucket(bucketName)); + logger.LogInformation("Создан бакет {BucketName}", bucketName); + } + + using var stream = new MemoryStream(content); + await minioClient.PutObjectAsync(new PutObjectArgs() + .WithBucket(bucketName) + .WithObject(key) + .WithStreamData(stream) + .WithObjectSize(stream.Length) + .WithContentType("application/json")); + + logger.LogInformation("Файл {Key} загружен в MinIO", key); + } + catch (Exception ex) + { + logger.LogError(ex, "Ошибка загрузки файла {Key}", key); + throw; + } + } + + public async Task FileExistsAsync(string bucketName, string key) + { + try + { + await minioClient.StatObjectAsync(new StatObjectArgs() + .WithBucket(bucketName) + .WithObject(key)); + return true; + } + catch (Exception ex) + { + logger.LogWarning(ex, "Ошибка при проверке файла {Key}", key); + return false; + } + } + + public async Task> ListFilesAsync(string bucketName) + { + var files = new List(); + try + { + var args = new ListObjectsArgs() + .WithBucket(bucketName) + .WithRecursive(true); + + await foreach (var item in minioClient.ListObjectsEnumAsync(args)) + { + files.Add(item.Key); + } + + logger.LogInformation("Получен список файлов из бакета {BucketName}, найдено {Count} файлов", bucketName, files.Count); + } + catch (Exception ex) + { + logger.LogError(ex, "Ошибка при получении списка файлов из бакета {BucketName}", bucketName); + } + return files; + } + + public async Task GetFileAsync(string bucketName, string key) + { + try + { + using var memoryStream = new MemoryStream(); + var args = new GetObjectArgs() + .WithBucket(bucketName) + .WithObject(key) + .WithCallbackStream(stream => stream.CopyTo(memoryStream)); + + await minioClient.GetObjectAsync(args); + logger.LogInformation("Файл {Key} загружен из MinIO", key); + return memoryStream.ToArray(); + } + catch (Exception ex) + { + logger.LogError(ex, "Ошибка при получении файла {Key}", key); + return null; + } + } + + public async Task GetFileMetadataAsync(string bucketName, string key) + { + try + { + var args = new StatObjectArgs() + .WithBucket(bucketName) + .WithObject(key); + + var stat = await minioClient.StatObjectAsync(args); + return new FileMetadata(key, stat.Size, stat.LastModified); + } + catch (Exception ex) + { + logger.LogWarning(ex, "Ошибка при получении метаданных файла {Key}", key); + return null; + } + } +} \ No newline at end of file diff --git a/CompanyEmployee.FileService/appsettings.Development.json b/CompanyEmployee.FileService/appsettings.Development.json new file mode 100644 index 00000000..c054fc38 --- /dev/null +++ b/CompanyEmployee.FileService/appsettings.Development.json @@ -0,0 +1,17 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning" + } + }, + "AWS": { + "ServiceURL": "http://localhost:4566", + "Region": "us-east-1", + "AccessKeyId": "test", + "SecretAccessKey": "test" + }, + "S3": { + "BucketName": "employee-data" + } +} \ No newline at end of file diff --git a/CompanyEmployee.FileService/appsettings.json b/CompanyEmployee.FileService/appsettings.json new file mode 100644 index 00000000..ac6c3c11 --- /dev/null +++ b/CompanyEmployee.FileService/appsettings.json @@ -0,0 +1,11 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning" + } + }, + "ConnectionStrings": { + "minio": "Endpoint=http://localhost:9000;AccessKey=minioadmin;SecretKey=minioadmin" + } +} \ No newline at end of file diff --git a/CompanyEmployee.Gateway/CompanyEmployee.Gateway.csproj b/CompanyEmployee.Gateway/CompanyEmployee.Gateway.csproj new file mode 100644 index 00000000..31d4bc8c --- /dev/null +++ b/CompanyEmployee.Gateway/CompanyEmployee.Gateway.csproj @@ -0,0 +1,23 @@ + + + + net8.0 + enable + enable + + + + + + + + + + + + + + + + + diff --git a/CompanyEmployee.Gateway/LoadBalancers/WeightedRandomLoadBalancer.cs b/CompanyEmployee.Gateway/LoadBalancers/WeightedRandomLoadBalancer.cs new file mode 100644 index 00000000..122f831d --- /dev/null +++ b/CompanyEmployee.Gateway/LoadBalancers/WeightedRandomLoadBalancer.cs @@ -0,0 +1,82 @@ +using Ocelot.Errors; +using Ocelot.LoadBalancer.Interfaces; +using Ocelot.Responses; +using Ocelot.Values; + +namespace CompanyEmployee.Gateway.LoadBalancers; + +/// +/// Балансировщик с взвешенным случайным распределением запросов. +/// +public class WeightedRandomLoadBalancer : ILoadBalancer +{ + private readonly List _services; + private readonly Dictionary _weights; + private readonly Random _random = new(); + private readonly object _lock = new(); + + /// + /// Тип балансировщика. + /// + public string Type => nameof(WeightedRandomLoadBalancer); + + /// + /// Инициализирует новый экземпляр балансировщика с весами. + /// + /// Список сервисов. + /// Словарь весов для каждого сервиса. + public WeightedRandomLoadBalancer(List services, Dictionary weights) + { + _services = services; + _weights = weights; + } + + /// + public Task> LeaseAsync(HttpContext httpContext) + { + lock (_lock) + { + var weightedList = new List(); + + foreach (var service in _services) + { + var key = $"{service.HostAndPort.DownstreamHost}:{service.HostAndPort.DownstreamPort}"; + var weight = _weights.GetValueOrDefault(key, 1); + + for (var i = 0; i < weight; i++) + { + weightedList.Add(service); + } + } + + if (weightedList.Count == 0) + { + return Task.FromResult>( + new ErrorResponse(new List + { + new UnableToFindServiceError() + })); + } + + var selected = weightedList[_random.Next(weightedList.Count)]; + return Task.FromResult>( + new OkResponse(selected.HostAndPort)); + } + } + + /// + public void Release(ServiceHostAndPort hostAndPort) + { + } +} + +/// +/// Ошибка, возникающая когда сервис не найден. +/// +public class UnableToFindServiceError : Error +{ + public UnableToFindServiceError() + : base("Нет доступных сервисов для обработки запроса", OcelotErrorCode.UnableToFindDownstreamRouteError, 404) + { + } +} \ No newline at end of file diff --git a/CompanyEmployee.Gateway/LoadBalancers/WeightedRandomLoadBalancerFactory.cs b/CompanyEmployee.Gateway/LoadBalancers/WeightedRandomLoadBalancerFactory.cs new file mode 100644 index 00000000..866f4902 --- /dev/null +++ b/CompanyEmployee.Gateway/LoadBalancers/WeightedRandomLoadBalancerFactory.cs @@ -0,0 +1,47 @@ +using Ocelot.Configuration; +using Ocelot.LoadBalancer.Interfaces; +using Ocelot.Responses; +using Ocelot.Values; + +namespace CompanyEmployee.Gateway.LoadBalancers; + +/// +/// Фабрика для создания взвешенного случайного балансировщика. +/// +public class WeightedRandomLoadBalancerFactory : ILoadBalancerFactory +{ + private readonly Dictionary _defaultWeights = new() + { + { "localhost:6001", 5 }, + { "localhost:6002", 4 }, + { "localhost:6003", 3 }, + { "localhost:6004", 2 }, + { "localhost:6005", 1 } + }; + + /// + public Response Get(DownstreamRoute route, ServiceProviderConfiguration config) + { + var services = new List(); + + foreach (var address in route.DownstreamAddresses) + { + var serviceHostAndPort = new ServiceHostAndPort( + address.Host, + address.Port, + route.DownstreamScheme); + + var service = new Service( + $"{address.Host}:{address.Port}", + serviceHostAndPort, + string.Empty, + string.Empty, + Enumerable.Empty()); + + services.Add(service); + } + + var loadBalancer = new WeightedRandomLoadBalancer(services, _defaultWeights); + return new OkResponse(loadBalancer); + } +} \ No newline at end of file diff --git a/CompanyEmployee.Gateway/Program.cs b/CompanyEmployee.Gateway/Program.cs new file mode 100644 index 00000000..42408388 --- /dev/null +++ b/CompanyEmployee.Gateway/Program.cs @@ -0,0 +1,37 @@ +using CompanyEmployee.Gateway.LoadBalancers; +using CompanyEmployee.ServiceDefaults; +using Ocelot.DependencyInjection; +using Ocelot.Middleware; +using Ocelot.Provider.Polly; +using Ocelot.LoadBalancer.Interfaces; + +var builder = WebApplication.CreateBuilder(args); + +builder.AddServiceDefaults(); + +builder.Configuration.AddJsonFile("ocelot.json", false, true); + +builder.Services.AddCors(options => +{ + options.AddPolicy("wasm", policy => + { + policy.AllowAnyOrigin() + .WithMethods("GET") + .WithHeaders("Content-Type"); + }); +}); + +builder.Services.AddOcelot() + .AddPolly(); + +builder.Services.AddSingleton(); + +var app = builder.Build(); + +app.MapDefaultEndpoints(); +app.UseCors("wasm"); +app.UseHttpsRedirection(); + +await app.UseOcelot(); + +app.Run(); \ No newline at end of file diff --git a/CompanyEmployee.Gateway/Properties/launchSettings.json b/CompanyEmployee.Gateway/Properties/launchSettings.json new file mode 100644 index 00000000..3c66d5ce --- /dev/null +++ b/CompanyEmployee.Gateway/Properties/launchSettings.json @@ -0,0 +1,41 @@ +{ + "$schema": "http://json.schemastore.org/launchsettings.json", + "iisSettings": { + "windowsAuthentication": false, + "anonymousAuthentication": true, + "iisExpress": { + "applicationUrl": "http://localhost:28509", + "sslPort": 44389 + } + }, + "profiles": { + "http": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": false, + "launchUrl": "swagger", + "applicationUrl": "http://localhost:7001", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + }, + "https": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": false, + "launchUrl": "swagger", + "applicationUrl": "https://localhost:7001", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + }, + "IIS Express": { + "commandName": "IISExpress", + "launchBrowser": true, + "launchUrl": "swagger", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + } + } +} \ No newline at end of file diff --git a/CompanyEmployee.Gateway/appsettings.Development.json b/CompanyEmployee.Gateway/appsettings.Development.json new file mode 100644 index 00000000..0c208ae9 --- /dev/null +++ b/CompanyEmployee.Gateway/appsettings.Development.json @@ -0,0 +1,8 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning" + } + } +} diff --git a/CompanyEmployee.Gateway/appsettings.json b/CompanyEmployee.Gateway/appsettings.json new file mode 100644 index 00000000..10f68b8c --- /dev/null +++ b/CompanyEmployee.Gateway/appsettings.json @@ -0,0 +1,9 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning" + } + }, + "AllowedHosts": "*" +} diff --git a/CompanyEmployee.Gateway/ocelot.json b/CompanyEmployee.Gateway/ocelot.json new file mode 100644 index 00000000..1bf4faf0 --- /dev/null +++ b/CompanyEmployee.Gateway/ocelot.json @@ -0,0 +1,44 @@ +{ + "Routes": [ + { + "DownstreamPathTemplate": "/api/employee", + "DownstreamScheme": "https", + "DownstreamHostAndPorts": [ + { + "Host": "localhost", + "Port": 6001 + }, + { + "Host": "localhost", + "Port": 6002 + }, + { + "Host": "localhost", + "Port": 6003 + }, + { + "Host": "localhost", + "Port": 6004 + }, + { + "Host": "localhost", + "Port": 6005 + } + ], + "UpstreamPathTemplate": "/api/employee", + "UpstreamHttpMethod": [ "GET" ], + "LoadBalancerOptions": { + "Type": "WeightedRandom", + "Key": "employee-service" + }, + "QoSOptions": { + "ExceptionsAllowedBeforeBreaking": 3, + "DurationOfBreak": 30000, + "TimeoutValue": 5000 + } + } + ], + "GlobalConfiguration": { + "BaseUrl": "https://localhost:7001" + } +} \ No newline at end of file diff --git a/CompanyEmployee.IntegrationTests/BasicTest.cs b/CompanyEmployee.IntegrationTests/BasicTest.cs new file mode 100644 index 00000000..e66bb8a2 --- /dev/null +++ b/CompanyEmployee.IntegrationTests/BasicTest.cs @@ -0,0 +1,160 @@ +using CompanyEmployee.Domain.Entity; +using System.Text.Json; + +namespace CompanyEmployee.IntegrationTests; + +/// +/// . +/// +public class BasicTests +{ + private readonly HttpClient _apiClient; + private readonly HttpClient _gatewayClient; + private readonly HttpClient _fileServiceClient; + + public BasicTests() + { + _apiClient = new HttpClient + { + BaseAddress = new Uri("https://localhost:6001") + }; + + _gatewayClient = new HttpClient + { + BaseAddress = new Uri("https://localhost:7000") + }; + + _fileServiceClient = new HttpClient + { + BaseAddress = new Uri("https://localhost:7277") + }; + } + + /// + /// , API . + /// + [Fact] + public async Task GetEmployee_ShouldReturnEmployee() + { + var response = await _apiClient.GetAsync("/api/employee?id=1"); + response.EnsureSuccessStatusCode(); + + var content = await response.Content.ReadAsStringAsync(); + var employee = JsonSerializer.Deserialize(content, new JsonSerializerOptions + { + PropertyNameCaseInsensitive = true + }); + + Assert.NotNull(employee); + Assert.Equal(1, employee.Id); + Assert.False(string.IsNullOrEmpty(employee.FullName)); + } + + /// + /// Redis. + /// + [Fact] + public async Task SameEmployeeId_ShouldReturnSameData() + { + var response1 = await _apiClient.GetAsync("/api/employee?id=2"); + var content1 = await response1.Content.ReadAsStringAsync(); + + var response2 = await _apiClient.GetAsync("/api/employee?id=2"); + var content2 = await response2.Content.ReadAsStringAsync(); + + Assert.Equal(content1, content2); + } + + /// + /// , ID . + /// + [Fact] + public async Task DifferentIds_ShouldGenerateDifferentEmployees() + { + var response1 = await _apiClient.GetAsync("/api/employee?id=10"); + var employee1 = JsonSerializer.Deserialize( + await response1.Content.ReadAsStringAsync(), + new JsonSerializerOptions { PropertyNameCaseInsensitive = true }); + + var response2 = await _apiClient.GetAsync("/api/employee?id=20"); + var employee2 = JsonSerializer.Deserialize( + await response2.Content.ReadAsStringAsync(), + new JsonSerializerOptions { PropertyNameCaseInsensitive = true }); + + Assert.NotNull(employee1); + Assert.NotNull(employee2); + Assert.NotEqual(employee1.FullName, employee2.FullName); + } + + /// + /// Gateway (Weighted Random). + /// + [Fact] + public async Task LoadBalancer_ShouldDistributeRequests() + { + var requestsCount = 50; + var successCount = 0; + + for (var i = 0; i < requestsCount; i++) + { + var response = await _gatewayClient.GetAsync($"/api/employee?id={i + 1}"); + if (response.IsSuccessStatusCode) + { + successCount++; + } + } + + Assert.Equal(requestsCount, successCount); + } + + /// + /// SNS S3. + /// + [Fact] + public async Task EmployeeGeneration_ShouldSendToSnsAndSaveToS3() + { + var employeeId = 777; + await _fileServiceClient.GetAsync("/health"); + await Task.Delay(5000); + var response = await _apiClient.GetAsync($"/api/employee?id={employeeId}"); + response.EnsureSuccessStatusCode(); + + await Task.Delay(3000); + + var fileCheckResponse = await _fileServiceClient.GetAsync($"/api/files/exists/employee_{employeeId}.json"); + + Assert.True(fileCheckResponse.IsSuccessStatusCode, " S3 "); + } + + /// + /// : -> -> -> . + /// + [Fact] + public async Task FullCycle_ShouldWorkCorrectly() + { + var employeeId = 777; + + var startTime = DateTime.Now; + var response = await _apiClient.GetAsync($"/api/employee?id={employeeId}"); + var firstDuration = DateTime.Now - startTime; + + response.EnsureSuccessStatusCode(); + var employee = JsonSerializer.Deserialize( + await response.Content.ReadAsStringAsync(), + new JsonSerializerOptions { PropertyNameCaseInsensitive = true }); + + Assert.NotNull(employee); + Assert.Equal(employeeId, employee.Id); + + startTime = DateTime.Now; + var cachedResponse = await _apiClient.GetAsync($"/api/employee?id={employeeId}"); + var secondDuration = DateTime.Now - startTime; + + Assert.True(secondDuration < firstDuration, " ()"); + + await Task.Delay(3000); + + var fileExists = await _fileServiceClient.GetAsync($"/api/files/exists/employee_{employeeId}.json"); + Assert.True(fileExists.IsSuccessStatusCode, " S3"); + } +} \ No newline at end of file diff --git a/CompanyEmployee.IntegrationTests/CompanyEmployee.IntegrationTests.csproj b/CompanyEmployee.IntegrationTests/CompanyEmployee.IntegrationTests.csproj new file mode 100644 index 00000000..72b8529e --- /dev/null +++ b/CompanyEmployee.IntegrationTests/CompanyEmployee.IntegrationTests.csproj @@ -0,0 +1,31 @@ + + + + net8.0 + enable + enable + + false + true + + + + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + + + + + + + + + + diff --git a/CompanyEmployee.ServiceDefaults/CompanyEmployee.ServiceDefaults.csproj b/CompanyEmployee.ServiceDefaults/CompanyEmployee.ServiceDefaults.csproj new file mode 100644 index 00000000..6ee49167 --- /dev/null +++ b/CompanyEmployee.ServiceDefaults/CompanyEmployee.ServiceDefaults.csproj @@ -0,0 +1,22 @@ + + + + net8.0 + enable + enable + true + + + + + + + + + + + + + + + diff --git a/CompanyEmployee.ServiceDefaults/Extensions.cs b/CompanyEmployee.ServiceDefaults/Extensions.cs new file mode 100644 index 00000000..e23f6c60 --- /dev/null +++ b/CompanyEmployee.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.Hosting; +using Microsoft.Extensions.Logging; +using OpenTelemetry; +using OpenTelemetry.Metrics; +using OpenTelemetry.Trace; + +namespace CompanyEmployee.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/README.md b/README.md deleted file mode 100644 index dcaa5eb7..00000000 --- a/README.md +++ /dev/null @@ -1,128 +0,0 @@ -# Современные технологии разработки программного обеспечения -[Таблица с успеваемостью](https://docs.google.com/spreadsheets/d/1an43o-iqlq4V_kDtkr_y7DC221hY9qdhGPrpII27sH8/edit?usp=sharing) - -## Задание -### Цель -Реализация проекта микросервисного бекенда. - -### Задачи -* Реализация межсервисной коммуникации, -* Изучение работы с брокерами сообщений, -* Изучение архитектурных паттернов, -* Изучение работы со средствами оркестрации на примере .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). -