Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Client.Wasm/Components/StudentCard.razor
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
</CardHeader>
<CardBody>
<UnorderedList Unstyled>
<UnorderedListItem>Номер <Strong>№X "Название лабораторной"</Strong></UnorderedListItem>
<UnorderedListItem>Вариант <Strong>№Х "Название варианта"</Strong></UnorderedListItem>
<UnorderedListItem>Выполнена <Strong>Фамилией Именем 65ХХ</Strong> </UnorderedListItem>
<UnorderedListItem><Link To="https://puginarug.com/">Ссылка на форк</Link></UnorderedListItem>
<UnorderedListItem>Номер <Strong>№3 "Интеграционное тестирование"</Strong></UnorderedListItem>
<UnorderedListItem>Вариант <Strong>№43 "Сотрудник компании"</Strong></UnorderedListItem>
<UnorderedListItem>Выполнена <Strong>Казаковым Андреем 6513</Strong> </UnorderedListItem>
<UnorderedListItem><Link To="https://github.com/Gironape/cloud-development">Ссылка на форк</Link></UnorderedListItem>
</UnorderedList>
</CardBody>
</Card>
2 changes: 1 addition & 1 deletion Client.Wasm/wwwroot/appsettings.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
}
},
"AllowedHosts": "*",
"BaseAddress": ""
"BaseAddress": "https://localhost:7000/api/employee"
}
110 changes: 110 additions & 0 deletions CloudDevelopment.sln
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
24 changes: 24 additions & 0 deletions CompanyEmployee.Api/CompanyEmployee.Api.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Aspire.StackExchange.Redis.DistributedCaching" Version="9.5.0" />
<PackageReference Include="AWSSDK.SimpleNotificationService" Version="3.7.400.26" />
<PackageReference Include="Bogus" Version="35.6.5" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Client.Wasm\Client.Wasm.csproj" />
<ProjectReference Include="..\CompanyEmployee.Domain\CompanyEmployee.Domain.csproj" />
<ProjectReference Include="..\CompanyEmployee.ServiceDefaults\CompanyEmployee.ServiceDefaults.csproj" />
</ItemGroup>

<ProjectExtensions><VisualStudio><UserProperties properties_4launchsettings_1json__JsonSchema="" /></VisualStudio></ProjectExtensions>

</Project>
55 changes: 55 additions & 0 deletions CompanyEmployee.Api/Controllers/EmployeeController.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
using CompanyEmployee.Api.Services;
using CompanyEmployee.Domain.Entity;
using Microsoft.AspNetCore.Mvc;

namespace CompanyEmployee.Api.Controllers;

/// <summary>
/// Контроллер для работы с сотрудниками.
/// </summary>
/// <param name="employeeService">Сервис для получения сотрудников с кэшированием.</param>
/// <param name="logger">Логгер для записи информации о запросах.</param>
[ApiController]
[Route("api/[controller]")]
public class EmployeeController(
IEmployeeService employeeService,
ILogger<EmployeeController> logger) : ControllerBase
{
/// <summary>
/// Получить сотрудника по идентификатору.
/// </summary>
/// <param name="id">Идентификатор сотрудника.</param>
/// <param name="cancellationToken">Токен отмены операции.</param>
/// <returns>Объект сотрудника.</returns>
[HttpGet]
[ProducesResponseType(typeof(Employee), StatusCodes.Status200OK)]
[ProducesResponseType(StatusCodes.Status400BadRequest)]
[ProducesResponseType(StatusCodes.Status404NotFound)]
[ProducesResponseType(StatusCodes.Status500InternalServerError)]
public async Task<ActionResult<Employee>> 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, "Внутренняя ошибка сервера");
}
}
}
48 changes: 48 additions & 0 deletions CompanyEmployee.Api/Program.cs
Original file line number Diff line number Diff line change
@@ -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<IEmployeeGenerator, EmployeeGenerator>();
builder.Services.AddSingleton<ICacheService, RedisCacheService>();
builder.Services.AddScoped<IEmployeeService, EmployeeService>();

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<IAmazonSimpleNotificationService>(_ =>
new AmazonSimpleNotificationServiceClient(awsAccessKey, awsSecretKey, snsConfig));

builder.Services.AddSingleton<SnsPublisherService>();

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();
41 changes: 41 additions & 0 deletions CompanyEmployee.Api/Properties/launchSettings.json
Original file line number Diff line number Diff line change
@@ -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"
}
}
}
}
Loading