diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index a30a680..eaa389a 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -6,7 +6,7 @@ on: - main env: - VERSION: 3.9.6 + VERSION: 3.9.7 jobs: # ЧАСТЬ 1: Собираем образы и кладем в Gitea (чтобы делиться с ребятами) diff --git a/Directory.Build.props b/Directory.Build.props index 02dc18a..da1a835 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,6 +1,6 @@ - 3.9.6 + 3.9.7 net10.0 preview enable diff --git a/compose.yaml b/compose.yaml index b8cecdd..a790505 100644 --- a/compose.yaml +++ b/compose.yaml @@ -49,7 +49,7 @@ services: crond -f bot: - image: git.codeanddice.ru/toutsu/gmrelay-bot:3.9.6 + image: git.codeanddice.ru/toutsu/gmrelay-bot:3.9.7 restart: always depends_on: db: @@ -67,7 +67,7 @@ services: retries: 3 discord: - image: git.codeanddice.ru/toutsu/gmrelay-discord-bot:3.9.6 + image: git.codeanddice.ru/toutsu/gmrelay-discord-bot:3.9.7 restart: always depends_on: db: @@ -86,7 +86,7 @@ services: retries: 3 web: - image: git.codeanddice.ru/toutsu/gmrelay-web:3.9.6 + image: git.codeanddice.ru/toutsu/gmrelay-web:3.9.7 restart: always depends_on: db: diff --git a/src/GmRelay.Bot/Features/Sessions/CreateSession/CreateSessionHandler.cs b/src/GmRelay.Bot/Features/Sessions/CreateSession/CreateSessionHandler.cs index d16db2f..70cf0c6 100644 --- a/src/GmRelay.Bot/Features/Sessions/CreateSession/CreateSessionHandler.cs +++ b/src/GmRelay.Bot/Features/Sessions/CreateSession/CreateSessionHandler.cs @@ -229,7 +229,11 @@ public sealed class CreateSessionHandler if (p.Type == WizardCreationType.Single) { if (p.Single?.ScheduledAt is null) missingFields.Add("дата/время"); - if (p.Single?.MaxPlayers is null) missingFields.Add("лимит мест"); + // MaxPlayers = null is a valid "♾ Без лимита" choice + // (see GameCreationWizard.ApplyCapacityChoice "no_limit"). Only a + // missing wizard step on the numeric-input path is a real defect; + // a non-null 0 also blocks (zero players is never what the user + // asked for). Treat null as "no limit" and accept it. } else { diff --git a/src/GmRelay.Web/Components/Layout/NavMenu.razor b/src/GmRelay.Web/Components/Layout/NavMenu.razor index d765c6c..b7b076d 100644 --- a/src/GmRelay.Web/Components/Layout/NavMenu.razor +++ b/src/GmRelay.Web/Components/Layout/NavMenu.razor @@ -82,7 +82,7 @@ - + diff --git a/tests/GmRelay.Bot.Tests/Features/Sessions/CreateSession/Wizard/CreateSessionHandlerSubmitValidationTests.cs b/tests/GmRelay.Bot.Tests/Features/Sessions/CreateSession/Wizard/CreateSessionHandlerSubmitValidationTests.cs index 134a935..81fb996 100644 --- a/tests/GmRelay.Bot.Tests/Features/Sessions/CreateSession/Wizard/CreateSessionHandlerSubmitValidationTests.cs +++ b/tests/GmRelay.Bot.Tests/Features/Sessions/CreateSession/Wizard/CreateSessionHandlerSubmitValidationTests.cs @@ -146,4 +146,47 @@ public sealed class CreateSessionHandlerSubmitValidationTests Assert.Single(messenger.Edits); Assert.Contains("слоты", messenger.Edits[0].Text, StringComparison.OrdinalIgnoreCase); } + + [Fact] + public async Task SubmitDraftAsync_SingleWithNoLimit_DoesNotReportMaxPlayersAsMissing() + { + // Regression for #131: pressing "♾ Без лимита" sets MaxPlayers = null. + // IsComplete must NOT flag that as a missing field; null means + // "no player limit" and is a valid final state. + var drafts = new FakeWizardDraftRepository(); + var messenger = new FakeWizardMessenger(); + + var sut = new CreateSessionHandler( + drafts, + shared: null!, + messenger, + NullLogger.Instance); + + var payload = new WizardPayload + { + Type = WizardCreationType.Single, + Title = "T", + System = "Dnd5e", + DurationMinutes = 240, + Visibility = WizardVisibility.Public, + Single = new WizardSingleInput + { + ScheduledAt = DateTimeOffset.UtcNow.AddDays(7), + MaxPlayers = null, + }, + }; + var draft = NewDraft(WizardStepNames.Confirm, payload); + drafts.Seed(draft); + + await sut.SubmitDraftAsync(draft, CancellationToken.None); + + // Validation must let the no-limit payload through. The shared + // handler is null, so anything that reached the database call would + // throw a NullReferenceException — that is caught by the retry + // path and reported as a "💥 Ошибка:" edit, not a missing-fields + // edit. Therefore we assert that NO edit mentions a missing field. + Assert.NotEmpty(messenger.Edits); + var lastEdit = messenger.Edits[^1].Text; + Assert.DoesNotContain("Не заполнены", lastEdit, StringComparison.OrdinalIgnoreCase); + } }