Merge pull request #84: feat: implement DiscordSessionBatchRenderer for Embed and Buttons

- Render SessionBatchViewModel into NetCord EmbedProperties + ActionRowProperties
- 7 tests covering open/full/waitlist/cancelled/reschedule states
- Version bump 2.2.0 → 2.3.0

Closes #27

.gitea/workflows/deploy.yml

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

Directory.Build.props

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

compose.yaml

@@ -49,7 +49,7 @@ services:
         crond -f
 
   bot:
-    image: git.codeanddice.ru/toutsu/gmrelay-bot:2.2.0
+    image: git.codeanddice.ru/toutsu/gmrelay-bot:2.3.0
     restart: always
     depends_on:
       db:
@@ -67,7 +67,7 @@ services:
       retries: 3
 
   discord:
-    image: git.codeanddice.ru/toutsu/gmrelay-discord-bot:2.2.0
+    image: git.codeanddice.ru/toutsu/gmrelay-discord-bot:2.3.0
     restart: always
     depends_on:
       db:
@@ -79,7 +79,7 @@ services:
       - gmrelay
 
   web:
-    image: git.codeanddice.ru/toutsu/gmrelay-web:2.2.0
+    image: git.codeanddice.ru/toutsu/gmrelay-web:2.3.0
     restart: always
     depends_on:
       db:

src/GmRelay.DiscordBot/Rendering/DiscordSessionBatchRenderer.cs

@@ -0,0 +1,125 @@
+using GmRelay.Shared.Domain;
+using GmRelay.Shared.Rendering;
+using NetCord;
+using NetCord.Rest;
+
+namespace GmRelay.DiscordBot.Rendering;
+
+public static class DiscordSessionBatchRenderer
+{
+    public static (IReadOnlyList<EmbedProperties> Embeds, IReadOnlyList<ActionRowProperties> ActionRows) Render(SessionBatchViewModel view)
+    {
+        var embeds = new List<EmbedProperties>();
+        var actionRows = new List<ActionRowProperties>();
+
+        foreach (var session in view.Sessions)
+        {
+            var embed = BuildEmbed(view.Title, session);
+            embeds.Add(embed);
+
+            if (session.AvailableActions.Count > 0)
+            {
+                var actionRow = new ActionRowProperties();
+                foreach (var action in session.AvailableActions)
+                {
+                    actionRow.Add(new ButtonProperties(
+                        $"{action.ActionKey}:{action.SessionId}",
+                        action.Label,
+                        ButtonStyle.Primary));
+                }
+                actionRows.Add(actionRow);
+            }
+        }
+
+        return (embeds, actionRows);
+    }
+
+    private static EmbedProperties BuildEmbed(string title, SessionViewItem session)
+    {
+        var embed = new EmbedProperties()
+            .WithTitle($"{title} — {session.ScheduledAt.FormatMoscow()}");
+
+        if (SessionStatus.IsCancelled(session.Status))
+        {
+            embed = embed.WithDescription("❌ Сессия отменена");
+        }
+        else
+        {
+            embed = embed.WithDescription(BuildPlayerDescription(session));
+        }
+
+        var fields = new List<EmbedFieldProperties>
+        {
+            new EmbedFieldProperties()
+                .WithName("👥 Заполненность")
+                .WithValue(session.MaxPlayers.HasValue
+                    ? $"{session.ActivePlayerCount}/{session.MaxPlayers.Value}"
+                    : $"{session.ActivePlayerCount}")
+                .WithInline(),
+
+            new EmbedFieldProperties()
+                .WithName("⏳ Лист ожидания")
+                .WithValue(session.WaitlistedPlayers.Count > 0
+                    ? session.WaitlistedPlayers.Count.ToString()
+                    : "—")
+                .WithInline(),
+
+            new EmbedFieldProperties()
+                .WithName("📊 Статус")
+                .WithValue(FormatStatus(session.Status))
+                .WithInline()
+        };
+
+        if (!string.IsNullOrEmpty(session.JoinLink))
+        {
+            embed = embed.WithUrl(session.JoinLink);
+        }
+
+        embed = embed.WithColor(GetColor(session));
+        embed = embed.AddFields(fields);
+
+        return embed;
+    }
+
+    private static string BuildPlayerDescription(SessionViewItem session)
+    {
+        if (session.ActivePlayers.Count == 0)
+            return "👥 Пока никто не записался";
+
+        var lines = session.ActivePlayers
+            .Select(p => $"• {p.DisplayName}")
+            .ToList();
+
+        if (session.WaitlistedPlayers.Count > 0)
+        {
+            lines.Add("");
+            lines.Add($"⏳ Лист ожидания ({session.WaitlistedPlayers.Count}):");
+            lines.AddRange(session.WaitlistedPlayers.Select(p => $"• {p.DisplayName}"));
+        }
+
+        return string.Join('\n', lines);
+    }
+
+    private static string FormatStatus(string status) => status switch
+    {
+        SessionStatus.Planned => "Запланирована",
+        SessionStatus.ConfirmationSent => "Ожидает подтверждения",
+        SessionStatus.Confirmed => "Подтверждена",
+        SessionStatus.Cancelled => "Отменена",
+        _ => status
+    };
+
+    private static Color GetColor(SessionViewItem session)
+    {
+        if (SessionStatus.IsCancelled(session.Status))
+            return new Color(0xED4245);
+
+        if (session.Status == SessionStatus.Confirmed)
+            return new Color(0x5865F2);
+
+        if (session.MaxPlayers.HasValue && session.ActivePlayerCount >= session.MaxPlayers.Value)
+            return new Color(0xFEE75C);
+
+        return new Color(0x57F287);
+    }
+}

src/GmRelay.Shared/Rendering/DiscordSessionBatchRenderer.cs

@@ -1,13 +0,0 @@
-namespace GmRelay.Shared.Rendering;
-
-/// <summary>
-/// Заглушка для Discord-рендерера.
-/// Реальная реализация будет добавлена в проект GmRelay.DiscordBot (issue #26).
-/// </summary>
-public static class DiscordSessionBatchRenderer
-{
-    public static object Render(SessionBatchViewModel view)
-    {
-        throw new NotImplementedException("Discord renderer will be implemented in issue #26.");
-    }
-}

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

@@ -56,7 +56,7 @@
                     </button>
                 </form>
 
-                <div class="nav-version">v2.2.0</div>
+                <div class="nav-version">v2.3.0</div>
             </div>
         </Authorized>
         <NotAuthorized>

tests/GmRelay.Bot.Tests/Discord/DiscordProjectStructureTests.cs

@@ -61,7 +61,7 @@ public sealed class DiscordProjectStructureTests
         var prChecks = File.ReadAllText(Path.Combine(repoRoot, ".gitea", "workflows", "pr-checks.yml"));
         var deploy = File.ReadAllText(Path.Combine(repoRoot, ".gitea", "workflows", "deploy.yml"));
 
-        Assert.Contains("gmrelay-discord-bot:2.2.0", compose);
+        Assert.Contains("gmrelay-discord-bot:2.3.0", compose);
         Assert.Contains("Discord__Token=${DISCORD_BOT_TOKEN:?Set DISCORD_BOT_TOKEN in .env}", compose);
         Assert.Contains("src/GmRelay.DiscordBot/Dockerfile", deploy);
         Assert.Contains("DISCORD_BOT_TOKEN", deploy);
@@ -75,13 +75,13 @@ public sealed class DiscordProjectStructureTests
     {
         var repoRoot = GetRepoRoot();
 
-        Assert.Contains("<Version>2.2.0</Version>", File.ReadAllText(Path.Combine(repoRoot, "Directory.Build.props")));
-        Assert.Contains("VERSION: 2.2.0", File.ReadAllText(Path.Combine(repoRoot, ".gitea", "workflows", "deploy.yml")));
-        Assert.Contains("gmrelay-bot:2.2.0", File.ReadAllText(Path.Combine(repoRoot, "compose.yaml")));
-        Assert.Contains("gmrelay-web:2.2.0", File.ReadAllText(Path.Combine(repoRoot, "compose.yaml")));
-        Assert.Contains("gmrelay-discord-bot:2.2.0", File.ReadAllText(Path.Combine(repoRoot, "compose.yaml")));
+        Assert.Contains("<Version>2.3.0</Version>", File.ReadAllText(Path.Combine(repoRoot, "Directory.Build.props")));
+        Assert.Contains("VERSION: 2.3.0", File.ReadAllText(Path.Combine(repoRoot, ".gitea", "workflows", "deploy.yml")));
+        Assert.Contains("gmrelay-bot:2.3.0", File.ReadAllText(Path.Combine(repoRoot, "compose.yaml")));
+        Assert.Contains("gmrelay-web:2.3.0", File.ReadAllText(Path.Combine(repoRoot, "compose.yaml")));
+        Assert.Contains("gmrelay-discord-bot:2.3.0", File.ReadAllText(Path.Combine(repoRoot, "compose.yaml")));
         Assert.Contains(
-            "v2.2.0",
+            "v2.3.0",
             File.ReadAllText(Path.Combine(repoRoot, "src", "GmRelay.Web", "Components", "Layout", "NavMenu.razor")));
     }
 }

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

@@ -0,0 +1,139 @@
+using GmRelay.DiscordBot.Rendering;
+using GmRelay.Shared.Domain;
+using GmRelay.Shared.Rendering;
+using NetCord;
+using NetCord.Rest;
+
+namespace GmRelay.Bot.Tests.Rendering;
+
+public sealed class DiscordSessionBatchRendererTests
+{
+    [Fact]
+    public void Render_ShouldProduceEmbedsAndButtonsForMultipleSessions()
+    {
+        var firstSessionId = Guid.NewGuid();
+        var secondSessionId = Guid.NewGuid();
+        var cancelledSessionId = Guid.NewGuid();
+
+        var sessions = new[]
+        {
+            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[]
+        {
+            new ParticipantBatchDto(secondSessionId, "Alice", "alice", ParticipantRegistrationStatus.Active),
+            new ParticipantBatchDto(secondSessionId, "Charlie", null, ParticipantRegistrationStatus.Waitlisted),
+            new ParticipantBatchDto(cancelledSessionId, "Bob", null, ParticipantRegistrationStatus.Active)
+        };
+
+        var view = SessionBatchViewBuilder.Build("Campaign", sessions, participants);
+        var (embeds, actionRows) = DiscordSessionBatchRenderer.Render(view);
+
+        Assert.Equal(3, embeds.Count);
+        Assert.Equal(2, actionRows.Count); // cancelled skipped
+
+        // Embed titles contain game title and Moscow date
+        Assert.Contains(embeds, e => e.Title!.Contains("Campaign") && e.Title.Contains("26"));
+        Assert.Contains(embeds, e => e.Title!.Contains("Campaign") && e.Title.Contains("27"));
+        Assert.Contains(embeds, e => e.Title!.Contains("Campaign") && e.Title.Contains("28"));
+
+        // Cancelled session embed description indicates cancellation
+        var cancelledEmbed = embeds.First(e => e.Description!.Contains("отменена") || e.Description.Contains("Отменена"));
+        Assert.NotNull(cancelledEmbed);
+
+        // Active session embeds contain player names
+        Assert.Contains(embeds, e => e.Description!.Contains("Alice"));
+        Assert.Contains(embeds, e => e.Description!.Contains("Charlie"));
+
+        // Buttons for active sessions
+        var allButtons = actionRows.SelectMany(r => r).OfType<ButtonProperties>().ToList();
+        Assert.Contains(allButtons, b => b.CustomId == $"join_session:{firstSessionId}");
+        Assert.Contains(allButtons, b => b.CustomId == $"leave_session:{firstSessionId}");
+        Assert.Contains(allButtons, b => b.CustomId == $"join_session:{secondSessionId}");
+        Assert.Contains(allButtons, b => b.CustomId == $"leave_session:{secondSessionId}");
+    }
+
+    [Fact]
+    public void Render_ShouldSkipActionRowsForCancelledSessions()
+    {
+        var cancelledSessionId = Guid.NewGuid();
+        var sessions = new[] { new SessionBatchDto(cancelledSessionId, DateTime.UtcNow, SessionStatus.Cancelled, null, "") };
+        var participants = Array.Empty<ParticipantBatchDto>();
+
+        var view = SessionBatchViewBuilder.Build("Test", sessions, participants);
+        var (embeds, actionRows) = DiscordSessionBatchRenderer.Render(view);
+
+        Assert.Single(embeds);
+        Assert.Empty(actionRows);
+    }
+
+    [Fact]
+    public void Render_ShouldShowWaitlistButtonWhenFull()
+    {
+        var sessionId = Guid.NewGuid();
+        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);
+        var (_, actionRows) = DiscordSessionBatchRenderer.Render(view);
+        var buttons = actionRows.SelectMany(r => r).OfType<ButtonProperties>().ToList();
+        var joinButton = buttons.First(b => b.CustomId == $"join_session:{sessionId}");
+
+        Assert.Contains("ожидания", joinButton.Label);
+    }
+
+    [Fact]
+    public void Render_ShouldUseRedColorForCancelledSessions()
+    {
+        var sessionId = Guid.NewGuid();
+        var sessions = new[] { new SessionBatchDto(sessionId, DateTime.UtcNow, SessionStatus.Cancelled, null, "") };
+        var participants = Array.Empty<ParticipantBatchDto>();
+
+        var view = SessionBatchViewBuilder.Build("Test", sessions, participants);
+        var (embeds, _) = DiscordSessionBatchRenderer.Render(view);
+
+        Assert.Equal(0xED4245, embeds[0].Color.RawValue);
+    }
+
+    [Fact]
+    public void Render_ShouldUseGreenColorForOpenSessions()
+    {
+        var sessionId = Guid.NewGuid();
+        var sessions = new[] { new SessionBatchDto(sessionId, DateTime.UtcNow, SessionStatus.Planned, 4, "https://example.com/game") };
+        var participants = Array.Empty<ParticipantBatchDto>();
+
+        var view = SessionBatchViewBuilder.Build("Test", sessions, participants);
+        var (embeds, _) = DiscordSessionBatchRenderer.Render(view);
+
+        Assert.Equal(0x57F287, embeds[0].Color.RawValue);
+    }
+
+    [Fact]
+    public void Render_ShouldUseYellowColorForFullSessions()
+    {
+        var sessionId = Guid.NewGuid();
+        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);
+        var (embeds, _) = DiscordSessionBatchRenderer.Render(view);
+
+        Assert.Equal(0xFEE75C, embeds[0].Color.RawValue);
+    }
+
+    [Fact]
+    public void Render_ShouldHandleRescheduleStatus()
+    {
+        var sessionId = Guid.NewGuid();
+        var sessions = new[] { new SessionBatchDto(sessionId, DateTime.UtcNow, "Rescheduled", 4, "") };
+        var participants = Array.Empty<ParticipantBatchDto>();
+
+        var view = SessionBatchViewBuilder.Build("Test", sessions, participants);
+        var (embeds, actionRows) = DiscordSessionBatchRenderer.Render(view);
+
+        Assert.Single(embeds);
+        Assert.Single(actionRows); // not cancelled → actions present
+    }
+}