Merge pull request #51: feat(#19): добавить ссылку на игру в карточку батча

- SessionBatchDto: добавлено поле JoinLink
- SessionViewItem: добавлено поле JoinLink
- SessionBatchViewBuilder: прокидывание JoinLink из DTO в ViewModel
- CreateSessionHandler, SessionService: обновлены все вызовы конструктора
- TelegramSessionBatchRenderer (Bot + Web): рендеринг ссылки в карточке
- Добавлены тесты на наличие ссылки в рендере
- Все 7 SQL-запросов, загружающих SessionBatchDto, обновлены с join_link AS JoinLink
- Бамп версии до 1.11.0

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

.gitea/workflows/deploy.yml

@@ -6,7 +6,7 @@ on:
       - main 
 
 env:
-  VERSION: 1.10.5
+  VERSION: 1.11.0
 
 jobs:
   # ЧАСТЬ 1: Собираем образы и кладем в Gitea (чтобы делиться с ребятами)

Directory.Build.props

@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <Version>1.10.5</Version>
+    <Version>1.11.0</Version>
     <TargetFramework>net10.0</TargetFramework>
     <LangVersion>preview</LangVersion>
     <Nullable>enable</Nullable>

compose.yaml

@@ -17,7 +17,7 @@ services:
       retries: 10
 
   bot:
-    image: git.codeanddice.ru/toutsu/gmrelay-bot:1.10.5
+    image: git.codeanddice.ru/toutsu/gmrelay-bot:1.11.0
     restart: always
     depends_on:
       db:
@@ -30,7 +30,7 @@ services:
       - gmrelay
 
   web:
-    image: git.codeanddice.ru/toutsu/gmrelay-web:1.10.5
+    image: git.codeanddice.ru/toutsu/gmrelay-web:1.11.0
     restart: always
     depends_on:
       db:

src/GmRelay.Bot/Features/Sessions/CreateSession/CancelSessionHandler.cs

@@ -69,7 +69,7 @@ public sealed class CancelSessionHandler(
 
         // 3. Загружаем весь батч для перерисовки
         var batchSessions = await connection.QueryAsync<SessionBatchDto>(
-            @"SELECT id as SessionId, scheduled_at as ScheduledAt, status as Status, max_players as MaxPlayers
+            @"SELECT id as SessionId, scheduled_at as ScheduledAt, status as Status, max_players as MaxPlayers, join_link as JoinLink
               FROM sessions
               WHERE batch_id = @BatchId
               ORDER BY scheduled_at",

src/GmRelay.Bot/Features/Sessions/CreateSession/CreateSessionHandler.cs

@@ -178,7 +178,7 @@ public sealed class CreateSessionHandler(
                     },
                     transaction);
 
-                sessions.Add(new SessionBatchDto(sessionId, scheduledAt.UtcDateTime, SessionStatus.Planned, parseResult.MaxPlayers));
+                sessions.Add(new SessionBatchDto(sessionId, scheduledAt.UtcDateTime, SessionStatus.Planned, parseResult.MaxPlayers, link));
             }
 
             await transaction.CommitAsync(cancellationToken);

src/GmRelay.Bot/Features/Sessions/CreateSession/JoinSessionHandler.cs

@@ -115,7 +115,7 @@ public sealed class JoinSessionHandler(
 
             // Загружаем весь батч для перерисовки
             var batchSessions = await connection.QueryAsync<SessionBatchDto>(
-                @"SELECT id as SessionId, scheduled_at as ScheduledAt, status as Status, max_players as MaxPlayers
+                @"SELECT id as SessionId, scheduled_at as ScheduledAt, status as Status, max_players as MaxPlayers, join_link as JoinLink
                   FROM sessions
                   WHERE batch_id = @BatchId
                   ORDER BY scheduled_at",

src/GmRelay.Bot/Features/Sessions/CreateSession/LeaveSessionHandler.cs

@@ -157,7 +157,8 @@ public sealed class LeaveSessionHandler(
                 SELECT id AS SessionId,
                        scheduled_at AS ScheduledAt,
                        status AS Status,
-                       max_players AS MaxPlayers
+                       max_players AS MaxPlayers,
+                       join_link AS JoinLink
                 FROM sessions
                 WHERE batch_id = @BatchId
                 ORDER BY scheduled_at

src/GmRelay.Bot/Features/Sessions/CreateSession/PromoteWaitlistedPlayerHandler.cs

@@ -137,7 +137,8 @@ public sealed class PromoteWaitlistedPlayerHandler(
                 SELECT id AS SessionId,
                        scheduled_at AS ScheduledAt,
                        status AS Status,
-                       max_players AS MaxPlayers
+                       max_players AS MaxPlayers,
+                       join_link AS JoinLink
                 FROM sessions
                 WHERE batch_id = @BatchId
                 ORDER BY scheduled_at

src/GmRelay.Bot/Features/Sessions/RescheduleSession/HandleRescheduleTimeInputHandler.cs

@@ -357,7 +357,7 @@ public sealed class HandleRescheduleTimeInputHandler(
             await using var conn = await dataSource.OpenConnectionAsync(ct);
 
             var batchSessions = (await conn.QueryAsync<SessionBatchDto>(
-                "SELECT id AS SessionId, scheduled_at AS ScheduledAt, status AS Status, max_players AS MaxPlayers FROM sessions WHERE batch_id = @BatchId ORDER BY scheduled_at",
+                "SELECT id AS SessionId, scheduled_at AS ScheduledAt, status AS Status, max_players AS MaxPlayers, join_link AS JoinLink FROM sessions WHERE batch_id = @BatchId ORDER BY scheduled_at",
                 new { proposal.BatchId })).ToList();
 
             var batchParticipants = (await conn.QueryAsync<ParticipantBatchDto>(

src/GmRelay.Bot/Features/Sessions/RescheduleSession/RescheduleVotingDeadlineService.cs

@@ -286,7 +286,7 @@ public sealed class RescheduleVotingDeadlineService(
             await using var connection = await dataSource.OpenConnectionAsync(ct);
 
             var batchSessions = (await connection.QueryAsync<SessionBatchDto>(
-                "SELECT id AS SessionId, scheduled_at AS ScheduledAt, status AS Status, max_players AS MaxPlayers FROM sessions WHERE batch_id = @BatchId ORDER BY scheduled_at",
+                "SELECT id AS SessionId, scheduled_at AS ScheduledAt, status AS Status, max_players AS MaxPlayers, join_link AS JoinLink FROM sessions WHERE batch_id = @BatchId ORDER BY scheduled_at",
                 new { proposal.BatchId })).ToList();
 
             var batchParticipants = (await connection.QueryAsync<ParticipantBatchDto>(

src/GmRelay.Bot/Infrastructure/Telegram/TelegramSessionBatchRenderer.cs

@@ -21,6 +21,11 @@ public static class TelegramSessionBatchRenderer
                 ? $"👥 Места: {session.ActivePlayerCount}/{session.MaxPlayers.Value}\n"
                 : $"👥 Игроки ({session.ActivePlayerCount}):\n";
 
+            if (!string.IsNullOrEmpty(session.JoinLink))
+            {
+                messageText += $"🔗 <a href=\"{System.Net.WebUtility.HtmlEncode(session.JoinLink)}\">Ссылка на игру</a>\n";
+            }
+
             if (session.ActivePlayers.Count > 0)
             {
                 messageText += string.Join("\n", session.ActivePlayers.Select(p =>

src/GmRelay.Shared/Rendering/SessionBatchDto.cs

@@ -1,4 +1,4 @@
 namespace GmRelay.Shared.Rendering;
 
-public sealed record SessionBatchDto(Guid SessionId, DateTime ScheduledAt, string Status, int? MaxPlayers);
+public sealed record SessionBatchDto(Guid SessionId, DateTime ScheduledAt, string Status, int? MaxPlayers, string JoinLink);
 public sealed record ParticipantBatchDto(Guid SessionId, string DisplayName, string? TelegramUsername, string RegistrationStatus);

src/GmRelay.Shared/Rendering/SessionBatchViewBuilder.cs

@@ -38,6 +38,7 @@ public static class SessionBatchViewBuilder
                 session.ScheduledAt,
                 session.Status,
                 session.MaxPlayers,
+                session.JoinLink,
                 activePlayers.Count,
                 activePlayers,
                 waitlistedPlayers,

src/GmRelay.Shared/Rendering/SessionBatchViewModel.cs

@@ -11,6 +11,7 @@ public sealed record SessionViewItem(
     DateTime ScheduledAt,
     string Status,
     int? MaxPlayers,
+    string JoinLink,
     int ActivePlayerCount,
     IReadOnlyList<PlayerViewItem> ActivePlayers,
     IReadOnlyList<PlayerViewItem> WaitlistedPlayers,

src/GmRelay.Web/Components/Layout/NavMenu.razor

@@ -56,7 +56,7 @@
                     </button>
                 </form>
 
-                <div class="nav-version">v1.10.5</div>
+                <div class="nav-version">v1.11.0</div>
             </div>
         </Authorized>
         <NotAuthorized>

src/GmRelay.Web/Components/Layout/NavMenu.razor.css

@@ -198,6 +198,7 @@
     }
 
     .nav-header {
+        padding-left: 3.75rem;
         padding-right: 0.75rem;
     }
 }

src/GmRelay.Web/Services/SessionService.cs

@@ -938,7 +938,7 @@ public sealed class SessionService(
                 },
                 transaction);
 
-            renderedSessions.Add(new SessionBatchDto(sessionId, scheduledAt, SessionStatus.Planned, sourceSession.MaxPlayers));
+            renderedSessions.Add(new SessionBatchDto(sessionId, scheduledAt, SessionStatus.Planned, sourceSession.MaxPlayers, batchJoinLink));
         }
 
         await transaction.CommitAsync();
@@ -1147,7 +1147,7 @@ public sealed class SessionService(
                 },
                 transaction);
 
-            renderedSessions.Add(new SessionBatchDto(sessionId, scheduledAt, SessionStatus.Planned, template.MaxPlayers));
+            renderedSessions.Add(new SessionBatchDto(sessionId, scheduledAt, SessionStatus.Planned, template.MaxPlayers, template.JoinLink));
         }
 
         await transaction.CommitAsync();
@@ -1245,7 +1245,7 @@ public sealed class SessionService(
             await using var conn = await dataSource.OpenConnectionAsync();
 
             var sessions = (await conn.QueryAsync<SessionBatchDto>(
-                "SELECT id AS SessionId, scheduled_at AS ScheduledAt, status AS Status, max_players AS MaxPlayers FROM sessions WHERE batch_id = @BatchId ORDER BY scheduled_at",
+                "SELECT id AS SessionId, scheduled_at AS ScheduledAt, status AS Status, max_players AS MaxPlayers, join_link AS JoinLink FROM sessions WHERE batch_id = @BatchId ORDER BY scheduled_at",
                 new { BatchId = batchId })).ToList();
 
             var participants = (await conn.QueryAsync<ParticipantBatchDto>(

src/GmRelay.Web/Services/TelegramSessionBatchRenderer.cs

@@ -20,6 +20,11 @@ public static class TelegramSessionBatchRenderer
                 ? $"👥 Места: {session.ActivePlayerCount}/{session.MaxPlayers.Value}\n"
                 : $"👥 Игроки ({session.ActivePlayerCount}):\n";
 
+            if (!string.IsNullOrEmpty(session.JoinLink))
+            {
+                messageText += $"🔗 <a href=\"{System.Net.WebUtility.HtmlEncode(session.JoinLink)}\">Ссылка на игру</a>\n";
+            }
+
             if (session.ActivePlayers.Count > 0)
             {
                 messageText += string.Join("\n", session.ActivePlayers.Select(p =>

tests/GmRelay.Bot.Tests/Features/Landing/TelegramLandingPromisesSmokeTests.cs

@@ -147,6 +147,7 @@ public sealed class TelegramLandingPromisesSmokeTests
             string title,
             IReadOnlyList<DateTimeOffset> scheduledTimes,
             int? maxPlayers,
+            string joinLink,
             SessionNotificationMode notificationMode)
         {
             Title = title;
@@ -156,7 +157,8 @@ public sealed class TelegramLandingPromisesSmokeTests
                     Guid.NewGuid(),
                     scheduledAt.UtcDateTime,
                     SessionStatus.Planned,
-                    maxPlayers))
+                    maxPlayers,
+                    joinLink))
                 .ToList();
         }
 
@@ -173,6 +175,7 @@ public sealed class TelegramLandingPromisesSmokeTests
                 parseResult.Title!,
                 parseResult.ScheduledTimes,
                 parseResult.MaxPlayers,
+                parseResult.Link!,
                 notificationMode);
 
             scenario.RenderBatch();
@@ -318,7 +321,8 @@ public sealed class TelegramLandingPromisesSmokeTests
                         session.Id,
                         session.ScheduledAt,
                         session.Status,
-                        session.MaxPlayers))
+                        session.MaxPlayers,
+                        session.JoinLink))
                     .ToList(),
                 participants
                     .Select(participant => new ParticipantBatchDto(
@@ -371,7 +375,8 @@ public sealed class TelegramLandingPromisesSmokeTests
         Guid Id,
         DateTime ScheduledAt,
         string Status,
-        int? MaxPlayers)
+        int? MaxPlayers,
+        string JoinLink)
     {
         public DateTime ScheduledAt { get; set; } = ScheduledAt;
     }

tests/GmRelay.Bot.Tests/Rendering/SessionBatchViewBuilderTests.cs

@@ -14,9 +14,9 @@ public sealed class SessionBatchViewBuilderTests
 
         var sessions = new[]
         {
-            new SessionBatchDto(secondSessionId, new DateTime(2026, 4, 27, 18, 0, 0, DateTimeKind.Utc), SessionStatus.Planned, 4),
-            new SessionBatchDto(cancelledSessionId, new DateTime(2026, 4, 28, 18, 0, 0, DateTimeKind.Utc), SessionStatus.Cancelled, null),
-            new SessionBatchDto(firstSessionId, new DateTime(2026, 4, 26, 18, 0, 0, DateTimeKind.Utc), SessionStatus.Planned, 2)
+            new SessionBatchDto(secondSessionId, new DateTime(2026, 4, 27, 18, 0, 0, DateTimeKind.Utc), SessionStatus.Planned, 4, "https://example.com/game"),
+            new SessionBatchDto(cancelledSessionId, new DateTime(2026, 4, 28, 18, 0, 0, DateTimeKind.Utc), SessionStatus.Cancelled, null, ""),
+            new SessionBatchDto(firstSessionId, new DateTime(2026, 4, 26, 18, 0, 0, DateTimeKind.Utc), SessionStatus.Planned, 2, "https://example.com/game")
         };
         var participants = new[]
         {
@@ -38,7 +38,7 @@ public sealed class SessionBatchViewBuilderTests
     public void Build_ShouldCalculatePlayerCounts()
     {
         var sessionId = Guid.NewGuid();
-        var sessions = new[] { new SessionBatchDto(sessionId, DateTime.UtcNow, SessionStatus.Planned, 4) };
+        var sessions = new[] { new SessionBatchDto(sessionId, DateTime.UtcNow, SessionStatus.Planned, 4, "https://example.com/game") };
         var participants = new[]
         {
             new ParticipantBatchDto(sessionId, "Alice", "alice", ParticipantRegistrationStatus.Active),
@@ -59,7 +59,7 @@ public sealed class SessionBatchViewBuilderTests
     public void Build_ShouldIncludeActionsForActiveSessions()
     {
         var sessionId = Guid.NewGuid();
-        var sessions = new[] { new SessionBatchDto(sessionId, DateTime.UtcNow, SessionStatus.Planned, 4) };
+        var sessions = new[] { new SessionBatchDto(sessionId, DateTime.UtcNow, SessionStatus.Planned, 4, "https://example.com/game") };
         var participants = Array.Empty<ParticipantBatchDto>();
 
         var result = SessionBatchViewBuilder.Build("Test", sessions, participants);
@@ -76,7 +76,7 @@ public sealed class SessionBatchViewBuilderTests
     public void Build_ShouldNotIncludeActionsForCancelledSessions()
     {
         var sessionId = Guid.NewGuid();
-        var sessions = new[] { new SessionBatchDto(sessionId, DateTime.UtcNow, SessionStatus.Cancelled, null) };
+        var sessions = new[] { new SessionBatchDto(sessionId, DateTime.UtcNow, SessionStatus.Cancelled, null, "") };
         var participants = Array.Empty<ParticipantBatchDto>();
 
         var result = SessionBatchViewBuilder.Build("Test", sessions, participants);
@@ -88,7 +88,7 @@ public sealed class SessionBatchViewBuilderTests
     public void Build_ShouldMarkWaitlistActionWhenFull()
     {
         var sessionId = Guid.NewGuid();
-        var sessions = new[] { new SessionBatchDto(sessionId, DateTime.UtcNow, SessionStatus.Planned, 1) };
+        var sessions = new[] { new SessionBatchDto(sessionId, DateTime.UtcNow, SessionStatus.Planned, 1, "https://example.com/game") };
         var participants = new[] { new ParticipantBatchDto(sessionId, "Alice", "alice", ParticipantRegistrationStatus.Active) };
 
         var result = SessionBatchViewBuilder.Build("Test", sessions, participants);
@@ -101,7 +101,7 @@ public sealed class SessionBatchViewBuilderTests
     public void Build_ShouldIncludePlayerUsernames()
     {
         var sessionId = Guid.NewGuid();
-        var sessions = new[] { new SessionBatchDto(sessionId, DateTime.UtcNow, SessionStatus.Planned, null) };
+        var sessions = new[] { new SessionBatchDto(sessionId, DateTime.UtcNow, SessionStatus.Planned, null, "https://example.com/game") };
         var participants = new[] { new ParticipantBatchDto(sessionId, "Alice", "alice", ParticipantRegistrationStatus.Active) };
 
         var result = SessionBatchViewBuilder.Build("Test", sessions, participants);

tests/GmRelay.Bot.Tests/Rendering/TelegramSessionBatchRendererTests.cs

@@ -16,9 +16,9 @@ public sealed class TelegramSessionBatchRendererTests
 
         var sessions = new[]
         {
-            new SessionBatchDto(secondSessionId, new DateTime(2026, 4, 27, 18, 0, 0, DateTimeKind.Utc), SessionStatus.Planned, 4),
-            new SessionBatchDto(cancelledSessionId, new DateTime(2026, 4, 28, 18, 0, 0, DateTimeKind.Utc), SessionStatus.Cancelled, null),
-            new SessionBatchDto(firstSessionId, new DateTime(2026, 4, 26, 18, 0, 0, DateTimeKind.Utc), SessionStatus.Planned, 2)
+            new SessionBatchDto(secondSessionId, new DateTime(2026, 4, 27, 18, 0, 0, DateTimeKind.Utc), SessionStatus.Planned, 4, "https://example.com/game2"),
+            new SessionBatchDto(cancelledSessionId, new DateTime(2026, 4, 28, 18, 0, 0, DateTimeKind.Utc), SessionStatus.Cancelled, null, ""),
+            new SessionBatchDto(firstSessionId, new DateTime(2026, 4, 26, 18, 0, 0, DateTimeKind.Utc), SessionStatus.Planned, 2, "https://example.com/game1")
         };
         var participants = new[]
         {
@@ -35,6 +35,9 @@ public sealed class TelegramSessionBatchRendererTests
         Assert.Contains("Charlie", text);
         Assert.Contains("Bob", text);
         Assert.Contains("Сессия отменена", text);
+        Assert.Contains("Ссылка на игру", text);
+        Assert.Contains("https://example.com/game1", text);
+        Assert.Contains("https://example.com/game2", text);
 
         var buttons = markup.InlineKeyboard.SelectMany(row => row).ToList();
         Assert.Equal(4, buttons.Count); // 2 sessions x 2 buttons each
@@ -51,7 +54,7 @@ public sealed class TelegramSessionBatchRendererTests
     public void Render_ShouldSkipButtonsForCancelledSessions()
     {
         var cancelledSessionId = Guid.NewGuid();
-        var sessions = new[] { new SessionBatchDto(cancelledSessionId, DateTime.UtcNow, SessionStatus.Cancelled, null) };
+        var sessions = new[] { new SessionBatchDto(cancelledSessionId, DateTime.UtcNow, SessionStatus.Cancelled, null, "") };
         var participants = Array.Empty<ParticipantBatchDto>();
 
         var view = SessionBatchViewBuilder.Build("Test", sessions, participants);
@@ -64,7 +67,7 @@ public sealed class TelegramSessionBatchRendererTests
     public void Render_ShouldShowWaitlistButtonWhenFull()
     {
         var sessionId = Guid.NewGuid();
-        var sessions = new[] { new SessionBatchDto(sessionId, DateTime.UtcNow, SessionStatus.Planned, 1) };
+        var sessions = new[] { new SessionBatchDto(sessionId, DateTime.UtcNow, SessionStatus.Planned, 1, "https://example.com/game") };
         var participants = new[] { new ParticipantBatchDto(sessionId, "Alice", "alice", ParticipantRegistrationStatus.Active) };
 
         var view = SessionBatchViewBuilder.Build("Test", sessions, participants);