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
@@ -18,7 +18,9 @@ public class BlockUserCommandHandlerTests
    private readonly IRealtimeNotifier _notifier = Substitute.For<IRealtimeNotifier>();
    private readonly ITelegramNotifier _telegramNotifier = Substitute.For<ITelegramNotifier>();
    private readonly ICurrentUser _currentUser = Substitute.For<ICurrentUser>();
-    private readonly ILogger<BlockUserCommandHandler> _logger = Substitute.For<ILogger<BlockUserCommandHandler>>();
+    private readonly ILogger<BlockUserCommandHandler> _logger = Substitute.For<
+        ILogger<BlockUserCommandHandler>
+    >();

    [Fact]
    public async Task Handle_IdentityServiceFails_ReturnsFailureWithoutTouchingConfigs()
@@ -26,17 +28,35 @@ public class BlockUserCommandHandlerTests
        using var dbContext = InMemoryDbContextFactory.Create();
        var userId = Guid.NewGuid();
        var failure = UserErrors.NotFound;
-        _identityService.BlockUserAsync(userId, Arg.Any<CancellationToken>()).Returns(Result.Failure(failure));
+        _identityService
+            .BlockUserAsync(userId, Arg.Any<CancellationToken>())
+            .Returns(Result.Failure(failure));

-        var handler = new BlockUserCommandHandler(dbContext, _identityService, _gateway, _notifier, _telegramNotifier, _currentUser, _logger);
+        var handler = new BlockUserCommandHandler(
+            dbContext,
+            _identityService,
+            _gateway,
+            _notifier,
+            _telegramNotifier,
+            _currentUser,
+            _logger
+        );

        var result = await handler.Handle(new BlockUserCommand(userId), CancellationToken.None);

        Assert.False(result.IsSuccess);
        Assert.Equal(failure, result.Error);
-        await _gateway.DidNotReceive().UpdateClientAsync(
-            Arg.Any<Node>(), Arg.Any<string>(), Arg.Any<string>(), Arg.Any<VpnProtocol>(),
-            Arg.Any<string>(), Arg.Any<bool>(), Arg.Any<CancellationToken>());
+        await _gateway
+            .DidNotReceive()
+            .UpdateClientAsync(
+                Arg.Any<Node>(),
+                Arg.Any<string>(),
+                Arg.Any<string>(),
+                Arg.Any<VpnProtocol>(),
+                Arg.Any<string>(),
+                Arg.Any<bool>(),
+                Arg.Any<CancellationToken>()
+            );
    }

    [Fact]
@@ -46,7 +66,12 @@ public class BlockUserCommandHandlerTests
        var userId = Guid.NewGuid();
        var adminId = Guid.NewGuid();

-        var node = Node.Register("node-1", new Uri("https://node1.example.com"), new NodeCredentials("admin", "protected"), null);
+        var node = Node.Register(
+            "node-1",
+            new Uri("https://node1.example.com"),
+            new NodeCredentials("admin", "protected"),
+            null
+        );
        var inbound = Inbound.FromRemote(node.Id, "1", VpnProtocol.Vless, "remark", 443);
        var config = VpnConfig.Create(userId, inbound.Id, VpnProtocol.Vless, "my-config");

@@ -55,24 +80,56 @@ public class BlockUserCommandHandlerTests
        dbContext.VpnConfigs.Add(config);
        await dbContext.SaveChangesAsync(CancellationToken.None);

-        _identityService.BlockUserAsync(userId, Arg.Any<CancellationToken>()).Returns(Result.Success());
+        _identityService
+            .BlockUserAsync(userId, Arg.Any<CancellationToken>())
+            .Returns(Result.Success());
        _currentUser.UserId.Returns(adminId);
-        _gateway.UpdateClientAsync(
-            Arg.Any<Node>(), Arg.Any<string>(), Arg.Any<string>(), Arg.Any<VpnProtocol>(),
-            Arg.Any<string>(), Arg.Any<bool>(), Arg.Any<CancellationToken>())
+        _gateway
+            .UpdateClientAsync(
+                Arg.Any<Node>(),
+                Arg.Any<string>(),
+                Arg.Any<string>(),
+                Arg.Any<VpnProtocol>(),
+                Arg.Any<string>(),
+                Arg.Any<bool>(),
+                Arg.Any<CancellationToken>()
+            )
            .Returns(Result.Success());

-        var handler = new BlockUserCommandHandler(dbContext, _identityService, _gateway, _notifier, _telegramNotifier, _currentUser, _logger);
+        var handler = new BlockUserCommandHandler(
+            dbContext,
+            _identityService,
+            _gateway,
+            _notifier,
+            _telegramNotifier,
+            _currentUser,
+            _logger
+        );

        var result = await handler.Handle(new BlockUserCommand(userId), CancellationToken.None);

        Assert.True(result.IsSuccess);
        Assert.Equal(ConfigStatus.Disabled, config.Status);

-        await _gateway.Received(1).UpdateClientAsync(
-            Arg.Is<Node>(n => n.Id == node.Id), inbound.RemoteInboundId, config.ClientExternalId, config.Protocol,
-            "my-config", enable: false, Arg.Any<CancellationToken>());
-        await _notifier.Received(1).NotifyConfigStatusChangedAsync(userId, config.Id, ConfigStatus.Disabled, Arg.Any<CancellationToken>());
+        await _gateway
+            .Received(1)
+            .UpdateClientAsync(
+                Arg.Is<Node>(n => n.Id == node.Id),
+                inbound.RemoteInboundId,
+                config.ClientExternalId,
+                config.Protocol,
+                "my-config",
+                enable: false,
+                Arg.Any<CancellationToken>()
+            );
+        await _notifier
+            .Received(1)
+            .NotifyConfigStatusChangedAsync(
+                userId,
+                config.Id,
+                ConfigStatus.Disabled,
+                Arg.Any<CancellationToken>()
+            );

        var audit = Assert.Single(dbContext.AuditLogs.Local);
        Assert.Equal("UserBlocked", audit.Action);
@@ -85,17 +142,35 @@ public class BlockUserCommandHandlerTests
        using var dbContext = InMemoryDbContextFactory.Create();
        var userId = Guid.NewGuid();

-        _identityService.BlockUserAsync(userId, Arg.Any<CancellationToken>()).Returns(Result.Success());
+        _identityService
+            .BlockUserAsync(userId, Arg.Any<CancellationToken>())
+            .Returns(Result.Success());
        _currentUser.UserId.Returns(Guid.NewGuid());

-        var handler = new BlockUserCommandHandler(dbContext, _identityService, _gateway, _notifier, _telegramNotifier, _currentUser, _logger);
+        var handler = new BlockUserCommandHandler(
+            dbContext,
+            _identityService,
+            _gateway,
+            _notifier,
+            _telegramNotifier,
+            _currentUser,
+            _logger
+        );

        var result = await handler.Handle(new BlockUserCommand(userId), CancellationToken.None);

        Assert.True(result.IsSuccess);
-        await _gateway.DidNotReceive().UpdateClientAsync(
-            Arg.Any<Node>(), Arg.Any<string>(), Arg.Any<string>(), Arg.Any<VpnProtocol>(),
-            Arg.Any<string>(), Arg.Any<bool>(), Arg.Any<CancellationToken>());
+        await _gateway
+            .DidNotReceive()
+            .UpdateClientAsync(
+                Arg.Any<Node>(),
+                Arg.Any<string>(),
+                Arg.Any<string>(),
+                Arg.Any<VpnProtocol>(),
+                Arg.Any<string>(),
+                Arg.Any<bool>(),
+                Arg.Any<CancellationToken>()
+            );
    }

    [Fact]
@@ -105,7 +180,12 @@ public class BlockUserCommandHandlerTests
        var userId = Guid.NewGuid();
        var adminId = Guid.NewGuid();

-        var node = Node.Register("node-1", new Uri("https://node1.example.com"), new NodeCredentials("admin", "protected"), null);
+        var node = Node.Register(
+            "node-1",
+            new Uri("https://node1.example.com"),
+            new NodeCredentials("admin", "protected"),
+            null
+        );
        var inbound = Inbound.FromRemote(node.Id, "1", VpnProtocol.Vless, "remark", 443);
        var config = VpnConfig.Create(userId, inbound.Id, VpnProtocol.Vless, "my-config");

@@ -114,20 +194,43 @@ public class BlockUserCommandHandlerTests
        dbContext.VpnConfigs.Add(config);
        await dbContext.SaveChangesAsync(CancellationToken.None);

-        _identityService.BlockUserAsync(userId, Arg.Any<CancellationToken>()).Returns(Result.Success());
+        _identityService
+            .BlockUserAsync(userId, Arg.Any<CancellationToken>())
+            .Returns(Result.Success());
        _currentUser.UserId.Returns(adminId);
-        _gateway.UpdateClientAsync(
-            Arg.Any<Node>(), Arg.Any<string>(), Arg.Any<string>(), Arg.Any<VpnProtocol>(),
-            Arg.Any<string>(), Arg.Any<bool>(), Arg.Any<CancellationToken>())
+        _gateway
+            .UpdateClientAsync(
+                Arg.Any<Node>(),
+                Arg.Any<string>(),
+                Arg.Any<string>(),
+                Arg.Any<VpnProtocol>(),
+                Arg.Any<string>(),
+                Arg.Any<bool>(),
+                Arg.Any<CancellationToken>()
+            )
            .Returns(Result.Failure(Error.Failure("Xui.UpdateClientFailed", "Нода недоступна.")));

-        var handler = new BlockUserCommandHandler(dbContext, _identityService, _gateway, _notifier, _telegramNotifier, _currentUser, _logger);
+        var handler = new BlockUserCommandHandler(
+            dbContext,
+            _identityService,
+            _gateway,
+            _notifier,
+            _telegramNotifier,
+            _currentUser,
+            _logger
+        );

        var result = await handler.Handle(new BlockUserCommand(userId), CancellationToken.None);

        Assert.True(result.IsSuccess);
        Assert.Equal(ConfigStatus.Active, config.Status);
-        await _notifier.DidNotReceive().NotifyConfigStatusChangedAsync(
-            Arg.Any<Guid>(), Arg.Any<Guid>(), Arg.Any<ConfigStatus>(), Arg.Any<CancellationToken>());
+        await _notifier
+            .DidNotReceive()
+            .NotifyConfigStatusChangedAsync(
+                Arg.Any<Guid>(),
+                Arg.Any<Guid>(),
+                Arg.Any<ConfigStatus>(),
+                Arg.Any<CancellationToken>()
+            );
    }
 }