Refactor project files for improved readability and structure

- Cleaned up whitespace in Directory.Build.props and Directory.Packages.props for consistency. - Reformatted project file references in PnvPanel.Api.csproj for better clarity. - Enhanced code readability in various endpoint files by adjusting line breaks and indentation. - Standardized method signatures and improved formatting in ResultExtensions and multiple endpoint classes for better maintainability.
2026-07-14 07:24:13 +03:00
parent 9d5424bb9c
commit df137ca5a7
285 changed files with 6911 additions and 2063 deletions
@@ -8,22 +8,32 @@ using PnvPanel.Domain.Support;
 namespace PnvPanel.Application.Support.CreateRoleRequest;

 public sealed class CreateRoleRequestTicketCommandHandler(
-    IAppDbContext dbContext, IRoleService roleService, IRealtimeNotifier notifier,
-    ITelegramNotifier telegramNotifier, ICurrentUser currentUser)
-    : ICommandHandler<CreateRoleRequestTicketCommand, Result<TicketDetailDto>>
+    IAppDbContext dbContext,
+    IRoleService roleService,
+    IRealtimeNotifier notifier,
+    ITelegramNotifier telegramNotifier,
+    ICurrentUser currentUser
+) : ICommandHandler<CreateRoleRequestTicketCommand, Result<TicketDetailDto>>
 {
    // Совпадает со значением Infrastructure.Identity.RoleNames.Admin — Application не может ссылаться
    // на Infrastructure (направление зависимостей), поэтому системное имя роли продублировано здесь.
    private const string AdminRoleName = "admin";

-    public async Task<Result<TicketDetailDto>> Handle(CreateRoleRequestTicketCommand command, CancellationToken cancellationToken)
+    public async Task<Result<TicketDetailDto>> Handle(
+        CreateRoleRequestTicketCommand command,
+        CancellationToken cancellationToken
+    )
    {
        if (currentUser.UserId is not { } userId)
            return Result.Failure<TicketDetailDto>(AuthErrors.Unauthorized);

        var hasPending = await dbContext.SupportTickets.AnyAsync(
-            t => t.UserId == userId && t.Type == TicketType.RoleRequest && t.Status == TicketStatus.Open,
-            cancellationToken);
+            t =>
+                t.UserId == userId
+                && t.Type == TicketType.RoleRequest
+                && t.Status == TicketStatus.Open,
+            cancellationToken
+        );
        if (hasPending)
            return Result.Failure<TicketDetailDto>(SupportErrors.RoleRequestAlreadyPending);

@@ -46,7 +56,11 @@ public sealed class CreateRoleRequestTicketCommandHandler(
        else
        {
            ticket = SupportTicket.CreateRoleRequestForNewRole(
-                userId, command.NewRoleName!, command.NewRoleMaxConfigs!.Value, command.NewRoleMaxIpLimit!.Value);
+                userId,
+                command.NewRoleName!,
+                command.NewRoleMaxConfigs!.Value,
+                command.NewRoleMaxIpLimit!.Value
+            );
        }

        dbContext.SupportTickets.Add(ticket);
@@ -55,18 +69,48 @@ public sealed class CreateRoleRequestTicketCommandHandler(
        dbContext.TicketComments.Add(comment);

        var userName = currentUser.UserName ?? userId.ToString();
-        var roleDescription = requestedRoleName
+        var roleDescription =
+            requestedRoleName
            ?? $"новая роль «{command.NewRoleName}» (конфигов: {command.NewRoleMaxConfigs}, IP: {command.NewRoleMaxIpLimit})";

-        await notifier.NotifyTicketCreatedAsync(ticket.Id, userId, userName, ticket.Type, cancellationToken);
-        await telegramNotifier.NotifyAdminsRoleRequestCreatedAsync(ticket.Id, userName, roleDescription, command.Justification, cancellationToken);
+        await notifier.NotifyTicketCreatedAsync(
+            ticket.Id,
+            userId,
+            userName,
+            ticket.Type,
+            cancellationToken
+        );
+        await telegramNotifier.NotifyAdminsRoleRequestCreatedAsync(
+            ticket.Id,
+            userName,
+            roleDescription,
+            command.Justification,
+            cancellationToken
+        );

-        var commentDto = new TicketCommentDto(comment.Id, userId, userName, comment.Body, comment.CreatedAt, []);
+        var commentDto = new TicketCommentDto(
+            comment.Id,
+            userId,
+            userName,
+            comment.Body,
+            comment.CreatedAt,
+            []
+        );

        var dto = new TicketDetailDto(
-            ticket.Id, ticket.UserId, userName, ticket.Type, ticket.Status,
-            ticket.RequestedRoleId, requestedRoleName, ticket.ProposedRoleName, ticket.ProposedMaxConfigs,
-            ticket.ProposedMaxIpLimit, ticket.CreatedAt, [commentDto]);
+            ticket.Id,
+            ticket.UserId,
+            userName,
+            ticket.Type,
+            ticket.Status,
+            ticket.RequestedRoleId,
+            requestedRoleName,
+            ticket.ProposedRoleName,
+            ticket.ProposedMaxConfigs,
+            ticket.ProposedMaxIpLimit,
+            ticket.CreatedAt,
+            [commentDto]
+        );

        return Result.Success(dto);
    }