feat(#21): support selected telegram topics for schedules

Route new schedules to an existing forum topic when /newsession is sent inside one, create bot-owned topics only from the forum root, and keep group notifications/dashboard updates threaded to the stored topic. Persist topic ownership so deletion only removes empty bot-created topics, add topic routing tests and smoke coverage, and bump release metadata to 1.14.0.
2026-05-12 12:01:10 +03:00
parent 007806a5d8
commit de9f56c97d
21 changed files with 334 additions and 50 deletions
@@ -0,0 +1,76 @@
+namespace GmRelay.Bot.Tests.Infrastructure.Telegram;
+
+public sealed class TelegramTopicIntegrationSmokeTests
+{
+    [Fact]
+    public async Task BotAndWebCode_ShouldPersistAndUseTopicOwnership()
+    {
+        var migration = await ReadRepositoryFileAsync("src/GmRelay.Bot/Migrations/V015__add_topic_ownership.sql");
+        var createHandler = await ReadRepositoryFileAsync("src/GmRelay.Bot/Features/Sessions/CreateSession/CreateSessionHandler.cs");
+        var deleteHandler = await ReadRepositoryFileAsync("src/GmRelay.Bot/Features/Sessions/ListSessions/DeleteSessionHandler.cs");
+
+        Assert.Contains("topic_created_by_bot", migration, StringComparison.Ordinal);
+        Assert.Contains("ResolveNewScheduleDestination", createHandler, StringComparison.Ordinal);
+        Assert.Contains("message.MessageThreadId", createHandler, StringComparison.Ordinal);
+        Assert.Contains("topic_created_by_bot", createHandler, StringComparison.Ordinal);
+        Assert.Contains("MissingForumTopicRightsMessage", createHandler, StringComparison.Ordinal);
+        Assert.Contains("TopicCreatedByBot", deleteHandler, StringComparison.Ordinal);
+        Assert.Contains("ShouldDeleteForumTopic", deleteHandler, StringComparison.Ordinal);
+        Assert.Contains("remainingInTopic", deleteHandler, StringComparison.Ordinal);
+    }
+
+    [Fact]
+    public async Task GroupNotifications_ShouldSendToStoredForumTopic()
+    {
+        var confirmationHandler = await ReadRepositoryFileAsync("src/GmRelay.Bot/Features/Confirmation/SendConfirmation/SendConfirmationHandler.cs");
+        var joinLinkHandler = await ReadRepositoryFileAsync("src/GmRelay.Bot/Features/Reminders/SendJoinLink/SendJoinLinkHandler.cs");
+        var rsvpHandler = await ReadRepositoryFileAsync("src/GmRelay.Bot/Features/Confirmation/HandleRsvp/HandleRsvpHandler.cs");
+        var cancelHandler = await ReadRepositoryFileAsync("src/GmRelay.Bot/Features/Sessions/CreateSession/CancelSessionHandler.cs");
+        var initiateRescheduleHandler = await ReadRepositoryFileAsync("src/GmRelay.Bot/Features/Sessions/RescheduleSession/InitiateRescheduleHandler.cs");
+        var rescheduleInputHandler = await ReadRepositoryFileAsync("src/GmRelay.Bot/Features/Sessions/RescheduleSession/HandleRescheduleTimeInputHandler.cs");
+        var rescheduleDeadlineService = await ReadRepositoryFileAsync("src/GmRelay.Bot/Features/Sessions/RescheduleSession/RescheduleVotingDeadlineService.cs");
+
+        Assert.Contains("int? ThreadId", confirmationHandler, StringComparison.Ordinal);
+        Assert.Contains("s.thread_id AS ThreadId", confirmationHandler, StringComparison.Ordinal);
+        Assert.Contains("messageThreadId: session.ThreadId", confirmationHandler, StringComparison.Ordinal);
+
+        Assert.Contains("int? ThreadId", joinLinkHandler, StringComparison.Ordinal);
+        Assert.Contains("s.thread_id AS ThreadId", joinLinkHandler, StringComparison.Ordinal);
+        Assert.Contains("messageThreadId: session.ThreadId", joinLinkHandler, StringComparison.Ordinal);
+
+        Assert.Contains("int? ThreadId", rsvpHandler, StringComparison.Ordinal);
+        Assert.Contains("s.thread_id AS ThreadId", rsvpHandler, StringComparison.Ordinal);
+        Assert.Contains("messageThreadId: session.ThreadId", rsvpHandler, StringComparison.Ordinal);
+
+        Assert.Contains("int? MessageThreadId", cancelHandler, StringComparison.Ordinal);
+        Assert.Contains("messageThreadId: command.MessageThreadId", cancelHandler, StringComparison.Ordinal);
+
+        Assert.Contains("int? MessageThreadId", initiateRescheduleHandler, StringComparison.Ordinal);
+        Assert.Contains("messageThreadId: command.MessageThreadId", initiateRescheduleHandler, StringComparison.Ordinal);
+
+        Assert.Contains("int? ThreadId", rescheduleInputHandler, StringComparison.Ordinal);
+        Assert.Contains("s.thread_id AS ThreadId", rescheduleInputHandler, StringComparison.Ordinal);
+        Assert.Contains("messageThreadId: proposal.ThreadId", rescheduleInputHandler, StringComparison.Ordinal);
+
+        Assert.Contains("int? ThreadId", rescheduleDeadlineService, StringComparison.Ordinal);
+        Assert.Contains("s.thread_id AS ThreadId", rescheduleDeadlineService, StringComparison.Ordinal);
+        Assert.Contains("messageThreadId: proposal.ThreadId", rescheduleDeadlineService, StringComparison.Ordinal);
+    }
+
+    private static async Task<string> ReadRepositoryFileAsync(string relativePath)
+    {
+        var directory = new DirectoryInfo(AppContext.BaseDirectory);
+        while (directory is not null)
+        {
+            var candidate = Path.Combine(directory.FullName, relativePath);
+            if (File.Exists(candidate))
+            {
+                return await File.ReadAllTextAsync(candidate);
+            }
+
+            directory = directory.Parent;
+        }
+
+        throw new FileNotFoundException($"Could not locate repository file '{relativePath}'.");
+    }
+}
@@ -0,0 +1,80 @@
+using GmRelay.Bot.Infrastructure.Telegram;
+
+namespace GmRelay.Bot.Tests.Infrastructure.Telegram;
+
+public sealed class TelegramTopicRoutingTests
+{
+    [Fact]
+    public void ResolveNewScheduleDestination_UsesIncomingTopic_WhenForumCommandWasSentInsideTopic()
+    {
+        var destination = TelegramTopicRouting.ResolveNewScheduleDestination(
+            chatIsForum: true,
+            incomingMessageThreadId: 42);
+
+        Assert.Equal(42, destination.MessageThreadId);
+        Assert.False(destination.ShouldCreateForumTopic);
+        Assert.False(destination.TopicCreatedByBot);
+    }
+
+    [Fact]
+    public void ResolveNewScheduleDestination_CreatesBotOwnedTopic_WhenForumCommandWasSentInRoot()
+    {
+        var destination = TelegramTopicRouting.ResolveNewScheduleDestination(
+            chatIsForum: true,
+            incomingMessageThreadId: null);
+
+        Assert.Null(destination.MessageThreadId);
+        Assert.True(destination.ShouldCreateForumTopic);
+        Assert.True(destination.TopicCreatedByBot);
+    }
+
+    [Fact]
+    public void ResolveNewScheduleDestination_UsesPlainChat_WhenChatIsNotForum()
+    {
+        var destination = TelegramTopicRouting.ResolveNewScheduleDestination(
+            chatIsForum: false,
+            incomingMessageThreadId: 42);
+
+        Assert.Null(destination.MessageThreadId);
+        Assert.False(destination.ShouldCreateForumTopic);
+        Assert.False(destination.TopicCreatedByBot);
+    }
+
+    [Fact]
+    public void MissingForumTopicRightsMessage_NamesRequiredAdminRight()
+    {
+        Assert.Contains("admin", TelegramTopicRouting.MissingForumTopicRightsMessage, StringComparison.OrdinalIgnoreCase);
+        Assert.Contains("Manage Topics", TelegramTopicRouting.MissingForumTopicRightsMessage, StringComparison.Ordinal);
+    }
+
+    [Theory]
+    [InlineData("Bad Request: not enough rights to create forum topic")]
+    [InlineData("Bad Request: CHAT_ADMIN_REQUIRED")]
+    [InlineData("Forbidden: bot is not an administrator")]
+    public void IsMissingForumTopicRightsError_MatchesAdminPermissionErrors(string apiError)
+    {
+        Assert.True(TelegramTopicRouting.IsMissingForumTopicRightsError(apiError));
+    }
+
+    [Fact]
+    public void IsMissingForumTopicRightsError_IgnoresUnrelatedApiErrors()
+    {
+        Assert.False(TelegramTopicRouting.IsMissingForumTopicRightsError("Bad Request: topic name is invalid"));
+    }
+
+    [Theory]
+    [InlineData(true, 0, true)]
+    [InlineData(true, 1, false)]
+    [InlineData(false, 0, false)]
+    public void ShouldDeleteForumTopic_DeletesOnlyBotOwnedEmptyTopic(
+        bool topicCreatedByBot,
+        int remainingSessionsInTopic,
+        bool expected)
+    {
+        var shouldDelete = TelegramTopicRouting.ShouldDeleteForumTopic(
+            topicCreatedByBot,
+            remainingSessionsInTopic);
+
+        Assert.Equal(expected, shouldDelete);
+    }
+}