diff --git a/Client.Wasm/Components/StudentCard.razor b/Client.Wasm/Components/StudentCard.razor index 661f1181..e272049c 100644 --- a/Client.Wasm/Components/StudentCard.razor +++ b/Client.Wasm/Components/StudentCard.razor @@ -4,10 +4,10 @@ - Номер №X "Название лабораторной" - Вариант №Х "Название варианта" - Выполнена Фамилией Именем 65ХХ - Ссылка на форк + Номер №3 "Интеграционное тестирование" + Вариант №17 "Транспортное средство" + Выполнена Чукаревым Михаилом 6511 + Ссылка на форк diff --git a/Client.Wasm/Properties/launchSettings.json b/Client.Wasm/Properties/launchSettings.json index 0d824ea7..f08b1cea 100644 --- a/Client.Wasm/Properties/launchSettings.json +++ b/Client.Wasm/Properties/launchSettings.json @@ -12,7 +12,7 @@ "http": { "commandName": "Project", "dotnetRunMessages": true, - "launchBrowser": true, + "launchBrowser": false, "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}", "applicationUrl": "http://localhost:5127", "environmentVariables": { @@ -22,7 +22,7 @@ "https": { "commandName": "Project", "dotnetRunMessages": true, - "launchBrowser": true, + "launchBrowser": false, "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}", "applicationUrl": "https://localhost:7282;http://localhost:5127", "environmentVariables": { @@ -31,11 +31,11 @@ }, "IIS Express": { "commandName": "IISExpress", - "launchBrowser": true, + "launchBrowser": false, "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" } } } -} +} \ No newline at end of file diff --git a/Client.Wasm/wwwroot/appsettings.json b/Client.Wasm/wwwroot/appsettings.json index d1fe7ab3..6a94713f 100644 --- a/Client.Wasm/wwwroot/appsettings.json +++ b/Client.Wasm/wwwroot/appsettings.json @@ -6,5 +6,6 @@ } }, "AllowedHosts": "*", - "BaseAddress": "" + "BaseAddress": "http://localhost:5200/api/vehicles" } + diff --git a/CloudDevelopment.sln b/CloudDevelopment.sln index cb48241d..516335e2 100644 --- a/CloudDevelopment.sln +++ b/CloudDevelopment.sln @@ -5,20 +5,143 @@ 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("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{827E0CD3-B72D-47B6-A68D-7590B98EB39B}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceDefaults", "src\ServiceDefaults\ServiceDefaults.csproj", "{207C1A03-203E-4804-854F-0B70D3B0226F}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VehicleApi", "src\VehicleApi\VehicleApi.csproj", "{8C4738CB-0C2F-4664-9F35-62F27C0E5877}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{0AB3BF05-4346-4AA6-1389-037BE0695223}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VehicleApi.Tests", "tests\VehicleApi.Tests\VehicleApi.Tests.csproj", "{E6CB2EEC-E2A0-449F-89DE-11AE5579B37B}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ApiGateway", "src\ApiGateway\ApiGateway.csproj", "{42CE0FED-8889-49C7-988A-E8E12D59DCA2}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AppHost", "src\AppHost\AppHost.csproj", "{BD8774D8-8997-4902-B545-B6EEB3304A63}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FileService", "src\FileService\FileService.csproj", "{E0EC95F2-7EB9-4055-886A-E96E2297F109}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Integration.Tests", "tests\Integration.Tests\Integration.Tests.csproj", "{AA5B48F3-EF9D-405A-AE6C-F86D4BE9B2FA}" +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 + {207C1A03-203E-4804-854F-0B70D3B0226F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {207C1A03-203E-4804-854F-0B70D3B0226F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {207C1A03-203E-4804-854F-0B70D3B0226F}.Debug|x64.ActiveCfg = Debug|Any CPU + {207C1A03-203E-4804-854F-0B70D3B0226F}.Debug|x64.Build.0 = Debug|Any CPU + {207C1A03-203E-4804-854F-0B70D3B0226F}.Debug|x86.ActiveCfg = Debug|Any CPU + {207C1A03-203E-4804-854F-0B70D3B0226F}.Debug|x86.Build.0 = Debug|Any CPU + {207C1A03-203E-4804-854F-0B70D3B0226F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {207C1A03-203E-4804-854F-0B70D3B0226F}.Release|Any CPU.Build.0 = Release|Any CPU + {207C1A03-203E-4804-854F-0B70D3B0226F}.Release|x64.ActiveCfg = Release|Any CPU + {207C1A03-203E-4804-854F-0B70D3B0226F}.Release|x64.Build.0 = Release|Any CPU + {207C1A03-203E-4804-854F-0B70D3B0226F}.Release|x86.ActiveCfg = Release|Any CPU + {207C1A03-203E-4804-854F-0B70D3B0226F}.Release|x86.Build.0 = Release|Any CPU + {8C4738CB-0C2F-4664-9F35-62F27C0E5877}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8C4738CB-0C2F-4664-9F35-62F27C0E5877}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8C4738CB-0C2F-4664-9F35-62F27C0E5877}.Debug|x64.ActiveCfg = Debug|Any CPU + {8C4738CB-0C2F-4664-9F35-62F27C0E5877}.Debug|x64.Build.0 = Debug|Any CPU + {8C4738CB-0C2F-4664-9F35-62F27C0E5877}.Debug|x86.ActiveCfg = Debug|Any CPU + {8C4738CB-0C2F-4664-9F35-62F27C0E5877}.Debug|x86.Build.0 = Debug|Any CPU + {8C4738CB-0C2F-4664-9F35-62F27C0E5877}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8C4738CB-0C2F-4664-9F35-62F27C0E5877}.Release|Any CPU.Build.0 = Release|Any CPU + {8C4738CB-0C2F-4664-9F35-62F27C0E5877}.Release|x64.ActiveCfg = Release|Any CPU + {8C4738CB-0C2F-4664-9F35-62F27C0E5877}.Release|x64.Build.0 = Release|Any CPU + {8C4738CB-0C2F-4664-9F35-62F27C0E5877}.Release|x86.ActiveCfg = Release|Any CPU + {8C4738CB-0C2F-4664-9F35-62F27C0E5877}.Release|x86.Build.0 = Release|Any CPU + {E6CB2EEC-E2A0-449F-89DE-11AE5579B37B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E6CB2EEC-E2A0-449F-89DE-11AE5579B37B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E6CB2EEC-E2A0-449F-89DE-11AE5579B37B}.Debug|x64.ActiveCfg = Debug|Any CPU + {E6CB2EEC-E2A0-449F-89DE-11AE5579B37B}.Debug|x64.Build.0 = Debug|Any CPU + {E6CB2EEC-E2A0-449F-89DE-11AE5579B37B}.Debug|x86.ActiveCfg = Debug|Any CPU + {E6CB2EEC-E2A0-449F-89DE-11AE5579B37B}.Debug|x86.Build.0 = Debug|Any CPU + {E6CB2EEC-E2A0-449F-89DE-11AE5579B37B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E6CB2EEC-E2A0-449F-89DE-11AE5579B37B}.Release|Any CPU.Build.0 = Release|Any CPU + {E6CB2EEC-E2A0-449F-89DE-11AE5579B37B}.Release|x64.ActiveCfg = Release|Any CPU + {E6CB2EEC-E2A0-449F-89DE-11AE5579B37B}.Release|x64.Build.0 = Release|Any CPU + {E6CB2EEC-E2A0-449F-89DE-11AE5579B37B}.Release|x86.ActiveCfg = Release|Any CPU + {E6CB2EEC-E2A0-449F-89DE-11AE5579B37B}.Release|x86.Build.0 = Release|Any CPU + {42CE0FED-8889-49C7-988A-E8E12D59DCA2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {42CE0FED-8889-49C7-988A-E8E12D59DCA2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {42CE0FED-8889-49C7-988A-E8E12D59DCA2}.Debug|x64.ActiveCfg = Debug|Any CPU + {42CE0FED-8889-49C7-988A-E8E12D59DCA2}.Debug|x64.Build.0 = Debug|Any CPU + {42CE0FED-8889-49C7-988A-E8E12D59DCA2}.Debug|x86.ActiveCfg = Debug|Any CPU + {42CE0FED-8889-49C7-988A-E8E12D59DCA2}.Debug|x86.Build.0 = Debug|Any CPU + {42CE0FED-8889-49C7-988A-E8E12D59DCA2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {42CE0FED-8889-49C7-988A-E8E12D59DCA2}.Release|Any CPU.Build.0 = Release|Any CPU + {42CE0FED-8889-49C7-988A-E8E12D59DCA2}.Release|x64.ActiveCfg = Release|Any CPU + {42CE0FED-8889-49C7-988A-E8E12D59DCA2}.Release|x64.Build.0 = Release|Any CPU + {42CE0FED-8889-49C7-988A-E8E12D59DCA2}.Release|x86.ActiveCfg = Release|Any CPU + {42CE0FED-8889-49C7-988A-E8E12D59DCA2}.Release|x86.Build.0 = Release|Any CPU + {BD8774D8-8997-4902-B545-B6EEB3304A63}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BD8774D8-8997-4902-B545-B6EEB3304A63}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BD8774D8-8997-4902-B545-B6EEB3304A63}.Debug|x64.ActiveCfg = Debug|Any CPU + {BD8774D8-8997-4902-B545-B6EEB3304A63}.Debug|x64.Build.0 = Debug|Any CPU + {BD8774D8-8997-4902-B545-B6EEB3304A63}.Debug|x86.ActiveCfg = Debug|Any CPU + {BD8774D8-8997-4902-B545-B6EEB3304A63}.Debug|x86.Build.0 = Debug|Any CPU + {BD8774D8-8997-4902-B545-B6EEB3304A63}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BD8774D8-8997-4902-B545-B6EEB3304A63}.Release|Any CPU.Build.0 = Release|Any CPU + {BD8774D8-8997-4902-B545-B6EEB3304A63}.Release|x64.ActiveCfg = Release|Any CPU + {BD8774D8-8997-4902-B545-B6EEB3304A63}.Release|x64.Build.0 = Release|Any CPU + {BD8774D8-8997-4902-B545-B6EEB3304A63}.Release|x86.ActiveCfg = Release|Any CPU + {BD8774D8-8997-4902-B545-B6EEB3304A63}.Release|x86.Build.0 = Release|Any CPU + {E0EC95F2-7EB9-4055-886A-E96E2297F109}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E0EC95F2-7EB9-4055-886A-E96E2297F109}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E0EC95F2-7EB9-4055-886A-E96E2297F109}.Debug|x64.ActiveCfg = Debug|Any CPU + {E0EC95F2-7EB9-4055-886A-E96E2297F109}.Debug|x64.Build.0 = Debug|Any CPU + {E0EC95F2-7EB9-4055-886A-E96E2297F109}.Debug|x86.ActiveCfg = Debug|Any CPU + {E0EC95F2-7EB9-4055-886A-E96E2297F109}.Debug|x86.Build.0 = Debug|Any CPU + {E0EC95F2-7EB9-4055-886A-E96E2297F109}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E0EC95F2-7EB9-4055-886A-E96E2297F109}.Release|Any CPU.Build.0 = Release|Any CPU + {E0EC95F2-7EB9-4055-886A-E96E2297F109}.Release|x64.ActiveCfg = Release|Any CPU + {E0EC95F2-7EB9-4055-886A-E96E2297F109}.Release|x64.Build.0 = Release|Any CPU + {E0EC95F2-7EB9-4055-886A-E96E2297F109}.Release|x86.ActiveCfg = Release|Any CPU + {E0EC95F2-7EB9-4055-886A-E96E2297F109}.Release|x86.Build.0 = Release|Any CPU + {AA5B48F3-EF9D-405A-AE6C-F86D4BE9B2FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {AA5B48F3-EF9D-405A-AE6C-F86D4BE9B2FA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {AA5B48F3-EF9D-405A-AE6C-F86D4BE9B2FA}.Debug|x64.ActiveCfg = Debug|Any CPU + {AA5B48F3-EF9D-405A-AE6C-F86D4BE9B2FA}.Debug|x64.Build.0 = Debug|Any CPU + {AA5B48F3-EF9D-405A-AE6C-F86D4BE9B2FA}.Debug|x86.ActiveCfg = Debug|Any CPU + {AA5B48F3-EF9D-405A-AE6C-F86D4BE9B2FA}.Debug|x86.Build.0 = Debug|Any CPU + {AA5B48F3-EF9D-405A-AE6C-F86D4BE9B2FA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {AA5B48F3-EF9D-405A-AE6C-F86D4BE9B2FA}.Release|Any CPU.Build.0 = Release|Any CPU + {AA5B48F3-EF9D-405A-AE6C-F86D4BE9B2FA}.Release|x64.ActiveCfg = Release|Any CPU + {AA5B48F3-EF9D-405A-AE6C-F86D4BE9B2FA}.Release|x64.Build.0 = Release|Any CPU + {AA5B48F3-EF9D-405A-AE6C-F86D4BE9B2FA}.Release|x86.ActiveCfg = Release|Any CPU + {AA5B48F3-EF9D-405A-AE6C-F86D4BE9B2FA}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {207C1A03-203E-4804-854F-0B70D3B0226F} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B} + {8C4738CB-0C2F-4664-9F35-62F27C0E5877} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B} + {E6CB2EEC-E2A0-449F-89DE-11AE5579B37B} = {0AB3BF05-4346-4AA6-1389-037BE0695223} + {42CE0FED-8889-49C7-988A-E8E12D59DCA2} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B} + {BD8774D8-8997-4902-B545-B6EEB3304A63} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B} + {E0EC95F2-7EB9-4055-886A-E96E2297F109} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B} + {AA5B48F3-EF9D-405A-AE6C-F86D4BE9B2FA} = {0AB3BF05-4346-4AA6-1389-037BE0695223} + EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {90FE6B04-8381-437E-893A-FEBA1DA10AEE} EndGlobalSection diff --git a/README.md b/README.md index dcaa5eb7..189f3edf 100644 --- a/README.md +++ b/README.md @@ -1,128 +1,178 @@ # Современные технологии разработки программного обеспечения -[Таблица с успеваемостью](https://docs.google.com/spreadsheets/d/1an43o-iqlq4V_kDtkr_y7DC221hY9qdhGPrpII27sH8/edit?usp=sharing) -## Задание -### Цель -Реализация проекта микросервисного бекенда. +**Вариант №17 — «Транспортное средство»** +**Выполнил:** Чукарев Михаил, группа 6511 -### Задачи -* Реализация межсервисной коммуникации, -* Изучение работы с брокерами сообщений, -* Изучение архитектурных паттернов, -* Изучение работы со средствами оркестрации на примере .NET Aspire, -* Повторение основ работы с системами контроля версий, -* Интеграционное тестирование. +## Лабораторная работа №3 — «Интеграционное тестирование» + +### Описание + +Реализован файловый сервис, сохраняющий данные о транспортных средствах в объектное хранилище через брокер сообщений, а также интеграционные тесты, проверяющие корректность работы всего бэкенда. + +### Что реализовано -### Лабораторные работы
-1. «Кэширование» - Реализация сервиса генерации контрактов, кэширование его ответов -
- -В рамках первой лабораторной работы необходимо: -* Реализовать сервис генерации контрактов на основе Bogus, -* Реализовать кеширование при помощи IDistributedCache и Redis, -* Реализовать структурное логирование сервиса генерации, -* Настроить оркестрацию Aspire. - +Брокер сообщений (Amazon SQS + LocalStack) +
+ +
+Файловый сервис (FileService) +
+ +- `MinioStorageService` — сохраняет JSON каждого сообщения как отдельный файл в MinIO +- Эндпоинт `GET /files` — список всех файлов в bucket + +
+
+ +
+Объектное хранилище (MinIO) +
+ +- Bucket `vehicles` создаётся автоматически при старте FileService +- Хранение JSON-файлов с данными транспортных средств + +
+
+ +
+Интеграционные тесты (xUnit + Aspire Testing) +
+ +- Поднимают весь AppHost целиком (Redis, LocalStack, MinIO, все сервисы) +- `GetVehicle_ValidId_ReturnsOk` — gateway возвращает 200 +- `GetVehicle_ValidId_ReturnsExpectedFields` — ответ содержит все поля +- `GetVehicle_InvalidId_ReturnsBadRequest` — валидация id=0 +- `GetVehicle_NegativeId_ReturnsBadRequest` — валидация отрицательных id +- `GetVehicle_SameId_ReturnsCachedData` — одинаковый id возвращает одинаковые данные +- `GetVehicle_DifferentIds_ReturnDifferentData` — разные id возвращают разные данные +- `GetVehicle_FileAppearsInMinio` — файл появляется в MinIO после запроса (30 сек таймаут) +- `FileService_HealthCheck_ReturnsOk` — health check FileService +- `Gateway_HealthCheck_ReturnsOk` — health check ApiGateway + +
+
+ +## Лабораторная работа №2 — «Балансировка нагрузки» + +### Описание + +Реализован ApiGateway с балансировкой нагрузки между тремя репликами сервиса генерации данных о транспортных средствах с оркестрацией через .NET Aspire. + +### Что реализовано + +
+Балансировка нагрузки (Ocelot + WeightedRandom) +
+ +- ApiGateway на базе Ocelot +- Кастомный балансировщик `WeightedRandomLoadBalancer` +- Веса реплик настраиваются через `appsettings.json` (`WeightedRandom:Weights`) +- Три реплики сервиса генерации + +
+
-2. «Балансировка нагрузки» - Реализация апи гейтвея, настройка его работы -
- -В рамках второй лабораторной работы необходимо: -* Настроить оркестрацию на запуск нескольких реплик сервиса генерации, -* Реализовать апи гейтвей на основе Ocelot, -* Имплементировать алгоритм балансировки нагрузки согласно варианту. - -
+CORS +
+ +- Настроен на уровне ApiGateway (`AllowAnyOrigin`, `AllowAnyMethod`, `AllowAnyHeader`) + +
+
-3. «Интеграционное тестирование» - Реализация файлового сервиса и объектного хранилища, интеграционное тестирование бекенда -
+Оркестрация (.NET Aspire) +
-В рамках третьей лабораторной работы необходимо: -* Добавить в оркестрацию объектное хранилище, -* Реализовать файловый сервис, сериализующий сгенерированные данные в файлы и сохраняющий их в объектном хранилище, -* Реализовать отправку генерируемых данных в файловый сервис посредством брокера, -* Реализовать интеграционные тесты, проверяющие корректность работы всех сервисов бекенда вместе. +- Redis +- Три реплики VehicleApi +- ApiGateway +- Клиент -
+
+ +## Лабораторная работа №1 — «Кэширование» + +**Вариант №17 — «Транспортное средство»** +**Выполнил:** Чукарев Михаил, группа 6511 + +### Описание + +Реализован сервис генерации данных о транспортных средствах с кэшированием ответов в Redis и оркестрацией через .NET Aspire. + +### Что реализовано +
-4. (Опционально) «Переход на облачную инфраструктуру» - Перенос бекенда в Yandex Cloud -
- -В рамках четвертой лабораторной работы необходимо перенестиервисы на облако все ранее разработанные сервисы: -* Клиент - в хостинг через отдельный бакет Object Storage, -* Сервис генерации - в Cloud Function, -* Апи гейтвей - в Serverless Integration как API Gateway, -* Брокер сообщений - в Message Queue, -* Файловый сервис - в Cloud Function, -* Объектное хранилище - в отдельный бакет Object Storage, - -
+Генерация данных (Bogus) +
+ +- Класс `VehicleGenerator` с `RuleFor` для каждого поля +- Поля: VIN, производитель, модель, год выпуска, тип кузова, тип топлива, цвет, пробег, дата последнего ТО + +
-## Задание. Общая часть -**Обязательно**: -* Реализация серверной части на [.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 с информацией о задании, скриншоты приложения и прочая информация. +
+Кэширование (Redis + IDistributedCache) +
-**Факультативно**: -* Перенос бекенда на облачную инфраструктуру Yandex Cloud +- Сервис `VehicleService` инкапсулирует логику работы с кэшем -Внимательно прочитайте [дискуссии](https://github.com/itsecd/cloud-development/discussions/1) о том, как работает автоматическое распределение на ревью. -Сразу корректно называйте свои pr, чтобы они попали на ревью нужному преподавателю. +
+
-По итогу работы в семестре должна получиться следующая информационная система:
-C4 диаграмма -Современные_технологии_разработки_ПО_drawio +Структурное логирование +
+ +- Логирование через `ILogger` + +
-## Варианты заданий -Номер варианта задания присваивается в начале семестра. Изменить его нельзя. Каждый вариант имеет уникальную комбинацию из предметной области, базы данных и технологии для общения сервиса генерации данных и сервера апи. +
+CORS +
+ +- Доверенные origins вынесены в `appsettings.json` (`Cors:AllowedOrigins`) +- `AllowAnyMethod`, `AllowAnyHeader` -[Список вариантов](https://docs.google.com/document/d/1WGmLYwffTTaAj4TgFCk5bUyW3XKbFMiBm-DHZrfFWr4/edit?usp=sharing) -[Список предметных областей и алгоритмов балансировки](https://docs.google.com/document/d/1PLn2lKe4swIdJDZhwBYzxqFSu0AbY2MFY1SUPkIKOM4/edit?usp=sharing) +
+
-## Схема сдачи +
+Оркестрация (.NET Aspire) +
-На каждую из лабораторных работ необходимо сделать отдельный [Pull Request (PR)](https://docs.github.com/en/pull-requests). +- Redis +- API сервис +- Клиент WASM -Общая схема: -1. Сделать форк данного репозитория -2. Выполнить задание -3. Сделать PR в данный репозиторий -4. Исправить замечания после code review -5. Получить approve +
+
-## Критерии оценивания +
+API +
-Конкурентный принцип. -Так как задания в первой лабораторной будут повторяться между студентами, то выделяются следующие показатели для оценки: -1. Скорость разработки -2. Качество разработки -3. Полнота выполнения задания +- Единственный эндпоинт: `GET /api/vehicles?id={id}` -Быстрее делаете PR - у вас преимущество. -Быстрее получаете Approve - у вас преимущество. -Выполните нечто немного выходящее за рамки проекта - у вас преимущество. -Не укладываетесь в дедлайн - получаете минимально возможный балл. +
+
-### Шкала оценивания +
+Тесты (xUnit) +
-- **3 балла** за качество кода, из них: - - 2 балла - базовая оценка - - 1 балл (но не более) можно получить за выполнение любого из следующих пунктов: - - Реализация факультативного функционала - - Выполнение работы раньше других: первые 5 человек из каждой группы, которые сделали PR и получили approve, получают дополнительный балл - -## Вопросы и обратная связь по курсу +- `Generate_SameId_ReturnsSameData` — детерминированность генерации +- `Generate_DifferentIds_ReturnsDifferentData` — уникальность по `id` +- `Generate_YearConstraint_IsValid` — год в диапазоне [1990, текущий] +- `Generate_MileageConstraint_IsValid` — пробег в диапазоне [0, 500 000] +- `Generate_LastServiceDateConstraint_IsValid` — дата ТО не раньше года выпуска и не в будущем -Чтобы задать вопрос по лабораторной, воспользуйтесь [соответствующим разделом дискуссий](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). +
+
diff --git a/src/ApiGateway/ApiGateway.csproj b/src/ApiGateway/ApiGateway.csproj new file mode 100644 index 00000000..0378f393 --- /dev/null +++ b/src/ApiGateway/ApiGateway.csproj @@ -0,0 +1,23 @@ + + + + net8.0 + enable + enable + + + + + + + + + + + + + Always + + + + diff --git a/src/ApiGateway/LoadBalancing/WeightedRandomLoadBalancer.cs b/src/ApiGateway/LoadBalancing/WeightedRandomLoadBalancer.cs new file mode 100644 index 00000000..75e9782e --- /dev/null +++ b/src/ApiGateway/LoadBalancing/WeightedRandomLoadBalancer.cs @@ -0,0 +1,29 @@ +using Ocelot.LoadBalancer.LoadBalancers; +using Ocelot.Responses; +using Ocelot.Values; + +namespace ApiGateway.LoadBalancing; + +public class WeightedRandomLoadBalancer(List services, double[] weights) : ILoadBalancer +{ + public string Type => nameof(WeightedRandomLoadBalancer); + + public Task> LeaseAsync(HttpContext httpContext) + { + var cumulative = 0.0; + var roll = Random.Shared.NextDouble(); + + for (var i = 0; i < services.Count; i++) + { + cumulative += weights[i]; + if (roll < cumulative) + return Task.FromResult>( + new OkResponse(services[i].HostAndPort)); + } + + return Task.FromResult>( + new OkResponse(services[Random.Shared.Next(services.Count)].HostAndPort)); + } + + public void Release(ServiceHostAndPort hostAndPort) { } +} \ No newline at end of file diff --git a/src/ApiGateway/Program.cs b/src/ApiGateway/Program.cs new file mode 100644 index 00000000..91a54015 --- /dev/null +++ b/src/ApiGateway/Program.cs @@ -0,0 +1,70 @@ +using ApiGateway.LoadBalancing; +using Ocelot.DependencyInjection; +using Ocelot.Middleware; +using Microsoft.AspNetCore.Diagnostics.HealthChecks; + +var builder = WebApplication.CreateBuilder(args); + +builder.AddServiceDefaults(); + +builder.Configuration.AddJsonFile("ocelot.json", optional: false, reloadOnChange: true); + +var urls = new List(); + +for (var i = 1; ; i++) +{ + var url = builder.Configuration[$"services:vehicleapi-{i}:api-endpoint:0"]; + if (url == null) break; + urls.Add(new Uri(url)); +} + +if (urls.Count > 0) +{ + for (var i = 0; i < urls.Count; i++) + { + builder.Configuration[$"Routes:0:DownstreamHostAndPorts:{i}:Host"] = urls[i].Host; + builder.Configuration[$"Routes:0:DownstreamHostAndPorts:{i}:Port"] = urls[i].Port.ToString(); + } +} + +builder.Services.AddCors(options => +{ + options.AddDefaultPolicy(policy => + { + var allowedOrigins = builder.Configuration + .GetSection("Cors:AllowedOrigins") + .Get() ?? []; + + policy.WithOrigins(allowedOrigins) + .AllowAnyMethod() + .AllowAnyHeader(); + }); +}); + +var weights = builder.Configuration + .GetSection("WeightedRandom:Weights") + .Get() ?? [0.5, 0.3, 0.2]; + +builder.Services.AddOcelot(builder.Configuration) + .AddCustomLoadBalancer((serviceProvider, route, serviceDiscoveryProvider) => + { + var services = serviceDiscoveryProvider.GetAsync().GetAwaiter().GetResult().ToList(); + return new WeightedRandomLoadBalancer(services, weights); + }); + +var app = builder.Build(); + +app.UseCors(); +app.UseRouting(); +app.UseEndpoints(endpoints => +{ + endpoints.MapHealthChecks("/health"); + endpoints.MapHealthChecks("/alive", new HealthCheckOptions + { + Predicate = r => r.Tags.Contains("live") + }); +}); + +await app.UseOcelot(); + +app.Run(); \ No newline at end of file diff --git a/src/ApiGateway/Properties/launchSettings.json b/src/ApiGateway/Properties/launchSettings.json new file mode 100644 index 00000000..c94776a4 --- /dev/null +++ b/src/ApiGateway/Properties/launchSettings.json @@ -0,0 +1,10 @@ +{ + "profiles": { + "ApiGateway": { + "commandName": "Project", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + } + } +} \ No newline at end of file diff --git a/src/ApiGateway/appsettings.json b/src/ApiGateway/appsettings.json new file mode 100644 index 00000000..27019413 --- /dev/null +++ b/src/ApiGateway/appsettings.json @@ -0,0 +1,19 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning", + "Ocelot": "Information" + } + }, + "AllowedHosts": "*", + "WeightedRandom": { + "Weights": [ 0.5, 0.3, 0.2 ] + }, + "Cors": { + "AllowedOrigins": [ + "https://localhost:7282", + "http://localhost:5127" + ] + } +} \ No newline at end of file diff --git a/src/ApiGateway/ocelot.json b/src/ApiGateway/ocelot.json new file mode 100644 index 00000000..419c673d --- /dev/null +++ b/src/ApiGateway/ocelot.json @@ -0,0 +1,22 @@ +{ + "Routes": [ + { + "UpstreamPathTemplate": "/api/vehicles", + "UpstreamHttpMethod": [ "GET" ], + "DownstreamPathTemplate": "/api/vehicles", + "DownstreamScheme": "http", + "DownstreamHostAndPorts": [ + { "Host": "localhost", "Port": 5101 }, + { "Host": "localhost", "Port": 5102 }, + { "Host": "localhost", "Port": 5103 } + ], + "LoadBalancerOptions": { + "Type": "WeightedRandomLoadBalancer", + "Key": "vehicles" + } + } + ], + "GlobalConfiguration": { + "BaseUrl": "http://localhost:5200" + } +} \ No newline at end of file diff --git a/src/AppHost/AppHost.csproj b/src/AppHost/AppHost.csproj new file mode 100644 index 00000000..93490118 --- /dev/null +++ b/src/AppHost/AppHost.csproj @@ -0,0 +1,23 @@ + + + + Exe + net8.0 + enable + enable + true + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/AppHost/Program.cs b/src/AppHost/Program.cs new file mode 100644 index 00000000..4307b487 --- /dev/null +++ b/src/AppHost/Program.cs @@ -0,0 +1,72 @@ +var builder = DistributedApplication.CreateBuilder(args); + +var ports = builder.Configuration + .GetSection("ApiService:Ports") + .GetChildren() + .Select(x => int.Parse(x.Value!)) + .ToList(); + +if (ports.Count == 0) + ports = [5101, 5102, 5103]; + +var gatewayPort = int.TryParse(builder.Configuration["ApiGateway:Port"], out var p) ? p : 5200; +var fileServicePort = int.TryParse(builder.Configuration["FileService:Port"], out var fp) ? fp : 5300; + +var cache = builder.AddRedis("cache") + .WithRedisInsight(); + +var minio = builder.AddContainer("minio", "minio/minio") + .WithArgs("server", "/data", "--console-address", ":9001") + .WithEnvironment("MINIO_ROOT_USER", "minioadmin") + .WithEnvironment("MINIO_ROOT_PASSWORD", "minioadmin") + .WithHttpEndpoint(port: 9000, targetPort: 9000, name: "api") + .WithHttpEndpoint(port: 9001, targetPort: 9001, name: "console"); + +var localstack = builder.AddContainer("localstack", "localstack/localstack", "3.0.0") + .WithEnvironment("SERVICES", "sqs") + .WithEnvironment("DEFAULT_REGION", "us-east-1") + .WithEnvironment("AWS_DEFAULT_REGION", "us-east-1") + .WithEnvironment("AWS_ACCESS_KEY_ID", "test") + .WithEnvironment("AWS_SECRET_ACCESS_KEY", "test") + .WithEnvironment("LOCALSTACK_ACKNOWLEDGE_ACCOUNT_REQUIREMENT", "1") + .WithHttpEndpoint(port: 4566, targetPort: 4566, name: "api"); + +var localstackEndpoint = localstack.GetEndpoint("api"); +var minioEndpoint = minio.GetEndpoint("api"); + +var sqsServiceUrl = ReferenceExpression.Create($"http://{localstackEndpoint.Property(EndpointProperty.Host)}:{localstackEndpoint.Property(EndpointProperty.Port)}"); +var sqsQueueUrl = ReferenceExpression.Create($"http://{localstackEndpoint.Property(EndpointProperty.Host)}:{localstackEndpoint.Property(EndpointProperty.Port)}/000000000000/vehicles"); + +var fileService = builder.AddProject("fileservice") + .WithEnvironment("Sqs__ServiceUrl", sqsServiceUrl) + .WithEnvironment("Sqs__QueueUrl", sqsQueueUrl) + .WithEnvironment("Minio__Endpoint", ReferenceExpression.Create($"{minioEndpoint.Property(EndpointProperty.Host)}:{minioEndpoint.Property(EndpointProperty.Port)}")) + .WaitFor(minio) + .WaitFor(localstack); + +var gateway = builder.AddProject("apigateway") + .WithHttpEndpoint(port: gatewayPort, name: "gateway-endpoint", isProxied: false) + .WithExternalHttpEndpoints(); + +var serviceId = 1; +foreach (var port in ports) +{ + var replica = builder.AddProject($"vehicleapi-{serviceId++}") + .WithReference(cache) + .WithEnvironment("Sqs__ServiceUrl", sqsServiceUrl) + .WithEnvironment("Sqs__QueueUrl", sqsQueueUrl) + .WithHttpEndpoint(port: port, name: "api-endpoint", isProxied: false) + .WithExternalHttpEndpoints() + .WaitFor(cache) + .WaitFor(localstack); + + gateway.WithReference(replica) + .WaitFor(replica); + fileService.WaitFor(replica); +} + +builder.AddProject("client") + .WithReference(gateway) + .WaitFor(gateway); + +builder.Build().Run(); \ No newline at end of file diff --git a/src/AppHost/Properties/launchSettings.json b/src/AppHost/Properties/launchSettings.json new file mode 100644 index 00000000..a37f7f18 --- /dev/null +++ b/src/AppHost/Properties/launchSettings.json @@ -0,0 +1,17 @@ +{ + "$schema": "https://json.schemastore.org/launchsettings.json", + "profiles": { + "https": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": true, + "applicationUrl": "https://localhost:17057;http://localhost:15057", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development", + "DOTNET_ENVIRONMENT": "Development", + "DOTNET_DASHBOARD_OTLP_ENDPOINT_URL": "https://localhost:21057", + "DOTNET_RESOURCE_SERVICE_ENDPOINT_URL": "https://localhost:22057" + } + } + } +} diff --git a/src/AppHost/appsettings.json b/src/AppHost/appsettings.json new file mode 100644 index 00000000..0dbac826 --- /dev/null +++ b/src/AppHost/appsettings.json @@ -0,0 +1,14 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning" + } + }, + "ApiService": { + "Ports": [ 5101, 5102, 5103 ] + }, + "ApiGateway": { + "Port": 5200 + } +} \ No newline at end of file diff --git a/src/FileService/FileService.csproj b/src/FileService/FileService.csproj new file mode 100644 index 00000000..3daf8a18 --- /dev/null +++ b/src/FileService/FileService.csproj @@ -0,0 +1,18 @@ + + + + net8.0 + enable + enable + + + + + + + + + + + + diff --git a/src/FileService/Program.cs b/src/FileService/Program.cs new file mode 100644 index 00000000..41cfa543 --- /dev/null +++ b/src/FileService/Program.cs @@ -0,0 +1,47 @@ +using Amazon.SQS; +using FileService.Services; +using Minio; + +var builder = WebApplication.CreateBuilder(args); + +builder.AddServiceDefaults(); + +// MinIO +var minioEndpoint = builder.Configuration["Minio:Endpoint"] ?? "localhost:9000"; +var minioAccessKey = builder.Configuration["Minio:AccessKey"] ?? "minioadmin"; +var minioSecretKey = builder.Configuration["Minio:SecretKey"] ?? "minioadmin"; +var minioUseSSL = builder.Configuration.GetValue("Minio:UseSSL", false); + +builder.Services.AddSingleton(_ => + new MinioClient() + .WithEndpoint(minioEndpoint) + .WithCredentials(minioAccessKey, minioSecretKey) + .WithSSL(minioUseSSL) + .Build()); + +// AWS SQS +var sqsConfig = new AmazonSQSConfig +{ + ServiceURL = builder.Configuration["Sqs:ServiceUrl"] ?? "http://localhost:4566" +}; + +var sqsCredentials = new Amazon.Runtime.BasicAWSCredentials( + builder.Configuration["Sqs:AccessKey"] ?? "test", + builder.Configuration["Sqs:SecretKey"] ?? "test"); + +builder.Services.AddSingleton(_ => new AmazonSQSClient(sqsCredentials, sqsConfig)); + +builder.Services.AddSingleton(); +builder.Services.AddHostedService(); + +var app = builder.Build(); + +app.MapDefaultEndpoints(); + +app.MapGet("/files", async (MinioStorageService storage) => +{ + var files = await storage.ListFilesAsync(); + return Results.Ok(files); +}); + +app.Run(); diff --git a/src/FileService/Properties/launchSettings.json b/src/FileService/Properties/launchSettings.json new file mode 100644 index 00000000..1e0274d8 --- /dev/null +++ b/src/FileService/Properties/launchSettings.json @@ -0,0 +1,14 @@ +{ + "$schema": "http://json.schemastore.org/launchsettings.json", + "profiles": { + "http": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": false, + "applicationUrl": "http://localhost:5300", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + } + } +} diff --git a/src/FileService/Services/MinioStorageService.cs b/src/FileService/Services/MinioStorageService.cs new file mode 100644 index 00000000..851464d8 --- /dev/null +++ b/src/FileService/Services/MinioStorageService.cs @@ -0,0 +1,57 @@ +using Minio; +using Minio.DataModel.Args; + +namespace FileService.Services; + +/// +/// Сервис для сохранения файлов в объектном хранилище MinIO. +/// +public class MinioStorageService(IMinioClient minio, IConfiguration config, ILogger logger) +{ + private readonly string _bucketName = config["Minio:BucketName"] ?? "vehicles"; + + public async Task EnsureBucketExistsAsync() + { + var exists = await minio.BucketExistsAsync(new BucketExistsArgs().WithBucket(_bucketName)); + + if (!exists) + { + await minio.MakeBucketAsync(new MakeBucketArgs().WithBucket(_bucketName)); + logger.LogInformation("Bucket '{Bucket}' created", _bucketName); + } + else + { + logger.LogInformation("Bucket '{Bucket}' already exists", _bucketName); + } + } + + public async Task SaveAsync(string objectName, string jsonContent) + { + var bytes = System.Text.Encoding.UTF8.GetBytes(jsonContent); + using var stream = new MemoryStream(bytes); + + var args = new PutObjectArgs() + .WithBucket(_bucketName) + .WithObject(objectName) + .WithStreamData(stream) + .WithObjectSize(bytes.Length) + .WithContentType("application/json"); + + await minio.PutObjectAsync(args); + + logger.LogInformation("Saved object '{Object}' to bucket '{Bucket}'", objectName, _bucketName); + } + + public async Task> ListFilesAsync() + { + var items = new List(); + var args = new ListObjectsArgs() + .WithBucket(_bucketName) + .WithRecursive(true); + + await foreach (var item in minio.ListObjectsEnumAsync(args)) + items.Add(item.Key); + + return items; + } +} \ No newline at end of file diff --git a/src/FileService/Services/SqsConsumerService.cs b/src/FileService/Services/SqsConsumerService.cs new file mode 100644 index 00000000..003422d4 --- /dev/null +++ b/src/FileService/Services/SqsConsumerService.cs @@ -0,0 +1,113 @@ +using Amazon.SQS; +using Amazon.SQS.Model; + +namespace FileService.Services; + +/// +/// Фоновый сервис, непрерывно опрашивающий очередь SQS и сохраняющий +/// полученные данные транспортных средств в объектное хранилище. +/// +public class SqsConsumerService( + IAmazonSQS sqs, + MinioStorageService storage, + IConfiguration config, + ILogger logger) : BackgroundService +{ + private readonly string _queueUrl = config["Sqs:QueueUrl"] + ?? throw new InvalidOperationException("Sqs:QueueUrl is not configured"); + + private readonly int _pollingIntervalMs = config.GetValue("Sqs:PollingIntervalMs", 1000); + private readonly int _maxMessages = config.GetValue("Sqs:MaxMessages", 10); + + protected override async Task ExecuteAsync(CancellationToken stoppingToken) + { + logger.LogInformation("SQS consumer started. Queue: {QueueUrl}", _queueUrl); + + await EnsureQueueExistsAsync(); + + await storage.EnsureBucketExistsAsync(); + + while (!stoppingToken.IsCancellationRequested) + { + try + { + await PollAsync(stoppingToken); + } + catch (OperationCanceledException) + { + break; + } + catch (Exception ex) + { + logger.LogError(ex, "Error while polling SQS queue"); + await Task.Delay(_pollingIntervalMs, stoppingToken); + } + } + + logger.LogInformation("SQS consumer stopped"); + } + + private async Task PollAsync(CancellationToken ct) + { + var request = new ReceiveMessageRequest + { + QueueUrl = _queueUrl, + MaxNumberOfMessages = _maxMessages, + WaitTimeSeconds = 5 + }; + + var response = await sqs.ReceiveMessageAsync(request, ct); + + if (response.Messages.Count == 0) + { + await Task.Delay(_pollingIntervalMs, ct); + return; + } + + logger.LogInformation("Received {Count} messages from SQS", response.Messages.Count); + + foreach (var message in response.Messages) + { + await ProcessMessageAsync(message, ct); + } + } + + private async Task ProcessMessageAsync(Message message, CancellationToken ct) +{ + try + { + using var doc = System.Text.Json.JsonDocument.Parse(message.Body); + var root = doc.RootElement; + + var id = 0; + if (root.TryGetProperty("Id", out var idProp) || root.TryGetProperty("id", out idProp)) + id = idProp.GetInt32(); + var objectName = $"vehicle-{id}-{DateTimeOffset.UtcNow:yyyyMMdd-HHmmss-fff}-{message.MessageId[..8]}.json"; + + await storage.SaveAsync(objectName, message.Body); + await sqs.DeleteMessageAsync(_queueUrl, message.ReceiptHandle, ct); + + logger.LogInformation("Processed message {MessageId} → saved as '{ObjectName}'", + message.MessageId, objectName); + } + catch (Exception ex) + { + logger.LogError(ex, "Failed to process message {MessageId}", message.MessageId); + } +} + private async Task EnsureQueueExistsAsync() +{ + try + { + await sqs.CreateQueueAsync(new Amazon.SQS.Model.CreateQueueRequest + { + QueueName = _queueUrl.Split('/').Last() + }); + logger.LogInformation("SQS queue ensured"); + } + catch (Exception ex) + { + logger.LogWarning("Could not create queue: {Message}", ex.Message); + } +} +} diff --git a/src/FileService/appsettings.json b/src/FileService/appsettings.json new file mode 100644 index 00000000..13067f46 --- /dev/null +++ b/src/FileService/appsettings.json @@ -0,0 +1,19 @@ +{ + "Sqs": { + "QueueUrl": "http://localhost:4566/000000000000/vehicles", + "ServiceUrl": "http://localhost:4566", + "Region": "us-east-1", + "AccessKey": "test", + "SecretKey": "test", + "PollingIntervalMs": 1000, + "MaxMessages": 10 + }, + "Minio": { + "Endpoint": "localhost:9000", + "AccessKey": "minioadmin", + "SecretKey": "minioadmin", + "BucketName": "vehicles", + "UseSSL": false + }, + "AllowedHosts": "*" +} diff --git a/src/ServiceDefaults/Extensions.cs b/src/ServiceDefaults/Extensions.cs new file mode 100644 index 00000000..62670bc2 --- /dev/null +++ b/src/ServiceDefaults/Extensions.cs @@ -0,0 +1,79 @@ +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Diagnostics.HealthChecks; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Diagnostics.HealthChecks; +using Microsoft.Extensions.Logging; +using OpenTelemetry; +using OpenTelemetry.Metrics; +using OpenTelemetry.Trace; + +namespace Microsoft.Extensions.Hosting; + +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(); + + 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() + .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(); + } + + return builder; + } + + public static TBuilder AddDefaultHealthChecks(this TBuilder builder) where TBuilder : IHostApplicationBuilder + { + builder.Services.AddHealthChecks() + .AddCheck("self", () => HealthCheckResult.Healthy(), ["live"]); + + return builder; + } + + public static WebApplication MapDefaultEndpoints(this WebApplication app) + { + app.MapHealthChecks(HealthEndpointPath); + app.MapHealthChecks(AlivenessEndpointPath, new HealthCheckOptions + { + Predicate = r => r.Tags.Contains("live") + }); + + return app; + } +} diff --git a/src/ServiceDefaults/ServiceDefaults.csproj b/src/ServiceDefaults/ServiceDefaults.csproj new file mode 100644 index 00000000..66030857 --- /dev/null +++ b/src/ServiceDefaults/ServiceDefaults.csproj @@ -0,0 +1,20 @@ + + + + net8.0 + enable + enable + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/VehicleApi/Models/Vehicle.cs b/src/VehicleApi/Models/Vehicle.cs new file mode 100644 index 00000000..5b9602c7 --- /dev/null +++ b/src/VehicleApi/Models/Vehicle.cs @@ -0,0 +1,37 @@ +namespace VehicleApi.Models; + +/// +/// Представляет сущность транспортного средства. +/// +public record Vehicle +{ + /// Уникальный идентификатор транспортного средства. + public int Id { get; init; } + + /// Идентификационный номер транспортного средства (VIN). + public required string Vin { get; init; } + + /// Производитель транспортного средства. + public required string Manufacturer { get; init; } + + /// Модель транспортного средства. + public required string Model { get; init; } + + /// Год выпуска транспортного средства. + public int Year { get; init; } + + /// Тип кузова транспортного средства. + public required string BodyType { get; init; } + + /// Тип топлива транспортного средства. + public required string FuelType { get; init; } + + /// Цвет транспортного средства. + public required string Color { get; init; } + + /// Пробег транспортного средства. + public double Mileage { get; init; } + + /// Дата последнего технического обслуживания. + public DateOnly LastServiceDate { get; init; } +} \ No newline at end of file diff --git a/src/VehicleApi/Program.cs b/src/VehicleApi/Program.cs new file mode 100644 index 00000000..efb045fc --- /dev/null +++ b/src/VehicleApi/Program.cs @@ -0,0 +1,49 @@ +using Amazon.SQS; +using Microsoft.AspNetCore.Mvc; +using VehicleApi.Services; + +var builder = WebApplication.CreateBuilder(args); + +builder.AddServiceDefaults(); + +// AWS SQS +var sqsConfig = new AmazonSQSConfig +{ + ServiceURL = builder.Configuration["Sqs:ServiceUrl"] ?? "http://localhost:4566" +}; + +var sqsCredentials = new Amazon.Runtime.BasicAWSCredentials( + builder.Configuration["Sqs:AccessKey"] ?? "test", + builder.Configuration["Sqs:SecretKey"] ?? "test"); + +builder.Services.AddSingleton(_ => new AmazonSQSClient(sqsCredentials, sqsConfig)); +builder.Services.AddSingleton(); + +builder.Services.AddScoped(); + +builder.AddRedisDistributedCache("cache"); + +var app = builder.Build(); + +var publisher = app.Services.GetRequiredService(); +await publisher.EnsureQueueExistsAsync(); + +app.MapDefaultEndpoints(); + +app.MapGet("/api/vehicles", async (int id, [FromServices] VehicleService vehicleService, ILogger logger) => +{ + if (id <= 0) + { + logger.LogWarning("Invalid vehicle ID {Id} requested", id); + return Results.BadRequest("ID must be greater than 0"); + } + + var vehicle = await vehicleService.GetByIdAsync(id); + return Results.Ok(vehicle); +}); + +app.Run(); + + + +namespace VehicleApi { public partial class Program { } } \ No newline at end of file diff --git a/src/VehicleApi/Properties/launchSettings.json b/src/VehicleApi/Properties/launchSettings.json new file mode 100644 index 00000000..36b29597 --- /dev/null +++ b/src/VehicleApi/Properties/launchSettings.json @@ -0,0 +1,32 @@ +{ + "profiles": { + "http": { + "commandName": "Project", + "applicationUrl": "http://localhost:5000", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + }, + "replica1": { + "commandName": "Project", + "applicationUrl": "http://localhost:5101", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + }, + "replica2": { + "commandName": "Project", + "applicationUrl": "http://localhost:5102", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + }, + "replica3": { + "commandName": "Project", + "applicationUrl": "http://localhost:5103", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + } + } +} \ No newline at end of file diff --git a/src/VehicleApi/Services/SqsPublisherService.cs b/src/VehicleApi/Services/SqsPublisherService.cs new file mode 100644 index 00000000..cfb29e21 --- /dev/null +++ b/src/VehicleApi/Services/SqsPublisherService.cs @@ -0,0 +1,49 @@ +using System.Text.Json; +using Amazon.SQS; +using Amazon.SQS.Model; +using VehicleApi.Models; + +namespace VehicleApi.Services; + +/// +/// Сервис публикации данных транспортного средства в очередь SQS. +/// +public class SqsPublisherService(IAmazonSQS sqs, IConfiguration config, ILogger logger) +{ + private readonly string _queueUrl = config["Sqs:QueueUrl"] + ?? throw new InvalidOperationException("Sqs:QueueUrl is not configured"); + + /// + /// Публикует данные транспортного средства в SQS-очередь. + /// + public async Task PublishAsync(Vehicle vehicle) + { + var body = JsonSerializer.Serialize(vehicle); + + var request = new SendMessageRequest + { + QueueUrl = _queueUrl, + MessageBody = body + }; + + var response = await sqs.SendMessageAsync(request); + + logger.LogInformation("Published vehicle {Id} to SQS, MessageId: {MessageId}", + vehicle.Id, response.MessageId); + } + public async Task EnsureQueueExistsAsync() +{ + try + { + var queueName = _queueUrl.Split('/').Last(); + await sqs.CreateQueueAsync(new Amazon.SQS.Model.CreateQueueRequest { QueueName = queueName }); + logger.LogInformation("SQS queue ensured by VehicleApi"); + } + catch (Exception ex) + { + logger.LogWarning("Could not create queue: {Message}", ex.Message); + } +} +} + + diff --git a/src/VehicleApi/Services/VehicleGenerator.cs b/src/VehicleApi/Services/VehicleGenerator.cs new file mode 100644 index 00000000..2f7145fb --- /dev/null +++ b/src/VehicleApi/Services/VehicleGenerator.cs @@ -0,0 +1,26 @@ +using Bogus; +using VehicleApi.Models; + +namespace VehicleApi.Services; + +public static class VehicleGenerator +{ + private static readonly Faker _faker = new Faker() + .RuleFor(v => v.Id, f => f.IndexFaker) + .RuleFor(v => v.Vin, f => f.Vehicle.Vin()) + .RuleFor(v => v.Manufacturer, f => f.Vehicle.Manufacturer()) + .RuleFor(v => v.Model, f => f.Vehicle.Model()) + .RuleFor(v => v.Year, f => f.Random.Int(1990, DateTime.Now.Year)) + .RuleFor(v => v.BodyType, f => f.Vehicle.Type()) + .RuleFor(v => v.FuelType, f => f.Vehicle.Fuel()) + .RuleFor(v => v.Color, f => f.Commerce.Color()) + .RuleFor(v => v.Mileage, f => f.Random.Double(0, 500000)) + .RuleFor(v => v.LastServiceDate, (f, v) => + DateOnly.FromDateTime(f.Date.Between(new DateTime(v.Year, 1, 1), DateTime.Now))); + + public static Vehicle Generate(int id) + { + _faker.UseSeed(id); + return _faker.Generate(); + } +} \ No newline at end of file diff --git a/src/VehicleApi/Services/VehicleService.cs b/src/VehicleApi/Services/VehicleService.cs new file mode 100644 index 00000000..36c72237 --- /dev/null +++ b/src/VehicleApi/Services/VehicleService.cs @@ -0,0 +1,46 @@ +using System.Text.Json; +using Microsoft.Extensions.Caching.Distributed; +using VehicleApi.Models; + +namespace VehicleApi.Services; + +public class VehicleService( + IDistributedCache cache, + SqsPublisherService publisher, + ILogger logger, + IConfiguration config) +{ + private DistributedCacheEntryOptions GetCacheOptions() + { + var minutes = config.GetValue("Cache:AbsoluteExpirationMinutes", 10); + return new DistributedCacheEntryOptions + { + AbsoluteExpirationRelativeToNow = TimeSpan.FromMinutes(minutes) + }; + } + + public async Task GetByIdAsync(int id) + { + var cacheKey = $"vehicle:{id}"; + var cachedData = await cache.GetAsync(cacheKey); + + if (cachedData != null) + { + logger.LogInformation("Cache hit for vehicle ID {Id}", id); + var cached = JsonSerializer.Deserialize(cachedData); + if (cached != null) + return cached; + } + + logger.LogInformation("Cache miss for vehicle ID {Id}", id); + var vehicle = VehicleGenerator.Generate(id) with { Id = id }; + + var serialized = JsonSerializer.SerializeToUtf8Bytes(vehicle); + await cache.SetAsync(cacheKey, serialized, GetCacheOptions()); + logger.LogInformation("Vehicle {Id} cached", id); + + await publisher.PublishAsync(vehicle); + + return vehicle; + } +} \ No newline at end of file diff --git a/src/VehicleApi/VehicleApi.csproj b/src/VehicleApi/VehicleApi.csproj new file mode 100644 index 00000000..3ca90c0e --- /dev/null +++ b/src/VehicleApi/VehicleApi.csproj @@ -0,0 +1,19 @@ + + + + net8.0 + enable + enable + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/VehicleApi/appsettings.json b/src/VehicleApi/appsettings.json new file mode 100644 index 00000000..ee2a86eb --- /dev/null +++ b/src/VehicleApi/appsettings.json @@ -0,0 +1,12 @@ +{ + "Cache": { + "AbsoluteExpirationMinutes": 10 + }, + "Sqs": { + "QueueUrl": "http://localhost:4566/000000000000/vehicles", + "ServiceUrl": "http://localhost:4566", + "AccessKey": "test", + "SecretKey": "test" + }, + "AllowedHosts": "*" +} \ No newline at end of file diff --git a/tests/Integration.Tests/AppHostFixture.cs b/tests/Integration.Tests/AppHostFixture.cs new file mode 100644 index 00000000..887205a3 --- /dev/null +++ b/tests/Integration.Tests/AppHostFixture.cs @@ -0,0 +1,49 @@ +using Aspire.Hosting; +using Aspire.Hosting.Testing; +using Xunit; + +namespace Integration.Tests; + +/// +/// Поднимает весь Aspire AppHost один раз для всей коллекции тестов. +/// +public sealed class AppHostFixture : IAsyncLifetime +{ + public HttpClient GatewayClient { get; private set; } = null!; + public HttpClient FileServiceClient { get; private set; } = null!; + + private DistributedApplication _app = null!; + + public async Task InitializeAsync() + { + var builder = await DistributedApplicationTestingBuilder.CreateAsync(); + _app = await builder.BuildAsync(); + await _app.StartAsync(); + + GatewayClient = _app.CreateHttpClient("apigateway", "gateway-endpoint"); + FileServiceClient = _app.CreateHttpClient("fileservice"); + + using var cts = new CancellationTokenSource(TimeSpan.FromMinutes(5)); + while (true) + { + try + { + var response = await GatewayClient.GetAsync("/api/vehicles?id=1", cts.Token); + if ((int)response.StatusCode < 500) + break; + } + catch + { + // ещё не готов + } + await Task.Delay(2000, cts.Token); + } + } + + public async Task DisposeAsync() + { + GatewayClient?.Dispose(); + FileServiceClient?.Dispose(); + await _app.DisposeAsync(); + } +} diff --git a/tests/Integration.Tests/BackendIntegrationTests.cs b/tests/Integration.Tests/BackendIntegrationTests.cs new file mode 100644 index 00000000..4985ebf9 --- /dev/null +++ b/tests/Integration.Tests/BackendIntegrationTests.cs @@ -0,0 +1,128 @@ +using System.Net; +using System.Text.Json; +using Xunit; + +namespace Integration.Tests; + +/// +/// Интеграционные тесты всего бэкенда через Aspire AppHost. +/// Проверяют: gateway, кэш Redis, SQS-пайплайн и сохранение файлов в MinIO. +/// +public sealed class BackendIntegrationTests(AppHostFixture fixture) : IClassFixture +{ + private readonly HttpClient _gatewayClient = fixture.GatewayClient; + private readonly HttpClient _fileServiceClient = fixture.FileServiceClient; + + [Fact] + public async Task GetVehicle_ValidId_ReturnsOk() + { + var response = await _gatewayClient.GetAsync("/api/vehicles?id=1"); + + Assert.Equal(HttpStatusCode.OK, response.StatusCode); + } + + [Fact] + public async Task GetVehicle_ValidId_ReturnsExpectedFields() + { + var response = await _gatewayClient.GetAsync("/api/vehicles?id=5"); + var json = await response.Content.ReadAsStringAsync(); + using var doc = JsonDocument.Parse(json); + var root = doc.RootElement; + + Assert.True(root.TryGetProperty("id", out _), "Missing 'id' field"); + Assert.True(root.TryGetProperty("vin", out _), "Missing 'vin' field"); + Assert.True(root.TryGetProperty("manufacturer", out _), "Missing 'manufacturer' field"); + Assert.True(root.TryGetProperty("model", out _), "Missing 'model' field"); + Assert.True(root.TryGetProperty("year", out _), "Missing 'year' field"); + } + + [Fact] + public async Task GetVehicle_InvalidId_ReturnsBadRequest() + { + var response = await _gatewayClient.GetAsync("/api/vehicles?id=0"); + + Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode); + } + + [Theory] + [InlineData(-1)] + [InlineData(-100)] + public async Task GetVehicle_NegativeId_ReturnsBadRequest(int id) + { + var response = await _gatewayClient.GetAsync($"/api/vehicles?id={id}"); + + Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode); + } + + [Fact] + public async Task GetVehicle_SameId_ReturnsCachedData() + { + var r1 = await _gatewayClient.GetAsync("/api/vehicles?id=42"); + var r2 = await _gatewayClient.GetAsync("/api/vehicles?id=42"); + + r1.EnsureSuccessStatusCode(); + r2.EnsureSuccessStatusCode(); + + var json1 = await r1.Content.ReadAsStringAsync(); + var json2 = await r2.Content.ReadAsStringAsync(); + + Assert.Equal(json1, json2); + } + + [Fact] + public async Task GetVehicle_DifferentIds_ReturnDifferentData() + { + var r1 = await _gatewayClient.GetAsync("/api/vehicles?id=10"); + var r2 = await _gatewayClient.GetAsync("/api/vehicles?id=20"); + + r1.EnsureSuccessStatusCode(); + r2.EnsureSuccessStatusCode(); + + using var doc1 = JsonDocument.Parse(await r1.Content.ReadAsStringAsync()); + using var doc2 = JsonDocument.Parse(await r2.Content.ReadAsStringAsync()); + + Assert.Equal(10, doc1.RootElement.GetProperty("id").GetInt32()); + Assert.Equal(20, doc2.RootElement.GetProperty("id").GetInt32()); + } + + [Fact] + public async Task GetVehicle_FileAppearsInMinio() + { + var id = Random.Shared.Next(50_000, 99_999); + var deadline = DateTime.UtcNow.AddSeconds(30); + + await _gatewayClient.GetAsync($"/api/vehicles?id={id}"); + + while (DateTime.UtcNow < deadline) + { + await Task.Delay(2000); + + var filesResponse = await _fileServiceClient.GetAsync("/files"); + if (!filesResponse.IsSuccessStatusCode) continue; + + var files = JsonSerializer.Deserialize>( + await filesResponse.Content.ReadAsStringAsync()) ?? []; + + if (files.Any(f => f.Contains(id.ToString()))) + return; + } + + Assert.Fail($"Файл для vehicle id={id} не появился в MinIO за 30 секунд"); + } + + [Fact] + public async Task FileService_HealthCheck_ReturnsOk() + { + var response = await _fileServiceClient.GetAsync("/health"); + + Assert.Equal(HttpStatusCode.OK, response.StatusCode); + } + + [Fact] + public async Task Gateway_HealthCheck_ReturnsOk() + { + var response = await _gatewayClient.GetAsync("/health"); + + Assert.Equal(HttpStatusCode.OK, response.StatusCode); + } +} diff --git a/tests/Integration.Tests/Integration.Tests.csproj b/tests/Integration.Tests/Integration.Tests.csproj new file mode 100644 index 00000000..4a3375e8 --- /dev/null +++ b/tests/Integration.Tests/Integration.Tests.csproj @@ -0,0 +1,25 @@ + + + + net8.0 + enable + enable + false + true + + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + + + + + + + \ No newline at end of file diff --git a/tests/VehicleApi.Tests/VehicleApi.Tests.csproj b/tests/VehicleApi.Tests/VehicleApi.Tests.csproj new file mode 100644 index 00000000..43d11c14 --- /dev/null +++ b/tests/VehicleApi.Tests/VehicleApi.Tests.csproj @@ -0,0 +1,24 @@ + + + + net8.0 + enable + enable + false + true + + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + + + + + + diff --git a/tests/VehicleApi.Tests/VehicleGeneratorTests.cs b/tests/VehicleApi.Tests/VehicleGeneratorTests.cs new file mode 100644 index 00000000..b7d0257f --- /dev/null +++ b/tests/VehicleApi.Tests/VehicleGeneratorTests.cs @@ -0,0 +1,73 @@ +using VehicleApi.Services; +using Xunit; + +namespace VehicleApi.Tests; + +public class VehicleGeneratorTests +{ + [Fact] + public void Generate_SameId_ReturnsSameData() + { + var vehicle1 = VehicleGenerator.Generate(42); + var vehicle2 = VehicleGenerator.Generate(42); + + Assert.Equal(vehicle1.Vin, vehicle2.Vin); + Assert.Equal(vehicle1.Manufacturer, vehicle2.Manufacturer); + Assert.Equal(vehicle1.Model, vehicle2.Model); + Assert.Equal(vehicle1.Year, vehicle2.Year); + Assert.Equal(vehicle1.BodyType, vehicle2.BodyType); + Assert.Equal(vehicle1.FuelType, vehicle2.FuelType); + Assert.Equal(vehicle1.Color, vehicle2.Color); + Assert.Equal(vehicle1.Mileage, vehicle2.Mileage); + } + + [Theory] + [InlineData(1, 2)] + [InlineData(10, 20)] + [InlineData(42, 100)] + public void Generate_DifferentIds_ReturnsDifferentData(int id1, int id2) + { + var vehicle1 = VehicleGenerator.Generate(id1); + var vehicle2 = VehicleGenerator.Generate(id2); + + Assert.NotEqual(vehicle1.Vin, vehicle2.Vin); + } + + [Fact] + public void Generate_YearConstraint_IsValid() + { + for (var i = 1; i <= 100; i++) + { + var vehicle = VehicleGenerator.Generate(i); + + Assert.True(vehicle.Year >= 1990, $"Vehicle {i} has Year {vehicle.Year} which is less than 1990"); + Assert.True(vehicle.Year <= DateTime.Now.Year, $"Vehicle {i} has Year {vehicle.Year} which exceeds current year {DateTime.Now.Year}"); + } + } + + [Fact] + public void Generate_MileageConstraint_IsValid() + { + for (var i = 1; i <= 100; i++) + { + var vehicle = VehicleGenerator.Generate(i); + + Assert.True(vehicle.Mileage >= 0, $"Vehicle {i} has Mileage {vehicle.Mileage} which is less than 0"); + Assert.True(vehicle.Mileage <= 500000, $"Vehicle {i} has Mileage {vehicle.Mileage} which exceeds 500,000"); + } + } + + [Fact] + public void Generate_LastServiceDateConstraint_IsValid() + { + for (var i = 1; i <= 100; i++) + { + var vehicle = VehicleGenerator.Generate(i); + + Assert.True(vehicle.LastServiceDate.Year >= vehicle.Year, + $"Vehicle {i} has LastServiceDate year {vehicle.LastServiceDate.Year} which is before the vehicle's manufacturing year {vehicle.Year}"); + Assert.True(vehicle.LastServiceDate <= DateOnly.FromDateTime(DateTime.Now), + $"Vehicle {i} has LastServiceDate {vehicle.LastServiceDate} which is in the future"); + } + } +}