Рыженкова Диана Лаб. 1 Группа 6512

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<Projects.Service_Api>("service-api")
+    .WithReference(cache, "RedisCache")
+    .WaitFor(cache);
+
+builder.AddProject<Projects.Client_Wasm>("employee-wasm")
+    .WaitFor(service);
+
+builder.Build().Run();

AspireApp/AspireApp.AppHost/AspireApp.AppHost.csproj

@@ -0,0 +1,24 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <Sdk Name="Aspire.AppHost.Sdk" Version="9.0.0" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <IsAspireHost>true</IsAspireHost>
+    <UserSecretsId>8acee786-1688-40c1-943e-5186ce386476</UserSecretsId>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Aspire.Hosting.AppHost" Version="9.0.0" />
+	<PackageReference Include="Aspire.Hosting.Redis" Version="9.0.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\Client.Wasm\Client.Wasm.csproj" />
+    <ProjectReference Include="..\..\ServiceApi\Service.Api.csproj" />
+  </ItemGroup>
+
+</Project>

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"
+      }
+    }
+  }
+}

AspireApp/AspireApp.AppHost/appsettings.Development.json

@@ -0,0 +1,8 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  }
+}

AspireApp/AspireApp.AppHost/appsettings.json

@@ -0,0 +1,9 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning",
+      "Aspire.Hosting.Dcp": "Warning"
+    }
+  }
+}

AspireApp/AspireApp.ServiceDefaults/AspireApp.ServiceDefaults.csproj

@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <IsAspireSharedProject>true</IsAspireSharedProject>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <FrameworkReference Include="Microsoft.AspNetCore.App" />
+
+    <PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="9.0.0" />
+    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.9.0" />
+    <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.9.0" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.9.0" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.9.0" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.9.0" />
+  </ItemGroup>
+
+</Project>

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<TBuilder>(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<ServiceDiscoveryOptions>(options =>
+        // {
+        //     options.AllowedSchemes = ["https"];
+        // });
+
+        return builder;
+    }
+
+    public static TBuilder ConfigureOpenTelemetry<TBuilder>(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<TBuilder>(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<TBuilder>(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;
+    }
+}

Client.Wasm/Components/StudentCard.razor

@@ -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>№32 "Сотрудник компании"</Strong></UnorderedListItem>
+            <UnorderedListItem>Выполнена <Strong>Рыженковой Дианой 6512</Strong> </UnorderedListItem>
+            <UnorderedListItem><Link To="https://github.com/DianaRyz/cloud-development">Ссылка на форк</Link></UnorderedListItem>
         </UnorderedList>
     </CardBody>
 </Card>

Client.Wasm/wwwroot/appsettings.json

@@ -6,5 +6,5 @@
     }
   },
   "AllowedHosts": "*",
-  "BaseAddress": ""
+  "BaseAddress": "http://localhost:7099/employee"
 }

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

ServiceApi/Entities/Employee.cs

@@ -0,0 +1,69 @@
+using System.Text.Json.Serialization;
+
+namespace Service.Api.Entities;
+
+/// <summary>
+/// Сотрудник компании
+/// </summary>
+public class Employee
+{
+    /// <summary>
+    /// Идентификатор сотрудника в системе
+    /// </summary>
+    [JsonPropertyName("id")]
+    public int Id { get; set; }
+
+    /// <summary>
+    /// ФИО
+    /// </summary>
+    [JsonPropertyName("fullName")]
+    public string? FullName { get; set; }
+
+    /// <summary>
+    /// Должность
+    /// </summary>
+    [JsonPropertyName("position")]
+    public string? Position { get; set; }
+
+    /// <summary>
+    /// Отдел
+    /// </summary>
+    [JsonPropertyName("department")]
+    public string? Department { get; set; }
+
+    /// <summary>
+    /// Дата приема
+    /// </summary>
+    [JsonPropertyName("hireDate")]
+    public DateOnly HireDate { get; set; }
+
+    /// <summary>
+    /// Оклад
+    /// </summary>
+    [JsonPropertyName("salary")]
+    public decimal Salary { get; set; }
+
+    /// <summary>
+    /// Электронная почта
+    /// </summary>
+    [JsonPropertyName("email")]
+    public string? Email { get; set; }
+
+    /// <summary>
+    /// Номер телефона
+    /// </summary>
+    [JsonPropertyName("phone")]
+    public string? Phone { get; set; }
+
+    /// <summary>
+    /// Индикатор увольнения
+    /// </summary>
+    [JsonPropertyName("isFired")]
+    public bool IsFired { get; set; }
+
+    /// <summary>
+    /// Дата увольнения
+    /// </summary>
+    [JsonPropertyName("fireDate")]
+    public DateOnly? FireDate { get; set; }
+}