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>№1 "Кэширование"</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:7106/api/employee"
}
24 changes: 24 additions & 0 deletions CloudDevelopment.sln
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,14 @@ VisualStudioVersion = 17.14.36811.4
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Client.Wasm", "Client.Wasm\Client.Wasm.csproj", "{AE7EEA74-2FE0-136F-D797-854FD87E022A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "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
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -15,6 +23,22 @@ Global
{AE7EEA74-2FE0-136F-D797-854FD87E022A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AE7EEA74-2FE0-136F-D797-854FD87E022A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AE7EEA74-2FE0-136F-D797-854FD87E022A}.Release|Any CPU.Build.0 = Release|Any CPU
{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}.Release|Any CPU.ActiveCfg = Release|Any CPU
{069756DA-EFFA-4835-B69C-0849C48BE473}.Release|Any CPU.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}.Release|Any CPU.ActiveCfg = Release|Any CPU
{60C547C0-C951-4270-1D2E-4BB68A5739B6}.Release|Any CPU.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}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FD5B46C8-0F5C-493A-B5FF-708AEA44AD3D}.Release|Any CPU.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}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EEC6E8C9-9951-4CE6-DBC8-FEDF498A759B}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
23 changes: 23 additions & 0 deletions CompanyEmployee.Api/CompanyEmployee.Api.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<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.3.1" />
<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(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, "Внутренняя ошибка сервера");
}
}
}
39 changes: 39 additions & 0 deletions CompanyEmployee.Api/Program.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
using CompanyEmployee.Api.Services;
using CompanyEmployee.ServiceDefaults;

var builder = WebApplication.CreateBuilder(args);

builder.AddServiceDefaults();
builder.AddRedisDistributedCache("redis");
builder.Services.AddControllers();
builder.Services.AddEndpointsApiExplorer();
builder.Services.AddSwaggerGen();

builder.Services.AddCors(options =>
{
options.AddPolicy("wasm", policy =>
{
policy.AllowAnyOrigin()
.WithMethods("GET")
.WithHeaders("Content-Type");
});
});

builder.Services.AddSingleton<IEmployeeGenerator, EmployeeGenerator>();
builder.Services.AddSingleton<ICacheService, RedisCacheService>();
builder.Services.AddScoped<IEmployeeService, EmployeeService>();

var app = builder.Build();

if (app.Environment.IsDevelopment())
{
app.UseSwagger();
app.UseSwaggerUI();
}

app.MapDefaultEndpoints();
app.UseHttpsRedirection();
app.UseCors("wasm");
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": true,
"launchUrl": "swagger",
"applicationUrl": "http://localhost:5121",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
},
"https": {
"commandName": "Project",
"dotnetRunMessages": true,
"launchBrowser": true,
"launchUrl": "swagger",
"applicationUrl": "https://localhost:7106;http://localhost:5121",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
},
"IIS Express": {
"commandName": "IISExpress",
"launchBrowser": true,
"launchUrl": "swagger",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
}
}
}
78 changes: 78 additions & 0 deletions CompanyEmployee.Api/Services/EmployeeGenerator.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
using Bogus;
using Bogus.DataSets;
using CompanyEmployee.Domain.Entity;

namespace CompanyEmployee.Api.Services;

/// <summary>
/// Генератор сотрудников.
/// </summary>
/// <param name="logger">Логгер.</param>
public class EmployeeGenerator(ILogger<EmployeeGenerator> logger) : IEmployeeGenerator
{
private readonly string[] _professions = { "Developer", "Manager", "Analyst", "Designer", "QA" };
private readonly string[] _suffixes = { "Junior", "Middle", "Senior" };

/// <inheritdoc />
public Employee Generate(int id)
{
Randomizer.Seed = new Random(id);
var faker = new Faker("ru");
var employee = new Faker<Employee>("ru")
.RuleFor(e => e.Id, id)
.RuleFor(e => e.FullName, f =>
{
var gender = f.PickRandom<Name.Gender>();
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;
}
}
40 changes: 40 additions & 0 deletions CompanyEmployee.Api/Services/EmployeeService.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
using CompanyEmployee.Domain.Entity;
using Microsoft.Extensions.Caching.Distributed;

namespace CompanyEmployee.Api.Services;

/// <summary>
/// Бизнес-логика работы с сотрудниками.
/// </summary>
/// <param name="generator">Генератор сотрудников.</param>
/// <param name="cache">Сервис кэширования.</param>
/// <param name="logger">Логгер.</param>
public class EmployeeService(
IEmployeeGenerator generator,
ICacheService cache,
ILogger<EmployeeService> logger) : IEmployeeService
{
private readonly DistributedCacheEntryOptions _cacheOptions = new()
{
AbsoluteExpirationRelativeToNow = TimeSpan.FromMinutes(5)
};

/// <inheritdoc />
public async Task<Employee?> GetEmployeeAsync(int id, CancellationToken cancellationToken = default)
{
var cacheKey = $"employee:{id}";
var employee = await cache.GetAsync<Employee>(cacheKey, cancellationToken);
if (employee != null)
{
logger.LogInformation("Сотрудник с ID {Id} найден в кэше", id);
return employee;
}

logger.LogInformation("Сотрудник с ID {Id} не найден в кэше, генерация нового", id);
employee = generator.Generate(id);

await cache.SetAsync(cacheKey, employee, _cacheOptions, cancellationToken);

return employee;
}
}
22 changes: 22 additions & 0 deletions CompanyEmployee.Api/Services/ICacheService.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
using Microsoft.Extensions.Caching.Distributed;

namespace CompanyEmployee.Api.Services;

/// <summary>
/// Сервис для работы с распределённым кэшем.
/// </summary>
public interface ICacheService
{
/// <summary>Получает данные из кэша по ключу.</summary>
/// <param name="key">Ключ кэша.</param>
/// <param name="cancellationToken">Токен отмены.</param>
/// <returns>Данные из кэша или default.</returns>
public Task<T?> GetAsync<T>(string key, CancellationToken cancellationToken = default);

/// <summary>Сохраняет данные в кэш.</summary>
/// <param name="key">Ключ кэша.</param>
/// <param name="value">Данные для сохранения.</param>
/// <param name="options">Опции кэширования.</param>
/// <param name="cancellationToken">Токен отмены.</param>
public Task SetAsync<T>(string key, T value, DistributedCacheEntryOptions? options = null, CancellationToken cancellationToken = default);
}
16 changes: 16 additions & 0 deletions CompanyEmployee.Api/Services/IEmployeeGenerator.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
using CompanyEmployee.Domain.Entity;

namespace CompanyEmployee.Api.Services;

/// <summary>
/// Генератор данных сотрудников.
/// </summary>
public interface IEmployeeGenerator
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Нет саммари

{
/// <summary>
/// Генерирует сотрудника по идентификатору.
/// </summary>
/// <param name="id">Идентификатор.</param>
/// <returns>Сгенерированный сотрудник.</returns>
public Employee Generate(int id);
}
Loading