Добавлены логи и тесты, внесены незначительные изменения

.github/workflows/build.yml

@@ -22,3 +22,5 @@ jobs:
       run: dotnet restore
     - name: Build
       run: dotnet build --no-restore
+    - name: Test
+      run: dotnet test --no-build

StudHub.Server.sln

@@ -10,6 +10,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Platform.API", "src\Platfor
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Admin.API", "src\Admin.API\Admin.API.csproj", "{781F6E4E-FC3B-46E4-895A-F27A4310CF42}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unit", "test\Unit\Unit.csproj", "{3558A138-C00A-4857-93E5-3ECCB5CD873C}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -36,5 +38,9 @@ Global
 		{781F6E4E-FC3B-46E4-895A-F27A4310CF42}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{781F6E4E-FC3B-46E4-895A-F27A4310CF42}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{781F6E4E-FC3B-46E4-895A-F27A4310CF42}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3558A138-C00A-4857-93E5-3ECCB5CD873C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3558A138-C00A-4857-93E5-3ECCB5CD873C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3558A138-C00A-4857-93E5-3ECCB5CD873C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3558A138-C00A-4857-93E5-3ECCB5CD873C}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal

src/Admin.API/Admin.API.csproj

@@ -15,6 +15,7 @@
       <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.12" />
       <PackageReference Include="NSwag.AspNetCore" Version="14.4.0" />
       <PackageReference Include="Scalar.AspNetCore" Version="2.6.9" />
+      <PackageReference Include="Serilog.AspNetCore" Version="9.0.0" />
     </ItemGroup>
 
 </Project>

src/Admin.API/Controllers/ReportController.cs

@@ -0,0 +1,49 @@
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using Application;
+using Application.DTO;
+using Application.Interfaces.Queries;
+using Application.Interfaces.Services;
+using Domain.Entities.Admin;
+
+namespace Admin.API.Controllers;
+
+[Authorize]
+[ApiController]
+[Route("reports")]
+public class ReportController : ControllerBase 
+{
+    private readonly IReportsService _reportsService;
+    private readonly IReportsQueryService _reportsQueryService;
+
+    public ReportController(IReportsService reportsService, IReportsQueryService reportsQueryService)
+    {
+        _reportsService = reportsService;
+        _reportsQueryService = reportsQueryService;
+    }
+
+    [HttpPost]
+    [ProducesResponseType(StatusCodes.Status201Created)]
+    [ProducesResponseType(StatusCodes.Status400BadRequest)]
+    [ProducesResponseType(StatusCodes.Status404NotFound)]
+    public async Task<IActionResult> Create(ReportDTO reportDTO)
+    {
+        await _reportsService.CreateReport(reportDTO);
+        return new StatusCodeResult(StatusCodes.Status201Created);
+    }
+
+    [HttpGet]
+    [ProducesResponseType(StatusCodes.Status200OK)]
+    public async Task<ActionResult<ICollection<Report>>> GetAll() => Ok(await _reportsQueryService.GetAllAsync());
+
+    [HttpGet("{id:int}")]
+    [ProducesResponseType(StatusCodes.Status200OK)]
+    [ProducesResponseType(StatusCodes.Status404NotFound)]
+    public async Task<ActionResult<ReportDTO>> GetById(int id) => Ok(await _reportsQueryService.GetByIdAsync(id));
+
+    [HttpGet("getByTargetEntityId")]
+    [ProducesResponseType(StatusCodes.Status200OK)]
+    [ProducesResponseType(StatusCodes.Status400BadRequest)]
+    public async Task<ActionResult<ICollection<Report>>> GetByTargetEntityId(ReportTargetEntities entity) 
+        => Ok(await _reportsQueryService.GetByTargetEntityIdAsync(entity));
+}

src/Admin.API/ExceptionHandlers/AuthorizationExceptionHandler.cs → src/Admin.API/ExceptionHandlers/ApplicationAuthorizationExceptionHandler.cs

@@ -1,16 +1,25 @@
 using Microsoft.AspNetCore.Diagnostics;
 using Microsoft.AspNetCore.Mvc;
+using Application.Exceptions;
+using ILogger = Serilog.ILogger;
 
 namespace Admin.API.ExceptionHandlers;
 
-public class AuthorizationExceptionHandler : IExceptionHandler
+public class ApplicationAuthorizationExceptionHandler : IExceptionHandler
 {
 	private const string ResponseTitle = "Доступ запрещён";
 	private const int StatusCode = StatusCodes.Status403Forbidden;
+	private readonly ILogger _logger;
+
+	public ApplicationAuthorizationExceptionHandler(ILogger logger)
+	{
+		_logger = logger;
+	}
+
 	public async ValueTask<bool> TryHandleAsync(HttpContext httpContext, Exception exception,
 		CancellationToken cancellationToken)
 	{
-		if (exception is not UnauthorizedAccessException)
+		if (exception is not ApplicationAuthorizationException)
 		{
 			return false;
 		}
@@ -23,6 +32,7 @@ public async ValueTask<bool> TryHandleAsync(HttpContext httpContext, Exception e
 			Detail = exception.Message
 		};
 		await httpContext.Response.WriteAsJsonAsync(problemDetails, cancellationToken);
+		_logger.Warning(exception, "Исключение обработано: {ResponseTitle}", ResponseTitle);
 		return true;
 	}
 }

src/Admin.API/ExceptionHandlers/AuthenticationExceptionHandler.cs

@@ -1,13 +1,21 @@
 using System.Security.Authentication;
 using Microsoft.AspNetCore.Diagnostics;
 using Microsoft.AspNetCore.Mvc;
+using ILogger = Serilog.ILogger;
 
 namespace Admin.API.ExceptionHandlers;
 
 public class AuthenticationExceptionHandler : IExceptionHandler
 {
 	private const string ResponseTitle = "При аутентификации произошла ошибка";
 	private const int StatusCode = StatusCodes.Status401Unauthorized;
+	private readonly ILogger _logger;
+
+	public AuthenticationExceptionHandler(ILogger logger)
+	{
+		_logger = logger;
+	}
+
 	public async ValueTask<bool> TryHandleAsync(HttpContext httpContext, Exception exception,
 		CancellationToken cancellationToken)
 	{
@@ -24,6 +32,7 @@ public async ValueTask<bool> TryHandleAsync(HttpContext httpContext, Exception e
 			Detail = exception.Message
 		};
 		await httpContext.Response.WriteAsJsonAsync(problemDetails, cancellationToken);
+		_logger.Warning(exception, "Исключение обработано: {ResponseTitle}", ResponseTitle);
 		return true;
 	}
 }

src/Admin.API/ExceptionHandlers/BadRequestExceptionHandler.cs

@@ -1,12 +1,20 @@
 using Microsoft.AspNetCore.Diagnostics;
 using Microsoft.AspNetCore.Mvc;
+using ILogger = Serilog.ILogger;
 
 namespace Admin.API.ExceptionHandlers;
 
 public class BadRequestExceptionHandler : IExceptionHandler
 {
 	private const string ResponseTitle = "Некорректный запрос";
 	private const int StatusCode = StatusCodes.Status400BadRequest;
+	private readonly ILogger _logger;
+
+	public BadRequestExceptionHandler(ILogger logger)
+	{
+		_logger = logger;
+	}
+
 	public async ValueTask<bool> TryHandleAsync(HttpContext httpContext, Exception exception,
 		CancellationToken cancellationToken)
 	{
@@ -23,6 +31,7 @@ public async ValueTask<bool> TryHandleAsync(HttpContext httpContext, Exception e
 			Detail = exception.Message
 		};
 		await httpContext.Response.WriteAsJsonAsync(problemDetails, cancellationToken);
+		_logger.Warning(exception, "Исключение обработано: {ResponseTitle}", ResponseTitle);
 		return true;
 	}
 }

src/Admin.API/ExceptionHandlers/GlobalExceptionHandler.cs

@@ -1,12 +1,20 @@
 using Microsoft.AspNetCore.Diagnostics;
 using Microsoft.AspNetCore.Mvc;
+using ILogger = Serilog.ILogger;
 
 namespace Admin.API.ExceptionHandlers;
 
 public class GlobalExceptionHandler : IExceptionHandler
 {
 	private const string ResponseTitle = "Произошла ошибка на стороне сервера";
 	private const int StatusCode = StatusCodes.Status500InternalServerError;
+	private readonly ILogger _logger;
+
+	public GlobalExceptionHandler(ILogger logger)
+	{
+		_logger = logger;
+	}
+
 	public async ValueTask<bool> TryHandleAsync(HttpContext httpContext, Exception exception,
 		CancellationToken cancellationToken)
 	{
@@ -19,6 +27,7 @@ public async ValueTask<bool> TryHandleAsync(HttpContext httpContext, Exception e
 			Detail = exception.Message
 		};
 		await httpContext.Response.WriteAsJsonAsync(problemDetails, cancellationToken);
+		_logger.Error(exception, ResponseTitle);
 		return true;
 	}
 }

src/Admin.API/ExceptionHandlers/InvalidOperationExceptionHandler.cs

@@ -1,13 +1,21 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.AspNetCore.Diagnostics;
 using Microsoft.AspNetCore.Mvc;
+using ILogger = Serilog.ILogger;
 
 namespace Admin.API.ExceptionHandlers;
 
 public class InvalidOperationExceptionHandler : IExceptionHandler
 {
 	private const string ResponseTitle = "Недопустимая операция";
 	private const int StatusCode = StatusCodes.Status409Conflict;
+	private readonly ILogger _logger;
+
+	public InvalidOperationExceptionHandler(ILogger logger)
+	{
+		_logger = logger;
+	}
+
 	public async ValueTask<bool> TryHandleAsync(HttpContext httpContext, Exception exception,
 		CancellationToken cancellationToken)
 	{
@@ -24,6 +32,7 @@ public async ValueTask<bool> TryHandleAsync(HttpContext httpContext, Exception e
 			Detail = exception.Message
 		};
 		await httpContext.Response.WriteAsJsonAsync(problemDetails, cancellationToken);
+		_logger.Warning(exception, "Исключение обработано: {ResponseTitle}", ResponseTitle);
 		return true;
 	}
 }

src/Admin.API/ExceptionHandlers/NotFoundExceptionHandler.cs

@@ -1,13 +1,21 @@
 using Microsoft.AspNetCore.Diagnostics;
 using Microsoft.AspNetCore.Mvc;
 using Application.Exceptions;
+using ILogger = Serilog.ILogger;
 
 namespace Admin.API.ExceptionHandlers;
 
 public class NotFoundExceptionHandler : IExceptionHandler
 {
 	private const string ResponseTitle = "Запрашиваемый ресурс отсутствует на сервере";
 	private const int StatusCode = StatusCodes.Status404NotFound;
+	private readonly ILogger _logger;
+
+	public NotFoundExceptionHandler(ILogger logger)
+	{
+		_logger = logger;
+	}
+
 	public async ValueTask<bool> TryHandleAsync(HttpContext httpContext, Exception exception,
 		CancellationToken cancellationToken)
 	{
@@ -24,6 +32,7 @@ public async ValueTask<bool> TryHandleAsync(HttpContext httpContext, Exception e
 			Detail = exception.Message
 		};
 		await httpContext.Response.WriteAsJsonAsync(problemDetails, cancellationToken);
+		_logger.Warning(exception, "Исключение обработано: {ResponseTitle}", ResponseTitle);
 		return true;
 	}
 }

src/Admin.API/Extensions/ServiceCollectionExtensions.cs

@@ -10,7 +10,7 @@ public static IServiceCollection AddExceptionHandlers(this IServiceCollection se
 		services.AddExceptionHandler<InvalidOperationExceptionHandler>();
 		services.AddExceptionHandler<NotFoundExceptionHandler>();
 		services.AddExceptionHandler<AuthenticationExceptionHandler>();
-		services.AddExceptionHandler<AuthorizationExceptionHandler>();
+		services.AddExceptionHandler<ApplicationAuthorizationExceptionHandler>();
 		services.AddExceptionHandler<GlobalExceptionHandler>();
 		return services;
 	}

src/Admin.API/Program.cs

@@ -1,6 +1,8 @@
 using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.IdentityModel.Tokens;
 using Scalar.AspNetCore;
+using Serilog;
+using Serilog.Filters;
 using Application.Interfaces.Services;
 using Infrastructure.Extensions;
 using Admin.API.Extensions;
@@ -12,8 +14,18 @@ public class Program
 	public static void Main(string[] args)
 	{
 		var builder = WebApplication.CreateBuilder(args);
+		builder.Host.UseSerilog((context, configuration) =>
+		{
+			configuration.ReadFrom.Configuration(context.Configuration);
+			// Временное решение, дублирование логов при использовании ExceptionHandlerMiddleware исправлено в .NET 10
+			configuration.Filter.ByExcluding(Matching
+				.FromSource<Microsoft.AspNetCore.Diagnostics.ExceptionHandlerMiddleware>());
+		});
 		builder.Services.AddEndpointsApiExplorer();
-		builder.Services.AddOpenApiDocument();
+		builder.Services.AddOpenApiDocument(options =>
+		{
+			options.Title = builder.Environment.IsDevelopment() ? "StudHub Admin API [DEV]" : "StudHub Admin API";
+		});
 		builder.Configuration.AddEnvironmentVariables();
 		builder.Services.AddStudHubServices(builder.Configuration.GetConnectionString("Default")!);
 		builder.Services.AddAdminServices();
@@ -67,6 +79,7 @@ public static void Main(string[] args)
 			};
 		});
 		var app = builder.Build();
+		app.UseSerilogRequestLogging();
 		app.UseCors();
 		app.UseExceptionHandler();
 		app.UseOpenApi(options =>
@@ -75,10 +88,12 @@ public static void Main(string[] args)
 		});
 		app.MapScalarApiReference(options =>
 		{
-			options.Title = "StudHub.Admin API";
+			options.Title = app.Environment.IsDevelopment()
+				? "StudHub Admin API [DEV]"
+				: "StudHub Admin API";
 			options.Servers = new List<ScalarServer>
 			{
-				new ScalarServer("https://api.admin.setka-rtu.ru")
+				new ScalarServer("https://api-admin.setka-rtu.ru")
 			};
 			if (app.Environment.IsDevelopment())
 			{
@@ -90,4 +105,4 @@ public static void Main(string[] args)
 
 		app.Run();
 	}
-}
+}

src/Admin.API/appsettings.Development.json

@@ -1,8 +1,22 @@
 {
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
+  "Serilog": {
+    "MinimumLevel": {
+      "Default": "Debug",
+      "Override": {
+        "Microsoft.EntityFrameworkCore": "Information",
+        "Microsoft.AspNetCore": "Information"
+      }
+    },
+    "Using": [ "Serilog.Sinks.Console", "Serilog.Sinks.File" ],
+    "WriteTo": [
+      { "Name": "Console" },
+      {
+        "Name": "File",
+        "Args": {
+          "path": "/Logs/Admin.API/Development/DevLog-.txt",
+          "rollingInterval": "Day"
+        }
+      }
+    ]
   }
 }