feat(arena-colosseum): playable bracket + rank-match promotion (phase 2)
Closes 4 more arena-colosseum spec shapes (6/16 → 10/16): the dual-prefix
battle URLs (colosseum_battle/* and colosseum_rank_battle/*) for both
do_matching and per-match finish, plus the bracket-end /finish + /retire
pair on /arena_colosseum.
* ColosseumProgressionService: pure-logic decisions for win-threshold
advancement, 3008 promotion trigger, and per-round reward bundles.
Extends ColosseumRoundsConfig with FinishRewards/RetireRewards per
round + a top-level ChampionRewards list.
* MatchContextBuilder.BuildForColosseumAsync: lifts the registered deck
via IDeckRepository (NOT viewer-graph) per project_ef_nav_include_pitfall.
* ArenaColosseumBattleController: dual route prefixes off one controller
via explicit absolute [HttpPost("/...")] routes — does NOT extend
SVSimController's [Route("[controller]")]. Same pattern as FreeBattle.
URL-vs-IsRankMatching mismatch returns 400 with a phase-mismatch error;
no-deck triggers the standard 3001 matchmaking-illegal state. 3008
flips run.IsRankMatching exactly once via the progression service.
* /arena_colosseum/finish + /retire share FinishResponse (rewards +
reward_list + colosseum_status). Champion finish appends ChampionRewards
and surfaces colosseum_status.is_champion = true. Both delete the run
row after granting via IInventoryTransaction.GrantAsync.
* DI: ModePolicy entries for "colosseum_battle" and "colosseum_rank_battle".
* Tests: 8 progression-service unit tests (pure logic), 5 battle-controller
HTTP tests, 5 bracket-terminate HTTP tests, 2 full-bracket E2E walks
(champion path + retire mid-round). Full suite: 1331/1331.
This commit is contained in:
gamer147
@@ -0,0 +1,156 @@
|
||||
using System.Net;
|
||||
using System.Net.Http.Json;
|
||||
using System.Text.Json;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using SVSim.Database;
|
||||
using SVSim.Database.Enums;
|
||||
using SVSim.Database.Models;
|
||||
using SVSim.UnitTests.Infrastructure;
|
||||
|
||||
namespace SVSim.UnitTests.Controllers;
|
||||
|
||||
/// <summary>
|
||||
/// Per-match battle URL coverage — verifies the dual <c>colosseum_battle/*</c> +
|
||||
/// <c>colosseum_rank_battle/*</c> dispatch matches <c>run.IsRankMatching</c>, that
|
||||
/// <c>battle/finish</c> bumps the per-round counters, and that the 3008 promotion
|
||||
/// trigger flips the run's rank flag.
|
||||
/// </summary>
|
||||
public class ArenaColosseumBattleControllerTests
|
||||
{
|
||||
private static readonly object Envelope =
|
||||
new { viewer_id = "0", steam_id = 0, steam_session_ticket = "" };
|
||||
|
||||
private static async Task SeedRunAsync(SVSimTestFactory factory, long viewerId, bool isRankMatching = false)
|
||||
{
|
||||
using var scope = factory.Services.CreateScope();
|
||||
var db = scope.ServiceProvider.GetRequiredService<SVSimDbContext>();
|
||||
db.ViewerArenaColosseumRuns.Add(new ViewerArenaColosseumRun
|
||||
{
|
||||
ViewerId = viewerId,
|
||||
EntryId = 1001,
|
||||
SeasonId = 42,
|
||||
RoundId = 1,
|
||||
DeckFormat = Format.Rotation,
|
||||
MaxBattleCountThisRound = 5,
|
||||
BreakthroughNumberThisRound = 4,
|
||||
IsRankMatching = isRankMatching,
|
||||
RegisteredDeckNoListJson = "[3]",
|
||||
});
|
||||
await db.SaveChangesAsync();
|
||||
}
|
||||
|
||||
[Test]
|
||||
public async Task DoMatching_pre_rank_rejects_when_run_is_rank_matching()
|
||||
{
|
||||
using var factory = new SVSimTestFactory();
|
||||
var vid = await factory.SeedViewerAsync();
|
||||
await SeedRunAsync(factory, vid, isRankMatching: true);
|
||||
await factory.SeedDeckAsync(vid, Format.Rotation, number: 3);
|
||||
using var client = factory.CreateAuthenticatedClient(vid);
|
||||
|
||||
var resp = await client.PostAsync("/colosseum_battle/do_matching", JsonContent.Create(Envelope));
|
||||
Assert.That(resp.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest));
|
||||
var body = await resp.Content.ReadAsStringAsync();
|
||||
StringAssert.Contains("colosseum_url_phase_mismatch", body);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public async Task DoMatching_post_rank_rejects_when_run_is_pre_rank()
|
||||
{
|
||||
using var factory = new SVSimTestFactory();
|
||||
var vid = await factory.SeedViewerAsync();
|
||||
await SeedRunAsync(factory, vid, isRankMatching: false);
|
||||
await factory.SeedDeckAsync(vid, Format.Rotation, number: 3);
|
||||
using var client = factory.CreateAuthenticatedClient(vid);
|
||||
|
||||
var resp = await client.PostAsync("/colosseum_rank_battle/do_matching", JsonContent.Create(Envelope));
|
||||
Assert.That(resp.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest));
|
||||
var body = await resp.Content.ReadAsStringAsync();
|
||||
StringAssert.Contains("colosseum_url_phase_mismatch", body);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public async Task DoMatching_returns_3001_when_no_deck_registered()
|
||||
{
|
||||
using var factory = new SVSimTestFactory();
|
||||
var vid = await factory.SeedViewerAsync();
|
||||
|
||||
using (var scope = factory.Services.CreateScope())
|
||||
{
|
||||
var db = scope.ServiceProvider.GetRequiredService<SVSimDbContext>();
|
||||
db.ViewerArenaColosseumRuns.Add(new ViewerArenaColosseumRun
|
||||
{
|
||||
ViewerId = vid,
|
||||
EntryId = 1001,
|
||||
SeasonId = 42,
|
||||
RoundId = 1,
|
||||
DeckFormat = Format.Rotation,
|
||||
RegisteredDeckNoListJson = "[]",
|
||||
});
|
||||
await db.SaveChangesAsync();
|
||||
}
|
||||
|
||||
using var client = factory.CreateAuthenticatedClient(vid);
|
||||
var resp = await client.PostAsync("/colosseum_battle/do_matching", JsonContent.Create(Envelope));
|
||||
Assert.That(resp.StatusCode, Is.EqualTo(HttpStatusCode.OK));
|
||||
|
||||
var body = await resp.Content.ReadAsStringAsync();
|
||||
using var doc = JsonDocument.Parse(body);
|
||||
Assert.That(doc.RootElement.GetProperty("matching_state").GetInt32(), Is.EqualTo(3001));
|
||||
}
|
||||
|
||||
[Test]
|
||||
public async Task BattleFinish_win_advances_counters_and_appends_result_list()
|
||||
{
|
||||
using var factory = new SVSimTestFactory();
|
||||
var vid = await factory.SeedViewerAsync();
|
||||
await SeedRunAsync(factory, vid);
|
||||
using var client = factory.CreateAuthenticatedClient(vid);
|
||||
|
||||
var req = new
|
||||
{
|
||||
battle_result = 1, is_retire = 0, class_id = 1,
|
||||
total_turn = 5, evolve_count = 1, enemy_evolve_count = 0,
|
||||
recovery_data = "",
|
||||
viewer_id = "0", steam_id = 0, steam_session_ticket = "",
|
||||
};
|
||||
var resp = await client.PostAsync("/colosseum_battle/finish", JsonContent.Create(req));
|
||||
Assert.That(resp.StatusCode, Is.EqualTo(HttpStatusCode.OK));
|
||||
|
||||
using var scope = factory.Services.CreateScope();
|
||||
var db = scope.ServiceProvider.GetRequiredService<SVSimDbContext>();
|
||||
var run = await db.ViewerArenaColosseumRuns.FirstAsync(r => r.ViewerId == vid);
|
||||
Assert.That(run.WinCount, Is.EqualTo(1));
|
||||
Assert.That(run.LossCount, Is.EqualTo(0));
|
||||
Assert.That(run.BattleCountThisRound, Is.EqualTo(1));
|
||||
Assert.That(run.ResultListJson, Is.EqualTo("[1]"));
|
||||
}
|
||||
|
||||
[Test]
|
||||
public async Task BattleFinish_retire_does_not_advance_counters()
|
||||
{
|
||||
using var factory = new SVSimTestFactory();
|
||||
var vid = await factory.SeedViewerAsync();
|
||||
await SeedRunAsync(factory, vid);
|
||||
using var client = factory.CreateAuthenticatedClient(vid);
|
||||
|
||||
var req = new
|
||||
{
|
||||
battle_result = 2, is_retire = 1, class_id = 1,
|
||||
total_turn = 3, evolve_count = 0, enemy_evolve_count = 0,
|
||||
recovery_data = "",
|
||||
viewer_id = "0", steam_id = 0, steam_session_ticket = "",
|
||||
};
|
||||
var resp = await client.PostAsync("/colosseum_battle/finish", JsonContent.Create(req));
|
||||
Assert.That(resp.StatusCode, Is.EqualTo(HttpStatusCode.OK));
|
||||
|
||||
using var scope = factory.Services.CreateScope();
|
||||
var db = scope.ServiceProvider.GetRequiredService<SVSimDbContext>();
|
||||
var run = await db.ViewerArenaColosseumRuns.FirstAsync(r => r.ViewerId == vid);
|
||||
Assert.That(run.WinCount, Is.EqualTo(0));
|
||||
Assert.That(run.LossCount, Is.EqualTo(0));
|
||||
Assert.That(run.BattleCountThisRound, Is.EqualTo(0),
|
||||
"is_retire=1 must not bump the per-round battle counter");
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,244 @@
|
||||
using System.Net;
|
||||
using System.Net.Http.Json;
|
||||
using System.Text.Json;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using SVSim.Database;
|
||||
using SVSim.Database.Enums;
|
||||
using SVSim.Database.Models;
|
||||
using SVSim.UnitTests.Infrastructure;
|
||||
|
||||
namespace SVSim.UnitTests.Controllers;
|
||||
|
||||
/// <summary>
|
||||
/// Bracket-end /finish + /retire coverage. Locks the wire shape (rewards + reward_list +
|
||||
/// colosseum_status) and verifies side-effects: rewards granted through the inventory
|
||||
/// service, run row deleted, champion flag flipped on final-round clear.
|
||||
/// </summary>
|
||||
public class ArenaColosseumControllerBracketTerminateTests
|
||||
{
|
||||
private static readonly object Envelope =
|
||||
new { viewer_id = "0", steam_id = 0, steam_session_ticket = "" };
|
||||
|
||||
/// <summary>Three-round config with reward bundles on every round + a champion bundle.</summary>
|
||||
private static async Task ActivateSeasonWithRewardsAsync(SVSimTestFactory factory)
|
||||
{
|
||||
using var scope = factory.Services.CreateScope();
|
||||
var db = scope.ServiceProvider.GetRequiredService<SVSimDbContext>();
|
||||
|
||||
var seasonJson = JsonSerializer.Serialize(new
|
||||
{
|
||||
IsColosseumPeriod = true,
|
||||
SeasonId = 42,
|
||||
ColosseumName = "Test Cup",
|
||||
DeckFormat = (int)Format.Rotation,
|
||||
FinalRoundEliminateCount = 1000,
|
||||
});
|
||||
await UpsertConfigAsync(db, "ColosseumSeason", seasonJson);
|
||||
|
||||
var roundsJson = JsonSerializer.Serialize(new
|
||||
{
|
||||
Rounds = new[]
|
||||
{
|
||||
new
|
||||
{
|
||||
RoundId = 1,
|
||||
Groups = new[] { new { Group = "", MaxBattleCount = 5, BreakthroughNumber = 3, EntryNumber = 100_000 } },
|
||||
FinishRewards = new[]
|
||||
{
|
||||
new { Type = (int)UserGoodsType.Crystal, DetailId = 0L, Count = 100, Name = "R1 finish" },
|
||||
},
|
||||
RetireRewards = new object[]
|
||||
{
|
||||
new { Type = (int)UserGoodsType.Rupy, DetailId = 0L, Count = 50, Name = "R1 retire" },
|
||||
},
|
||||
},
|
||||
new
|
||||
{
|
||||
RoundId = 2,
|
||||
Groups = new[] { new { Group = "Group A", MaxBattleCount = 5, BreakthroughNumber = 4, EntryNumber = 10_000 } },
|
||||
FinishRewards = new[]
|
||||
{
|
||||
new { Type = (int)UserGoodsType.Crystal, DetailId = 0L, Count = 250, Name = "R2 finish" },
|
||||
},
|
||||
RetireRewards = Array.Empty<object>(),
|
||||
},
|
||||
new
|
||||
{
|
||||
RoundId = 3,
|
||||
Groups = new[] { new { Group = "Final", MaxBattleCount = 5, BreakthroughNumber = 4, EntryNumber = 1_000 } },
|
||||
FinishRewards = new[]
|
||||
{
|
||||
new { Type = (int)UserGoodsType.Crystal, DetailId = 0L, Count = 1000, Name = "Final clear" },
|
||||
},
|
||||
RetireRewards = Array.Empty<object>(),
|
||||
},
|
||||
},
|
||||
ChampionRewards = new[]
|
||||
{
|
||||
new { Type = (int)UserGoodsType.Crystal, DetailId = 0L, Count = 5000, Name = "Champion Pack" },
|
||||
},
|
||||
});
|
||||
await UpsertConfigAsync(db, "ColosseumRounds", roundsJson);
|
||||
}
|
||||
|
||||
private static async Task UpsertConfigAsync(SVSimDbContext db, string section, string json)
|
||||
{
|
||||
var existing = await db.GameConfigs.FirstOrDefaultAsync(s => s.SectionName == section);
|
||||
if (existing is null)
|
||||
db.GameConfigs.Add(new GameConfigSection { SectionName = section, ValueJson = json });
|
||||
else
|
||||
existing.ValueJson = json;
|
||||
await db.SaveChangesAsync();
|
||||
}
|
||||
|
||||
private static async Task SeedRunAsync(
|
||||
SVSimTestFactory factory, long viewerId, int roundId, int winCount, int battleCount)
|
||||
{
|
||||
using var scope = factory.Services.CreateScope();
|
||||
var db = scope.ServiceProvider.GetRequiredService<SVSimDbContext>();
|
||||
db.ViewerArenaColosseumRuns.Add(new ViewerArenaColosseumRun
|
||||
{
|
||||
ViewerId = viewerId,
|
||||
EntryId = 1001,
|
||||
SeasonId = 42,
|
||||
RoundId = roundId,
|
||||
DeckFormat = Format.Rotation,
|
||||
WinCount = winCount,
|
||||
BattleCountThisRound = battleCount,
|
||||
MaxBattleCountThisRound = 5,
|
||||
BreakthroughNumberThisRound = roundId == 1 ? 3 : 4,
|
||||
});
|
||||
await db.SaveChangesAsync();
|
||||
}
|
||||
|
||||
[Test]
|
||||
public async Task Finish_emits_champion_flag_when_round_3_cleared()
|
||||
{
|
||||
using var factory = new SVSimTestFactory();
|
||||
await ActivateSeasonWithRewardsAsync(factory);
|
||||
var vid = await factory.SeedViewerAsync();
|
||||
await SeedRunAsync(factory, vid, roundId: 3, winCount: 4, battleCount: 4);
|
||||
|
||||
using var client = factory.CreateAuthenticatedClient(vid);
|
||||
var resp = await client.PostAsync("/arena_colosseum/finish", JsonContent.Create(Envelope));
|
||||
Assert.That(resp.StatusCode, Is.EqualTo(HttpStatusCode.OK));
|
||||
|
||||
var body = await resp.Content.ReadAsStringAsync();
|
||||
using var doc = JsonDocument.Parse(body);
|
||||
var root = doc.RootElement;
|
||||
|
||||
Assert.That(root.GetProperty("colosseum_status").GetProperty("is_champion").GetBoolean(), Is.True);
|
||||
Assert.That(root.GetProperty("colosseum_status").GetProperty("colosseum_name").GetString(),
|
||||
Is.EqualTo("Test Cup"));
|
||||
|
||||
// Final clear + champion bundle = 2 reward entries.
|
||||
Assert.That(root.GetProperty("rewards").GetArrayLength(), Is.EqualTo(2));
|
||||
Assert.That(root.GetProperty("reward_list").GetArrayLength(), Is.EqualTo(2));
|
||||
}
|
||||
|
||||
[Test]
|
||||
public async Task Finish_grants_rewards_and_deletes_run()
|
||||
{
|
||||
using var factory = new SVSimTestFactory();
|
||||
await ActivateSeasonWithRewardsAsync(factory);
|
||||
var vid = await factory.SeedViewerAsync();
|
||||
// Round 1 breakthrough advances to round 2 — bracket isn't finished. Use round 3 +
|
||||
// exhausted battle cap WITHOUT breakthrough to terminate cleanly with round-end rewards.
|
||||
await SeedRunAsync(factory, vid, roundId: 3, winCount: 2, battleCount: 5);
|
||||
|
||||
ulong crystalsBefore;
|
||||
using (var beforeScope = factory.Services.CreateScope())
|
||||
{
|
||||
var beforeDb = beforeScope.ServiceProvider.GetRequiredService<SVSimDbContext>();
|
||||
crystalsBefore = (await beforeDb.Viewers.FirstAsync(v => v.Id == vid)).Currency.Crystals;
|
||||
}
|
||||
|
||||
using var client = factory.CreateAuthenticatedClient(vid);
|
||||
var resp = await client.PostAsync("/arena_colosseum/finish", JsonContent.Create(Envelope));
|
||||
Assert.That(resp.StatusCode, Is.EqualTo(HttpStatusCode.OK));
|
||||
|
||||
using var verifyScope = factory.Services.CreateScope();
|
||||
var db = verifyScope.ServiceProvider.GetRequiredService<SVSimDbContext>();
|
||||
|
||||
var run = await db.ViewerArenaColosseumRuns.FirstOrDefaultAsync(r => r.ViewerId == vid);
|
||||
Assert.That(run, Is.Null, "run row must be deleted on /finish");
|
||||
|
||||
var viewer = await db.Viewers.FirstAsync(v => v.Id == vid);
|
||||
Assert.That(viewer.Currency.Crystals - crystalsBefore, Is.EqualTo(1000UL),
|
||||
"Round 3 finish bundle is 1000 Crystal (not champion — battle cap hit without breakthrough)");
|
||||
}
|
||||
|
||||
[Test]
|
||||
public async Task Finish_rejects_when_bracket_still_in_progress()
|
||||
{
|
||||
using var factory = new SVSimTestFactory();
|
||||
await ActivateSeasonWithRewardsAsync(factory);
|
||||
var vid = await factory.SeedViewerAsync();
|
||||
// Mid-round: 1 win, 1 battle, breakthrough is 3 — not yet eligible.
|
||||
await SeedRunAsync(factory, vid, roundId: 1, winCount: 1, battleCount: 1);
|
||||
|
||||
using var client = factory.CreateAuthenticatedClient(vid);
|
||||
var resp = await client.PostAsync("/arena_colosseum/finish", JsonContent.Create(Envelope));
|
||||
Assert.That(resp.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest));
|
||||
|
||||
var body = await resp.Content.ReadAsStringAsync();
|
||||
StringAssert.Contains("bracket_not_finished", body);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public async Task Retire_grants_round_capped_rewards_and_deletes_run()
|
||||
{
|
||||
using var factory = new SVSimTestFactory();
|
||||
await ActivateSeasonWithRewardsAsync(factory);
|
||||
var vid = await factory.SeedViewerAsync();
|
||||
await SeedRunAsync(factory, vid, roundId: 1, winCount: 1, battleCount: 2);
|
||||
|
||||
ulong rupeesBefore;
|
||||
using (var beforeScope = factory.Services.CreateScope())
|
||||
{
|
||||
var beforeDb = beforeScope.ServiceProvider.GetRequiredService<SVSimDbContext>();
|
||||
rupeesBefore = (await beforeDb.Viewers.FirstAsync(v => v.Id == vid)).Currency.Rupees;
|
||||
}
|
||||
|
||||
using var client = factory.CreateAuthenticatedClient(vid);
|
||||
var resp = await client.PostAsync("/arena_colosseum/retire", JsonContent.Create(Envelope));
|
||||
Assert.That(resp.StatusCode, Is.EqualTo(HttpStatusCode.OK));
|
||||
|
||||
var body = await resp.Content.ReadAsStringAsync();
|
||||
using var doc = JsonDocument.Parse(body);
|
||||
var root = doc.RootElement;
|
||||
Assert.That(root.GetProperty("rewards").GetArrayLength(), Is.EqualTo(1));
|
||||
Assert.That(root.GetProperty("rewards")[0].GetProperty("name").GetString(), Is.EqualTo("R1 retire"));
|
||||
|
||||
using var verifyScope = factory.Services.CreateScope();
|
||||
var db = verifyScope.ServiceProvider.GetRequiredService<SVSimDbContext>();
|
||||
var run = await db.ViewerArenaColosseumRuns.FirstOrDefaultAsync(r => r.ViewerId == vid);
|
||||
Assert.That(run, Is.Null, "run row must be deleted on /retire");
|
||||
|
||||
var viewer = await db.Viewers.FirstAsync(v => v.Id == vid);
|
||||
Assert.That(viewer.Currency.Rupees - rupeesBefore, Is.EqualTo(50UL),
|
||||
"Round 1 retire bundle adds 50 Rupy on top of starting balance");
|
||||
}
|
||||
|
||||
[Test]
|
||||
public async Task Retire_during_final_round_still_works_and_emits_status()
|
||||
{
|
||||
using var factory = new SVSimTestFactory();
|
||||
await ActivateSeasonWithRewardsAsync(factory);
|
||||
var vid = await factory.SeedViewerAsync();
|
||||
// Round 3 has empty RetireRewards per config — client ignores rewards at FinalB anyway.
|
||||
await SeedRunAsync(factory, vid, roundId: 3, winCount: 2, battleCount: 3);
|
||||
|
||||
using var client = factory.CreateAuthenticatedClient(vid);
|
||||
var resp = await client.PostAsync("/arena_colosseum/retire", JsonContent.Create(Envelope));
|
||||
Assert.That(resp.StatusCode, Is.EqualTo(HttpStatusCode.OK));
|
||||
|
||||
var body = await resp.Content.ReadAsStringAsync();
|
||||
using var doc = JsonDocument.Parse(body);
|
||||
Assert.That(doc.RootElement.GetProperty("rewards").GetArrayLength(), Is.EqualTo(0),
|
||||
"FinalB retire emits empty rewards per retire.md");
|
||||
Assert.That(doc.RootElement.GetProperty("colosseum_status").GetProperty("now_round_id").GetInt32(),
|
||||
Is.EqualTo(3));
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user