feat: support co-gm group delegation

2026-04-27 14:27:16 +03:00
parent a8f2b10956
commit 2529df4157
20 changed files with 805 additions and 63 deletions
@@ -16,7 +16,7 @@ public sealed record CancelSessionCommand(
    int MessageId);

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

 public sealed class CancelSessionHandler(
    NpgsqlDataSource dataSource,
@@ -29,13 +29,23 @@ public sealed class CancelSessionHandler(
        await using var connection = await dataSource.OpenConnectionAsync(ct);
        await using var transaction = await connection.BeginTransactionAsync(ct);
        
-        // 1. Проверяем, что запрос делает ГМ данной сессии
+        // 1. Проверяем, что запрос делает управляющий данной группы.
        var session = await connection.QuerySingleOrDefaultAsync<CancelSessionInfoDto>(
-            @"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",
-            new { command.SessionId }, transaction);
+            """
+            SELECT s.title AS Title,
+                   s.batch_id AS BatchId,
+                   s.notification_mode AS NotificationMode,
+                   EXISTS (
+                       SELECT 1
+                       FROM group_managers gm
+                       JOIN players p ON p.id = gm.player_id
+                       WHERE gm.group_id = s.group_id
+                         AND p.telegram_id = @TelegramUserId
+                   ) AS CanManage
+            FROM sessions s
+            WHERE s.id = @SessionId
+            """,
+            new { command.SessionId, command.TelegramUserId }, transaction);

        if (session == null)
        {
@@ -43,9 +53,9 @@ public sealed class CancelSessionHandler(
            return;
        }

-        if (session.GmId != command.TelegramUserId)
+        if (!session.CanManage)
        {
-            await bot.AnswerCallbackQuery(command.CallbackQueryId, "Только Мастер Игры (GM) может отменять сессию.", showAlert: true, cancellationToken: ct);
+            await bot.AnswerCallbackQuery(command.CallbackQueryId, "Только owner или co-GM может отменять сессию.", showAlert: true, cancellationToken: ct);
            return;
        }

@@ -7,6 +7,8 @@ using Telegram.Bot.Types;

 namespace GmRelay.Bot.Features.Sessions.CreateSession;

+internal sealed record SessionCreationGroupAccessDto(Guid GroupId, bool CanManage);
+
 public sealed class CreateSessionHandler(
    NpgsqlDataSource dataSource,
    ITelegramBotClient botClient,
@@ -74,16 +76,64 @@ public sealed class CreateSessionHandler(
                new { TgId = gmId, Name = gmName, Username = gmUsername },
                transaction);

-            var groupId = await connection.ExecuteScalarAsync<Guid>(
+            var existingGroup = await connection.QuerySingleOrDefaultAsync<SessionCreationGroupAccessDto>(
                """
-                INSERT INTO game_groups (telegram_chat_id, name, gm_telegram_id)
-                VALUES (@ChatId, @ChatName, @GmId)
-                ON CONFLICT (telegram_chat_id) DO UPDATE SET name = EXCLUDED.name
-                RETURNING id;
+                SELECT g.id AS GroupId,
+                       EXISTS (
+                           SELECT 1
+                           FROM group_managers gm
+                           JOIN players p ON p.id = gm.player_id
+                           WHERE gm.group_id = g.id
+                             AND p.telegram_id = @GmId
+                       ) AS CanManage
+                FROM game_groups g
+                WHERE g.telegram_chat_id = @ChatId
                """,
-                new { ChatId = chatId, ChatName = chatTitle, GmId = gmId },
+                new { ChatId = chatId, GmId = gmId },
                transaction);

+            Guid groupId;
+            if (existingGroup is null)
+            {
+                groupId = await connection.ExecuteScalarAsync<Guid>(
+                    """
+                    INSERT INTO game_groups (telegram_chat_id, name, gm_telegram_id)
+                    VALUES (@ChatId, @ChatName, @GmId)
+                    RETURNING id;
+                    """,
+                    new { ChatId = chatId, ChatName = chatTitle, GmId = gmId },
+                    transaction);
+
+                await connection.ExecuteAsync(
+                    """
+                    INSERT INTO group_managers (group_id, player_id, role)
+                    SELECT @GroupId, p.id, @OwnerRole
+                    FROM players p
+                    WHERE p.telegram_id = @GmId
+                    ON CONFLICT (group_id, player_id) DO NOTHING
+                    """,
+                    new { GroupId = groupId, GmId = gmId, OwnerRole = GroupManagerRoleExtensions.OwnerValue },
+                    transaction);
+            }
+            else
+            {
+                if (!existingGroup.CanManage)
+                {
+                    await transaction.RollbackAsync(cancellationToken);
+                    await botClient.SendMessage(
+                        chatId,
+                        "⛔ Только owner или co-GM этой группы может создавать игровые сессии.",
+                        cancellationToken: cancellationToken);
+                    return;
+                }
+
+                groupId = existingGroup.GroupId;
+                await connection.ExecuteAsync(
+                    "UPDATE game_groups SET name = @ChatName WHERE id = @GroupId",
+                    new { ChatName = chatTitle, GroupId = groupId },
+                    transaction);
+            }
+
            int? messageThreadId = null;
            if (message.Chat.IsForum)
            {
@@ -13,7 +13,7 @@ public sealed record PromoteWaitlistedPlayerCommand(
    long ChatId,
    int MessageId);

-internal sealed record PromoteWaitlistSessionDto(string Title, Guid BatchId, long GmId, int? MaxPlayers);
+internal sealed record PromoteWaitlistSessionDto(string Title, Guid BatchId, bool CanManage, int? MaxPlayers);
 internal sealed record WaitlistedParticipantDto(Guid ParticipantRowId, string DisplayName);

 public sealed class PromoteWaitlistedPlayerHandler(
@@ -34,13 +34,18 @@ public sealed class PromoteWaitlistedPlayerHandler(
                SELECT s.title AS Title,
                       s.batch_id AS BatchId,
                       s.max_players AS MaxPlayers,
-                       g.gm_telegram_id AS GmId
+                       EXISTS (
+                           SELECT 1
+                           FROM group_managers gm
+                           JOIN players p ON p.id = gm.player_id
+                           WHERE gm.group_id = s.group_id
+                             AND p.telegram_id = @TelegramUserId
+                       ) AS CanManage
                FROM sessions s
-                JOIN game_groups g ON s.group_id = g.id
                WHERE s.id = @SessionId
                FOR UPDATE
                """,
-                new { command.SessionId },
+                new { command.SessionId, command.TelegramUserId },
                transaction);

            if (session is null)
@@ -50,10 +55,10 @@ public sealed class PromoteWaitlistedPlayerHandler(
                return;
            }

-            if (session.GmId != command.TelegramUserId)
+            if (!session.CanManage)
            {
                await transaction.RollbackAsync(ct);
-                await bot.AnswerCallbackQuery(command.CallbackQueryId, "Только Мастер Игры (GM) может поднимать игроков из листа ожидания.", showAlert: true, cancellationToken: ct);
+                await bot.AnswerCallbackQuery(command.CallbackQueryId, "Только owner или co-GM может поднимать игроков из листа ожидания.", showAlert: true, cancellationToken: ct);
                return;
            }