feat(connections): server removal orchestrator

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: HandyS11

src/RustPlusBot.Features.Connections/ConnectionServiceCollectionExtensions.cs

@@ -2,6 +2,7 @@
 using RustPlusBot.Discord;
 using RustPlusBot.Features.Connections.Hosting;
 using RustPlusBot.Features.Connections.Listening;
+using RustPlusBot.Features.Connections.Removal;
 using RustPlusBot.Features.Connections.Supervisor;
 
 namespace RustPlusBot.Features.Connections;
@@ -18,6 +19,7 @@ public static IServiceCollection AddConnections(this IServiceCollection services
 
         services.AddSingleton<IRustSocketSource, RustPlusSocketSource>();
         services.AddSingleton<IConnectionSupervisor, ConnectionSupervisor>();
+        services.AddScoped<IServerRemovalService, ServerRemovalService>();
 
         // Contribute this assembly's interaction modules to the Discord layer.
         services.AddSingleton(new InteractionModuleAssembly(typeof(ConnectionServiceCollectionExtensions).Assembly));

src/RustPlusBot.Features.Connections/Removal/IServerRemovalService.cs

@@ -0,0 +1,12 @@
+namespace RustPlusBot.Features.Connections.Removal;
+
+/// <summary>Orchestrates removing a server: stop the socket, delete the row (cascades), tear down the workspace.</summary>
+internal interface IServerRemovalService
+{
+    /// <summary>Removes a server end-to-end. Returns true if a server row was deleted.</summary>
+    /// <param name="guildId">The owning guild snowflake.</param>
+    /// <param name="serverId">The server to remove.</param>
+    /// <param name="cancellationToken">A cancellation token.</param>
+    /// <returns>True if a matching server row was removed.</returns>
+    Task<bool> RemoveServerAsync(ulong guildId, Guid serverId, CancellationToken cancellationToken = default);
+}

src/RustPlusBot.Features.Connections/Removal/ServerRemovalService.cs

@@ -0,0 +1,25 @@
+using RustPlusBot.Features.Connections.Supervisor;
+using RustPlusBot.Features.Workspace.Teardown;
+using RustPlusBot.Persistence.Servers;
+
+namespace RustPlusBot.Features.Connections.Removal;
+
+/// <summary>Default <see cref="IServerRemovalService"/>. Order matters: stop the socket before deleting the row,
+/// so no late status write re-inserts a connection-state row against a deleted server (FK violation).</summary>
+/// <param name="supervisor">Stops the live socket.</param>
+/// <param name="servers">Deletes the RustServer (cascades credentials + connection state).</param>
+/// <param name="workspace">Tears down the server's Discord category/channels/records.</param>
+internal sealed class ServerRemovalService(
+    IConnectionSupervisor supervisor,
+    IServerService servers,
+    IServerWorkspaceRemover workspace) : IServerRemovalService
+{
+    /// <inheritdoc />
+    public async Task<bool> RemoveServerAsync(ulong guildId, Guid serverId, CancellationToken cancellationToken = default)
+    {
+        await supervisor.StopAsync(guildId, serverId).ConfigureAwait(false);
+        var removed = await servers.RemoveAsync(guildId, serverId, cancellationToken).ConfigureAwait(false);
+        await workspace.RemoveServerAsync(guildId, serverId, cancellationToken).ConfigureAwait(false);
+        return removed;
+    }
+}

tests/RustPlusBot.Features.Connections.Tests/ConnectionRegistrationTests.cs

@@ -6,7 +6,9 @@
 using RustPlusBot.Abstractions.Time;
 using RustPlusBot.Discord.Notifications;
 using RustPlusBot.Features.Connections;
+using RustPlusBot.Features.Connections.Removal;
 using RustPlusBot.Features.Connections.Supervisor;
+using RustPlusBot.Features.Workspace.Teardown;
 using RustPlusBot.Persistence;
 using RustPlusBot.Persistence.Connections;
 
@@ -26,6 +28,7 @@ public async Task Services_Resolve()
         services.AddLogging();
         services.AddBotPersistence("DataSource=:memory:");
         services.AddOptions<ConnectionOptions>();
+        services.AddSingleton(Substitute.For<IServerWorkspaceRemover>());
         services.AddConnections();
 
         await using var provider = services.BuildServiceProvider(new ServiceProviderOptions
@@ -36,5 +39,6 @@ public async Task Services_Resolve()
         Assert.NotNull(provider.GetRequiredService<IConnectionSupervisor>());
         await using var scope = provider.CreateAsyncScope();
         Assert.NotNull(scope.ServiceProvider.GetRequiredService<IConnectionStore>());
+        Assert.NotNull(scope.ServiceProvider.GetRequiredService<IServerRemovalService>());
     }
 }

tests/RustPlusBot.Features.Connections.Tests/RustPlusBot.Features.Connections.Tests.csproj

@@ -16,6 +16,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\RustPlusBot.Features.Connections\RustPlusBot.Features.Connections.csproj" />
+    <ProjectReference Include="..\..\src\RustPlusBot.Features.Workspace\RustPlusBot.Features.Workspace.csproj" />
   </ItemGroup>
 
 </Project>

tests/RustPlusBot.Features.Connections.Tests/ServerRemovalServiceTests.cs

@@ -0,0 +1,49 @@
+using NSubstitute;
+using RustPlusBot.Features.Connections.Removal;
+using RustPlusBot.Features.Connections.Supervisor;
+using RustPlusBot.Features.Workspace.Teardown;
+using RustPlusBot.Persistence.Servers;
+
+namespace RustPlusBot.Features.Connections.Tests;
+
+public sealed class ServerRemovalServiceTests
+{
+    [Fact]
+    public async Task RemoveServer_Stops_Deletes_TearsDown_InOrder()
+    {
+        var serverId = Guid.NewGuid();
+        var supervisor = Substitute.For<IConnectionSupervisor>();
+        var servers = Substitute.For<IServerService>();
+        servers.RemoveAsync(10UL, serverId, Arg.Any<CancellationToken>()).Returns(true);
+        var workspace = Substitute.For<IServerWorkspaceRemover>();
+        var sut = new ServerRemovalService(supervisor, servers, workspace);
+
+        var removed = await sut.RemoveServerAsync(10UL, serverId);
+
+        Assert.True(removed);
+#pragma warning disable VSTHRD110 // Received.InOrder requires unawaited calls inside its synchronous ordering lambda — this is the NSubstitute-prescribed pattern.
+        Received.InOrder(() =>
+        {
+            supervisor.StopAsync(10UL, serverId);
+            servers.RemoveAsync(10UL, serverId, Arg.Any<CancellationToken>());
+            workspace.RemoveServerAsync(10UL, serverId, Arg.Any<CancellationToken>());
+        });
+#pragma warning restore VSTHRD110
+    }
+
+    [Fact]
+    public async Task RemoveServer_WhenServerAbsent_ReturnsFalse_StillTearsDown()
+    {
+        var serverId = Guid.NewGuid();
+        var supervisor = Substitute.For<IConnectionSupervisor>();
+        var servers = Substitute.For<IServerService>();
+        servers.RemoveAsync(10UL, serverId, Arg.Any<CancellationToken>()).Returns(false);
+        var workspace = Substitute.For<IServerWorkspaceRemover>();
+        var sut = new ServerRemovalService(supervisor, servers, workspace);
+
+        var removed = await sut.RemoveServerAsync(10UL, serverId);
+
+        Assert.False(removed);
+        await workspace.Received(1).RemoveServerAsync(10UL, serverId, Arg.Any<CancellationToken>());
+    }
+}