feat: send personal player notifications

2026-04-27 10:11:11 +03:00
parent 3228e77c7f
commit a8f2b10956
23 changed files with 666 additions and 38 deletions
@@ -1,4 +1,5 @@
 using Dapper;
+using GmRelay.Bot.Features.Notifications;
 using GmRelay.Shared.Domain;
 using GmRelay.Shared.Rendering;
 using Npgsql;
@@ -15,11 +16,12 @@ public sealed record CancelSessionCommand(
    int MessageId);

 // DTOs for AOT compilation
-internal sealed record CancelSessionInfoDto(string Title, Guid BatchId, long GmId);
+internal sealed record CancelSessionInfoDto(string Title, Guid BatchId, long GmId, string NotificationMode);

 public sealed class CancelSessionHandler(
    NpgsqlDataSource dataSource,
    ITelegramBotClient bot,
+    DirectSessionNotificationSender directSender,
    ILogger<CancelSessionHandler> logger)
 {
    public async Task HandleAsync(CancelSessionCommand command, CancellationToken ct)
@@ -29,7 +31,7 @@ public sealed class CancelSessionHandler(
        
        // 1. Проверяем, что запрос делает ГМ данной сессии
        var session = await connection.QuerySingleOrDefaultAsync<CancelSessionInfoDto>(
-            @"SELECT s.title as Title, s.batch_id as BatchId, g.gm_telegram_id as GmId
+            @"SELECT s.title as Title, s.batch_id as BatchId, g.gm_telegram_id as GmId, s.notification_mode as NotificationMode
              FROM sessions s
              JOIN game_groups g ON s.group_id = g.id
              WHERE s.id = @SessionId",
@@ -73,6 +75,19 @@ public sealed class CancelSessionHandler(
              ORDER BY sp.registration_status ASC, sp.created_at ASC, sp.responded_at ASC, p.created_at ASC",
            new { BatchId = session.BatchId }, transaction);

+        var directRecipients = (await connection.QueryAsync<DirectNotificationRecipient>(
+            """
+            SELECT p.telegram_id AS TelegramId,
+                   p.display_name AS DisplayName
+            FROM session_participants sp
+            JOIN players p ON sp.player_id = p.id
+            WHERE sp.session_id = @SessionId
+              AND sp.is_gm = false
+              AND sp.registration_status = @Active
+            """,
+            new { command.SessionId, Active = ParticipantRegistrationStatus.Active },
+            transaction)).ToList();
+
        await transaction.CommitAsync(ct);

        // 4. Перерисовываем сообщение
@@ -92,6 +107,17 @@ public sealed class CancelSessionHandler(
            
            // Опционально: написать отдельное сообщение в чат
            await bot.SendMessage(command.ChatId, $"❌ <b>Внимание!</b> Сессия \"{System.Net.WebUtility.HtmlEncode(session.Title)}\" отменена.", parseMode: Telegram.Bot.Types.Enums.ParseMode.Html, cancellationToken: ct);
+
+            var mode = SessionNotificationModeExtensions.FromDatabaseValue(session.NotificationMode);
+            if (mode.ShouldSendDirectMessages())
+            {
+                await directSender.SendAsync(
+                    directRecipients,
+                    $"❌ <b>Сессия отменена</b>\n\n📌 <b>{System.Net.WebUtility.HtmlEncode(session.Title)}</b>",
+                    "session-cancelled",
+                    command.SessionId,
+                    ct);
+            }
        }
        catch (Exception ex)
        {
@@ -1,4 +1,5 @@
 using Dapper;
+using GmRelay.Bot.Features.Notifications;
 using GmRelay.Shared.Domain;
 using GmRelay.Shared.Rendering;
 using Npgsql;
@@ -12,9 +13,13 @@ namespace GmRelay.Bot.Features.Sessions.RescheduleSession;

 internal sealed record AwaitingProposalDto(
    Guid Id, Guid SessionId, string Title, DateTime CurrentScheduledAt,
-    Guid BatchId, int? BatchMessageId, long TelegramChatId);
+    Guid BatchId, int? BatchMessageId, long TelegramChatId, string NotificationMode);

-internal sealed record VoteParticipantDto(Guid PlayerId, string DisplayName, string? TelegramUsername);
+internal sealed record VoteParticipantDto(
+    Guid PlayerId,
+    string DisplayName,
+    string? TelegramUsername,
+    long TelegramId = 0);

 // ── Handler ──────────────────────────────────────────────────────────

@@ -26,6 +31,7 @@ internal sealed record VoteParticipantDto(Guid PlayerId, string DisplayName, str
 public sealed class HandleRescheduleTimeInputHandler(
    NpgsqlDataSource dataSource,
    ITelegramBotClient bot,
+    DirectSessionNotificationSender directSender,
    ILogger<HandleRescheduleTimeInputHandler> logger)
 {
    /// <summary>
@@ -48,7 +54,8 @@ public sealed class HandleRescheduleTimeInputHandler(
            """
            SELECT rp.id AS Id, rp.session_id AS SessionId, s.title AS Title, s.scheduled_at AS CurrentScheduledAt,
                   s.batch_id AS BatchId, s.batch_message_id AS BatchMessageId,
-                   g.telegram_chat_id AS TelegramChatId
+                   g.telegram_chat_id AS TelegramChatId,
+                   s.notification_mode AS NotificationMode
            FROM reschedule_proposals rp
            JOIN sessions s ON s.id = rp.session_id
            JOIN game_groups g ON g.id = s.group_id
@@ -86,7 +93,10 @@ public sealed class HandleRescheduleTimeInputHandler(
        // 3. Load participants (non-GM) signed up for this session
        var participants = (await connection.QueryAsync<VoteParticipantDto>(
            """
-            SELECT p.id AS PlayerId, p.display_name AS DisplayName, p.telegram_username AS TelegramUsername
+            SELECT p.id AS PlayerId,
+                   p.display_name AS DisplayName,
+                   p.telegram_username AS TelegramUsername,
+                   p.telegram_id AS TelegramId
            FROM session_participants sp
            JOIN players p ON p.id = sp.player_id
            WHERE sp.session_id = @SessionId
@@ -135,6 +145,29 @@ public sealed class HandleRescheduleTimeInputHandler(
            replyMarkup: keyboard,
            cancellationToken: ct);

+        var mode = SessionNotificationModeExtensions.FromDatabaseValue(proposal.NotificationMode);
+        if (mode.ShouldSendDirectMessages())
+        {
+            var directText = $"""
+                🔄 <b>Голосование за перенос сессии</b>
+
+                📌 <b>{System.Net.WebUtility.HtmlEncode(proposal.Title)}</b>
+                📅 Текущее время: <b>{proposal.CurrentScheduledAt.FormatMoscow()}</b> (МСК)
+                📅 Новое время: <b>{newTime.FormatMoscow()}</b> (МСК)
+
+                Проголосуйте кнопкой в групповом сообщении.
+                """;
+
+            await directSender.SendAsync(
+                participants.Select(p => new DirectNotificationRecipient(
+                    p.TelegramId,
+                    p.DisplayName)),
+                directText,
+                "reschedule-vote",
+                proposal.SessionId,
+                ct);
+        }
+
        // Store vote message ID
        await connection.ExecuteAsync(
            "UPDATE reschedule_proposals SET vote_message_id = @MsgId WHERE id = @Id",
@@ -156,7 +189,11 @@ public sealed class HandleRescheduleTimeInputHandler(

        await connection.ExecuteAsync(
            """
-            UPDATE sessions SET scheduled_at = @NewTime, status = @Status, updated_at = now()
+            UPDATE sessions
+            SET scheduled_at = @NewTime,
+                status = @Status,
+                one_hour_reminder_processed_at = NULL,
+                updated_at = now()
            WHERE id = @SessionId
            """,
            new { NewTime = newTime, proposal.SessionId, Status = SessionStatus.Planned },
@@ -1,4 +1,5 @@
 using Dapper;
+using GmRelay.Bot.Features.Notifications;
 using GmRelay.Shared.Domain;
 using GmRelay.Shared.Rendering;
 using Npgsql;
@@ -25,11 +26,13 @@ internal sealed record VoteProposalDto(
    string SessionStatus,
    long TelegramChatId,
    int? ConfirmationMessageId,
-    int? BatchMessageId);
+    int? BatchMessageId,
+    string NotificationMode);

 public sealed class HandleRescheduleVoteHandler(
    NpgsqlDataSource dataSource,
    ITelegramBotClient bot,
+    DirectSessionNotificationSender directSender,
    ILogger<HandleRescheduleVoteHandler> logger)
 {
    public async Task HandleAsync(HandleRescheduleVoteCommand command, CancellationToken ct)
@@ -48,7 +51,8 @@ public sealed class HandleRescheduleVoteHandler(
                   s.status AS SessionStatus,
                   s.confirmation_message_id AS ConfirmationMessageId,
                   s.batch_message_id AS BatchMessageId,
-                   g.telegram_chat_id AS TelegramChatId
+                   g.telegram_chat_id AS TelegramChatId,
+                   s.notification_mode AS NotificationMode
            FROM reschedule_proposals rp
            JOIN sessions s ON s.id = rp.session_id
            JOIN game_groups g ON g.id = s.group_id
@@ -105,7 +109,8 @@ public sealed class HandleRescheduleVoteHandler(
                """
                SELECT p.id AS PlayerId,
                       p.display_name AS DisplayName,
-                       p.telegram_username AS TelegramUsername
+                       p.telegram_username AS TelegramUsername,
+                       p.telegram_id AS TelegramId
                FROM session_participants sp
                JOIN players p ON p.id = sp.player_id
                WHERE sp.session_id = @SessionId
@@ -130,6 +135,8 @@ public sealed class HandleRescheduleVoteHandler(

        if (decision.Outcome == RescheduleVoteOutcome.Rejected)
        {
+            var directRecipients = await LoadDirectRecipients(connection, proposal.SessionId, transaction);
+
            await connection.ExecuteAsync(
                "UPDATE reschedule_proposals SET status = 'Rejected' WHERE id = @Id",
                new { Id = command.ProposalId },
@@ -156,12 +163,25 @@ public sealed class HandleRescheduleVoteHandler(
            }

            await bot.AnswerCallbackQuery(command.CallbackQueryId, decision.CallbackText, cancellationToken: ct);
+
+            var mode = SessionNotificationModeExtensions.FromDatabaseValue(proposal.NotificationMode);
+            if (mode.ShouldSendDirectMessages())
+            {
+                await directSender.SendAsync(
+                    directRecipients,
+                    $"❌ <b>Перенос сессии отклонён</b>\n\n📌 <b>{System.Net.WebUtility.HtmlEncode(proposal.Title)}</b>\n📅 Время остаётся прежним: <b>{proposal.CurrentScheduledAt.FormatMoscow()}</b> (МСК)",
+                    "reschedule-rejected",
+                    proposal.SessionId,
+                    ct);
+            }
+
            logger.LogInformation("Reschedule proposal {ProposalId} rejected by player {PlayerId}", command.ProposalId, playerId);
            return;
        }

        if (decision.ShouldRescheduleSession)
        {
+            var directRecipients = await LoadDirectRecipients(connection, proposal.SessionId, transaction);
            var newTime = new DateTimeOffset(proposal.ProposedAt, TimeSpan.Zero);

            await connection.ExecuteAsync(
@@ -171,6 +191,7 @@ public sealed class HandleRescheduleVoteHandler(
                    status = @Status,
                    confirmation_message_id = NULL,
                    link_message_id = NULL,
+                    one_hour_reminder_processed_at = NULL,
                    updated_at = now()
                WHERE id = @SessionId
                """,
@@ -214,6 +235,17 @@ public sealed class HandleRescheduleVoteHandler(

            await TryUpdateBatchMessage(proposal, ct);

+            var mode = SessionNotificationModeExtensions.FromDatabaseValue(proposal.NotificationMode);
+            if (mode.ShouldSendDirectMessages())
+            {
+                await directSender.SendAsync(
+                    directRecipients,
+                    $"✅ <b>Сессия перенесена</b>\n\n📌 <b>{System.Net.WebUtility.HtmlEncode(proposal.Title)}</b>\n📅 Новое время: <b>{proposal.ProposedAt.FormatMoscow()}</b> (МСК)",
+                    "reschedule-approved",
+                    proposal.SessionId,
+                    ct);
+            }
+
            logger.LogInformation(
                "Session {SessionId} rescheduled to {NewTime} (proposal {ProposalId})",
                proposal.SessionId,
@@ -257,6 +289,25 @@ public sealed class HandleRescheduleVoteHandler(
        await bot.AnswerCallbackQuery(command.CallbackQueryId, decision.CallbackText, cancellationToken: ct);
    }

+    private static async Task<List<DirectNotificationRecipient>> LoadDirectRecipients(
+        Npgsql.NpgsqlConnection connection,
+        Guid sessionId,
+        Npgsql.NpgsqlTransaction transaction)
+    {
+        return (await connection.QueryAsync<DirectNotificationRecipient>(
+            """
+            SELECT p.telegram_id AS TelegramId,
+                   p.display_name AS DisplayName
+            FROM session_participants sp
+            JOIN players p ON p.id = sp.player_id
+            WHERE sp.session_id = @SessionId
+              AND sp.is_gm = false
+              AND sp.registration_status = @Active
+            """,
+            new { SessionId = sessionId, Active = ParticipantRegistrationStatus.Active },
+            transaction)).ToList();
+    }
+
    private async Task TryUpdateBatchMessage(VoteProposalDto proposal, CancellationToken ct)
    {
        try