diff --git a/src/GmRelay.Web/Components/Pages/EditSession.razor b/src/GmRelay.Web/Components/Pages/EditSession.razor
index aa100fd..af68256 100644
--- a/src/GmRelay.Web/Components/Pages/EditSession.razor
+++ b/src/GmRelay.Web/Components/Pages/EditSession.razor
@@ -51,6 +51,12 @@
+
+
+ @if (!string.IsNullOrEmpty(errorMessage))
+ {
+
+ ⚠️ @errorMessage
+
+ }
+
@if (sessions == null)
{
@@ -48,6 +55,7 @@
| Название |
Время (МСК) |
+ Места |
Статус |
Ссылка |
Действие |
@@ -59,6 +67,7 @@
| @session.Title |
@session.ScheduledAt.FormatMoscow() |
+ @FormatSeats(session) |
@TranslateStatus(session.Status)
|
@@ -69,9 +78,17 @@
-
- ✏️ Изменить
-
+
+
+ ✏️ Изменить
+
+ @if (CanPromote(session))
+ {
+
+ }
+ |
}
@@ -93,6 +110,10 @@
🕐 Время
@session.ScheduledAt.FormatMoscow()
+ 👥 Места
+ @FormatSeats(session)
+
🔗 Ссылка
Подключиться ↗
@@ -102,6 +123,12 @@
✏️ Изменить
+ @if (CanPromote(session))
+ {
+
+ }
}
@@ -112,11 +139,14 @@
@code {
[Parameter] public Guid GroupId { get; set; }
private List? sessions;
+ private Guid? promotingSessionId;
+ private long telegramId;
+ private string? errorMessage;
protected override async Task OnInitializedAsync()
{
var authState = await AuthStateProvider.GetAuthenticationStateAsync();
- if (!authState.User.TryGetTelegramId(out var telegramId))
+ if (!authState.User.TryGetTelegramId(out telegramId))
{
Navigation.NavigateTo("/access-denied");
return;
@@ -129,6 +159,45 @@
}
}
+ private async Task PromoteWaitlisted(Guid sessionId)
+ {
+ errorMessage = null;
+ promotingSessionId = sessionId;
+
+ try
+ {
+ await SessionService.PromoteWaitlistedPlayerForGmAsync(sessionId, telegramId);
+ sessions = await SessionService.GetUpcomingSessionsForGmAsync(GroupId, telegramId);
+ }
+ catch (SessionAccessDeniedException)
+ {
+ Navigation.NavigateTo("/access-denied");
+ }
+ catch (Exception ex)
+ {
+ errorMessage = ex.Message;
+ }
+ finally
+ {
+ promotingSessionId = null;
+ }
+ }
+
+ private static bool CanPromote(WebSession session) =>
+ session.WaitlistedPlayerCount > 0 &&
+ (!session.MaxPlayers.HasValue || session.ActivePlayerCount < session.MaxPlayers.Value);
+
+ private static string FormatSeats(WebSession session)
+ {
+ var seats = session.MaxPlayers.HasValue
+ ? $"{session.ActivePlayerCount}/{session.MaxPlayers.Value}"
+ : session.ActivePlayerCount.ToString(System.Globalization.CultureInfo.InvariantCulture);
+
+ return session.WaitlistedPlayerCount > 0
+ ? $"{seats} · ожидание {session.WaitlistedPlayerCount}"
+ : seats;
+ }
+
private string GetStatusClass(string status) => status switch
{
SessionStatus.Confirmed => "status-success",
diff --git a/src/GmRelay.Web/Services/AuthorizedSessionService.cs b/src/GmRelay.Web/Services/AuthorizedSessionService.cs
index 310030b..28c4b7b 100644
--- a/src/GmRelay.Web/Services/AuthorizedSessionService.cs
+++ b/src/GmRelay.Web/Services/AuthorizedSessionService.cs
@@ -26,7 +26,7 @@ public sealed class AuthorizedSessionService(ISessionStore sessionStore)
return await GroupBelongsToGmAsync(session.GroupId, gmId) ? session : null;
}
- public async Task UpdateSessionForGmAsync(Guid sessionId, long gmId, string title, DateTime scheduledAt, string joinLink)
+ public async Task UpdateSessionForGmAsync(Guid sessionId, long gmId, string title, DateTime scheduledAt, string joinLink, int? maxPlayers)
{
var session = await GetSessionForGmAsync(sessionId, gmId);
if (session is null)
@@ -34,7 +34,18 @@ public sealed class AuthorizedSessionService(ISessionStore sessionStore)
throw new SessionAccessDeniedException(sessionId, gmId);
}
- await sessionStore.UpdateSessionAsync(sessionId, session.GroupId, title, scheduledAt, joinLink);
+ await sessionStore.UpdateSessionAsync(sessionId, session.GroupId, title, scheduledAt, joinLink, maxPlayers);
+ }
+
+ public async Task PromoteWaitlistedPlayerForGmAsync(Guid sessionId, long gmId)
+ {
+ var session = await GetSessionForGmAsync(sessionId, gmId);
+ if (session is null)
+ {
+ throw new SessionAccessDeniedException(sessionId, gmId);
+ }
+
+ await sessionStore.PromoteWaitlistedPlayerAsync(sessionId, session.GroupId);
}
private async Task GroupBelongsToGmAsync(Guid groupId, long gmId)
diff --git a/src/GmRelay.Web/Services/ISessionStore.cs b/src/GmRelay.Web/Services/ISessionStore.cs
index 0d7510c..f9bb888 100644
--- a/src/GmRelay.Web/Services/ISessionStore.cs
+++ b/src/GmRelay.Web/Services/ISessionStore.cs
@@ -6,5 +6,6 @@ public interface ISessionStore
Task GetGroupAsync(Guid groupId);
Task> GetUpcomingSessionsAsync(Guid groupId);
Task GetSessionAsync(Guid sessionId);
- Task UpdateSessionAsync(Guid sessionId, Guid groupId, string title, DateTime scheduledAt, string joinLink);
+ Task UpdateSessionAsync(Guid sessionId, Guid groupId, string title, DateTime scheduledAt, string joinLink, int? maxPlayers);
+ Task PromoteWaitlistedPlayerAsync(Guid sessionId, Guid groupId);
}
diff --git a/src/GmRelay.Web/Services/SessionService.cs b/src/GmRelay.Web/Services/SessionService.cs
index a5580cb..9250a94 100644
--- a/src/GmRelay.Web/Services/SessionService.cs
+++ b/src/GmRelay.Web/Services/SessionService.cs
@@ -7,7 +7,21 @@ using Telegram.Bot;
namespace GmRelay.Web.Services;
public sealed record WebGameGroup(Guid Id, long TelegramChatId, string Name, long GmTelegramId);
-public sealed record WebSession(Guid Id, Guid GroupId, string Title, DateTime ScheduledAt, string Status, string JoinLink, Guid BatchId, int? BatchMessageId, long TelegramChatId);
+public sealed record WebSession(
+ Guid Id,
+ Guid GroupId,
+ string Title,
+ DateTime ScheduledAt,
+ string Status,
+ string JoinLink,
+ Guid BatchId,
+ int? BatchMessageId,
+ long TelegramChatId,
+ int? MaxPlayers,
+ int ActivePlayerCount,
+ int WaitlistedPlayerCount);
+
+internal sealed record WebPromotedParticipantDto(Guid ParticipantRowId, string DisplayName);
public sealed class SessionService(
NpgsqlDataSource dataSource,
@@ -36,12 +50,34 @@ public sealed class SessionService(
return (await conn.QueryAsync(
@"SELECT s.id, s.group_id AS GroupId, s.title, s.scheduled_at AS ScheduledAt, s.status, s.join_link AS JoinLink,
s.batch_id AS BatchId, s.batch_message_id AS BatchMessageId,
- g.telegram_chat_id AS TelegramChatId
+ g.telegram_chat_id AS TelegramChatId,
+ s.max_players AS MaxPlayers,
+ COALESCE(active_counts.count, 0)::int AS ActivePlayerCount,
+ COALESCE(waitlist_counts.count, 0)::int AS WaitlistedPlayerCount
FROM sessions s
JOIN game_groups g ON g.id = s.group_id
+ LEFT JOIN LATERAL (
+ SELECT COUNT(*) AS count
+ FROM session_participants sp
+ WHERE sp.session_id = s.id
+ AND sp.is_gm = false
+ AND sp.registration_status = @Active
+ ) active_counts ON true
+ LEFT JOIN LATERAL (
+ SELECT COUNT(*) AS count
+ FROM session_participants sp
+ WHERE sp.session_id = s.id
+ AND sp.is_gm = false
+ AND sp.registration_status = @Waitlisted
+ ) waitlist_counts ON true
WHERE s.group_id = @GroupId AND s.scheduled_at > now() - interval '4 hours'
ORDER BY s.scheduled_at",
- new { GroupId = groupId })).ToList();
+ new
+ {
+ GroupId = groupId,
+ Active = ParticipantRegistrationStatus.Active,
+ Waitlisted = ParticipantRegistrationStatus.Waitlisted
+ })).ToList();
}
public async Task GetSessionAsync(Guid sessionId)
@@ -50,14 +86,36 @@ public sealed class SessionService(
return await conn.QuerySingleOrDefaultAsync(
@"SELECT s.id, s.group_id AS GroupId, s.title, s.scheduled_at AS ScheduledAt, s.status, s.join_link AS JoinLink,
s.batch_id AS BatchId, s.batch_message_id AS BatchMessageId,
- g.telegram_chat_id AS TelegramChatId
+ g.telegram_chat_id AS TelegramChatId,
+ s.max_players AS MaxPlayers,
+ COALESCE(active_counts.count, 0)::int AS ActivePlayerCount,
+ COALESCE(waitlist_counts.count, 0)::int AS WaitlistedPlayerCount
FROM sessions s
JOIN game_groups g ON g.id = s.group_id
+ LEFT JOIN LATERAL (
+ SELECT COUNT(*) AS count
+ FROM session_participants sp
+ WHERE sp.session_id = s.id
+ AND sp.is_gm = false
+ AND sp.registration_status = @Active
+ ) active_counts ON true
+ LEFT JOIN LATERAL (
+ SELECT COUNT(*) AS count
+ FROM session_participants sp
+ WHERE sp.session_id = s.id
+ AND sp.is_gm = false
+ AND sp.registration_status = @Waitlisted
+ ) waitlist_counts ON true
WHERE s.id = @SessionId",
- new { SessionId = sessionId });
+ new
+ {
+ SessionId = sessionId,
+ Active = ParticipantRegistrationStatus.Active,
+ Waitlisted = ParticipantRegistrationStatus.Waitlisted
+ });
}
- public async Task UpdateSessionAsync(Guid sessionId, Guid groupId, string title, DateTime scheduledAt, string joinLink)
+ public async Task UpdateSessionAsync(Guid sessionId, Guid groupId, string title, DateTime scheduledAt, string joinLink, int? maxPlayers)
{
await using var conn = await dataSource.OpenConnectionAsync();
await using var transaction = await conn.BeginTransactionAsync();
@@ -65,7 +123,10 @@ public sealed class SessionService(
var oldSession = await conn.QuerySingleOrDefaultAsync(
@"SELECT s.id, s.group_id AS GroupId, s.title, s.scheduled_at AS ScheduledAt, s.status, s.join_link AS JoinLink,
s.batch_id AS BatchId, s.batch_message_id AS BatchMessageId,
- g.telegram_chat_id AS TelegramChatId
+ g.telegram_chat_id AS TelegramChatId,
+ s.max_players AS MaxPlayers,
+ 0 AS ActivePlayerCount,
+ 0 AS WaitlistedPlayerCount
FROM sessions s
JOIN game_groups g ON g.id = s.group_id
WHERE s.id = @Id AND s.group_id = @GroupId",
@@ -82,9 +143,18 @@ public sealed class SessionService(
SET title = @Title,
scheduled_at = @ScheduledAt,
join_link = @JoinLink,
+ max_players = @MaxPlayers,
updated_at = now()
WHERE id = @Id AND group_id = @GroupId",
- new { Id = sessionId, GroupId = groupId, Title = title, ScheduledAt = scheduledAt, JoinLink = joinLink },
+ new
+ {
+ Id = sessionId,
+ GroupId = groupId,
+ Title = title,
+ ScheduledAt = scheduledAt,
+ JoinLink = joinLink,
+ MaxPlayers = maxPlayers
+ },
transaction);
if (updatedRows == 0)
@@ -102,7 +172,9 @@ public sealed class SessionService(
var timeChanged = oldSession.ScheduledAt != scheduledAt;
var notification = $"🔄 Мастер обновил игру!\n\n" +
$"📌 {System.Net.WebUtility.HtmlEncode(title)}\n" +
- $"📅 Время: {scheduledAt.FormatMoscow()} (МСК)" + (timeChanged ? " (изменено)" : "");
+ $"📅 Время: {scheduledAt.FormatMoscow()} (МСК)" + (timeChanged ? " (изменено)" : "") +
+ "\n" +
+ $"👥 Мест: {(maxPlayers.HasValue ? maxPlayers.Value.ToString(System.Globalization.CultureInfo.InvariantCulture) : "без лимита")}";
await bot.SendMessage(oldSession.TelegramChatId, notification, parseMode: Telegram.Bot.Types.Enums.ParseMode.Html);
@@ -112,6 +184,104 @@ public sealed class SessionService(
}
}
+ public async Task PromoteWaitlistedPlayerAsync(Guid sessionId, Guid groupId)
+ {
+ await using var conn = await dataSource.OpenConnectionAsync();
+ await using var transaction = await conn.BeginTransactionAsync();
+
+ var session = await conn.QuerySingleOrDefaultAsync(
+ @"SELECT s.id, s.group_id AS GroupId, s.title, s.scheduled_at AS ScheduledAt, s.status, s.join_link AS JoinLink,
+ s.batch_id AS BatchId, s.batch_message_id AS BatchMessageId,
+ g.telegram_chat_id AS TelegramChatId,
+ s.max_players AS MaxPlayers,
+ 0 AS ActivePlayerCount,
+ 0 AS WaitlistedPlayerCount
+ FROM sessions s
+ JOIN game_groups g ON g.id = s.group_id
+ WHERE s.id = @SessionId AND s.group_id = @GroupId
+ FOR UPDATE",
+ new { SessionId = sessionId, GroupId = groupId },
+ transaction);
+
+ if (session is null)
+ {
+ throw new SessionAccessDeniedException(sessionId, 0);
+ }
+
+ var activeParticipants = await conn.ExecuteScalarAsync(
+ """
+ SELECT COUNT(*)
+ FROM session_participants
+ WHERE session_id = @SessionId
+ AND is_gm = false
+ AND registration_status = @Active
+ """,
+ new { SessionId = sessionId, Active = ParticipantRegistrationStatus.Active },
+ transaction);
+
+ var waitlistedParticipants = await conn.ExecuteScalarAsync(
+ """
+ SELECT COUNT(*)
+ FROM session_participants
+ WHERE session_id = @SessionId
+ AND is_gm = false
+ AND registration_status = @Waitlisted
+ """,
+ new { SessionId = sessionId, Waitlisted = ParticipantRegistrationStatus.Waitlisted },
+ transaction);
+
+ if (!SessionCapacityRules.CanPromoteWaitlistedPlayer(session.MaxPlayers, activeParticipants, waitlistedParticipants))
+ {
+ throw new InvalidOperationException(waitlistedParticipants == 0
+ ? "Лист ожидания пуст."
+ : "Нет свободных мест для повышения игрока.");
+ }
+
+ var promoted = await conn.QuerySingleAsync(
+ """
+ SELECT sp.id AS ParticipantRowId,
+ 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 = @Waitlisted
+ ORDER BY sp.created_at ASC, sp.id ASC
+ LIMIT 1
+ FOR UPDATE OF sp
+ """,
+ new { SessionId = sessionId, Waitlisted = ParticipantRegistrationStatus.Waitlisted },
+ transaction);
+
+ await conn.ExecuteAsync(
+ """
+ UPDATE session_participants
+ SET registration_status = @Active,
+ rsvp_status = @Pending,
+ responded_at = NULL
+ WHERE id = @ParticipantRowId
+ """,
+ new
+ {
+ promoted.ParticipantRowId,
+ Active = ParticipantRegistrationStatus.Active,
+ Pending = RsvpStatus.Pending
+ },
+ transaction);
+
+ await transaction.CommitAsync();
+
+ await bot.SendMessage(
+ session.TelegramChatId,
+ $"⬆️ {System.Net.WebUtility.HtmlEncode(promoted.DisplayName)} переведен(а) из листа ожидания в основной состав «{System.Net.WebUtility.HtmlEncode(session.Title)}».",
+ parseMode: Telegram.Bot.Types.Enums.ParseMode.Html);
+
+ if (session.BatchMessageId.HasValue)
+ {
+ await TryUpdateBatchMessageAsync(session.BatchId, session.TelegramChatId, session.BatchMessageId.Value, session.Title);
+ }
+ }
+
private async Task TryUpdateBatchMessageAsync(Guid batchId, long chatId, int messageId, string title)
{
try
@@ -119,16 +289,19 @@ public sealed class SessionService(
await using var conn = await dataSource.OpenConnectionAsync();
var sessions = (await conn.QueryAsync(
- "SELECT id AS SessionId, scheduled_at AS ScheduledAt, status AS Status 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 FROM sessions WHERE batch_id = @BatchId ORDER BY scheduled_at",
new { BatchId = batchId })).ToList();
var participants = (await conn.QueryAsync(
- @"SELECT sp.session_id AS SessionId, p.display_name AS DisplayName, p.telegram_username AS TelegramUsername
+ @"SELECT sp.session_id AS SessionId,
+ p.display_name AS DisplayName,
+ p.telegram_username AS TelegramUsername,
+ sp.registration_status AS RegistrationStatus
FROM session_participants sp
JOIN players p ON sp.player_id = p.id
JOIN sessions s ON sp.session_id = s.id
WHERE s.batch_id = @BatchId AND sp.is_gm = false
- ORDER BY sp.responded_at ASC, p.created_at ASC",
+ ORDER BY sp.registration_status ASC, sp.created_at ASC, sp.responded_at ASC, p.created_at ASC",
new { BatchId = batchId })).ToList();
var renderResult = SessionBatchRenderer.Render(title, sessions, participants);
diff --git a/src/GmRelay.Web/wwwroot/app.css b/src/GmRelay.Web/wwwroot/app.css
index 1165fab..0631ef1 100644
--- a/src/GmRelay.Web/wwwroot/app.css
+++ b/src/GmRelay.Web/wwwroot/app.css
@@ -1,5 +1,5 @@
/* ============================================
- GM-Relay Design System v1.1.0
+ GM-Relay Design System v1.2.0
Dark RPG Dashboard Theme
============================================ */
@@ -821,4 +821,4 @@ input[type="datetime-local"]::-webkit-calendar-picker-indicator {
.glass-card {
padding: 1rem;
}
-}
\ No newline at end of file
+}
diff --git a/tests/GmRelay.Bot.Tests/Features/Sessions/CreateSession/NewSessionCommandParserTests.cs b/tests/GmRelay.Bot.Tests/Features/Sessions/CreateSession/NewSessionCommandParserTests.cs
index 41fb803..344b330 100644
--- a/tests/GmRelay.Bot.Tests/Features/Sessions/CreateSession/NewSessionCommandParserTests.cs
+++ b/tests/GmRelay.Bot.Tests/Features/Sessions/CreateSession/NewSessionCommandParserTests.cs
@@ -13,6 +13,7 @@ public sealed class NewSessionCommandParserTests
Название: Curse of Strahd
Время: 24.04.2026 19:30
Время: 01.05.2026 20:00
+ Мест: 4
Ссылка: https://example.test/room
""";
@@ -21,6 +22,7 @@ public sealed class NewSessionCommandParserTests
Assert.True(result.IsValid);
Assert.Equal("Curse of Strahd", result.Title);
Assert.Equal("https://example.test/room", result.Link);
+ Assert.Equal(4, result.MaxPlayers);
Assert.Equal(
[
new DateTimeOffset(2026, 4, 24, 16, 30, 0, TimeSpan.Zero),
@@ -65,4 +67,22 @@ public sealed class NewSessionCommandParserTests
Assert.False(result.IsValid);
Assert.Null(result.Link);
}
+
+ [Fact]
+ public void Parse_ShouldCollectInvalidSeatLimit()
+ {
+ var text = """
+ /newsession
+ Название: Blades in the Dark
+ Время: 25.04.2026 19:30
+ Мест: 0
+ Ссылка: https://example.test/blades
+ """;
+
+ var result = NewSessionCommandParser.Parse(text, DateTimeOffset.UtcNow);
+
+ Assert.False(result.IsValid);
+ Assert.Null(result.MaxPlayers);
+ Assert.Equal(["0"], result.InvalidSeatLimitInputs);
+ }
}
diff --git a/tests/GmRelay.Bot.Tests/Features/Sessions/CreateSession/SessionCapacityRulesTests.cs b/tests/GmRelay.Bot.Tests/Features/Sessions/CreateSession/SessionCapacityRulesTests.cs
new file mode 100644
index 0000000..d3d2638
--- /dev/null
+++ b/tests/GmRelay.Bot.Tests/Features/Sessions/CreateSession/SessionCapacityRulesTests.cs
@@ -0,0 +1,31 @@
+using GmRelay.Bot.Features.Sessions.CreateSession;
+using GmRelay.Shared.Domain;
+
+namespace GmRelay.Bot.Tests.Features.Sessions.CreateSession;
+
+public sealed class SessionCapacityRulesTests
+{
+ [Fact]
+ public void DecideJoinStatus_ShouldReturnActive_WhenSessionHasFreeSeats()
+ {
+ var status = SessionCapacityRules.DecideJoinStatus(maxPlayers: 3, activeParticipants: 2);
+
+ Assert.Equal(ParticipantRegistrationStatus.Active, status);
+ }
+
+ [Fact]
+ public void DecideJoinStatus_ShouldReturnWaitlisted_WhenSessionReachedLimit()
+ {
+ var status = SessionCapacityRules.DecideJoinStatus(maxPlayers: 2, activeParticipants: 2);
+
+ Assert.Equal(ParticipantRegistrationStatus.Waitlisted, status);
+ }
+
+ [Fact]
+ public void CanPromoteWaitlistedPlayer_ShouldRequireWaitlistAndFreeSeat()
+ {
+ Assert.True(SessionCapacityRules.CanPromoteWaitlistedPlayer(maxPlayers: 3, activeParticipants: 2, waitlistedParticipants: 1));
+ Assert.False(SessionCapacityRules.CanPromoteWaitlistedPlayer(maxPlayers: 3, activeParticipants: 3, waitlistedParticipants: 1));
+ Assert.False(SessionCapacityRules.CanPromoteWaitlistedPlayer(maxPlayers: 3, activeParticipants: 2, waitlistedParticipants: 0));
+ }
+}
diff --git a/tests/GmRelay.Bot.Tests/Rendering/SessionBatchRendererTests.cs b/tests/GmRelay.Bot.Tests/Rendering/SessionBatchRendererTests.cs
index 28f932e..6011e48 100644
--- a/tests/GmRelay.Bot.Tests/Rendering/SessionBatchRendererTests.cs
+++ b/tests/GmRelay.Bot.Tests/Rendering/SessionBatchRendererTests.cs
@@ -14,14 +14,15 @@ public sealed class SessionBatchRendererTests
var sessions = new[]
{
- new SessionBatchDto(secondSessionId, new DateTime(2026, 4, 27, 18, 0, 0, DateTimeKind.Utc), SessionStatus.Planned),
- new SessionBatchDto(cancelledSessionId, new DateTime(2026, 4, 28, 18, 0, 0, DateTimeKind.Utc), SessionStatus.Cancelled),
- new SessionBatchDto(firstSessionId, new DateTime(2026, 4, 26, 18, 0, 0, DateTimeKind.Utc), SessionStatus.Planned)
+ 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)
};
var participants = new[]
{
- new ParticipantBatchDto(secondSessionId, "Alice", "alice"),
- new ParticipantBatchDto(cancelledSessionId, "Bob", null)
+ new ParticipantBatchDto(secondSessionId, "Alice", "alice", ParticipantRegistrationStatus.Active),
+ new ParticipantBatchDto(secondSessionId, "Charlie", null, ParticipantRegistrationStatus.Waitlisted),
+ new ParticipantBatchDto(cancelledSessionId, "Bob", null, ParticipantRegistrationStatus.Active)
};
var result = SessionBatchRenderer.Render("Campaign", sessions, participants);
@@ -35,7 +36,11 @@ public sealed class SessionBatchRendererTests
Assert.Contains("Campaign", text);
Assert.True(firstIndex < secondIndex);
Assert.True(secondIndex < thirdIndex);
+ Assert.Contains("Места: 0/2", text);
+ Assert.Contains("Места: 1/4", text);
Assert.Contains("@alice", text);
+ Assert.Contains("Лист ожидания (1)", text);
+ Assert.Contains("Charlie", text);
Assert.Contains("Bob", text);
Assert.Equal(2, result.Markup.InlineKeyboard.Count());
Assert.Collection(
@@ -45,6 +50,7 @@ public sealed class SessionBatchRendererTests
callbackData => Assert.Equal($"reschedule_session:{firstSessionId}", callbackData),
callbackData => Assert.Equal($"join_session:{secondSessionId}", callbackData),
callbackData => Assert.Equal($"cancel_session:{secondSessionId}", callbackData),
- callbackData => Assert.Equal($"reschedule_session:{secondSessionId}", callbackData));
+ callbackData => Assert.Equal($"reschedule_session:{secondSessionId}", callbackData),
+ callbackData => Assert.Equal($"promote_waitlist:{secondSessionId}", callbackData));
}
}
diff --git a/tests/GmRelay.Bot.Tests/Web/AuthorizedSessionServiceTests.cs b/tests/GmRelay.Bot.Tests/Web/AuthorizedSessionServiceTests.cs
index 5fc9a79..a2215cf 100644
--- a/tests/GmRelay.Bot.Tests/Web/AuthorizedSessionServiceTests.cs
+++ b/tests/GmRelay.Bot.Tests/Web/AuthorizedSessionServiceTests.cs
@@ -16,7 +16,7 @@ public sealed class AuthorizedSessionServiceTests
],
sessions:
[
- new(Guid.NewGuid(), groupId, "Session A", DateTime.UtcNow, "Planned", "https://example.test/a", Guid.NewGuid(), 10, 42)
+ new(Guid.NewGuid(), groupId, "Session A", DateTime.UtcNow, "Planned", "https://example.test/a", Guid.NewGuid(), 10, 42, 4, 1, 0)
]);
var service = new AuthorizedSessionService(store);
@@ -56,7 +56,7 @@ public sealed class AuthorizedSessionServiceTests
],
sessions:
[
- new(sessionId, groupId, "Session A", DateTime.UtcNow, "Planned", "https://example.test/a", Guid.NewGuid(), 10, 42)
+ new(sessionId, groupId, "Session A", DateTime.UtcNow, "Planned", "https://example.test/a", Guid.NewGuid(), 10, 42, 4, 1, 0)
]);
var service = new AuthorizedSessionService(store);
@@ -78,7 +78,7 @@ public sealed class AuthorizedSessionServiceTests
],
sessions:
[
- new(sessionId, groupId, "Session A", DateTime.UtcNow, "Planned", "https://example.test/a", Guid.NewGuid(), 10, 42)
+ new(sessionId, groupId, "Session A", DateTime.UtcNow, "Planned", "https://example.test/a", Guid.NewGuid(), 10, 42, 4, 1, 0)
]);
var service = new AuthorizedSessionService(store);
@@ -99,11 +99,11 @@ public sealed class AuthorizedSessionServiceTests
],
sessions:
[
- new(sessionId, groupId, "Session A", DateTime.UtcNow, "Planned", "https://example.test/a", Guid.NewGuid(), 10, 42)
+ new(sessionId, groupId, "Session A", DateTime.UtcNow, "Planned", "https://example.test/a", Guid.NewGuid(), 10, 42, 4, 1, 0)
]);
var service = new AuthorizedSessionService(store);
- var action = () => service.UpdateSessionForGmAsync(sessionId, 1001L, "Updated", DateTime.UtcNow.AddDays(1), "https://example.test/b");
+ var action = () => service.UpdateSessionForGmAsync(sessionId, 1001L, "Updated", DateTime.UtcNow.AddDays(1), "https://example.test/b", 5);
await Assert.ThrowsAsync(action);
Assert.False(store.UpdateCalled);
@@ -123,11 +123,11 @@ public sealed class AuthorizedSessionServiceTests
],
sessions:
[
- new(sessionId, groupId, "Session A", DateTime.UtcNow, "Planned", "https://example.test/a", Guid.NewGuid(), 10, 42)
+ new(sessionId, groupId, "Session A", DateTime.UtcNow, "Planned", "https://example.test/a", Guid.NewGuid(), 10, 42, 4, 1, 0)
]);
var service = new AuthorizedSessionService(store);
- await service.UpdateSessionForGmAsync(sessionId, gmId, "Updated", scheduledAt, "https://example.test/b");
+ await service.UpdateSessionForGmAsync(sessionId, gmId, "Updated", scheduledAt, "https://example.test/b", 5);
Assert.True(store.UpdateCalled);
Assert.Equal(groupId, store.LastUpdatedGroupId);
@@ -135,6 +135,31 @@ public sealed class AuthorizedSessionServiceTests
Assert.Equal("Updated", store.LastUpdatedTitle);
Assert.Equal(scheduledAt, store.LastUpdatedScheduledAt);
Assert.Equal("https://example.test/b", store.LastUpdatedJoinLink);
+ Assert.Equal(5, store.LastUpdatedMaxPlayers);
+ }
+
+ [Fact]
+ public async Task PromoteWaitlistedPlayerForGmAsync_PromotesOwnedSession()
+ {
+ var gmId = 1001L;
+ var groupId = Guid.NewGuid();
+ var sessionId = Guid.NewGuid();
+ var store = new FakeSessionStore(
+ groups:
+ [
+ new(groupId, 42, "Alpha", gmId)
+ ],
+ sessions:
+ [
+ new(sessionId, groupId, "Session A", DateTime.UtcNow, "Planned", "https://example.test/a", Guid.NewGuid(), 10, 42, 4, 3, 1)
+ ]);
+ var service = new AuthorizedSessionService(store);
+
+ await service.PromoteWaitlistedPlayerForGmAsync(sessionId, gmId);
+
+ Assert.True(store.PromoteCalled);
+ Assert.Equal(groupId, store.LastPromotedGroupId);
+ Assert.Equal(sessionId, store.LastPromotedSessionId);
}
private sealed class FakeSessionStore(
@@ -145,11 +170,15 @@ public sealed class AuthorizedSessionServiceTests
private readonly Dictionary sessionsById = sessions?.ToDictionary(session => session.Id) ?? [];
public bool UpdateCalled { get; private set; }
+ public bool PromoteCalled { get; private set; }
public Guid? LastUpdatedSessionId { get; private set; }
public Guid? LastUpdatedGroupId { get; private set; }
public string? LastUpdatedTitle { get; private set; }
public DateTime? LastUpdatedScheduledAt { get; private set; }
public string? LastUpdatedJoinLink { get; private set; }
+ public int? LastUpdatedMaxPlayers { get; private set; }
+ public Guid? LastPromotedSessionId { get; private set; }
+ public Guid? LastPromotedGroupId { get; private set; }
public Task> GetGroupsForGmAsync(long gmId) =>
Task.FromResult(groupsById.Values.Where(group => group.GmTelegramId == gmId).ToList());
@@ -169,7 +198,7 @@ public sealed class AuthorizedSessionServiceTests
return Task.FromResult(session);
}
- public Task UpdateSessionAsync(Guid sessionId, Guid groupId, string title, DateTime scheduledAt, string joinLink)
+ public Task UpdateSessionAsync(Guid sessionId, Guid groupId, string title, DateTime scheduledAt, string joinLink, int? maxPlayers)
{
UpdateCalled = true;
LastUpdatedSessionId = sessionId;
@@ -177,6 +206,15 @@ public sealed class AuthorizedSessionServiceTests
LastUpdatedTitle = title;
LastUpdatedScheduledAt = scheduledAt;
LastUpdatedJoinLink = joinLink;
+ LastUpdatedMaxPlayers = maxPlayers;
+ return Task.CompletedTask;
+ }
+
+ public Task PromoteWaitlistedPlayerAsync(Guid sessionId, Guid groupId)
+ {
+ PromoteCalled = true;
+ LastPromotedSessionId = sessionId;
+ LastPromotedGroupId = groupId;
return Task.CompletedTask;
}
}