Compare commits
8 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| a8f2b10956 | |||
| 3228e77c7f | |||
| 621ef553e7 | |||
| 5f3516e703 | |||
| 2eb7d86e48 | |||
| 3e291b0ed5 | |||
| a5ba4111cf | |||
| f45985041b |
+27
-23
@@ -6,7 +6,7 @@ on:
|
|||||||
- main
|
- main
|
||||||
|
|
||||||
env:
|
env:
|
||||||
VERSION: 1.2.0
|
VERSION: 1.5.0
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
# ЧАСТЬ 1: Собираем образы и кладем в Gitea (чтобы делиться с ребятами)
|
# ЧАСТЬ 1: Собираем образы и кладем в Gitea (чтобы делиться с ребятами)
|
||||||
@@ -23,29 +23,33 @@ jobs:
|
|||||||
username: toutsu
|
username: toutsu
|
||||||
password: ${{ secrets.GIT_TOKEN }}
|
password: ${{ secrets.GIT_TOKEN }}
|
||||||
|
|
||||||
- name: Build and push Bot
|
- name: Build Bot image
|
||||||
uses: docker/build-push-action@v5
|
run: |
|
||||||
with:
|
docker build \
|
||||||
context: .
|
--label "org.opencontainers.image.source=https://git.codeanddice.ru/${{ gitea.repository }}" \
|
||||||
file: src/GmRelay.Bot/Dockerfile
|
-f src/GmRelay.Bot/Dockerfile \
|
||||||
push: true
|
-t git.codeanddice.ru/toutsu/gmrelay-bot:latest \
|
||||||
tags: |
|
-t git.codeanddice.ru/toutsu/gmrelay-bot:${{ env.VERSION }} \
|
||||||
git.codeanddice.ru/toutsu/gmrelay-bot:latest
|
.
|
||||||
git.codeanddice.ru/toutsu/gmrelay-bot:${{ env.VERSION }}
|
|
||||||
labels: |
|
|
||||||
org.opencontainers.image.source=https://git.codeanddice.ru/${{ gitea.repository }}
|
|
||||||
|
|
||||||
- name: Build and push Web
|
- name: Push Bot image
|
||||||
uses: docker/build-push-action@v5
|
run: |
|
||||||
with:
|
docker push git.codeanddice.ru/toutsu/gmrelay-bot:latest
|
||||||
context: .
|
docker push git.codeanddice.ru/toutsu/gmrelay-bot:${{ env.VERSION }}
|
||||||
file: src/GmRelay.Web/Dockerfile
|
|
||||||
push: true
|
- name: Build Web image
|
||||||
tags: |
|
run: |
|
||||||
git.codeanddice.ru/toutsu/gmrelay-web:latest
|
docker build \
|
||||||
git.codeanddice.ru/toutsu/gmrelay-web:${{ env.VERSION }}
|
--label "org.opencontainers.image.source=https://git.codeanddice.ru/${{ gitea.repository }}" \
|
||||||
labels: |
|
-f src/GmRelay.Web/Dockerfile \
|
||||||
org.opencontainers.image.source=https://git.codeanddice.ru/${{ gitea.repository }}
|
-t git.codeanddice.ru/toutsu/gmrelay-web:latest \
|
||||||
|
-t git.codeanddice.ru/toutsu/gmrelay-web:${{ env.VERSION }} \
|
||||||
|
.
|
||||||
|
|
||||||
|
- name: Push Web image
|
||||||
|
run: |
|
||||||
|
docker push git.codeanddice.ru/toutsu/gmrelay-web:latest
|
||||||
|
docker push git.codeanddice.ru/toutsu/gmrelay-web:${{ env.VERSION }}
|
||||||
|
|
||||||
# ЧАСТЬ 2: Запускаем эти образы на самом сервере
|
# ЧАСТЬ 2: Запускаем эти образы на самом сервере
|
||||||
deploy:
|
deploy:
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<Project>
|
<Project>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<Version>1.2.0</Version>
|
<Version>1.5.0</Version>
|
||||||
<TargetFramework>net10.0</TargetFramework>
|
<TargetFramework>net10.0</TargetFramework>
|
||||||
<LangVersion>preview</LangVersion>
|
<LangVersion>preview</LangVersion>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
|
|||||||
@@ -4,22 +4,27 @@
|
|||||||
|
|
||||||
Проект разработан с упором на производительность, архитектуру Vertical Slice, Native AOT (для бота) и удобство развертывания с использованием .NET Aspire.
|
Проект разработан с упором на производительность, архитектуру Vertical Slice, Native AOT (для бота) и удобство развертывания с использованием .NET Aspire.
|
||||||
|
|
||||||
|
**Текущая версия:** `v1.5.0`.
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## ✨ Ключевые возможности
|
## ✨ Ключевые возможности
|
||||||
|
|
||||||
### 🤖 Telegram Бот
|
### 🤖 Telegram Бот
|
||||||
- **📅 Создание расписаний (Batch Sessions)**: Создавайте сразу несколько игр одним сообщением (на неделю или месяц вперед).
|
- **📅 Создание расписаний (Batch Sessions)**: Создавайте сразу несколько игр одним сообщением (на неделю или месяц вперед).
|
||||||
- **✋ Интерактивная запись**: Игроки записываются на конкретные даты нажатием одной кнопки.
|
- **✋ Интерактивная запись и выход**: Игроки записываются на конкретные даты и самостоятельно снимают запись нажатием одной кнопки.
|
||||||
- **👥 Лимит мест и лист ожидания**: ГМ задаёт максимальный состав, бот не переполняет сессию и автоматически ведёт очередь ожидания.
|
- **👥 Лимит мест и лист ожидания**: ГМ задаёт максимальный состав, бот не переполняет сессию, автоматически ведёт очередь ожидания и освобождённое место отдаёт первому ожидающему.
|
||||||
- **📁 Поддержка Форумов (Telegram Topics)**: Бот автоматически создает тему во вложенных чатах Telegram под каждую новую пачку игр.
|
- **📁 Поддержка Форумов (Telegram Topics)**: Бот автоматически создает тему во вложенных чатах Telegram под каждую новую пачку игр.
|
||||||
- **❌ Управление сессиями**: Мастер может отменять отдельные игры прямо в общем сообщении расписания.
|
- **❌ Управление сессиями**: Мастер может отменять отдельные игры прямо в общем сообщении расписания.
|
||||||
|
- **🔔 Персональные уведомления**: Игроки получают DM о RSVP за 24 часа, напоминание за 1 час, ссылку перед игрой, отмены и переносы; групповые уведомления при этом остаются.
|
||||||
- **🗓 Экспорт в Календарь**: Генерация файла `.ics` для добавления всех игр в Google, Apple или Яндекс Календарь одной командой.
|
- **🗓 Экспорт в Календарь**: Генерация файла `.ics` для добавления всех игр в Google, Apple или Яндекс Календарь одной командой.
|
||||||
- **🚀 Native AOT**: Скомпилирован в нативный бинарный файл. Мгновенный запуск и минимальное потребление памяти. Идеально для **Raspberry Pi**.
|
- **🚀 Native AOT**: Скомпилирован в нативный бинарный файл. Мгновенный запуск и минимальное потребление памяти. Идеально для **Raspberry Pi**.
|
||||||
|
|
||||||
### 🌐 Web Dashboard (Blazor Server)
|
### 🌐 Web Dashboard (Blazor Server)
|
||||||
- **🔐 Авторизация через Telegram**: Безопасный вход с использованием Telegram Login Widget (HMAC-SHA256 валидация).
|
- **🔐 Авторизация через Telegram**: Безопасный вход с использованием Telegram Login Widget (HMAC-SHA256 валидация).
|
||||||
- **📝 Удобное редактирование**: Веб-интерфейс для детального редактирования сессий, изменения дат, названий и статусов.
|
- **📝 Удобное редактирование**: Веб-интерфейс для детального редактирования сессий, изменения дат, названий и статусов.
|
||||||
|
- **🧩 Bulk-операции для Batch Sessions**: ГМ может обновить общий title/link, перенести всю пачку на фиксированный шаг и клонировать batch на следующую неделю или месяц.
|
||||||
|
- **🔕 Режим уведомлений batch**: Для каждой пачки можно выбрать `В группе и в личку` или `Только в группе`.
|
||||||
- **⬆️ Управление очередью**: Веб-интерфейс показывает заполненность, лист ожидания и позволяет ГМу поднять первого игрока из очереди.
|
- **⬆️ Управление очередью**: Веб-интерфейс показывает заполненность, лист ожидания и позволяет ГМу поднять первого игрока из очереди.
|
||||||
- **🔄 Автоматическая синхронизация**: Любые изменения в веб-интерфейсе мгновенно обновляют сообщения с расписанием в Telegram-чатах игроков.
|
- **🔄 Автоматическая синхронизация**: Любые изменения в веб-интерфейсе мгновенно обновляют сообщения с расписанием в Telegram-чатах игроков.
|
||||||
- **🕒 Управление временем**: UI адаптирован под московское время (UTC+3), в то время как база данных работает в UTC.
|
- **🕒 Управление временем**: UI адаптирован под московское время (UTC+3), в то время как база данных работает в UTC.
|
||||||
@@ -118,6 +123,19 @@ docker compose up -d
|
|||||||
|
|
||||||
Строка `Мест:` необязательна. Если она указана, игроки сверх лимита попадут в лист ожидания, а ГМ сможет повысить первого ожидающего через кнопку в Telegram или Web Dashboard.
|
Строка `Мест:` необязательна. Если она указана, игроки сверх лимита попадут в лист ожидания, а ГМ сможет повысить первого ожидающего через кнопку в Telegram или Web Dashboard.
|
||||||
|
|
||||||
|
Игрок может самостоятельно снять запись кнопкой `🚪 Выйти` в сообщении расписания. Если он был в основном составе и в листе ожидания есть игроки, бот автоматически переводит первого ожидающего в основной состав и обновляет сообщение пачки.
|
||||||
|
|
||||||
|
### Bulk-операции в Web Dashboard
|
||||||
|
На странице группы Web Dashboard показывает отдельный блок для каждой пачки игр. ГМ может:
|
||||||
|
- обновить общий `title` и `link` сразу у всех сессий batch;
|
||||||
|
- выбрать режим уведомлений: дублировать важные сообщения игрокам в личку или оставить только групповые уведомления;
|
||||||
|
- перенести пачку, задав новую первую дату и фиксированный шаг между играми в днях;
|
||||||
|
- клонировать batch на следующую неделю или следующий календарный месяц.
|
||||||
|
|
||||||
|
После редактирования или переноса исходное Telegram-сообщение расписания перерисовывается. При клонировании создаётся новая пачка с новым Telegram-сообщением и пустым составом игроков.
|
||||||
|
|
||||||
|
Если включён режим `В группе и в личку`, бот дополнительно отправляет игрокам персональные сообщения о RSVP за 24 часа, напоминание за 1 час, ссылку перед стартом, отмену и перенос. Если Telegram не позволяет написать игроку в ЛС, бот логирует ошибку и продолжает отправку остальным участникам.
|
||||||
|
|
||||||
### Другие команды
|
### Другие команды
|
||||||
- `/listsessions` — Показать список всех актуальных игр в этой группе.
|
- `/listsessions` — Показать список всех актуальных игр в этой группе.
|
||||||
- `/reschedulesession` — Перенести сессию на другое время с голосованием игроков.
|
- `/reschedulesession` — Перенести сессию на другое время с голосованием игроков.
|
||||||
|
|||||||
+2
-2
@@ -17,7 +17,7 @@ services:
|
|||||||
retries: 10
|
retries: 10
|
||||||
|
|
||||||
bot:
|
bot:
|
||||||
image: git.codeanddice.ru/toutsu/gmrelay-bot:1.2.0
|
image: git.codeanddice.ru/toutsu/gmrelay-bot:1.5.0
|
||||||
restart: always
|
restart: always
|
||||||
depends_on:
|
depends_on:
|
||||||
db:
|
db:
|
||||||
@@ -29,7 +29,7 @@ services:
|
|||||||
- gmrelay
|
- gmrelay
|
||||||
|
|
||||||
web:
|
web:
|
||||||
image: git.codeanddice.ru/toutsu/gmrelay-web:1.2.0
|
image: git.codeanddice.ru/toutsu/gmrelay-web:1.5.0
|
||||||
restart: always
|
restart: always
|
||||||
depends_on:
|
depends_on:
|
||||||
db:
|
db:
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
using Dapper;
|
using Dapper;
|
||||||
|
using GmRelay.Bot.Features.Notifications;
|
||||||
using GmRelay.Shared.Domain;
|
using GmRelay.Shared.Domain;
|
||||||
using Npgsql;
|
using Npgsql;
|
||||||
using Telegram.Bot;
|
using Telegram.Bot;
|
||||||
@@ -13,7 +14,8 @@ internal sealed record SessionInfo(
|
|||||||
string Title,
|
string Title,
|
||||||
DateTime ScheduledAt,
|
DateTime ScheduledAt,
|
||||||
Guid GroupId,
|
Guid GroupId,
|
||||||
long TelegramChatId);
|
long TelegramChatId,
|
||||||
|
string NotificationMode);
|
||||||
|
|
||||||
internal sealed record ParticipantInfo(
|
internal sealed record ParticipantInfo(
|
||||||
long TelegramId,
|
long TelegramId,
|
||||||
@@ -29,6 +31,7 @@ internal sealed record ParticipantInfo(
|
|||||||
public sealed class SendConfirmationHandler(
|
public sealed class SendConfirmationHandler(
|
||||||
NpgsqlDataSource dataSource,
|
NpgsqlDataSource dataSource,
|
||||||
ITelegramBotClient bot,
|
ITelegramBotClient bot,
|
||||||
|
DirectSessionNotificationSender directSender,
|
||||||
ILogger<SendConfirmationHandler> logger)
|
ILogger<SendConfirmationHandler> logger)
|
||||||
{
|
{
|
||||||
public async Task HandleAsync(Guid sessionId, CancellationToken ct)
|
public async Task HandleAsync(Guid sessionId, CancellationToken ct)
|
||||||
@@ -39,7 +42,8 @@ public sealed class SendConfirmationHandler(
|
|||||||
var session = await connection.QuerySingleOrDefaultAsync<SessionInfo>(
|
var session = await connection.QuerySingleOrDefaultAsync<SessionInfo>(
|
||||||
"""
|
"""
|
||||||
SELECT s.id, s.title, s.scheduled_at AS ScheduledAt, s.group_id AS GroupId,
|
SELECT s.id, s.title, s.scheduled_at AS ScheduledAt, s.group_id AS GroupId,
|
||||||
g.telegram_chat_id AS TelegramChatId
|
g.telegram_chat_id AS TelegramChatId,
|
||||||
|
s.notification_mode AS NotificationMode
|
||||||
FROM sessions s
|
FROM sessions s
|
||||||
JOIN game_groups g ON g.id = s.group_id
|
JOIN game_groups g ON g.id = s.group_id
|
||||||
WHERE s.id = @SessionId AND s.status = @Planned
|
WHERE s.id = @SessionId AND s.status = @Planned
|
||||||
@@ -115,6 +119,26 @@ public sealed class SendConfirmationHandler(
|
|||||||
MessageId = message.MessageId
|
MessageId = message.MessageId
|
||||||
});
|
});
|
||||||
|
|
||||||
|
var mode = SessionNotificationModeExtensions.FromDatabaseValue(session.NotificationMode);
|
||||||
|
if (mode.ShouldSendDirectMessages())
|
||||||
|
{
|
||||||
|
var directText = $"""
|
||||||
|
🎲 <b>Подтвердите участие в игре</b>
|
||||||
|
|
||||||
|
📌 <b>{System.Net.WebUtility.HtmlEncode(session.Title)}</b>
|
||||||
|
📅 {session.ScheduledAt.FormatMoscow()} (МСК)
|
||||||
|
|
||||||
|
Ответьте кнопкой в групповом сообщении расписания.
|
||||||
|
""";
|
||||||
|
|
||||||
|
await directSender.SendAsync(
|
||||||
|
participants.Select(p => new DirectNotificationRecipient(p.TelegramId, p.DisplayName)),
|
||||||
|
directText,
|
||||||
|
"confirmation",
|
||||||
|
sessionId,
|
||||||
|
ct);
|
||||||
|
}
|
||||||
|
|
||||||
logger.LogInformation(
|
logger.LogInformation(
|
||||||
"Confirmation sent for session {SessionId} ({Title}), message_id={MessageId}",
|
"Confirmation sent for session {SessionId} ({Title}), message_id={MessageId}",
|
||||||
sessionId, session.Title, message.MessageId);
|
sessionId, session.Title, message.MessageId);
|
||||||
|
|||||||
@@ -0,0 +1,41 @@
|
|||||||
|
using Telegram.Bot;
|
||||||
|
using Telegram.Bot.Types.Enums;
|
||||||
|
|
||||||
|
namespace GmRelay.Bot.Features.Notifications;
|
||||||
|
|
||||||
|
public sealed record DirectNotificationRecipient(long TelegramId, string DisplayName);
|
||||||
|
|
||||||
|
public sealed class DirectSessionNotificationSender(
|
||||||
|
ITelegramBotClient bot,
|
||||||
|
ILogger<DirectSessionNotificationSender> logger)
|
||||||
|
{
|
||||||
|
public async Task SendAsync(
|
||||||
|
IEnumerable<DirectNotificationRecipient> recipients,
|
||||||
|
string htmlText,
|
||||||
|
string notificationKind,
|
||||||
|
Guid sessionId,
|
||||||
|
CancellationToken ct)
|
||||||
|
{
|
||||||
|
foreach (var recipient in recipients)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
await bot.SendMessage(
|
||||||
|
chatId: recipient.TelegramId,
|
||||||
|
text: htmlText,
|
||||||
|
parseMode: ParseMode.Html,
|
||||||
|
cancellationToken: ct);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.LogWarning(
|
||||||
|
ex,
|
||||||
|
"Failed to send {NotificationKind} DM for session {SessionId} to player {TelegramId} ({DisplayName})",
|
||||||
|
notificationKind,
|
||||||
|
sessionId,
|
||||||
|
recipient.TelegramId,
|
||||||
|
recipient.DisplayName);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,4 +1,5 @@
|
|||||||
using Dapper;
|
using Dapper;
|
||||||
|
using GmRelay.Bot.Features.Notifications;
|
||||||
using GmRelay.Shared.Domain;
|
using GmRelay.Shared.Domain;
|
||||||
using Npgsql;
|
using Npgsql;
|
||||||
using Telegram.Bot;
|
using Telegram.Bot;
|
||||||
@@ -12,7 +13,8 @@ internal sealed record JoinLinkSession(
|
|||||||
string Title,
|
string Title,
|
||||||
string JoinLink,
|
string JoinLink,
|
||||||
DateTime ScheduledAt,
|
DateTime ScheduledAt,
|
||||||
long TelegramChatId);
|
long TelegramChatId,
|
||||||
|
string NotificationMode);
|
||||||
|
|
||||||
internal sealed record ConfirmedPlayer(
|
internal sealed record ConfirmedPlayer(
|
||||||
long TelegramId,
|
long TelegramId,
|
||||||
@@ -28,6 +30,7 @@ internal sealed record ConfirmedPlayer(
|
|||||||
public sealed class SendJoinLinkHandler(
|
public sealed class SendJoinLinkHandler(
|
||||||
NpgsqlDataSource dataSource,
|
NpgsqlDataSource dataSource,
|
||||||
ITelegramBotClient bot,
|
ITelegramBotClient bot,
|
||||||
|
DirectSessionNotificationSender directSender,
|
||||||
ILogger<SendJoinLinkHandler> logger)
|
ILogger<SendJoinLinkHandler> logger)
|
||||||
{
|
{
|
||||||
public async Task HandleAsync(Guid sessionId, CancellationToken ct)
|
public async Task HandleAsync(Guid sessionId, CancellationToken ct)
|
||||||
@@ -38,7 +41,8 @@ public sealed class SendJoinLinkHandler(
|
|||||||
var session = await connection.QuerySingleOrDefaultAsync<JoinLinkSession>(
|
var session = await connection.QuerySingleOrDefaultAsync<JoinLinkSession>(
|
||||||
"""
|
"""
|
||||||
SELECT s.id, s.title, s.join_link AS JoinLink, s.scheduled_at AS ScheduledAt,
|
SELECT s.id, s.title, s.join_link AS JoinLink, s.scheduled_at AS ScheduledAt,
|
||||||
g.telegram_chat_id AS TelegramChatId
|
g.telegram_chat_id AS TelegramChatId,
|
||||||
|
s.notification_mode AS NotificationMode
|
||||||
FROM sessions s
|
FROM sessions s
|
||||||
JOIN game_groups g ON g.id = s.group_id
|
JOIN game_groups g ON g.id = s.group_id
|
||||||
WHERE s.id = @SessionId
|
WHERE s.id = @SessionId
|
||||||
@@ -102,6 +106,24 @@ public sealed class SendJoinLinkHandler(
|
|||||||
""",
|
""",
|
||||||
new { SessionId = sessionId, MessageId = message.MessageId });
|
new { SessionId = sessionId, MessageId = message.MessageId });
|
||||||
|
|
||||||
|
var mode = SessionNotificationModeExtensions.FromDatabaseValue(session.NotificationMode);
|
||||||
|
if (mode.ShouldSendDirectMessages())
|
||||||
|
{
|
||||||
|
var directText = $"""
|
||||||
|
🎮 <b>Игра начинается через 5 минут</b>
|
||||||
|
|
||||||
|
📌 <b>{System.Net.WebUtility.HtmlEncode(session.Title)}</b>
|
||||||
|
🔗 {System.Net.WebUtility.HtmlEncode(session.JoinLink)}
|
||||||
|
""";
|
||||||
|
|
||||||
|
await directSender.SendAsync(
|
||||||
|
players.Select(p => new DirectNotificationRecipient(p.TelegramId, p.DisplayName)),
|
||||||
|
directText,
|
||||||
|
"join-link",
|
||||||
|
sessionId,
|
||||||
|
ct);
|
||||||
|
}
|
||||||
|
|
||||||
logger.LogInformation(
|
logger.LogInformation(
|
||||||
"Join link sent for session {SessionId} ({Title}), message_id={MessageId}",
|
"Join link sent for session {SessionId} ({Title}), message_id={MessageId}",
|
||||||
sessionId, session.Title, message.MessageId);
|
sessionId, session.Title, message.MessageId);
|
||||||
|
|||||||
@@ -0,0 +1,97 @@
|
|||||||
|
using Dapper;
|
||||||
|
using GmRelay.Bot.Features.Notifications;
|
||||||
|
using GmRelay.Shared.Domain;
|
||||||
|
using Npgsql;
|
||||||
|
|
||||||
|
namespace GmRelay.Bot.Features.Reminders.SendOneHourReminder;
|
||||||
|
|
||||||
|
internal sealed record OneHourReminderSession(
|
||||||
|
Guid Id,
|
||||||
|
string Title,
|
||||||
|
string JoinLink,
|
||||||
|
DateTime ScheduledAt,
|
||||||
|
string NotificationMode);
|
||||||
|
|
||||||
|
public sealed class SendOneHourReminderHandler(
|
||||||
|
NpgsqlDataSource dataSource,
|
||||||
|
DirectSessionNotificationSender directSender,
|
||||||
|
ILogger<SendOneHourReminderHandler> logger)
|
||||||
|
{
|
||||||
|
public async Task HandleAsync(Guid sessionId, CancellationToken ct)
|
||||||
|
{
|
||||||
|
await using var connection = await dataSource.OpenConnectionAsync(ct);
|
||||||
|
|
||||||
|
var session = await connection.QuerySingleOrDefaultAsync<OneHourReminderSession>(
|
||||||
|
"""
|
||||||
|
SELECT id,
|
||||||
|
title,
|
||||||
|
join_link AS JoinLink,
|
||||||
|
scheduled_at AS ScheduledAt,
|
||||||
|
notification_mode AS NotificationMode
|
||||||
|
FROM sessions
|
||||||
|
WHERE id = @SessionId
|
||||||
|
AND status IN (@Confirmed, @ConfirmationSent)
|
||||||
|
AND one_hour_reminder_processed_at IS NULL
|
||||||
|
""",
|
||||||
|
new
|
||||||
|
{
|
||||||
|
SessionId = sessionId,
|
||||||
|
Confirmed = SessionStatus.Confirmed,
|
||||||
|
ConfirmationSent = SessionStatus.ConfirmationSent
|
||||||
|
});
|
||||||
|
|
||||||
|
if (session is null)
|
||||||
|
{
|
||||||
|
logger.LogWarning("Session {SessionId} not eligible for one-hour reminder", sessionId);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
var recipients = (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
|
||||||
|
AND sp.rsvp_status != @Declined
|
||||||
|
""",
|
||||||
|
new
|
||||||
|
{
|
||||||
|
SessionId = sessionId,
|
||||||
|
Active = ParticipantRegistrationStatus.Active,
|
||||||
|
Declined = RsvpStatus.Declined
|
||||||
|
})).ToList();
|
||||||
|
|
||||||
|
var mode = SessionNotificationModeExtensions.FromDatabaseValue(session.NotificationMode);
|
||||||
|
if (mode.ShouldSendDirectMessages() && recipients.Count > 0)
|
||||||
|
{
|
||||||
|
var text = $"""
|
||||||
|
⏰ <b>Игра начнётся примерно через 1 час</b>
|
||||||
|
|
||||||
|
📌 <b>{System.Net.WebUtility.HtmlEncode(session.Title)}</b>
|
||||||
|
📅 {session.ScheduledAt.FormatMoscow()} (МСК)
|
||||||
|
🔗 {System.Net.WebUtility.HtmlEncode(session.JoinLink)}
|
||||||
|
""";
|
||||||
|
|
||||||
|
await directSender.SendAsync(recipients, text, "one-hour-reminder", session.Id, ct);
|
||||||
|
}
|
||||||
|
|
||||||
|
await connection.ExecuteAsync(
|
||||||
|
"""
|
||||||
|
UPDATE sessions
|
||||||
|
SET one_hour_reminder_processed_at = now(),
|
||||||
|
updated_at = now()
|
||||||
|
WHERE id = @SessionId
|
||||||
|
AND one_hour_reminder_processed_at IS NULL
|
||||||
|
""",
|
||||||
|
new { SessionId = sessionId });
|
||||||
|
|
||||||
|
logger.LogInformation(
|
||||||
|
"One-hour reminder processed for session {SessionId} ({Title}) with mode {NotificationMode}",
|
||||||
|
sessionId,
|
||||||
|
session.Title,
|
||||||
|
session.NotificationMode);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,4 +1,5 @@
|
|||||||
using Dapper;
|
using Dapper;
|
||||||
|
using GmRelay.Bot.Features.Notifications;
|
||||||
using GmRelay.Shared.Domain;
|
using GmRelay.Shared.Domain;
|
||||||
using GmRelay.Shared.Rendering;
|
using GmRelay.Shared.Rendering;
|
||||||
using Npgsql;
|
using Npgsql;
|
||||||
@@ -15,11 +16,12 @@ public sealed record CancelSessionCommand(
|
|||||||
int MessageId);
|
int MessageId);
|
||||||
|
|
||||||
// DTOs for AOT compilation
|
// 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(
|
public sealed class CancelSessionHandler(
|
||||||
NpgsqlDataSource dataSource,
|
NpgsqlDataSource dataSource,
|
||||||
ITelegramBotClient bot,
|
ITelegramBotClient bot,
|
||||||
|
DirectSessionNotificationSender directSender,
|
||||||
ILogger<CancelSessionHandler> logger)
|
ILogger<CancelSessionHandler> logger)
|
||||||
{
|
{
|
||||||
public async Task HandleAsync(CancelSessionCommand command, CancellationToken ct)
|
public async Task HandleAsync(CancelSessionCommand command, CancellationToken ct)
|
||||||
@@ -29,7 +31,7 @@ public sealed class CancelSessionHandler(
|
|||||||
|
|
||||||
// 1. Проверяем, что запрос делает ГМ данной сессии
|
// 1. Проверяем, что запрос делает ГМ данной сессии
|
||||||
var session = await connection.QuerySingleOrDefaultAsync<CancelSessionInfoDto>(
|
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
|
FROM sessions s
|
||||||
JOIN game_groups g ON s.group_id = g.id
|
JOIN game_groups g ON s.group_id = g.id
|
||||||
WHERE s.id = @SessionId",
|
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",
|
ORDER BY sp.registration_status ASC, sp.created_at ASC, sp.responded_at ASC, p.created_at ASC",
|
||||||
new { BatchId = session.BatchId }, transaction);
|
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);
|
await transaction.CommitAsync(ct);
|
||||||
|
|
||||||
// 4. Перерисовываем сообщение
|
// 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);
|
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)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -0,0 +1,217 @@
|
|||||||
|
using Dapper;
|
||||||
|
using GmRelay.Shared.Domain;
|
||||||
|
using GmRelay.Shared.Rendering;
|
||||||
|
using Npgsql;
|
||||||
|
using Telegram.Bot;
|
||||||
|
|
||||||
|
namespace GmRelay.Bot.Features.Sessions.CreateSession;
|
||||||
|
|
||||||
|
public sealed record LeaveSessionCommand(
|
||||||
|
Guid SessionId,
|
||||||
|
long TelegramUserId,
|
||||||
|
string CallbackQueryId,
|
||||||
|
long ChatId,
|
||||||
|
int MessageId);
|
||||||
|
|
||||||
|
internal sealed record LeaveSessionInfoDto(string Title, Guid BatchId, string Status, int? MaxPlayers);
|
||||||
|
internal sealed record LeaveSessionParticipantDto(Guid ParticipantRowId, string DisplayName, string RegistrationStatus);
|
||||||
|
internal sealed record LeaveSessionPromotionDto(Guid ParticipantRowId, string DisplayName);
|
||||||
|
|
||||||
|
public sealed class LeaveSessionHandler(
|
||||||
|
NpgsqlDataSource dataSource,
|
||||||
|
ITelegramBotClient bot,
|
||||||
|
ILogger<LeaveSessionHandler> logger)
|
||||||
|
{
|
||||||
|
public async Task HandleAsync(LeaveSessionCommand command, CancellationToken ct)
|
||||||
|
{
|
||||||
|
await using var connection = await dataSource.OpenConnectionAsync(ct);
|
||||||
|
await using var transaction = await connection.BeginTransactionAsync(ct);
|
||||||
|
var transactionCommitted = false;
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var session = await connection.QuerySingleOrDefaultAsync<LeaveSessionInfoDto>(
|
||||||
|
"""
|
||||||
|
SELECT title AS Title,
|
||||||
|
batch_id AS BatchId,
|
||||||
|
status AS Status,
|
||||||
|
max_players AS MaxPlayers
|
||||||
|
FROM sessions
|
||||||
|
WHERE id = @SessionId
|
||||||
|
FOR UPDATE
|
||||||
|
""",
|
||||||
|
new { command.SessionId },
|
||||||
|
transaction);
|
||||||
|
|
||||||
|
if (session is null)
|
||||||
|
{
|
||||||
|
await transaction.RollbackAsync(ct);
|
||||||
|
await bot.AnswerCallbackQuery(command.CallbackQueryId, "Сессия не найдена.", cancellationToken: ct);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (SessionStatus.IsCancelled(session.Status))
|
||||||
|
{
|
||||||
|
await transaction.RollbackAsync(ct);
|
||||||
|
await bot.AnswerCallbackQuery(command.CallbackQueryId, "Сессия уже отменена.", cancellationToken: ct);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
var participant = await connection.QuerySingleOrDefaultAsync<LeaveSessionParticipantDto>(
|
||||||
|
"""
|
||||||
|
SELECT sp.id AS ParticipantRowId,
|
||||||
|
p.display_name AS DisplayName,
|
||||||
|
sp.registration_status AS RegistrationStatus
|
||||||
|
FROM session_participants sp
|
||||||
|
JOIN players p ON p.id = sp.player_id
|
||||||
|
WHERE sp.session_id = @SessionId
|
||||||
|
AND p.telegram_id = @TelegramUserId
|
||||||
|
AND sp.is_gm = false
|
||||||
|
FOR UPDATE OF sp
|
||||||
|
""",
|
||||||
|
new { command.SessionId, command.TelegramUserId },
|
||||||
|
transaction);
|
||||||
|
|
||||||
|
if (participant is null)
|
||||||
|
{
|
||||||
|
await transaction.RollbackAsync(ct);
|
||||||
|
await bot.AnswerCallbackQuery(command.CallbackQueryId, "Вы не записаны на эту сессию.", cancellationToken: ct);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
await connection.ExecuteAsync(
|
||||||
|
"""
|
||||||
|
DELETE FROM session_participants
|
||||||
|
WHERE id = @ParticipantRowId
|
||||||
|
""",
|
||||||
|
new { participant.ParticipantRowId },
|
||||||
|
transaction);
|
||||||
|
|
||||||
|
var activeParticipantsAfterLeave = await connection.ExecuteScalarAsync<int>(
|
||||||
|
"""
|
||||||
|
SELECT COUNT(*)
|
||||||
|
FROM session_participants
|
||||||
|
WHERE session_id = @SessionId
|
||||||
|
AND is_gm = false
|
||||||
|
AND registration_status = @Active
|
||||||
|
""",
|
||||||
|
new { command.SessionId, Active = ParticipantRegistrationStatus.Active },
|
||||||
|
transaction);
|
||||||
|
|
||||||
|
var waitlistedParticipants = await connection.ExecuteScalarAsync<int>(
|
||||||
|
"""
|
||||||
|
SELECT COUNT(*)
|
||||||
|
FROM session_participants
|
||||||
|
WHERE session_id = @SessionId
|
||||||
|
AND is_gm = false
|
||||||
|
AND registration_status = @Waitlisted
|
||||||
|
""",
|
||||||
|
new { command.SessionId, Waitlisted = ParticipantRegistrationStatus.Waitlisted },
|
||||||
|
transaction);
|
||||||
|
|
||||||
|
string? promotedDisplayName = null;
|
||||||
|
if (SessionCapacityRules.ShouldPromoteAfterParticipantLeaves(
|
||||||
|
participant.RegistrationStatus,
|
||||||
|
session.MaxPlayers,
|
||||||
|
activeParticipantsAfterLeave,
|
||||||
|
waitlistedParticipants))
|
||||||
|
{
|
||||||
|
var promoted = await connection.QuerySingleAsync<LeaveSessionPromotionDto>(
|
||||||
|
"""
|
||||||
|
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 { command.SessionId, Waitlisted = ParticipantRegistrationStatus.Waitlisted },
|
||||||
|
transaction);
|
||||||
|
|
||||||
|
await connection.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);
|
||||||
|
|
||||||
|
promotedDisplayName = promoted.DisplayName;
|
||||||
|
}
|
||||||
|
|
||||||
|
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
|
||||||
|
""",
|
||||||
|
new { session.BatchId },
|
||||||
|
transaction)).ToList();
|
||||||
|
|
||||||
|
var batchParticipants = (await connection.QueryAsync<ParticipantBatchDto>(
|
||||||
|
"""
|
||||||
|
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.registration_status ASC, sp.created_at ASC, sp.responded_at ASC, p.created_at ASC
|
||||||
|
""",
|
||||||
|
new { session.BatchId },
|
||||||
|
transaction)).ToList();
|
||||||
|
|
||||||
|
await transaction.CommitAsync(ct);
|
||||||
|
transactionCommitted = true;
|
||||||
|
|
||||||
|
var renderResult = SessionBatchRenderer.Render(session.Title, batchSessions, batchParticipants);
|
||||||
|
|
||||||
|
await bot.EditMessageText(
|
||||||
|
chatId: command.ChatId,
|
||||||
|
messageId: command.MessageId,
|
||||||
|
text: renderResult.Text,
|
||||||
|
parseMode: Telegram.Bot.Types.Enums.ParseMode.Html,
|
||||||
|
replyMarkup: renderResult.Markup,
|
||||||
|
cancellationToken: ct);
|
||||||
|
|
||||||
|
var callbackText = participant.RegistrationStatus == ParticipantRegistrationStatus.Waitlisted
|
||||||
|
? "Вы удалены из листа ожидания."
|
||||||
|
: promotedDisplayName is null
|
||||||
|
? "Вы отписались от сессии."
|
||||||
|
: $"Вы отписались от сессии. Место получил(а) {promotedDisplayName}.";
|
||||||
|
|
||||||
|
await bot.AnswerCallbackQuery(command.CallbackQueryId, callbackText, cancellationToken: ct);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.LogError(ex, "Ошибка при самостоятельной отмене записи на сессию {SessionId}", command.SessionId);
|
||||||
|
if (!transactionCommitted)
|
||||||
|
{
|
||||||
|
await transaction.RollbackAsync(ct);
|
||||||
|
}
|
||||||
|
|
||||||
|
var errorText = transactionCommitted
|
||||||
|
? "Запись снята, но не удалось обновить сообщение расписания."
|
||||||
|
: "Произошла ошибка при отмене записи.";
|
||||||
|
await bot.AnswerCallbackQuery(command.CallbackQueryId, errorText, cancellationToken: ct);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
+42
-5
@@ -1,4 +1,5 @@
|
|||||||
using Dapper;
|
using Dapper;
|
||||||
|
using GmRelay.Bot.Features.Notifications;
|
||||||
using GmRelay.Shared.Domain;
|
using GmRelay.Shared.Domain;
|
||||||
using GmRelay.Shared.Rendering;
|
using GmRelay.Shared.Rendering;
|
||||||
using Npgsql;
|
using Npgsql;
|
||||||
@@ -12,9 +13,13 @@ namespace GmRelay.Bot.Features.Sessions.RescheduleSession;
|
|||||||
|
|
||||||
internal sealed record AwaitingProposalDto(
|
internal sealed record AwaitingProposalDto(
|
||||||
Guid Id, Guid SessionId, string Title, DateTime CurrentScheduledAt,
|
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 ──────────────────────────────────────────────────────────
|
// ── Handler ──────────────────────────────────────────────────────────
|
||||||
|
|
||||||
@@ -26,6 +31,7 @@ internal sealed record VoteParticipantDto(Guid PlayerId, string DisplayName, str
|
|||||||
public sealed class HandleRescheduleTimeInputHandler(
|
public sealed class HandleRescheduleTimeInputHandler(
|
||||||
NpgsqlDataSource dataSource,
|
NpgsqlDataSource dataSource,
|
||||||
ITelegramBotClient bot,
|
ITelegramBotClient bot,
|
||||||
|
DirectSessionNotificationSender directSender,
|
||||||
ILogger<HandleRescheduleTimeInputHandler> logger)
|
ILogger<HandleRescheduleTimeInputHandler> logger)
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <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,
|
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,
|
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
|
FROM reschedule_proposals rp
|
||||||
JOIN sessions s ON s.id = rp.session_id
|
JOIN sessions s ON s.id = rp.session_id
|
||||||
JOIN game_groups g ON g.id = s.group_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
|
// 3. Load participants (non-GM) signed up for this session
|
||||||
var participants = (await connection.QueryAsync<VoteParticipantDto>(
|
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
|
FROM session_participants sp
|
||||||
JOIN players p ON p.id = sp.player_id
|
JOIN players p ON p.id = sp.player_id
|
||||||
WHERE sp.session_id = @SessionId
|
WHERE sp.session_id = @SessionId
|
||||||
@@ -135,6 +145,29 @@ public sealed class HandleRescheduleTimeInputHandler(
|
|||||||
replyMarkup: keyboard,
|
replyMarkup: keyboard,
|
||||||
cancellationToken: ct);
|
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
|
// Store vote message ID
|
||||||
await connection.ExecuteAsync(
|
await connection.ExecuteAsync(
|
||||||
"UPDATE reschedule_proposals SET vote_message_id = @MsgId WHERE id = @Id",
|
"UPDATE reschedule_proposals SET vote_message_id = @MsgId WHERE id = @Id",
|
||||||
@@ -156,7 +189,11 @@ public sealed class HandleRescheduleTimeInputHandler(
|
|||||||
|
|
||||||
await connection.ExecuteAsync(
|
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
|
WHERE id = @SessionId
|
||||||
""",
|
""",
|
||||||
new { NewTime = newTime, proposal.SessionId, Status = SessionStatus.Planned },
|
new { NewTime = newTime, proposal.SessionId, Status = SessionStatus.Planned },
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
using Dapper;
|
using Dapper;
|
||||||
|
using GmRelay.Bot.Features.Notifications;
|
||||||
using GmRelay.Shared.Domain;
|
using GmRelay.Shared.Domain;
|
||||||
using GmRelay.Shared.Rendering;
|
using GmRelay.Shared.Rendering;
|
||||||
using Npgsql;
|
using Npgsql;
|
||||||
@@ -25,11 +26,13 @@ internal sealed record VoteProposalDto(
|
|||||||
string SessionStatus,
|
string SessionStatus,
|
||||||
long TelegramChatId,
|
long TelegramChatId,
|
||||||
int? ConfirmationMessageId,
|
int? ConfirmationMessageId,
|
||||||
int? BatchMessageId);
|
int? BatchMessageId,
|
||||||
|
string NotificationMode);
|
||||||
|
|
||||||
public sealed class HandleRescheduleVoteHandler(
|
public sealed class HandleRescheduleVoteHandler(
|
||||||
NpgsqlDataSource dataSource,
|
NpgsqlDataSource dataSource,
|
||||||
ITelegramBotClient bot,
|
ITelegramBotClient bot,
|
||||||
|
DirectSessionNotificationSender directSender,
|
||||||
ILogger<HandleRescheduleVoteHandler> logger)
|
ILogger<HandleRescheduleVoteHandler> logger)
|
||||||
{
|
{
|
||||||
public async Task HandleAsync(HandleRescheduleVoteCommand command, CancellationToken ct)
|
public async Task HandleAsync(HandleRescheduleVoteCommand command, CancellationToken ct)
|
||||||
@@ -48,7 +51,8 @@ public sealed class HandleRescheduleVoteHandler(
|
|||||||
s.status AS SessionStatus,
|
s.status AS SessionStatus,
|
||||||
s.confirmation_message_id AS ConfirmationMessageId,
|
s.confirmation_message_id AS ConfirmationMessageId,
|
||||||
s.batch_message_id AS BatchMessageId,
|
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
|
FROM reschedule_proposals rp
|
||||||
JOIN sessions s ON s.id = rp.session_id
|
JOIN sessions s ON s.id = rp.session_id
|
||||||
JOIN game_groups g ON g.id = s.group_id
|
JOIN game_groups g ON g.id = s.group_id
|
||||||
@@ -105,7 +109,8 @@ public sealed class HandleRescheduleVoteHandler(
|
|||||||
"""
|
"""
|
||||||
SELECT p.id AS PlayerId,
|
SELECT p.id AS PlayerId,
|
||||||
p.display_name AS DisplayName,
|
p.display_name AS DisplayName,
|
||||||
p.telegram_username AS TelegramUsername
|
p.telegram_username AS TelegramUsername,
|
||||||
|
p.telegram_id AS TelegramId
|
||||||
FROM session_participants sp
|
FROM session_participants sp
|
||||||
JOIN players p ON p.id = sp.player_id
|
JOIN players p ON p.id = sp.player_id
|
||||||
WHERE sp.session_id = @SessionId
|
WHERE sp.session_id = @SessionId
|
||||||
@@ -130,6 +135,8 @@ public sealed class HandleRescheduleVoteHandler(
|
|||||||
|
|
||||||
if (decision.Outcome == RescheduleVoteOutcome.Rejected)
|
if (decision.Outcome == RescheduleVoteOutcome.Rejected)
|
||||||
{
|
{
|
||||||
|
var directRecipients = await LoadDirectRecipients(connection, proposal.SessionId, transaction);
|
||||||
|
|
||||||
await connection.ExecuteAsync(
|
await connection.ExecuteAsync(
|
||||||
"UPDATE reschedule_proposals SET status = 'Rejected' WHERE id = @Id",
|
"UPDATE reschedule_proposals SET status = 'Rejected' WHERE id = @Id",
|
||||||
new { Id = command.ProposalId },
|
new { Id = command.ProposalId },
|
||||||
@@ -156,12 +163,25 @@ public sealed class HandleRescheduleVoteHandler(
|
|||||||
}
|
}
|
||||||
|
|
||||||
await bot.AnswerCallbackQuery(command.CallbackQueryId, decision.CallbackText, cancellationToken: ct);
|
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);
|
logger.LogInformation("Reschedule proposal {ProposalId} rejected by player {PlayerId}", command.ProposalId, playerId);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (decision.ShouldRescheduleSession)
|
if (decision.ShouldRescheduleSession)
|
||||||
{
|
{
|
||||||
|
var directRecipients = await LoadDirectRecipients(connection, proposal.SessionId, transaction);
|
||||||
var newTime = new DateTimeOffset(proposal.ProposedAt, TimeSpan.Zero);
|
var newTime = new DateTimeOffset(proposal.ProposedAt, TimeSpan.Zero);
|
||||||
|
|
||||||
await connection.ExecuteAsync(
|
await connection.ExecuteAsync(
|
||||||
@@ -171,6 +191,7 @@ public sealed class HandleRescheduleVoteHandler(
|
|||||||
status = @Status,
|
status = @Status,
|
||||||
confirmation_message_id = NULL,
|
confirmation_message_id = NULL,
|
||||||
link_message_id = NULL,
|
link_message_id = NULL,
|
||||||
|
one_hour_reminder_processed_at = NULL,
|
||||||
updated_at = now()
|
updated_at = now()
|
||||||
WHERE id = @SessionId
|
WHERE id = @SessionId
|
||||||
""",
|
""",
|
||||||
@@ -214,6 +235,17 @@ public sealed class HandleRescheduleVoteHandler(
|
|||||||
|
|
||||||
await TryUpdateBatchMessage(proposal, ct);
|
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(
|
logger.LogInformation(
|
||||||
"Session {SessionId} rescheduled to {NewTime} (proposal {ProposalId})",
|
"Session {SessionId} rescheduled to {NewTime} (proposal {ProposalId})",
|
||||||
proposal.SessionId,
|
proposal.SessionId,
|
||||||
@@ -257,6 +289,25 @@ public sealed class HandleRescheduleVoteHandler(
|
|||||||
await bot.AnswerCallbackQuery(command.CallbackQueryId, decision.CallbackText, cancellationToken: ct);
|
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)
|
private async Task TryUpdateBatchMessage(VoteProposalDto proposal, CancellationToken ct)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ using Dapper;
|
|||||||
using GmRelay.Shared.Domain;
|
using GmRelay.Shared.Domain;
|
||||||
using GmRelay.Bot.Features.Confirmation.SendConfirmation;
|
using GmRelay.Bot.Features.Confirmation.SendConfirmation;
|
||||||
using GmRelay.Bot.Features.Reminders.SendJoinLink;
|
using GmRelay.Bot.Features.Reminders.SendJoinLink;
|
||||||
|
using GmRelay.Bot.Features.Reminders.SendOneHourReminder;
|
||||||
using Npgsql;
|
using Npgsql;
|
||||||
|
|
||||||
namespace GmRelay.Bot.Infrastructure.Scheduling;
|
namespace GmRelay.Bot.Infrastructure.Scheduling;
|
||||||
@@ -17,11 +18,13 @@ namespace GmRelay.Bot.Infrastructure.Scheduling;
|
|||||||
public sealed class SessionSchedulerService(
|
public sealed class SessionSchedulerService(
|
||||||
NpgsqlDataSource dataSource,
|
NpgsqlDataSource dataSource,
|
||||||
SendConfirmationHandler confirmationHandler,
|
SendConfirmationHandler confirmationHandler,
|
||||||
|
SendOneHourReminderHandler oneHourReminderHandler,
|
||||||
SendJoinLinkHandler joinLinkHandler,
|
SendJoinLinkHandler joinLinkHandler,
|
||||||
ILogger<SessionSchedulerService> logger) : BackgroundService
|
ILogger<SessionSchedulerService> logger) : BackgroundService
|
||||||
{
|
{
|
||||||
private static readonly TimeSpan TickInterval = TimeSpan.FromMinutes(1);
|
private static readonly TimeSpan TickInterval = TimeSpan.FromMinutes(1);
|
||||||
private static readonly TimeSpan ConfirmationLeadTime = TimeSpan.FromHours(24);
|
private static readonly TimeSpan ConfirmationLeadTime = TimeSpan.FromHours(24);
|
||||||
|
private static readonly TimeSpan OneHourReminderLeadTime = TimeSpan.FromHours(1);
|
||||||
private static readonly TimeSpan JoinLinkLeadTime = TimeSpan.FromMinutes(5);
|
private static readonly TimeSpan JoinLinkLeadTime = TimeSpan.FromMinutes(5);
|
||||||
|
|
||||||
protected override async Task ExecuteAsync(CancellationToken stoppingToken)
|
protected override async Task ExecuteAsync(CancellationToken stoppingToken)
|
||||||
@@ -36,6 +39,7 @@ public sealed class SessionSchedulerService(
|
|||||||
try
|
try
|
||||||
{
|
{
|
||||||
await ProcessConfirmationTriggers(stoppingToken);
|
await ProcessConfirmationTriggers(stoppingToken);
|
||||||
|
await ProcessOneHourReminderTriggers(stoppingToken);
|
||||||
await ProcessJoinLinkTriggers(stoppingToken);
|
await ProcessJoinLinkTriggers(stoppingToken);
|
||||||
}
|
}
|
||||||
catch (OperationCanceledException) when (stoppingToken.IsCancellationRequested)
|
catch (OperationCanceledException) when (stoppingToken.IsCancellationRequested)
|
||||||
@@ -52,6 +56,42 @@ public sealed class SessionSchedulerService(
|
|||||||
logger.LogInformation("Session scheduler stopped");
|
logger.LogInformation("Session scheduler stopped");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// T-1h trigger: process direct reminders according to the session notification mode.
|
||||||
|
/// </summary>
|
||||||
|
private async Task ProcessOneHourReminderTriggers(CancellationToken ct)
|
||||||
|
{
|
||||||
|
await using var connection = await dataSource.OpenConnectionAsync(ct);
|
||||||
|
|
||||||
|
var sessionIds = await connection.QueryAsync<Guid>(
|
||||||
|
"""
|
||||||
|
SELECT id
|
||||||
|
FROM sessions
|
||||||
|
WHERE status IN (@Confirmed, @ConfirmationSent)
|
||||||
|
AND scheduled_at - @LeadTime <= now()
|
||||||
|
AND one_hour_reminder_processed_at IS NULL
|
||||||
|
""",
|
||||||
|
new
|
||||||
|
{
|
||||||
|
Confirmed = SessionStatus.Confirmed,
|
||||||
|
ConfirmationSent = SessionStatus.ConfirmationSent,
|
||||||
|
LeadTime = OneHourReminderLeadTime
|
||||||
|
});
|
||||||
|
|
||||||
|
foreach (var sessionId in sessionIds)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
await oneHourReminderHandler.HandleAsync(sessionId, ct);
|
||||||
|
logger.LogInformation("One-hour reminder processed for session {SessionId}", sessionId);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.LogError(ex, "Failed to process one-hour reminder for session {SessionId}", sessionId);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// T-24h trigger: find sessions that need confirmation requests sent.
|
/// T-24h trigger: find sessions that need confirmation requests sent.
|
||||||
/// Condition: status='Planned' AND scheduled_at minus 24h is in the past.
|
/// Condition: status='Planned' AND scheduled_at minus 24h is in the past.
|
||||||
|
|||||||
@@ -20,6 +20,7 @@ public sealed class UpdateRouter(
|
|||||||
HandleRsvpHandler rsvpHandler,
|
HandleRsvpHandler rsvpHandler,
|
||||||
CreateSessionHandler createSessionHandler,
|
CreateSessionHandler createSessionHandler,
|
||||||
JoinSessionHandler joinSessionHandler,
|
JoinSessionHandler joinSessionHandler,
|
||||||
|
LeaveSessionHandler leaveSessionHandler,
|
||||||
PromoteWaitlistedPlayerHandler promoteWaitlistedPlayerHandler,
|
PromoteWaitlistedPlayerHandler promoteWaitlistedPlayerHandler,
|
||||||
CancelSessionHandler cancelSessionHandler,
|
CancelSessionHandler cancelSessionHandler,
|
||||||
DeleteSessionHandler deleteSessionHandler,
|
DeleteSessionHandler deleteSessionHandler,
|
||||||
@@ -73,6 +74,19 @@ public sealed class UpdateRouter(
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (action == "leave_session" && parts.Length >= 2 && Guid.TryParse(parts[1], out var leaveSessionId))
|
||||||
|
{
|
||||||
|
var command = new LeaveSessionCommand(
|
||||||
|
SessionId: leaveSessionId,
|
||||||
|
TelegramUserId: query.From.Id,
|
||||||
|
CallbackQueryId: query.Id,
|
||||||
|
ChatId: message.Chat.Id,
|
||||||
|
MessageId: message.MessageId);
|
||||||
|
|
||||||
|
await leaveSessionHandler.HandleAsync(command, ct);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (action == "cancel_session" && parts.Length >= 2 && Guid.TryParse(parts[1], out var cancelSessionId))
|
if (action == "cancel_session" && parts.Length >= 2 && Guid.TryParse(parts[1], out var cancelSessionId))
|
||||||
{
|
{
|
||||||
var command = new CancelSessionCommand(
|
var command = new CancelSessionCommand(
|
||||||
@@ -210,6 +224,7 @@ public sealed class UpdateRouter(
|
|||||||
Ссылка: https://link
|
Ссылка: https://link
|
||||||
|
|
||||||
/listsessions — список предстоящих сессий
|
/listsessions — список предстоящих сессий
|
||||||
|
Игроки могут записаться кнопкой «На дату» и сняться кнопкой «Выйти».
|
||||||
/help — эта справка
|
/help — эта справка
|
||||||
""",
|
""",
|
||||||
cancellationToken: ct);
|
cancellationToken: ct);
|
||||||
|
|||||||
@@ -0,0 +1,8 @@
|
|||||||
|
ALTER TABLE sessions
|
||||||
|
ADD COLUMN notification_mode VARCHAR(50) NOT NULL DEFAULT 'GroupAndDirect'
|
||||||
|
CHECK (notification_mode IN ('GroupAndDirect', 'GroupOnly')),
|
||||||
|
ADD COLUMN one_hour_reminder_processed_at TIMESTAMPTZ;
|
||||||
|
|
||||||
|
CREATE INDEX ix_sessions_one_hour_reminders ON sessions (scheduled_at)
|
||||||
|
WHERE status IN ('Confirmed', 'ConfirmationSent')
|
||||||
|
AND one_hour_reminder_processed_at IS NULL;
|
||||||
@@ -1,6 +1,8 @@
|
|||||||
using GmRelay.Bot.Features.Confirmation.HandleRsvp;
|
using GmRelay.Bot.Features.Confirmation.HandleRsvp;
|
||||||
using GmRelay.Bot.Features.Confirmation.SendConfirmation;
|
using GmRelay.Bot.Features.Confirmation.SendConfirmation;
|
||||||
|
using GmRelay.Bot.Features.Notifications;
|
||||||
using GmRelay.Bot.Features.Reminders.SendJoinLink;
|
using GmRelay.Bot.Features.Reminders.SendJoinLink;
|
||||||
|
using GmRelay.Bot.Features.Reminders.SendOneHourReminder;
|
||||||
using GmRelay.Bot.Features.Sessions.CreateSession;
|
using GmRelay.Bot.Features.Sessions.CreateSession;
|
||||||
using GmRelay.Bot.Features.Sessions.RescheduleSession;
|
using GmRelay.Bot.Features.Sessions.RescheduleSession;
|
||||||
using GmRelay.Bot.Infrastructure.Database;
|
using GmRelay.Bot.Infrastructure.Database;
|
||||||
@@ -50,10 +52,13 @@ builder.Services.AddSingleton<ITelegramUpdateSource, TelegramUpdateSource>();
|
|||||||
|
|
||||||
// ── Feature handlers (explicit registration — AOT safe) ──────────────
|
// ── Feature handlers (explicit registration — AOT safe) ──────────────
|
||||||
builder.Services.AddSingleton<SendConfirmationHandler>();
|
builder.Services.AddSingleton<SendConfirmationHandler>();
|
||||||
|
builder.Services.AddSingleton<DirectSessionNotificationSender>();
|
||||||
builder.Services.AddSingleton<HandleRsvpHandler>();
|
builder.Services.AddSingleton<HandleRsvpHandler>();
|
||||||
builder.Services.AddSingleton<SendJoinLinkHandler>();
|
builder.Services.AddSingleton<SendJoinLinkHandler>();
|
||||||
|
builder.Services.AddSingleton<SendOneHourReminderHandler>();
|
||||||
builder.Services.AddSingleton<CreateSessionHandler>();
|
builder.Services.AddSingleton<CreateSessionHandler>();
|
||||||
builder.Services.AddSingleton<JoinSessionHandler>();
|
builder.Services.AddSingleton<JoinSessionHandler>();
|
||||||
|
builder.Services.AddSingleton<LeaveSessionHandler>();
|
||||||
builder.Services.AddSingleton<PromoteWaitlistedPlayerHandler>();
|
builder.Services.AddSingleton<PromoteWaitlistedPlayerHandler>();
|
||||||
builder.Services.AddSingleton<CancelSessionHandler>();
|
builder.Services.AddSingleton<CancelSessionHandler>();
|
||||||
builder.Services.AddSingleton<GmRelay.Bot.Features.Sessions.ListSessions.DeleteSessionHandler>();
|
builder.Services.AddSingleton<GmRelay.Bot.Features.Sessions.ListSessions.DeleteSessionHandler>();
|
||||||
|
|||||||
@@ -23,4 +23,14 @@ public static class SessionCapacityRules
|
|||||||
|
|
||||||
return !maxPlayers.HasValue || activeParticipants < maxPlayers.Value;
|
return !maxPlayers.HasValue || activeParticipants < maxPlayers.Value;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static bool ShouldPromoteAfterParticipantLeaves(
|
||||||
|
string removedRegistrationStatus,
|
||||||
|
int? maxPlayers,
|
||||||
|
int activeParticipantsAfterLeave,
|
||||||
|
int waitlistedParticipants)
|
||||||
|
{
|
||||||
|
return removedRegistrationStatus == ParticipantRegistrationStatus.Active
|
||||||
|
&& CanPromoteWaitlistedPlayer(maxPlayers, activeParticipantsAfterLeave, waitlistedParticipants);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,33 @@
|
|||||||
|
namespace GmRelay.Shared.Domain;
|
||||||
|
|
||||||
|
public enum SessionNotificationMode
|
||||||
|
{
|
||||||
|
GroupAndDirect,
|
||||||
|
GroupOnly
|
||||||
|
}
|
||||||
|
|
||||||
|
public static class SessionNotificationModeExtensions
|
||||||
|
{
|
||||||
|
public const string GroupAndDirectValue = nameof(SessionNotificationMode.GroupAndDirect);
|
||||||
|
public const string GroupOnlyValue = nameof(SessionNotificationMode.GroupOnly);
|
||||||
|
|
||||||
|
public static bool ShouldSendDirectMessages(this SessionNotificationMode mode) =>
|
||||||
|
mode == SessionNotificationMode.GroupAndDirect;
|
||||||
|
|
||||||
|
public static string ToDatabaseValue(this SessionNotificationMode mode) =>
|
||||||
|
mode switch
|
||||||
|
{
|
||||||
|
SessionNotificationMode.GroupAndDirect => GroupAndDirectValue,
|
||||||
|
SessionNotificationMode.GroupOnly => GroupOnlyValue,
|
||||||
|
_ => throw new ArgumentOutOfRangeException(nameof(mode), mode, "Unknown notification mode.")
|
||||||
|
};
|
||||||
|
|
||||||
|
public static SessionNotificationMode FromDatabaseValue(string? value) =>
|
||||||
|
value switch
|
||||||
|
{
|
||||||
|
null or "" => SessionNotificationMode.GroupAndDirect,
|
||||||
|
GroupAndDirectValue => SessionNotificationMode.GroupAndDirect,
|
||||||
|
GroupOnlyValue => SessionNotificationMode.GroupOnly,
|
||||||
|
_ => throw new ArgumentOutOfRangeException(nameof(value), value, "Unknown notification mode.")
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -60,6 +60,11 @@ public static class SessionBatchRenderer
|
|||||||
buttons.Add(new[]
|
buttons.Add(new[]
|
||||||
{
|
{
|
||||||
InlineKeyboardButton.WithCallbackData(GetJoinButtonText(session, sessionPlayers.Count, dateTitle), $"join_session:{session.SessionId}"),
|
InlineKeyboardButton.WithCallbackData(GetJoinButtonText(session, sessionPlayers.Count, dateTitle), $"join_session:{session.SessionId}"),
|
||||||
|
InlineKeyboardButton.WithCallbackData($"🚪 Выйти {dateTitle}", $"leave_session:{session.SessionId}")
|
||||||
|
});
|
||||||
|
|
||||||
|
buttons.Add(new[]
|
||||||
|
{
|
||||||
InlineKeyboardButton.WithCallbackData($"❌ Отменить {dateTitle} (ГМ)", $"cancel_session:{session.SessionId}"),
|
InlineKeyboardButton.WithCallbackData($"❌ Отменить {dateTitle} (ГМ)", $"cancel_session:{session.SessionId}"),
|
||||||
InlineKeyboardButton.WithCallbackData($"⏰ (ГМ)", $"reschedule_session:{session.SessionId}")
|
InlineKeyboardButton.WithCallbackData($"⏰ (ГМ)", $"reschedule_session:{session.SessionId}")
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -47,7 +47,7 @@
|
|||||||
</button>
|
</button>
|
||||||
</form>
|
</form>
|
||||||
|
|
||||||
<div class="nav-version">v1.2.0</div>
|
<div class="nav-version">v1.3.0</div>
|
||||||
</div>
|
</div>
|
||||||
</Authorized>
|
</Authorized>
|
||||||
<NotAuthorized>
|
<NotAuthorized>
|
||||||
|
|||||||
@@ -27,6 +27,13 @@
|
|||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@if (!string.IsNullOrEmpty(successMessage))
|
||||||
|
{
|
||||||
|
<div class="gm-alert gm-alert-success" style="margin-bottom: 1rem;">
|
||||||
|
✅ @successMessage
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
|
||||||
@if (sessions == null)
|
@if (sessions == null)
|
||||||
{
|
{
|
||||||
<div class="glass-card" style="padding: 2rem;">
|
<div class="glass-card" style="padding: 2rem;">
|
||||||
@@ -48,6 +55,72 @@
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
<div class="batch-bulk-grid animate-slide-up">
|
||||||
|
@foreach (var batch in batchModels)
|
||||||
|
{
|
||||||
|
<div class="batch-bulk-card">
|
||||||
|
<div class="batch-bulk-header">
|
||||||
|
<div>
|
||||||
|
<h3>@batch.Title</h3>
|
||||||
|
<p>@FormatBatchSummary(batch)</p>
|
||||||
|
</div>
|
||||||
|
<span class="status-badge status-info">Batch</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<EditForm Model="@batch" OnValidSubmit="@(() => UpdateBatchDetails(batch))">
|
||||||
|
<div class="batch-bulk-fields">
|
||||||
|
<div class="gm-form-group">
|
||||||
|
<label class="gm-form-label">Общее название</label>
|
||||||
|
<InputText @bind-Value="batch.Title" class="gm-form-control" />
|
||||||
|
</div>
|
||||||
|
<div class="gm-form-group">
|
||||||
|
<label class="gm-form-label">Общая ссылка</label>
|
||||||
|
<InputText @bind-Value="batch.JoinLink" class="gm-form-control" />
|
||||||
|
</div>
|
||||||
|
<div class="gm-form-group">
|
||||||
|
<label class="gm-form-label">Уведомления игрокам</label>
|
||||||
|
<select @bind="batch.NotificationMode" class="gm-form-control">
|
||||||
|
<option value="@SessionNotificationModeExtensions.GroupAndDirectValue">В группе и в личку</option>
|
||||||
|
<option value="@SessionNotificationModeExtensions.GroupOnlyValue">Только в группе</option>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<button type="submit" class="btn-gm btn-gm-primary" disabled="@IsBatchBusy(batch)">
|
||||||
|
@(IsBatchBusy(batch) ? "⏳ Обновляем..." : "💾 Обновить batch")
|
||||||
|
</button>
|
||||||
|
</EditForm>
|
||||||
|
|
||||||
|
<div class="batch-bulk-divider"></div>
|
||||||
|
|
||||||
|
<EditForm Model="@batch" OnValidSubmit="@(() => RescheduleBatch(batch))">
|
||||||
|
<div class="batch-bulk-fields">
|
||||||
|
<div class="gm-form-group">
|
||||||
|
<label class="gm-form-label">Первая дата пачки (МСК, UTC+3)</label>
|
||||||
|
<input type="datetime-local" @bind="batch.FirstScheduledAtLocal" class="gm-form-control" />
|
||||||
|
</div>
|
||||||
|
<div class="gm-form-group">
|
||||||
|
<label class="gm-form-label">Шаг между играми, дней</label>
|
||||||
|
<InputNumber @bind-Value="batch.IntervalDays" class="gm-form-control" min="1" />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<button type="submit" class="btn-gm btn-gm-outline" disabled="@IsBatchBusy(batch)">
|
||||||
|
@(IsBatchBusy(batch) ? "⏳ Переносим..." : "📅 Перенести пачку")
|
||||||
|
</button>
|
||||||
|
</EditForm>
|
||||||
|
|
||||||
|
<div class="batch-clone-row">
|
||||||
|
<select @bind="batch.CloneInterval" class="gm-form-control">
|
||||||
|
<option value="week">Следующая неделя</option>
|
||||||
|
<option value="month">Следующий месяц</option>
|
||||||
|
</select>
|
||||||
|
<button type="button" class="btn-gm btn-gm-success" disabled="@IsBatchBusy(batch)" @onclick="() => CloneBatch(batch)">
|
||||||
|
@(IsBatchBusy(batch) ? "⏳ Клонируем..." : "🧬 Клонировать")
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
|
||||||
@* Desktop table *@
|
@* Desktop table *@
|
||||||
<div class="glass-card session-table-desktop animate-slide-up" style="padding: 0; overflow: hidden;">
|
<div class="glass-card session-table-desktop animate-slide-up" style="padding: 0; overflow: hidden;">
|
||||||
<table class="gm-table">
|
<table class="gm-table">
|
||||||
@@ -139,9 +212,12 @@
|
|||||||
@code {
|
@code {
|
||||||
[Parameter] public Guid GroupId { get; set; }
|
[Parameter] public Guid GroupId { get; set; }
|
||||||
private List<WebSession>? sessions;
|
private List<WebSession>? sessions;
|
||||||
|
private List<BatchBulkEditModel> batchModels = [];
|
||||||
private Guid? promotingSessionId;
|
private Guid? promotingSessionId;
|
||||||
|
private Guid? processingBatchId;
|
||||||
private long telegramId;
|
private long telegramId;
|
||||||
private string? errorMessage;
|
private string? errorMessage;
|
||||||
|
private string? successMessage;
|
||||||
|
|
||||||
protected override async Task OnInitializedAsync()
|
protected override async Task OnInitializedAsync()
|
||||||
{
|
{
|
||||||
@@ -152,22 +228,31 @@
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
await LoadSessions();
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task LoadSessions()
|
||||||
|
{
|
||||||
sessions = await SessionService.GetUpcomingSessionsForGmAsync(GroupId, telegramId);
|
sessions = await SessionService.GetUpcomingSessionsForGmAsync(GroupId, telegramId);
|
||||||
if (sessions is null)
|
if (sessions is null)
|
||||||
{
|
{
|
||||||
Navigation.NavigateTo("/access-denied");
|
Navigation.NavigateTo("/access-denied");
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
RebuildBatchModels();
|
||||||
}
|
}
|
||||||
|
|
||||||
private async Task PromoteWaitlisted(Guid sessionId)
|
private async Task PromoteWaitlisted(Guid sessionId)
|
||||||
{
|
{
|
||||||
errorMessage = null;
|
errorMessage = null;
|
||||||
|
successMessage = null;
|
||||||
promotingSessionId = sessionId;
|
promotingSessionId = sessionId;
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
await SessionService.PromoteWaitlistedPlayerForGmAsync(sessionId, telegramId);
|
await SessionService.PromoteWaitlistedPlayerForGmAsync(sessionId, telegramId);
|
||||||
sessions = await SessionService.GetUpcomingSessionsForGmAsync(GroupId, telegramId);
|
await LoadSessions();
|
||||||
}
|
}
|
||||||
catch (SessionAccessDeniedException)
|
catch (SessionAccessDeniedException)
|
||||||
{
|
{
|
||||||
@@ -183,6 +268,153 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private async Task UpdateBatchDetails(BatchBulkEditModel batch)
|
||||||
|
{
|
||||||
|
errorMessage = null;
|
||||||
|
successMessage = null;
|
||||||
|
|
||||||
|
if (!ValidateBatchDetails(batch))
|
||||||
|
{
|
||||||
|
errorMessage = "Название и ссылка для batch не должны быть пустыми.";
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
processingBatchId = batch.BatchId;
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
await SessionService.UpdateBatchDetailsForGmAsync(batch.BatchId, telegramId, batch.Title, batch.JoinLink);
|
||||||
|
await SessionService.UpdateBatchNotificationModeForGmAsync(
|
||||||
|
batch.BatchId,
|
||||||
|
telegramId,
|
||||||
|
SessionNotificationModeExtensions.FromDatabaseValue(batch.NotificationMode));
|
||||||
|
successMessage = "Настройки batch обновлены.";
|
||||||
|
await LoadSessions();
|
||||||
|
}
|
||||||
|
catch (SessionAccessDeniedException)
|
||||||
|
{
|
||||||
|
Navigation.NavigateTo("/access-denied");
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
errorMessage = "Не удалось обновить пачку: " + ex.Message;
|
||||||
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
processingBatchId = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task RescheduleBatch(BatchBulkEditModel batch)
|
||||||
|
{
|
||||||
|
errorMessage = null;
|
||||||
|
successMessage = null;
|
||||||
|
|
||||||
|
if (batch.IntervalDays <= 0)
|
||||||
|
{
|
||||||
|
errorMessage = "Шаг между играми должен быть больше 0 дней.";
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
processingBatchId = batch.BatchId;
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var utcTime = new DateTimeOffset(batch.FirstScheduledAtLocal, TimeSpan.FromHours(3)).ToUniversalTime().UtcDateTime;
|
||||||
|
await SessionService.RescheduleBatchForGmAsync(batch.BatchId, telegramId, utcTime, batch.IntervalDays);
|
||||||
|
successMessage = "Расписание пачки обновлено.";
|
||||||
|
await LoadSessions();
|
||||||
|
}
|
||||||
|
catch (SessionAccessDeniedException)
|
||||||
|
{
|
||||||
|
Navigation.NavigateTo("/access-denied");
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
errorMessage = "Не удалось перенести пачку: " + ex.Message;
|
||||||
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
processingBatchId = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task CloneBatch(BatchBulkEditModel batch)
|
||||||
|
{
|
||||||
|
errorMessage = null;
|
||||||
|
successMessage = null;
|
||||||
|
processingBatchId = batch.BatchId;
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var interval = batch.CloneInterval == "month"
|
||||||
|
? BatchCloneInterval.NextMonth
|
||||||
|
: BatchCloneInterval.NextWeek;
|
||||||
|
|
||||||
|
var clonedBatch = await SessionService.CloneBatchForGmAsync(batch.BatchId, telegramId, interval);
|
||||||
|
successMessage = $"Пачка склонирована: {clonedBatch.SessionCount} игр.";
|
||||||
|
await LoadSessions();
|
||||||
|
}
|
||||||
|
catch (SessionAccessDeniedException)
|
||||||
|
{
|
||||||
|
Navigation.NavigateTo("/access-denied");
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
errorMessage = "Не удалось клонировать пачку: " + ex.Message;
|
||||||
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
processingBatchId = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void RebuildBatchModels()
|
||||||
|
{
|
||||||
|
batchModels = sessions?
|
||||||
|
.GroupBy(session => session.BatchId)
|
||||||
|
.Select(group =>
|
||||||
|
{
|
||||||
|
var orderedSessions = group.OrderBy(session => session.ScheduledAt).ToList();
|
||||||
|
var firstSession = orderedSessions[0];
|
||||||
|
var lastSession = orderedSessions[^1];
|
||||||
|
|
||||||
|
return new BatchBulkEditModel
|
||||||
|
{
|
||||||
|
BatchId = group.Key,
|
||||||
|
Title = firstSession.Title,
|
||||||
|
JoinLink = firstSession.JoinLink,
|
||||||
|
NotificationMode = firstSession.NotificationMode,
|
||||||
|
FirstScheduledAtLocal = firstSession.ScheduledAt.ToMoscow(),
|
||||||
|
LastScheduledAtLocal = lastSession.ScheduledAt.ToMoscow(),
|
||||||
|
IntervalDays = InferIntervalDays(orderedSessions),
|
||||||
|
SessionCount = orderedSessions.Count
|
||||||
|
};
|
||||||
|
})
|
||||||
|
.OrderBy(batch => batch.FirstScheduledAtLocal)
|
||||||
|
.ToList() ?? [];
|
||||||
|
}
|
||||||
|
|
||||||
|
private static bool ValidateBatchDetails(BatchBulkEditModel batch)
|
||||||
|
{
|
||||||
|
batch.Title = batch.Title.Trim();
|
||||||
|
batch.JoinLink = batch.JoinLink.Trim();
|
||||||
|
return batch.Title.Length > 0 && batch.JoinLink.Length > 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
private bool IsBatchBusy(BatchBulkEditModel batch) => processingBatchId == batch.BatchId;
|
||||||
|
|
||||||
|
private static int InferIntervalDays(IReadOnlyList<WebSession> orderedSessions)
|
||||||
|
{
|
||||||
|
if (orderedSessions.Count < 2)
|
||||||
|
{
|
||||||
|
return 7;
|
||||||
|
}
|
||||||
|
|
||||||
|
var days = (orderedSessions[1].ScheduledAt - orderedSessions[0].ScheduledAt).TotalDays;
|
||||||
|
return Math.Max(1, (int)Math.Round(days, MidpointRounding.AwayFromZero));
|
||||||
|
}
|
||||||
|
|
||||||
private static bool CanPromote(WebSession session) =>
|
private static bool CanPromote(WebSession session) =>
|
||||||
session.WaitlistedPlayerCount > 0 &&
|
session.WaitlistedPlayerCount > 0 &&
|
||||||
(!session.MaxPlayers.HasValue || session.ActivePlayerCount < session.MaxPlayers.Value);
|
(!session.MaxPlayers.HasValue || session.ActivePlayerCount < session.MaxPlayers.Value);
|
||||||
@@ -198,6 +430,12 @@
|
|||||||
: seats;
|
: seats;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static string FormatBatchSummary(BatchBulkEditModel batch) =>
|
||||||
|
$"{batch.SessionCount} игр · {FormatLocalMoscow(batch.FirstScheduledAtLocal)} — {FormatLocalMoscow(batch.LastScheduledAtLocal)}";
|
||||||
|
|
||||||
|
private static string FormatLocalMoscow(DateTime localMoscow) =>
|
||||||
|
localMoscow.ToString("d MMMM yyyy, HH:mm", System.Globalization.CultureInfo.GetCultureInfo("ru-RU"));
|
||||||
|
|
||||||
private string GetStatusClass(string status) => status switch
|
private string GetStatusClass(string status) => status switch
|
||||||
{
|
{
|
||||||
SessionStatus.Confirmed => "status-success",
|
SessionStatus.Confirmed => "status-success",
|
||||||
@@ -215,4 +453,17 @@
|
|||||||
SessionStatus.Cancelled => "Отменено",
|
SessionStatus.Cancelled => "Отменено",
|
||||||
_ => status
|
_ => status
|
||||||
};
|
};
|
||||||
|
|
||||||
|
private sealed class BatchBulkEditModel
|
||||||
|
{
|
||||||
|
public Guid BatchId { get; init; }
|
||||||
|
public string Title { get; set; } = "";
|
||||||
|
public string JoinLink { get; set; } = "";
|
||||||
|
public string NotificationMode { get; set; } = SessionNotificationModeExtensions.GroupAndDirectValue;
|
||||||
|
public DateTime FirstScheduledAtLocal { get; set; } = DateTime.Now;
|
||||||
|
public DateTime LastScheduledAtLocal { get; init; } = DateTime.Now;
|
||||||
|
public int IntervalDays { get; set; } = 7;
|
||||||
|
public int SessionCount { get; init; }
|
||||||
|
public string CloneInterval { get; set; } = "week";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
using GmRelay.Shared.Domain;
|
||||||
|
|
||||||
namespace GmRelay.Web.Services;
|
namespace GmRelay.Web.Services;
|
||||||
|
|
||||||
public sealed class AuthorizedSessionService(ISessionStore sessionStore)
|
public sealed class AuthorizedSessionService(ISessionStore sessionStore)
|
||||||
@@ -26,6 +28,17 @@ public sealed class AuthorizedSessionService(ISessionStore sessionStore)
|
|||||||
return await GroupBelongsToGmAsync(session.GroupId, gmId) ? session : null;
|
return await GroupBelongsToGmAsync(session.GroupId, gmId) ? session : null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public async Task<WebSessionBatch?> GetBatchForGmAsync(Guid batchId, long gmId)
|
||||||
|
{
|
||||||
|
var batch = await sessionStore.GetBatchAsync(batchId);
|
||||||
|
if (batch is null)
|
||||||
|
{
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return await GroupBelongsToGmAsync(batch.GroupId, gmId) ? batch : null;
|
||||||
|
}
|
||||||
|
|
||||||
public async Task UpdateSessionForGmAsync(Guid sessionId, long gmId, string title, DateTime scheduledAt, string joinLink, int? maxPlayers)
|
public async Task UpdateSessionForGmAsync(Guid sessionId, long gmId, string title, DateTime scheduledAt, string joinLink, int? maxPlayers)
|
||||||
{
|
{
|
||||||
var session = await GetSessionForGmAsync(sessionId, gmId);
|
var session = await GetSessionForGmAsync(sessionId, gmId);
|
||||||
@@ -48,6 +61,55 @@ public sealed class AuthorizedSessionService(ISessionStore sessionStore)
|
|||||||
await sessionStore.PromoteWaitlistedPlayerAsync(sessionId, session.GroupId);
|
await sessionStore.PromoteWaitlistedPlayerAsync(sessionId, session.GroupId);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public async Task UpdateBatchDetailsForGmAsync(Guid batchId, long gmId, string title, string joinLink)
|
||||||
|
{
|
||||||
|
var batch = await GetBatchForGmAsync(batchId, gmId);
|
||||||
|
if (batch is null)
|
||||||
|
{
|
||||||
|
throw new SessionAccessDeniedException(batchId, gmId);
|
||||||
|
}
|
||||||
|
|
||||||
|
await sessionStore.UpdateBatchDetailsAsync(batchId, batch.GroupId, title.Trim(), joinLink.Trim());
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task UpdateBatchNotificationModeForGmAsync(Guid batchId, long gmId, SessionNotificationMode notificationMode)
|
||||||
|
{
|
||||||
|
var batch = await GetBatchForGmAsync(batchId, gmId);
|
||||||
|
if (batch is null)
|
||||||
|
{
|
||||||
|
throw new SessionAccessDeniedException(batchId, gmId);
|
||||||
|
}
|
||||||
|
|
||||||
|
await sessionStore.UpdateBatchNotificationModeAsync(batchId, batch.GroupId, notificationMode);
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task RescheduleBatchForGmAsync(Guid batchId, long gmId, DateTime firstScheduledAt, int intervalDays)
|
||||||
|
{
|
||||||
|
if (intervalDays <= 0)
|
||||||
|
{
|
||||||
|
throw new ArgumentOutOfRangeException(nameof(intervalDays), intervalDays, "Interval must be greater than zero.");
|
||||||
|
}
|
||||||
|
|
||||||
|
var batch = await GetBatchForGmAsync(batchId, gmId);
|
||||||
|
if (batch is null)
|
||||||
|
{
|
||||||
|
throw new SessionAccessDeniedException(batchId, gmId);
|
||||||
|
}
|
||||||
|
|
||||||
|
await sessionStore.RescheduleBatchAsync(batchId, batch.GroupId, firstScheduledAt, intervalDays);
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<WebSessionBatch> CloneBatchForGmAsync(Guid batchId, long gmId, BatchCloneInterval interval)
|
||||||
|
{
|
||||||
|
var batch = await GetBatchForGmAsync(batchId, gmId);
|
||||||
|
if (batch is null)
|
||||||
|
{
|
||||||
|
throw new SessionAccessDeniedException(batchId, gmId);
|
||||||
|
}
|
||||||
|
|
||||||
|
return await sessionStore.CloneBatchAsync(batchId, batch.GroupId, interval);
|
||||||
|
}
|
||||||
|
|
||||||
private async Task<bool> GroupBelongsToGmAsync(Guid groupId, long gmId)
|
private async Task<bool> GroupBelongsToGmAsync(Guid groupId, long gmId)
|
||||||
{
|
{
|
||||||
var group = await sessionStore.GetGroupAsync(groupId);
|
var group = await sessionStore.GetGroupAsync(groupId);
|
||||||
|
|||||||
@@ -0,0 +1,46 @@
|
|||||||
|
using GmRelay.Shared.Domain;
|
||||||
|
|
||||||
|
namespace GmRelay.Web.Services;
|
||||||
|
|
||||||
|
public enum BatchCloneInterval
|
||||||
|
{
|
||||||
|
NextWeek,
|
||||||
|
NextMonth
|
||||||
|
}
|
||||||
|
|
||||||
|
public sealed record WebSessionBatch(
|
||||||
|
Guid Id,
|
||||||
|
Guid GroupId,
|
||||||
|
string Title,
|
||||||
|
string JoinLink,
|
||||||
|
DateTime FirstScheduledAt,
|
||||||
|
DateTime LastScheduledAt,
|
||||||
|
int SessionCount,
|
||||||
|
string NotificationMode = SessionNotificationModeExtensions.GroupAndDirectValue);
|
||||||
|
|
||||||
|
public static class BatchSchedulePlanner
|
||||||
|
{
|
||||||
|
public static IReadOnlyList<DateTime> BuildFixedIntervalSchedule(
|
||||||
|
IEnumerable<DateTime> currentSchedule,
|
||||||
|
DateTime firstScheduledAt,
|
||||||
|
int intervalDays)
|
||||||
|
{
|
||||||
|
if (intervalDays <= 0)
|
||||||
|
{
|
||||||
|
throw new ArgumentOutOfRangeException(nameof(intervalDays), intervalDays, "Interval must be greater than zero.");
|
||||||
|
}
|
||||||
|
|
||||||
|
return currentSchedule
|
||||||
|
.OrderBy(scheduledAt => scheduledAt)
|
||||||
|
.Select((_, index) => firstScheduledAt.AddDays(intervalDays * index))
|
||||||
|
.ToList();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static DateTime ShiftForClone(DateTime scheduledAt, BatchCloneInterval interval) =>
|
||||||
|
interval switch
|
||||||
|
{
|
||||||
|
BatchCloneInterval.NextWeek => scheduledAt.AddDays(7),
|
||||||
|
BatchCloneInterval.NextMonth => scheduledAt.AddMonths(1),
|
||||||
|
_ => throw new ArgumentOutOfRangeException(nameof(interval), interval, "Unknown clone interval.")
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -1,3 +1,5 @@
|
|||||||
|
using GmRelay.Shared.Domain;
|
||||||
|
|
||||||
namespace GmRelay.Web.Services;
|
namespace GmRelay.Web.Services;
|
||||||
|
|
||||||
public interface ISessionStore
|
public interface ISessionStore
|
||||||
@@ -6,6 +8,11 @@ public interface ISessionStore
|
|||||||
Task<WebGameGroup?> GetGroupAsync(Guid groupId);
|
Task<WebGameGroup?> GetGroupAsync(Guid groupId);
|
||||||
Task<List<WebSession>> GetUpcomingSessionsAsync(Guid groupId);
|
Task<List<WebSession>> GetUpcomingSessionsAsync(Guid groupId);
|
||||||
Task<WebSession?> GetSessionAsync(Guid sessionId);
|
Task<WebSession?> GetSessionAsync(Guid sessionId);
|
||||||
|
Task<WebSessionBatch?> GetBatchAsync(Guid batchId);
|
||||||
Task UpdateSessionAsync(Guid sessionId, Guid groupId, string title, DateTime scheduledAt, string joinLink, int? maxPlayers);
|
Task UpdateSessionAsync(Guid sessionId, Guid groupId, string title, DateTime scheduledAt, string joinLink, int? maxPlayers);
|
||||||
Task PromoteWaitlistedPlayerAsync(Guid sessionId, Guid groupId);
|
Task PromoteWaitlistedPlayerAsync(Guid sessionId, Guid groupId);
|
||||||
|
Task UpdateBatchDetailsAsync(Guid batchId, Guid groupId, string title, string joinLink);
|
||||||
|
Task UpdateBatchNotificationModeAsync(Guid batchId, Guid groupId, SessionNotificationMode notificationMode);
|
||||||
|
Task RescheduleBatchAsync(Guid batchId, Guid groupId, DateTime firstScheduledAt, int intervalDays);
|
||||||
|
Task<WebSessionBatch> CloneBatchAsync(Guid batchId, Guid groupId, BatchCloneInterval interval);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -19,9 +19,33 @@ public sealed record WebSession(
|
|||||||
long TelegramChatId,
|
long TelegramChatId,
|
||||||
int? MaxPlayers,
|
int? MaxPlayers,
|
||||||
int ActivePlayerCount,
|
int ActivePlayerCount,
|
||||||
int WaitlistedPlayerCount);
|
int WaitlistedPlayerCount,
|
||||||
|
string NotificationMode = SessionNotificationModeExtensions.GroupAndDirectValue);
|
||||||
|
|
||||||
internal sealed record WebPromotedParticipantDto(Guid ParticipantRowId, string DisplayName);
|
internal sealed record WebPromotedParticipantDto(Guid ParticipantRowId, string DisplayName);
|
||||||
|
internal sealed record WebDirectNotificationRecipient(long TelegramId, string DisplayName);
|
||||||
|
internal sealed record WebBatchInfo(
|
||||||
|
Guid BatchId,
|
||||||
|
Guid GroupId,
|
||||||
|
string Title,
|
||||||
|
string JoinLink,
|
||||||
|
long TelegramChatId,
|
||||||
|
int? BatchMessageId,
|
||||||
|
int? ThreadId,
|
||||||
|
string NotificationMode);
|
||||||
|
|
||||||
|
internal sealed record WebBatchSessionRow(
|
||||||
|
Guid Id,
|
||||||
|
Guid GroupId,
|
||||||
|
string Title,
|
||||||
|
string JoinLink,
|
||||||
|
DateTime ScheduledAt,
|
||||||
|
string Status,
|
||||||
|
int? MaxPlayers,
|
||||||
|
int? BatchMessageId,
|
||||||
|
long TelegramChatId,
|
||||||
|
int? ThreadId,
|
||||||
|
string NotificationMode);
|
||||||
|
|
||||||
public sealed class SessionService(
|
public sealed class SessionService(
|
||||||
NpgsqlDataSource dataSource,
|
NpgsqlDataSource dataSource,
|
||||||
@@ -53,7 +77,8 @@ public sealed class SessionService(
|
|||||||
g.telegram_chat_id AS TelegramChatId,
|
g.telegram_chat_id AS TelegramChatId,
|
||||||
s.max_players AS MaxPlayers,
|
s.max_players AS MaxPlayers,
|
||||||
COALESCE(active_counts.count, 0)::int AS ActivePlayerCount,
|
COALESCE(active_counts.count, 0)::int AS ActivePlayerCount,
|
||||||
COALESCE(waitlist_counts.count, 0)::int AS WaitlistedPlayerCount
|
COALESCE(waitlist_counts.count, 0)::int AS WaitlistedPlayerCount,
|
||||||
|
s.notification_mode AS NotificationMode
|
||||||
FROM sessions s
|
FROM sessions s
|
||||||
JOIN game_groups g ON g.id = s.group_id
|
JOIN game_groups g ON g.id = s.group_id
|
||||||
LEFT JOIN LATERAL (
|
LEFT JOIN LATERAL (
|
||||||
@@ -89,7 +114,8 @@ public sealed class SessionService(
|
|||||||
g.telegram_chat_id AS TelegramChatId,
|
g.telegram_chat_id AS TelegramChatId,
|
||||||
s.max_players AS MaxPlayers,
|
s.max_players AS MaxPlayers,
|
||||||
COALESCE(active_counts.count, 0)::int AS ActivePlayerCount,
|
COALESCE(active_counts.count, 0)::int AS ActivePlayerCount,
|
||||||
COALESCE(waitlist_counts.count, 0)::int AS WaitlistedPlayerCount
|
COALESCE(waitlist_counts.count, 0)::int AS WaitlistedPlayerCount,
|
||||||
|
s.notification_mode AS NotificationMode
|
||||||
FROM sessions s
|
FROM sessions s
|
||||||
JOIN game_groups g ON g.id = s.group_id
|
JOIN game_groups g ON g.id = s.group_id
|
||||||
LEFT JOIN LATERAL (
|
LEFT JOIN LATERAL (
|
||||||
@@ -115,6 +141,26 @@ public sealed class SessionService(
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public async Task<WebSessionBatch?> GetBatchAsync(Guid batchId)
|
||||||
|
{
|
||||||
|
await using var conn = await dataSource.OpenConnectionAsync();
|
||||||
|
return await conn.QuerySingleOrDefaultAsync<WebSessionBatch>(
|
||||||
|
"""
|
||||||
|
SELECT s.batch_id AS Id,
|
||||||
|
s.group_id AS GroupId,
|
||||||
|
(array_agg(s.title ORDER BY s.scheduled_at))[1] AS Title,
|
||||||
|
(array_agg(s.join_link ORDER BY s.scheduled_at))[1] AS JoinLink,
|
||||||
|
MIN(s.scheduled_at) AS FirstScheduledAt,
|
||||||
|
MAX(s.scheduled_at) AS LastScheduledAt,
|
||||||
|
COUNT(*)::int AS SessionCount,
|
||||||
|
(array_agg(s.notification_mode ORDER BY s.scheduled_at))[1] AS NotificationMode
|
||||||
|
FROM sessions s
|
||||||
|
WHERE s.batch_id = @BatchId
|
||||||
|
GROUP BY s.batch_id, s.group_id
|
||||||
|
""",
|
||||||
|
new { BatchId = batchId });
|
||||||
|
}
|
||||||
|
|
||||||
public async Task UpdateSessionAsync(Guid sessionId, Guid groupId, string title, DateTime scheduledAt, string joinLink, int? maxPlayers)
|
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 conn = await dataSource.OpenConnectionAsync();
|
||||||
@@ -126,7 +172,8 @@ public sealed class SessionService(
|
|||||||
g.telegram_chat_id AS TelegramChatId,
|
g.telegram_chat_id AS TelegramChatId,
|
||||||
s.max_players AS MaxPlayers,
|
s.max_players AS MaxPlayers,
|
||||||
0 AS ActivePlayerCount,
|
0 AS ActivePlayerCount,
|
||||||
0 AS WaitlistedPlayerCount
|
0 AS WaitlistedPlayerCount,
|
||||||
|
s.notification_mode AS NotificationMode
|
||||||
FROM sessions s
|
FROM sessions s
|
||||||
JOIN game_groups g ON g.id = s.group_id
|
JOIN game_groups g ON g.id = s.group_id
|
||||||
WHERE s.id = @Id AND s.group_id = @GroupId",
|
WHERE s.id = @Id AND s.group_id = @GroupId",
|
||||||
@@ -144,6 +191,10 @@ public sealed class SessionService(
|
|||||||
scheduled_at = @ScheduledAt,
|
scheduled_at = @ScheduledAt,
|
||||||
join_link = @JoinLink,
|
join_link = @JoinLink,
|
||||||
max_players = @MaxPlayers,
|
max_players = @MaxPlayers,
|
||||||
|
one_hour_reminder_processed_at = CASE
|
||||||
|
WHEN scheduled_at <> @ScheduledAt THEN NULL
|
||||||
|
ELSE one_hour_reminder_processed_at
|
||||||
|
END,
|
||||||
updated_at = now()
|
updated_at = now()
|
||||||
WHERE id = @Id AND group_id = @GroupId",
|
WHERE id = @Id AND group_id = @GroupId",
|
||||||
new
|
new
|
||||||
@@ -178,6 +229,13 @@ public sealed class SessionService(
|
|||||||
|
|
||||||
await bot.SendMessage(oldSession.TelegramChatId, notification, parseMode: Telegram.Bot.Types.Enums.ParseMode.Html);
|
await bot.SendMessage(oldSession.TelegramChatId, notification, parseMode: Telegram.Bot.Types.Enums.ParseMode.Html);
|
||||||
|
|
||||||
|
var mode = SessionNotificationModeExtensions.FromDatabaseValue(oldSession.NotificationMode);
|
||||||
|
if (mode.ShouldSendDirectMessages())
|
||||||
|
{
|
||||||
|
var recipients = await LoadSessionDirectRecipientsAsync(conn, sessionId);
|
||||||
|
await SendDirectNotificationsAsync(recipients, notification, "web-session-updated", sessionId);
|
||||||
|
}
|
||||||
|
|
||||||
if (oldSession.BatchMessageId.HasValue)
|
if (oldSession.BatchMessageId.HasValue)
|
||||||
{
|
{
|
||||||
await TryUpdateBatchMessageAsync(oldSession.BatchId, oldSession.TelegramChatId, oldSession.BatchMessageId.Value, title);
|
await TryUpdateBatchMessageAsync(oldSession.BatchId, oldSession.TelegramChatId, oldSession.BatchMessageId.Value, title);
|
||||||
@@ -195,7 +253,8 @@ public sealed class SessionService(
|
|||||||
g.telegram_chat_id AS TelegramChatId,
|
g.telegram_chat_id AS TelegramChatId,
|
||||||
s.max_players AS MaxPlayers,
|
s.max_players AS MaxPlayers,
|
||||||
0 AS ActivePlayerCount,
|
0 AS ActivePlayerCount,
|
||||||
0 AS WaitlistedPlayerCount
|
0 AS WaitlistedPlayerCount,
|
||||||
|
s.notification_mode AS NotificationMode
|
||||||
FROM sessions s
|
FROM sessions s
|
||||||
JOIN game_groups g ON g.id = s.group_id
|
JOIN game_groups g ON g.id = s.group_id
|
||||||
WHERE s.id = @SessionId AND s.group_id = @GroupId
|
WHERE s.id = @SessionId AND s.group_id = @GroupId
|
||||||
@@ -282,6 +341,316 @@ public sealed class SessionService(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public async Task UpdateBatchDetailsAsync(Guid batchId, Guid groupId, string title, string joinLink)
|
||||||
|
{
|
||||||
|
await using var conn = await dataSource.OpenConnectionAsync();
|
||||||
|
await using var transaction = await conn.BeginTransactionAsync();
|
||||||
|
|
||||||
|
var batch = await GetBatchInfoAsync(conn, batchId, groupId, transaction);
|
||||||
|
if (batch is null)
|
||||||
|
{
|
||||||
|
throw new SessionAccessDeniedException(batchId, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
var updatedRows = await conn.ExecuteAsync(
|
||||||
|
"""
|
||||||
|
UPDATE sessions
|
||||||
|
SET title = @Title,
|
||||||
|
join_link = @JoinLink,
|
||||||
|
updated_at = now()
|
||||||
|
WHERE batch_id = @BatchId
|
||||||
|
AND group_id = @GroupId
|
||||||
|
""",
|
||||||
|
new
|
||||||
|
{
|
||||||
|
BatchId = batchId,
|
||||||
|
GroupId = groupId,
|
||||||
|
Title = title,
|
||||||
|
JoinLink = joinLink
|
||||||
|
},
|
||||||
|
transaction);
|
||||||
|
|
||||||
|
if (updatedRows == 0)
|
||||||
|
{
|
||||||
|
throw new SessionAccessDeniedException(batchId, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
await transaction.CommitAsync();
|
||||||
|
|
||||||
|
if (batch.BatchMessageId.HasValue)
|
||||||
|
{
|
||||||
|
await TryUpdateBatchMessageAsync(batchId, batch.TelegramChatId, batch.BatchMessageId.Value, title);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task UpdateBatchNotificationModeAsync(Guid batchId, Guid groupId, SessionNotificationMode notificationMode)
|
||||||
|
{
|
||||||
|
await using var conn = await dataSource.OpenConnectionAsync();
|
||||||
|
await using var transaction = await conn.BeginTransactionAsync();
|
||||||
|
|
||||||
|
var batch = await GetBatchInfoAsync(conn, batchId, groupId, transaction);
|
||||||
|
if (batch is null)
|
||||||
|
{
|
||||||
|
throw new SessionAccessDeniedException(batchId, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
var updatedRows = await conn.ExecuteAsync(
|
||||||
|
"""
|
||||||
|
UPDATE sessions
|
||||||
|
SET notification_mode = @NotificationMode,
|
||||||
|
updated_at = now()
|
||||||
|
WHERE batch_id = @BatchId
|
||||||
|
AND group_id = @GroupId
|
||||||
|
""",
|
||||||
|
new
|
||||||
|
{
|
||||||
|
BatchId = batchId,
|
||||||
|
GroupId = groupId,
|
||||||
|
NotificationMode = notificationMode.ToDatabaseValue()
|
||||||
|
},
|
||||||
|
transaction);
|
||||||
|
|
||||||
|
if (updatedRows == 0)
|
||||||
|
{
|
||||||
|
throw new SessionAccessDeniedException(batchId, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
await transaction.CommitAsync();
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task RescheduleBatchAsync(Guid batchId, Guid groupId, DateTime firstScheduledAt, int intervalDays)
|
||||||
|
{
|
||||||
|
await using var conn = await dataSource.OpenConnectionAsync();
|
||||||
|
await using var transaction = await conn.BeginTransactionAsync();
|
||||||
|
|
||||||
|
var batchSessions = (await conn.QueryAsync<WebBatchSessionRow>(
|
||||||
|
"""
|
||||||
|
SELECT s.id AS Id,
|
||||||
|
s.group_id AS GroupId,
|
||||||
|
s.title AS Title,
|
||||||
|
s.join_link AS JoinLink,
|
||||||
|
s.scheduled_at AS ScheduledAt,
|
||||||
|
s.status AS Status,
|
||||||
|
s.max_players AS MaxPlayers,
|
||||||
|
s.batch_message_id AS BatchMessageId,
|
||||||
|
g.telegram_chat_id AS TelegramChatId,
|
||||||
|
s.thread_id AS ThreadId,
|
||||||
|
s.notification_mode AS NotificationMode
|
||||||
|
FROM sessions s
|
||||||
|
JOIN game_groups g ON g.id = s.group_id
|
||||||
|
WHERE s.batch_id = @BatchId
|
||||||
|
AND s.group_id = @GroupId
|
||||||
|
ORDER BY s.scheduled_at
|
||||||
|
FOR UPDATE
|
||||||
|
""",
|
||||||
|
new { BatchId = batchId, GroupId = groupId },
|
||||||
|
transaction)).ToList();
|
||||||
|
|
||||||
|
if (batchSessions.Count == 0)
|
||||||
|
{
|
||||||
|
throw new SessionAccessDeniedException(batchId, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
var newSchedule = BatchSchedulePlanner.BuildFixedIntervalSchedule(
|
||||||
|
batchSessions.Select(session => session.ScheduledAt),
|
||||||
|
firstScheduledAt,
|
||||||
|
intervalDays);
|
||||||
|
|
||||||
|
for (var index = 0; index < batchSessions.Count; index++)
|
||||||
|
{
|
||||||
|
await conn.ExecuteAsync(
|
||||||
|
"""
|
||||||
|
UPDATE sessions
|
||||||
|
SET scheduled_at = @ScheduledAt,
|
||||||
|
one_hour_reminder_processed_at = NULL,
|
||||||
|
updated_at = now()
|
||||||
|
WHERE id = @SessionId
|
||||||
|
""",
|
||||||
|
new
|
||||||
|
{
|
||||||
|
SessionId = batchSessions[index].Id,
|
||||||
|
ScheduledAt = newSchedule[index]
|
||||||
|
},
|
||||||
|
transaction);
|
||||||
|
}
|
||||||
|
|
||||||
|
await transaction.CommitAsync();
|
||||||
|
|
||||||
|
var firstSession = batchSessions[0];
|
||||||
|
if (firstSession.BatchMessageId.HasValue)
|
||||||
|
{
|
||||||
|
await TryUpdateBatchMessageAsync(batchId, firstSession.TelegramChatId, firstSession.BatchMessageId.Value, firstSession.Title);
|
||||||
|
}
|
||||||
|
|
||||||
|
var notification = $"🔄 <b>Мастер обновил расписание пачки</b>\n\n" +
|
||||||
|
$"📌 <b>{System.Net.WebUtility.HtmlEncode(firstSession.Title)}</b>\n" +
|
||||||
|
$"🗓 Новое начало: <b>{firstScheduledAt.FormatMoscow()}</b> (МСК)\n" +
|
||||||
|
$"↔️ Шаг: <b>{intervalDays} дн.</b>";
|
||||||
|
|
||||||
|
await bot.SendMessage(firstSession.TelegramChatId, notification, parseMode: Telegram.Bot.Types.Enums.ParseMode.Html);
|
||||||
|
|
||||||
|
var mode = SessionNotificationModeExtensions.FromDatabaseValue(firstSession.NotificationMode);
|
||||||
|
if (mode.ShouldSendDirectMessages())
|
||||||
|
{
|
||||||
|
var recipients = await LoadBatchDirectRecipientsAsync(conn, batchId);
|
||||||
|
await SendDirectNotificationsAsync(recipients, notification, "web-batch-rescheduled", batchId);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<WebSessionBatch> CloneBatchAsync(Guid batchId, Guid groupId, BatchCloneInterval interval)
|
||||||
|
{
|
||||||
|
await using var conn = await dataSource.OpenConnectionAsync();
|
||||||
|
await using var transaction = await conn.BeginTransactionAsync();
|
||||||
|
|
||||||
|
var sourceSessions = (await conn.QueryAsync<WebBatchSessionRow>(
|
||||||
|
"""
|
||||||
|
SELECT s.id AS Id,
|
||||||
|
s.group_id AS GroupId,
|
||||||
|
s.title AS Title,
|
||||||
|
s.join_link AS JoinLink,
|
||||||
|
s.scheduled_at AS ScheduledAt,
|
||||||
|
s.status AS Status,
|
||||||
|
s.max_players AS MaxPlayers,
|
||||||
|
s.batch_message_id AS BatchMessageId,
|
||||||
|
g.telegram_chat_id AS TelegramChatId,
|
||||||
|
s.thread_id AS ThreadId,
|
||||||
|
s.notification_mode AS NotificationMode
|
||||||
|
FROM sessions s
|
||||||
|
JOIN game_groups g ON g.id = s.group_id
|
||||||
|
WHERE s.batch_id = @BatchId
|
||||||
|
AND s.group_id = @GroupId
|
||||||
|
ORDER BY s.scheduled_at
|
||||||
|
FOR UPDATE
|
||||||
|
""",
|
||||||
|
new { BatchId = batchId, GroupId = groupId },
|
||||||
|
transaction)).ToList();
|
||||||
|
|
||||||
|
if (sourceSessions.Count == 0)
|
||||||
|
{
|
||||||
|
throw new SessionAccessDeniedException(batchId, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
var newBatchId = Guid.NewGuid();
|
||||||
|
var batchTitle = sourceSessions[0].Title;
|
||||||
|
var batchJoinLink = sourceSessions[0].JoinLink;
|
||||||
|
var chatId = sourceSessions[0].TelegramChatId;
|
||||||
|
var threadId = sourceSessions[0].ThreadId;
|
||||||
|
var renderedSessions = new List<SessionBatchDto>();
|
||||||
|
|
||||||
|
foreach (var sourceSession in sourceSessions)
|
||||||
|
{
|
||||||
|
var scheduledAt = BatchSchedulePlanner.ShiftForClone(sourceSession.ScheduledAt, interval);
|
||||||
|
var sessionId = await conn.ExecuteScalarAsync<Guid>(
|
||||||
|
"""
|
||||||
|
INSERT INTO sessions (batch_id, group_id, title, join_link, scheduled_at, status, thread_id, max_players, notification_mode)
|
||||||
|
VALUES (@BatchId, @GroupId, @Title, @JoinLink, @ScheduledAt, @Status, @ThreadId, @MaxPlayers, @NotificationMode)
|
||||||
|
RETURNING id
|
||||||
|
""",
|
||||||
|
new
|
||||||
|
{
|
||||||
|
BatchId = newBatchId,
|
||||||
|
sourceSession.GroupId,
|
||||||
|
Title = batchTitle,
|
||||||
|
JoinLink = batchJoinLink,
|
||||||
|
ScheduledAt = scheduledAt,
|
||||||
|
Status = SessionStatus.Planned,
|
||||||
|
ThreadId = threadId,
|
||||||
|
sourceSession.MaxPlayers,
|
||||||
|
sourceSession.NotificationMode
|
||||||
|
},
|
||||||
|
transaction);
|
||||||
|
|
||||||
|
renderedSessions.Add(new SessionBatchDto(sessionId, scheduledAt, SessionStatus.Planned, sourceSession.MaxPlayers));
|
||||||
|
}
|
||||||
|
|
||||||
|
await transaction.CommitAsync();
|
||||||
|
|
||||||
|
var renderResult = SessionBatchRenderer.Render(batchTitle, renderedSessions, Array.Empty<ParticipantBatchDto>());
|
||||||
|
var batchMessage = await bot.SendMessage(
|
||||||
|
chatId: chatId,
|
||||||
|
messageThreadId: threadId,
|
||||||
|
text: renderResult.Text,
|
||||||
|
parseMode: Telegram.Bot.Types.Enums.ParseMode.Html,
|
||||||
|
replyMarkup: renderResult.Markup);
|
||||||
|
|
||||||
|
await conn.ExecuteAsync(
|
||||||
|
"UPDATE sessions SET batch_message_id = @MessageId WHERE batch_id = @BatchId",
|
||||||
|
new { MessageId = batchMessage.MessageId, BatchId = newBatchId });
|
||||||
|
|
||||||
|
return new WebSessionBatch(
|
||||||
|
newBatchId,
|
||||||
|
groupId,
|
||||||
|
batchTitle,
|
||||||
|
batchJoinLink,
|
||||||
|
renderedSessions.Min(session => session.ScheduledAt),
|
||||||
|
renderedSessions.Max(session => session.ScheduledAt),
|
||||||
|
renderedSessions.Count,
|
||||||
|
sourceSessions[0].NotificationMode);
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task<List<WebDirectNotificationRecipient>> LoadSessionDirectRecipientsAsync(
|
||||||
|
Npgsql.NpgsqlConnection conn,
|
||||||
|
Guid sessionId)
|
||||||
|
{
|
||||||
|
return (await conn.QueryAsync<WebDirectNotificationRecipient>(
|
||||||
|
"""
|
||||||
|
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 })).ToList();
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task<List<WebDirectNotificationRecipient>> LoadBatchDirectRecipientsAsync(
|
||||||
|
Npgsql.NpgsqlConnection conn,
|
||||||
|
Guid batchId)
|
||||||
|
{
|
||||||
|
return (await conn.QueryAsync<WebDirectNotificationRecipient>(
|
||||||
|
"""
|
||||||
|
SELECT DISTINCT p.telegram_id AS TelegramId,
|
||||||
|
p.display_name AS DisplayName
|
||||||
|
FROM session_participants sp
|
||||||
|
JOIN players p ON p.id = sp.player_id
|
||||||
|
JOIN sessions s ON s.id = sp.session_id
|
||||||
|
WHERE s.batch_id = @BatchId
|
||||||
|
AND sp.is_gm = false
|
||||||
|
AND sp.registration_status = @Active
|
||||||
|
""",
|
||||||
|
new { BatchId = batchId, Active = ParticipantRegistrationStatus.Active })).ToList();
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task SendDirectNotificationsAsync(
|
||||||
|
IEnumerable<WebDirectNotificationRecipient> recipients,
|
||||||
|
string htmlText,
|
||||||
|
string notificationKind,
|
||||||
|
Guid entityId)
|
||||||
|
{
|
||||||
|
foreach (var recipient in recipients)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
await bot.SendMessage(
|
||||||
|
chatId: recipient.TelegramId,
|
||||||
|
text: htmlText,
|
||||||
|
parseMode: Telegram.Bot.Types.Enums.ParseMode.Html);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.LogWarning(
|
||||||
|
ex,
|
||||||
|
"Failed to send {NotificationKind} DM for entity {EntityId} to player {TelegramId} ({DisplayName})",
|
||||||
|
notificationKind,
|
||||||
|
entityId,
|
||||||
|
recipient.TelegramId,
|
||||||
|
recipient.DisplayName);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private async Task TryUpdateBatchMessageAsync(Guid batchId, long chatId, int messageId, string title)
|
private async Task TryUpdateBatchMessageAsync(Guid batchId, long chatId, int messageId, string title)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
@@ -318,4 +687,30 @@ public sealed class SessionService(
|
|||||||
logger.LogWarning(ex, "Failed to update batch message {MessageId} in chat {ChatId}", messageId, chatId);
|
logger.LogWarning(ex, "Failed to update batch message {MessageId} in chat {ChatId}", messageId, chatId);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static async Task<WebBatchInfo?> GetBatchInfoAsync(
|
||||||
|
Npgsql.NpgsqlConnection conn,
|
||||||
|
Guid batchId,
|
||||||
|
Guid groupId,
|
||||||
|
Npgsql.NpgsqlTransaction transaction)
|
||||||
|
{
|
||||||
|
return await conn.QuerySingleOrDefaultAsync<WebBatchInfo>(
|
||||||
|
"""
|
||||||
|
SELECT s.batch_id AS BatchId,
|
||||||
|
s.group_id AS GroupId,
|
||||||
|
(array_agg(s.title ORDER BY s.scheduled_at))[1] AS Title,
|
||||||
|
(array_agg(s.join_link ORDER BY s.scheduled_at))[1] AS JoinLink,
|
||||||
|
g.telegram_chat_id AS TelegramChatId,
|
||||||
|
(array_agg(s.batch_message_id ORDER BY s.scheduled_at))[1] AS BatchMessageId,
|
||||||
|
(array_agg(s.thread_id ORDER BY s.scheduled_at))[1] AS ThreadId,
|
||||||
|
(array_agg(s.notification_mode ORDER BY s.scheduled_at))[1] AS NotificationMode
|
||||||
|
FROM sessions s
|
||||||
|
JOIN game_groups g ON g.id = s.group_id
|
||||||
|
WHERE s.batch_id = @BatchId
|
||||||
|
AND s.group_id = @GroupId
|
||||||
|
GROUP BY s.batch_id, s.group_id, g.telegram_chat_id
|
||||||
|
""",
|
||||||
|
new { BatchId = batchId, GroupId = groupId },
|
||||||
|
transaction);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/* ============================================
|
/* ============================================
|
||||||
GM-Relay Design System v1.2.0
|
GM-Relay Design System v1.5.0
|
||||||
Dark RPG Dashboard Theme
|
Dark RPG Dashboard Theme
|
||||||
============================================ */
|
============================================ */
|
||||||
|
|
||||||
@@ -363,6 +363,11 @@ input[type="datetime-local"]::-webkit-calendar-picker-indicator {
|
|||||||
filter: invert(0.7);
|
filter: invert(0.7);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
select option {
|
||||||
|
background: var(--bg-secondary);
|
||||||
|
color: var(--text-primary);
|
||||||
|
}
|
||||||
|
|
||||||
/* === Tables === */
|
/* === Tables === */
|
||||||
.gm-table {
|
.gm-table {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
@@ -553,6 +558,66 @@ input[type="datetime-local"]::-webkit-calendar-picker-indicator {
|
|||||||
gap: 1rem;
|
gap: 1rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* === Batch bulk operations === */
|
||||||
|
.batch-bulk-grid {
|
||||||
|
display: grid;
|
||||||
|
gap: 1rem;
|
||||||
|
margin-bottom: 1.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.batch-bulk-card {
|
||||||
|
background: var(--glass-bg);
|
||||||
|
backdrop-filter: blur(var(--glass-blur));
|
||||||
|
-webkit-backdrop-filter: blur(var(--glass-blur));
|
||||||
|
border: 1px solid var(--glass-border);
|
||||||
|
border-radius: var(--radius-md);
|
||||||
|
padding: 1.25rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.batch-bulk-header {
|
||||||
|
display: flex;
|
||||||
|
justify-content: space-between;
|
||||||
|
gap: 1rem;
|
||||||
|
align-items: flex-start;
|
||||||
|
margin-bottom: 1rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.batch-bulk-header h3 {
|
||||||
|
font-size: 1rem;
|
||||||
|
margin-bottom: 0.25rem;
|
||||||
|
overflow-wrap: anywhere;
|
||||||
|
}
|
||||||
|
|
||||||
|
.batch-bulk-header p {
|
||||||
|
margin: 0;
|
||||||
|
color: var(--text-muted);
|
||||||
|
font-size: 0.8125rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.batch-bulk-fields {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: repeat(2, minmax(0, 1fr));
|
||||||
|
gap: 0.75rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.batch-bulk-divider {
|
||||||
|
height: 1px;
|
||||||
|
background: var(--border-color);
|
||||||
|
margin: 1rem 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.batch-clone-row {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: minmax(0, 1fr) auto;
|
||||||
|
gap: 0.75rem;
|
||||||
|
align-items: center;
|
||||||
|
margin-top: 1rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.batch-clone-row .btn-gm {
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
|
||||||
/* === Animations === */
|
/* === Animations === */
|
||||||
@keyframes fadeIn {
|
@keyframes fadeIn {
|
||||||
from { opacity: 0; transform: translateY(8px); }
|
from { opacity: 0; transform: translateY(8px); }
|
||||||
@@ -772,6 +837,16 @@ input[type="datetime-local"]::-webkit-calendar-picker-indicator {
|
|||||||
grid-template-columns: 1fr;
|
grid-template-columns: 1fr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.batch-bulk-fields,
|
||||||
|
.batch-clone-row {
|
||||||
|
grid-template-columns: 1fr;
|
||||||
|
}
|
||||||
|
|
||||||
|
.batch-clone-row .btn-gm {
|
||||||
|
justify-content: center;
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
.page-container {
|
.page-container {
|
||||||
padding: 1rem;
|
padding: 1rem;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,16 @@
|
|||||||
|
using GmRelay.Shared.Domain;
|
||||||
|
|
||||||
|
namespace GmRelay.Bot.Tests.Domain;
|
||||||
|
|
||||||
|
public sealed class SessionNotificationModeTests
|
||||||
|
{
|
||||||
|
[Theory]
|
||||||
|
[InlineData(SessionNotificationMode.GroupAndDirect, true)]
|
||||||
|
[InlineData(SessionNotificationMode.GroupOnly, false)]
|
||||||
|
public void ShouldSendDirectMessages_ReturnsExpectedDecision(
|
||||||
|
SessionNotificationMode mode,
|
||||||
|
bool expected)
|
||||||
|
{
|
||||||
|
Assert.Equal(expected, mode.ShouldSendDirectMessages());
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -28,4 +28,26 @@ public sealed class SessionCapacityRulesTests
|
|||||||
Assert.False(SessionCapacityRules.CanPromoteWaitlistedPlayer(maxPlayers: 3, activeParticipants: 3, waitlistedParticipants: 1));
|
Assert.False(SessionCapacityRules.CanPromoteWaitlistedPlayer(maxPlayers: 3, activeParticipants: 3, waitlistedParticipants: 1));
|
||||||
Assert.False(SessionCapacityRules.CanPromoteWaitlistedPlayer(maxPlayers: 3, activeParticipants: 2, waitlistedParticipants: 0));
|
Assert.False(SessionCapacityRules.CanPromoteWaitlistedPlayer(maxPlayers: 3, activeParticipants: 2, waitlistedParticipants: 0));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void ShouldPromoteAfterParticipantLeaves_ShouldOnlyPromoteAfterActiveParticipantLeaves()
|
||||||
|
{
|
||||||
|
Assert.True(SessionCapacityRules.ShouldPromoteAfterParticipantLeaves(
|
||||||
|
removedRegistrationStatus: ParticipantRegistrationStatus.Active,
|
||||||
|
maxPlayers: 2,
|
||||||
|
activeParticipantsAfterLeave: 1,
|
||||||
|
waitlistedParticipants: 1));
|
||||||
|
|
||||||
|
Assert.False(SessionCapacityRules.ShouldPromoteAfterParticipantLeaves(
|
||||||
|
removedRegistrationStatus: ParticipantRegistrationStatus.Waitlisted,
|
||||||
|
maxPlayers: 2,
|
||||||
|
activeParticipantsAfterLeave: 1,
|
||||||
|
waitlistedParticipants: 1));
|
||||||
|
|
||||||
|
Assert.False(SessionCapacityRules.ShouldPromoteAfterParticipantLeaves(
|
||||||
|
removedRegistrationStatus: ParticipantRegistrationStatus.Active,
|
||||||
|
maxPlayers: 2,
|
||||||
|
activeParticipantsAfterLeave: 1,
|
||||||
|
waitlistedParticipants: 0));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -42,13 +42,15 @@ public sealed class SessionBatchRendererTests
|
|||||||
Assert.Contains("Лист ожидания (1)", text);
|
Assert.Contains("Лист ожидания (1)", text);
|
||||||
Assert.Contains("Charlie", text);
|
Assert.Contains("Charlie", text);
|
||||||
Assert.Contains("Bob", text);
|
Assert.Contains("Bob", text);
|
||||||
Assert.Equal(2, result.Markup.InlineKeyboard.Count());
|
Assert.Equal(4, result.Markup.InlineKeyboard.Count());
|
||||||
Assert.Collection(
|
Assert.Collection(
|
||||||
buttons.Select(button => button.CallbackData),
|
buttons.Select(button => button.CallbackData),
|
||||||
callbackData => Assert.Equal($"join_session:{firstSessionId}", callbackData),
|
callbackData => Assert.Equal($"join_session:{firstSessionId}", callbackData),
|
||||||
|
callbackData => Assert.Equal($"leave_session:{firstSessionId}", callbackData),
|
||||||
callbackData => Assert.Equal($"cancel_session:{firstSessionId}", callbackData),
|
callbackData => Assert.Equal($"cancel_session:{firstSessionId}", callbackData),
|
||||||
callbackData => Assert.Equal($"reschedule_session:{firstSessionId}", callbackData),
|
callbackData => Assert.Equal($"reschedule_session:{firstSessionId}", callbackData),
|
||||||
callbackData => Assert.Equal($"join_session:{secondSessionId}", callbackData),
|
callbackData => Assert.Equal($"join_session:{secondSessionId}", callbackData),
|
||||||
|
callbackData => Assert.Equal($"leave_session:{secondSessionId}", callbackData),
|
||||||
callbackData => Assert.Equal($"cancel_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));
|
callbackData => Assert.Equal($"promote_waitlist:{secondSessionId}", callbackData));
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
using GmRelay.Web.Services;
|
using GmRelay.Web.Services;
|
||||||
|
using GmRelay.Shared.Domain;
|
||||||
|
|
||||||
namespace GmRelay.Bot.Tests.Web;
|
namespace GmRelay.Bot.Tests.Web;
|
||||||
|
|
||||||
@@ -162,6 +163,176 @@ public sealed class AuthorizedSessionServiceTests
|
|||||||
Assert.Equal(sessionId, store.LastPromotedSessionId);
|
Assert.Equal(sessionId, store.LastPromotedSessionId);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public async Task UpdateBatchDetailsForGmAsync_Throws_WhenBatchBelongsToAnotherGm()
|
||||||
|
{
|
||||||
|
var batchId = Guid.NewGuid();
|
||||||
|
var groupId = Guid.NewGuid();
|
||||||
|
var store = new FakeSessionStore(
|
||||||
|
groups:
|
||||||
|
[
|
||||||
|
new(groupId, 42, "Alpha", 2002L)
|
||||||
|
],
|
||||||
|
sessions:
|
||||||
|
[
|
||||||
|
new(Guid.NewGuid(), groupId, "Session A", DateTime.UtcNow, "Planned", "https://example.test/a", batchId, 10, 42, 4, 1, 0)
|
||||||
|
]);
|
||||||
|
var service = new AuthorizedSessionService(store);
|
||||||
|
|
||||||
|
var action = () => service.UpdateBatchDetailsForGmAsync(batchId, 1001L, "Updated", "https://example.test/b");
|
||||||
|
|
||||||
|
await Assert.ThrowsAsync<SessionAccessDeniedException>(action);
|
||||||
|
Assert.False(store.UpdateBatchDetailsCalled);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public async Task UpdateBatchDetailsForGmAsync_UpdatesOwnedBatch()
|
||||||
|
{
|
||||||
|
var gmId = 1001L;
|
||||||
|
var groupId = Guid.NewGuid();
|
||||||
|
var batchId = Guid.NewGuid();
|
||||||
|
var store = new FakeSessionStore(
|
||||||
|
groups:
|
||||||
|
[
|
||||||
|
new(groupId, 42, "Alpha", gmId)
|
||||||
|
],
|
||||||
|
sessions:
|
||||||
|
[
|
||||||
|
new(Guid.NewGuid(), groupId, "Session A", DateTime.UtcNow, "Planned", "https://example.test/a", batchId, 10, 42, 4, 1, 0)
|
||||||
|
]);
|
||||||
|
var service = new AuthorizedSessionService(store);
|
||||||
|
|
||||||
|
await service.UpdateBatchDetailsForGmAsync(batchId, gmId, "Updated", "https://example.test/b");
|
||||||
|
|
||||||
|
Assert.True(store.UpdateBatchDetailsCalled);
|
||||||
|
Assert.Equal(batchId, store.LastUpdatedBatchId);
|
||||||
|
Assert.Equal(groupId, store.LastUpdatedBatchGroupId);
|
||||||
|
Assert.Equal("Updated", store.LastUpdatedBatchTitle);
|
||||||
|
Assert.Equal("https://example.test/b", store.LastUpdatedBatchJoinLink);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public async Task UpdateBatchNotificationModeForGmAsync_Throws_WhenBatchBelongsToAnotherGm()
|
||||||
|
{
|
||||||
|
var batchId = Guid.NewGuid();
|
||||||
|
var groupId = Guid.NewGuid();
|
||||||
|
var store = new FakeSessionStore(
|
||||||
|
groups:
|
||||||
|
[
|
||||||
|
new(groupId, 42, "Alpha", 2002L)
|
||||||
|
],
|
||||||
|
sessions:
|
||||||
|
[
|
||||||
|
new(Guid.NewGuid(), groupId, "Session A", DateTime.UtcNow, "Planned", "https://example.test/a", batchId, 10, 42, 4, 1, 0)
|
||||||
|
]);
|
||||||
|
var service = new AuthorizedSessionService(store);
|
||||||
|
|
||||||
|
var action = () => service.UpdateBatchNotificationModeForGmAsync(batchId, 1001L, SessionNotificationMode.GroupOnly);
|
||||||
|
|
||||||
|
await Assert.ThrowsAsync<SessionAccessDeniedException>(action);
|
||||||
|
Assert.False(store.UpdateBatchNotificationModeCalled);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public async Task UpdateBatchNotificationModeForGmAsync_UpdatesOwnedBatch()
|
||||||
|
{
|
||||||
|
var gmId = 1001L;
|
||||||
|
var groupId = Guid.NewGuid();
|
||||||
|
var batchId = Guid.NewGuid();
|
||||||
|
var store = new FakeSessionStore(
|
||||||
|
groups:
|
||||||
|
[
|
||||||
|
new(groupId, 42, "Alpha", gmId)
|
||||||
|
],
|
||||||
|
sessions:
|
||||||
|
[
|
||||||
|
new(Guid.NewGuid(), groupId, "Session A", DateTime.UtcNow, "Planned", "https://example.test/a", batchId, 10, 42, 4, 1, 0)
|
||||||
|
]);
|
||||||
|
var service = new AuthorizedSessionService(store);
|
||||||
|
|
||||||
|
await service.UpdateBatchNotificationModeForGmAsync(batchId, gmId, SessionNotificationMode.GroupOnly);
|
||||||
|
|
||||||
|
Assert.True(store.UpdateBatchNotificationModeCalled);
|
||||||
|
Assert.Equal(batchId, store.LastUpdatedNotificationBatchId);
|
||||||
|
Assert.Equal(groupId, store.LastUpdatedNotificationGroupId);
|
||||||
|
Assert.Equal(SessionNotificationMode.GroupOnly, store.LastUpdatedNotificationMode);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public async Task RescheduleBatchForGmAsync_RejectsNonPositiveInterval()
|
||||||
|
{
|
||||||
|
var gmId = 1001L;
|
||||||
|
var groupId = Guid.NewGuid();
|
||||||
|
var batchId = Guid.NewGuid();
|
||||||
|
var store = new FakeSessionStore(
|
||||||
|
groups:
|
||||||
|
[
|
||||||
|
new(groupId, 42, "Alpha", gmId)
|
||||||
|
],
|
||||||
|
sessions:
|
||||||
|
[
|
||||||
|
new(Guid.NewGuid(), groupId, "Session A", DateTime.UtcNow, "Planned", "https://example.test/a", batchId, 10, 42, 4, 1, 0)
|
||||||
|
]);
|
||||||
|
var service = new AuthorizedSessionService(store);
|
||||||
|
|
||||||
|
var action = () => service.RescheduleBatchForGmAsync(batchId, gmId, DateTime.UtcNow.AddDays(7), intervalDays: 0);
|
||||||
|
|
||||||
|
await Assert.ThrowsAsync<ArgumentOutOfRangeException>(action);
|
||||||
|
Assert.False(store.RescheduleBatchCalled);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public async Task RescheduleBatchForGmAsync_ReschedulesOwnedBatch()
|
||||||
|
{
|
||||||
|
var gmId = 1001L;
|
||||||
|
var groupId = Guid.NewGuid();
|
||||||
|
var batchId = Guid.NewGuid();
|
||||||
|
var firstScheduledAt = DateTime.UtcNow.AddDays(7);
|
||||||
|
var store = new FakeSessionStore(
|
||||||
|
groups:
|
||||||
|
[
|
||||||
|
new(groupId, 42, "Alpha", gmId)
|
||||||
|
],
|
||||||
|
sessions:
|
||||||
|
[
|
||||||
|
new(Guid.NewGuid(), groupId, "Session A", DateTime.UtcNow, "Planned", "https://example.test/a", batchId, 10, 42, 4, 1, 0)
|
||||||
|
]);
|
||||||
|
var service = new AuthorizedSessionService(store);
|
||||||
|
|
||||||
|
await service.RescheduleBatchForGmAsync(batchId, gmId, firstScheduledAt, intervalDays: 14);
|
||||||
|
|
||||||
|
Assert.True(store.RescheduleBatchCalled);
|
||||||
|
Assert.Equal(batchId, store.LastRescheduledBatchId);
|
||||||
|
Assert.Equal(groupId, store.LastRescheduledBatchGroupId);
|
||||||
|
Assert.Equal(firstScheduledAt, store.LastRescheduledFirstScheduledAt);
|
||||||
|
Assert.Equal(14, store.LastRescheduledIntervalDays);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public async Task CloneBatchForGmAsync_ClonesOwnedBatch()
|
||||||
|
{
|
||||||
|
var gmId = 1001L;
|
||||||
|
var groupId = Guid.NewGuid();
|
||||||
|
var batchId = Guid.NewGuid();
|
||||||
|
var store = new FakeSessionStore(
|
||||||
|
groups:
|
||||||
|
[
|
||||||
|
new(groupId, 42, "Alpha", gmId)
|
||||||
|
],
|
||||||
|
sessions:
|
||||||
|
[
|
||||||
|
new(Guid.NewGuid(), groupId, "Session A", DateTime.UtcNow, "Planned", "https://example.test/a", batchId, 10, 42, 4, 1, 0)
|
||||||
|
]);
|
||||||
|
var service = new AuthorizedSessionService(store);
|
||||||
|
|
||||||
|
await service.CloneBatchForGmAsync(batchId, gmId, BatchCloneInterval.NextWeek);
|
||||||
|
|
||||||
|
Assert.True(store.CloneBatchCalled);
|
||||||
|
Assert.Equal(batchId, store.LastClonedBatchId);
|
||||||
|
Assert.Equal(groupId, store.LastClonedBatchGroupId);
|
||||||
|
Assert.Equal(BatchCloneInterval.NextWeek, store.LastCloneInterval);
|
||||||
|
}
|
||||||
|
|
||||||
private sealed class FakeSessionStore(
|
private sealed class FakeSessionStore(
|
||||||
IEnumerable<WebGameGroup>? groups = null,
|
IEnumerable<WebGameGroup>? groups = null,
|
||||||
IEnumerable<WebSession>? sessions = null) : ISessionStore
|
IEnumerable<WebSession>? sessions = null) : ISessionStore
|
||||||
@@ -171,6 +342,10 @@ public sealed class AuthorizedSessionServiceTests
|
|||||||
|
|
||||||
public bool UpdateCalled { get; private set; }
|
public bool UpdateCalled { get; private set; }
|
||||||
public bool PromoteCalled { get; private set; }
|
public bool PromoteCalled { get; private set; }
|
||||||
|
public bool UpdateBatchDetailsCalled { get; private set; }
|
||||||
|
public bool UpdateBatchNotificationModeCalled { get; private set; }
|
||||||
|
public bool RescheduleBatchCalled { get; private set; }
|
||||||
|
public bool CloneBatchCalled { get; private set; }
|
||||||
public Guid? LastUpdatedSessionId { get; private set; }
|
public Guid? LastUpdatedSessionId { get; private set; }
|
||||||
public Guid? LastUpdatedGroupId { get; private set; }
|
public Guid? LastUpdatedGroupId { get; private set; }
|
||||||
public string? LastUpdatedTitle { get; private set; }
|
public string? LastUpdatedTitle { get; private set; }
|
||||||
@@ -179,6 +354,20 @@ public sealed class AuthorizedSessionServiceTests
|
|||||||
public int? LastUpdatedMaxPlayers { get; private set; }
|
public int? LastUpdatedMaxPlayers { get; private set; }
|
||||||
public Guid? LastPromotedSessionId { get; private set; }
|
public Guid? LastPromotedSessionId { get; private set; }
|
||||||
public Guid? LastPromotedGroupId { get; private set; }
|
public Guid? LastPromotedGroupId { get; private set; }
|
||||||
|
public Guid? LastUpdatedBatchId { get; private set; }
|
||||||
|
public Guid? LastUpdatedBatchGroupId { get; private set; }
|
||||||
|
public string? LastUpdatedBatchTitle { get; private set; }
|
||||||
|
public string? LastUpdatedBatchJoinLink { get; private set; }
|
||||||
|
public Guid? LastUpdatedNotificationBatchId { get; private set; }
|
||||||
|
public Guid? LastUpdatedNotificationGroupId { get; private set; }
|
||||||
|
public SessionNotificationMode? LastUpdatedNotificationMode { get; private set; }
|
||||||
|
public Guid? LastRescheduledBatchId { get; private set; }
|
||||||
|
public Guid? LastRescheduledBatchGroupId { get; private set; }
|
||||||
|
public DateTime? LastRescheduledFirstScheduledAt { get; private set; }
|
||||||
|
public int? LastRescheduledIntervalDays { get; private set; }
|
||||||
|
public Guid? LastClonedBatchId { get; private set; }
|
||||||
|
public Guid? LastClonedBatchGroupId { get; private set; }
|
||||||
|
public BatchCloneInterval? LastCloneInterval { get; private set; }
|
||||||
|
|
||||||
public Task<List<WebGameGroup>> GetGroupsForGmAsync(long gmId) =>
|
public Task<List<WebGameGroup>> GetGroupsForGmAsync(long gmId) =>
|
||||||
Task.FromResult(groupsById.Values.Where(group => group.GmTelegramId == gmId).ToList());
|
Task.FromResult(groupsById.Values.Where(group => group.GmTelegramId == gmId).ToList());
|
||||||
@@ -198,6 +387,29 @@ public sealed class AuthorizedSessionServiceTests
|
|||||||
return Task.FromResult(session);
|
return Task.FromResult(session);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public Task<WebSessionBatch?> GetBatchAsync(Guid batchId)
|
||||||
|
{
|
||||||
|
var batchSessions = sessionsById.Values
|
||||||
|
.Where(session => session.BatchId == batchId)
|
||||||
|
.OrderBy(session => session.ScheduledAt)
|
||||||
|
.ToList();
|
||||||
|
|
||||||
|
if (batchSessions.Count == 0)
|
||||||
|
{
|
||||||
|
return Task.FromResult<WebSessionBatch?>(null);
|
||||||
|
}
|
||||||
|
|
||||||
|
var firstSession = batchSessions[0];
|
||||||
|
return Task.FromResult<WebSessionBatch?>(new(
|
||||||
|
batchId,
|
||||||
|
firstSession.GroupId,
|
||||||
|
firstSession.Title,
|
||||||
|
firstSession.JoinLink,
|
||||||
|
firstSession.ScheduledAt,
|
||||||
|
batchSessions[^1].ScheduledAt,
|
||||||
|
batchSessions.Count));
|
||||||
|
}
|
||||||
|
|
||||||
public Task UpdateSessionAsync(Guid sessionId, Guid groupId, string title, DateTime scheduledAt, string joinLink, int? maxPlayers)
|
public Task UpdateSessionAsync(Guid sessionId, Guid groupId, string title, DateTime scheduledAt, string joinLink, int? maxPlayers)
|
||||||
{
|
{
|
||||||
UpdateCalled = true;
|
UpdateCalled = true;
|
||||||
@@ -217,5 +429,50 @@ public sealed class AuthorizedSessionServiceTests
|
|||||||
LastPromotedGroupId = groupId;
|
LastPromotedGroupId = groupId;
|
||||||
return Task.CompletedTask;
|
return Task.CompletedTask;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public Task UpdateBatchDetailsAsync(Guid batchId, Guid groupId, string title, string joinLink)
|
||||||
|
{
|
||||||
|
UpdateBatchDetailsCalled = true;
|
||||||
|
LastUpdatedBatchId = batchId;
|
||||||
|
LastUpdatedBatchGroupId = groupId;
|
||||||
|
LastUpdatedBatchTitle = title;
|
||||||
|
LastUpdatedBatchJoinLink = joinLink;
|
||||||
|
return Task.CompletedTask;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Task UpdateBatchNotificationModeAsync(Guid batchId, Guid groupId, SessionNotificationMode notificationMode)
|
||||||
|
{
|
||||||
|
UpdateBatchNotificationModeCalled = true;
|
||||||
|
LastUpdatedNotificationBatchId = batchId;
|
||||||
|
LastUpdatedNotificationGroupId = groupId;
|
||||||
|
LastUpdatedNotificationMode = notificationMode;
|
||||||
|
return Task.CompletedTask;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Task RescheduleBatchAsync(Guid batchId, Guid groupId, DateTime firstScheduledAt, int intervalDays)
|
||||||
|
{
|
||||||
|
RescheduleBatchCalled = true;
|
||||||
|
LastRescheduledBatchId = batchId;
|
||||||
|
LastRescheduledBatchGroupId = groupId;
|
||||||
|
LastRescheduledFirstScheduledAt = firstScheduledAt;
|
||||||
|
LastRescheduledIntervalDays = intervalDays;
|
||||||
|
return Task.CompletedTask;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Task<WebSessionBatch> CloneBatchAsync(Guid batchId, Guid groupId, BatchCloneInterval interval)
|
||||||
|
{
|
||||||
|
CloneBatchCalled = true;
|
||||||
|
LastClonedBatchId = batchId;
|
||||||
|
LastClonedBatchGroupId = groupId;
|
||||||
|
LastCloneInterval = interval;
|
||||||
|
return Task.FromResult(new WebSessionBatch(
|
||||||
|
Guid.NewGuid(),
|
||||||
|
groupId,
|
||||||
|
"Session A",
|
||||||
|
"https://example.test/a",
|
||||||
|
DateTime.UtcNow.AddDays(7),
|
||||||
|
DateTime.UtcNow.AddDays(7),
|
||||||
|
1));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,51 @@
|
|||||||
|
using GmRelay.Web.Services;
|
||||||
|
|
||||||
|
namespace GmRelay.Bot.Tests.Web;
|
||||||
|
|
||||||
|
public sealed class BatchSchedulePlannerTests
|
||||||
|
{
|
||||||
|
[Fact]
|
||||||
|
public void BuildFixedIntervalSchedule_OrdersSessionsAndAppliesInterval()
|
||||||
|
{
|
||||||
|
var firstScheduledAt = new DateTime(2026, 5, 4, 16, 0, 0, DateTimeKind.Utc);
|
||||||
|
var currentSchedule = new[]
|
||||||
|
{
|
||||||
|
new DateTime(2026, 4, 28, 16, 0, 0, DateTimeKind.Utc),
|
||||||
|
new DateTime(2026, 4, 21, 16, 0, 0, DateTimeKind.Utc),
|
||||||
|
new DateTime(2026, 5, 5, 16, 0, 0, DateTimeKind.Utc)
|
||||||
|
};
|
||||||
|
|
||||||
|
var result = BatchSchedulePlanner.BuildFixedIntervalSchedule(currentSchedule, firstScheduledAt, intervalDays: 7);
|
||||||
|
|
||||||
|
Assert.Equal(
|
||||||
|
[
|
||||||
|
firstScheduledAt,
|
||||||
|
firstScheduledAt.AddDays(7),
|
||||||
|
firstScheduledAt.AddDays(14)
|
||||||
|
],
|
||||||
|
result);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void BuildFixedIntervalSchedule_RejectsNonPositiveInterval()
|
||||||
|
{
|
||||||
|
var currentSchedule = new[] { new DateTime(2026, 4, 28, 16, 0, 0, DateTimeKind.Utc) };
|
||||||
|
var firstScheduledAt = new DateTime(2026, 5, 4, 16, 0, 0, DateTimeKind.Utc);
|
||||||
|
|
||||||
|
var action = () => BatchSchedulePlanner.BuildFixedIntervalSchedule(currentSchedule, firstScheduledAt, intervalDays: 0);
|
||||||
|
|
||||||
|
Assert.Throws<ArgumentOutOfRangeException>(action);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Theory]
|
||||||
|
[InlineData(BatchCloneInterval.NextWeek, 2026, 5, 8)]
|
||||||
|
[InlineData(BatchCloneInterval.NextMonth, 2026, 6, 1)]
|
||||||
|
public void ShiftForClone_AppliesRequestedCalendarShift(BatchCloneInterval interval, int expectedYear, int expectedMonth, int expectedDay)
|
||||||
|
{
|
||||||
|
var scheduledAt = new DateTime(2026, 5, 1, 16, 30, 0, DateTimeKind.Utc);
|
||||||
|
|
||||||
|
var result = BatchSchedulePlanner.ShiftForClone(scheduledAt, interval);
|
||||||
|
|
||||||
|
Assert.Equal(new DateTime(expectedYear, expectedMonth, expectedDay, 16, 30, 0, DateTimeKind.Utc), result);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,31 @@
|
|||||||
|
namespace GmRelay.Bot.Tests.Web;
|
||||||
|
|
||||||
|
public sealed class WebStylesTests
|
||||||
|
{
|
||||||
|
[Fact]
|
||||||
|
public async Task AppCss_ShouldStyleNativeSelectOptionsForReadableDropdowns()
|
||||||
|
{
|
||||||
|
var css = await File.ReadAllTextAsync(FindRepositoryFile("src/GmRelay.Web/wwwroot/app.css"));
|
||||||
|
|
||||||
|
Assert.Matches(
|
||||||
|
@"select\s+option\s*\{[^}]*background:\s*var\(--bg-secondary\);[^}]*color:\s*var\(--text-primary\);",
|
||||||
|
css);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static string FindRepositoryFile(string relativePath)
|
||||||
|
{
|
||||||
|
var directory = new DirectoryInfo(AppContext.BaseDirectory);
|
||||||
|
while (directory is not null)
|
||||||
|
{
|
||||||
|
var candidate = Path.Combine(directory.FullName, relativePath);
|
||||||
|
if (File.Exists(candidate))
|
||||||
|
{
|
||||||
|
return candidate;
|
||||||
|
}
|
||||||
|
|
||||||
|
directory = directory.Parent;
|
||||||
|
}
|
||||||
|
|
||||||
|
throw new FileNotFoundException($"Could not locate repository file '{relativePath}'.");
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user