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
16 changes: 10 additions & 6 deletions Client.Wasm/Components/StudentCard.razor
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
<Card>
<CardHeader>
<Heading Size="HeadingSize.Is5"><Icon Name="IconName.User" /> Лабораторная работа</Heading>
<Heading Size="HeadingSize.Is5">
<Icon Name="IconName.User" /> Лабораторная работа
</Heading>
</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>№2 "Балансировка нагрузки"</Strong></UnorderedListItem>
<UnorderedListItem>Вариант <Strong>№19 "Объект жилого строительства"</Strong></UnorderedListItem>
<UnorderedListItem>Выполнена <Strong>Абаниным Иваном 6512</Strong> </UnorderedListItem>
<UnorderedListItem>
<Link To="https://github.com/UselessMiva/cloud-development">Ссылка на форк</Link>
</UnorderedListItem>
</UnorderedList>
</CardBody>
</Card>
</Card>
3 changes: 2 additions & 1 deletion Client.Wasm/wwwroot/appsettings.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@
}
},
"AllowedHosts": "*",
"BaseAddress": ""

"BaseAddress": "https://localhost:7297/api/ResidentialProperty"
}
34 changes: 32 additions & 2 deletions CloudDevelopment.sln
Original file line number Diff line number Diff line change
@@ -1,10 +1,20 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.14.36811.4
# Visual Studio Version 18
VisualStudioVersion = 18.4.11605.240
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}") = "ResidentialProperty.AppHost", "ResidentialProperty.AppHost\ResidentialProperty.AppHost.csproj", "{C15C9641-651E-4929-A9AC-F91BA292ED4F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResidentialProperty.Domain", "ResidentialProperty.Domain\ResidentialProperty.Domain.csproj", "{BCCEEEA7-39DD-7F63-CC8A-99C00D0CDD05}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResidentialProperty.ServiceDefaults", "ResidentialProperty.ServiceDefaults\ResidentialProperty.ServiceDefaults.csproj", "{603B5FBD-0AA1-02F5-BFAB-CB290AEFE7C0}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResidentialProperty.Api", "ResidentialProperty.Api\ResidentialProperty.Api.csproj", "{02A8658C-5DF4-D5DF-1B14-34C6D1A25FFE}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResidentialProperty.ApiGateway", "ResidentialProperty.ApiGateway\ResidentialProperty.ApiGateway.csproj", "{75DBDD1A-EB23-50C6-74EC-22E1C27E1809}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -15,6 +25,26 @@ 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
{C15C9641-651E-4929-A9AC-F91BA292ED4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C15C9641-651E-4929-A9AC-F91BA292ED4F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C15C9641-651E-4929-A9AC-F91BA292ED4F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C15C9641-651E-4929-A9AC-F91BA292ED4F}.Release|Any CPU.Build.0 = Release|Any CPU
{BCCEEEA7-39DD-7F63-CC8A-99C00D0CDD05}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BCCEEEA7-39DD-7F63-CC8A-99C00D0CDD05}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BCCEEEA7-39DD-7F63-CC8A-99C00D0CDD05}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BCCEEEA7-39DD-7F63-CC8A-99C00D0CDD05}.Release|Any CPU.Build.0 = Release|Any CPU
{603B5FBD-0AA1-02F5-BFAB-CB290AEFE7C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{603B5FBD-0AA1-02F5-BFAB-CB290AEFE7C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{603B5FBD-0AA1-02F5-BFAB-CB290AEFE7C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{603B5FBD-0AA1-02F5-BFAB-CB290AEFE7C0}.Release|Any CPU.Build.0 = Release|Any CPU
{02A8658C-5DF4-D5DF-1B14-34C6D1A25FFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{02A8658C-5DF4-D5DF-1B14-34C6D1A25FFE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{02A8658C-5DF4-D5DF-1B14-34C6D1A25FFE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{02A8658C-5DF4-D5DF-1B14-34C6D1A25FFE}.Release|Any CPU.Build.0 = Release|Any CPU
{75DBDD1A-EB23-50C6-74EC-22E1C27E1809}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{75DBDD1A-EB23-50C6-74EC-22E1C27E1809}.Debug|Any CPU.Build.0 = Debug|Any CPU
{75DBDD1A-EB23-50C6-74EC-22E1C27E1809}.Release|Any CPU.ActiveCfg = Release|Any CPU
{75DBDD1A-EB23-50C6-74EC-22E1C27E1809}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
using ResidentialProperty.Api.Services.ResidentialPropertyGeneratorService;
using ResidentialProperty.Domain.Entities;
using Microsoft.AspNetCore.Mvc;

namespace ResidentialProperty.Api.Controllers;

[Route("api/[controller]")]
[ApiController]
public class ResidentialPropertyController(
IResidentialPropertyGeneratorService generatorService,
ILogger<ResidentialPropertyController> logger) : ControllerBase
{
/// <summary>
/// Получить объект жилого строительства по ID, если не найден в кэше — сгенерировать новый
/// </summary>
/// <param name="id">ID объекта</param>
/// <param name="cancellationToken">Токен отмены операции</param>
/// <returns>Объект жилого строительства</returns>
[HttpGet]
[ProducesResponseType(typeof(ResidentialPropertyEntity), StatusCodes.Status200OK)]
[ProducesResponseType(StatusCodes.Status400BadRequest)]
[ProducesResponseType(StatusCodes.Status404NotFound)]
[ProducesResponseType(StatusCodes.Status500InternalServerError)]
public async Task<ActionResult<ResidentialPropertyEntity>> GetById([FromQuery] int id, CancellationToken cancellationToken)
{
logger.LogInformation("Received request to retrieve/generate property {Id}", id);

var property = await generatorService.GetByIdAsync(id, cancellationToken);

return Ok(property);
}
}
63 changes: 63 additions & 0 deletions ResidentialProperty.Api/Program.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
using ResidentialProperty.Api.Services.ResidentialPropertyGeneratorService;
using ResidentialProperty.ServiceDefaults;

var builder = WebApplication.CreateBuilder(args);

builder.AddServiceDefaults();
builder.AddRedisDistributedCache("redis");

builder.Services.AddCors(options =>
{
options.AddDefaultPolicy(policy =>
{
policy.SetIsOriginAllowed(origin =>
new Uri(origin).Host == "localhost")
.WithMethods("GET")
.WithHeaders("Content-Type")
.AllowCredentials();
});
});

// Регистрация сервисов
builder.Services.AddSingleton<ResidentialPropertyGenerator>();
builder.Services.AddScoped<IResidentialPropertyGeneratorService, ResidentialPropertyGeneratorService>();

builder.Services.AddControllers();
builder.Services.AddEndpointsApiExplorer();
builder.Services.AddSwaggerGen(options =>
{
options.SwaggerDoc("v1", new Microsoft.OpenApi.OpenApiInfo
{
Title = "Residential Property Generator API",
Description = "API для генерации объектов жилого строительства",
Version = "v1"
});

var xmlFilename = $"{System.Reflection.Assembly.GetExecutingAssembly().GetName().Name}.xml";
var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFilename);
if (File.Exists(xmlPath))
{
options.IncludeXmlComments(xmlPath);
}

var domainXmlPath = Path.Combine(AppContext.BaseDirectory, "ResidentialProperty.Domain.xml");
if (File.Exists(domainXmlPath))
{
options.IncludeXmlComments(domainXmlPath);
}
});

var app = builder.Build();

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

app.UseHttpsRedirection();
app.UseCors();
app.MapControllers();
app.MapDefaultEndpoints();

app.Run();
31 changes: 31 additions & 0 deletions ResidentialProperty.Api/Properties/launchSettings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
"$schema": "http://json.schemastore.org/launchsettings.json",
"iisSettings": {
"windowsAuthentication": false,
"anonymousAuthentication": true,
"iisExpress": {
"applicationUrl": "http://localhost:32342",
"sslPort": 44362
}
},
"profiles": {
"http": {
"commandName": "Project",
"dotnetRunMessages": true,
"launchBrowser": true,
"launchUrl": "swagger",
"applicationUrl": "http://localhost:5187",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
},
"IIS Express": {
"commandName": "IISExpress",
"launchBrowser": true,
"launchUrl": "swagger",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
}
}
}
23 changes: 23 additions & 0 deletions ResidentialProperty.Api/ResidentialProperty.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>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<NoWarn>$(NoWarn);1591</NoWarn>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Aspire.StackExchange.Redis.DistributedCaching" Version="9.5.2" />
<PackageReference Include="Bogus" Version="35.6.5" />
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.24" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="10.1.4" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\ResidentialProperty.Domain\ResidentialProperty.Domain.csproj" />
<ProjectReference Include="..\ResidentialProperty.ServiceDefaults\ResidentialProperty.ServiceDefaults.csproj" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
using ResidentialProperty.Domain.Entities;

namespace ResidentialProperty.Api.Services.ResidentialPropertyGeneratorService;

/// <summary>
/// Сервис получения объекта жилого строительства
/// </summary>
public interface IResidentialPropertyGeneratorService
{
public Task<ResidentialPropertyEntity> GetByIdAsync(int id, CancellationToken cancellationToken = default);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
using Bogus;
using ResidentialProperty.Domain.Entities;

namespace ResidentialProperty.Api.Services.ResidentialPropertyGeneratorService;

/// <summary>
/// Генератор случайных объектов жилого строительства с использованием Bogus
/// </summary>
public class ResidentialPropertyGenerator
{
private static readonly string[] _propertyTypes = new[] { "Квартира", "ИЖС", "Апартаменты", "Офис", "Коммерческая" };
private readonly Faker<ResidentialPropertyEntity> _faker;
private int _idCounter = 1;

public ResidentialPropertyGenerator()
{
_faker = new Faker<ResidentialPropertyEntity>("ru")
.RuleFor(p => p.Id, f => _idCounter++)
.RuleFor(p => p.Address, f => $"{f.Address.City()}, ул. {f.Address.StreetName()}, д. {f.Random.Number(1, 100)}")
.RuleFor(p => p.PropertyType, f => f.PickRandom(_propertyTypes))
.RuleFor(p => p.YearBuilt, f => f.Random.Number(1950, DateTime.Now.Year))
.RuleFor(p => p.TotalArea, f => Math.Round(f.Random.Double(30, 200), 2))
.RuleFor(p => p.LivingArea, (f, p) => Math.Round(p.TotalArea * f.Random.Double(0.5, 0.9), 2))
.RuleFor(p => p.TotalFloors, f => f.Random.Number(1, 25))
.RuleFor(p => p.Floor, (f, p) =>
p.PropertyType == "ИЖС" ? null : f.Random.Number(1, p.TotalFloors))
.RuleFor(p => p.CadastralNumber, f => f.Random.ReplaceNumbers("##:##:#######:####"))
.RuleFor(p => p.CadastralValue, (f, p) =>
Math.Round((decimal)(p.TotalArea * f.Random.Double(50000, 150000)), 2));
}

/// <summary>
/// Генерирует один случайный объект жилого строительства
/// </summary>
public ResidentialPropertyEntity Generate() => _faker.Generate();
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
using Microsoft.Extensions.Caching.Distributed;
using ResidentialProperty.Domain.Entities;
using System.Text.Json;

namespace ResidentialProperty.Api.Services.ResidentialPropertyGeneratorService;

/// <summary>
/// Сервис получения объекта жилого строительства: сначала ищет в кэше, при промахе — генерирует новый и сохраняет
/// </summary>
public class ResidentialPropertyGeneratorService(
IDistributedCache cache,
ResidentialPropertyGenerator generator,
IConfiguration configuration,
ILogger<ResidentialPropertyGeneratorService> logger) : IResidentialPropertyGeneratorService
{
private readonly int _expirationMinutes = configuration.GetValue("CacheSettings:ExpirationMinutes", 10);

/// <summary>
/// Возвращает объект жилого строительства по идентификатору.
/// Если объект найден в кэше — возвращается из него; иначе генерируется, сохраняется в кэш и возвращается.
/// </summary>
/// <param name="id">Идентификатор объекта</param>
/// <param name="cancellationToken">Токен отмены операции</param>
/// <returns>Объект жилого строительства</returns>
public async Task<ResidentialPropertyEntity> GetByIdAsync(int id, CancellationToken cancellationToken = default)
{
logger.LogInformation("Attempting to retrieve residential property {Id} from cache", id);

var cacheKey = $"residential-property-{id}";

// Получаем объект из кэша
var property = await GetFromCacheAsync(cacheKey, id, cancellationToken);

if (property != null)
{
return property;
}

// Если в кэше нет или ошибка — генерируем новый объект
logger.LogInformation("Property {Id} not found in cache or cache unavailable, generating a new one", id);
property = generator.Generate();
property.Id = id;

// Попытка сохранить в кэш
await SaveToCacheAsync(cacheKey, property, cancellationToken);

return property;
}

private async Task<ResidentialPropertyEntity?> GetFromCacheAsync(string cacheKey, int id, CancellationToken cancellationToken)
{
try
{
var cachedData = await cache.GetStringAsync(cacheKey, cancellationToken);

if (!string.IsNullOrEmpty(cachedData))
{
var property = JsonSerializer.Deserialize<ResidentialPropertyEntity>(cachedData);

if (property != null)
{
logger.LogInformation("Residential property {Id} found in cache", id);
return property;
}

logger.LogWarning("Property {Id} was found in cache but could not be deserialized. Generating a new one", id);
}
}
catch (Exception ex)
{
logger.LogWarning(ex, "Failed to retrieve property {Id} from cache (error ignored)", id);
}

return null;
}

private async Task SaveToCacheAsync(string cacheKey, ResidentialPropertyEntity property, CancellationToken cancellationToken)
{
try
{
logger.LogInformation("Saving property {Id} to cache", property.Id);

var cacheOptions = new DistributedCacheEntryOptions
{
AbsoluteExpirationRelativeToNow = TimeSpan.FromMinutes(_expirationMinutes)
};

await cache.SetStringAsync(
cacheKey,
JsonSerializer.Serialize(property),
cacheOptions,
cancellationToken);

logger.LogInformation(
"Residential property generated and cached: Id={Id}, Address={Address}, Type={PropertyType}, TotalArea={TotalArea}, CadastralValue={CadastralValue}",
property.Id,
property.Address,
property.PropertyType,
property.TotalArea,
property.CadastralValue);
}
catch (Exception ex)
{
logger.LogWarning(ex, "Failed to save property {Id} to cache (error ignored)", property.Id);
}
}
}
Loading
Loading