diff --git a/AspireApp/AspireApp.AppHost/AppHost.cs b/AspireApp/AspireApp.AppHost/AppHost.cs new file mode 100644 index 00000000..54b3941e --- /dev/null +++ b/AspireApp/AspireApp.AppHost/AppHost.cs @@ -0,0 +1,13 @@ +var builder = DistributedApplication.CreateBuilder(args); + +var cache = builder.AddRedis("employee-cache") + .WithRedisInsight(containerName: "employee-insight"); + +var service = builder.AddProject("service-api") + .WithReference(cache, "RedisCache") + .WaitFor(cache); + +builder.AddProject("employee-wasm") + .WaitFor(service); + +builder.Build().Run(); diff --git a/AspireApp/AspireApp.AppHost/AspireApp.AppHost.csproj b/AspireApp/AspireApp.AppHost/AspireApp.AppHost.csproj new file mode 100644 index 00000000..0d6320b5 --- /dev/null +++ b/AspireApp/AspireApp.AppHost/AspireApp.AppHost.csproj @@ -0,0 +1,24 @@ + + + + + + Exe + net8.0 + enable + enable + true + 8acee786-1688-40c1-943e-5186ce386476 + + + + + + + + + + + + + diff --git a/AspireApp/AspireApp.AppHost/Properties/launchSettings.json b/AspireApp/AspireApp.AppHost/Properties/launchSettings.json new file mode 100644 index 00000000..82c959fa --- /dev/null +++ b/AspireApp/AspireApp.AppHost/Properties/launchSettings.json @@ -0,0 +1,29 @@ +{ + "$schema": "https://json.schemastore.org/launchsettings.json", + "profiles": { + "https": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": true, + "applicationUrl": "https://localhost:17096;http://localhost:15155", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development", + "DOTNET_ENVIRONMENT": "Development", + "DOTNET_DASHBOARD_OTLP_ENDPOINT_URL": "https://localhost:21139", + "DOTNET_RESOURCE_SERVICE_ENDPOINT_URL": "https://localhost:22017" + } + }, + "http": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": true, + "applicationUrl": "http://localhost:15155", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development", + "DOTNET_ENVIRONMENT": "Development", + "DOTNET_DASHBOARD_OTLP_ENDPOINT_URL": "http://localhost:19197", + "DOTNET_RESOURCE_SERVICE_ENDPOINT_URL": "http://localhost:20116" + } + } + } +} diff --git a/AspireApp/AspireApp.AppHost/appsettings.Development.json b/AspireApp/AspireApp.AppHost/appsettings.Development.json new file mode 100644 index 00000000..0c208ae9 --- /dev/null +++ b/AspireApp/AspireApp.AppHost/appsettings.Development.json @@ -0,0 +1,8 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning" + } + } +} diff --git a/AspireApp/AspireApp.AppHost/appsettings.json b/AspireApp/AspireApp.AppHost/appsettings.json new file mode 100644 index 00000000..31c092aa --- /dev/null +++ b/AspireApp/AspireApp.AppHost/appsettings.json @@ -0,0 +1,9 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning", + "Aspire.Hosting.Dcp": "Warning" + } + } +} diff --git a/AspireApp/AspireApp.ServiceDefaults/AspireApp.ServiceDefaults.csproj b/AspireApp/AspireApp.ServiceDefaults/AspireApp.ServiceDefaults.csproj new file mode 100644 index 00000000..6c036a13 --- /dev/null +++ b/AspireApp/AspireApp.ServiceDefaults/AspireApp.ServiceDefaults.csproj @@ -0,0 +1,22 @@ + + + + net8.0 + enable + enable + true + + + + + + + + + + + + + + + diff --git a/AspireApp/AspireApp.ServiceDefaults/Extensions.cs b/AspireApp/AspireApp.ServiceDefaults/Extensions.cs new file mode 100644 index 00000000..13151bf4 --- /dev/null +++ b/AspireApp/AspireApp.ServiceDefaults/Extensions.cs @@ -0,0 +1,119 @@ +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Diagnostics.HealthChecks; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Diagnostics.HealthChecks; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.ServiceDiscovery; +using OpenTelemetry; +using OpenTelemetry.Metrics; +using OpenTelemetry.Trace; + +namespace Microsoft.Extensions.Hosting; + +// Adds common .NET Aspire services: service discovery, resilience, health checks, and OpenTelemetry. +// This project should be referenced by each service project in your solution. +// To learn more about using this project, see https://aka.ms/dotnet/aspire/service-defaults +public static class Extensions +{ + public static TBuilder AddServiceDefaults(this TBuilder builder) where TBuilder : IHostApplicationBuilder + { + builder.ConfigureOpenTelemetry(); + + builder.AddDefaultHealthChecks(); + + builder.Services.AddServiceDiscovery(); + + builder.Services.ConfigureHttpClientDefaults(http => + { + // Turn on resilience by default + http.AddStandardResilienceHandler(); + + // Turn on service discovery by default + http.AddServiceDiscovery(); + }); + + // Uncomment the following to restrict the allowed schemes for service discovery. + // builder.Services.Configure(options => + // { + // options.AllowedSchemes = ["https"]; + // }); + + return builder; + } + + public static TBuilder ConfigureOpenTelemetry(this TBuilder builder) where TBuilder : IHostApplicationBuilder + { + builder.Logging.AddOpenTelemetry(logging => + { + logging.IncludeFormattedMessage = true; + logging.IncludeScopes = true; + }); + + builder.Services.AddOpenTelemetry() + .WithMetrics(metrics => + { + metrics.AddAspNetCoreInstrumentation() + .AddHttpClientInstrumentation() + .AddRuntimeInstrumentation(); + }) + .WithTracing(tracing => + { + tracing.AddSource(builder.Environment.ApplicationName) + .AddAspNetCoreInstrumentation() + // Uncomment the following line to enable gRPC instrumentation (requires the OpenTelemetry.Instrumentation.GrpcNetClient package) + //.AddGrpcClientInstrumentation() + .AddHttpClientInstrumentation(); + }); + + builder.AddOpenTelemetryExporters(); + + return builder; + } + + private static TBuilder AddOpenTelemetryExporters(this TBuilder builder) where TBuilder : IHostApplicationBuilder + { + var useOtlpExporter = !string.IsNullOrWhiteSpace(builder.Configuration["OTEL_EXPORTER_OTLP_ENDPOINT"]); + + if (useOtlpExporter) + { + builder.Services.AddOpenTelemetry().UseOtlpExporter(); + } + + // Uncomment the following lines to enable the Azure Monitor exporter (requires the Azure.Monitor.OpenTelemetry.AspNetCore package) + //if (!string.IsNullOrEmpty(builder.Configuration["APPLICATIONINSIGHTS_CONNECTION_STRING"])) + //{ + // builder.Services.AddOpenTelemetry() + // .UseAzureMonitor(); + //} + + return builder; + } + + public static TBuilder AddDefaultHealthChecks(this TBuilder builder) where TBuilder : IHostApplicationBuilder + { + builder.Services.AddHealthChecks() + // Add a default liveness check to ensure app is responsive + .AddCheck("self", () => HealthCheckResult.Healthy(), ["live"]); + + return builder; + } + + public static WebApplication MapDefaultEndpoints(this WebApplication app) + { + // Adding health checks endpoints to applications in non-development environments has security implications. + // See https://aka.ms/dotnet/aspire/healthchecks for details before enabling these endpoints in non-development environments. + if (app.Environment.IsDevelopment()) + { + // All health checks must pass for app to be considered ready to accept traffic after starting + app.MapHealthChecks("/health"); + + // Only health checks tagged with the "live" tag must pass for app to be considered alive + app.MapHealthChecks("/alive", new HealthCheckOptions + { + Predicate = r => r.Tags.Contains("live") + }); + } + + return app; + } +} diff --git a/Client.Wasm/Components/StudentCard.razor b/Client.Wasm/Components/StudentCard.razor index 661f1181..065320bf 100644 --- a/Client.Wasm/Components/StudentCard.razor +++ b/Client.Wasm/Components/StudentCard.razor @@ -4,10 +4,10 @@ - Номер №X "Название лабораторной" - Вариант №Х "Название варианта" - Выполнена Фамилией Именем 65ХХ - Ссылка на форк + Номер №1 "Кэширование" + Вариант №32 "Сотрудник компании" + Выполнена Рыженковой Дианой 6512 + Ссылка на форк diff --git a/Client.Wasm/wwwroot/appsettings.json b/Client.Wasm/wwwroot/appsettings.json index d1fe7ab3..39898806 100644 --- a/Client.Wasm/wwwroot/appsettings.json +++ b/Client.Wasm/wwwroot/appsettings.json @@ -6,5 +6,5 @@ } }, "AllowedHosts": "*", - "BaseAddress": "" + "BaseAddress": "http://localhost:7099/employee" } diff --git a/CloudDevelopment.sln b/CloudDevelopment.sln index cb48241d..98a8e888 100644 --- a/CloudDevelopment.sln +++ b/CloudDevelopment.sln @@ -5,6 +5,12 @@ 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}") = "AspireApp.AppHost", "AspireApp\AspireApp.AppHost\AspireApp.AppHost.csproj", "{2CF45C7F-89EA-48F5-8350-A59AF1F82BC7}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AspireApp.ServiceDefaults", "AspireApp\AspireApp.ServiceDefaults\AspireApp.ServiceDefaults.csproj", "{A0BC68FF-8BE6-4035-BF3B-561CB4631B57}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Service.Api", "ServiceApi\Service.Api.csproj", "{888B9F35-3A72-42E9-A176-BA7A19ED878C}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -15,6 +21,18 @@ 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 + {2CF45C7F-89EA-48F5-8350-A59AF1F82BC7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2CF45C7F-89EA-48F5-8350-A59AF1F82BC7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2CF45C7F-89EA-48F5-8350-A59AF1F82BC7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2CF45C7F-89EA-48F5-8350-A59AF1F82BC7}.Release|Any CPU.Build.0 = Release|Any CPU + {A0BC68FF-8BE6-4035-BF3B-561CB4631B57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A0BC68FF-8BE6-4035-BF3B-561CB4631B57}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A0BC68FF-8BE6-4035-BF3B-561CB4631B57}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A0BC68FF-8BE6-4035-BF3B-561CB4631B57}.Release|Any CPU.Build.0 = Release|Any CPU + {888B9F35-3A72-42E9-A176-BA7A19ED878C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {888B9F35-3A72-42E9-A176-BA7A19ED878C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {888B9F35-3A72-42E9-A176-BA7A19ED878C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {888B9F35-3A72-42E9-A176-BA7A19ED878C}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/ServiceApi/Entities/Employee.cs b/ServiceApi/Entities/Employee.cs new file mode 100644 index 00000000..6bac3f41 --- /dev/null +++ b/ServiceApi/Entities/Employee.cs @@ -0,0 +1,69 @@ +using System.Text.Json.Serialization; + +namespace Service.Api.Entities; + +/// +/// Сотрудник компании +/// +public class Employee +{ + /// + /// Идентификатор сотрудника в системе + /// + [JsonPropertyName("id")] + public int Id { get; set; } + + /// + /// ФИО + /// + [JsonPropertyName("fullName")] + public string? FullName { get; set; } + + /// + /// Должность + /// + [JsonPropertyName("position")] + public string? Position { get; set; } + + /// + /// Отдел + /// + [JsonPropertyName("department")] + public string? Department { get; set; } + + /// + /// Дата приема + /// + [JsonPropertyName("hireDate")] + public DateOnly HireDate { get; set; } + + /// + /// Оклад + /// + [JsonPropertyName("salary")] + public decimal Salary { get; set; } + + /// + /// Электронная почта + /// + [JsonPropertyName("email")] + public string? Email { get; set; } + + /// + /// Номер телефона + /// + [JsonPropertyName("phone")] + public string? Phone { get; set; } + + /// + /// Индикатор увольнения + /// + [JsonPropertyName("isFired")] + public bool IsFired { get; set; } + + /// + /// Дата увольнения + /// + [JsonPropertyName("fireDate")] + public DateOnly? FireDate { get; set; } +} \ No newline at end of file diff --git a/ServiceApi/Generator/EmployeeGenerator.cs b/ServiceApi/Generator/EmployeeGenerator.cs new file mode 100644 index 00000000..560bde05 --- /dev/null +++ b/ServiceApi/Generator/EmployeeGenerator.cs @@ -0,0 +1,118 @@ +using Bogus; +using Bogus.DataSets; +using Service.Api.Entities; + +namespace Service.Api.Generator; + +/// +/// Генератор случайных сотрудников компании +/// +public static class EmployeeGenerator +{ + private static readonly Faker _faker; + + /// + /// Справочник профессий + /// + private static readonly string[] _professions = + { + "Developer", + "Manager", + "Analyst", + "Tester", + "Administrator", + "Designer" + }; + + /// + /// Справочник суффиксов + /// + private static readonly string[] _levels = + { + "Junior", + "Middle", + "Senior" + }; + + static EmployeeGenerator() + { + _faker = new Faker("ru") + + .RuleFor(e => e.Id, f => f.IndexFaker + 1) + + // ФИО + .RuleFor(e => e.FullName, f => + { + var gender = f.PickRandom(); + + var firstName = f.Name.FirstName(gender); + var lastName = f.Name.LastName(gender); + + var patronymicSuffix = gender == Name.Gender.Male ? "ович" : "овна"; + var patronymic = f.Name.FirstName(Name.Gender.Male) + patronymicSuffix; + + return $"{lastName} {firstName} {patronymic}"; + }) + + // Должность + .RuleFor(e => e.Position, f => + { + var level = f.PickRandom(_levels); + var profession = f.PickRandom(_professions); + + return $"{level} {profession}"; + }) + + // Отдел + .RuleFor(e => e.Department, f => f.Commerce.Department()) + + // Дата приема (не более 10 лет назад) + .RuleFor(e => e.HireDate, + f => DateOnly.FromDateTime(f.Date.Past(10))) + + // Оклад (зависит от уровня) + .RuleFor(e => e.Salary, (f, e) => + { + if (e.Position!.Contains("Junior")) + return Math.Round(f.Random.Decimal(50000, 90000), 2); + + if (e.Position.Contains("Middle")) + return Math.Round(f.Random.Decimal(90000, 150000), 2); + + return Math.Round(f.Random.Decimal(150000, 250000), 2); + }) + + // Email + .RuleFor(e => e.Email, f => f.Internet.Email()) + + // Телефон + .RuleFor(e => e.Phone, + f => f.Phone.PhoneNumber("+7(###)###-##-##")) + + // Индикатор увольнения + .RuleFor(e => e.IsFired, + f => f.Random.Bool(0.2f)) // 20% сотрудников уволены + + // Дата увольнения + .RuleFor(e => e.FireDate, (f, e) => + { + if (!e.IsFired) + return null; + + return DateOnly.FromDateTime( + f.Date.Between( + e.HireDate.ToDateTime(TimeOnly.MinValue), + DateTime.Now)); + }); + } + + /// + /// Генерирует одного случайного сотрудника + /// + public static Employee Generate(int id) + { + var employee = _faker.Generate(); + employee.Id = id; + return employee; + } +} \ No newline at end of file diff --git a/ServiceApi/Generator/EmployeeGeneratorService.cs b/ServiceApi/Generator/EmployeeGeneratorService.cs new file mode 100644 index 00000000..dbd3a6b5 --- /dev/null +++ b/ServiceApi/Generator/EmployeeGeneratorService.cs @@ -0,0 +1,68 @@ +using Microsoft.Extensions.Caching.Distributed; +using Service.Api.Entities; +using StackExchange.Redis; +using System.Reflection.Emit; +using System.Runtime.CompilerServices; +using System.Text.Json; +namespace Service.Api.Generator; + +public class EmployeeGeneratorService(IDistributedCache cache, ILogger logger, IConfiguration configuration) : IEmployeeGeneratorService +{ + /// + /// Время инициализации кэша + /// + private readonly TimeSpan _cacheExpiration = int.TryParse(configuration["CacheExpiration"], out var sec) + ? TimeSpan.FromSeconds(sec) + : TimeSpan.FromSeconds(3600); + + public async Task ProcessEmployee(int id) + { + logger.LogInformation("Обработка сотрудника {id} ", id); + try + { + logger.LogInformation("Trying to get employee {id} from cache", id); + var employee = await RetrieveFromCache(id); + if (employee != null) + { + logger.LogInformation("Employee {id} was found in cache", id); + return employee; + } + logger.LogInformation("No employee {id} in cache. Generating employee", id); + employee = EmployeeGenerator.Generate(id); + logger.LogInformation("Populating the cache with employee {id}", id); + await PopulateCache(employee); + return employee; + } + catch (Exception ex) + { + logger.LogError(ex, "Exception occurred during employee {id} processing", id); + throw; + } + + } + + /// + /// Пытается достать сотрудника из кэша + /// + private async Task RetrieveFromCache(int id) + { + var json = await cache.GetStringAsync(id.ToString()); + if (string.IsNullOrEmpty(json)) + return null; + return JsonSerializer.Deserialize(json); + } + + /// + /// Кладет сотрудника в кэш + /// + private async Task PopulateCache(Employee employee) + { + var json = JsonSerializer.Serialize(employee); + await cache.SetStringAsync(employee.Id.ToString(), json, + new DistributedCacheEntryOptions + { + AbsoluteExpirationRelativeToNow = _cacheExpiration + }); + } + +} diff --git a/ServiceApi/Generator/IEmployeeGeneratorService.cs b/ServiceApi/Generator/IEmployeeGeneratorService.cs new file mode 100644 index 00000000..8ae6fda8 --- /dev/null +++ b/ServiceApi/Generator/IEmployeeGeneratorService.cs @@ -0,0 +1,12 @@ +using Service.Api.Entities; + +namespace Service.Api.Generator; + +/// +/// Интерфейс для записи юзкейса по обработке сотрудников компании +/// +public interface IEmployeeGeneratorService +{ + Task ProcessEmployee(int id); + +} diff --git a/ServiceApi/Program.cs b/ServiceApi/Program.cs new file mode 100644 index 00000000..dfb2905e --- /dev/null +++ b/ServiceApi/Program.cs @@ -0,0 +1,20 @@ +using Service.Api.Generator; + +var builder = WebApplication.CreateBuilder(args); + +builder.AddServiceDefaults(); +builder.AddRedisDistributedCache("RedisCache"); + +builder.Services.AddScoped(); +builder.Services.AddCors(options => options.AddDefaultPolicy(policy => +{ + policy.WithOrigins("https://localhost:5127", "http://localhost:5127", "https://localhost:7282") + .WithMethods("GET") + .AllowAnyHeader(); +})); + +var app = builder.Build(); +app.MapDefaultEndpoints(); +app.MapGet("/employee", (IEmployeeGeneratorService service, int id) => service.ProcessEmployee(id)); +app.UseCors(); +app.Run(); diff --git a/ServiceApi/Properties/launchSettings.json b/ServiceApi/Properties/launchSettings.json new file mode 100644 index 00000000..1fb877b8 --- /dev/null +++ b/ServiceApi/Properties/launchSettings.json @@ -0,0 +1,13 @@ +{ + "profiles": { + "http": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": true, + "applicationUrl": "http://localhost:7099", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + } + } +} diff --git a/ServiceApi/Service.Api.csproj b/ServiceApi/Service.Api.csproj new file mode 100644 index 00000000..fad90748 --- /dev/null +++ b/ServiceApi/Service.Api.csproj @@ -0,0 +1,16 @@ + + + + net8.0 + enable + enable + + + + + + + + + + diff --git a/ServiceApi/appsettings.Development.json b/ServiceApi/appsettings.Development.json new file mode 100644 index 00000000..0c208ae9 --- /dev/null +++ b/ServiceApi/appsettings.Development.json @@ -0,0 +1,8 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning" + } + } +} diff --git a/ServiceApi/appsettings.json b/ServiceApi/appsettings.json new file mode 100644 index 00000000..10f68b8c --- /dev/null +++ b/ServiceApi/appsettings.json @@ -0,0 +1,9 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning" + } + }, + "AllowedHosts": "*" +}