Compare commits
8 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Toutsu
|
11b145a967 | ||
|
Toutsu
|
105b3c59d7 | ||
|
Toutsu
|
3bea327043 | ||
|
Toutsu
|
c6aea78ff3 | ||
|
Toutsu
|
01c49f2df0 | ||
|
Toutsu
|
9deccd3a9d | ||
|
Toutsu
|
81d4ec2c97 | ||
|
Toutsu
|
c0a5482e1a |
@@ -6,7 +6,7 @@ on:
|
|||||||
- main
|
- main
|
||||||
|
|
||||||
env:
|
env:
|
||||||
VERSION: 1.15.0
|
VERSION: 2.0.0
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
# ЧАСТЬ 1: Собираем образы и кладем в Gitea (чтобы делиться с ребятами)
|
# ЧАСТЬ 1: Собираем образы и кладем в Gitea (чтобы делиться с ребятами)
|
||||||
|
|||||||
@@ -1,343 +0,0 @@
|
|||||||
# Issue #15: Session Audit Log Implementation Plan
|
|
||||||
|
|
||||||
> **For Hermes:** Use subagent-driven-development skill to implement this plan task-by-task.
|
|
||||||
|
|
||||||
**Goal:** Add transparent audit history for every session change, visible to GM in Web Dashboard.
|
|
||||||
|
|
||||||
**Architecture:** PostgreSQL audit table + Dapper queries. Automatic logging inside mutating SessionService methods. New Razor page for GM history view.
|
|
||||||
|
|
||||||
**Tech Stack:** C# 12, Blazor SSR, Dapper, PostgreSQL, xUnit.
|
|
||||||
|
|
||||||
**Branch:** `issue-15-session-audit-log` (includes mobile UI bugfix cherry-pick)
|
|
||||||
|
|
||||||
**Version Bump:** `1.10.1` → `1.10.2`
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Task 1: Database Migration (V013)
|
|
||||||
|
|
||||||
**Objective:** Create `session_audit_log` table.
|
|
||||||
|
|
||||||
**File:** Create `src/GmRelay.Bot/Migrations/V013__add_session_audit_log.sql`
|
|
||||||
|
|
||||||
```sql
|
|
||||||
CREATE EXTENSION IF NOT EXISTS "pgcrypto";
|
|
||||||
|
|
||||||
CREATE TABLE session_audit_log (
|
|
||||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
|
||||||
session_id UUID NOT NULL REFERENCES sessions(id) ON DELETE CASCADE,
|
|
||||||
actor_telegram_id BIGINT NOT NULL,
|
|
||||||
actor_name VARCHAR(255) NOT NULL,
|
|
||||||
change_type VARCHAR(50) NOT NULL,
|
|
||||||
CHECK (change_type IN ('Title','Time','Link','MaxPlayers','Status','WaitlistPromote','PlayerRemoved','BatchRescheduled','Cancelled')),
|
|
||||||
old_value TEXT,
|
|
||||||
new_value TEXT,
|
|
||||||
changed_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
|
||||||
);
|
|
||||||
|
|
||||||
CREATE INDEX ix_session_audit_log_session_id ON session_audit_log(session_id);
|
|
||||||
CREATE INDEX ix_session_audit_log_changed_at ON session_audit_log(changed_at);
|
|
||||||
```
|
|
||||||
|
|
||||||
**Step 2:** Verify migration compiles: `psql $DATABASE_URL -f src/GmRelay.Bot/Migrations/V013__add_session_audit_log.sql` (optional, CI will test)
|
|
||||||
|
|
||||||
**Step 3:** Commit: `git add src/GmRelay.Bot/Migrations/V013__add_session_audit_log.sql && git commit -m "chore(#15): add session_audit_log migration"`
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Task 2: Domain Model & Interface Methods
|
|
||||||
|
|
||||||
**Objective:** Add `SessionAuditLogEntry` record and two new methods to `ISessionStore`.
|
|
||||||
|
|
||||||
**Files:**
|
|
||||||
- Modify: `src/GmRelay.Web/Services/ISessionStore.cs`
|
|
||||||
- Modify: `src/GmRelay.Web/Services/SessionService.cs`
|
|
||||||
|
|
||||||
**Step 1: Add record to ISessionStore.cs** (after PlayerAttendanceStats)
|
|
||||||
|
|
||||||
```csharp
|
|
||||||
public sealed record SessionAuditLogEntry(
|
|
||||||
Guid Id,
|
|
||||||
Guid SessionId,
|
|
||||||
long ActorTelegramId,
|
|
||||||
string ActorName,
|
|
||||||
string ChangeType,
|
|
||||||
string? OldValue,
|
|
||||||
string? NewValue,
|
|
||||||
DateTime ChangedAt
|
|
||||||
);
|
|
||||||
```
|
|
||||||
|
|
||||||
**Step 2: Add methods to ISessionStore interface**
|
|
||||||
|
|
||||||
```csharp
|
|
||||||
Task LogSessionChangeAsync(Guid sessionId, long actorTelegramId, string actorName, string changeType, string? oldValue, string? newValue);
|
|
||||||
Task<List<SessionAuditLogEntry>> GetSessionHistoryAsync(Guid sessionId);
|
|
||||||
```
|
|
||||||
|
|
||||||
**Step 3: Implement in SessionService.cs**
|
|
||||||
|
|
||||||
```csharp
|
|
||||||
public async Task LogSessionChangeAsync(Guid sessionId, long actorTelegramId, string actorName, string changeType, string? oldValue, string? newValue)
|
|
||||||
{
|
|
||||||
using var connection = new NpgsqlConnection(connectionString);
|
|
||||||
await connection.ExecuteAsync(
|
|
||||||
"INSERT INTO session_audit_log (session_id, actor_telegram_id, actor_name, change_type, old_value, new_value) VALUES (@sessionId, @actorTelegramId, @actorName, @changeType, @oldValue, @newValue)",
|
|
||||||
new { sessionId, actorTelegramId, actorName, changeType, oldValue, newValue });
|
|
||||||
}
|
|
||||||
|
|
||||||
public async Task<List<SessionAuditLogEntry>> GetSessionHistoryAsync(Guid sessionId)
|
|
||||||
{
|
|
||||||
using var connection = new NpgsqlConnection(connectionString);
|
|
||||||
var entries = await connection.QueryAsync<SessionAuditLogEntry>(
|
|
||||||
"SELECT id, session_id as SessionId, actor_telegram_id as ActorTelegramId, actor_name as ActorName, change_type as ChangeType, old_value as OldValue, new_value as NewValue, changed_at as ChangedAt FROM session_audit_log WHERE session_id = @sessionId ORDER BY changed_at DESC",
|
|
||||||
new { sessionId });
|
|
||||||
return entries.ToList();
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
**Step 4:** Commit: `git add -A && git commit -m "feat(#15): add SessionAuditLogEntry and audit store methods"`
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Task 3: Instrument Mutating Methods
|
|
||||||
|
|
||||||
**Objective:** Auto-log changes in key methods. Only log when value actually changes.
|
|
||||||
|
|
||||||
**File:** Modify `src/GmRelay.Web/Services/SessionService.cs`
|
|
||||||
|
|
||||||
**Step 1: Instrument UpdateSessionAsync**
|
|
||||||
|
|
||||||
Before executing UPDATE, read current session. After UPDATE, compare and log each changed field:
|
|
||||||
|
|
||||||
```csharp
|
|
||||||
// After var currentSession = await GetSessionAsync(sessionId);
|
|
||||||
// Before the UPDATE SQL:
|
|
||||||
|
|
||||||
if (currentSession is not null)
|
|
||||||
{
|
|
||||||
if (currentSession.Title != title)
|
|
||||||
await LogSessionChangeAsync(sessionId, /* actor will be passed from caller */ ...);
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
**Problem:** SessionService doesn't know the actor (GM) telegram ID. Solution: add `long actorTelegramId` parameter to mutating methods, or use a decorator pattern.
|
|
||||||
|
|
||||||
**Better approach:** Instrument in `AuthorizedSessionService` which already has `gmId`. That is the authorized wrapper.
|
|
||||||
|
|
||||||
**Revised approach:** Add `IAuditLogger` interface and inject it. Or simpler: change `ISessionStore` mutating methods to accept `long actorTelegramId` and `string actorName` as last parameters.
|
|
||||||
|
|
||||||
**Simpler approach for this plan:** Since all mutating methods in `ISessionStore` are called through `AuthorizedSessionService`, instrument in `AuthorizedSessionService` methods AFTER the underlying `SessionService` call. BUT we need old values.
|
|
||||||
|
|
||||||
**Final approach:** Change `ISessionStore` methods to include `actorTelegramId` parameter, and inside `SessionService` fetch old values and log.
|
|
||||||
|
|
||||||
Let's add `long actorTelegramId` parameter to:
|
|
||||||
- `UpdateSessionAsync`
|
|
||||||
- `PromoteWaitlistedPlayerAsync`
|
|
||||||
- `RemovePlayerFromSessionAsync`
|
|
||||||
- `RescheduleBatchAsync`
|
|
||||||
|
|
||||||
Wait, this is a bigger change. Let's be more pragmatic: add a new `IAuditService` that can be called from `AuthorizedSessionService` after mutations. `IAuditService` just wraps `ISessionStore.LogSessionChangeAsync`.
|
|
||||||
|
|
||||||
Actually, simplest: add `actorTelegramId` and `actorName` parameters to `LogSessionChangeAsync` and call it from `AuthorizedSessionService` after each mutation. For old/new values, read the session before mutation in AuthorizedSessionService.
|
|
||||||
|
|
||||||
**Plan:**
|
|
||||||
- `AuthorizedSessionService.UpdateSessionForGmAsync`: read session before update, call update, then log differences.
|
|
||||||
- Same pattern for other mutating methods.
|
|
||||||
|
|
||||||
**Step 1: Read current session in AuthorizedSessionService.UpdateSessionForGmAsync**
|
|
||||||
|
|
||||||
```csharp
|
|
||||||
public async Task UpdateSessionForGmAsync(Guid sessionId, long gmId, string title, DateTime scheduledAt, string joinLink, int? maxPlayers)
|
|
||||||
{
|
|
||||||
var groupId = await EnforceSessionOwnershipAsync(sessionId, gmId);
|
|
||||||
var before = await store.GetSessionAsync(sessionId); // add this
|
|
||||||
await store.UpdateSessionAsync(sessionId, groupId, title, scheduledAt, joinLink, maxPlayers);
|
|
||||||
if (before is not null)
|
|
||||||
{
|
|
||||||
if (before.Title != title)
|
|
||||||
await store.LogSessionChangeAsync(sessionId, gmId, "ГМ", "Title", before.Title, title);
|
|
||||||
if (before.ScheduledAt != scheduledAt)
|
|
||||||
await store.LogSessionChangeAsync(sessionId, gmId, "ГМ", "Time", before.ScheduledAt.ToString("O"), scheduledAt.ToString("O"));
|
|
||||||
if (before.JoinLink != joinLink)
|
|
||||||
await store.LogSessionChangeAsync(sessionId, gmId, "ГМ", "Link", before.JoinLink, joinLink);
|
|
||||||
if (before.MaxPlayers != maxPlayers)
|
|
||||||
await store.LogSessionChangeAsync(sessionId, gmId, "ГМ", "MaxPlayers", before.MaxPlayers?.ToString(), maxPlayers?.ToString());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
Wait, `EnforceSessionOwnershipAsync` returns `groupId` but we need it. Let me check the current AuthorizedSessionService code... We saw earlier it does `await EnforceSessionOwnershipAsync(sessionId, gmId)` then calls `store.UpdateSessionAsync`.
|
|
||||||
|
|
||||||
Actually, looking at the compact output from earlier, `AuthorizedSessionService` has `EnforceSessionOwnershipAsync` as a private helper. Let me verify.
|
|
||||||
|
|
||||||
From the compact output of AuthorizedSessionService earlier:
|
|
||||||
```
|
|
||||||
public async Task UpdateSessionForGmAsync(Guid sessionId, long gmId, string title, DateTime scheduledAt, string joinLink, int? maxPlayers)
|
|
||||||
{
|
|
||||||
var groupId = await EnforceSessionOwnershipAsync(sessionId, gmId);
|
|
||||||
await store.UpdateSessionAsync(sessionId, groupId, title, scheduledAt, joinLink, maxPlayers);
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
So it DOES return groupId. Perfect.
|
|
||||||
|
|
||||||
But we need actor name. We can use the GM's display name from `GetGroupManagementForGmAsync` or just hardcode "ГМ" for now. Or we can query the player name. For simplicity, use "ГМ" + telegram ID, or query the player display name.
|
|
||||||
|
|
||||||
Actually, let's query the GM name from the group or just use telegram ID as identifier. Since this is audit log, having human-readable name is better. We can pass `actorName` to the log method.
|
|
||||||
|
|
||||||
Simpler: In `AuthorizedSessionService`, after `EnforceSessionOwnershipAsync`, we already know the group. We can get the GM name from group or just use a generic "ГМ" label. Actually, the telegram ID is sufficient for audit, and the display name can be resolved later in the UI.
|
|
||||||
|
|
||||||
Let's just log `actor_telegram_id` and use "ГМ" as actor_name. Or better, query the player display name if needed.
|
|
||||||
|
|
||||||
For this plan, let's keep it simple: log with `gmId` as actor_telegram_id and `"ГМ"` as actor_name. The UI can resolve the name.
|
|
||||||
|
|
||||||
**Step 2: Instrument all mutating AuthorizedSessionService methods**
|
|
||||||
|
|
||||||
Do this for:
|
|
||||||
- `UpdateSessionForGmAsync` (Title, Time, Link, MaxPlayers)
|
|
||||||
- `RescheduleBatchForGmAsync` (BatchRescheduled)
|
|
||||||
- `PromoteWaitlistedPlayerForGmAsync` (WaitlistPromote)
|
|
||||||
- `RemovePlayerFromSessionForGmAsync` (PlayerRemoved)
|
|
||||||
- `UpdateBatchDetailsForGmAsync` (Title, Link)
|
|
||||||
- `UpdateBatchNotificationModeForGmAsync` (maybe skip, internal)
|
|
||||||
- `DeleteSessionHandler` in Bot features (Cancelled) — this is in Bot layer, not Web
|
|
||||||
|
|
||||||
For Cancelled status, we need to instrument `CancelSessionHandler` in Bot. But the Bot handlers don't use `ISessionStore` directly... they use `SessionService` or direct SQL. Let me check.
|
|
||||||
|
|
||||||
Actually, for this plan, focus on Web layer mutations first. Bot layer can be a follow-up.
|
|
||||||
|
|
||||||
**Step 3: Commit:** `git add -A && git commit -m "feat(#15): instrument audit logging in AuthorizedSessionService"`
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Task 4: Web Page - SessionHistory.razor
|
|
||||||
|
|
||||||
**Objective:** GM-visible timeline of session changes.
|
|
||||||
|
|
||||||
**Files:**
|
|
||||||
- Create: `src/GmRelay.Web/Components/Pages/SessionHistory.razor`
|
|
||||||
- Modify: `src/GmRelay.Web/Components/Pages/GroupDetails.razor` (add "История" link)
|
|
||||||
- Modify: `src/GmRelay.Web/Components/Pages/EditSession.razor` (add "История" link)
|
|
||||||
|
|
||||||
**Step 1: Create SessionHistory.razor**
|
|
||||||
|
|
||||||
Route: `@page "/session/{SessionId:guid}/history"`
|
|
||||||
|
|
||||||
Layout: table with columns: Время, Актор, Тип изменения, Было, Стало.
|
|
||||||
|
|
||||||
Colors: use existing CSS variables.
|
|
||||||
|
|
||||||
**Step 2: Add navigation links**
|
|
||||||
|
|
||||||
In GroupDetails.razor sessions table: add 📜 История column/link.
|
|
||||||
In EditSession.razor: add button "📜 История изменений" linking to `/session/{SessionId}/history`.
|
|
||||||
|
|
||||||
**Step 3: Commit:** `git add -A && git commit -m "feat(#15): add SessionHistory.razor page with audit timeline"`
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Task 5: FakeSessionStore + TDD Tests
|
|
||||||
|
|
||||||
**Objective:** Test audit logging. RED-GREEN-REFACTOR.
|
|
||||||
|
|
||||||
**Files:**
|
|
||||||
- Modify: `tests/GmRelay.Bot.Tests/Web/AuthorizedSessionServiceTests.cs`
|
|
||||||
|
|
||||||
**Step 1: RED — Write failing test**
|
|
||||||
|
|
||||||
```csharp
|
|
||||||
[Fact]
|
|
||||||
public async Task UpdateSessionForGmAsync_LogsAudit_WhenTitleChanges()
|
|
||||||
{
|
|
||||||
var gmId = 1001L;
|
|
||||||
var groupId = Guid.NewGuid();
|
|
||||||
var sessionId = Guid.NewGuid();
|
|
||||||
var store = new FakeSessionStore(
|
|
||||||
groups: [new(groupId, 42, "Alpha", gmId)],
|
|
||||||
sessions: [new(sessionId, groupId, "Session A", DateTime.UtcNow, "Planned", "https://example.test/a", Guid.NewGuid(), 10, 42, 4, 1, 0)]);
|
|
||||||
var service = new AuthorizedSessionService(store);
|
|
||||||
|
|
||||||
await service.UpdateSessionForGmAsync(sessionId, gmId, "Updated Title", DateTime.UtcNow.AddDays(1), "https://example.test/b", 5);
|
|
||||||
|
|
||||||
Assert.Single(store.LogEntries);
|
|
||||||
Assert.Equal("Title", store.LogEntries[0].ChangeType);
|
|
||||||
Assert.Equal("Session A", store.LogEntries[0].OldValue);
|
|
||||||
Assert.Equal("Updated Title", store.LogEntries[0].NewValue);
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
Run: `dotnet test tests/GmRelay.Bot.Tests/Web/AuthorizedSessionServiceTests.cs --filter "FullyQualifiedName~LogsAudit" -v n`
|
|
||||||
Expected: FAIL (FakeSessionStore doesn't have LogSessionChangeAsync / LogEntries)
|
|
||||||
|
|
||||||
**Step 2: GREEN — Add to FakeSessionStore**
|
|
||||||
|
|
||||||
Add `List<SessionAuditLogEntry> LogEntries` and implement `LogSessionChangeAsync` / `GetSessionHistoryAsync`.
|
|
||||||
|
|
||||||
**Step 3: Refactor — Add more tests**
|
|
||||||
|
|
||||||
- No audit when values unchanged
|
|
||||||
- Audit for time change
|
|
||||||
- Audit for link change
|
|
||||||
- Audit for max players change
|
|
||||||
- GetSessionHistoryAsync returns entries ordered by time desc
|
|
||||||
|
|
||||||
**Step 4: Full suite**
|
|
||||||
Run: `dotnet test tests/GmRelay.Bot.Tests/GmRelay.Bot.Tests.csproj`
|
|
||||||
Expected: all pass
|
|
||||||
|
|
||||||
**Step 5: Commit:** `git add -A && git commit -m "test(#15): add audit logging TDD tests"`
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Task 6: Bump Version & Docs
|
|
||||||
|
|
||||||
**Objective:** Update version and documentation.
|
|
||||||
|
|
||||||
**Files:**
|
|
||||||
- Modify: `Directory.Build.props`
|
|
||||||
- Modify: `compose.yaml`
|
|
||||||
- Modify: `README.md`
|
|
||||||
- Modify: Wiki «Руководство ГМа»
|
|
||||||
|
|
||||||
**Step 1: Bump version to 1.10.2**
|
|
||||||
|
|
||||||
**Step 2: Update README** — add "📜 История изменений сессии" bullet in Web Dashboard section.
|
|
||||||
|
|
||||||
**Step 3: Update wiki** — add subsection «Журнал действий» with description of how to access `/session/{id}/history`, what change types are tracked, and how to read the timeline.
|
|
||||||
|
|
||||||
**Step 4: Commit:** `git add -A && git commit -m "docs(#15): bump version to 1.10.2 and add audit log docs"`
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Task 7: Push & PR
|
|
||||||
|
|
||||||
**Step 1:** `git push origin issue-15-session-audit-log`
|
|
||||||
|
|
||||||
**Step 2:** Create PR via `mcp_gitea_pull_request_write`
|
|
||||||
|
|
||||||
**Step 3:** Wait CI (`mcp_gitea_actions_run_read`)
|
|
||||||
|
|
||||||
**Step 4:** Merge PR
|
|
||||||
|
|
||||||
**Step 5:** Create tag `v1.10.2` and release
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Verification Checklist
|
|
||||||
|
|
||||||
- [ ] Migration V013 applied successfully
|
|
||||||
- [ ] `SessionAuditLogEntry` record defined in `ISessionStore.cs`
|
|
||||||
- [ ] `LogSessionChangeAsync` and `GetSessionHistoryAsync` implemented in `SessionService.cs`
|
|
||||||
- [ ] `AuthorizedSessionService` logs on value changes only
|
|
||||||
- [ ] `SessionHistory.razor` renders timeline for GM
|
|
||||||
- [ ] Links from GroupDetails and EditSession pages
|
|
||||||
- [ ] `FakeSessionStore` implements audit methods
|
|
||||||
- [ ] TDD tests: RED → GREEN → all pass
|
|
||||||
- [ ] Full `dotnet test` suite: all pass
|
|
||||||
- [ ] Version bumped to 1.10.2
|
|
||||||
- [ ] README and wiki updated
|
|
||||||
- [ ] CI run success
|
|
||||||
- [ ] PR merged to main
|
|
||||||
- [ ] Tag `v1.10.2` created
|
|
||||||
- [ ] Release published
|
|
||||||
@@ -1,480 +0,0 @@
|
|||||||
# Issue #19: выровнять /newsession с batch-сценарием лендинга — Implementation Plan
|
|
||||||
|
|
||||||
> **For Hermes:** Use subagent-driven-development skill to implement this plan task-by-task.
|
|
||||||
|
|
||||||
**Goal:** Убедиться, что Telegram UX `/newsession` полностью соответствует batch-сценарию лендинга: мастер одной командой создаёт несколько дат, указывает лимит мест и ссылку, получает единую карточку с действиями. Обеспечить покрытие acceptance criteria регрессионными тестами и устранить найденные расхождения.
|
|
||||||
|
|
||||||
**Architecture:** Сценарий уже реализован в `CreateSessionHandler` + `NewSessionCommandParser` + `SessionBatchRenderer`. Основная задача — добавить недостающие тесты на «точный» landing-сценарий (несколько явных дат, не recurring), проверить отсутствие частичных сессий при любых ошибках, и убедиться, что карточка содержит все обещанные элементы.
|
|
||||||
|
|
||||||
**Tech Stack:** .NET 10, xUnit, Dapper, Npgsql, Telegram.Bot, Native AOT.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Контекст кодовой базы
|
|
||||||
|
|
||||||
- `src/GmRelay.Bot/Features/Sessions/CreateSession/CreateSessionHandler.cs` — создание batch, транзакция БД, отправка карточки.
|
|
||||||
- `src/GmRelay.Bot/Features/Sessions/CreateSession/NewSessionCommandParser.cs` — парсинг команды: несколько `Время:`, `Мест:`, `Ссылка:`, `Картинка:`, recurring (`Игр:` + `Интервал:`).
|
|
||||||
- `src/GmRelay.Shared/Rendering/SessionBatchRenderer.cs` — рендеринг HTML-карточки с кнопками.
|
|
||||||
- `src/GmRelay.Shared/Rendering/BatchMessageEditor.cs` — редактирование batch-сообщения (text/photo).
|
|
||||||
- `src/GmRelay.Bot/Infrastructure/Telegram/UpdateRouter.cs` — роутинг команд, текст `/help`.
|
|
||||||
- `tests/GmRelay.Bot.Tests/Features/Sessions/CreateSession/NewSessionCommandParserTests.cs` — тесты парсера.
|
|
||||||
- `tests/GmRelay.Bot.Tests/Features/Landing/TelegramLandingPromisesSmokeTests.cs` — smoke-тест всего landing-флоу через `FakeTelegramMessenger`.
|
|
||||||
- `tests/GmRelay.Bot.Tests/Rendering/SessionBatchRendererTests.cs` — тесты рендерера.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### Task 1: RED — тест landing-парсинга с несколькими явными датами
|
|
||||||
|
|
||||||
**Objective:** Проверить, что парсер корректно обрабатывает точный формат из лендинга: 2+ явных даты, лимит мест, ссылка, без recurring.
|
|
||||||
|
|
||||||
**Files:**
|
|
||||||
- Modify: `tests/GmRelay.Bot.Tests/Features/Sessions/CreateSession/NewSessionCommandParserTests.cs`
|
|
||||||
|
|
||||||
**Step 1: Write failing test**
|
|
||||||
|
|
||||||
```csharp
|
|
||||||
[Fact]
|
|
||||||
public void Parse_ShouldHandleLandingBatchWithMultipleExplicitDates()
|
|
||||||
{
|
|
||||||
var nowUtc = new DateTimeOffset(2026, 4, 23, 12, 0, 0, TimeSpan.Zero);
|
|
||||||
var text = """
|
|
||||||
/newsession
|
|
||||||
Название: Landing Batch Game
|
|
||||||
Время: 15.05.2026 19:30
|
|
||||||
Время: 22.05.2026 19:30
|
|
||||||
Мест: 4
|
|
||||||
Ссылка: https://example.test/landing
|
|
||||||
""";
|
|
||||||
|
|
||||||
var result = NewSessionCommandParser.Parse(text, nowUtc);
|
|
||||||
|
|
||||||
Assert.True(result.IsValid);
|
|
||||||
Assert.Equal("Landing Batch Game", result.Title);
|
|
||||||
Assert.Equal("https://example.test/landing", result.Link);
|
|
||||||
Assert.Equal(4, result.MaxPlayers);
|
|
||||||
Assert.Equal(2, result.ScheduledTimes.Count);
|
|
||||||
Assert.Equal(new DateTimeOffset(2026, 5, 15, 16, 30, 0, TimeSpan.Zero), result.ScheduledTimes[0]);
|
|
||||||
Assert.Equal(new DateTimeOffset(2026, 5, 22, 16, 30, 0, TimeSpan.Zero), result.ScheduledTimes[1]);
|
|
||||||
Assert.Empty(result.PastTimeInputs);
|
|
||||||
Assert.Empty(result.InvalidTimeInputs);
|
|
||||||
Assert.Empty(result.InvalidSeatLimitInputs);
|
|
||||||
Assert.Empty(result.InvalidRecurringInputs);
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
**Step 2: Run test to verify failure**
|
|
||||||
|
|
||||||
Run: `dotnet test tests/GmRelay.Bot.Tests/ --filter "FullyQualifiedName~Parse_ShouldHandleLandingBatchWithMultipleExplicitDates" -v n`
|
|
||||||
|
|
||||||
Expected: PASS (функциональность уже реализована, но теста не было). Если FAIL — исправить парсер перед продолжением.
|
|
||||||
|
|
||||||
**Step 3: Commit**
|
|
||||||
|
|
||||||
```bash
|
|
||||||
git add tests/GmRelay.Bot.Tests/Features/Sessions/CreateSession/NewSessionCommandParserTests.cs
|
|
||||||
git commit -m "test(#19): landing batch parser test with multiple explicit dates"
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### Task 2: RED — тест рендеринга landing-карточки
|
|
||||||
|
|
||||||
**Objective:** Проверить, что `SessionBatchRenderer` для landing-сценария выводит название, все даты, лимит, заполненность и кнопки записи/выхода.
|
|
||||||
|
|
||||||
**Files:**
|
|
||||||
- Modify: `tests/GmRelay.Bot.Tests/Rendering/SessionBatchRendererTests.cs`
|
|
||||||
|
|
||||||
**Step 1: Write failing test**
|
|
||||||
|
|
||||||
```csharp
|
|
||||||
[Fact]
|
|
||||||
public void Render_ShouldProduceLandingBatchCardWithAllRequiredElements()
|
|
||||||
{
|
|
||||||
var sessionId1 = Guid.NewGuid();
|
|
||||||
var sessionId2 = Guid.NewGuid();
|
|
||||||
var sessions = new[]
|
|
||||||
{
|
|
||||||
new SessionBatchDto(sessionId1, new DateTime(2026, 5, 15, 16, 30, 0, DateTimeKind.Utc), SessionStatus.Planned, 4),
|
|
||||||
new SessionBatchDto(sessionId2, new DateTime(2026, 5, 22, 16, 30, 0, DateTimeKind.Utc), SessionStatus.Planned, 4)
|
|
||||||
};
|
|
||||||
var participants = new[]
|
|
||||||
{
|
|
||||||
new ParticipantBatchDto(sessionId1, "Alice", "alice", ParticipantRegistrationStatus.Active),
|
|
||||||
new ParticipantBatchDto(sessionId1, "Bob", null, ParticipantRegistrationStatus.Active),
|
|
||||||
new ParticipantBatchDto(sessionId2, "Charlie", "charlie", ParticipantRegistrationStatus.Waitlisted)
|
|
||||||
};
|
|
||||||
|
|
||||||
var result = SessionBatchRenderer.Render("Landing Batch Game", sessions, participants);
|
|
||||||
var text = result.Text;
|
|
||||||
var buttons = result.Markup.InlineKeyboard.SelectMany(row => row).ToList();
|
|
||||||
|
|
||||||
Assert.Contains("Landing Batch Game", text);
|
|
||||||
Assert.Contains("15 мая 2026, 19:30", text);
|
|
||||||
Assert.Contains("22 мая 2026, 19:30", text);
|
|
||||||
Assert.Contains("Места: 2/4", text);
|
|
||||||
Assert.Contains("Места: 0/4", text);
|
|
||||||
Assert.Contains("@alice", text);
|
|
||||||
Assert.Contains("Bob", text);
|
|
||||||
Assert.Contains("Лист ожидания (1)", text);
|
|
||||||
Assert.Contains("@charlie", text);
|
|
||||||
|
|
||||||
Assert.Equal(4, buttons.Count);
|
|
||||||
Assert.Contains($"join_session:{sessionId1}", buttons.Select(b => b.CallbackData));
|
|
||||||
Assert.Contains($"leave_session:{sessionId1}", buttons.Select(b => b.CallbackData));
|
|
||||||
Assert.Contains($"join_session:{sessionId2}", buttons.Select(b => b.CallbackData));
|
|
||||||
Assert.Contains($"leave_session:{sessionId2}", buttons.Select(b => b.CallbackData));
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
**Step 2: Run test to verify failure**
|
|
||||||
|
|
||||||
Run: `dotnet test tests/GmRelay.Bot.Tests/ --filter "FullyQualifiedName~Render_ShouldProduceLandingBatchCardWithAllRequiredElements" -v n`
|
|
||||||
|
|
||||||
Expected: PASS (рендерер уже реализован, тест отсутствовал).
|
|
||||||
|
|
||||||
**Step 3: Commit**
|
|
||||||
|
|
||||||
```bash
|
|
||||||
git add tests/GmRelay.Bot.Tests/Rendering/SessionBatchRendererTests.cs
|
|
||||||
git commit -m "test(#19): landing batch renderer card elements test"
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### Task 3: RED — тест «ошибки ввода не создают частичных сессий»
|
|
||||||
|
|
||||||
**Objective:** Убедиться, что при невалидном вводе `CreateSessionHandler` не создаёт ни одной записи в БД и не публикует карточку.
|
|
||||||
|
|
||||||
**Files:**
|
|
||||||
- Create: `tests/GmRelay.Bot.Tests/Features/Sessions/CreateSession/CreateSessionHandlerTests.cs`
|
|
||||||
- Modify: `src/GmRelay.Bot/Features/Sessions/CreateSession/CreateSessionHandler.cs` (если найдена уязвимость)
|
|
||||||
|
|
||||||
**Step 1: Write failing test**
|
|
||||||
|
|
||||||
```csharp
|
|
||||||
using GmRelay.Bot.Features.Sessions.CreateSession;
|
|
||||||
using Npgsql;
|
|
||||||
using Telegram.Bot;
|
|
||||||
using Microsoft.Extensions.Logging.Abstractions;
|
|
||||||
|
|
||||||
namespace GmRelay.Bot.Tests.Features.Sessions.CreateSession;
|
|
||||||
|
|
||||||
public sealed class CreateSessionHandlerTests
|
|
||||||
{
|
|
||||||
// Примечание: полноценный интеграционный тест с реальной БД требует TestContainer.
|
|
||||||
// Для Native AOT проекта используем подход с in-memory фейком через рефакторинг хендлера.
|
|
||||||
// Ниже — тест-спецификация, которую реализуем через FakeDataSource или рефакторинг.
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
Поскольку `CreateSessionHandler` напрямую зависит от `NpgsqlDataSource` и `ITelegramBotClient`, для unit-тестирования нужно либо:
|
|
||||||
а) использовать интеграционный тест с PostgreSQL (TestContainers), либо
|
|
||||||
б) рефакторить хендлер, выделив `ISessionRepository`.
|
|
||||||
|
|
||||||
**Рекомендуемый подход (YAGNI):** добавить интеграционный тест в smoke-стиле через `FakeTelegramMessenger`, дополнив `TelegramLandingSmokeScenario` сценарием «invalid command does not publish anything».
|
|
||||||
|
|
||||||
**Step 1 (реализация):** Дописать тест в `TelegramLandingPromisesSmokeTests.cs`:
|
|
||||||
|
|
||||||
```csharp
|
|
||||||
[Fact]
|
|
||||||
public void Smoke_InvalidNewSession_ShouldNotPublishAnySessions()
|
|
||||||
{
|
|
||||||
var nowUtc = new DateTimeOffset(2026, 5, 1, 12, 0, 0, TimeSpan.Zero);
|
|
||||||
var invalidText = """
|
|
||||||
/newsession
|
|
||||||
Название: Bad Game
|
|
||||||
Время: 01.01.2020 19:30
|
|
||||||
"""; // нет ссылки
|
|
||||||
|
|
||||||
var parseResult = NewSessionCommandParser.Parse(invalidText, nowUtc);
|
|
||||||
|
|
||||||
Assert.False(parseResult.IsValid);
|
|
||||||
Assert.Empty(parseResult.ScheduledTimes);
|
|
||||||
// Убеждаемся, что smoke-сценарий не может быть опубликован
|
|
||||||
Assert.Throws<InvalidOperationException>(() =>
|
|
||||||
TelegramLandingSmokeScenario.Publish(parseResult, SessionNotificationMode.GroupAndDirect));
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
В `TelegramLandingSmokeScenario.Publish` добавить guard:
|
|
||||||
```csharp
|
|
||||||
if (!parseResult.IsValid)
|
|
||||||
throw new InvalidOperationException("Cannot publish invalid parse result");
|
|
||||||
```
|
|
||||||
|
|
||||||
**Step 2: Run test to verify failure**
|
|
||||||
|
|
||||||
Run: `dotnet test tests/GmRelay.Bot.Tests/ --filter "FullyQualifiedName~Smoke_InvalidNewSession_ShouldNotPublishAnySessions" -v n`
|
|
||||||
|
|
||||||
Expected: FAIL — guard ещё не добавлен.
|
|
||||||
|
|
||||||
**Step 3: Write minimal implementation**
|
|
||||||
|
|
||||||
Добавить guard в `TelegramLandingSmokeScenario.Publish`:
|
|
||||||
```csharp
|
|
||||||
if (!parseResult.IsValid)
|
|
||||||
throw new InvalidOperationException("Cannot publish invalid parse result");
|
|
||||||
```
|
|
||||||
|
|
||||||
**Step 4: Run test to verify pass**
|
|
||||||
|
|
||||||
Expected: PASS.
|
|
||||||
|
|
||||||
**Step 5: Commit**
|
|
||||||
|
|
||||||
```bash
|
|
||||||
git add tests/GmRelay.Bot.Tests/Features/Landing/TelegramLandingPromisesSmokeTests.cs
|
|
||||||
git add src/GmRelay.Bot/... # если были изменения
|
|
||||||
# (файл CreateSessionHandler.cs не трогаем — валидация происходит ДО транзакции)
|
|
||||||
git commit -m "test(#19): ensure invalid parse does not publish partial sessions"
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### Task 4: RED — тест atomicity при сбое отправки batch-сообщения
|
|
||||||
|
|
||||||
**Objective:** В `CreateSessionHandler` `batch_message_id` обновляется ПОСЛЕ `transaction.Commit()`. Если отправка сообщения в Telegram падает, сессии созданы, но `batch_message_id` не записан — игроки не увидят карточку. Нужно либо доказать, что это обработано, либо исправить.
|
|
||||||
|
|
||||||
**Files:**
|
|
||||||
- Modify: `src/GmRelay.Bot/Features/Sessions/CreateSession/CreateSessionHandler.cs`
|
|
||||||
|
|
||||||
**Step 1: Анализ кода**
|
|
||||||
|
|
||||||
Текущий порядок в `CreateSessionHandler`:
|
|
||||||
1. Валидация (до транзакции) ✓
|
|
||||||
2. `BEGIN TRANSACTION`
|
|
||||||
3. INSERT players, groups, sessions
|
|
||||||
4. `COMMIT`
|
|
||||||
5. `SessionBatchRenderer.Render`
|
|
||||||
6. `botClient.SendMessage/SendPhoto`
|
|
||||||
7. `UPDATE sessions SET batch_message_id = ...` (вне транзакции!)
|
|
||||||
|
|
||||||
Если шаг 6 падает — сессии «висят» без published message. Это частичное создание.
|
|
||||||
|
|
||||||
**Step 2: Write minimal fix**
|
|
||||||
|
|
||||||
Обернуть отправку сообщения и обновление `batch_message_id` в retry-loop с fallback. Если после N попыток не удалось — отправить GM уведомление об ошибке и оставить сессии (не удалять, чтобы не терять данные), но сделать так, чтобы `batch_message_id` обновлялся только при успешной отправке.
|
|
||||||
|
|
||||||
```csharp
|
|
||||||
// Внутри CreateSessionHandler, после Commit:
|
|
||||||
Message? batchMessage = null;
|
|
||||||
var sendAttempts = 0;
|
|
||||||
const int maxAttempts = 3;
|
|
||||||
Exception? lastSendException = null;
|
|
||||||
|
|
||||||
while (batchMessage is null && sendAttempts < maxAttempts)
|
|
||||||
{
|
|
||||||
sendAttempts++;
|
|
||||||
try
|
|
||||||
{
|
|
||||||
batchMessage = await SendBatchMessageAsync(...); // extracted method
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
lastSendException = ex;
|
|
||||||
logger.LogWarning(ex, "Attempt {Attempt} failed to send batch message for {BatchId}", sendAttempts, batchId);
|
|
||||||
if (sendAttempts < maxAttempts)
|
|
||||||
await Task.Delay(TimeSpan.FromSeconds(1), cancellationToken);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (batchMessage is not null)
|
|
||||||
{
|
|
||||||
await connection.ExecuteAsync(
|
|
||||||
"UPDATE sessions SET batch_message_id = @MsgId WHERE batch_id = @BatchId",
|
|
||||||
new { MsgId = batchMessage.MessageId, BatchId = batchId });
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
logger.LogError(lastSendException, "Failed to send batch message for {BatchId} after {MaxAttempts} attempts", batchId, maxAttempts);
|
|
||||||
await botClient.SendMessage(
|
|
||||||
chatId,
|
|
||||||
$"⚠️ Сессии созданы, но не удалось опубликовать карточку. Пожалуйста, используйте /listsessions.\n\nОшибка: {lastSendException?.Message}",
|
|
||||||
cancellationToken: cancellationToken);
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
**Step 3: Extract helper**
|
|
||||||
|
|
||||||
Выделить метод `SendBatchMessageAsync` из текущего inline-кода отправки (строки 117–176 в текущем файле), чтобы логика была читаемой и тестируемой.
|
|
||||||
|
|
||||||
**Step 4: Run tests**
|
|
||||||
|
|
||||||
Run: `dotnet test tests/GmRelay.Bot.Tests/ -v n`
|
|
||||||
|
|
||||||
Expected: все существующие тесты PASS, новая логика не ломает smoke-тест (т.к. smoke-тест не использует реальный `CreateSessionHandler`).
|
|
||||||
|
|
||||||
**Step 5: Commit**
|
|
||||||
|
|
||||||
```bash
|
|
||||||
git add src/GmRelay.Bot/Features/Sessions/CreateSession/CreateSessionHandler.cs
|
|
||||||
git commit -m "fix(#19): retry batch message send and prevent orphaned sessions without batch_message_id"
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### Task 5: RED — smoke-тест полного landing-сценария с явными датами
|
|
||||||
|
|
||||||
**Objective:** Дополнить `TelegramLandingPromisesSmokeTests` полным сквозным сценарием: парсинг → публикация → запись → выход → проверка карточки.
|
|
||||||
|
|
||||||
**Files:**
|
|
||||||
- Modify: `tests/GmRelay.Bot.Tests/Features/Landing/TelegramLandingPromisesSmokeTests.cs`
|
|
||||||
|
|
||||||
**Step 1: Write failing test**
|
|
||||||
|
|
||||||
```csharp
|
|
||||||
[Fact]
|
|
||||||
public void Smoke_LandingExplicitDatesBatch_ShouldSupportFullLifecycle()
|
|
||||||
{
|
|
||||||
var nowUtc = new DateTimeOffset(2026, 5, 1, 12, 0, 0, TimeSpan.Zero);
|
|
||||||
var text = """
|
|
||||||
/newsession
|
|
||||||
Название: Landing Explicit Batch
|
|
||||||
Время: 15.05.2026 19:30
|
|
||||||
Время: 22.05.2026 19:30
|
|
||||||
Мест: 3
|
|
||||||
Ссылка: https://example.test/explicit
|
|
||||||
""";
|
|
||||||
|
|
||||||
var parseResult = NewSessionCommandParser.Parse(text, nowUtc);
|
|
||||||
Assert.True(parseResult.IsValid);
|
|
||||||
Assert.Equal(2, parseResult.ScheduledTimes.Count);
|
|
||||||
Assert.Equal(3, parseResult.MaxPlayers);
|
|
||||||
|
|
||||||
var scenario = TelegramLandingSmokeScenario.Publish(parseResult, SessionNotificationMode.GroupAndDirect);
|
|
||||||
Assert.Contains("Landing Explicit Batch", scenario.LastMessage.Text);
|
|
||||||
Assert.Contains("15 мая 2026, 19:30", scenario.LastMessage.Text);
|
|
||||||
Assert.Contains("22 мая 2026, 19:30", scenario.LastMessage.Text);
|
|
||||||
Assert.Contains("Места: 0/3", scenario.LastMessage.Text);
|
|
||||||
|
|
||||||
var callbacks = CallbackData(scenario.LastMessage.Markup);
|
|
||||||
Assert.Equal(4, callbacks.Count); // join+leave для каждой из 2 сессий
|
|
||||||
|
|
||||||
var firstSessionId = scenario.Sessions[0].Id;
|
|
||||||
var alice = scenario.Join(firstSessionId, 1001, "Alice", "alice");
|
|
||||||
var bob = scenario.Join(firstSessionId, 1002, "Bob", "bob");
|
|
||||||
var carol = scenario.Join(firstSessionId, 1003, "Carol", "carol");
|
|
||||||
|
|
||||||
Assert.Equal(ParticipantRegistrationStatus.Active, scenario.RegistrationStatus(firstSessionId, alice));
|
|
||||||
Assert.Equal(ParticipantRegistrationStatus.Active, scenario.RegistrationStatus(firstSessionId, bob));
|
|
||||||
Assert.Equal(ParticipantRegistrationStatus.Waitlisted, scenario.RegistrationStatus(firstSessionId, carol));
|
|
||||||
Assert.Contains("Места: 2/3", scenario.LastMessage.Text);
|
|
||||||
Assert.Contains("@alice", scenario.LastMessage.Text);
|
|
||||||
Assert.Contains("@bob", scenario.LastMessage.Text);
|
|
||||||
Assert.Contains("@carol", scenario.LastMessage.Text);
|
|
||||||
|
|
||||||
scenario.Leave(firstSessionId, alice);
|
|
||||||
Assert.False(scenario.HasParticipant(firstSessionId, alice));
|
|
||||||
Assert.Equal(ParticipantRegistrationStatus.Active, scenario.RegistrationStatus(firstSessionId, carol));
|
|
||||||
Assert.DoesNotContain("@alice", scenario.LastMessage.Text);
|
|
||||||
Assert.Contains("@carol", scenario.LastMessage.Text);
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
**Step 2: Run test to verify failure**
|
|
||||||
|
|
||||||
Run: `dotnet test tests/GmRelay.Bot.Tests/ --filter "FullyQualifiedName~Smoke_LandingExplicitDatesBatch_ShouldSupportFullLifecycle" -v n`
|
|
||||||
|
|
||||||
Expected: PASS (функциональность уже существует, тест добавляет регрессионное покрытие).
|
|
||||||
|
|
||||||
**Step 3: Commit**
|
|
||||||
|
|
||||||
```bash
|
|
||||||
git add tests/GmRelay.Bot.Tests/Features/Landing/TelegramLandingPromisesSmokeTests.cs
|
|
||||||
git commit -m "test(#19): full lifecycle smoke test for explicit-dates landing batch"
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### Task 6: Проверка и обновление `/help` текста
|
|
||||||
|
|
||||||
**Objective:** Убедиться, что текст `/help` точно отражает landing-формат и упоминает batch-сценарий.
|
|
||||||
|
|
||||||
**Files:**
|
|
||||||
- Modify: `src/GmRelay.Bot/Infrastructure/Telegram/UpdateRouter.cs`
|
|
||||||
|
|
||||||
**Step 1: Read current `/help` text**
|
|
||||||
|
|
||||||
Текущий `/help` уже содержит:
|
|
||||||
```
|
|
||||||
/newsession
|
|
||||||
Название: My Game
|
|
||||||
Время: 15.05.2026 19:30
|
|
||||||
Время: 22.05.2026 19:30
|
|
||||||
Мест: 4
|
|
||||||
Ссылка: https://link
|
|
||||||
Картинка: https://cover
|
|
||||||
|
|
||||||
Для регулярного расписания можно указать одну дату:
|
|
||||||
Игр: 4
|
|
||||||
Интервал: 7
|
|
||||||
```
|
|
||||||
|
|
||||||
**Step 2: Verify alignment**
|
|
||||||
|
|
||||||
- Формат совпадает с лендингом ✓
|
|
||||||
- Упоминается `Мест:` ✓
|
|
||||||
- Упоминается несколько `Время:` ✓
|
|
||||||
- Упоминается `Ссылка:` ✓
|
|
||||||
|
|
||||||
Никаких изменений не требуется. Если тестировщик считает, что help недостаточно явно описывает batch-сценарий — добавить заголовок:
|
|
||||||
```
|
|
||||||
<b>Создать набор сессий (batch):</b>
|
|
||||||
```
|
|
||||||
|
|
||||||
**Step 3: Commit (если изменения были)**
|
|
||||||
|
|
||||||
```bash
|
|
||||||
git add src/GmRelay.Bot/Infrastructure/Telegram/UpdateRouter.cs
|
|
||||||
git commit -m "docs(#19): clarify batch scenario in /help text"
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### Task 7: Финальный прогон и cleanup
|
|
||||||
|
|
||||||
**Objective:** Убедиться, что все тесты проходят, нет warnings, и план соответствует acceptance criteria.
|
|
||||||
|
|
||||||
**Files:**
|
|
||||||
- Все изменённые файлы
|
|
||||||
|
|
||||||
**Step 1: Run full test suite**
|
|
||||||
|
|
||||||
```bash
|
|
||||||
dotnet test tests/GmRelay.Bot.Tests/ -v n
|
|
||||||
```
|
|
||||||
|
|
||||||
Expected: все тесты PASS.
|
|
||||||
|
|
||||||
**Step 2: Verify checklist**
|
|
||||||
|
|
||||||
- [ ] `Parse_ShouldHandleLandingBatchWithMultipleExplicitDates` — PASS
|
|
||||||
- [ ] `Render_ShouldProduceLandingBatchCardWithAllRequiredElements` — PASS
|
|
||||||
- [ ] `Smoke_InvalidNewSession_ShouldNotPublishAnySessions` — PASS
|
|
||||||
- [ ] `Smoke_LandingExplicitDatesBatch_ShouldSupportFullLifecycle` — PASS
|
|
||||||
- [ ] Все существующие тесты — PASS
|
|
||||||
- [ ] `CreateSessionHandler` обрабатывает сбой отправки batch-сообщения (retry + fallback)
|
|
||||||
- [ ] `/help` текст соответствует landing-формату
|
|
||||||
- [ ] Никаких новых warnings при сборке
|
|
||||||
|
|
||||||
**Step 3: Commit финальный**
|
|
||||||
|
|
||||||
```bash
|
|
||||||
git add -A
|
|
||||||
git commit -m "feat(#19): align /newsession with landing batch scenario — tests + atomicity fix"
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Acceptance Criteria Verification
|
|
||||||
|
|
||||||
| Критерий | Статус | Покрытие |
|
|
||||||
|---|---|---|
|
|
||||||
| Мастер может создать batch из нескольких дат | ✅ Реализовано | Task 1, Task 5 |
|
|
||||||
| Карточка содержит название, даты, лимит, заполненность, действия | ✅ Реализовано | Task 2, Task 5 |
|
|
||||||
| Ошибки ввода не создают частичных сессий | ✅ Реализовано (валидация до транзакции) | Task 3 |
|
|
||||||
| Сбой публикации карточки не оставляет «висячие» сессии без `batch_message_id` | 🔄 Фиксится | Task 4 |
|
|
||||||
|
|
||||||
## Execution Handoff
|
|
||||||
|
|
||||||
Plan complete and saved to `.hermes/plans/gmrelay-issue-19.md`. Ready to execute using subagent-driven-development — dispatch a fresh subagent per task with two-stage review (spec compliance then code quality). Shall I proceed?
|
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
<Project>
|
<Project>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<Version>1.15.0</Version>
|
<Version>2.0.0</Version>
|
||||||
<TargetFramework>net10.0</TargetFramework>
|
<TargetFramework>net10.0</TargetFramework>
|
||||||
<LangVersion>preview</LangVersion>
|
<LangVersion>preview</LangVersion>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
|
|||||||
@@ -0,0 +1,21 @@
|
|||||||
|
MIT License
|
||||||
|
|
||||||
|
Copyright (c) 2026 Toutsu
|
||||||
|
|
||||||
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
|
in the Software without restriction, including without limitation the rights
|
||||||
|
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
copies of the Software, and to permit persons to whom the Software is
|
||||||
|
furnished to do so, subject to the following conditions:
|
||||||
|
|
||||||
|
The above copyright notice and this permission notice shall be included in all
|
||||||
|
copies or substantial portions of the Software.
|
||||||
|
|
||||||
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||||
|
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
||||||
|
IN THE SOFTWARE.
|
||||||
+12
-2
@@ -49,7 +49,7 @@ services:
|
|||||||
crond -f
|
crond -f
|
||||||
|
|
||||||
bot:
|
bot:
|
||||||
image: git.codeanddice.ru/toutsu/gmrelay-bot:1.15.0
|
image: git.codeanddice.ru/toutsu/gmrelay-bot:2.0.0
|
||||||
restart: always
|
restart: always
|
||||||
depends_on:
|
depends_on:
|
||||||
db:
|
db:
|
||||||
@@ -60,9 +60,14 @@ services:
|
|||||||
- "Telegram__MiniAppUrl=${TELEGRAM_MINI_APP_URL:-}"
|
- "Telegram__MiniAppUrl=${TELEGRAM_MINI_APP_URL:-}"
|
||||||
networks:
|
networks:
|
||||||
- gmrelay
|
- gmrelay
|
||||||
|
healthcheck:
|
||||||
|
test: ["CMD-SHELL", "wget -qO- http://localhost:8081/health || exit 1"]
|
||||||
|
interval: 10s
|
||||||
|
timeout: 5s
|
||||||
|
retries: 3
|
||||||
|
|
||||||
web:
|
web:
|
||||||
image: git.codeanddice.ru/toutsu/gmrelay-web:1.15.0
|
image: git.codeanddice.ru/toutsu/gmrelay-web:2.0.0
|
||||||
restart: always
|
restart: always
|
||||||
depends_on:
|
depends_on:
|
||||||
db:
|
db:
|
||||||
@@ -78,6 +83,11 @@ services:
|
|||||||
- web_keys:/app/dataprotection-keys
|
- web_keys:/app/dataprotection-keys
|
||||||
networks:
|
networks:
|
||||||
- gmrelay
|
- gmrelay
|
||||||
|
healthcheck:
|
||||||
|
test: ["CMD-SHELL", "wget -qO- http://localhost:8080/health || exit 1"]
|
||||||
|
interval: 10s
|
||||||
|
timeout: 5s
|
||||||
|
retries: 3
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
pgdata:
|
pgdata:
|
||||||
|
|||||||
@@ -30,9 +30,15 @@ RUN dotnet publish "GmRelay.Bot.csproj" -c Release -a $TARGETARCH -o /app/publis
|
|||||||
FROM mcr.microsoft.com/dotnet/runtime-deps:10.0-noble AS final
|
FROM mcr.microsoft.com/dotnet/runtime-deps:10.0-noble AS final
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
|
# Устанавливаем wget для healthcheck
|
||||||
|
RUN apt-get update && apt-get install -y --no-install-recommends wget \
|
||||||
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
# Копируем только AOT-результаты из билда
|
# Копируем только AOT-результаты из билда
|
||||||
COPY --from=build /app/publish .
|
COPY --from=build /app/publish .
|
||||||
|
|
||||||
|
EXPOSE 8081
|
||||||
|
|
||||||
USER $APP_UID
|
USER $APP_UID
|
||||||
|
|
||||||
# Запуск скомпилированного AOT бинарного файла напрямую
|
# Запуск скомпилированного AOT бинарного файла напрямую
|
||||||
|
|||||||
@@ -77,11 +77,14 @@ public sealed class CreateSessionHandler(
|
|||||||
{
|
{
|
||||||
await connection.ExecuteAsync(
|
await connection.ExecuteAsync(
|
||||||
"""
|
"""
|
||||||
INSERT INTO players (telegram_id, display_name, telegram_username)
|
INSERT INTO players (telegram_id, display_name, telegram_username, platform, external_user_id, external_username)
|
||||||
VALUES (@TgId, @Name, @Username)
|
VALUES (@TgId, @Name, @Username, 'Telegram', @TgId::TEXT, @Username)
|
||||||
ON CONFLICT (telegram_id) DO UPDATE
|
ON CONFLICT (telegram_id) DO UPDATE
|
||||||
SET display_name = EXCLUDED.display_name,
|
SET display_name = EXCLUDED.display_name,
|
||||||
telegram_username = EXCLUDED.telegram_username;
|
telegram_username = EXCLUDED.telegram_username,
|
||||||
|
platform = COALESCE(players.platform, 'Telegram'),
|
||||||
|
external_user_id = COALESCE(players.external_user_id, EXCLUDED.telegram_id::TEXT),
|
||||||
|
external_username = COALESCE(players.external_username, EXCLUDED.telegram_username);
|
||||||
""",
|
""",
|
||||||
new { TgId = gmId, Name = gmName, Username = gmUsername },
|
new { TgId = gmId, Name = gmName, Username = gmUsername },
|
||||||
transaction);
|
transaction);
|
||||||
@@ -94,10 +97,10 @@ public sealed class CreateSessionHandler(
|
|||||||
FROM group_managers gm
|
FROM group_managers gm
|
||||||
JOIN players p ON p.id = gm.player_id
|
JOIN players p ON p.id = gm.player_id
|
||||||
WHERE gm.group_id = g.id
|
WHERE gm.group_id = g.id
|
||||||
AND p.telegram_id = @GmId
|
AND COALESCE(p.external_user_id, p.telegram_id::TEXT) = @GmId::TEXT
|
||||||
) AS CanManage
|
) AS CanManage
|
||||||
FROM game_groups g
|
FROM game_groups g
|
||||||
WHERE g.telegram_chat_id = @ChatId
|
WHERE COALESCE(g.external_group_id, g.telegram_chat_id::TEXT) = @ChatId::TEXT
|
||||||
""",
|
""",
|
||||||
new { ChatId = chatId, GmId = gmId },
|
new { ChatId = chatId, GmId = gmId },
|
||||||
transaction);
|
transaction);
|
||||||
@@ -107,8 +110,8 @@ public sealed class CreateSessionHandler(
|
|||||||
{
|
{
|
||||||
groupId = await connection.ExecuteScalarAsync<Guid>(
|
groupId = await connection.ExecuteScalarAsync<Guid>(
|
||||||
"""
|
"""
|
||||||
INSERT INTO game_groups (telegram_chat_id, name, gm_telegram_id)
|
INSERT INTO game_groups (telegram_chat_id, name, gm_telegram_id, platform, external_group_id)
|
||||||
VALUES (@ChatId, @ChatName, @GmId)
|
VALUES (@ChatId, @ChatName, @GmId, 'Telegram', @ChatId::TEXT)
|
||||||
RETURNING id;
|
RETURNING id;
|
||||||
""",
|
""",
|
||||||
new { ChatId = chatId, ChatName = chatTitle, GmId = gmId },
|
new { ChatId = chatId, ChatName = chatTitle, GmId = gmId },
|
||||||
@@ -119,7 +122,7 @@ public sealed class CreateSessionHandler(
|
|||||||
INSERT INTO group_managers (group_id, player_id, role)
|
INSERT INTO group_managers (group_id, player_id, role)
|
||||||
SELECT @GroupId, p.id, @OwnerRole
|
SELECT @GroupId, p.id, @OwnerRole
|
||||||
FROM players p
|
FROM players p
|
||||||
WHERE p.telegram_id = @GmId
|
WHERE COALESCE(p.external_user_id, p.telegram_id::TEXT) = @GmId::TEXT
|
||||||
ON CONFLICT (group_id, player_id) DO NOTHING
|
ON CONFLICT (group_id, player_id) DO NOTHING
|
||||||
""",
|
""",
|
||||||
new { GroupId = groupId, GmId = gmId, OwnerRole = GroupManagerRoleExtensions.OwnerValue },
|
new { GroupId = groupId, GmId = gmId, OwnerRole = GroupManagerRoleExtensions.OwnerValue },
|
||||||
|
|||||||
@@ -35,9 +35,14 @@ public sealed class JoinSessionHandler(
|
|||||||
{
|
{
|
||||||
// 1. Убеждаемся, что игрок есть в базе
|
// 1. Убеждаемся, что игрок есть в базе
|
||||||
var playerId = await connection.ExecuteScalarAsync<Guid>(
|
var playerId = await connection.ExecuteScalarAsync<Guid>(
|
||||||
@"INSERT INTO players (telegram_id, display_name, telegram_username)
|
@"INSERT INTO players (telegram_id, display_name, telegram_username, platform, external_user_id, external_username)
|
||||||
VALUES (@TgId, @Name, @Username)
|
VALUES (@TgId, @Name, @Username, 'Telegram', @TgId::TEXT, @Username)
|
||||||
ON CONFLICT (telegram_id) DO UPDATE SET display_name = EXCLUDED.display_name, telegram_username = EXCLUDED.telegram_username
|
ON CONFLICT (telegram_id) DO UPDATE
|
||||||
|
SET display_name = EXCLUDED.display_name,
|
||||||
|
telegram_username = EXCLUDED.telegram_username,
|
||||||
|
platform = COALESCE(players.platform, 'Telegram'),
|
||||||
|
external_user_id = COALESCE(players.external_user_id, EXCLUDED.telegram_id::TEXT),
|
||||||
|
external_username = COALESCE(players.external_username, EXCLUDED.telegram_username)
|
||||||
RETURNING id;",
|
RETURNING id;",
|
||||||
new { TgId = command.TelegramUserId, Name = command.DisplayName, Username = command.TelegramUsername },
|
new { TgId = command.TelegramUserId, Name = command.DisplayName, Username = command.TelegramUsername },
|
||||||
transaction);
|
transaction);
|
||||||
|
|||||||
@@ -0,0 +1,101 @@
|
|||||||
|
using System.Net;
|
||||||
|
|
||||||
|
namespace GmRelay.Bot.Infrastructure.Health;
|
||||||
|
|
||||||
|
public sealed class BotHealthCheckHostedService : IHostedService
|
||||||
|
{
|
||||||
|
private readonly ILogger<BotHealthCheckHostedService> _logger;
|
||||||
|
private readonly string _prefix;
|
||||||
|
private HttpListener? _listener;
|
||||||
|
private CancellationTokenSource? _cts;
|
||||||
|
private Task? _listenerTask;
|
||||||
|
|
||||||
|
public BotHealthCheckHostedService(
|
||||||
|
ILogger<BotHealthCheckHostedService> logger,
|
||||||
|
IConfiguration configuration)
|
||||||
|
{
|
||||||
|
_logger = logger;
|
||||||
|
_prefix = configuration.GetValue("HealthCheck:Prefix", "http://+:8081/")!;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Task StartAsync(CancellationToken cancellationToken)
|
||||||
|
{
|
||||||
|
_cts = new CancellationTokenSource();
|
||||||
|
_listener = new HttpListener();
|
||||||
|
_listener.Prefixes.Add(_prefix);
|
||||||
|
_listener.Start();
|
||||||
|
|
||||||
|
_logger.LogInformation("Health check server started on {Prefix}", _prefix);
|
||||||
|
|
||||||
|
_listenerTask = Task.Run(async () => await ListenAsync(_cts.Token), cancellationToken);
|
||||||
|
|
||||||
|
return Task.CompletedTask;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task StopAsync(CancellationToken cancellationToken)
|
||||||
|
{
|
||||||
|
_cts?.Cancel();
|
||||||
|
_listener?.Stop();
|
||||||
|
|
||||||
|
if (_listenerTask != null)
|
||||||
|
{
|
||||||
|
await Task.WhenAny(_listenerTask, Task.Delay(TimeSpan.FromSeconds(5), cancellationToken));
|
||||||
|
}
|
||||||
|
|
||||||
|
_listener?.Close();
|
||||||
|
_logger.LogInformation("Health check server stopped");
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task ListenAsync(CancellationToken cancellationToken)
|
||||||
|
{
|
||||||
|
while (_listener?.IsListening == true && !cancellationToken.IsCancellationRequested)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var context = await _listener.GetContextAsync();
|
||||||
|
_ = Task.Run(() => HandleRequestAsync(context), cancellationToken);
|
||||||
|
}
|
||||||
|
catch (HttpListenerException) when (cancellationToken.IsCancellationRequested)
|
||||||
|
{
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
catch (ObjectDisposedException)
|
||||||
|
{
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
_logger.LogError(ex, "Error in health check listener");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task HandleRequestAsync(HttpListenerContext context)
|
||||||
|
{
|
||||||
|
var response = context.Response;
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var request = context.Request;
|
||||||
|
|
||||||
|
if (request.Url?.AbsolutePath == "/health")
|
||||||
|
{
|
||||||
|
response.StatusCode = (int)HttpStatusCode.OK;
|
||||||
|
response.ContentType = "application/json";
|
||||||
|
var body = "{\"status\":\"healthy\"}"u8.ToArray();
|
||||||
|
await response.OutputStream.WriteAsync(body);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
response.StatusCode = (int)HttpStatusCode.NotFound;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
_logger.LogError(ex, "Error handling health check request");
|
||||||
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
response.Close();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -47,7 +47,7 @@ BEGIN
|
|||||||
SELECT
|
SELECT
|
||||||
pt.player_id,
|
pt.player_id,
|
||||||
p.display_name,
|
p.display_name,
|
||||||
p.telegram_username,
|
COALESCE(p.external_username, p.telegram_username) AS telegram_username,
|
||||||
pt.total_sessions,
|
pt.total_sessions,
|
||||||
pt.confirmed_count,
|
pt.confirmed_count,
|
||||||
pt.declined_count,
|
pt.declined_count,
|
||||||
|
|||||||
@@ -0,0 +1,119 @@
|
|||||||
|
-- =============================================================
|
||||||
|
-- V016: Add platform identity columns and platform_messages table
|
||||||
|
-- =============================================================
|
||||||
|
-- Scope: Prepare schema for multi-platform support (Discord, etc).
|
||||||
|
-- Legacy telegram_* columns are retained for backward compatibility.
|
||||||
|
-- =============================================================
|
||||||
|
|
||||||
|
-- -- Players: platform-agnostic identity
|
||||||
|
ALTER TABLE players
|
||||||
|
ADD COLUMN platform VARCHAR(50),
|
||||||
|
ADD COLUMN external_user_id VARCHAR(255),
|
||||||
|
ADD COLUMN external_username VARCHAR(255);
|
||||||
|
|
||||||
|
CREATE UNIQUE INDEX ix_players_platform_external_user_id
|
||||||
|
ON players (platform, external_user_id)
|
||||||
|
WHERE platform IS NOT NULL AND external_user_id IS NOT NULL;
|
||||||
|
|
||||||
|
-- -- Game groups: platform-agnostic identity
|
||||||
|
ALTER TABLE game_groups
|
||||||
|
ADD COLUMN platform VARCHAR(50),
|
||||||
|
ADD COLUMN external_group_id VARCHAR(255),
|
||||||
|
ADD COLUMN external_channel_id VARCHAR(255);
|
||||||
|
|
||||||
|
CREATE UNIQUE INDEX ix_game_groups_platform_external_group_id
|
||||||
|
ON game_groups (platform, external_group_id)
|
||||||
|
WHERE platform IS NOT NULL AND external_group_id IS NOT NULL;
|
||||||
|
|
||||||
|
-- -- Backfill existing Telegram data
|
||||||
|
UPDATE players
|
||||||
|
SET platform = 'Telegram',
|
||||||
|
external_user_id = telegram_id::TEXT,
|
||||||
|
external_username = telegram_username
|
||||||
|
WHERE platform IS NULL;
|
||||||
|
|
||||||
|
UPDATE game_groups
|
||||||
|
SET platform = 'Telegram',
|
||||||
|
external_group_id = telegram_chat_id::TEXT
|
||||||
|
WHERE platform IS NULL;
|
||||||
|
|
||||||
|
-- -- Platform messages: store per-platform message references
|
||||||
|
CREATE TABLE platform_messages (
|
||||||
|
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||||
|
platform VARCHAR(50) NOT NULL,
|
||||||
|
group_id UUID REFERENCES game_groups(id) ON DELETE CASCADE,
|
||||||
|
batch_id UUID,
|
||||||
|
session_id UUID REFERENCES sessions(id) ON DELETE CASCADE,
|
||||||
|
external_channel_id VARCHAR(255),
|
||||||
|
external_thread_id VARCHAR(255),
|
||||||
|
external_message_id VARCHAR(255) NOT NULL,
|
||||||
|
purpose VARCHAR(50) NOT NULL,
|
||||||
|
created_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE INDEX ix_platform_messages_group_id ON platform_messages(group_id);
|
||||||
|
CREATE INDEX ix_platform_messages_batch_id ON platform_messages(batch_id);
|
||||||
|
CREATE INDEX ix_platform_messages_session_id ON platform_messages(session_id);
|
||||||
|
CREATE INDEX ix_platform_messages_platform_message
|
||||||
|
ON platform_messages (platform, external_message_id);
|
||||||
|
|
||||||
|
-- -- Recreate attendance stats function for new columns (prod back-compat)
|
||||||
|
CREATE OR REPLACE FUNCTION get_group_attendance_stats(p_group_id UUID)
|
||||||
|
RETURNS TABLE (
|
||||||
|
player_id UUID,
|
||||||
|
display_name VARCHAR,
|
||||||
|
telegram_username VARCHAR,
|
||||||
|
total_sessions BIGINT,
|
||||||
|
confirmed_count BIGINT,
|
||||||
|
declined_count BIGINT,
|
||||||
|
no_response_count BIGINT,
|
||||||
|
waitlisted_count BIGINT,
|
||||||
|
cancellation_affected_count BIGINT,
|
||||||
|
attendance_rate NUMERIC
|
||||||
|
) AS $$
|
||||||
|
BEGIN
|
||||||
|
RETURN QUERY
|
||||||
|
WITH player_sessions AS (
|
||||||
|
SELECT
|
||||||
|
sp.player_id,
|
||||||
|
s.id AS session_id,
|
||||||
|
sp.rsvp_status,
|
||||||
|
sp.registration_status,
|
||||||
|
s.status AS session_status,
|
||||||
|
s.scheduled_at
|
||||||
|
FROM session_participants sp
|
||||||
|
JOIN sessions s ON s.id = sp.session_id
|
||||||
|
WHERE s.group_id = p_group_id
|
||||||
|
),
|
||||||
|
player_totals AS (
|
||||||
|
SELECT
|
||||||
|
ps.player_id,
|
||||||
|
COUNT(*) FILTER (WHERE ps.session_status <> 'Cancelled') AS total_sessions,
|
||||||
|
COUNT(*) FILTER (WHERE ps.rsvp_status = 'Confirmed' AND ps.session_status <> 'Cancelled') AS confirmed_count,
|
||||||
|
COUNT(*) FILTER (WHERE ps.rsvp_status = 'Declined' AND ps.session_status <> 'Cancelled') AS declined_count,
|
||||||
|
COUNT(*) FILTER (WHERE ps.rsvp_status = 'Pending' AND ps.scheduled_at < NOW() AND ps.session_status <> 'Cancelled') AS no_response_count,
|
||||||
|
COUNT(*) FILTER (WHERE ps.registration_status = 'Waitlisted' AND ps.session_status <> 'Cancelled') AS waitlisted_count,
|
||||||
|
COUNT(*) FILTER (WHERE ps.session_status = 'Cancelled') AS cancellation_affected_count
|
||||||
|
FROM player_sessions ps
|
||||||
|
GROUP BY ps.player_id
|
||||||
|
)
|
||||||
|
SELECT
|
||||||
|
pt.player_id,
|
||||||
|
p.display_name,
|
||||||
|
COALESCE(p.external_username, p.telegram_username) AS telegram_username,
|
||||||
|
pt.total_sessions,
|
||||||
|
pt.confirmed_count,
|
||||||
|
pt.declined_count,
|
||||||
|
pt.no_response_count,
|
||||||
|
pt.waitlisted_count,
|
||||||
|
pt.cancellation_affected_count,
|
||||||
|
ROUND(
|
||||||
|
100.0 * pt.confirmed_count
|
||||||
|
/ NULLIF(pt.total_sessions, 0),
|
||||||
|
1
|
||||||
|
) AS attendance_rate
|
||||||
|
FROM player_totals pt
|
||||||
|
JOIN players p ON p.id = pt.player_id
|
||||||
|
ORDER BY pt.confirmed_count DESC, pt.total_sessions DESC;
|
||||||
|
END;
|
||||||
|
$$ LANGUAGE plpgsql STABLE;
|
||||||
@@ -6,6 +6,7 @@ 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;
|
||||||
|
using GmRelay.Bot.Infrastructure.Health;
|
||||||
using GmRelay.Bot.Infrastructure.Logging;
|
using GmRelay.Bot.Infrastructure.Logging;
|
||||||
using GmRelay.Bot.Infrastructure.Scheduling;
|
using GmRelay.Bot.Infrastructure.Scheduling;
|
||||||
using GmRelay.Bot.Infrastructure.Telegram;
|
using GmRelay.Bot.Infrastructure.Telegram;
|
||||||
@@ -85,6 +86,9 @@ builder.Services.AddSingleton<ISessionTriggerStore, DbSessionTriggerStore>();
|
|||||||
builder.Services.AddHostedService<SessionSchedulerService>();
|
builder.Services.AddHostedService<SessionSchedulerService>();
|
||||||
builder.Services.AddHostedService<RescheduleVotingDeadlineService>();
|
builder.Services.AddHostedService<RescheduleVotingDeadlineService>();
|
||||||
|
|
||||||
|
// ── Health check server ──────────────────────────────────────────────
|
||||||
|
builder.Services.AddHostedService<BotHealthCheckHostedService>();
|
||||||
|
|
||||||
var host = builder.Build();
|
var host = builder.Build();
|
||||||
|
|
||||||
// ── Run database migrations on startup ───────────────────────────────
|
// ── Run database migrations on startup ───────────────────────────────
|
||||||
|
|||||||
@@ -56,7 +56,7 @@
|
|||||||
</button>
|
</button>
|
||||||
</form>
|
</form>
|
||||||
|
|
||||||
<div class="nav-version">v1.15.0</div>
|
<div class="nav-version">v2.0.0</div>
|
||||||
</div>
|
</div>
|
||||||
</Authorized>
|
</Authorized>
|
||||||
<NotAuthorized>
|
<NotAuthorized>
|
||||||
|
|||||||
@@ -18,8 +18,9 @@ RUN dotnet publish "GmRelay.Web.csproj" -c Release -o /app/publish /p:UseAppHost
|
|||||||
# Stage 2: Runtime
|
# Stage 2: Runtime
|
||||||
FROM mcr.microsoft.com/dotnet/aspnet:10.0-noble AS final
|
FROM mcr.microsoft.com/dotnet/aspnet:10.0-noble AS final
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
RUN apt-get update && apt-get install -y --no-install-recommends libgssapi-krb5-2 && rm -rf /var/lib/apt/lists/*
|
RUN apt-get update && apt-get install -y --no-install-recommends libgssapi-krb5-2 wget && rm -rf /var/lib/apt/lists/*
|
||||||
COPY --from=build /app/publish .
|
COPY --from=build /app/publish .
|
||||||
|
RUN mkdir -p /app/dataprotection-keys && chown -R $APP_UID:$APP_UID /app/dataprotection-keys
|
||||||
ENV ASPNETCORE_URLS=http://+:8080
|
ENV ASPNETCORE_URLS=http://+:8080
|
||||||
EXPOSE 8080
|
EXPOSE 8080
|
||||||
USER $APP_UID
|
USER $APP_UID
|
||||||
|
|||||||
@@ -0,0 +1,25 @@
|
|||||||
|
using Microsoft.Extensions.Diagnostics.HealthChecks;
|
||||||
|
using Npgsql;
|
||||||
|
|
||||||
|
namespace GmRelay.Web.Health;
|
||||||
|
|
||||||
|
public sealed class NpgsqlHealthCheck(NpgsqlDataSource dataSource) : IHealthCheck
|
||||||
|
{
|
||||||
|
public async Task<HealthCheckResult> CheckHealthAsync(
|
||||||
|
HealthCheckContext context,
|
||||||
|
CancellationToken cancellationToken = default)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
await using var connection = await dataSource.OpenConnectionAsync(cancellationToken);
|
||||||
|
await using var command = connection.CreateCommand();
|
||||||
|
command.CommandText = "SELECT 1";
|
||||||
|
await command.ExecuteScalarAsync(cancellationToken);
|
||||||
|
return HealthCheckResult.Healthy();
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
return HealthCheckResult.Unhealthy("PostgreSQL is unavailable", ex);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,9 +1,13 @@
|
|||||||
using GmRelay.Web.Components;
|
using GmRelay.Web.Components;
|
||||||
|
using GmRelay.Web.Health;
|
||||||
using GmRelay.Web.Services;
|
using GmRelay.Web.Services;
|
||||||
using Microsoft.AspNetCore.Authentication.Cookies;
|
using Microsoft.AspNetCore.Authentication.Cookies;
|
||||||
using Microsoft.AspNetCore.Authentication;
|
using Microsoft.AspNetCore.Authentication;
|
||||||
using Microsoft.AspNetCore.DataProtection;
|
using Microsoft.AspNetCore.DataProtection;
|
||||||
|
using Microsoft.AspNetCore.Diagnostics.HealthChecks;
|
||||||
|
using Microsoft.Extensions.Diagnostics.HealthChecks;
|
||||||
using System.Security.Claims;
|
using System.Security.Claims;
|
||||||
|
using System.Text.Json;
|
||||||
using Telegram.Bot;
|
using Telegram.Bot;
|
||||||
using Npgsql;
|
using Npgsql;
|
||||||
|
|
||||||
@@ -12,6 +16,10 @@ var builder = WebApplication.CreateBuilder(args);
|
|||||||
// Add Aspire service defaults
|
// Add Aspire service defaults
|
||||||
builder.AddServiceDefaults();
|
builder.AddServiceDefaults();
|
||||||
|
|
||||||
|
// Add health checks
|
||||||
|
builder.Services.AddHealthChecks()
|
||||||
|
.AddCheck<NpgsqlHealthCheck>("npgsql");
|
||||||
|
|
||||||
// Add Data Protection
|
// Add Data Protection
|
||||||
builder.Services.AddDataProtection()
|
builder.Services.AddDataProtection()
|
||||||
.PersistKeysToFileSystem(new DirectoryInfo("/app/dataprotection-keys"));
|
.PersistKeysToFileSystem(new DirectoryInfo("/app/dataprotection-keys"));
|
||||||
@@ -83,6 +91,26 @@ app.MapStaticAssets();
|
|||||||
app.MapRazorComponents<App>()
|
app.MapRazorComponents<App>()
|
||||||
.AddInteractiveServerRenderMode();
|
.AddInteractiveServerRenderMode();
|
||||||
|
|
||||||
|
// Health check endpoints
|
||||||
|
app.MapHealthChecks("/health", new HealthCheckOptions
|
||||||
|
{
|
||||||
|
ResponseWriter = async (context, report) =>
|
||||||
|
{
|
||||||
|
context.Response.ContentType = "application/json";
|
||||||
|
var response = new
|
||||||
|
{
|
||||||
|
status = report.Status == HealthStatus.Healthy ? "healthy" : "unhealthy",
|
||||||
|
timestamp = DateTimeOffset.UtcNow.ToString("O")
|
||||||
|
};
|
||||||
|
await context.Response.WriteAsJsonAsync(response);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
app.MapHealthChecks("/alive", new HealthCheckOptions
|
||||||
|
{
|
||||||
|
Predicate = r => r.Tags.Contains("live")
|
||||||
|
});
|
||||||
|
|
||||||
// Endpoint to handle Telegram Login callback
|
// Endpoint to handle Telegram Login callback
|
||||||
app.MapGet("/auth/telegram", async (HttpContext context, TelegramAuthService authService) =>
|
app.MapGet("/auth/telegram", async (HttpContext context, TelegramAuthService authService) =>
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -242,11 +242,14 @@ public sealed class SessionService(
|
|||||||
|
|
||||||
await conn.ExecuteAsync(
|
await conn.ExecuteAsync(
|
||||||
"""
|
"""
|
||||||
INSERT INTO players (telegram_id, display_name, telegram_username)
|
INSERT INTO players (telegram_id, display_name, telegram_username, platform, external_user_id, external_username)
|
||||||
VALUES (@TelegramId, @DisplayName, @TelegramUsername)
|
VALUES (@TelegramId, @DisplayName, @TelegramUsername, 'Telegram', @TelegramId::TEXT, @TelegramUsername)
|
||||||
ON CONFLICT (telegram_id) DO UPDATE
|
ON CONFLICT (telegram_id) DO UPDATE
|
||||||
SET display_name = EXCLUDED.display_name,
|
SET display_name = EXCLUDED.display_name,
|
||||||
telegram_username = EXCLUDED.telegram_username
|
telegram_username = EXCLUDED.telegram_username,
|
||||||
|
platform = COALESCE(players.platform, 'Telegram'),
|
||||||
|
external_user_id = COALESCE(players.external_user_id, EXCLUDED.telegram_id::TEXT),
|
||||||
|
external_username = COALESCE(players.external_username, EXCLUDED.telegram_username)
|
||||||
""",
|
""",
|
||||||
new
|
new
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -7,8 +7,13 @@
|
|||||||
<IsPackable>false</IsPackable>
|
<IsPackable>false</IsPackable>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<FrameworkReference Include="Microsoft.AspNetCore.App" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="coverlet.collector" Version="6.0.4" />
|
<PackageReference Include="coverlet.collector" Version="6.0.4" />
|
||||||
|
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.5" />
|
||||||
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
|
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
|
||||||
<PackageReference Include="xunit" Version="2.9.3" />
|
<PackageReference Include="xunit" Version="2.9.3" />
|
||||||
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.4" />
|
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.4" />
|
||||||
|
|||||||
@@ -0,0 +1,118 @@
|
|||||||
|
namespace GmRelay.Bot.Tests.Infrastructure.Database;
|
||||||
|
|
||||||
|
public sealed class PlatformIdentityMigrationTests
|
||||||
|
{
|
||||||
|
[Fact]
|
||||||
|
public async Task MigrationV016_ShouldAddPlatformIdentityColumns()
|
||||||
|
{
|
||||||
|
var migration = await ReadRepositoryFileAsync("src/GmRelay.Bot/Migrations/V016__add_platform_identity.sql");
|
||||||
|
|
||||||
|
Assert.Contains("players", migration, StringComparison.Ordinal);
|
||||||
|
Assert.Contains("platform", migration, StringComparison.Ordinal);
|
||||||
|
Assert.Contains("external_user_id", migration, StringComparison.Ordinal);
|
||||||
|
Assert.Contains("external_username", migration, StringComparison.Ordinal);
|
||||||
|
|
||||||
|
Assert.Contains("game_groups", migration, StringComparison.Ordinal);
|
||||||
|
Assert.Contains("external_group_id", migration, StringComparison.Ordinal);
|
||||||
|
Assert.Contains("external_channel_id", migration, StringComparison.Ordinal);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public async Task MigrationV016_ShouldCreatePlatformMessagesTable()
|
||||||
|
{
|
||||||
|
var migration = await ReadRepositoryFileAsync("src/GmRelay.Bot/Migrations/V016__add_platform_identity.sql");
|
||||||
|
|
||||||
|
Assert.Contains("CREATE TABLE platform_messages", migration, StringComparison.Ordinal);
|
||||||
|
Assert.Contains("platform", migration, StringComparison.Ordinal);
|
||||||
|
Assert.Contains("group_id", migration, StringComparison.Ordinal);
|
||||||
|
Assert.Contains("batch_id", migration, StringComparison.Ordinal);
|
||||||
|
Assert.Contains("session_id", migration, StringComparison.Ordinal);
|
||||||
|
Assert.Contains("external_thread_id", migration, StringComparison.Ordinal);
|
||||||
|
Assert.Contains("external_message_id", migration, StringComparison.Ordinal);
|
||||||
|
Assert.Contains("purpose", migration, StringComparison.Ordinal);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public async Task MigrationV016_ShouldBackfillExistingTelegramData()
|
||||||
|
{
|
||||||
|
var migration = await ReadRepositoryFileAsync("src/GmRelay.Bot/Migrations/V016__add_platform_identity.sql");
|
||||||
|
|
||||||
|
Assert.Contains("UPDATE players", migration, StringComparison.Ordinal);
|
||||||
|
Assert.Contains("UPDATE game_groups", migration, StringComparison.Ordinal);
|
||||||
|
Assert.Contains("'Telegram'", migration, StringComparison.Ordinal);
|
||||||
|
Assert.Contains("telegram_id", migration, StringComparison.Ordinal);
|
||||||
|
Assert.Contains("telegram_chat_id", migration, StringComparison.Ordinal);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public async Task MigrationV016_ShouldNotDropLegacyTelegramColumns()
|
||||||
|
{
|
||||||
|
var migration = await ReadRepositoryFileAsync("src/GmRelay.Bot/Migrations/V016__add_platform_identity.sql");
|
||||||
|
|
||||||
|
Assert.DoesNotContain("DROP COLUMN telegram_id", migration, StringComparison.OrdinalIgnoreCase);
|
||||||
|
Assert.DoesNotContain("DROP COLUMN telegram_chat_id", migration, StringComparison.OrdinalIgnoreCase);
|
||||||
|
Assert.DoesNotContain("DROP COLUMN telegram_username", migration, StringComparison.OrdinalIgnoreCase);
|
||||||
|
Assert.DoesNotContain("DROP COLUMN gm_telegram_id", migration, StringComparison.OrdinalIgnoreCase);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public async Task Code_ShouldQueryPlayersUsingExternalUserIdFallback()
|
||||||
|
{
|
||||||
|
var createHandler = await ReadRepositoryFileAsync("src/GmRelay.Bot/Features/Sessions/CreateSession/CreateSessionHandler.cs");
|
||||||
|
|
||||||
|
Assert.Contains("external_user_id", createHandler, StringComparison.Ordinal);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public async Task Code_ShouldQueryGroupsUsingExternalGroupIdFallback()
|
||||||
|
{
|
||||||
|
var createHandler = await ReadRepositoryFileAsync("src/GmRelay.Bot/Features/Sessions/CreateSession/CreateSessionHandler.cs");
|
||||||
|
|
||||||
|
Assert.Contains("external_group_id", createHandler, StringComparison.Ordinal);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public async Task JoinSessionHandler_ShouldDualWritePlatformIdentity()
|
||||||
|
{
|
||||||
|
var handler = await ReadRepositoryFileAsync("src/GmRelay.Bot/Features/Sessions/CreateSession/JoinSessionHandler.cs");
|
||||||
|
|
||||||
|
Assert.Contains("external_user_id", handler, StringComparison.Ordinal);
|
||||||
|
Assert.Contains("external_username", handler, StringComparison.Ordinal);
|
||||||
|
Assert.Contains("platform", handler, StringComparison.Ordinal);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public async Task WebSessionService_ShouldDualWritePlatformIdentity()
|
||||||
|
{
|
||||||
|
var service = await ReadRepositoryFileAsync("src/GmRelay.Web/Services/SessionService.cs");
|
||||||
|
|
||||||
|
Assert.Contains("external_user_id", service, StringComparison.Ordinal);
|
||||||
|
Assert.Contains("external_username", service, StringComparison.Ordinal);
|
||||||
|
Assert.Contains("platform", service, StringComparison.Ordinal);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public async Task AttendanceStatsFunction_ShouldReferenceExternalUsername()
|
||||||
|
{
|
||||||
|
var statsMigration = await ReadRepositoryFileAsync("src/GmRelay.Bot/Migrations/V012__add_attendance_stats.sql");
|
||||||
|
|
||||||
|
Assert.Contains("external_username", statsMigration, StringComparison.Ordinal);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static async Task<string> ReadRepositoryFileAsync(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 await File.ReadAllTextAsync(candidate);
|
||||||
|
}
|
||||||
|
|
||||||
|
directory = directory.Parent;
|
||||||
|
}
|
||||||
|
|
||||||
|
throw new FileNotFoundException($"Could not locate repository file '{relativePath}'.");
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,54 @@
|
|||||||
|
using System.Net;
|
||||||
|
using System.Net.Sockets;
|
||||||
|
using GmRelay.Bot.Infrastructure.Health;
|
||||||
|
using Microsoft.Extensions.Configuration;
|
||||||
|
using Microsoft.Extensions.Logging.Abstractions;
|
||||||
|
|
||||||
|
namespace GmRelay.Bot.Tests.Infrastructure.Health;
|
||||||
|
|
||||||
|
public sealed class BotHealthCheckHostedServiceTests : IDisposable
|
||||||
|
{
|
||||||
|
private readonly BotHealthCheckHostedService _service;
|
||||||
|
private readonly int _port;
|
||||||
|
|
||||||
|
public BotHealthCheckHostedServiceTests()
|
||||||
|
{
|
||||||
|
_port = GetAvailablePort();
|
||||||
|
var config = new ConfigurationBuilder()
|
||||||
|
.AddInMemoryCollection(new Dictionary<string, string?>
|
||||||
|
{
|
||||||
|
["HealthCheck:Prefix"] = $"http://localhost:{_port}/"
|
||||||
|
})
|
||||||
|
.Build();
|
||||||
|
|
||||||
|
_service = new BotHealthCheckHostedService(
|
||||||
|
NullLogger<BotHealthCheckHostedService>.Instance,
|
||||||
|
config);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Dispose()
|
||||||
|
{
|
||||||
|
_service.StopAsync(CancellationToken.None).Wait(TimeSpan.FromSeconds(5));
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public async Task HealthEndpoint_ShouldReturn200_WhenServiceIsRunning()
|
||||||
|
{
|
||||||
|
await _service.StartAsync(CancellationToken.None);
|
||||||
|
|
||||||
|
using var client = new HttpClient();
|
||||||
|
client.Timeout = TimeSpan.FromSeconds(5);
|
||||||
|
var response = await client.GetAsync($"http://localhost:{_port}/health");
|
||||||
|
|
||||||
|
Assert.Equal(HttpStatusCode.OK, response.StatusCode);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static int GetAvailablePort()
|
||||||
|
{
|
||||||
|
var listener = new TcpListener(IPAddress.Loopback, 0);
|
||||||
|
listener.Start();
|
||||||
|
var port = ((IPEndPoint)listener.LocalEndpoint).Port;
|
||||||
|
listener.Stop();
|
||||||
|
return port;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,46 @@
|
|||||||
|
using System;
|
||||||
|
using System.IO;
|
||||||
|
using Xunit;
|
||||||
|
|
||||||
|
namespace GmRelay.Bot.Tests.Project;
|
||||||
|
|
||||||
|
public class LicenseFileTests
|
||||||
|
{
|
||||||
|
private static string GetRepoRoot()
|
||||||
|
{
|
||||||
|
var dir = AppContext.BaseDirectory;
|
||||||
|
while (!string.IsNullOrEmpty(dir) && !File.Exists(Path.Combine(dir, "Directory.Build.props")))
|
||||||
|
{
|
||||||
|
dir = Directory.GetParent(dir)?.FullName;
|
||||||
|
}
|
||||||
|
return dir ?? throw new InvalidOperationException("Could not find repo root");
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void LicenseFile_ExistsInRepoRoot()
|
||||||
|
{
|
||||||
|
var repoRoot = GetRepoRoot();
|
||||||
|
var licensePath = Path.Combine(repoRoot, "LICENSE");
|
||||||
|
Assert.True(File.Exists(licensePath), "LICENSE file should exist in repo root");
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void LicenseFile_ContainsMitLicenseText()
|
||||||
|
{
|
||||||
|
var repoRoot = GetRepoRoot();
|
||||||
|
var licensePath = Path.Combine(repoRoot, "LICENSE");
|
||||||
|
Assert.True(File.Exists(licensePath), "LICENSE file should exist");
|
||||||
|
var content = File.ReadAllText(licensePath);
|
||||||
|
Assert.Contains("MIT License", content);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void Readme_ReferencesLicenseFile()
|
||||||
|
{
|
||||||
|
var repoRoot = GetRepoRoot();
|
||||||
|
var readmePath = Path.Combine(repoRoot, "README.md");
|
||||||
|
Assert.True(File.Exists(readmePath), "README.md should exist");
|
||||||
|
var content = File.ReadAllText(readmePath);
|
||||||
|
Assert.Contains("./LICENSE", content);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,86 @@
|
|||||||
|
using GmRelay.Web.Health;
|
||||||
|
using Microsoft.AspNetCore.Builder;
|
||||||
|
using Microsoft.AspNetCore.Diagnostics.HealthChecks;
|
||||||
|
using Microsoft.AspNetCore.Hosting;
|
||||||
|
using Microsoft.AspNetCore.Http;
|
||||||
|
using Microsoft.AspNetCore.TestHost;
|
||||||
|
using Microsoft.Extensions.DependencyInjection;
|
||||||
|
using Microsoft.Extensions.Diagnostics.HealthChecks;
|
||||||
|
using Npgsql;
|
||||||
|
using System.Net;
|
||||||
|
using System.Text.Json;
|
||||||
|
|
||||||
|
namespace GmRelay.Bot.Tests.Web;
|
||||||
|
|
||||||
|
public sealed class WebHealthEndpointTests
|
||||||
|
{
|
||||||
|
private static WebApplication CreateTestApp(HealthStatus npgsqlStatus)
|
||||||
|
{
|
||||||
|
var builder = WebApplication.CreateBuilder();
|
||||||
|
builder.WebHost.UseTestServer();
|
||||||
|
builder.Services.AddHealthChecks()
|
||||||
|
.AddCheck("self", () => HealthCheckResult.Healthy(), ["live"])
|
||||||
|
.AddCheck("npgsql", () => new HealthCheckResult(npgsqlStatus));
|
||||||
|
|
||||||
|
var app = builder.Build();
|
||||||
|
app.MapHealthChecks("/health", new HealthCheckOptions
|
||||||
|
{
|
||||||
|
ResponseWriter = async (context, report) =>
|
||||||
|
{
|
||||||
|
context.Response.ContentType = "application/json";
|
||||||
|
var response = new
|
||||||
|
{
|
||||||
|
status = report.Status == HealthStatus.Healthy ? "healthy" : "unhealthy",
|
||||||
|
timestamp = DateTimeOffset.UtcNow.ToString("O")
|
||||||
|
};
|
||||||
|
await context.Response.WriteAsJsonAsync(response);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
app.MapHealthChecks("/alive", new HealthCheckOptions
|
||||||
|
{
|
||||||
|
Predicate = r => r.Tags.Contains("live")
|
||||||
|
});
|
||||||
|
|
||||||
|
return app;
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public async Task HealthEndpoint_ShouldReturn200AndJson_WhenHealthy()
|
||||||
|
{
|
||||||
|
await using var app = CreateTestApp(HealthStatus.Healthy);
|
||||||
|
await app.StartAsync();
|
||||||
|
using var client = app.GetTestClient();
|
||||||
|
|
||||||
|
var response = await client.GetAsync("/health");
|
||||||
|
|
||||||
|
Assert.Equal(HttpStatusCode.OK, response.StatusCode);
|
||||||
|
var content = await response.Content.ReadAsStringAsync();
|
||||||
|
using var doc = JsonDocument.Parse(content);
|
||||||
|
Assert.Equal("healthy", doc.RootElement.GetProperty("status").GetString());
|
||||||
|
Assert.NotNull(doc.RootElement.GetProperty("timestamp").GetString());
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public async Task HealthEndpoint_ShouldReturn503_WhenDatabaseUnavailable()
|
||||||
|
{
|
||||||
|
await using var app = CreateTestApp(HealthStatus.Unhealthy);
|
||||||
|
await app.StartAsync();
|
||||||
|
using var client = app.GetTestClient();
|
||||||
|
|
||||||
|
var response = await client.GetAsync("/health");
|
||||||
|
|
||||||
|
Assert.Equal(HttpStatusCode.ServiceUnavailable, response.StatusCode);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public async Task NpgsqlHealthCheck_ShouldReturnUnhealthy_WhenDatabaseIsInaccessible()
|
||||||
|
{
|
||||||
|
var dataSource = NpgsqlDataSource.Create("Host=localhost;Port=5432;Database=gmrelay_db;Username=gmrelay;Password=fake");
|
||||||
|
var healthCheck = new NpgsqlHealthCheck(dataSource);
|
||||||
|
|
||||||
|
var result = await healthCheck.CheckHealthAsync(new HealthCheckContext());
|
||||||
|
|
||||||
|
Assert.Equal(HealthStatus.Unhealthy, result.Status);
|
||||||
|
Assert.NotNull(result.Exception);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -8,6 +8,16 @@
|
|||||||
"resolved": "6.0.4",
|
"resolved": "6.0.4",
|
||||||
"contentHash": "lkhqpF8Pu2Y7IiN7OntbsTtdbpR1syMsm2F3IgX6ootA4ffRqWL5jF7XipHuZQTdVuWG/gVAAcf8mjk8Tz0xPg=="
|
"contentHash": "lkhqpF8Pu2Y7IiN7OntbsTtdbpR1syMsm2F3IgX6ootA4ffRqWL5jF7XipHuZQTdVuWG/gVAAcf8mjk8Tz0xPg=="
|
||||||
},
|
},
|
||||||
|
"Microsoft.AspNetCore.Mvc.Testing": {
|
||||||
|
"type": "Direct",
|
||||||
|
"requested": "[10.0.5, )",
|
||||||
|
"resolved": "10.0.5",
|
||||||
|
"contentHash": "MfacYQ7jNzj6073YobyoFfXpNmGqrV1UCywTM339DOcYpfalcM4K4heFjV5k3dDkKkWOGWO/DV3hdmVRqFkIxA==",
|
||||||
|
"dependencies": {
|
||||||
|
"Microsoft.AspNetCore.TestHost": "10.0.5",
|
||||||
|
"Microsoft.Extensions.DependencyModel": "10.0.5"
|
||||||
|
}
|
||||||
|
},
|
||||||
"Microsoft.NET.Test.Sdk": {
|
"Microsoft.NET.Test.Sdk": {
|
||||||
"type": "Direct",
|
"type": "Direct",
|
||||||
"requested": "[17.14.1, )",
|
"requested": "[17.14.1, )",
|
||||||
@@ -47,14 +57,6 @@
|
|||||||
"contentHash": "nEYgziWN7hksgEQEWy24JypcMCU8gKYcIIyPL05JfdXxUWuPRLotH/KOeuHevAjSEOYkL3dtGakBkJAuPobGmA==",
|
"contentHash": "nEYgziWN7hksgEQEWy24JypcMCU8gKYcIIyPL05JfdXxUWuPRLotH/KOeuHevAjSEOYkL3dtGakBkJAuPobGmA==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"AspNetCore.HealthChecks.NpgSql": "9.0.0",
|
"AspNetCore.HealthChecks.NpgSql": "9.0.0",
|
||||||
"Microsoft.Extensions.Configuration.Abstractions": "10.0.5",
|
|
||||||
"Microsoft.Extensions.Configuration.Binder": "10.0.5",
|
|
||||||
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.5",
|
|
||||||
"Microsoft.Extensions.Diagnostics.HealthChecks": "10.0.5",
|
|
||||||
"Microsoft.Extensions.Hosting.Abstractions": "10.0.5",
|
|
||||||
"Microsoft.Extensions.Logging.Abstractions": "10.0.5",
|
|
||||||
"Microsoft.Extensions.Options": "10.0.5",
|
|
||||||
"Microsoft.Extensions.Primitives": "10.0.5",
|
|
||||||
"Npgsql.DependencyInjection": "10.0.1",
|
"Npgsql.DependencyInjection": "10.0.1",
|
||||||
"Npgsql.OpenTelemetry": "10.0.1",
|
"Npgsql.OpenTelemetry": "10.0.1",
|
||||||
"OpenTelemetry.Extensions.Hosting": "1.15.0"
|
"OpenTelemetry.Extensions.Hosting": "1.15.0"
|
||||||
@@ -65,7 +67,6 @@
|
|||||||
"resolved": "9.0.0",
|
"resolved": "9.0.0",
|
||||||
"contentHash": "npc58/AD5zuVxERdhCl2Kb7WnL37mwX42SJcXIwvmEig0/dugOLg3SIwtfvvh3TnvTwR/sk5LYNkkPaBdks61A==",
|
"contentHash": "npc58/AD5zuVxERdhCl2Kb7WnL37mwX42SJcXIwvmEig0/dugOLg3SIwtfvvh3TnvTwR/sk5LYNkkPaBdks61A==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"Microsoft.Extensions.Diagnostics.HealthChecks": "8.0.11",
|
|
||||||
"Npgsql": "8.0.3"
|
"Npgsql": "8.0.3"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -82,10 +83,7 @@
|
|||||||
"dbup-core": {
|
"dbup-core": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "6.1.1",
|
"resolved": "6.1.1",
|
||||||
"contentHash": "kgpuyJVEFJHoIj/slnc994Go88aoeZqNDfGHDBr4sh7CsEWwJhOTCt/FJqO4ziUImL5L0NEY0kxxOiNgPKI2Fw==",
|
"contentHash": "kgpuyJVEFJHoIj/slnc994Go88aoeZqNDfGHDBr4sh7CsEWwJhOTCt/FJqO4ziUImL5L0NEY0kxxOiNgPKI2Fw=="
|
||||||
"dependencies": {
|
|
||||||
"Microsoft.Extensions.Logging.Abstractions": "8.0.0"
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
"dbup-postgresql": {
|
"dbup-postgresql": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
@@ -96,6 +94,11 @@
|
|||||||
"dbup-core": "6.1.1"
|
"dbup-core": "6.1.1"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"Microsoft.AspNetCore.TestHost": {
|
||||||
|
"type": "Transitive",
|
||||||
|
"resolved": "10.0.5",
|
||||||
|
"contentHash": "PJEdrZnnhvxIEXzDdvdZ38GvpdaiUfKkZ99kudS8riJwhowFb/Qh26Wjk9smrCWcYdMFQmpN5epGiL4o1s8LYA=="
|
||||||
|
},
|
||||||
"Microsoft.CodeCoverage": {
|
"Microsoft.CodeCoverage": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "17.14.1",
|
"resolved": "17.14.1",
|
||||||
@@ -104,252 +107,33 @@
|
|||||||
"Microsoft.Extensions.AmbientMetadata.Application": {
|
"Microsoft.Extensions.AmbientMetadata.Application": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "10.2.0",
|
"resolved": "10.2.0",
|
||||||
"contentHash": "CNrEjaOCZ8d1HtB0mvpiX4EWxLkee2xy+CsYXxmsEYJSFgw3OmF9pIhP/tCTeYBHhpsKJj5wM63G8IBFGxAcsw==",
|
"contentHash": "CNrEjaOCZ8d1HtB0mvpiX4EWxLkee2xy+CsYXxmsEYJSFgw3OmF9pIhP/tCTeYBHhpsKJj5wM63G8IBFGxAcsw=="
|
||||||
"dependencies": {
|
|
||||||
"Microsoft.Extensions.Configuration": "10.0.2",
|
|
||||||
"Microsoft.Extensions.Hosting.Abstractions": "10.0.2",
|
|
||||||
"Microsoft.Extensions.Options.ConfigurationExtensions": "10.0.2"
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
"Microsoft.Extensions.Compliance.Abstractions": {
|
"Microsoft.Extensions.Compliance.Abstractions": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "10.2.0",
|
"resolved": "10.2.0",
|
||||||
"contentHash": "1a4xDAT6fRyP8t419q3WvWMmMslDTvI7OAZLWBhn5rysFG0bl5xFenTswd1xAbT/3u3mx4Xyb5bPx+V+18tJeQ==",
|
"contentHash": "1a4xDAT6fRyP8t419q3WvWMmMslDTvI7OAZLWBhn5rysFG0bl5xFenTswd1xAbT/3u3mx4Xyb5bPx+V+18tJeQ=="
|
||||||
"dependencies": {
|
|
||||||
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.2",
|
|
||||||
"Microsoft.Extensions.ObjectPool": "10.0.2"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Microsoft.Extensions.Configuration": {
|
|
||||||
"type": "Transitive",
|
|
||||||
"resolved": "10.0.5",
|
|
||||||
"contentHash": "8Rx5sqg04FttxrumyG6bmoRuFRgYzK6IVwF1i0/o0cXfKBdDeVpJejKHtJCMjyg9E/DNMVqpqOGe/tCT5gYvVA==",
|
|
||||||
"dependencies": {
|
|
||||||
"Microsoft.Extensions.Configuration.Abstractions": "10.0.5",
|
|
||||||
"Microsoft.Extensions.Primitives": "10.0.5"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Microsoft.Extensions.Configuration.Abstractions": {
|
|
||||||
"type": "Transitive",
|
|
||||||
"resolved": "10.0.5",
|
|
||||||
"contentHash": "P09QpTHjqHmCLQOTC+WyLkoRNxek4NIvfWt+TnU0etoDUSRxcltyd6+j/ouRbMdLR0j44GqGO+lhI2M4fAHG4g==",
|
|
||||||
"dependencies": {
|
|
||||||
"Microsoft.Extensions.Primitives": "10.0.5"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Microsoft.Extensions.Configuration.Binder": {
|
|
||||||
"type": "Transitive",
|
|
||||||
"resolved": "10.0.5",
|
|
||||||
"contentHash": "99Z4rjyXopb1MIazDSPcvwYCUdYNO01Cf1GUs2WUjIFAbkGmwzj2vPa2k+3pheJRV+YgNd2QqRKHAri0oBAU4Q==",
|
|
||||||
"dependencies": {
|
|
||||||
"Microsoft.Extensions.Configuration": "10.0.5",
|
|
||||||
"Microsoft.Extensions.Configuration.Abstractions": "10.0.5"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Microsoft.Extensions.Configuration.CommandLine": {
|
|
||||||
"type": "Transitive",
|
|
||||||
"resolved": "10.0.5",
|
|
||||||
"contentHash": "or9fOLopMUTJOQVJ3bou4aD6PwvsiKf4kZC4EE5sRRKSkmh+wfk/LekJXRjAX88X+1JA9zHjDo+5fiQ7z3MY/A==",
|
|
||||||
"dependencies": {
|
|
||||||
"Microsoft.Extensions.Configuration": "10.0.5",
|
|
||||||
"Microsoft.Extensions.Configuration.Abstractions": "10.0.5"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Microsoft.Extensions.Configuration.EnvironmentVariables": {
|
|
||||||
"type": "Transitive",
|
|
||||||
"resolved": "10.0.5",
|
|
||||||
"contentHash": "tchMGQ+zVTO40np/Zzg2Li/TIR8bksQgg4UVXZa0OzeFCKWnIYtxE2FVs+eSmjPGCjMS2voZbwN/mUcYfpSTuA==",
|
|
||||||
"dependencies": {
|
|
||||||
"Microsoft.Extensions.Configuration": "10.0.5",
|
|
||||||
"Microsoft.Extensions.Configuration.Abstractions": "10.0.5"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Microsoft.Extensions.Configuration.FileExtensions": {
|
|
||||||
"type": "Transitive",
|
|
||||||
"resolved": "10.0.5",
|
|
||||||
"contentHash": "OhTr0O79dP49734lLTqVveivVX9sDXxbI/8vjELAZTHXqoN90mdpgTAgwicJED42iaHMCcZcK6Bj+8wNyBikaw==",
|
|
||||||
"dependencies": {
|
|
||||||
"Microsoft.Extensions.Configuration": "10.0.5",
|
|
||||||
"Microsoft.Extensions.Configuration.Abstractions": "10.0.5",
|
|
||||||
"Microsoft.Extensions.FileProviders.Abstractions": "10.0.5",
|
|
||||||
"Microsoft.Extensions.FileProviders.Physical": "10.0.5",
|
|
||||||
"Microsoft.Extensions.Primitives": "10.0.5"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Microsoft.Extensions.Configuration.Json": {
|
|
||||||
"type": "Transitive",
|
|
||||||
"resolved": "10.0.5",
|
|
||||||
"contentHash": "brBM/WP0YAUYh2+QqSYVdK8eQHYQTtTEUJXJ+84Zkdo2buGLja9VSrMIhgoeBUU7JBmcskAib8Lb/N83bvxgYQ==",
|
|
||||||
"dependencies": {
|
|
||||||
"Microsoft.Extensions.Configuration": "10.0.5",
|
|
||||||
"Microsoft.Extensions.Configuration.Abstractions": "10.0.5",
|
|
||||||
"Microsoft.Extensions.Configuration.FileExtensions": "10.0.5",
|
|
||||||
"Microsoft.Extensions.FileProviders.Abstractions": "10.0.5"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Microsoft.Extensions.Configuration.UserSecrets": {
|
|
||||||
"type": "Transitive",
|
|
||||||
"resolved": "10.0.5",
|
|
||||||
"contentHash": "fhdG6UV9lIp70QhNkVyaHciUVq25IPFkczheVJL9bIFvmnJ+Zghaie6dWkDbbVmxZlHl9gj3zTDxMxJs5zNhIA==",
|
|
||||||
"dependencies": {
|
|
||||||
"Microsoft.Extensions.Configuration.Abstractions": "10.0.5",
|
|
||||||
"Microsoft.Extensions.Configuration.Json": "10.0.5",
|
|
||||||
"Microsoft.Extensions.FileProviders.Abstractions": "10.0.5",
|
|
||||||
"Microsoft.Extensions.FileProviders.Physical": "10.0.5"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Microsoft.Extensions.DependencyInjection": {
|
|
||||||
"type": "Transitive",
|
|
||||||
"resolved": "10.0.5",
|
|
||||||
"contentHash": "v1SVsowG6YE1YnHVGmLWz57YTRCQRx9pH5ebIESXfm5isI9gA3QaMyg/oMTzPpXYZwSAVDzYItGJKfmV+pqXkQ==",
|
|
||||||
"dependencies": {
|
|
||||||
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.5"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Microsoft.Extensions.DependencyInjection.Abstractions": {
|
|
||||||
"type": "Transitive",
|
|
||||||
"resolved": "10.0.5",
|
|
||||||
"contentHash": "iVMtq9eRvzyhx8949EGT0OCYJfXi737SbRVzWXE5GrOgGj5AaZ9eUuxA/BSUfmOMALKn/g8KfFaNQw0eiB3lyA=="
|
|
||||||
},
|
},
|
||||||
"Microsoft.Extensions.DependencyInjection.AutoActivation": {
|
"Microsoft.Extensions.DependencyInjection.AutoActivation": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "10.2.0",
|
"resolved": "10.2.0",
|
||||||
"contentHash": "Z/OI261l7LnxyODKPx0trQyIHFyicCR/akfn64lGOjPcf4FpAZ7ePAGl2HPvQBUBSNfPTF0gWeCfuFmyftMgYA==",
|
"contentHash": "Z/OI261l7LnxyODKPx0trQyIHFyicCR/akfn64lGOjPcf4FpAZ7ePAGl2HPvQBUBSNfPTF0gWeCfuFmyftMgYA=="
|
||||||
"dependencies": {
|
|
||||||
"Microsoft.Extensions.Hosting.Abstractions": "10.0.2"
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
"Microsoft.Extensions.Diagnostics": {
|
"Microsoft.Extensions.DependencyModel": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "10.0.5",
|
"resolved": "10.0.5",
|
||||||
"contentHash": "vAJHd4yOpmKoK+jBuYV7a3y+Ab9U4ARCc29b6qvMy276RgJFw9LFs0DdsPqOL3ahwzyrX7tM+i4cCxU/RX0qAg==",
|
"contentHash": "xA4kkL+QS6KCAOKz/O0oquHs44Ob8J7zpBCNt3wjkBWDg5aCqfwG8rWWLsg5V86AM0sB849g9JjPjIdksTCIKg=="
|
||||||
"dependencies": {
|
|
||||||
"Microsoft.Extensions.Configuration": "10.0.5",
|
|
||||||
"Microsoft.Extensions.Diagnostics.Abstractions": "10.0.5",
|
|
||||||
"Microsoft.Extensions.Options.ConfigurationExtensions": "10.0.5"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Microsoft.Extensions.Diagnostics.Abstractions": {
|
|
||||||
"type": "Transitive",
|
|
||||||
"resolved": "10.0.5",
|
|
||||||
"contentHash": "/nYGrpa9/0BZofrVpBbbj+Ns8ZesiPE0V/KxsuHgDgHQopIzN54nRaQGSuvPw16/kI9sW1Zox5yyAPqvf0Jz6A==",
|
|
||||||
"dependencies": {
|
|
||||||
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.5",
|
|
||||||
"Microsoft.Extensions.Options": "10.0.5"
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
"Microsoft.Extensions.Diagnostics.ExceptionSummarization": {
|
"Microsoft.Extensions.Diagnostics.ExceptionSummarization": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "10.2.0",
|
"resolved": "10.2.0",
|
||||||
"contentHash": "3qMK1D40D10kb5TdBtFJpzz6/WH0NinWs68ZZS8jCFgHMXDiOjGiPOneMmIocCP/wnUUW4Hzf8lMsIE1xIGxDA==",
|
"contentHash": "3qMK1D40D10kb5TdBtFJpzz6/WH0NinWs68ZZS8jCFgHMXDiOjGiPOneMmIocCP/wnUUW4Hzf8lMsIE1xIGxDA=="
|
||||||
"dependencies": {
|
|
||||||
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.2"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Microsoft.Extensions.Diagnostics.HealthChecks": {
|
|
||||||
"type": "Transitive",
|
|
||||||
"resolved": "10.0.5",
|
|
||||||
"contentHash": "REdt95QXHscGdtw/UUgyCW2lF9DJcAOJxmebKW2IkgUjuCAdMODIi2HNOWg5utW98nm8ekgV0Gjqs/sljwwqMw==",
|
|
||||||
"dependencies": {
|
|
||||||
"Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "10.0.5",
|
|
||||||
"Microsoft.Extensions.Hosting.Abstractions": "10.0.5",
|
|
||||||
"Microsoft.Extensions.Logging.Abstractions": "10.0.5",
|
|
||||||
"Microsoft.Extensions.Options": "10.0.5"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": {
|
|
||||||
"type": "Transitive",
|
|
||||||
"resolved": "10.0.5",
|
|
||||||
"contentHash": "NrIMTy7dpqxAvA6kHAYH8cXID/YgeNOy0OqFKpLtkPu5X4WS/basX91UszANzVrMNRAICJ2GOnGiRxJtsRyEQw=="
|
|
||||||
},
|
|
||||||
"Microsoft.Extensions.Features": {
|
|
||||||
"type": "Transitive",
|
|
||||||
"resolved": "10.0.2",
|
|
||||||
"contentHash": "X7tm2aV2w3lN9roSSGhl19lz4w76HvdiuKNhIv2XOiorYII9XCm66o/z9IJ0+QwkgvEv5gMZDM6rV6uwABHEQQ=="
|
|
||||||
},
|
|
||||||
"Microsoft.Extensions.FileProviders.Abstractions": {
|
|
||||||
"type": "Transitive",
|
|
||||||
"resolved": "10.0.5",
|
|
||||||
"contentHash": "nCBmCx0Xemlu65ZiWMcXbvfvtznKxf4/YYKF9R28QkqdI9lTikedGqzJ28/xmdGGsxUnsP5/3TQGpiPwVjK0dA==",
|
|
||||||
"dependencies": {
|
|
||||||
"Microsoft.Extensions.Primitives": "10.0.5"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Microsoft.Extensions.FileProviders.Physical": {
|
|
||||||
"type": "Transitive",
|
|
||||||
"resolved": "10.0.5",
|
|
||||||
"contentHash": "dMu5kUPSfol1Rqhmr6nWPSmbFjDe9w6bkoKithG17bWTZA0UyKirTatM5mqYUN3mGpNA0MorlusIoVTh6J7o5g==",
|
|
||||||
"dependencies": {
|
|
||||||
"Microsoft.Extensions.FileProviders.Abstractions": "10.0.5",
|
|
||||||
"Microsoft.Extensions.FileSystemGlobbing": "10.0.5",
|
|
||||||
"Microsoft.Extensions.Primitives": "10.0.5"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Microsoft.Extensions.FileSystemGlobbing": {
|
|
||||||
"type": "Transitive",
|
|
||||||
"resolved": "10.0.5",
|
|
||||||
"contentHash": "mOE3ARusNQR0a5x8YOcnUbfyyXGqoAWQtEc7qFOfNJgruDWQLo39Re+3/Lzj5pLPFuFYj8hN4dgKzaSQDKiOCw=="
|
|
||||||
},
|
|
||||||
"Microsoft.Extensions.Hosting": {
|
|
||||||
"type": "Transitive",
|
|
||||||
"resolved": "10.0.5",
|
|
||||||
"contentHash": "8i7e5IBdiKLNqt/+ciWrS8U95Rv5DClaaj7ulkZbimnCi4uREWd+lXzkp3joofFuIPOlAzV4AckxLTIELv2jdg==",
|
|
||||||
"dependencies": {
|
|
||||||
"Microsoft.Extensions.Configuration": "10.0.5",
|
|
||||||
"Microsoft.Extensions.Configuration.Abstractions": "10.0.5",
|
|
||||||
"Microsoft.Extensions.Configuration.Binder": "10.0.5",
|
|
||||||
"Microsoft.Extensions.Configuration.CommandLine": "10.0.5",
|
|
||||||
"Microsoft.Extensions.Configuration.EnvironmentVariables": "10.0.5",
|
|
||||||
"Microsoft.Extensions.Configuration.FileExtensions": "10.0.5",
|
|
||||||
"Microsoft.Extensions.Configuration.Json": "10.0.5",
|
|
||||||
"Microsoft.Extensions.Configuration.UserSecrets": "10.0.5",
|
|
||||||
"Microsoft.Extensions.DependencyInjection": "10.0.5",
|
|
||||||
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.5",
|
|
||||||
"Microsoft.Extensions.Diagnostics": "10.0.5",
|
|
||||||
"Microsoft.Extensions.FileProviders.Abstractions": "10.0.5",
|
|
||||||
"Microsoft.Extensions.FileProviders.Physical": "10.0.5",
|
|
||||||
"Microsoft.Extensions.Hosting.Abstractions": "10.0.5",
|
|
||||||
"Microsoft.Extensions.Logging": "10.0.5",
|
|
||||||
"Microsoft.Extensions.Logging.Abstractions": "10.0.5",
|
|
||||||
"Microsoft.Extensions.Logging.Configuration": "10.0.5",
|
|
||||||
"Microsoft.Extensions.Logging.Console": "10.0.5",
|
|
||||||
"Microsoft.Extensions.Logging.Debug": "10.0.5",
|
|
||||||
"Microsoft.Extensions.Logging.EventLog": "10.0.5",
|
|
||||||
"Microsoft.Extensions.Logging.EventSource": "10.0.5",
|
|
||||||
"Microsoft.Extensions.Options": "10.0.5"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Microsoft.Extensions.Hosting.Abstractions": {
|
|
||||||
"type": "Transitive",
|
|
||||||
"resolved": "10.0.5",
|
|
||||||
"contentHash": "+Wb7KAMVZTomwJkQrjuPTe5KBzGod7N8XeG+ScxRlkPOB4sZLG4ccVwjV4Phk5BCJt7uIMnGHVoN6ZMVploX+g==",
|
|
||||||
"dependencies": {
|
|
||||||
"Microsoft.Extensions.Configuration.Abstractions": "10.0.5",
|
|
||||||
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.5",
|
|
||||||
"Microsoft.Extensions.Diagnostics.Abstractions": "10.0.5",
|
|
||||||
"Microsoft.Extensions.FileProviders.Abstractions": "10.0.5",
|
|
||||||
"Microsoft.Extensions.Logging.Abstractions": "10.0.5"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Microsoft.Extensions.Http": {
|
|
||||||
"type": "Transitive",
|
|
||||||
"resolved": "10.0.2",
|
|
||||||
"contentHash": "egUPC0xydb1ugCMcRyJ6zaOGOzx7N4coOVlGeLcIsXhUf1xHHwZeX+ob7JuG0dXExFduHYE/t+4/4y8BLlBKmw==",
|
|
||||||
"dependencies": {
|
|
||||||
"Microsoft.Extensions.Configuration.Abstractions": "10.0.2",
|
|
||||||
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.2",
|
|
||||||
"Microsoft.Extensions.Diagnostics": "10.0.2",
|
|
||||||
"Microsoft.Extensions.Logging": "10.0.2",
|
|
||||||
"Microsoft.Extensions.Logging.Abstractions": "10.0.2",
|
|
||||||
"Microsoft.Extensions.Options": "10.0.2"
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
"Microsoft.Extensions.Http.Diagnostics": {
|
"Microsoft.Extensions.Http.Diagnostics": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "10.2.0",
|
"resolved": "10.2.0",
|
||||||
"contentHash": "I0FBgF6yZRwYH9E3KQ2vHm80YZ7YBj+52GDsmOWXPBv/p15b/wUoNupV9kw3LnSNVsWMqlGbiuZgBnHpMwPh+Q==",
|
"contentHash": "I0FBgF6yZRwYH9E3KQ2vHm80YZ7YBj+52GDsmOWXPBv/p15b/wUoNupV9kw3LnSNVsWMqlGbiuZgBnHpMwPh+Q==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"Microsoft.Extensions.Http": "10.0.2",
|
|
||||||
"Microsoft.Extensions.Telemetry": "10.2.0"
|
"Microsoft.Extensions.Telemetry": "10.2.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -359,128 +143,15 @@
|
|||||||
"contentHash": "Lg+OjBW+ODDbM4Ax4LoERvQ1dqSZ8I2gQc2+B0/WOWl2+PunLJ3xb3x8MtHGfcb/Mp98RoMpwRKm6Aj9mzXwrA==",
|
"contentHash": "Lg+OjBW+ODDbM4Ax4LoERvQ1dqSZ8I2gQc2+B0/WOWl2+PunLJ3xb3x8MtHGfcb/Mp98RoMpwRKm6Aj9mzXwrA==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"Microsoft.Extensions.Http.Diagnostics": "10.2.0",
|
"Microsoft.Extensions.Http.Diagnostics": "10.2.0",
|
||||||
"Microsoft.Extensions.ObjectPool": "10.0.2",
|
|
||||||
"Microsoft.Extensions.Resilience": "10.2.0"
|
"Microsoft.Extensions.Resilience": "10.2.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"Microsoft.Extensions.Logging": {
|
|
||||||
"type": "Transitive",
|
|
||||||
"resolved": "10.0.5",
|
|
||||||
"contentHash": "+XTMKQyDWg4ODoNHU/BN3BaI1jhGO7VCS+BnzT/4IauiG6y2iPAte7MyD7rHKS+hNP0TkFkjrae8DFjDUxtcxg==",
|
|
||||||
"dependencies": {
|
|
||||||
"Microsoft.Extensions.DependencyInjection": "10.0.5",
|
|
||||||
"Microsoft.Extensions.Logging.Abstractions": "10.0.5",
|
|
||||||
"Microsoft.Extensions.Options": "10.0.5"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Microsoft.Extensions.Logging.Abstractions": {
|
|
||||||
"type": "Transitive",
|
|
||||||
"resolved": "10.0.5",
|
|
||||||
"contentHash": "9HOdqlDtPptVcmKAjsQ/Nr5Rxfq6FMYLdhvZh1lVmeKR738qeYecQD7+ldooXf+u2KzzR1kafSphWngIM3C6ug==",
|
|
||||||
"dependencies": {
|
|
||||||
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.5"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Microsoft.Extensions.Logging.Configuration": {
|
|
||||||
"type": "Transitive",
|
|
||||||
"resolved": "10.0.5",
|
|
||||||
"contentHash": "cSgxsDgfP0+gmVRPVoNHI/KIDavIZxh+CxE6tSLPlYTogqccDnjBFI9CgEsiNuMP6+fiuXUwhhlTz36uUEpwbQ==",
|
|
||||||
"dependencies": {
|
|
||||||
"Microsoft.Extensions.Configuration": "10.0.5",
|
|
||||||
"Microsoft.Extensions.Configuration.Abstractions": "10.0.5",
|
|
||||||
"Microsoft.Extensions.Configuration.Binder": "10.0.5",
|
|
||||||
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.5",
|
|
||||||
"Microsoft.Extensions.Logging": "10.0.5",
|
|
||||||
"Microsoft.Extensions.Logging.Abstractions": "10.0.5",
|
|
||||||
"Microsoft.Extensions.Options": "10.0.5",
|
|
||||||
"Microsoft.Extensions.Options.ConfigurationExtensions": "10.0.5"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Microsoft.Extensions.Logging.Console": {
|
|
||||||
"type": "Transitive",
|
|
||||||
"resolved": "10.0.5",
|
|
||||||
"contentHash": "PMs2gha2v24hvH5o5KQem5aNK4mN0BhhCWlMqsg9tzifWKzjeQi2tyPOP/RaWMVvalOhVLcrmoMYPqbnia/epg==",
|
|
||||||
"dependencies": {
|
|
||||||
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.5",
|
|
||||||
"Microsoft.Extensions.Logging": "10.0.5",
|
|
||||||
"Microsoft.Extensions.Logging.Abstractions": "10.0.5",
|
|
||||||
"Microsoft.Extensions.Logging.Configuration": "10.0.5",
|
|
||||||
"Microsoft.Extensions.Options": "10.0.5"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Microsoft.Extensions.Logging.Debug": {
|
|
||||||
"type": "Transitive",
|
|
||||||
"resolved": "10.0.5",
|
|
||||||
"contentHash": "/VacEkBQ02A8PBXSa6YpbIXCuisYy6JJr62/+ANJDZE+RMBfZMcXJXLfr/LpyLE6pgdp17Wxlt7e7R9zvkwZ3Q==",
|
|
||||||
"dependencies": {
|
|
||||||
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.5",
|
|
||||||
"Microsoft.Extensions.Logging": "10.0.5",
|
|
||||||
"Microsoft.Extensions.Logging.Abstractions": "10.0.5"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Microsoft.Extensions.Logging.EventLog": {
|
|
||||||
"type": "Transitive",
|
|
||||||
"resolved": "10.0.5",
|
|
||||||
"contentHash": "0ezhWYJS4/6KrqQel9JL+Tr4n+4EX2TF5EYiaysBWNNEM2c3Gtj1moD39esfgk8OHblSX+UFjtZ3z0c4i9tRvw==",
|
|
||||||
"dependencies": {
|
|
||||||
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.5",
|
|
||||||
"Microsoft.Extensions.Logging": "10.0.5",
|
|
||||||
"Microsoft.Extensions.Logging.Abstractions": "10.0.5",
|
|
||||||
"Microsoft.Extensions.Options": "10.0.5",
|
|
||||||
"System.Diagnostics.EventLog": "10.0.5"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Microsoft.Extensions.Logging.EventSource": {
|
|
||||||
"type": "Transitive",
|
|
||||||
"resolved": "10.0.5",
|
|
||||||
"contentHash": "vN+aq1hBFXyYvY5Ow9WyeR66drKQxRZmas4lAjh6QWfryPkjTn1uLtX5AFIxyDaZj78v5TG2sELUyvrXpAPQQw==",
|
|
||||||
"dependencies": {
|
|
||||||
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.5",
|
|
||||||
"Microsoft.Extensions.Logging": "10.0.5",
|
|
||||||
"Microsoft.Extensions.Logging.Abstractions": "10.0.5",
|
|
||||||
"Microsoft.Extensions.Options": "10.0.5",
|
|
||||||
"Microsoft.Extensions.Primitives": "10.0.5"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Microsoft.Extensions.ObjectPool": {
|
|
||||||
"type": "Transitive",
|
|
||||||
"resolved": "10.0.2",
|
|
||||||
"contentHash": "kpCp4m7nwJVBcRKWXYHdVK/W0dkKyyFOjCmKVdO+zKThWvUxP1V+jVEP9FGpqRu4GPl9041SEXu2f+U/l825nQ=="
|
|
||||||
},
|
|
||||||
"Microsoft.Extensions.Options": {
|
|
||||||
"type": "Transitive",
|
|
||||||
"resolved": "10.0.5",
|
|
||||||
"contentHash": "MDaQMdUplw0AIRhWWmbLA7yQEXaLIHb+9CTroTiNS8OlI0LMXS4LCxtopqauiqGCWlRgJ+xyraVD8t6veRAFbw==",
|
|
||||||
"dependencies": {
|
|
||||||
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.5",
|
|
||||||
"Microsoft.Extensions.Primitives": "10.0.5"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Microsoft.Extensions.Options.ConfigurationExtensions": {
|
|
||||||
"type": "Transitive",
|
|
||||||
"resolved": "10.0.5",
|
|
||||||
"contentHash": "BB9uUW3+6Rxu1R97OB1H/13lUF8P2+H1+eDhpZlK30kDh/6E4EKHBUqTp+ilXQmZLzsRErxON8aBSR6WpUKJdg==",
|
|
||||||
"dependencies": {
|
|
||||||
"Microsoft.Extensions.Configuration.Abstractions": "10.0.5",
|
|
||||||
"Microsoft.Extensions.Configuration.Binder": "10.0.5",
|
|
||||||
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.5",
|
|
||||||
"Microsoft.Extensions.Options": "10.0.5",
|
|
||||||
"Microsoft.Extensions.Primitives": "10.0.5"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Microsoft.Extensions.Primitives": {
|
|
||||||
"type": "Transitive",
|
|
||||||
"resolved": "10.0.5",
|
|
||||||
"contentHash": "/HUHJ0tw/LQvD0DZrz50eQy/3z7PfX7WWEaXnjKTV9/TNdcgFlNTZGo49QhS7PTmhDqMyHRMqAXSBxLh0vso4g=="
|
|
||||||
},
|
|
||||||
"Microsoft.Extensions.Resilience": {
|
"Microsoft.Extensions.Resilience": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "10.2.0",
|
"resolved": "10.2.0",
|
||||||
"contentHash": "v4WOdAOFxB3AcsUkZWNcHL3mYzs4KAPtHO8rkoQlFKOBoD3KyjjAL+h3tRwSK5i4UpF/yhxsQRY0JxKj4osxxw==",
|
"contentHash": "v4WOdAOFxB3AcsUkZWNcHL3mYzs4KAPtHO8rkoQlFKOBoD3KyjjAL+h3tRwSK5i4UpF/yhxsQRY0JxKj4osxxw==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"Microsoft.Extensions.Diagnostics": "10.0.2",
|
|
||||||
"Microsoft.Extensions.Diagnostics.ExceptionSummarization": "10.2.0",
|
"Microsoft.Extensions.Diagnostics.ExceptionSummarization": "10.2.0",
|
||||||
"Microsoft.Extensions.Options.ConfigurationExtensions": "10.0.2",
|
|
||||||
"Microsoft.Extensions.Telemetry.Abstractions": "10.2.0",
|
"Microsoft.Extensions.Telemetry.Abstractions": "10.2.0",
|
||||||
"Polly.Extensions": "8.4.2",
|
"Polly.Extensions": "8.4.2",
|
||||||
"Polly.RateLimiting": "8.4.2"
|
"Polly.RateLimiting": "8.4.2"
|
||||||
@@ -491,23 +162,13 @@
|
|||||||
"resolved": "10.2.0",
|
"resolved": "10.2.0",
|
||||||
"contentHash": "AHTPfiKodj66xA8RwRkFD4q11V2AvzcuDsujv6ViPkOPtvBEYcPVplHakK56pPzWlX08MDS+TAQXfFXAeP7J5w==",
|
"contentHash": "AHTPfiKodj66xA8RwRkFD4q11V2AvzcuDsujv6ViPkOPtvBEYcPVplHakK56pPzWlX08MDS+TAQXfFXAeP7J5w==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"Microsoft.Extensions.Http": "10.0.2",
|
|
||||||
"Microsoft.Extensions.ServiceDiscovery.Abstractions": "10.2.0"
|
"Microsoft.Extensions.ServiceDiscovery.Abstractions": "10.2.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"Microsoft.Extensions.ServiceDiscovery.Abstractions": {
|
"Microsoft.Extensions.ServiceDiscovery.Abstractions": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "10.2.0",
|
"resolved": "10.2.0",
|
||||||
"contentHash": "sANlOvfqfw/yfych4CLlHSKSWzIie6mQG7w83gVur1foNOafyHxcgpoQMvBf+KiB4Tpls6P1/Z77IIQSK8hxFg==",
|
"contentHash": "sANlOvfqfw/yfych4CLlHSKSWzIie6mQG7w83gVur1foNOafyHxcgpoQMvBf+KiB4Tpls6P1/Z77IIQSK8hxFg=="
|
||||||
"dependencies": {
|
|
||||||
"Microsoft.Extensions.Configuration.Abstractions": "10.0.2",
|
|
||||||
"Microsoft.Extensions.Configuration.Binder": "10.0.2",
|
|
||||||
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.2",
|
|
||||||
"Microsoft.Extensions.Features": "10.0.2",
|
|
||||||
"Microsoft.Extensions.Logging.Abstractions": "10.0.2",
|
|
||||||
"Microsoft.Extensions.Options": "10.0.2",
|
|
||||||
"Microsoft.Extensions.Primitives": "10.0.2"
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
"Microsoft.Extensions.Telemetry": {
|
"Microsoft.Extensions.Telemetry": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
@@ -516,8 +177,6 @@
|
|||||||
"dependencies": {
|
"dependencies": {
|
||||||
"Microsoft.Extensions.AmbientMetadata.Application": "10.2.0",
|
"Microsoft.Extensions.AmbientMetadata.Application": "10.2.0",
|
||||||
"Microsoft.Extensions.DependencyInjection.AutoActivation": "10.2.0",
|
"Microsoft.Extensions.DependencyInjection.AutoActivation": "10.2.0",
|
||||||
"Microsoft.Extensions.Logging.Configuration": "10.0.2",
|
|
||||||
"Microsoft.Extensions.ObjectPool": "10.0.2",
|
|
||||||
"Microsoft.Extensions.Telemetry.Abstractions": "10.2.0"
|
"Microsoft.Extensions.Telemetry.Abstractions": "10.2.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -526,10 +185,7 @@
|
|||||||
"resolved": "10.2.0",
|
"resolved": "10.2.0",
|
||||||
"contentHash": "6V4V6NX6RLUYWwV89DeW/4zK5xOycYHWhsfMXSpKVGgMHfXcczmbk6hBeqTnRPzhpATYcOWlmA6hk1jgdxUugA==",
|
"contentHash": "6V4V6NX6RLUYWwV89DeW/4zK5xOycYHWhsfMXSpKVGgMHfXcczmbk6hBeqTnRPzhpATYcOWlmA6hk1jgdxUugA==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"Microsoft.Extensions.Compliance.Abstractions": "10.2.0",
|
"Microsoft.Extensions.Compliance.Abstractions": "10.2.0"
|
||||||
"Microsoft.Extensions.Logging.Abstractions": "10.0.2",
|
|
||||||
"Microsoft.Extensions.ObjectPool": "10.0.2",
|
|
||||||
"Microsoft.Extensions.Options": "10.0.2"
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"Microsoft.TestPlatform.ObjectModel": {
|
"Microsoft.TestPlatform.ObjectModel": {
|
||||||
@@ -554,17 +210,13 @@
|
|||||||
"Npgsql": {
|
"Npgsql": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "10.0.2",
|
"resolved": "10.0.2",
|
||||||
"contentHash": "q5RfBI+wywJSFUNDE1L4ZbHEHCFTblo8Uf6A6oe4feOUFYiUQXyAf9GBh5qEZpvJaHiEbpBPkQumjEhXCJxdrg==",
|
"contentHash": "q5RfBI+wywJSFUNDE1L4ZbHEHCFTblo8Uf6A6oe4feOUFYiUQXyAf9GBh5qEZpvJaHiEbpBPkQumjEhXCJxdrg=="
|
||||||
"dependencies": {
|
|
||||||
"Microsoft.Extensions.Logging.Abstractions": "10.0.0"
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
"Npgsql.DependencyInjection": {
|
"Npgsql.DependencyInjection": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "10.0.1",
|
"resolved": "10.0.1",
|
||||||
"contentHash": "YHFa4vD27sNIfv6s5q8Zi1fLvKfmK1xcpMv0PUvXOxDFbRmuMRSHwpZTbPvsAlj97q1/o7DfyynLqfqrCm1VnA==",
|
"contentHash": "YHFa4vD27sNIfv6s5q8Zi1fLvKfmK1xcpMv0PUvXOxDFbRmuMRSHwpZTbPvsAlj97q1/o7DfyynLqfqrCm1VnA==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0",
|
|
||||||
"Npgsql": "10.0.1"
|
"Npgsql": "10.0.1"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -582,8 +234,6 @@
|
|||||||
"resolved": "1.15.3",
|
"resolved": "1.15.3",
|
||||||
"contentHash": "N0i6WjPoHPbZyms1ugbDIFAJFuGlpeExJMU/+XSL0lQRUkg/D0utFkDoLXf8Z1km5B+xVZ2GyMXXiX8qdeNmPg==",
|
"contentHash": "N0i6WjPoHPbZyms1ugbDIFAJFuGlpeExJMU/+XSL0lQRUkg/D0utFkDoLXf8Z1km5B+xVZ2GyMXXiX8qdeNmPg==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"Microsoft.Extensions.Diagnostics.Abstractions": "10.0.0",
|
|
||||||
"Microsoft.Extensions.Logging.Configuration": "10.0.0",
|
|
||||||
"OpenTelemetry.Api.ProviderBuilderExtensions": "1.15.3"
|
"OpenTelemetry.Api.ProviderBuilderExtensions": "1.15.3"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -597,7 +247,6 @@
|
|||||||
"resolved": "1.15.3",
|
"resolved": "1.15.3",
|
||||||
"contentHash": "SYn0lqYDwLMWhv/zlNGsQcl2yX++yTumanX46bmOZE/ZDOd1WjPBO2kZaZgKLEZTZk48pavIFGJ6vOvxXgWVFQ==",
|
"contentHash": "SYn0lqYDwLMWhv/zlNGsQcl2yX++yTumanX46bmOZE/ZDOd1WjPBO2kZaZgKLEZTZk48pavIFGJ6vOvxXgWVFQ==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.0",
|
|
||||||
"OpenTelemetry.Api": "1.15.3"
|
"OpenTelemetry.Api": "1.15.3"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -614,7 +263,6 @@
|
|||||||
"resolved": "1.15.3",
|
"resolved": "1.15.3",
|
||||||
"contentHash": "u8n/W8yIlqv0BXZmvId1iVaeWXG42tGKdTkuLYg5g57Y/r9CeUNzqtrSHNdG5IoO8iPX79w3v+WsbAHgUQbfeg==",
|
"contentHash": "u8n/W8yIlqv0BXZmvId1iVaeWXG42tGKdTkuLYg5g57Y/r9CeUNzqtrSHNdG5IoO8iPX79w3v+WsbAHgUQbfeg==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"Microsoft.Extensions.Hosting.Abstractions": "10.0.0",
|
|
||||||
"OpenTelemetry": "1.15.3"
|
"OpenTelemetry": "1.15.3"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -631,8 +279,6 @@
|
|||||||
"resolved": "1.15.1",
|
"resolved": "1.15.1",
|
||||||
"contentHash": "vFO4Fj/dXkoVNGo/nhoGpO2zYQmZwr4jTID7oRGo+XlQ8LqksyZjUXQ4p39RfUvTID7IzzL8Qe71tW7CcAFymA==",
|
"contentHash": "vFO4Fj/dXkoVNGo/nhoGpO2zYQmZwr4jTID7oRGo+XlQ8LqksyZjUXQ4p39RfUvTID7IzzL8Qe71tW7CcAFymA==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"Microsoft.Extensions.Configuration": "10.0.0",
|
|
||||||
"Microsoft.Extensions.Options": "10.0.0",
|
|
||||||
"OpenTelemetry.Api.ProviderBuilderExtensions": "[1.15.3, 2.0.0)"
|
"OpenTelemetry.Api.ProviderBuilderExtensions": "[1.15.3, 2.0.0)"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -654,8 +300,6 @@
|
|||||||
"resolved": "8.4.2",
|
"resolved": "8.4.2",
|
||||||
"contentHash": "GZ9vRVmR0jV2JtZavt+pGUsQ1O1cuRKG7R7VOZI6ZDy9y6RNPvRvXK1tuS4ffUrv8L0FTea59oEuQzgS0R7zSA==",
|
"contentHash": "GZ9vRVmR0jV2JtZavt+pGUsQ1O1cuRKG7R7VOZI6ZDy9y6RNPvRvXK1tuS4ffUrv8L0FTea59oEuQzgS0R7zSA==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"Microsoft.Extensions.Logging.Abstractions": "8.0.0",
|
|
||||||
"Microsoft.Extensions.Options": "8.0.0",
|
|
||||||
"Polly.Core": "8.4.2"
|
"Polly.Core": "8.4.2"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -664,27 +308,13 @@
|
|||||||
"resolved": "8.4.2",
|
"resolved": "8.4.2",
|
||||||
"contentHash": "ehTImQ/eUyO07VYW2WvwSmU9rRH200SKJ/3jku9rOkyWE0A2JxNFmAVms8dSn49QLSjmjFRRSgfNyOgr/2PSmA==",
|
"contentHash": "ehTImQ/eUyO07VYW2WvwSmU9rRH200SKJ/3jku9rOkyWE0A2JxNFmAVms8dSn49QLSjmjFRRSgfNyOgr/2PSmA==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"Polly.Core": "8.4.2",
|
"Polly.Core": "8.4.2"
|
||||||
"System.Threading.RateLimiting": "8.0.0"
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"System.Diagnostics.EventLog": {
|
|
||||||
"type": "Transitive",
|
|
||||||
"resolved": "10.0.5",
|
|
||||||
"contentHash": "wugvy+pBVzjQEnRs9wMTWwoaeNFX3hsaHeVHFDIvJSWXp7wfmNWu3mxAwBIE6pyW+g6+rHa1Of5fTzb0QVqUTA=="
|
|
||||||
},
|
|
||||||
"System.Threading.RateLimiting": {
|
|
||||||
"type": "Transitive",
|
|
||||||
"resolved": "8.0.0",
|
|
||||||
"contentHash": "7mu9v0QDv66ar3DpGSZHg9NuNcxDaaAcnMULuZlaTpP9+hwXhrxNGsF5GmLkSHxFdb5bBc1TzeujsRgTrPWi+Q=="
|
|
||||||
},
|
|
||||||
"Telegram.Bot": {
|
"Telegram.Bot": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "22.9.6.1",
|
"resolved": "22.9.6.1",
|
||||||
"contentHash": "I0eaMaETcWIhMn4uu4RGd9e6PLJOjaOG3QAcKPsTcS80H3TF6gqj3UF9NKu4ZY90ul6Y6NiWToHkg/PsvxkotA==",
|
"contentHash": "I0eaMaETcWIhMn4uu4RGd9e6PLJOjaOG3QAcKPsTcS80H3TF6gqj3UF9NKu4ZY90ul6Y6NiWToHkg/PsvxkotA=="
|
||||||
"dependencies": {
|
|
||||||
"Microsoft.Extensions.Options.ConfigurationExtensions": "8.0.0"
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
"xunit.abstractions": {
|
"xunit.abstractions": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
@@ -732,9 +362,8 @@
|
|||||||
"Aspire.Npgsql": "[13.2.2, )",
|
"Aspire.Npgsql": "[13.2.2, )",
|
||||||
"Dapper": "[2.1.72, )",
|
"Dapper": "[2.1.72, )",
|
||||||
"Dapper.AOT": "[1.0.48, )",
|
"Dapper.AOT": "[1.0.48, )",
|
||||||
"GmRelay.ServiceDefaults": "[1.15.0, )",
|
"GmRelay.ServiceDefaults": "[1.15.1, )",
|
||||||
"GmRelay.Shared": "[1.15.0, )",
|
"GmRelay.Shared": "[1.15.1, )",
|
||||||
"Microsoft.Extensions.Hosting": "[10.0.5, )",
|
|
||||||
"Npgsql": "[10.0.2, )",
|
"Npgsql": "[10.0.2, )",
|
||||||
"Telegram.Bot": "[22.9.5.3, )",
|
"Telegram.Bot": "[22.9.5.3, )",
|
||||||
"dbup-postgresql": "[7.0.1, )"
|
"dbup-postgresql": "[7.0.1, )"
|
||||||
@@ -760,8 +389,8 @@
|
|||||||
"dependencies": {
|
"dependencies": {
|
||||||
"Aspire.Npgsql": "[13.2.2, )",
|
"Aspire.Npgsql": "[13.2.2, )",
|
||||||
"Dapper": "[2.1.72, )",
|
"Dapper": "[2.1.72, )",
|
||||||
"GmRelay.ServiceDefaults": "[1.15.0, )",
|
"GmRelay.ServiceDefaults": "[1.15.1, )",
|
||||||
"GmRelay.Shared": "[1.15.0, )",
|
"GmRelay.Shared": "[1.15.1, )",
|
||||||
"Npgsql": "[10.0.2, )",
|
"Npgsql": "[10.0.2, )",
|
||||||
"Telegram.Bot": "[22.9.6.1, )"
|
"Telegram.Bot": "[22.9.6.1, )"
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user