Merge feat/arena-colosseum: 3-phase Grand Prix implementation (1/16 → 15/16)
This commit is contained in:
@@ -0,0 +1,86 @@
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using SVSim.Database;
|
||||
using SVSim.Database.Models;
|
||||
|
||||
namespace SVSim.Bootstrap.Importers;
|
||||
|
||||
/// <summary>
|
||||
/// Shared upsert path for the three Colosseum curated-deck pools. Each subclass binds the
|
||||
/// EF entity type + the seed filename; the load + key + diff logic lives here. Empty seed
|
||||
/// files are non-fatal — the pools ship empty by default per the plan (admins fill them
|
||||
/// per-event).
|
||||
/// </summary>
|
||||
public abstract class ColosseumCuratedDeckImporterBase<TEntity>
|
||||
where TEntity : class, IColosseumCuratedDeck, new()
|
||||
{
|
||||
protected abstract string SeedFileName { get; }
|
||||
|
||||
public async Task<int> ImportAsync(SVSimDbContext context, string seedDir)
|
||||
{
|
||||
var path = Path.Combine(seedDir, SeedFileName);
|
||||
if (!File.Exists(path))
|
||||
{
|
||||
Console.WriteLine($"[{GetType().Name}] missing {path}; skipping.");
|
||||
return 0;
|
||||
}
|
||||
|
||||
var seeds = SeedLoader.LoadList<ColosseumCuratedDeckSeed>(path);
|
||||
var set = context.Set<TEntity>();
|
||||
var existing = await set.ToDictionaryAsync(d => d.DeckNo);
|
||||
|
||||
int upserted = 0;
|
||||
foreach (var s in seeds)
|
||||
{
|
||||
if (existing.TryGetValue(s.DeckNo, out var row))
|
||||
{
|
||||
row.ClassId = s.ClassId;
|
||||
row.CardListJson = s.CardListJson;
|
||||
row.SleeveId = s.SleeveId;
|
||||
row.LeaderSkinId = s.LeaderSkinId;
|
||||
row.DisplayOrder = s.DisplayOrder;
|
||||
}
|
||||
else
|
||||
{
|
||||
set.Add(new TEntity
|
||||
{
|
||||
DeckNo = s.DeckNo,
|
||||
ClassId = s.ClassId,
|
||||
CardListJson = s.CardListJson,
|
||||
SleeveId = s.SleeveId,
|
||||
LeaderSkinId = s.LeaderSkinId,
|
||||
DisplayOrder = s.DisplayOrder,
|
||||
});
|
||||
}
|
||||
upserted++;
|
||||
}
|
||||
|
||||
await context.SaveChangesAsync();
|
||||
Console.WriteLine($"[{GetType().Name}] upserted={upserted}");
|
||||
return upserted;
|
||||
}
|
||||
}
|
||||
|
||||
public sealed class ColosseumCuratedDeckSeed
|
||||
{
|
||||
public int DeckNo { get; set; }
|
||||
public int ClassId { get; set; }
|
||||
public string CardListJson { get; set; } = "[]";
|
||||
public long SleeveId { get; set; }
|
||||
public long LeaderSkinId { get; set; }
|
||||
public int DisplayOrder { get; set; }
|
||||
}
|
||||
|
||||
public sealed class ColosseumHofDecksImporter : ColosseumCuratedDeckImporterBase<ColosseumHofDeck>
|
||||
{
|
||||
protected override string SeedFileName => "colosseum-hof-decks.json";
|
||||
}
|
||||
|
||||
public sealed class ColosseumWindFallDecksImporter : ColosseumCuratedDeckImporterBase<ColosseumWindFallDeck>
|
||||
{
|
||||
protected override string SeedFileName => "colosseum-windfall-decks.json";
|
||||
}
|
||||
|
||||
public sealed class ColosseumAvatarDecksImporter : ColosseumCuratedDeckImporterBase<ColosseumAvatarDeck>
|
||||
{
|
||||
protected override string SeedFileName => "colosseum-avatar-decks.json";
|
||||
}
|
||||
@@ -85,6 +85,9 @@ public static class Program
|
||||
await new AvatarAbilityImporter().ImportAsync(context, opts.SeedDir);
|
||||
await new ArenaSeasonImporter().ImportAsync(context, opts.SeedDir);
|
||||
await new ArenaTwoPickRewardImporter().ImportAsync(context, opts.SeedDir);
|
||||
await new ColosseumHofDecksImporter().ImportAsync(context, opts.SeedDir);
|
||||
await new ColosseumWindFallDecksImporter().ImportAsync(context, opts.SeedDir);
|
||||
await new ColosseumAvatarDecksImporter().ImportAsync(context, opts.SeedDir);
|
||||
await new BattlePassImporter().ImportAsync(context, opts.SeedDir);
|
||||
await new BattlePassSeasonImporter().ImportAsync(context, opts.SeedDir);
|
||||
await new BattlePassRewardImporter().ImportAsync(context, opts.SeedDir);
|
||||
|
||||
4761
SVSim.Database/Migrations/20260613155613_AddArenaColosseumRun.Designer.cs
generated
Normal file
4761
SVSim.Database/Migrations/20260613155613_AddArenaColosseumRun.Designer.cs
generated
Normal file
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,69 @@
|
||||
using System;
|
||||
using Microsoft.EntityFrameworkCore.Migrations;
|
||||
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
|
||||
|
||||
#nullable disable
|
||||
|
||||
namespace SVSim.Database.Migrations
|
||||
{
|
||||
/// <inheritdoc />
|
||||
public partial class AddArenaColosseumRun : Migration
|
||||
{
|
||||
/// <inheritdoc />
|
||||
protected override void Up(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.CreateTable(
|
||||
name: "ViewerArenaColosseumRuns",
|
||||
columns: table => new
|
||||
{
|
||||
Id = table.Column<long>(type: "bigint", nullable: false)
|
||||
.Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
|
||||
ViewerId = table.Column<long>(type: "bigint", nullable: false),
|
||||
EntryId = table.Column<long>(type: "bigint", nullable: false),
|
||||
SeasonId = table.Column<int>(type: "integer", nullable: false),
|
||||
RoundId = table.Column<int>(type: "integer", nullable: false),
|
||||
DeckFormat = table.Column<int>(type: "integer", nullable: false),
|
||||
LeaderSkinId = table.Column<long>(type: "bigint", nullable: false),
|
||||
ConsumeItemType = table.Column<int>(type: "integer", nullable: false),
|
||||
CandidateClassIdsJson = table.Column<string>(type: "jsonb", nullable: false),
|
||||
SelectTurn = table.Column<int>(type: "integer", nullable: false),
|
||||
IsSelectCompleted = table.Column<bool>(type: "boolean", nullable: false),
|
||||
SelectedCardIdsJson = table.Column<string>(type: "jsonb", nullable: false),
|
||||
PendingPickSetsJson = table.Column<string>(type: "jsonb", nullable: false),
|
||||
NextCandidateId = table.Column<long>(type: "bigint", nullable: false),
|
||||
ClassId = table.Column<int>(type: "integer", nullable: false),
|
||||
ChaosId = table.Column<int>(type: "integer", nullable: false),
|
||||
ResultListJson = table.Column<string>(type: "jsonb", nullable: false),
|
||||
WinCount = table.Column<int>(type: "integer", nullable: false),
|
||||
LossCount = table.Column<int>(type: "integer", nullable: false),
|
||||
BattleCountThisRound = table.Column<int>(type: "integer", nullable: false),
|
||||
MaxBattleCountThisRound = table.Column<int>(type: "integer", nullable: false),
|
||||
BreakthroughNumberThisRound = table.Column<int>(type: "integer", nullable: false),
|
||||
RestEntryNum = table.Column<int>(type: "integer", nullable: false),
|
||||
IsRankMatching = table.Column<bool>(type: "boolean", nullable: false),
|
||||
IsChampion = table.Column<bool>(type: "boolean", nullable: false),
|
||||
RegisteredDeckNoListJson = table.Column<string>(type: "jsonb", nullable: false),
|
||||
IsPublished = table.Column<bool>(type: "boolean", nullable: false),
|
||||
CreatedAt = table.Column<DateTime>(type: "timestamp with time zone", nullable: false),
|
||||
UpdatedAt = table.Column<DateTime>(type: "timestamp with time zone", nullable: false)
|
||||
},
|
||||
constraints: table =>
|
||||
{
|
||||
table.PrimaryKey("PK_ViewerArenaColosseumRuns", x => x.Id);
|
||||
});
|
||||
|
||||
migrationBuilder.CreateIndex(
|
||||
name: "IX_ViewerArenaColosseumRuns_ViewerId",
|
||||
table: "ViewerArenaColosseumRuns",
|
||||
column: "ViewerId",
|
||||
unique: true);
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.DropTable(
|
||||
name: "ViewerArenaColosseumRuns");
|
||||
}
|
||||
}
|
||||
}
|
||||
4866
SVSim.Database/Migrations/20260613164340_AddColosseumCuratedDecks.Designer.cs
generated
Normal file
4866
SVSim.Database/Migrations/20260613164340_AddColosseumCuratedDecks.Designer.cs
generated
Normal file
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,100 @@
|
||||
using Microsoft.EntityFrameworkCore.Migrations;
|
||||
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
|
||||
|
||||
#nullable disable
|
||||
|
||||
namespace SVSim.Database.Migrations
|
||||
{
|
||||
/// <inheritdoc />
|
||||
public partial class AddColosseumCuratedDecks : Migration
|
||||
{
|
||||
/// <inheritdoc />
|
||||
protected override void Up(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.CreateTable(
|
||||
name: "ColosseumAvatarDecks",
|
||||
columns: table => new
|
||||
{
|
||||
Id = table.Column<long>(type: "bigint", nullable: false)
|
||||
.Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
|
||||
DeckNo = table.Column<int>(type: "integer", nullable: false),
|
||||
ClassId = table.Column<int>(type: "integer", nullable: false),
|
||||
CardListJson = table.Column<string>(type: "jsonb", nullable: false),
|
||||
SleeveId = table.Column<long>(type: "bigint", nullable: false),
|
||||
LeaderSkinId = table.Column<long>(type: "bigint", nullable: false),
|
||||
DisplayOrder = table.Column<int>(type: "integer", nullable: false)
|
||||
},
|
||||
constraints: table =>
|
||||
{
|
||||
table.PrimaryKey("PK_ColosseumAvatarDecks", x => x.Id);
|
||||
});
|
||||
|
||||
migrationBuilder.CreateTable(
|
||||
name: "ColosseumHofDecks",
|
||||
columns: table => new
|
||||
{
|
||||
Id = table.Column<long>(type: "bigint", nullable: false)
|
||||
.Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
|
||||
DeckNo = table.Column<int>(type: "integer", nullable: false),
|
||||
ClassId = table.Column<int>(type: "integer", nullable: false),
|
||||
CardListJson = table.Column<string>(type: "jsonb", nullable: false),
|
||||
SleeveId = table.Column<long>(type: "bigint", nullable: false),
|
||||
LeaderSkinId = table.Column<long>(type: "bigint", nullable: false),
|
||||
DisplayOrder = table.Column<int>(type: "integer", nullable: false)
|
||||
},
|
||||
constraints: table =>
|
||||
{
|
||||
table.PrimaryKey("PK_ColosseumHofDecks", x => x.Id);
|
||||
});
|
||||
|
||||
migrationBuilder.CreateTable(
|
||||
name: "ColosseumWindFallDecks",
|
||||
columns: table => new
|
||||
{
|
||||
Id = table.Column<long>(type: "bigint", nullable: false)
|
||||
.Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
|
||||
DeckNo = table.Column<int>(type: "integer", nullable: false),
|
||||
ClassId = table.Column<int>(type: "integer", nullable: false),
|
||||
CardListJson = table.Column<string>(type: "jsonb", nullable: false),
|
||||
SleeveId = table.Column<long>(type: "bigint", nullable: false),
|
||||
LeaderSkinId = table.Column<long>(type: "bigint", nullable: false),
|
||||
DisplayOrder = table.Column<int>(type: "integer", nullable: false)
|
||||
},
|
||||
constraints: table =>
|
||||
{
|
||||
table.PrimaryKey("PK_ColosseumWindFallDecks", x => x.Id);
|
||||
});
|
||||
|
||||
migrationBuilder.CreateIndex(
|
||||
name: "IX_ColosseumAvatarDecks_DeckNo",
|
||||
table: "ColosseumAvatarDecks",
|
||||
column: "DeckNo",
|
||||
unique: true);
|
||||
|
||||
migrationBuilder.CreateIndex(
|
||||
name: "IX_ColosseumHofDecks_DeckNo",
|
||||
table: "ColosseumHofDecks",
|
||||
column: "DeckNo",
|
||||
unique: true);
|
||||
|
||||
migrationBuilder.CreateIndex(
|
||||
name: "IX_ColosseumWindFallDecks_DeckNo",
|
||||
table: "ColosseumWindFallDecks",
|
||||
column: "DeckNo",
|
||||
unique: true);
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.DropTable(
|
||||
name: "ColosseumAvatarDecks");
|
||||
|
||||
migrationBuilder.DropTable(
|
||||
name: "ColosseumHofDecks");
|
||||
|
||||
migrationBuilder.DropTable(
|
||||
name: "ColosseumWindFallDecks");
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -970,6 +970,41 @@ namespace SVSim.Database.Migrations
|
||||
b.ToTable("ClassExpCurve");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("SVSim.Database.Models.ColosseumAvatarDeck", b =>
|
||||
{
|
||||
b.Property<long>("Id")
|
||||
.ValueGeneratedOnAdd()
|
||||
.HasColumnType("bigint");
|
||||
|
||||
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("Id"));
|
||||
|
||||
b.Property<string>("CardListJson")
|
||||
.IsRequired()
|
||||
.HasColumnType("jsonb");
|
||||
|
||||
b.Property<int>("ClassId")
|
||||
.HasColumnType("integer");
|
||||
|
||||
b.Property<int>("DeckNo")
|
||||
.HasColumnType("integer");
|
||||
|
||||
b.Property<int>("DisplayOrder")
|
||||
.HasColumnType("integer");
|
||||
|
||||
b.Property<long>("LeaderSkinId")
|
||||
.HasColumnType("bigint");
|
||||
|
||||
b.Property<long>("SleeveId")
|
||||
.HasColumnType("bigint");
|
||||
|
||||
b.HasKey("Id");
|
||||
|
||||
b.HasIndex("DeckNo")
|
||||
.IsUnique();
|
||||
|
||||
b.ToTable("ColosseumAvatarDecks");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("SVSim.Database.Models.ColosseumConfig", b =>
|
||||
{
|
||||
b.Property<int>("Id")
|
||||
@@ -1041,6 +1076,76 @@ namespace SVSim.Database.Migrations
|
||||
b.ToTable("Colosseums");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("SVSim.Database.Models.ColosseumHofDeck", b =>
|
||||
{
|
||||
b.Property<long>("Id")
|
||||
.ValueGeneratedOnAdd()
|
||||
.HasColumnType("bigint");
|
||||
|
||||
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("Id"));
|
||||
|
||||
b.Property<string>("CardListJson")
|
||||
.IsRequired()
|
||||
.HasColumnType("jsonb");
|
||||
|
||||
b.Property<int>("ClassId")
|
||||
.HasColumnType("integer");
|
||||
|
||||
b.Property<int>("DeckNo")
|
||||
.HasColumnType("integer");
|
||||
|
||||
b.Property<int>("DisplayOrder")
|
||||
.HasColumnType("integer");
|
||||
|
||||
b.Property<long>("LeaderSkinId")
|
||||
.HasColumnType("bigint");
|
||||
|
||||
b.Property<long>("SleeveId")
|
||||
.HasColumnType("bigint");
|
||||
|
||||
b.HasKey("Id");
|
||||
|
||||
b.HasIndex("DeckNo")
|
||||
.IsUnique();
|
||||
|
||||
b.ToTable("ColosseumHofDecks");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("SVSim.Database.Models.ColosseumWindFallDeck", b =>
|
||||
{
|
||||
b.Property<long>("Id")
|
||||
.ValueGeneratedOnAdd()
|
||||
.HasColumnType("bigint");
|
||||
|
||||
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("Id"));
|
||||
|
||||
b.Property<string>("CardListJson")
|
||||
.IsRequired()
|
||||
.HasColumnType("jsonb");
|
||||
|
||||
b.Property<int>("ClassId")
|
||||
.HasColumnType("integer");
|
||||
|
||||
b.Property<int>("DeckNo")
|
||||
.HasColumnType("integer");
|
||||
|
||||
b.Property<int>("DisplayOrder")
|
||||
.HasColumnType("integer");
|
||||
|
||||
b.Property<long>("LeaderSkinId")
|
||||
.HasColumnType("bigint");
|
||||
|
||||
b.Property<long>("SleeveId")
|
||||
.HasColumnType("bigint");
|
||||
|
||||
b.HasKey("Id");
|
||||
|
||||
b.HasIndex("DeckNo")
|
||||
.IsUnique();
|
||||
|
||||
b.ToTable("ColosseumWindFallDecks");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("SVSim.Database.Models.DailyLoginBonusEntry", b =>
|
||||
{
|
||||
b.Property<int>("Id")
|
||||
@@ -2766,6 +2871,111 @@ namespace SVSim.Database.Migrations
|
||||
b.ToTable("ViewerAcquireHistory");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("SVSim.Database.Models.ViewerArenaColosseumRun", b =>
|
||||
{
|
||||
b.Property<long>("Id")
|
||||
.ValueGeneratedOnAdd()
|
||||
.HasColumnType("bigint");
|
||||
|
||||
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("Id"));
|
||||
|
||||
b.Property<int>("BattleCountThisRound")
|
||||
.HasColumnType("integer");
|
||||
|
||||
b.Property<int>("BreakthroughNumberThisRound")
|
||||
.HasColumnType("integer");
|
||||
|
||||
b.Property<string>("CandidateClassIdsJson")
|
||||
.IsRequired()
|
||||
.HasColumnType("jsonb");
|
||||
|
||||
b.Property<int>("ChaosId")
|
||||
.HasColumnType("integer");
|
||||
|
||||
b.Property<int>("ClassId")
|
||||
.HasColumnType("integer");
|
||||
|
||||
b.Property<int>("ConsumeItemType")
|
||||
.HasColumnType("integer");
|
||||
|
||||
b.Property<DateTime>("CreatedAt")
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.Property<int>("DeckFormat")
|
||||
.HasColumnType("integer");
|
||||
|
||||
b.Property<long>("EntryId")
|
||||
.HasColumnType("bigint");
|
||||
|
||||
b.Property<bool>("IsChampion")
|
||||
.HasColumnType("boolean");
|
||||
|
||||
b.Property<bool>("IsPublished")
|
||||
.HasColumnType("boolean");
|
||||
|
||||
b.Property<bool>("IsRankMatching")
|
||||
.HasColumnType("boolean");
|
||||
|
||||
b.Property<bool>("IsSelectCompleted")
|
||||
.HasColumnType("boolean");
|
||||
|
||||
b.Property<long>("LeaderSkinId")
|
||||
.HasColumnType("bigint");
|
||||
|
||||
b.Property<int>("LossCount")
|
||||
.HasColumnType("integer");
|
||||
|
||||
b.Property<int>("MaxBattleCountThisRound")
|
||||
.HasColumnType("integer");
|
||||
|
||||
b.Property<long>("NextCandidateId")
|
||||
.HasColumnType("bigint");
|
||||
|
||||
b.Property<string>("PendingPickSetsJson")
|
||||
.IsRequired()
|
||||
.HasColumnType("jsonb");
|
||||
|
||||
b.Property<string>("RegisteredDeckNoListJson")
|
||||
.IsRequired()
|
||||
.HasColumnType("jsonb");
|
||||
|
||||
b.Property<int>("RestEntryNum")
|
||||
.HasColumnType("integer");
|
||||
|
||||
b.Property<string>("ResultListJson")
|
||||
.IsRequired()
|
||||
.HasColumnType("jsonb");
|
||||
|
||||
b.Property<int>("RoundId")
|
||||
.HasColumnType("integer");
|
||||
|
||||
b.Property<int>("SeasonId")
|
||||
.HasColumnType("integer");
|
||||
|
||||
b.Property<int>("SelectTurn")
|
||||
.HasColumnType("integer");
|
||||
|
||||
b.Property<string>("SelectedCardIdsJson")
|
||||
.IsRequired()
|
||||
.HasColumnType("jsonb");
|
||||
|
||||
b.Property<DateTime>("UpdatedAt")
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.Property<long>("ViewerId")
|
||||
.HasColumnType("bigint");
|
||||
|
||||
b.Property<int>("WinCount")
|
||||
.HasColumnType("integer");
|
||||
|
||||
b.HasKey("Id");
|
||||
|
||||
b.HasIndex("ViewerId")
|
||||
.IsUnique();
|
||||
|
||||
b.ToTable("ViewerArenaColosseumRuns");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("SVSim.Database.Models.ViewerArenaTwoPickRun", b =>
|
||||
{
|
||||
b.Property<long>("Id")
|
||||
|
||||
21
SVSim.Database/Models/ColosseumAvatarDeck.cs
Normal file
21
SVSim.Database/Models/ColosseumAvatarDeck.cs
Normal file
@@ -0,0 +1,21 @@
|
||||
using System.ComponentModel.DataAnnotations.Schema;
|
||||
|
||||
namespace SVSim.Database.Models;
|
||||
|
||||
/// <summary>
|
||||
/// Curated Avatar (themed-character) deck for Arena Colosseum. See
|
||||
/// <see cref="ColosseumHofDeck"/> for the rationale on the duplicated schema.
|
||||
/// </summary>
|
||||
public class ColosseumAvatarDeck : IColosseumCuratedDeck
|
||||
{
|
||||
public long Id { get; set; }
|
||||
public int DeckNo { get; set; }
|
||||
public int ClassId { get; set; }
|
||||
|
||||
[Column(TypeName = "jsonb")]
|
||||
public string CardListJson { get; set; } = "[]";
|
||||
|
||||
public long SleeveId { get; set; }
|
||||
public long LeaderSkinId { get; set; }
|
||||
public int DisplayOrder { get; set; }
|
||||
}
|
||||
23
SVSim.Database/Models/ColosseumHofDeck.cs
Normal file
23
SVSim.Database/Models/ColosseumHofDeck.cs
Normal file
@@ -0,0 +1,23 @@
|
||||
using System.ComponentModel.DataAnnotations.Schema;
|
||||
|
||||
namespace SVSim.Database.Models;
|
||||
|
||||
/// <summary>
|
||||
/// Curated Hall-of-Fame deck pool for Arena Colosseum. Identical schema to
|
||||
/// <see cref="ColosseumWindFallDeck"/> and <see cref="ColosseumAvatarDeck"/> — separate
|
||||
/// tables instead of an enum-discriminated shared one because the operational lifecycle
|
||||
/// (per-pool importer, per-pool register endpoint, per-pool query) is independent.
|
||||
/// </summary>
|
||||
public class ColosseumHofDeck : IColosseumCuratedDeck
|
||||
{
|
||||
public long Id { get; set; }
|
||||
public int DeckNo { get; set; }
|
||||
public int ClassId { get; set; }
|
||||
|
||||
[Column(TypeName = "jsonb")]
|
||||
public string CardListJson { get; set; } = "[]";
|
||||
|
||||
public long SleeveId { get; set; }
|
||||
public long LeaderSkinId { get; set; }
|
||||
public int DisplayOrder { get; set; }
|
||||
}
|
||||
21
SVSim.Database/Models/ColosseumWindFallDeck.cs
Normal file
21
SVSim.Database/Models/ColosseumWindFallDeck.cs
Normal file
@@ -0,0 +1,21 @@
|
||||
using System.ComponentModel.DataAnnotations.Schema;
|
||||
|
||||
namespace SVSim.Database.Models;
|
||||
|
||||
/// <summary>
|
||||
/// Curated WindFall (limited-pool wildcard) deck for Arena Colosseum. See
|
||||
/// <see cref="ColosseumHofDeck"/> for the rationale on the duplicated schema.
|
||||
/// </summary>
|
||||
public class ColosseumWindFallDeck : IColosseumCuratedDeck
|
||||
{
|
||||
public long Id { get; set; }
|
||||
public int DeckNo { get; set; }
|
||||
public int ClassId { get; set; }
|
||||
|
||||
[Column(TypeName = "jsonb")]
|
||||
public string CardListJson { get; set; } = "[]";
|
||||
|
||||
public long SleeveId { get; set; }
|
||||
public long LeaderSkinId { get; set; }
|
||||
public int DisplayOrder { get; set; }
|
||||
}
|
||||
75
SVSim.Database/Models/Config/ColosseumRoundsConfig.cs
Normal file
75
SVSim.Database/Models/Config/ColosseumRoundsConfig.cs
Normal file
@@ -0,0 +1,75 @@
|
||||
using SVSim.Database.Enums;
|
||||
|
||||
namespace SVSim.Database.Models.Config;
|
||||
|
||||
/// <summary>
|
||||
/// The 3-round bracket schedule for an active Colosseum season — and the per-round
|
||||
/// reward bundles paid out by <c>/finish</c> + <c>/retire</c>. Empty <see cref="Rounds"/>
|
||||
/// is the default shipped state — lobby <c>/event_info</c> renders a benign payload with
|
||||
/// no rounds active. Collection default is in <see cref="ShippedDefaults"/> per
|
||||
/// feedback_config_defaults (property-initializer collection defaults silently empty out
|
||||
/// under the tier merge).
|
||||
/// </summary>
|
||||
[ConfigSection("ColosseumRounds")]
|
||||
public class ColosseumRoundsConfig
|
||||
{
|
||||
public List<RoundEntry> Rounds { get; set; } = new();
|
||||
|
||||
/// <summary>Champion-only reward bundle, paid alongside the final round's FinishRewards
|
||||
/// when <c>ColosseumProgressionService</c> determines the viewer cleared the bracket.</summary>
|
||||
public List<RewardEntry> ChampionRewards { get; set; } = new();
|
||||
|
||||
public static ColosseumRoundsConfig ShippedDefaults() => new()
|
||||
{
|
||||
Rounds = new(),
|
||||
ChampionRewards = new(),
|
||||
};
|
||||
|
||||
public class RoundEntry
|
||||
{
|
||||
/// <summary>1, 2, or 3 in the canonical 3-round schedule.</summary>
|
||||
public int RoundId { get; set; }
|
||||
|
||||
public DateTime StartTime { get; set; }
|
||||
public DateTime EndTime { get; set; }
|
||||
|
||||
/// <summary>Bracket groups within the round (e.g. distinct breakthrough thresholds
|
||||
/// for late-joiners). The first entry is the canonical lookup used by
|
||||
/// <c>ColosseumProgressionService</c> for the v1 single-bracket case.</summary>
|
||||
public List<GroupEntry> Groups { get; set; } = new();
|
||||
|
||||
/// <summary>Paid by <c>/finish</c> when the viewer clears or otherwise ends this round
|
||||
/// successfully. Empty = no bonus for this round.</summary>
|
||||
public List<RewardEntry> FinishRewards { get; set; } = new();
|
||||
|
||||
/// <summary>Paid by <c>/retire</c> when the viewer abandons mid-round. Client ignores
|
||||
/// these once <c>run.RoundId >= FinalB</c>, but server still emits them per
|
||||
/// retire.md (log completeness).</summary>
|
||||
public List<RewardEntry> RetireRewards { get; set; } = new();
|
||||
}
|
||||
|
||||
public class GroupEntry
|
||||
{
|
||||
public string Group { get; set; } = "";
|
||||
|
||||
/// <summary>Max battles a viewer can play in this round before bracket termination.</summary>
|
||||
public int MaxBattleCount { get; set; }
|
||||
|
||||
/// <summary>Wins required to promote out of this round.</summary>
|
||||
public int BreakthroughNumber { get; set; }
|
||||
|
||||
/// <summary>Total bracket entries allotted to this group.</summary>
|
||||
public int EntryNumber { get; set; }
|
||||
}
|
||||
|
||||
public class RewardEntry
|
||||
{
|
||||
public UserGoodsType Type { get; set; }
|
||||
public long DetailId { get; set; }
|
||||
public int Count { get; set; }
|
||||
|
||||
/// <summary>Display name for the <c>rewards[]</c> receipt block. Defaults to empty;
|
||||
/// client uses system-text lookups when blank.</summary>
|
||||
public string Name { get; set; } = "";
|
||||
}
|
||||
}
|
||||
68
SVSim.Database/Models/Config/ColosseumSeasonConfig.cs
Normal file
68
SVSim.Database/Models/Config/ColosseumSeasonConfig.cs
Normal file
@@ -0,0 +1,68 @@
|
||||
using SVSim.Database.Enums;
|
||||
|
||||
namespace SVSim.Database.Models.Config;
|
||||
|
||||
/// <summary>
|
||||
/// Event-level configuration for an active Arena Colosseum (Grand Prix) season. Default
|
||||
/// <see cref="ShippedDefaults"/> emits <c>IsColosseumPeriod = false</c> so the lobby read
|
||||
/// endpoints render an empty "no event scheduled" payload without crashing the client.
|
||||
/// Flipping the event on is an admin operation per
|
||||
/// <c>docs/operations/grand-prix-event-setup.md</c> — write a row to <c>GameConfigs</c>.
|
||||
/// </summary>
|
||||
[ConfigSection("ColosseumSeason")]
|
||||
public class ColosseumSeasonConfig
|
||||
{
|
||||
/// <summary>Master gate. <c>false</c> = lobby reads render an empty info block and
|
||||
/// entry rejects. The client (<c>Wizard/ColosseumEntryInfoTask.cs</c>) reads this and
|
||||
/// skips parsing the rest of the colosseum_info object.</summary>
|
||||
public bool IsColosseumPeriod { get; set; }
|
||||
|
||||
/// <summary>Stamped onto every <see cref="ViewerArenaColosseumRun"/> at entry time.</summary>
|
||||
public int SeasonId { get; set; }
|
||||
|
||||
public string ColosseumName { get; set; } = "";
|
||||
|
||||
/// <summary>Bracket format. Stamped onto the run at entry time.</summary>
|
||||
public Format DeckFormat { get; set; } = Format.Rotation;
|
||||
|
||||
/// <summary>Server stores bool; the wire shape is the STRING "0"/"1" per Wizard/ColosseumEntryInfoTask.cs's
|
||||
/// <c>jsonData.ToString() == "1"</c> parse. The response DTO converts at serialization time.</summary>
|
||||
public bool IsNormalTwoPick { get; set; }
|
||||
|
||||
/// <summary>Wire string used by the client as a theme/color code. Empty when not in special mode.</summary>
|
||||
public string IsSpecialMode { get; set; } = "";
|
||||
|
||||
public string? AnnounceId { get; set; }
|
||||
|
||||
public DateTime EventStartTime { get; set; }
|
||||
public DateTime EventEndTime { get; set; }
|
||||
|
||||
/// <summary>How many bracket entries get eliminated in the final round before champion-determination.</summary>
|
||||
public int FinalRoundEliminateCount { get; set; }
|
||||
|
||||
public string CardPoolName { get; set; } = "";
|
||||
|
||||
/// <summary>Card-set ids used as the 2-Pick / Chaos draft pool override for this season.
|
||||
/// Phase 3 reads this through <c>ArenaTwoPickCardPoolService</c> instead of
|
||||
/// <c>ChallengeConfig.PoolCardSetIds</c>.</summary>
|
||||
public List<int> PoolCardSetIds { get; set; } = new();
|
||||
|
||||
public int RupyCost { get; set; }
|
||||
public int TicketCost { get; set; }
|
||||
public int CrystalCost { get; set; }
|
||||
|
||||
public bool IsAllowedFreeEntry { get; set; }
|
||||
|
||||
public bool IsAllCardEnabled { get; set; }
|
||||
|
||||
/// <summary>Number of strategies offered per pick in 2-Pick Chaos mode.</summary>
|
||||
public int StrategyPickNum { get; set; }
|
||||
|
||||
public DateTime SalesPeriodStart { get; set; }
|
||||
public DateTime SalesPeriodEnd { get; set; }
|
||||
|
||||
public static ColosseumSeasonConfig ShippedDefaults() => new()
|
||||
{
|
||||
IsColosseumPeriod = false,
|
||||
};
|
||||
}
|
||||
17
SVSim.Database/Models/IColosseumCuratedDeck.cs
Normal file
17
SVSim.Database/Models/IColosseumCuratedDeck.cs
Normal file
@@ -0,0 +1,17 @@
|
||||
namespace SVSim.Database.Models;
|
||||
|
||||
/// <summary>
|
||||
/// Common shape across the three curated-deck pool tables — used by the controller's
|
||||
/// generic list+register dispatcher (Phase 3 Task 10) to avoid duplicating identical code
|
||||
/// per pool. The interface is plumbing only; the pools stay distinct EF entity types.
|
||||
/// </summary>
|
||||
public interface IColosseumCuratedDeck
|
||||
{
|
||||
long Id { get; set; }
|
||||
int DeckNo { get; set; }
|
||||
int ClassId { get; set; }
|
||||
string CardListJson { get; set; }
|
||||
long SleeveId { get; set; }
|
||||
long LeaderSkinId { get; set; }
|
||||
int DisplayOrder { get; set; }
|
||||
}
|
||||
105
SVSim.Database/Models/ViewerArenaColosseumRun.cs
Normal file
105
SVSim.Database/Models/ViewerArenaColosseumRun.cs
Normal file
@@ -0,0 +1,105 @@
|
||||
using System.ComponentModel.DataAnnotations.Schema;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using SVSim.Database.Enums;
|
||||
|
||||
namespace SVSim.Database.Models;
|
||||
|
||||
/// <summary>
|
||||
/// One active Grand Prix (Arena Colosseum) bracket run per viewer. Mirrors
|
||||
/// <see cref="ViewerArenaTwoPickRun"/> in shape so the 2-Pick draft state machine can be
|
||||
/// lifted onto it in Phase 3 — the schema is the union of constructed-mode lifecycle
|
||||
/// (registered decks, bracket counts, rank-match promotion flag) and TK2-style draft
|
||||
/// state. Standalone (not a Viewer owned collection) per
|
||||
/// project_ef_nav_include_pitfall, with a unique index on ViewerId to enforce
|
||||
/// "one active run per viewer". Row is deleted on /finish or /retire.
|
||||
/// </summary>
|
||||
[Index(nameof(ViewerId), IsUnique = true)]
|
||||
public class ViewerArenaColosseumRun
|
||||
{
|
||||
public long Id { get; set; }
|
||||
|
||||
public long ViewerId { get; set; }
|
||||
|
||||
/// <summary>Wire <c>entry_info.id</c>. Set to <see cref="Id"/> on insert.</summary>
|
||||
public long EntryId { get; set; }
|
||||
|
||||
/// <summary>Stamped from <see cref="Config.ColosseumSeasonConfig.SeasonId"/> at entry time so
|
||||
/// mid-run season-config edits don't shift the run's identity.</summary>
|
||||
public int SeasonId { get; set; }
|
||||
|
||||
/// <summary>Current bracket round (1..3 in the canonical 3-round schedule). Indexes
|
||||
/// <see cref="Config.ColosseumRoundsConfig.Rounds"/> at entry time, advances on bracket
|
||||
/// promotion via <c>ColosseumProgressionService</c>.</summary>
|
||||
public int RoundId { get; set; }
|
||||
|
||||
/// <summary>Format the bracket plays in (Rotation/Unlimited/TwoPick/HOF/WindFall/Avatar/...).
|
||||
/// Stamped from season config at entry time.</summary>
|
||||
public Format DeckFormat { get; set; }
|
||||
|
||||
public long LeaderSkinId { get; set; }
|
||||
|
||||
/// <summary>eARENA_PAY: 1 = ticket, 2 = crystal, 3 = rupy, 0 = free entry. Stamped at entry.</summary>
|
||||
public int ConsumeItemType { get; set; }
|
||||
|
||||
// --- 2-Pick / Chaos draft state (lifted from ViewerArenaTwoPickRun for Phase 3) ---
|
||||
|
||||
[Column(TypeName = "jsonb")]
|
||||
public string CandidateClassIdsJson { get; set; } = "[]";
|
||||
|
||||
/// <summary>Stored as 0 in constructed mode (no draft turn machinery).</summary>
|
||||
public int SelectTurn { get; set; }
|
||||
|
||||
public bool IsSelectCompleted { get; set; }
|
||||
|
||||
[Column(TypeName = "jsonb")]
|
||||
public string SelectedCardIdsJson { get; set; } = "[]";
|
||||
|
||||
[Column(TypeName = "jsonb")]
|
||||
public string PendingPickSetsJson { get; set; } = "[]";
|
||||
|
||||
/// <summary>Monotonic counter for CandidatePair.Id; advances by 2 each draft turn.</summary>
|
||||
public long NextCandidateId { get; set; } = 1;
|
||||
|
||||
/// <summary>Selected class for 2-Pick / Chaos modes; 0 in constructed mode.</summary>
|
||||
public int ClassId { get; set; }
|
||||
|
||||
/// <summary>Optional Chaos sub-mode replay id. 0 when not in Chaos.</summary>
|
||||
public int ChaosId { get; set; }
|
||||
|
||||
// --- Per-round bracket state ---
|
||||
|
||||
[Column(TypeName = "jsonb")]
|
||||
public string ResultListJson { get; set; } = "[]";
|
||||
|
||||
public int WinCount { get; set; }
|
||||
public int LossCount { get; set; }
|
||||
public int BattleCountThisRound { get; set; }
|
||||
|
||||
/// <summary>Cap copied from the matching <c>ColosseumRoundsConfig.Rounds[RoundId-1].Groups[0]</c>
|
||||
/// at entry — stamped so mid-run round-config edits don't shift the cap.</summary>
|
||||
public int MaxBattleCountThisRound { get; set; }
|
||||
|
||||
/// <summary>Wins required to break through to the next round. Same stamping rule as
|
||||
/// <see cref="MaxBattleCountThisRound"/>.</summary>
|
||||
public int BreakthroughNumberThisRound { get; set; }
|
||||
|
||||
/// <summary>Remaining attempts in the current entry. Decremented per battle finish until
|
||||
/// 0 or breakthrough.</summary>
|
||||
public int RestEntryNum { get; set; }
|
||||
|
||||
/// <summary>Flipped exactly once when the node signals <c>matching_state == 3008</c>.
|
||||
/// Subsequent battle URLs use the <c>colosseum_rank_battle/*</c> prefix.</summary>
|
||||
public bool IsRankMatching { get; set; }
|
||||
|
||||
public bool IsChampion { get; set; }
|
||||
|
||||
// --- Registered deck slot (constructed mode) ---
|
||||
|
||||
[Column(TypeName = "jsonb")]
|
||||
public string RegisteredDeckNoListJson { get; set; } = "[]";
|
||||
|
||||
public bool IsPublished { get; set; }
|
||||
|
||||
public DateTime CreatedAt { get; set; }
|
||||
public DateTime UpdatedAt { get; set; }
|
||||
}
|
||||
@@ -0,0 +1,36 @@
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using SVSim.Database.Models;
|
||||
|
||||
namespace SVSim.Database.Repositories.Viewer;
|
||||
|
||||
public class ArenaColosseumRunRepository : IArenaColosseumRunRepository
|
||||
{
|
||||
private readonly SVSimDbContext _db;
|
||||
public ArenaColosseumRunRepository(SVSimDbContext db) => _db = db;
|
||||
|
||||
public Task<ViewerArenaColosseumRun?> GetByViewerIdAsync(long viewerId) =>
|
||||
_db.ViewerArenaColosseumRuns.FirstOrDefaultAsync(r => r.ViewerId == viewerId);
|
||||
|
||||
public async Task UpsertAsync(ViewerArenaColosseumRun run)
|
||||
{
|
||||
run.UpdatedAt = DateTime.UtcNow;
|
||||
if (run.Id == 0)
|
||||
{
|
||||
run.CreatedAt = DateTime.UtcNow;
|
||||
_db.ViewerArenaColosseumRuns.Add(run);
|
||||
}
|
||||
else
|
||||
{
|
||||
_db.ViewerArenaColosseumRuns.Update(run);
|
||||
}
|
||||
await _db.SaveChangesAsync();
|
||||
}
|
||||
|
||||
public async Task DeleteAsync(long viewerId)
|
||||
{
|
||||
var row = await _db.ViewerArenaColosseumRuns.FirstOrDefaultAsync(r => r.ViewerId == viewerId);
|
||||
if (row is null) return;
|
||||
_db.ViewerArenaColosseumRuns.Remove(row);
|
||||
await _db.SaveChangesAsync();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,10 @@
|
||||
using SVSim.Database.Models;
|
||||
|
||||
namespace SVSim.Database.Repositories.Viewer;
|
||||
|
||||
public interface IArenaColosseumRunRepository
|
||||
{
|
||||
Task<ViewerArenaColosseumRun?> GetByViewerIdAsync(long viewerId);
|
||||
Task UpsertAsync(ViewerArenaColosseumRun run);
|
||||
Task DeleteAsync(long viewerId);
|
||||
}
|
||||
@@ -107,6 +107,10 @@ public class SVSimDbContext : DbContext
|
||||
|
||||
public DbSet<ArenaTwoPickReward> ArenaTwoPickRewards { get; set; } = null!;
|
||||
public DbSet<ViewerArenaTwoPickRun> ViewerArenaTwoPickRuns { get; set; } = null!;
|
||||
public DbSet<ViewerArenaColosseumRun> ViewerArenaColosseumRuns { get; set; } = null!;
|
||||
public DbSet<ColosseumHofDeck> ColosseumHofDecks { get; set; } = null!;
|
||||
public DbSet<ColosseumWindFallDeck> ColosseumWindFallDecks { get; set; } = null!;
|
||||
public DbSet<ColosseumAvatarDeck> ColosseumAvatarDecks { get; set; } = null!;
|
||||
|
||||
public DbSet<SerialCodeEntry> SerialCodes => Set<SerialCodeEntry>();
|
||||
public DbSet<SerialCodeRewardEntry> SerialCodeRewards => Set<SerialCodeRewardEntry>();
|
||||
@@ -496,6 +500,12 @@ public class SVSimDbContext : DbContext
|
||||
b.Property(e => e.OpponentRotationId).IsRequired();
|
||||
});
|
||||
|
||||
// Colosseum curated-deck pools — DeckNo is the wire identifier admins reference in
|
||||
// register endpoints; uniqueness per pool is the contract clients rely on.
|
||||
modelBuilder.Entity<ColosseumHofDeck>().HasIndex(d => d.DeckNo).IsUnique();
|
||||
modelBuilder.Entity<ColosseumWindFallDeck>().HasIndex(d => d.DeckNo).IsUnique();
|
||||
modelBuilder.Entity<ColosseumAvatarDeck>().HasIndex(d => d.DeckNo).IsUnique();
|
||||
|
||||
base.OnModelCreating(modelBuilder);
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,175 @@
|
||||
using System.Text.Json;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using SVSim.BattleNode.Bridge;
|
||||
using SVSim.Database.Repositories.Viewer;
|
||||
using SVSim.EmulatedEntrypoint.Constants;
|
||||
using SVSim.EmulatedEntrypoint.Matching;
|
||||
using SVSim.EmulatedEntrypoint.Models.Dtos.ArenaColosseum;
|
||||
using SVSim.EmulatedEntrypoint.Security;
|
||||
using SVSim.EmulatedEntrypoint.Security.SteamSessionAuthentication;
|
||||
using SVSim.EmulatedEntrypoint.Services;
|
||||
using SVSim.EmulatedEntrypoint.Services.ArenaColosseum;
|
||||
|
||||
namespace SVSim.EmulatedEntrypoint.Controllers;
|
||||
|
||||
/// <summary>
|
||||
/// Per-match URLs for the Colosseum bracket — the dual <c>colosseum_battle/*</c> +
|
||||
/// <c>colosseum_rank_battle/*</c> route family. Does NOT extend <see cref="SVSimController"/>'s
|
||||
/// <c>[Route("[controller]")]</c> because we need explicit absolute routes for two prefixes
|
||||
/// off one controller (same pattern as <see cref="FreeBattleController"/>).
|
||||
/// <para>
|
||||
/// The URL is the bracket-phase signal per do-matching.md §"server-side bidirectional
|
||||
/// mapping"; <see cref="ViewerArenaColosseumRun.IsRankMatching"/> flips to true once the
|
||||
/// node has signalled <c>matching_state == 3008</c> on a prior <c>do_matching</c>.
|
||||
/// </para>
|
||||
/// </summary>
|
||||
[ApiController]
|
||||
[Authorize(AuthenticationSchemes = SteamAuthenticationConstants.SchemeName)]
|
||||
public sealed class ArenaColosseumBattleController : ControllerBase
|
||||
{
|
||||
/// <summary>Per FinishTaskBase.IsEffectiveErrorCode — code 3502 ("battle already finished")
|
||||
/// is tolerated as a non-error retry, parsed the same as 1.</summary>
|
||||
private const int BattleAlreadyFinishedResultCode = 3502;
|
||||
|
||||
private readonly IMatchContextBuilder _ctxBuilder;
|
||||
private readonly IMatchingResolver _resolver;
|
||||
private readonly IArenaColosseumRunRepository _runs;
|
||||
private readonly IColosseumProgressionService _progression;
|
||||
private readonly ILogger<ArenaColosseumBattleController> _log;
|
||||
|
||||
public ArenaColosseumBattleController(
|
||||
IMatchContextBuilder ctxBuilder,
|
||||
IMatchingResolver resolver,
|
||||
IArenaColosseumRunRepository runs,
|
||||
IColosseumProgressionService progression,
|
||||
ILogger<ArenaColosseumBattleController> log)
|
||||
{
|
||||
_ctxBuilder = ctxBuilder;
|
||||
_resolver = resolver;
|
||||
_runs = runs;
|
||||
_progression = progression;
|
||||
_log = log;
|
||||
}
|
||||
|
||||
private bool TryGetViewerId(out long viewerId)
|
||||
{
|
||||
viewerId = 0;
|
||||
var claim = User.Claims.FirstOrDefault(c => c.Type == ShadowverseClaimTypes.ViewerIdClaim)?.Value;
|
||||
return claim is not null && long.TryParse(claim, out viewerId);
|
||||
}
|
||||
|
||||
[HttpPost("/colosseum_battle/do_matching")]
|
||||
public Task<IActionResult> DoMatchingPreRank(
|
||||
[FromBody] ColosseumDoMatchingRequestDto req, CancellationToken ct)
|
||||
=> DoMatchingInternal(isRankUrl: false, req, ct);
|
||||
|
||||
[HttpPost("/colosseum_rank_battle/do_matching")]
|
||||
public Task<IActionResult> DoMatchingPostRank(
|
||||
[FromBody] ColosseumDoMatchingRequestDto req, CancellationToken ct)
|
||||
=> DoMatchingInternal(isRankUrl: true, req, ct);
|
||||
|
||||
[HttpPost("/colosseum_battle/finish")]
|
||||
public Task<IActionResult> FinishPreRank(
|
||||
[FromBody] ColosseumBattleFinishRequestDto req, CancellationToken ct)
|
||||
=> FinishInternal(isRankUrl: false, req, ct);
|
||||
|
||||
[HttpPost("/colosseum_rank_battle/finish")]
|
||||
public Task<IActionResult> FinishPostRank(
|
||||
[FromBody] ColosseumBattleFinishRequestDto req, CancellationToken ct)
|
||||
=> FinishInternal(isRankUrl: true, req, ct);
|
||||
|
||||
private async Task<IActionResult> DoMatchingInternal(
|
||||
bool isRankUrl, ColosseumDoMatchingRequestDto req, CancellationToken ct)
|
||||
{
|
||||
if (!TryGetViewerId(out var vid)) return Unauthorized();
|
||||
|
||||
var run = await _runs.GetByViewerIdAsync(vid);
|
||||
if (run is null)
|
||||
{
|
||||
return BadRequest(new { error = "arena_colosseum_no_active_run" });
|
||||
}
|
||||
if (isRankUrl != run.IsRankMatching)
|
||||
{
|
||||
return BadRequest(new
|
||||
{
|
||||
error = "colosseum_url_phase_mismatch",
|
||||
is_rank_matching = run.IsRankMatching,
|
||||
requested_rank_url = isRankUrl,
|
||||
});
|
||||
}
|
||||
|
||||
MatchContext ctx;
|
||||
try
|
||||
{
|
||||
ctx = await _ctxBuilder.BuildForColosseumAsync(vid);
|
||||
}
|
||||
catch (InvalidOperationException ex)
|
||||
{
|
||||
_log.LogWarning(ex,
|
||||
"Colosseum BuildForColosseumAsync failed for viewer {Vid}; returning 3001.", vid);
|
||||
return Ok(new Models.Dtos.FreeBattle.DoMatchingResponseDto
|
||||
{
|
||||
MatchingState = 3001,
|
||||
NodeServerUrl = "",
|
||||
});
|
||||
}
|
||||
|
||||
var mode = isRankUrl ? "colosseum_rank_battle" : "colosseum_battle";
|
||||
var resolution = await _resolver.ResolveAsync(mode, new BattlePlayer(vid, ctx), ct);
|
||||
|
||||
// Promotion: server flips IsRankMatching once on the 3008 signal. Subsequent battle
|
||||
// URLs must use the rank prefix. (Plan §"matching_state == 3008 is the promotion trigger".)
|
||||
if (_progression.ShouldPromoteToRankMatching(run, resolution.MatchingState))
|
||||
{
|
||||
run.IsRankMatching = true;
|
||||
await _runs.UpsertAsync(run);
|
||||
}
|
||||
|
||||
return Ok(new Models.Dtos.FreeBattle.DoMatchingResponseDto
|
||||
{
|
||||
MatchingState = resolution.MatchingState,
|
||||
BattleId = resolution.BattleId,
|
||||
NodeServerUrl = resolution.NodeServerUrl,
|
||||
});
|
||||
}
|
||||
|
||||
private async Task<IActionResult> FinishInternal(
|
||||
bool isRankUrl, ColosseumBattleFinishRequestDto req, CancellationToken ct)
|
||||
{
|
||||
if (!TryGetViewerId(out var vid)) return Unauthorized();
|
||||
|
||||
var run = await _runs.GetByViewerIdAsync(vid);
|
||||
if (run is null)
|
||||
{
|
||||
return BadRequest(new { error = "arena_colosseum_no_active_run" });
|
||||
}
|
||||
|
||||
// Match-result tracking: 1 = win, 2 = loss, 0 = draw/abort. Record_list mirrors
|
||||
// ColosseumTopTask.battle_results.result_list (1=win, 0=loss). is_retire surfaces
|
||||
// as a non-counted result — does not advance the bracket.
|
||||
bool counts = req.IsRetire == 0;
|
||||
if (counts)
|
||||
{
|
||||
bool isWin = req.BattleResult == 1;
|
||||
run.BattleCountThisRound += 1;
|
||||
if (isWin) run.WinCount += 1;
|
||||
else run.LossCount += 1;
|
||||
|
||||
var resultList = ParseIntList(run.ResultListJson);
|
||||
resultList.Add(isWin ? 1 : 0);
|
||||
run.ResultListJson = JsonSerializer.Serialize(resultList);
|
||||
await _runs.UpsertAsync(run);
|
||||
}
|
||||
|
||||
// result_code 3502 ("battle already finished") is the idempotent-retry tolerance per
|
||||
// FinishTaskBase.IsEffectiveErrorCode. Server emits standard data; the translation
|
||||
// middleware sets the wire result_code via data_headers from the response envelope.
|
||||
return Ok(new ColosseumBattleFinishResponseDto { BattleResult = req.BattleResult });
|
||||
}
|
||||
|
||||
private static List<int> ParseIntList(string json) =>
|
||||
string.IsNullOrEmpty(json)
|
||||
? new()
|
||||
: JsonSerializer.Deserialize<List<int>>(json) ?? new();
|
||||
}
|
||||
@@ -1,22 +1,767 @@
|
||||
using System.Text.Json;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using SVSim.Database;
|
||||
using SVSim.Database.Enums;
|
||||
using SVSim.Database.Models;
|
||||
using SVSim.Database.Models.Config;
|
||||
using SVSim.Database.Repositories.Deck;
|
||||
using SVSim.Database.Repositories.Viewer;
|
||||
using SVSim.Database.Services;
|
||||
using SVSim.Database.Services.Inventory;
|
||||
using SVSim.EmulatedEntrypoint.Models.Dtos.ArenaColosseum;
|
||||
using SVSim.EmulatedEntrypoint.Models.Dtos.Common.ArenaTwoPick;
|
||||
using SVSim.EmulatedEntrypoint.Models.Dtos.Requests;
|
||||
using SVSim.EmulatedEntrypoint.Models.Dtos.Requests.ArenaColosseum;
|
||||
using SVSim.EmulatedEntrypoint.Models.Dtos.Responses.ArenaColosseum;
|
||||
using SVSim.EmulatedEntrypoint.Services;
|
||||
using SVSim.EmulatedEntrypoint.Services.ArenaColosseum;
|
||||
|
||||
namespace SVSim.EmulatedEntrypoint.Controllers;
|
||||
|
||||
/// <summary>
|
||||
/// Stub controller for the Colosseum arena family. Currently only emits a "no Colosseum
|
||||
/// period" /get_fee_info response so the home/arena screen doesn't 404. The full Colosseum
|
||||
/// flow (top, entry, register_deck, event_info, retire, finish, class_choose, card_choose,
|
||||
/// matchmaking) is deferred — see Wizard/ColosseumEntryInfoTask.cs for the parser surface.
|
||||
/// Arena Colosseum (Grand Prix) lobby. Phase 1 covers the three read endpoints (<c>/top</c>,
|
||||
/// <c>/get_fee_info</c>, <c>/event_info</c>) plus the entry/register-deck pair. Defaults to
|
||||
/// "no event scheduled" via <see cref="ColosseumSeasonConfig.IsColosseumPeriod"/> — flipping
|
||||
/// the event on is an admin operation per <c>docs/operations/grand-prix-event-setup.md</c>.
|
||||
/// </summary>
|
||||
[Route("arena_colosseum")]
|
||||
public class ArenaColosseumController : SVSimController
|
||||
{
|
||||
private readonly IGameConfigService _config;
|
||||
private readonly IArenaColosseumRunRepository _runs;
|
||||
private readonly IInventoryService _inventory;
|
||||
private readonly IDeckRepository _decks;
|
||||
private readonly IColosseumProgressionService _progression;
|
||||
private readonly IArenaTwoPickCardPoolService _pool;
|
||||
private readonly IRandom _rng;
|
||||
private readonly SVSimDbContext _db;
|
||||
|
||||
public ArenaColosseumController(
|
||||
IGameConfigService config,
|
||||
IArenaColosseumRunRepository runs,
|
||||
IInventoryService inventory,
|
||||
IDeckRepository decks,
|
||||
IColosseumProgressionService progression,
|
||||
IArenaTwoPickCardPoolService pool,
|
||||
IRandom rng,
|
||||
SVSimDbContext db)
|
||||
{
|
||||
_config = config;
|
||||
_runs = runs;
|
||||
_inventory = inventory;
|
||||
_decks = decks;
|
||||
_progression = progression;
|
||||
_pool = pool;
|
||||
_rng = rng;
|
||||
_db = db;
|
||||
}
|
||||
|
||||
[HttpPost("top")]
|
||||
public async Task<IActionResult> Top([FromBody] BaseRequest _)
|
||||
{
|
||||
if (!TryGetViewerId(out var vid)) return Unauthorized();
|
||||
|
||||
var season = _config.Get<ColosseumSeasonConfig>();
|
||||
var run = await _runs.GetByViewerIdAsync(vid);
|
||||
|
||||
var response = new TopResponse
|
||||
{
|
||||
ColosseumInfo = BuildColosseumInfo(season),
|
||||
ColosseumStatus = BuildOwnStatus(run),
|
||||
LeaderSkinId = run?.LeaderSkinId ?? 0,
|
||||
};
|
||||
|
||||
if (run is not null)
|
||||
{
|
||||
response.EntryInfo = new ColosseumEntryRef { Id = run.EntryId };
|
||||
response.NowRoundId = run.RoundId;
|
||||
response.MaxBattleCount = run.MaxBattleCountThisRound;
|
||||
response.IsFinish = run.IsChampion;
|
||||
response.FinalRoundEliminateCount = season.FinalRoundEliminateCount;
|
||||
response.EndTime = FormatTime(season.EventEndTime);
|
||||
response.BattleResults = new ColosseumBattleResults
|
||||
{
|
||||
WinCount = run.WinCount,
|
||||
ResultList = ParseIntList(run.ResultListJson),
|
||||
};
|
||||
response.BreakthroughNumber = run.BreakthroughNumberThisRound > 0 ? run.BreakthroughNumberThisRound : null;
|
||||
}
|
||||
|
||||
return Ok(response);
|
||||
}
|
||||
|
||||
[HttpPost("get_fee_info")]
|
||||
public IActionResult GetFeeInfo([FromBody] GetFeeInfoRequest req)
|
||||
public async Task<IActionResult> GetFeeInfo([FromBody] BaseRequest _)
|
||||
{
|
||||
if (!TryGetViewerId(out var vid)) return Unauthorized();
|
||||
|
||||
var season = _config.Get<ColosseumSeasonConfig>();
|
||||
var run = await _runs.GetByViewerIdAsync(vid);
|
||||
|
||||
var response = new GetFeeInfoResponseDto
|
||||
{
|
||||
ColosseumInfo = BuildColosseumInfo(season),
|
||||
ColosseumStatus = BuildOwnStatus(run),
|
||||
};
|
||||
|
||||
if (!season.IsColosseumPeriod)
|
||||
{
|
||||
return Ok(response);
|
||||
}
|
||||
|
||||
response.IsUnfinishedEntryExists = run is not null;
|
||||
response.IsAllowedFreeEntry = season.IsAllowedFreeEntry;
|
||||
response.FeeList = new ColosseumFeeList
|
||||
{
|
||||
RupyCost = season.RupyCost,
|
||||
TicketCost = season.TicketCost,
|
||||
CrystalCost = season.CrystalCost,
|
||||
};
|
||||
|
||||
if (run is not null)
|
||||
{
|
||||
response.DeckFormat = (int)run.DeckFormat;
|
||||
}
|
||||
|
||||
return Ok(response);
|
||||
}
|
||||
|
||||
[HttpPost("event_info")]
|
||||
public async Task<IActionResult> EventInfo([FromBody] BaseRequest _)
|
||||
{
|
||||
if (!TryGetViewerId(out var vid)) return Unauthorized();
|
||||
|
||||
var season = _config.Get<ColosseumSeasonConfig>();
|
||||
var rounds = _config.Get<ColosseumRoundsConfig>();
|
||||
var run = await _runs.GetByViewerIdAsync(vid);
|
||||
|
||||
return Ok(new EventInfoResponse
|
||||
{
|
||||
ColosseumInfo = new ColosseumEventInfo
|
||||
{
|
||||
Format = (int)season.DeckFormat,
|
||||
StartTime = FormatTime(season.EventStartTime),
|
||||
EndTime = FormatTime(season.EventEndTime),
|
||||
AnnounceId = season.AnnounceId,
|
||||
FinalRoundEliminateCount = season.FinalRoundEliminateCount,
|
||||
},
|
||||
Round1 = BuildRoundDetail(rounds, 1),
|
||||
Round2 = BuildRoundDetail(rounds, 2),
|
||||
Round3 = BuildRoundDetail(rounds, 3),
|
||||
ColosseumStatus = BuildOwnStatus(run),
|
||||
});
|
||||
}
|
||||
|
||||
[HttpPost("entry")]
|
||||
public async Task<IActionResult> Entry([FromBody] ArenaColosseumEntryRequest req)
|
||||
{
|
||||
if (!TryGetViewerId(out var vid)) return Unauthorized();
|
||||
|
||||
var season = _config.Get<ColosseumSeasonConfig>();
|
||||
if (!season.IsColosseumPeriod)
|
||||
{
|
||||
return BadRequest(new { error = "colosseum_period_closed" });
|
||||
}
|
||||
|
||||
var serverRoundId = ResolveServerRoundId(season);
|
||||
if (req.NowRoundId != serverRoundId)
|
||||
{
|
||||
return BadRequest(new { error = "now_round_id_mismatch", server_round_id = serverRoundId });
|
||||
}
|
||||
|
||||
if (await _runs.GetByViewerIdAsync(vid) is not null)
|
||||
{
|
||||
return BadRequest(new { error = "arena_colosseum_already_in_progress" });
|
||||
}
|
||||
|
||||
await using var tx = await _inventory.BeginAsync(vid);
|
||||
|
||||
RewardEntryDto? feeEntry = req.ConsumeItemType switch
|
||||
{
|
||||
1 => await DebitCrystalAsync(tx, season.CrystalCost),
|
||||
3 => await DebitTicketAsync(tx, season.TicketCost),
|
||||
4 => await DebitRupyAsync(tx, season.RupyCost),
|
||||
5 when season.IsAllowedFreeEntry => null,
|
||||
_ => throw new InvalidOperationException($"invalid consume_item_type {req.ConsumeItemType}"),
|
||||
};
|
||||
|
||||
var rounds = _config.Get<ColosseumRoundsConfig>();
|
||||
var roundConfig = rounds.Rounds.FirstOrDefault(r => r.RoundId == serverRoundId);
|
||||
var group = roundConfig?.Groups.FirstOrDefault();
|
||||
|
||||
var run = new ViewerArenaColosseumRun
|
||||
{
|
||||
ViewerId = vid,
|
||||
EntryId = 0,
|
||||
SeasonId = season.SeasonId,
|
||||
RoundId = serverRoundId,
|
||||
DeckFormat = season.DeckFormat,
|
||||
LeaderSkinId = 0,
|
||||
ConsumeItemType = req.ConsumeItemType,
|
||||
MaxBattleCountThisRound = group?.MaxBattleCount ?? 0,
|
||||
BreakthroughNumberThisRound = group?.BreakthroughNumber ?? 0,
|
||||
RestEntryNum = 0,
|
||||
};
|
||||
await _runs.UpsertAsync(run);
|
||||
run.EntryId = run.Id;
|
||||
await _runs.UpsertAsync(run);
|
||||
await tx.CommitAsync();
|
||||
|
||||
return Ok(new EntryResponse
|
||||
{
|
||||
RewardList = feeEntry is null ? new() : new() { feeEntry },
|
||||
EntryInfo = new ColosseumEntryRef
|
||||
{
|
||||
Id = run.EntryId,
|
||||
DeckFormat = (int)season.DeckFormat,
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
[HttpPost("register_deck")]
|
||||
public async Task<IActionResult> RegisterDeck([FromBody] ArenaColosseumRegisterDeckRequest req)
|
||||
{
|
||||
if (!TryGetViewerId(out var vid)) return Unauthorized();
|
||||
|
||||
var run = await _runs.GetByViewerIdAsync(vid);
|
||||
if (run is null)
|
||||
{
|
||||
return BadRequest(new { error = "no_active_run" });
|
||||
}
|
||||
|
||||
List<int> deckNos;
|
||||
try
|
||||
{
|
||||
deckNos = JsonSerializer.Deserialize<List<int>>(req.DeckNoList) ?? new();
|
||||
}
|
||||
catch (JsonException)
|
||||
{
|
||||
return BadRequest(new { error = "deck_no_list_malformed" });
|
||||
}
|
||||
|
||||
if (deckNos.Count == 0)
|
||||
{
|
||||
return BadRequest(new { error = "deck_no_list_empty" });
|
||||
}
|
||||
|
||||
// GetDeck filters by (viewerId, format, deckNo) — a slot that exists under a different
|
||||
// format returns null here, which is the format-mismatch case from the spec.
|
||||
foreach (var no in deckNos)
|
||||
{
|
||||
var deck = await _decks.GetDeck(vid, run.DeckFormat, no);
|
||||
if (deck is null)
|
||||
{
|
||||
return BadRequest(new { error = "deck_not_found", deck_no = no });
|
||||
}
|
||||
}
|
||||
|
||||
run.RegisteredDeckNoListJson = JsonSerializer.Serialize(deckNos);
|
||||
run.IsPublished = req.IsPublished;
|
||||
await _runs.UpsertAsync(run);
|
||||
|
||||
return Ok(new { });
|
||||
}
|
||||
|
||||
[HttpPost("finish")]
|
||||
public async Task<IActionResult> Finish([FromBody] BaseRequest _)
|
||||
{
|
||||
if (!TryGetViewerId(out var vid)) return Unauthorized();
|
||||
var run = await _runs.GetByViewerIdAsync(vid);
|
||||
if (run is null) return BadRequest(new { error = "no_active_run" });
|
||||
|
||||
var rounds = _config.Get<ColosseumRoundsConfig>();
|
||||
var decision = _progression.DecideAdvancement(run, rounds);
|
||||
if (!decision.IsBracketEnd)
|
||||
{
|
||||
return BadRequest(new { error = "bracket_not_finished" });
|
||||
}
|
||||
|
||||
run.IsChampion = decision.IsChampion;
|
||||
var rewardEntries = _progression.BuildFinishRewards(run, rounds);
|
||||
var (wireRewards, wireRewardList) = await GrantRewardsAsync(vid, rewardEntries);
|
||||
|
||||
await _runs.DeleteAsync(vid);
|
||||
|
||||
return Ok(new FinishResponse
|
||||
{
|
||||
Rewards = wireRewards,
|
||||
RewardList = wireRewardList,
|
||||
ColosseumStatus = new ColosseumOwnStatus
|
||||
{
|
||||
NowRoundId = run.RoundId,
|
||||
IsChampion = decision.IsChampion ? true : null,
|
||||
ColosseumName = decision.IsChampion ? rounds.Rounds.Count > 0
|
||||
? _config.Get<ColosseumSeasonConfig>().ColosseumName
|
||||
: null : null,
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
[HttpPost("get_candidate_classes")]
|
||||
public async Task<IActionResult> GetCandidateClasses([FromBody] BaseRequest _)
|
||||
{
|
||||
if (!TryGetViewerId(out var vid)) return Unauthorized();
|
||||
var run = await _runs.GetByViewerIdAsync(vid);
|
||||
if (run is null) return BadRequest(new { error = "no_active_run" });
|
||||
|
||||
// No persistent slate yet — sample 3 from the configured allow-list per
|
||||
// ArenaTwoPickConfig.AllowedClassIds. Idempotent re-call gets a fresh slate; the
|
||||
// spec says "logged server-side so re-calling is idempotent" — Phase 3 v1 doesn't
|
||||
// yet persist the slate (the slate stamps in on /class_choose).
|
||||
var aCfg = _config.Get<ArenaTwoPickConfig>();
|
||||
if (aCfg.AllowedClassIds.Count < 3)
|
||||
{
|
||||
return BadRequest(new { error = "arena_two_pick_allowed_class_ids_misconfigured" });
|
||||
}
|
||||
|
||||
var sampled = aCfg.AllowedClassIds
|
||||
.OrderBy(_ => _rng.Next(int.MaxValue))
|
||||
.Take(3)
|
||||
.ToList();
|
||||
|
||||
// Persist onto the run so /class_choose can validate the pick.
|
||||
run.CandidateClassIdsJson = JsonSerializer.Serialize(sampled);
|
||||
await _runs.UpsertAsync(run);
|
||||
|
||||
// v1 emits Normal-mode shape only (per plan §"Defer Chaos until live capture lands").
|
||||
// Server still ACCEPTS chaos_id on /class_choose for forward compatibility.
|
||||
return Ok(new GetCandidateClassesResponse
|
||||
{
|
||||
ClassId1 = sampled[0],
|
||||
ClassId2 = sampled[1],
|
||||
ClassId3 = sampled[2],
|
||||
});
|
||||
}
|
||||
|
||||
[HttpPost("class_choose")]
|
||||
public async Task<IActionResult> ClassChoose([FromBody] ArenaColosseumClassChooseRequest req)
|
||||
{
|
||||
if (!TryGetViewerId(out var vid)) return Unauthorized();
|
||||
var run = await _runs.GetByViewerIdAsync(vid);
|
||||
if (run is null) return BadRequest(new { error = "no_active_run" });
|
||||
if (run.ClassId != 0) return BadRequest(new { error = "arena_colosseum_invalid_state" });
|
||||
|
||||
// Mutually-exclusive request shape per class-choose.md.
|
||||
bool isNormal = req.ClassId != 0 && req.ChaosId == 0;
|
||||
bool isChaos = req.ChaosId != 0 && req.ClassId == 0;
|
||||
if (!isNormal && !isChaos)
|
||||
{
|
||||
return BadRequest(new { error = "class_choose_requires_class_id_xor_chaos_id" });
|
||||
}
|
||||
|
||||
var candidates = JsonSerializer.Deserialize<List<int>>(run.CandidateClassIdsJson) ?? new();
|
||||
int chosenClassId = isNormal ? req.ClassId : ResolveChaosClassId(req.ChaosId);
|
||||
if (isNormal && !candidates.Contains(chosenClassId))
|
||||
{
|
||||
return BadRequest(new { error = "arena_colosseum_class_not_offered" });
|
||||
}
|
||||
|
||||
run.ClassId = chosenClassId;
|
||||
run.ChaosId = isChaos ? req.ChaosId : 0;
|
||||
run.LeaderSkinId = chosenClassId; // class-default skin convention from TwoPick
|
||||
|
||||
var pool = _config.Get<ColosseumSeasonConfig>().PoolCardSetIds;
|
||||
var pairs = _pool.GeneratePickSetsForTurn(
|
||||
chosenClassId, turn: 1, startingPairId: run.NextCandidateId, _rng, poolCardSetIds: pool);
|
||||
run.NextCandidateId += pairs.Count;
|
||||
run.SelectTurn = 1;
|
||||
run.PendingPickSetsJson = JsonSerializer.Serialize(pairs);
|
||||
await _runs.UpsertAsync(run);
|
||||
|
||||
return Ok(new SVSim.EmulatedEntrypoint.Models.Dtos.Responses.ArenaTwoPick.ClassChooseResponseDto
|
||||
{
|
||||
ClassInfo = ProjectClassInfo(run),
|
||||
DeckInfo = ProjectDeckInfo(run),
|
||||
CandidateCardList = pairs.Select(ToDto).ToList(),
|
||||
});
|
||||
}
|
||||
|
||||
[HttpPost("get_candidate_cards")]
|
||||
public async Task<IActionResult> GetCandidateCards([FromBody] BaseRequest _)
|
||||
{
|
||||
if (!TryGetViewerId(out var vid)) return Unauthorized();
|
||||
var run = await _runs.GetByViewerIdAsync(vid);
|
||||
if (run is null) return BadRequest(new { error = "no_active_run" });
|
||||
|
||||
// Idempotent resume — no state mutation here, just replay the current snapshot.
|
||||
var pending = JsonSerializer.Deserialize<List<CandidatePair>>(run.PendingPickSetsJson) ?? new();
|
||||
return Ok(new GetCandidateCardsResponse
|
||||
{
|
||||
DeckInfo = ProjectDeckInfo(run),
|
||||
CandidateCardList = pending.Select(ToDto).ToList(),
|
||||
LeaderSkinId = run.LeaderSkinId == 0 ? null : run.LeaderSkinId,
|
||||
ClassInfo = ProjectClassInfo(run),
|
||||
});
|
||||
}
|
||||
|
||||
[HttpPost("card_choose")]
|
||||
public async Task<IActionResult> CardChoose([FromBody] ArenaColosseumCardChooseRequest req)
|
||||
{
|
||||
if (!TryGetViewerId(out var vid)) return Unauthorized();
|
||||
var run = await _runs.GetByViewerIdAsync(vid);
|
||||
if (run is null) return BadRequest(new { error = "no_active_run" });
|
||||
if (run.ClassId == 0 || run.IsSelectCompleted)
|
||||
return BadRequest(new { error = "arena_colosseum_invalid_state" });
|
||||
|
||||
var pending = JsonSerializer.Deserialize<List<CandidatePair>>(run.PendingPickSetsJson) ?? new();
|
||||
var pick = pending.FirstOrDefault(p => p.Id == req.SelectedId);
|
||||
if (pick is null)
|
||||
return BadRequest(new { error = "arena_colosseum_invalid_selection" });
|
||||
|
||||
var selectedCards = JsonSerializer.Deserialize<List<long>>(run.SelectedCardIdsJson) ?? new();
|
||||
selectedCards.Add(pick.CardId1);
|
||||
selectedCards.Add(pick.CardId2);
|
||||
run.SelectedCardIdsJson = JsonSerializer.Serialize(selectedCards);
|
||||
|
||||
List<CandidatePair>? nextPairs = null;
|
||||
if (run.SelectTurn < 15)
|
||||
{
|
||||
run.SelectTurn += 1;
|
||||
var pool = _config.Get<ColosseumSeasonConfig>().PoolCardSetIds;
|
||||
nextPairs = _pool.GeneratePickSetsForTurn(
|
||||
run.ClassId, run.SelectTurn, run.NextCandidateId, _rng, poolCardSetIds: pool);
|
||||
run.NextCandidateId += nextPairs.Count;
|
||||
run.PendingPickSetsJson = JsonSerializer.Serialize(nextPairs);
|
||||
}
|
||||
else
|
||||
{
|
||||
run.IsSelectCompleted = true;
|
||||
run.PendingPickSetsJson = "[]";
|
||||
}
|
||||
await _runs.UpsertAsync(run);
|
||||
|
||||
return Ok(new SVSim.EmulatedEntrypoint.Models.Dtos.Responses.ArenaTwoPick.CardChooseResponseDto
|
||||
{
|
||||
DeckInfo = ProjectDeckInfo(run),
|
||||
CandidateCardList = nextPairs?.Select(ToDto).ToList(),
|
||||
});
|
||||
}
|
||||
|
||||
[HttpPost("get_hof_deck_list")]
|
||||
public Task<IActionResult> GetHofDeckList([FromBody] BaseRequest _) =>
|
||||
GetCuratedListAsync<ColosseumHofDeck>();
|
||||
|
||||
[HttpPost("get_windfall_deck_list")]
|
||||
public Task<IActionResult> GetWindFallDeckList([FromBody] BaseRequest _) =>
|
||||
GetCuratedListAsync<ColosseumWindFallDeck>();
|
||||
|
||||
[HttpPost("get_avatar_deck_list")]
|
||||
public Task<IActionResult> GetAvatarDeckList([FromBody] BaseRequest _) =>
|
||||
GetCuratedListAsync<ColosseumAvatarDeck>();
|
||||
|
||||
[HttpPost("register_hof_deck")]
|
||||
public Task<IActionResult> RegisterHofDeck([FromBody] RegisterCuratedDeckRequest req) =>
|
||||
RegisterCuratedAsync<ColosseumHofDeck>(req);
|
||||
|
||||
[HttpPost("register_windfall_deck")]
|
||||
public Task<IActionResult> RegisterWindFallDeck([FromBody] RegisterCuratedDeckRequest req) =>
|
||||
RegisterCuratedAsync<ColosseumWindFallDeck>(req);
|
||||
|
||||
[HttpPost("register_avatar_deck")]
|
||||
public Task<IActionResult> RegisterAvatarDeck([FromBody] RegisterCuratedDeckRequest req) =>
|
||||
RegisterCuratedAsync<ColosseumAvatarDeck>(req);
|
||||
|
||||
/// <summary>
|
||||
/// Shared list dispatcher for the three curated-deck pools. Wire shape: bare array at
|
||||
/// <c>data</c> per get-curated-deck-list.md (NOT a wrapper object — client iterates
|
||||
/// <c>ResponseData["data"]</c> directly).
|
||||
/// </summary>
|
||||
private async Task<IActionResult> GetCuratedListAsync<TEntity>()
|
||||
where TEntity : class, IColosseumCuratedDeck
|
||||
{
|
||||
if (!TryGetViewerId(out _)) return Unauthorized();
|
||||
return Ok(new GetFeeInfoResponseDto());
|
||||
|
||||
var rows = await _db.Set<TEntity>().AsNoTracking()
|
||||
.OrderBy(d => d.DisplayOrder).ThenBy(d => d.DeckNo)
|
||||
.ToListAsync();
|
||||
|
||||
var entries = rows.Select(r => new ColosseumCuratedDeckEntry
|
||||
{
|
||||
DeckId = r.DeckNo,
|
||||
ClassId = r.ClassId,
|
||||
CardList = JsonSerializer.Deserialize<List<long>>(r.CardListJson) ?? new(),
|
||||
SleeveId = r.SleeveId == 0 ? null : r.SleeveId,
|
||||
SkinId = r.LeaderSkinId == 0 ? null : r.LeaderSkinId,
|
||||
}).ToList();
|
||||
|
||||
return Ok(entries);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Shared register dispatcher — validates each <c>deck_no_list</c> entry exists in the
|
||||
/// pool table for <typeparamref name="TEntity"/> (cross-pool register is rejected via
|
||||
/// the per-pool lookup). Persists onto the active run, NO <c>is_published</c> flag here
|
||||
/// — that's constructed-format-only per register-curated-deck.md.
|
||||
/// </summary>
|
||||
private async Task<IActionResult> RegisterCuratedAsync<TEntity>(RegisterCuratedDeckRequest req)
|
||||
where TEntity : class, IColosseumCuratedDeck
|
||||
{
|
||||
if (!TryGetViewerId(out var vid)) return Unauthorized();
|
||||
|
||||
var run = await _runs.GetByViewerIdAsync(vid);
|
||||
if (run is null) return BadRequest(new { error = "no_active_run" });
|
||||
|
||||
List<int> deckNos;
|
||||
try
|
||||
{
|
||||
deckNos = JsonSerializer.Deserialize<List<int>>(req.DeckNoList) ?? new();
|
||||
}
|
||||
catch (JsonException)
|
||||
{
|
||||
return BadRequest(new { error = "deck_no_list_malformed" });
|
||||
}
|
||||
|
||||
if (deckNos.Count == 0)
|
||||
{
|
||||
return BadRequest(new { error = "deck_no_list_empty" });
|
||||
}
|
||||
|
||||
var set = _db.Set<TEntity>();
|
||||
foreach (var no in deckNos)
|
||||
{
|
||||
// Per-pool lookup — registering an HOF deck_no against /register_windfall_deck
|
||||
// resolves to null here and rejects (cross-pool isolation).
|
||||
var found = await set.AnyAsync(d => d.DeckNo == no);
|
||||
if (!found)
|
||||
{
|
||||
return BadRequest(new { error = "deck_not_found", deck_no = no });
|
||||
}
|
||||
}
|
||||
|
||||
run.RegisteredDeckNoListJson = JsonSerializer.Serialize(deckNos);
|
||||
// Curated-register has no is_published flag; clear any prior value to keep state
|
||||
// consistent if the viewer switches from constructed to curated mid-bracket.
|
||||
run.IsPublished = false;
|
||||
await _runs.UpsertAsync(run);
|
||||
|
||||
return Ok(new { });
|
||||
}
|
||||
|
||||
/// <summary>v1 placeholder — Phase 3 §"Defer Chaos until live capture lands". Chaos
|
||||
/// chara ids map to a class via prod data (e.g. via a ChaosInfoMap). Until that lands,
|
||||
/// fall back to the chaos id mod 8 + 1 to keep the pool service happy. Real impl reads
|
||||
/// from <c>ColosseumChaosConfig</c> once captured.</summary>
|
||||
private static int ResolveChaosClassId(int chaosId) => ((chaosId - 1) % 8) + 1;
|
||||
|
||||
private static SVSim.EmulatedEntrypoint.Models.Dtos.Common.ArenaTwoPick.CandidatePairDto
|
||||
ToDto(CandidatePair p) => new()
|
||||
{
|
||||
Id = p.Id, Turn = p.Turn, SetNum = p.SetNum,
|
||||
CardId1 = p.CardId1, CardId2 = p.CardId2,
|
||||
IsSelected = p.IsSelected ? 1 : 0,
|
||||
};
|
||||
|
||||
private static SVSim.EmulatedEntrypoint.Models.Dtos.Common.ArenaTwoPick.ClassInfoDto
|
||||
ProjectClassInfo(ViewerArenaColosseumRun run)
|
||||
{
|
||||
var ids = JsonSerializer.Deserialize<List<int>>(run.CandidateClassIdsJson) ?? new();
|
||||
return new()
|
||||
{
|
||||
ClassId1 = ids.ElementAtOrDefault(0),
|
||||
ClassId2 = ids.ElementAtOrDefault(1),
|
||||
ClassId3 = ids.ElementAtOrDefault(2),
|
||||
SelectedClassId = run.ClassId,
|
||||
};
|
||||
}
|
||||
|
||||
private static SVSim.EmulatedEntrypoint.Models.Dtos.Common.ArenaTwoPick.DeckInfoDto
|
||||
ProjectDeckInfo(ViewerArenaColosseumRun run)
|
||||
{
|
||||
var cards = JsonSerializer.Deserialize<List<long>>(run.SelectedCardIdsJson) ?? new();
|
||||
return new()
|
||||
{
|
||||
TwoPickEntryId = run.EntryId,
|
||||
ClassId = run.ClassId,
|
||||
IsSelectCompleted = run.IsSelectCompleted,
|
||||
SelectedCardIds = cards,
|
||||
SelectTurn = run.SelectTurn == 0 ? 1 : run.SelectTurn,
|
||||
};
|
||||
}
|
||||
|
||||
[HttpPost("retire")]
|
||||
public async Task<IActionResult> Retire([FromBody] BaseRequest _)
|
||||
{
|
||||
if (!TryGetViewerId(out var vid)) return Unauthorized();
|
||||
var run = await _runs.GetByViewerIdAsync(vid);
|
||||
if (run is null) return BadRequest(new { error = "no_active_run" });
|
||||
|
||||
var rounds = _config.Get<ColosseumRoundsConfig>();
|
||||
var rewardEntries = _progression.BuildRetireRewards(run, rounds);
|
||||
var (wireRewards, wireRewardList) = await GrantRewardsAsync(vid, rewardEntries);
|
||||
|
||||
await _runs.DeleteAsync(vid);
|
||||
|
||||
return Ok(new FinishResponse
|
||||
{
|
||||
Rewards = wireRewards,
|
||||
RewardList = wireRewardList,
|
||||
ColosseumStatus = new ColosseumOwnStatus
|
||||
{
|
||||
NowRoundId = run.RoundId,
|
||||
RestEntryNum = 0,
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Grant the bundle through <c>IInventoryTransaction.GrantAsync</c> per
|
||||
/// <c>feedback_reward_grant_service</c> — single dispatch table for every UserGoodsType.
|
||||
/// Returns the two wire forms (rich <c>rewards</c> receipt + wallet-delta <c>reward_list</c>).
|
||||
/// </summary>
|
||||
private async Task<(List<ColosseumReceivedReward>, List<RewardEntryDto>)> GrantRewardsAsync(
|
||||
long viewerId, IReadOnlyList<ColosseumRoundsConfig.RewardEntry> bundle)
|
||||
{
|
||||
var receipts = new List<ColosseumReceivedReward>();
|
||||
var deltas = new List<RewardEntryDto>();
|
||||
if (bundle.Count == 0) return (receipts, deltas);
|
||||
|
||||
await using var tx = await _inventory.BeginAsync(viewerId);
|
||||
foreach (var entry in bundle)
|
||||
{
|
||||
var granted = await tx.GrantAsync(entry.Type, entry.DetailId, entry.Count);
|
||||
receipts.Add(new ColosseumReceivedReward
|
||||
{
|
||||
RewardNumber = entry.Count,
|
||||
RewardType = (int)entry.Type,
|
||||
RewardDetailId = entry.DetailId,
|
||||
Name = entry.Name,
|
||||
});
|
||||
// GrantAsync returns one or more (RewardType, RewardId, RewardNum) tuples — the
|
||||
// post-state-total semantics are owned by the inventory commit, which the wallet-delta
|
||||
// reflection inherits via tx.CommitAsync below.
|
||||
var first = granted.FirstOrDefault();
|
||||
deltas.Add(new RewardEntryDto
|
||||
{
|
||||
RewardType = first is null ? (int)entry.Type : (int)first.RewardType,
|
||||
RewardId = first?.RewardId ?? entry.DetailId,
|
||||
RewardNum = first?.RewardNum ?? entry.Count,
|
||||
});
|
||||
}
|
||||
await tx.CommitAsync();
|
||||
return (receipts, deltas);
|
||||
}
|
||||
|
||||
private static int ResolveServerRoundId(ColosseumSeasonConfig season) => 1;
|
||||
|
||||
private async Task<RewardEntryDto> DebitCrystalAsync(IInventoryTransaction tx, int cost)
|
||||
{
|
||||
var result = await tx.TrySpendAsync(SpendCurrency.Crystal, cost);
|
||||
if (!result.Success)
|
||||
throw new InvalidOperationException("insufficient_crystal");
|
||||
return new RewardEntryDto
|
||||
{
|
||||
RewardType = (int)UserGoodsType.Crystal,
|
||||
RewardId = 0,
|
||||
RewardNum = (int)result.PostStateTotal,
|
||||
};
|
||||
}
|
||||
|
||||
private async Task<RewardEntryDto> DebitRupyAsync(IInventoryTransaction tx, int cost)
|
||||
{
|
||||
var result = await tx.TrySpendAsync(SpendCurrency.Rupee, cost);
|
||||
if (!result.Success)
|
||||
throw new InvalidOperationException("insufficient_rupy");
|
||||
return new RewardEntryDto
|
||||
{
|
||||
RewardType = (int)UserGoodsType.Rupy,
|
||||
RewardId = 0,
|
||||
RewardNum = (int)result.PostStateTotal,
|
||||
};
|
||||
}
|
||||
|
||||
private async Task<RewardEntryDto> DebitTicketAsync(IInventoryTransaction tx, int cost)
|
||||
{
|
||||
// Colosseum's ticket id is server-internal — using ArenaTwoPick's TicketItemId convention
|
||||
// (item id 1) until a per-season override is captured.
|
||||
const int ticketItemId = 1;
|
||||
var result = await tx.TryDebitAsync(UserGoodsType.Item, ticketItemId, cost);
|
||||
if (!result.Success)
|
||||
throw new InvalidOperationException("insufficient_ticket");
|
||||
return new RewardEntryDto
|
||||
{
|
||||
RewardType = (int)UserGoodsType.Item,
|
||||
RewardId = ticketItemId,
|
||||
RewardNum = (int)result.PostStateTotal,
|
||||
};
|
||||
}
|
||||
|
||||
// --- helpers ---
|
||||
|
||||
private static ColosseumLobbyInfo BuildColosseumInfo(ColosseumSeasonConfig season)
|
||||
{
|
||||
if (!season.IsColosseumPeriod)
|
||||
{
|
||||
return new ColosseumLobbyInfo { IsColosseumPeriod = false };
|
||||
}
|
||||
|
||||
return new ColosseumLobbyInfo
|
||||
{
|
||||
IsColosseumPeriod = true,
|
||||
DeckFormat = (int)season.DeckFormat,
|
||||
IsNormalTwoPick = season.IsNormalTwoPick ? "1" : "0",
|
||||
ColosseumName = season.ColosseumName,
|
||||
IsRoundPeriod = true,
|
||||
IsSpecialMode = season.IsSpecialMode,
|
||||
CardPoolName = string.IsNullOrEmpty(season.CardPoolName) ? null : season.CardPoolName,
|
||||
NowRound = 1,
|
||||
StartTime = FormatTime(season.EventStartTime),
|
||||
EndTime = FormatTime(season.EventEndTime),
|
||||
IsAllCardEnabled = season.IsAllCardEnabled ? 1 : 0,
|
||||
SalesPeriodInfo = new SVSim.EmulatedEntrypoint.Models.Dtos.ColosseumSalesPeriodInfo
|
||||
{
|
||||
SalesPeriodTime = FormatTime(season.SalesPeriodEnd),
|
||||
},
|
||||
StrategyPickNum = season.StrategyPickNum > 0 ? season.StrategyPickNum : null,
|
||||
};
|
||||
}
|
||||
|
||||
/// <summary>Builds the <c>colosseum_status</c> block. When the viewer has no run, every
|
||||
/// property is null and global WhenWritingNull renders <c>{}</c> — the client
|
||||
/// (<c>SetColosseumOwnStatus</c>) short-circuits on <c>status.Count == 0</c>.</summary>
|
||||
private static ColosseumOwnStatus BuildOwnStatus(ViewerArenaColosseumRun? run)
|
||||
{
|
||||
if (run is null) return new ColosseumOwnStatus();
|
||||
|
||||
return new ColosseumOwnStatus
|
||||
{
|
||||
RestEntryNum = run.RestEntryNum,
|
||||
NowRoundId = run.RoundId,
|
||||
IsChampion = run.IsChampion ? true : null,
|
||||
};
|
||||
}
|
||||
|
||||
private static ColosseumRoundDetail BuildRoundDetail(ColosseumRoundsConfig rounds, int roundId)
|
||||
{
|
||||
var match = rounds.Rounds.FirstOrDefault(r => r.RoundId == roundId);
|
||||
if (match is null) return new ColosseumRoundDetail();
|
||||
|
||||
return new ColosseumRoundDetail
|
||||
{
|
||||
StartTime = FormatTime(match.StartTime),
|
||||
EndTime = FormatTime(match.EndTime),
|
||||
IsNowRound = IsNowRound(match),
|
||||
RoundDetail = match.Groups.Select(g => new ColosseumGroupRow
|
||||
{
|
||||
Group = g.Group,
|
||||
MaxBattleCount = g.MaxBattleCount,
|
||||
BreakthroughNumber = g.BreakthroughNumber,
|
||||
EntryNumber = g.EntryNumber,
|
||||
}).ToList(),
|
||||
};
|
||||
}
|
||||
|
||||
private static bool IsNowRound(ColosseumRoundsConfig.RoundEntry round)
|
||||
{
|
||||
var now = DateTime.UtcNow;
|
||||
return now >= round.StartTime && now <= round.EndTime;
|
||||
}
|
||||
|
||||
private static string FormatTime(DateTime t) =>
|
||||
t == default ? "" : t.ToString("yyyy-MM-dd HH:mm:ss");
|
||||
|
||||
private static List<int> ParseIntList(string json) =>
|
||||
string.IsNullOrEmpty(json)
|
||||
? new()
|
||||
: System.Text.Json.JsonSerializer.Deserialize<List<int>>(json) ?? new();
|
||||
}
|
||||
|
||||
@@ -0,0 +1,33 @@
|
||||
using System.Text.Json.Serialization;
|
||||
using MessagePack;
|
||||
using SVSim.EmulatedEntrypoint.Models.Dtos.Requests;
|
||||
|
||||
namespace SVSim.EmulatedEntrypoint.Models.Dtos.ArenaColosseum;
|
||||
|
||||
/// <summary>
|
||||
/// <c>POST /colosseum_battle/do_matching</c> + <c>POST /colosseum_rank_battle/do_matching</c>.
|
||||
/// Standard <c>DoMatchingParam</c> wire shape — same fields as rank/free-battle's variant.
|
||||
/// Per do-matching.md, post-promotion the client forces <c>need_init = 0</c>, but the
|
||||
/// server tolerates either value (URL is the routing signal).
|
||||
/// </summary>
|
||||
[MessagePackObject]
|
||||
public sealed class ColosseumDoMatchingRequestDto : BaseRequest
|
||||
{
|
||||
[JsonPropertyName("need_init")] [Key("need_init")]
|
||||
public int NeedInit { get; set; }
|
||||
|
||||
[JsonPropertyName("card_master_hash")] [Key("card_master_hash")]
|
||||
public string? CardMasterHash { get; set; }
|
||||
|
||||
[JsonPropertyName("log")] [Key("log")]
|
||||
public int Log { get; set; }
|
||||
|
||||
[JsonPropertyName("use_stage_select")] [Key("use_stage_select")]
|
||||
public int UseStageSelect { get; set; }
|
||||
|
||||
[JsonPropertyName("excluded_field_id_list")] [Key("excluded_field_id_list")]
|
||||
public List<long> ExcludedFieldIdList { get; set; } = new();
|
||||
|
||||
[JsonPropertyName("is_default_skin")] [Key("is_default_skin")]
|
||||
public int IsDefaultSkin { get; set; }
|
||||
}
|
||||
@@ -0,0 +1,49 @@
|
||||
using System.Text.Json.Serialization;
|
||||
using MessagePack;
|
||||
using SVSim.EmulatedEntrypoint.Models.Dtos.Requests;
|
||||
|
||||
namespace SVSim.EmulatedEntrypoint.Models.Dtos.ArenaColosseum;
|
||||
|
||||
/// <summary>
|
||||
/// <c>POST /colosseum_battle/finish</c> + <c>POST /colosseum_rank_battle/finish</c> request
|
||||
/// body — the per-match finish, NOT the bracket-end <c>/arena_colosseum/finish</c>.
|
||||
/// Standard <c>BattleFinishParam</c> shape inherited from <c>FinishTaskBase</c>.
|
||||
/// </summary>
|
||||
[MessagePackObject]
|
||||
public sealed class ColosseumBattleFinishRequestDto : BaseRequest
|
||||
{
|
||||
[JsonPropertyName("battle_result")] [Key("battle_result")]
|
||||
public int BattleResult { get; set; }
|
||||
|
||||
[JsonPropertyName("is_retire")] [Key("is_retire")]
|
||||
public int IsRetire { get; set; }
|
||||
|
||||
[JsonPropertyName("recovery_data")] [Key("recovery_data")]
|
||||
public string? RecoveryData { get; set; }
|
||||
|
||||
[JsonPropertyName("class_id")] [Key("class_id")]
|
||||
public int ClassId { get; set; }
|
||||
|
||||
[JsonPropertyName("total_turn")] [Key("total_turn")]
|
||||
public int TotalTurn { get; set; }
|
||||
|
||||
[JsonPropertyName("evolve_count")] [Key("evolve_count")]
|
||||
public int EvolveCount { get; set; }
|
||||
|
||||
[JsonPropertyName("enemy_evolve_count")] [Key("enemy_evolve_count")]
|
||||
public int EnemyEvolveCount { get; set; }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// <c>colosseum_battle/finish</c> response. Per battle-finish.md, the client maps this to
|
||||
/// <c>ColosseumBattleFinishDetail</c> which is an empty <c>MatchFinishBase</c> subclass —
|
||||
/// no Colosseum-specific fields beyond the shared rank-battle-finish superset. Phase 2 v1
|
||||
/// emits the minimum required to keep the client's <c>BattleFinishResponsProcessing</c>
|
||||
/// happy.
|
||||
/// </summary>
|
||||
[MessagePackObject(keyAsPropertyName: true)]
|
||||
public sealed class ColosseumBattleFinishResponseDto
|
||||
{
|
||||
[JsonPropertyName("battle_result")] [Key("battle_result")]
|
||||
public int BattleResult { get; set; }
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
using System.Text.Json.Serialization;
|
||||
using MessagePack;
|
||||
|
||||
namespace SVSim.EmulatedEntrypoint.Models.Dtos.ArenaColosseum;
|
||||
|
||||
[MessagePackObject]
|
||||
public class ColosseumBattleResults
|
||||
{
|
||||
[JsonPropertyName("win_count")] [Key("win_count")]
|
||||
public int WinCount { get; set; }
|
||||
|
||||
/// <summary>0 = loss, 1 = win. Client iterates as bool list.</summary>
|
||||
[JsonPropertyName("result_list")] [Key("result_list")]
|
||||
public List<int> ResultList { get; set; } = new();
|
||||
}
|
||||
@@ -0,0 +1,32 @@
|
||||
using System.Text.Json.Serialization;
|
||||
using MessagePack;
|
||||
|
||||
namespace SVSim.EmulatedEntrypoint.Models.Dtos.ArenaColosseum;
|
||||
|
||||
/// <summary>
|
||||
/// Wire shape for a single curated deck on <c>/get_{hof|windfall|avatar}_deck_list</c>.
|
||||
/// The list response is a BARE ARRAY at the <c>data</c> level per spec — client iterates
|
||||
/// directly without a wrapper object. Sleeve/skin are optional; client falls back to
|
||||
/// defaults when absent.
|
||||
/// </summary>
|
||||
[MessagePackObject]
|
||||
public sealed class ColosseumCuratedDeckEntry
|
||||
{
|
||||
[JsonPropertyName("deck_id")] [Key("deck_id")]
|
||||
public int DeckId { get; set; }
|
||||
|
||||
[JsonPropertyName("class_id")] [Key("class_id")]
|
||||
public int ClassId { get; set; }
|
||||
|
||||
[JsonPropertyName("card_list")] [Key("card_list")]
|
||||
public List<long> CardList { get; set; } = new();
|
||||
|
||||
[JsonPropertyName("sleeve_id")] [Key("sleeve_id")]
|
||||
public long? SleeveId { get; set; }
|
||||
|
||||
[JsonPropertyName("skin_id")] [Key("skin_id")]
|
||||
public long? SkinId { get; set; }
|
||||
|
||||
[JsonPropertyName("deck_name")] [Key("deck_name")]
|
||||
public string? DeckName { get; set; }
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
using System.Text.Json.Serialization;
|
||||
using MessagePack;
|
||||
|
||||
namespace SVSim.EmulatedEntrypoint.Models.Dtos.ArenaColosseum;
|
||||
|
||||
/// <summary>Wire <c>entry_info</c> object on <c>/top</c> and <c>/entry</c>. Reused across endpoints.</summary>
|
||||
[MessagePackObject]
|
||||
public class ColosseumEntryRef
|
||||
{
|
||||
[JsonPropertyName("id")] [Key("id")]
|
||||
public long Id { get; set; }
|
||||
|
||||
/// <summary>Used by <c>/entry</c> only — Format enum integer. Top emits via colosseum_info.</summary>
|
||||
[JsonPropertyName("deck_format")] [Key("deck_format")]
|
||||
public int? DeckFormat { get; set; }
|
||||
}
|
||||
@@ -0,0 +1,63 @@
|
||||
using System.Text.Json.Serialization;
|
||||
using MessagePack;
|
||||
|
||||
namespace SVSim.EmulatedEntrypoint.Models.Dtos.ArenaColosseum;
|
||||
|
||||
/// <summary>
|
||||
/// Event-level descriptor used by <c>/event_info</c> only — distinct shape from
|
||||
/// <see cref="ColosseumInfo"/>: only <c>format</c>, the event window, the announce id,
|
||||
/// and the final-round eliminate count. The client's <c>ColosseumDetailTask</c> reads
|
||||
/// these five fields plus the three string-keyed rounds.
|
||||
/// </summary>
|
||||
[MessagePackObject]
|
||||
public class ColosseumEventInfo
|
||||
{
|
||||
/// <summary>Event format. Mapped via <c>ApiRuleParseAndSet</c> on the client.</summary>
|
||||
[JsonPropertyName("format")] [Key("format")]
|
||||
public int Format { get; set; }
|
||||
|
||||
[JsonPropertyName("start_time")] [Key("start_time")]
|
||||
public string StartTime { get; set; } = "";
|
||||
|
||||
[JsonPropertyName("end_time")] [Key("end_time")]
|
||||
public string EndTime { get; set; } = "";
|
||||
|
||||
/// <summary>Optional — emit <c>null</c> when no announce content is configured.</summary>
|
||||
[JsonPropertyName("announce_id")] [Key("announce_id")]
|
||||
public string? AnnounceId { get; set; }
|
||||
|
||||
[JsonPropertyName("final_round_eliminate_count")] [Key("final_round_eliminate_count")]
|
||||
public int FinalRoundEliminateCount { get; set; }
|
||||
}
|
||||
|
||||
[MessagePackObject]
|
||||
public class ColosseumRoundDetail
|
||||
{
|
||||
[JsonPropertyName("start_time")] [Key("start_time")]
|
||||
public string StartTime { get; set; } = "";
|
||||
|
||||
[JsonPropertyName("end_time")] [Key("end_time")]
|
||||
public string EndTime { get; set; } = "";
|
||||
|
||||
[JsonPropertyName("is_now_round")] [Key("is_now_round")]
|
||||
public bool IsNowRound { get; set; }
|
||||
|
||||
[JsonPropertyName("round_detail")] [Key("round_detail")]
|
||||
public List<ColosseumGroupRow> RoundDetail { get; set; } = new();
|
||||
}
|
||||
|
||||
[MessagePackObject]
|
||||
public class ColosseumGroupRow
|
||||
{
|
||||
[JsonPropertyName("group")] [Key("group")]
|
||||
public string Group { get; set; } = "";
|
||||
|
||||
[JsonPropertyName("max_battle_count")] [Key("max_battle_count")]
|
||||
public int MaxBattleCount { get; set; }
|
||||
|
||||
[JsonPropertyName("breakthrough_number")] [Key("breakthrough_number")]
|
||||
public int BreakthroughNumber { get; set; }
|
||||
|
||||
[JsonPropertyName("entry_number")] [Key("entry_number")]
|
||||
public int EntryNumber { get; set; }
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
using System.Text.Json.Serialization;
|
||||
using MessagePack;
|
||||
|
||||
namespace SVSim.EmulatedEntrypoint.Models.Dtos.ArenaColosseum;
|
||||
|
||||
[MessagePackObject]
|
||||
public class ColosseumFeeList
|
||||
{
|
||||
[JsonPropertyName("rupy_cost")] [Key("rupy_cost")]
|
||||
public int RupyCost { get; set; }
|
||||
|
||||
[JsonPropertyName("ticket_cost")] [Key("ticket_cost")]
|
||||
public int TicketCost { get; set; }
|
||||
|
||||
[JsonPropertyName("crystal_cost")] [Key("crystal_cost")]
|
||||
public int CrystalCost { get; set; }
|
||||
}
|
||||
@@ -0,0 +1,81 @@
|
||||
using System.Text.Json.Serialization;
|
||||
using MessagePack;
|
||||
using SVSim.EmulatedEntrypoint.Models.Dtos;
|
||||
|
||||
namespace SVSim.EmulatedEntrypoint.Models.Dtos.ArenaColosseum;
|
||||
|
||||
/// <summary>
|
||||
/// Round-level Colosseum descriptor. Shared by <c>/top</c> and <c>/get_fee_info</c> via
|
||||
/// the client's static <c>ColosseumEntryInfoTask.SetColosseumInfo</c> helper. When
|
||||
/// <see cref="IsColosseumPeriod"/> is <c>false</c>, the client skips parsing every other
|
||||
/// field — server still emits this minimal payload so the lobby renders cleanly.
|
||||
/// <para>
|
||||
/// Distinct from <see cref="SVSim.EmulatedEntrypoint.Models.Dtos.ColosseumInfo"/> (the
|
||||
/// captured prod <c>/mypage/index</c> shape — stringly-typed and read-only). This is the
|
||||
/// per-endpoint Colosseum-family shape. <c>/event_info</c> uses yet a third shape —
|
||||
/// <see cref="ColosseumEventInfo"/>.
|
||||
/// </para>
|
||||
/// </summary>
|
||||
[MessagePackObject]
|
||||
public class ColosseumLobbyInfo
|
||||
{
|
||||
/// <summary>Master gate. <c>false</c> = lobby renders empty.</summary>
|
||||
[JsonPropertyName("is_colosseum_period")] [Key("is_colosseum_period")]
|
||||
public bool IsColosseumPeriod { get; set; }
|
||||
|
||||
/// <summary>Format enum (Rotation=0, Unlimited=1, TwoPick=10, HOF=31, ...).</summary>
|
||||
[JsonPropertyName("deck_format")] [Key("deck_format")]
|
||||
public int? DeckFormat { get; set; }
|
||||
|
||||
/// <summary>STRING wire shape: <c>"0"</c>/<c>"1"</c>. Client parses with
|
||||
/// <c>jsonData.ToString() == "1"</c>.</summary>
|
||||
[JsonPropertyName("is_normal_two_pick")] [Key("is_normal_two_pick")]
|
||||
public string? IsNormalTwoPick { get; set; }
|
||||
|
||||
[JsonPropertyName("colosseum_name")] [Key("colosseum_name")]
|
||||
public string? ColosseumName { get; set; }
|
||||
|
||||
[JsonPropertyName("is_round_period")] [Key("is_round_period")]
|
||||
public bool? IsRoundPeriod { get; set; }
|
||||
|
||||
/// <summary>Wire STRING used by the client as a UI color/theme code.</summary>
|
||||
[JsonPropertyName("is_special_mode")] [Key("is_special_mode")]
|
||||
public string? IsSpecialMode { get; set; }
|
||||
|
||||
[JsonPropertyName("card_pool_name")] [Key("card_pool_name")]
|
||||
public string? CardPoolName { get; set; }
|
||||
|
||||
/// <summary>Present during round period — current stage number (1..3).</summary>
|
||||
[JsonPropertyName("now_round")] [Key("now_round")]
|
||||
public int? NowRound { get; set; }
|
||||
|
||||
/// <summary>Present outside round period — next stage number.</summary>
|
||||
[JsonPropertyName("next_round")] [Key("next_round")]
|
||||
public int? NextRound { get; set; }
|
||||
|
||||
[JsonPropertyName("start_time")] [Key("start_time")]
|
||||
public string? StartTime { get; set; }
|
||||
|
||||
[JsonPropertyName("end_time")] [Key("end_time")]
|
||||
public string? EndTime { get; set; }
|
||||
|
||||
[JsonPropertyName("is_display_tips")] [Key("is_display_tips")]
|
||||
public int? IsDisplayTips { get; set; }
|
||||
|
||||
[JsonPropertyName("colosseum_id")] [Key("colosseum_id")]
|
||||
public int? ColosseumId { get; set; }
|
||||
|
||||
[JsonPropertyName("tips_id")] [Key("tips_id")]
|
||||
public int? TipsId { get; set; }
|
||||
|
||||
[JsonPropertyName("is_all_card_enabled")] [Key("is_all_card_enabled")]
|
||||
public int? IsAllCardEnabled { get; set; }
|
||||
|
||||
/// <summary>Reuses the captured <c>/mypage/index</c> shape — single
|
||||
/// <c>sales_period_time</c> field per prod capture.</summary>
|
||||
[JsonPropertyName("sales_period_info")] [Key("sales_period_info")]
|
||||
public ColosseumSalesPeriodInfo? SalesPeriodInfo { get; set; }
|
||||
|
||||
[JsonPropertyName("strategy_pick_num")] [Key("strategy_pick_num")]
|
||||
public int? StrategyPickNum { get; set; }
|
||||
}
|
||||
@@ -0,0 +1,33 @@
|
||||
using System.Text.Json.Serialization;
|
||||
using MessagePack;
|
||||
|
||||
namespace SVSim.EmulatedEntrypoint.Models.Dtos.ArenaColosseum;
|
||||
|
||||
/// <summary>
|
||||
/// Per-viewer Colosseum state. All fields optional — when the viewer has no run, ALL fields
|
||||
/// are null and the global <c>WhenWritingNull</c> policy renders this as <c>{}</c>, which
|
||||
/// the client's <c>SetColosseumOwnStatus</c> short-circuits with <c>status.Count != 0</c>.
|
||||
/// </summary>
|
||||
[MessagePackObject]
|
||||
public class ColosseumOwnStatus
|
||||
{
|
||||
[JsonPropertyName("rest_entry_num")] [Key("rest_entry_num")]
|
||||
public int? RestEntryNum { get; set; }
|
||||
|
||||
[JsonPropertyName("now_round_id")] [Key("now_round_id")]
|
||||
public int? NowRoundId { get; set; }
|
||||
|
||||
[JsonPropertyName("next_round_id")] [Key("next_round_id")]
|
||||
public int? NextRoundId { get; set; }
|
||||
|
||||
[JsonPropertyName("is_last_day")] [Key("is_last_day")]
|
||||
public bool? IsLastDay { get; set; }
|
||||
|
||||
[JsonPropertyName("is_champion")] [Key("is_champion")]
|
||||
public bool? IsChampion { get; set; }
|
||||
|
||||
/// <summary>Only present when <see cref="IsChampion"/> is true — client uses it to overwrite
|
||||
/// <c>ColosseumData.Name</c> for the champion screen.</summary>
|
||||
[JsonPropertyName("colosseum_name")] [Key("colosseum_name")]
|
||||
public string? ColosseumName { get; set; }
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
using System.Text.Json.Serialization;
|
||||
using MessagePack;
|
||||
|
||||
namespace SVSim.EmulatedEntrypoint.Models.Dtos.ArenaColosseum;
|
||||
|
||||
/// <summary>
|
||||
/// Per-entry shape for the <c>rewards</c> array on <c>/finish</c> + <c>/retire</c>. Richer
|
||||
/// than <c>RewardEntryDto</c> (which is the <c>reward_list</c> shape) — carries a display
|
||||
/// name. Distinct from the wallet-delta block: client renders <c>rewards</c> in the
|
||||
/// post-bracket popup while <c>reward_list</c> drives the silent wallet update.
|
||||
/// </summary>
|
||||
[MessagePackObject]
|
||||
public sealed class ColosseumReceivedReward
|
||||
{
|
||||
[JsonPropertyName("reward_number")] [Key("reward_number")]
|
||||
public int RewardNumber { get; set; }
|
||||
|
||||
[JsonPropertyName("reward_type")] [Key("reward_type")]
|
||||
public int RewardType { get; set; }
|
||||
|
||||
[JsonPropertyName("reward_detail_id")] [Key("reward_detail_id")]
|
||||
public long RewardDetailId { get; set; }
|
||||
|
||||
[JsonPropertyName("name")] [Key("name")]
|
||||
public string Name { get; set; } = "";
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
using System.Text.Json.Serialization;
|
||||
using MessagePack;
|
||||
|
||||
namespace SVSim.EmulatedEntrypoint.Models.Dtos.ArenaColosseum;
|
||||
|
||||
/// <summary>Lightweight deck-info shape for <c>/top</c>'s <c>user_deck[0]</c>. The client's
|
||||
/// <c>DeckData.Initialize</c> consumes the canonical deck shape; this is the minimum needed
|
||||
/// to render the deck preview in Phase 1.</summary>
|
||||
[MessagePackObject]
|
||||
public class ColosseumUserDeck
|
||||
{
|
||||
[JsonPropertyName("deck_id")] [Key("deck_id")]
|
||||
public long DeckId { get; set; }
|
||||
|
||||
[JsonPropertyName("class_id")] [Key("class_id")]
|
||||
public int ClassId { get; set; }
|
||||
|
||||
[JsonPropertyName("card_list")] [Key("card_list")]
|
||||
public List<long> CardList { get; set; } = new();
|
||||
|
||||
[JsonPropertyName("sleeve_id")] [Key("sleeve_id")]
|
||||
public long? SleeveId { get; set; }
|
||||
|
||||
[JsonPropertyName("skin_id")] [Key("skin_id")]
|
||||
public long? SkinId { get; set; }
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
using System.Text.Json.Serialization;
|
||||
using MessagePack;
|
||||
using SVSim.EmulatedEntrypoint.Models.Dtos.Requests;
|
||||
|
||||
namespace SVSim.EmulatedEntrypoint.Models.Dtos.Requests.ArenaColosseum;
|
||||
|
||||
[MessagePackObject]
|
||||
public sealed class ArenaColosseumCardChooseRequest : BaseRequest
|
||||
{
|
||||
[JsonPropertyName("selected_id")] [Key("selected_id")]
|
||||
public long SelectedId { get; set; }
|
||||
}
|
||||
@@ -0,0 +1,22 @@
|
||||
using System.Text.Json.Serialization;
|
||||
using MessagePack;
|
||||
using SVSim.EmulatedEntrypoint.Models.Dtos.Requests;
|
||||
|
||||
namespace SVSim.EmulatedEntrypoint.Models.Dtos.Requests.ArenaColosseum;
|
||||
|
||||
/// <summary>
|
||||
/// <c>POST /arena_colosseum/class_choose</c>. Two mutually-exclusive request shapes per
|
||||
/// class-choose.md — Normal sends <c>class_id</c>, Chaos sends <c>chaos_id</c>. Both fields
|
||||
/// are bound on this DTO; the server picks the mode by which is non-zero and rejects when
|
||||
/// both are present (or neither).
|
||||
/// </summary>
|
||||
[MessagePackObject]
|
||||
public sealed class ArenaColosseumClassChooseRequest : BaseRequest
|
||||
{
|
||||
[JsonPropertyName("class_id")] [Key("class_id")]
|
||||
public int ClassId { get; set; }
|
||||
|
||||
/// <summary>Chaos sub-mode replay id. 0 in Normal mode.</summary>
|
||||
[JsonPropertyName("chaos_id")] [Key("chaos_id")]
|
||||
public int ChaosId { get; set; }
|
||||
}
|
||||
@@ -0,0 +1,22 @@
|
||||
using System.Text.Json.Serialization;
|
||||
using MessagePack;
|
||||
using SVSim.EmulatedEntrypoint.Models.Dtos.Requests;
|
||||
|
||||
namespace SVSim.EmulatedEntrypoint.Models.Dtos.Requests.ArenaColosseum;
|
||||
|
||||
/// <summary>
|
||||
/// <c>POST /arena_colosseum/entry</c> — pay the entry cost and start a Colosseum bracket
|
||||
/// attempt. Maps to <c>Wizard/ColosseumEntryTask.ColosseumEntryTaskParam</c>.
|
||||
/// </summary>
|
||||
[MessagePackObject(keyAsPropertyName: false)]
|
||||
public class ArenaColosseumEntryRequest : BaseRequest
|
||||
{
|
||||
/// <summary>Currency selector — eARENA_PAY enum. 1=Crystal, 3=Ticket, 4=Rupy, 5=Free.</summary>
|
||||
[JsonPropertyName("consume_item_type")] [Key("consume_item_type")]
|
||||
public int ConsumeItemType { get; set; }
|
||||
|
||||
/// <summary>Client-echoed round id from the most recent <c>/get_fee_info</c> or <c>/top</c>.
|
||||
/// Server rejects if it disagrees with the current server-decided round.</summary>
|
||||
[JsonPropertyName("now_round_id")] [Key("now_round_id")]
|
||||
public int NowRoundId { get; set; }
|
||||
}
|
||||
@@ -0,0 +1,22 @@
|
||||
using System.Text.Json.Serialization;
|
||||
using MessagePack;
|
||||
using SVSim.EmulatedEntrypoint.Models.Dtos.Requests;
|
||||
|
||||
namespace SVSim.EmulatedEntrypoint.Models.Dtos.Requests.ArenaColosseum;
|
||||
|
||||
/// <summary>
|
||||
/// <c>POST /arena_colosseum/register_deck</c> — submit deck slot(s) for a constructed-format
|
||||
/// entry. Same wire gotcha as <c>arena_competition/register_deck</c> et al — <see cref="DeckNoList"/>
|
||||
/// is a JSON-encoded STRING like <c>"[3,4,5]"</c>, not an array. The server parses it.
|
||||
/// </summary>
|
||||
[MessagePackObject(keyAsPropertyName: false)]
|
||||
public class ArenaColosseumRegisterDeckRequest : BaseRequest
|
||||
{
|
||||
/// <summary>JSON-encoded list of deck slot numbers. Client does <c>JsonMapper.ToJson(List<int>)</c>.</summary>
|
||||
[JsonPropertyName("deck_no_list")] [Key("deck_no_list")]
|
||||
public string DeckNoList { get; set; } = "[]";
|
||||
|
||||
/// <summary>Server-stored visibility flag — does not affect bracket play.</summary>
|
||||
[JsonPropertyName("is_published")] [Key("is_published")]
|
||||
public bool IsPublished { get; set; }
|
||||
}
|
||||
@@ -1,6 +0,0 @@
|
||||
using MessagePack;
|
||||
|
||||
namespace SVSim.EmulatedEntrypoint.Models.Dtos.Requests.ArenaColosseum;
|
||||
|
||||
[MessagePackObject]
|
||||
public class GetFeeInfoRequest : BaseRequest { }
|
||||
@@ -0,0 +1,18 @@
|
||||
using System.Text.Json.Serialization;
|
||||
using MessagePack;
|
||||
using SVSim.EmulatedEntrypoint.Models.Dtos.Requests;
|
||||
|
||||
namespace SVSim.EmulatedEntrypoint.Models.Dtos.Requests.ArenaColosseum;
|
||||
|
||||
/// <summary>
|
||||
/// Shared request shape for the three curated-deck register URLs (HOF / WindFall / Avatar).
|
||||
/// Same JSON-encoded-string gotcha as <see cref="ArenaColosseumRegisterDeckRequest"/> —
|
||||
/// <c>deck_no_list</c> is a wire string like <c>"[1001,1002]"</c>. No <c>is_published</c>
|
||||
/// here (constructed-only flag per spec).
|
||||
/// </summary>
|
||||
[MessagePackObject]
|
||||
public sealed class RegisterCuratedDeckRequest : BaseRequest
|
||||
{
|
||||
[JsonPropertyName("deck_no_list")] [Key("deck_no_list")]
|
||||
public string DeckNoList { get; set; } = "[]";
|
||||
}
|
||||
@@ -0,0 +1,22 @@
|
||||
using System.Text.Json.Serialization;
|
||||
using MessagePack;
|
||||
using SVSim.EmulatedEntrypoint.Models.Dtos.ArenaColosseum;
|
||||
using SVSim.EmulatedEntrypoint.Models.Dtos.Common.ArenaTwoPick;
|
||||
|
||||
namespace SVSim.EmulatedEntrypoint.Models.Dtos.Responses.ArenaColosseum;
|
||||
|
||||
/// <summary>
|
||||
/// <c>POST /arena_colosseum/entry</c>. Sparse — only <c>reward_list</c> (wallet debit) +
|
||||
/// <c>entry_info.deck_format</c>. Client refreshes full lobby state via the next <c>/top</c>.
|
||||
/// Reuses <see cref="RewardEntryDto"/> from arena-two-pick — the wire shape is identical
|
||||
/// (<c>reward_type/reward_id/reward_num</c> per <c>UpdateHaveUserGoodsNumByJsonData</c>).
|
||||
/// </summary>
|
||||
[MessagePackObject]
|
||||
public class EntryResponse
|
||||
{
|
||||
[JsonPropertyName("reward_list")] [Key("reward_list")]
|
||||
public List<RewardEntryDto> RewardList { get; set; } = new();
|
||||
|
||||
[JsonPropertyName("entry_info")] [Key("entry_info")]
|
||||
public ColosseumEntryRef EntryInfo { get; set; } = new();
|
||||
}
|
||||
@@ -0,0 +1,31 @@
|
||||
using System.Text.Json.Serialization;
|
||||
using MessagePack;
|
||||
using SVSim.EmulatedEntrypoint.Models.Dtos.ArenaColosseum;
|
||||
|
||||
namespace SVSim.EmulatedEntrypoint.Models.Dtos.Responses.ArenaColosseum;
|
||||
|
||||
/// <summary>
|
||||
/// <c>POST /arena_colosseum/event_info</c>. The 3-round Colosseum bracket descriptor — note
|
||||
/// the rounds are STRING-keyed (<c>"1"</c>, <c>"2"</c>, <c>"3"</c>), NOT an array. The
|
||||
/// client iterates <c>for (i = 1; i <= 3; i++) jsonData[i.ToString()]</c>. Using three
|
||||
/// explicit <c>[JsonPropertyName("1"|"2"|"3")]</c> properties is simpler than a custom STJ
|
||||
/// converter and round-trips cleanly through MessagePack via matching <c>[Key("1"|...)]</c>.
|
||||
/// </summary>
|
||||
[MessagePackObject]
|
||||
public class EventInfoResponse
|
||||
{
|
||||
[JsonPropertyName("colosseum_info")] [Key("colosseum_info")]
|
||||
public ColosseumEventInfo ColosseumInfo { get; set; } = new();
|
||||
|
||||
[JsonPropertyName("1")] [Key("1")]
|
||||
public ColosseumRoundDetail Round1 { get; set; } = new();
|
||||
|
||||
[JsonPropertyName("2")] [Key("2")]
|
||||
public ColosseumRoundDetail Round2 { get; set; } = new();
|
||||
|
||||
[JsonPropertyName("3")] [Key("3")]
|
||||
public ColosseumRoundDetail Round3 { get; set; } = new();
|
||||
|
||||
[JsonPropertyName("colosseum_status")] [Key("colosseum_status")]
|
||||
public ColosseumOwnStatus ColosseumStatus { get; set; } = new();
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
using System.Text.Json.Serialization;
|
||||
using MessagePack;
|
||||
using SVSim.EmulatedEntrypoint.Models.Dtos.ArenaColosseum;
|
||||
using SVSim.EmulatedEntrypoint.Models.Dtos.Common.ArenaTwoPick;
|
||||
|
||||
namespace SVSim.EmulatedEntrypoint.Models.Dtos.Responses.ArenaColosseum;
|
||||
|
||||
/// <summary>
|
||||
/// <c>POST /arena_colosseum/finish</c> and <c>POST /arena_colosseum/retire</c>. Wire-identical
|
||||
/// shape per finish.md §"Wire-shared with /retire" — endpoints differ in side-effects only:
|
||||
/// /finish emits per-round-completion + champion bonus and marks the entry champion;
|
||||
/// /retire emits the round-capped consolation. The client renders <c>rewards</c> in the
|
||||
/// post-bracket popup, applies wallet deltas via <c>reward_list</c>, and updates the
|
||||
/// status block via <c>colosseum_status</c>.
|
||||
/// </summary>
|
||||
[MessagePackObject]
|
||||
public sealed class FinishResponse
|
||||
{
|
||||
[JsonPropertyName("rewards")] [Key("rewards")]
|
||||
public List<ColosseumReceivedReward> Rewards { get; set; } = new();
|
||||
|
||||
[JsonPropertyName("reward_list")] [Key("reward_list")]
|
||||
public List<RewardEntryDto> RewardList { get; set; } = new();
|
||||
|
||||
[JsonPropertyName("colosseum_status")] [Key("colosseum_status")]
|
||||
public ColosseumOwnStatus ColosseumStatus { get; set; } = new();
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
using System.Text.Json.Serialization;
|
||||
using MessagePack;
|
||||
using SVSim.EmulatedEntrypoint.Models.Dtos.Common.ArenaTwoPick;
|
||||
|
||||
namespace SVSim.EmulatedEntrypoint.Models.Dtos.Responses.ArenaColosseum;
|
||||
|
||||
/// <summary>
|
||||
/// <c>POST /arena_colosseum/get_candidate_cards</c>. Idempotent draft-resume — server emits
|
||||
/// the current snapshot for the active run plus the pending pair offer. The Common
|
||||
/// <c>DeckInfoDto</c>/<c>CandidatePairDto</c>/<c>ClassInfoDto</c> shapes are shared with
|
||||
/// arena-two-pick and arena-competition per spec.
|
||||
/// </summary>
|
||||
[MessagePackObject]
|
||||
public sealed class GetCandidateCardsResponse
|
||||
{
|
||||
[JsonPropertyName("deck_info")] [Key("deck_info")]
|
||||
public DeckInfoDto DeckInfo { get; set; } = new();
|
||||
|
||||
[JsonPropertyName("candidate_card_list")] [Key("candidate_card_list")]
|
||||
public List<CandidatePairDto> CandidateCardList { get; set; } = new();
|
||||
|
||||
[JsonPropertyName("leader_skin_id")] [Key("leader_skin_id")]
|
||||
public long? LeaderSkinId { get; set; }
|
||||
|
||||
[JsonPropertyName("class_info")] [Key("class_info")]
|
||||
public ClassInfoDto ClassInfo { get; set; } = new();
|
||||
}
|
||||
@@ -0,0 +1,41 @@
|
||||
using System.Text.Json.Serialization;
|
||||
using MessagePack;
|
||||
|
||||
namespace SVSim.EmulatedEntrypoint.Models.Dtos.Responses.ArenaColosseum;
|
||||
|
||||
/// <summary>
|
||||
/// <c>POST /arena_colosseum/get_candidate_classes</c>. Two mutually-exclusive sub-shapes —
|
||||
/// Normal 2-pick emits <c>class_id_1/2/3</c>; Chaos emits <c>chaos_id_1/2/3</c> +
|
||||
/// <c>chaos_info</c>. <c>WhenWritingNull</c> strips the inactive branch so the wire matches
|
||||
/// the spec exactly.
|
||||
/// </summary>
|
||||
[MessagePackObject]
|
||||
public sealed class GetCandidateClassesResponse
|
||||
{
|
||||
[JsonPropertyName("class_id_1")] [Key("class_id_1")]
|
||||
public int? ClassId1 { get; set; }
|
||||
|
||||
[JsonPropertyName("class_id_2")] [Key("class_id_2")]
|
||||
public int? ClassId2 { get; set; }
|
||||
|
||||
[JsonPropertyName("class_id_3")] [Key("class_id_3")]
|
||||
public int? ClassId3 { get; set; }
|
||||
|
||||
[JsonPropertyName("chaos_id_1")] [Key("chaos_id_1")]
|
||||
public int? ChaosId1 { get; set; }
|
||||
|
||||
[JsonPropertyName("chaos_id_2")] [Key("chaos_id_2")]
|
||||
public int? ChaosId2 { get; set; }
|
||||
|
||||
[JsonPropertyName("chaos_id_3")] [Key("chaos_id_3")]
|
||||
public int? ChaosId3 { get; set; }
|
||||
|
||||
[JsonPropertyName("selected_chaos_id")] [Key("selected_chaos_id")]
|
||||
public int? SelectedChaosId { get; set; }
|
||||
|
||||
[JsonPropertyName("selected_class_id")] [Key("selected_class_id")]
|
||||
public int? SelectedClassId { get; set; }
|
||||
|
||||
[JsonPropertyName("selected_leader_skin_id")] [Key("selected_leader_skin_id")]
|
||||
public long? SelectedLeaderSkinId { get; set; }
|
||||
}
|
||||
@@ -1,39 +1,46 @@
|
||||
using System.Text.Json.Serialization;
|
||||
using MessagePack;
|
||||
using SVSim.EmulatedEntrypoint.Models.Dtos.ArenaColosseum;
|
||||
|
||||
namespace SVSim.EmulatedEntrypoint.Models.Dtos.Responses.ArenaColosseum;
|
||||
|
||||
/// <summary>
|
||||
/// Minimum-viable stub for /arena_colosseum/get_fee_info — emits is_colosseum_period:false
|
||||
/// so the client (Wizard/ColosseumEntryInfoTask.cs:99) skips the rest of the parse and the
|
||||
/// home/arena screen renders without 404ing. TODO: implement the full Colosseum entry flow
|
||||
/// when the Colosseum format is brought online.
|
||||
/// <c>POST /arena_colosseum/get_fee_info</c> — pre-entry oracle. Most fields are optional;
|
||||
/// presence drives the lobby state machine on the client side
|
||||
/// (<c>Wizard/ColosseumEntryInfoTask.cs</c>). When no season is active, only
|
||||
/// <see cref="ColosseumInfo"/> + <see cref="ColosseumStatus"/> are emitted (the former with
|
||||
/// <c>is_colosseum_period:false</c>, the latter as <c>{}</c> via WhenWritingNull stripping).
|
||||
/// </summary>
|
||||
[MessagePackObject]
|
||||
public class GetFeeInfoResponseDto
|
||||
{
|
||||
/// <summary>
|
||||
/// Per-viewer Colosseum entry status (rest_entry_num, now_round_id, is_last_day, etc.).
|
||||
/// Empty object — client (ColosseumEntryInfoTask.cs:146) guards with `if (status.Count != 0)`,
|
||||
/// so an empty dict short-circuits cleanly.
|
||||
/// </summary>
|
||||
[JsonPropertyName("colosseum_status")] [Key("colosseum_status")]
|
||||
public ColosseumStatusDto ColosseumStatus { get; set; } = new();
|
||||
|
||||
[JsonPropertyName("colosseum_info")] [Key("colosseum_info")]
|
||||
public ColosseumInfoDto ColosseumInfo { get; set; } = new();
|
||||
}
|
||||
public ColosseumLobbyInfo ColosseumInfo { get; set; } = new();
|
||||
|
||||
[MessagePackObject]
|
||||
public class ColosseumStatusDto { }
|
||||
[JsonPropertyName("colosseum_status")] [Key("colosseum_status")]
|
||||
public ColosseumOwnStatus ColosseumStatus { get; set; } = new();
|
||||
|
||||
[MessagePackObject]
|
||||
public class ColosseumInfoDto
|
||||
{
|
||||
/// <summary>
|
||||
/// false = no Colosseum event running. Client (ColosseumEntryInfoTask.cs:100) gates every
|
||||
/// other field on this — emitting false is what lets us ship an otherwise-empty info block.
|
||||
/// </summary>
|
||||
[JsonPropertyName("is_colosseum_period")] [Key("is_colosseum_period")]
|
||||
public bool IsColosseumPeriod { get; set; } = false;
|
||||
[JsonPropertyName("is_unfinished_entry_exists")] [Key("is_unfinished_entry_exists")]
|
||||
public bool? IsUnfinishedEntryExists { get; set; }
|
||||
|
||||
[JsonPropertyName("is_allowed_free_entry")] [Key("is_allowed_free_entry")]
|
||||
public bool? IsAllowedFreeEntry { get; set; }
|
||||
|
||||
[JsonPropertyName("fee_list")] [Key("fee_list")]
|
||||
public ColosseumFeeList? FeeList { get; set; }
|
||||
|
||||
[JsonPropertyName("deck_format")] [Key("deck_format")]
|
||||
public int? DeckFormat { get; set; }
|
||||
|
||||
[JsonPropertyName("is_able_to_join_round_3")] [Key("is_able_to_join_round_3")]
|
||||
public bool? IsAbleToJoinRound3 { get; set; }
|
||||
|
||||
[JsonPropertyName("is_already_entry_final_round")] [Key("is_already_entry_final_round")]
|
||||
public bool? IsAlreadyEntryFinalRound { get; set; }
|
||||
|
||||
[JsonPropertyName("is_deck_deleted")] [Key("is_deck_deleted")]
|
||||
public bool? IsDeckDeleted { get; set; }
|
||||
|
||||
[JsonPropertyName("two_pick_status")] [Key("two_pick_status")]
|
||||
public int? TwoPickStatus { get; set; }
|
||||
}
|
||||
|
||||
@@ -0,0 +1,61 @@
|
||||
using System.Text.Json.Serialization;
|
||||
using MessagePack;
|
||||
using SVSim.EmulatedEntrypoint.Models.Dtos.ArenaColosseum;
|
||||
|
||||
namespace SVSim.EmulatedEntrypoint.Models.Dtos.Responses.ArenaColosseum;
|
||||
|
||||
/// <summary>
|
||||
/// <c>POST /arena_colosseum/top</c> — lobby state for an in-progress run. When no season is
|
||||
/// active <see cref="ColosseumInfo.IsColosseumPeriod"/> is <c>false</c> and most other
|
||||
/// fields are absent (the client guards on that flag before reading anything else).
|
||||
/// </summary>
|
||||
[MessagePackObject]
|
||||
public class TopResponse
|
||||
{
|
||||
[JsonPropertyName("entry_info")] [Key("entry_info")]
|
||||
public ColosseumEntryRef EntryInfo { get; set; } = new();
|
||||
|
||||
[JsonPropertyName("colosseum_info")] [Key("colosseum_info")]
|
||||
public ColosseumLobbyInfo ColosseumInfo { get; set; } = new();
|
||||
|
||||
[JsonPropertyName("colosseum_status")] [Key("colosseum_status")]
|
||||
public ColosseumOwnStatus ColosseumStatus { get; set; } = new();
|
||||
|
||||
[JsonPropertyName("now_round_id")] [Key("now_round_id")]
|
||||
public int NowRoundId { get; set; }
|
||||
|
||||
[JsonPropertyName("user_deck")] [Key("user_deck")]
|
||||
public List<ColosseumUserDeck> UserDeck { get; set; } = new();
|
||||
|
||||
[JsonPropertyName("max_battle_count")] [Key("max_battle_count")]
|
||||
public int MaxBattleCount { get; set; }
|
||||
|
||||
[JsonPropertyName("is_finish")] [Key("is_finish")]
|
||||
public bool IsFinish { get; set; }
|
||||
|
||||
[JsonPropertyName("final_round_eliminate_count")] [Key("final_round_eliminate_count")]
|
||||
public int FinalRoundEliminateCount { get; set; }
|
||||
|
||||
[JsonPropertyName("end_time")] [Key("end_time")]
|
||||
public string EndTime { get; set; } = "";
|
||||
|
||||
[JsonPropertyName("battle_results")] [Key("battle_results")]
|
||||
public ColosseumBattleResults BattleResults { get; set; } = new();
|
||||
|
||||
[JsonPropertyName("breakthrough_number")] [Key("breakthrough_number")]
|
||||
public int? BreakthroughNumber { get; set; }
|
||||
|
||||
[JsonPropertyName("box_grade_list")] [Key("box_grade_list")]
|
||||
public List<int>? BoxGradeList { get; set; }
|
||||
|
||||
[JsonPropertyName("selected_chaos_id")] [Key("selected_chaos_id")]
|
||||
public int? SelectedChaosId { get; set; }
|
||||
|
||||
/// <summary>ALWAYS emitted, even when 0. <c>WhenWritingNull</c> would strip this otherwise —
|
||||
/// see <c>project_wire_null_policy</c>: client does <c>jsonData["leader_skin_id"].ToInt()</c>
|
||||
/// unguarded, which throws a KeyNotFoundException if absent.</summary>
|
||||
[JsonPropertyName("leader_skin_id")]
|
||||
[JsonIgnore(Condition = JsonIgnoreCondition.Never)]
|
||||
[Key("leader_skin_id")]
|
||||
public long LeaderSkinId { get; set; }
|
||||
}
|
||||
@@ -106,6 +106,9 @@ public class Program
|
||||
builder.Services.AddScoped<IStoryMasterRepository, StoryMasterRepository>();
|
||||
builder.Services.AddScoped<IViewerStoryProgressRepository, ViewerStoryProgressRepository>();
|
||||
builder.Services.AddScoped<IArenaTwoPickRunRepository, ArenaTwoPickRunRepository>();
|
||||
builder.Services.AddScoped<IArenaColosseumRunRepository, ArenaColosseumRunRepository>();
|
||||
builder.Services.AddScoped<SVSim.EmulatedEntrypoint.Services.ArenaColosseum.IColosseumProgressionService,
|
||||
SVSim.EmulatedEntrypoint.Services.ArenaColosseum.ColosseumProgressionService>();
|
||||
builder.Services.AddScoped<IArenaTwoPickCardPoolService, ArenaTwoPickCardPoolService>();
|
||||
builder.Services.AddScoped<IArenaTwoPickService, ArenaTwoPickService>();
|
||||
builder.Services.AddScoped<IMatchContextBuilder, MatchContextBuilder>();
|
||||
@@ -157,6 +160,11 @@ public class Program
|
||||
// (see Shadowverse_Code_2026-05-23/ApiType.cs), so PvpOnly: park forever, no AI fallback.
|
||||
new ModePolicy("rotation_free_battle", PolicyKind.PvpOnly),
|
||||
new ModePolicy("unlimited_free_battle", PolicyKind.PvpOnly),
|
||||
// Colosseum (Grand Prix). Pre-promotion + post-promotion (rank) URLs each map
|
||||
// to their own pair-up mode — the URL IS the signal per do-matching.md, and the
|
||||
// node session has no way to ask the client "which bracket are you in?".
|
||||
new ModePolicy("colosseum_battle", PolicyKind.PvpOnly),
|
||||
new ModePolicy("colosseum_rank_battle", PolicyKind.PvpOnly),
|
||||
}));
|
||||
builder.Services.AddSingleton<IMatchingPairUpService, InProcessPairUp>();
|
||||
// Single resolver shared by every /do_matching family controller. Owns the
|
||||
|
||||
@@ -0,0 +1,69 @@
|
||||
using SVSim.Database.Models;
|
||||
using SVSim.Database.Models.Config;
|
||||
|
||||
namespace SVSim.EmulatedEntrypoint.Services.ArenaColosseum;
|
||||
|
||||
public class ColosseumProgressionService : IColosseumProgressionService
|
||||
{
|
||||
/// <summary>Colosseum-specific node signal — see do-matching.md §matching_state 3008.</summary>
|
||||
public const int PromoteToRankMatchingState = 3008;
|
||||
|
||||
public bool ShouldPromoteToRankMatching(ViewerArenaColosseumRun run, int matchingState) =>
|
||||
matchingState == PromoteToRankMatchingState && !run.IsRankMatching;
|
||||
|
||||
public AdvancementDecision DecideAdvancement(ViewerArenaColosseumRun run, ColosseumRoundsConfig rounds)
|
||||
{
|
||||
var currentRound = rounds.Rounds.FirstOrDefault(r => r.RoundId == run.RoundId);
|
||||
var currentGroup = currentRound?.Groups.FirstOrDefault();
|
||||
var maxRoundId = rounds.Rounds.Count == 0 ? run.RoundId : rounds.Rounds.Max(r => r.RoundId);
|
||||
|
||||
// No matching round config (e.g. content not seeded) — treat current state as terminal
|
||||
// so the controller doesn't loop forever. Champion=false because we can't tell.
|
||||
if (currentGroup is null)
|
||||
{
|
||||
return new AdvancementDecision(run.RoundId, IsBracketEnd: true, IsChampion: false);
|
||||
}
|
||||
|
||||
// Cleared the breakthrough threshold this round.
|
||||
if (run.WinCount >= currentGroup.BreakthroughNumber)
|
||||
{
|
||||
bool isFinal = run.RoundId >= maxRoundId;
|
||||
return new AdvancementDecision(
|
||||
NextRoundId: isFinal ? run.RoundId : run.RoundId + 1,
|
||||
IsBracketEnd: isFinal,
|
||||
IsChampion: isFinal);
|
||||
}
|
||||
|
||||
// Exhausted the per-round battle cap without clearing — bracket ends at current round.
|
||||
if (run.BattleCountThisRound >= currentGroup.MaxBattleCount)
|
||||
{
|
||||
return new AdvancementDecision(run.RoundId, IsBracketEnd: true, IsChampion: false);
|
||||
}
|
||||
|
||||
// Mid-round, still playing.
|
||||
return new AdvancementDecision(run.RoundId, IsBracketEnd: false, IsChampion: false);
|
||||
}
|
||||
|
||||
public IReadOnlyList<ColosseumRoundsConfig.RewardEntry> BuildRetireRewards(
|
||||
ViewerArenaColosseumRun run, ColosseumRoundsConfig rounds)
|
||||
{
|
||||
var round = rounds.Rounds.FirstOrDefault(r => r.RoundId == run.RoundId);
|
||||
return round?.RetireRewards ?? new();
|
||||
}
|
||||
|
||||
public IReadOnlyList<ColosseumRoundsConfig.RewardEntry> BuildFinishRewards(
|
||||
ViewerArenaColosseumRun run, ColosseumRoundsConfig rounds)
|
||||
{
|
||||
var round = rounds.Rounds.FirstOrDefault(r => r.RoundId == run.RoundId);
|
||||
var bundle = new List<ColosseumRoundsConfig.RewardEntry>();
|
||||
if (round is not null)
|
||||
{
|
||||
bundle.AddRange(round.FinishRewards);
|
||||
}
|
||||
if (run.IsChampion)
|
||||
{
|
||||
bundle.AddRange(rounds.ChampionRewards);
|
||||
}
|
||||
return bundle;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,39 @@
|
||||
using SVSim.Database.Enums;
|
||||
using SVSim.Database.Models;
|
||||
using SVSim.Database.Models.Config;
|
||||
|
||||
namespace SVSim.EmulatedEntrypoint.Services.ArenaColosseum;
|
||||
|
||||
/// <summary>
|
||||
/// Pure-logic decisions for the Colosseum bracket lifecycle. Reads a
|
||||
/// <see cref="ViewerArenaColosseumRun"/> + <see cref="ColosseumRoundsConfig"/> snapshot and
|
||||
/// returns advancement / promotion / reward decisions. Side-effectful (debits, grants,
|
||||
/// run-row writes) live on the controllers — this service just computes.
|
||||
/// </summary>
|
||||
public interface IColosseumProgressionService
|
||||
{
|
||||
/// <summary>True when the node signal <c>matching_state == 3008</c> indicates the run
|
||||
/// has been promoted to the ranked bracket and we haven't already flipped the flag.
|
||||
/// Subsequent battle URLs route to <c>colosseum_rank_battle/*</c>.</summary>
|
||||
bool ShouldPromoteToRankMatching(ViewerArenaColosseumRun run, int matchingState);
|
||||
|
||||
/// <summary>Triggered post-match-finish when wins/losses cross thresholds. Returns the
|
||||
/// next round id (or current if no change), whether the bracket has ended, and the
|
||||
/// champion flag for the final-round-cleared case.</summary>
|
||||
AdvancementDecision DecideAdvancement(ViewerArenaColosseumRun run, ColosseumRoundsConfig rounds);
|
||||
|
||||
/// <summary>Bundle to grant on <c>/retire</c>. Reads
|
||||
/// <see cref="ColosseumRoundsConfig.RoundEntry.RetireRewards"/> for the run's
|
||||
/// <see cref="ViewerArenaColosseumRun.RoundId"/>. Empty when no matching round.</summary>
|
||||
IReadOnlyList<ColosseumRoundsConfig.RewardEntry> BuildRetireRewards(
|
||||
ViewerArenaColosseumRun run, ColosseumRoundsConfig rounds);
|
||||
|
||||
/// <summary>Bundle to grant on <c>/finish</c>. Combines the current round's
|
||||
/// <see cref="ColosseumRoundsConfig.RoundEntry.FinishRewards"/> with
|
||||
/// <see cref="ColosseumRoundsConfig.ChampionRewards"/> when the run is a champion.</summary>
|
||||
IReadOnlyList<ColosseumRoundsConfig.RewardEntry> BuildFinishRewards(
|
||||
ViewerArenaColosseumRun run, ColosseumRoundsConfig rounds);
|
||||
}
|
||||
|
||||
/// <summary>Output of <see cref="IColosseumProgressionService.DecideAdvancement"/>.</summary>
|
||||
public sealed record AdvancementDecision(int NextRoundId, bool IsBracketEnd, bool IsChampion);
|
||||
@@ -17,14 +17,28 @@ public class ArenaTwoPickCardPoolService : IArenaTwoPickCardPoolService
|
||||
_db = db; _config = config;
|
||||
}
|
||||
|
||||
public List<CandidatePair> GeneratePickSetsForTurn(int classId, int turn, long startingPairId, IRandom rng)
|
||||
public List<CandidatePair> GeneratePickSetsForTurn(int classId, int turn, long startingPairId, IRandom rng) =>
|
||||
GeneratePickSetsForTurn(classId, turn, startingPairId, rng, poolCardSetIds: null);
|
||||
|
||||
public List<CandidatePair> GeneratePickSetsForTurn(
|
||||
int classId, int turn, long startingPairId, IRandom rng, IReadOnlyList<int>? poolCardSetIds)
|
||||
{
|
||||
var aCfg = _config.Get<ArenaTwoPickConfig>();
|
||||
var cCfg = _config.Get<ChallengeConfig>();
|
||||
|
||||
var setIds = cCfg.PoolCardSetIds is { Count: > 0 } ids
|
||||
? ids
|
||||
: _config.Get<RotationConfig>().RotationCardSetIds ?? new List<int>();
|
||||
// Caller-supplied override wins (e.g. ColosseumSeasonConfig.PoolCardSetIds). Falls
|
||||
// back to ChallengeConfig → RotationConfig per the original TK2 resolution chain.
|
||||
IReadOnlyList<int> setIds;
|
||||
if (poolCardSetIds is { Count: > 0 })
|
||||
{
|
||||
setIds = poolCardSetIds;
|
||||
}
|
||||
else
|
||||
{
|
||||
var cCfg = _config.Get<ChallengeConfig>();
|
||||
setIds = cCfg.PoolCardSetIds is { Count: > 0 } ids
|
||||
? ids
|
||||
: _config.Get<RotationConfig>().RotationCardSetIds ?? new List<int>();
|
||||
}
|
||||
|
||||
var setIdsArr = setIds.ToArray();
|
||||
|
||||
|
||||
@@ -9,4 +9,13 @@ public interface IArenaTwoPickCardPoolService
|
||||
/// (startingPairId, startingPairId+1); set_num = 1, 2; isSelected = false.
|
||||
/// </summary>
|
||||
List<CandidatePair> GeneratePickSetsForTurn(int classId, int turn, long startingPairId, IRandom rng);
|
||||
|
||||
/// <summary>
|
||||
/// Pool-override variant — used by Arena Colosseum's 2-Pick mode, where the draft pool
|
||||
/// comes from the per-season <c>ColosseumSeasonConfig.PoolCardSetIds</c> rather than the
|
||||
/// global <c>ChallengeConfig.PoolCardSetIds</c>. Pass an empty/null list to fall back to
|
||||
/// the default-pool resolution (challenge → rotation).
|
||||
/// </summary>
|
||||
List<CandidatePair> GeneratePickSetsForTurn(
|
||||
int classId, int turn, long startingPairId, IRandom rng, IReadOnlyList<int>? poolCardSetIds);
|
||||
}
|
||||
|
||||
@@ -24,4 +24,13 @@ public interface IMatchContextBuilder
|
||||
/// no deck at that slot.
|
||||
/// </summary>
|
||||
Task<MatchContext> BuildForRankBattleAsync(long viewerId, Format format, int deckNo);
|
||||
|
||||
/// <summary>
|
||||
/// Build a context for an Arena Colosseum bracket match — reads the active
|
||||
/// <c>ViewerArenaColosseumRun</c>'s registered deck slot (single-deck v1) via
|
||||
/// <c>IDeckRepository.GetDeck</c> (NOT viewer-graph traversal per
|
||||
/// <c>project_ef_nav_include_pitfall</c>). Throws when the run is missing or no deck
|
||||
/// has been registered yet.
|
||||
/// </summary>
|
||||
Task<MatchContext> BuildForColosseumAsync(long viewerId);
|
||||
}
|
||||
|
||||
@@ -11,17 +11,20 @@ namespace SVSim.EmulatedEntrypoint.Services;
|
||||
public class MatchContextBuilder : IMatchContextBuilder
|
||||
{
|
||||
private readonly IArenaTwoPickRunRepository _runs;
|
||||
private readonly IArenaColosseumRunRepository _colosseumRuns;
|
||||
private readonly IViewerRepository _viewers;
|
||||
private readonly IDeckRepository _decks;
|
||||
private readonly IGameConfigService _config;
|
||||
|
||||
public MatchContextBuilder(
|
||||
IArenaTwoPickRunRepository runs,
|
||||
IArenaColosseumRunRepository colosseumRuns,
|
||||
IViewerRepository viewers,
|
||||
IDeckRepository decks,
|
||||
IGameConfigService config)
|
||||
{
|
||||
_runs = runs;
|
||||
_colosseumRuns = colosseumRuns;
|
||||
_viewers = viewers;
|
||||
_decks = decks;
|
||||
_config = config;
|
||||
@@ -120,4 +123,58 @@ public class MatchContextBuilder : IMatchContextBuilder
|
||||
IsOfficial: viewer.Info.IsOfficial ? 1 : 0,
|
||||
BattleModeId: BattleModes.TakeTwo);
|
||||
}
|
||||
|
||||
public async Task<MatchContext> BuildForColosseumAsync(long viewerId)
|
||||
{
|
||||
var run = await _colosseumRuns.GetByViewerIdAsync(viewerId)
|
||||
?? throw new InvalidOperationException("arena_colosseum_no_active_run");
|
||||
|
||||
// v1 single-deck slot — Round-3 multi-deck format is deferred per plan.
|
||||
var deckNos = JsonSerializer.Deserialize<List<int>>(run.RegisteredDeckNoListJson) ?? new();
|
||||
if (deckNos.Count == 0)
|
||||
{
|
||||
throw new InvalidOperationException("arena_colosseum_no_deck_registered");
|
||||
}
|
||||
var deckNo = deckNos[0];
|
||||
|
||||
var viewer = await _viewers.LoadForMatchContextAsync(viewerId)
|
||||
?? throw new InvalidOperationException($"viewer {viewerId} not found");
|
||||
|
||||
var deck = await _decks.GetDeck(viewerId, run.DeckFormat, deckNo)
|
||||
?? throw new InvalidOperationException(
|
||||
$"viewer {viewerId} has no deck #{deckNo} for format {run.DeckFormat}");
|
||||
|
||||
var defaults = _config.Get<DefaultLoadoutConfig>();
|
||||
var emblemId = viewer.Info.SelectedEmblem.Id != 0
|
||||
? viewer.Info.SelectedEmblem.Id.ToString()
|
||||
: defaults.EmblemId.ToString();
|
||||
var degreeId = viewer.Info.SelectedDegree.Id != 0
|
||||
? viewer.Info.SelectedDegree.Id.ToString()
|
||||
: defaults.DegreeId.ToString();
|
||||
var charaId = run.LeaderSkinId != 0
|
||||
? run.LeaderSkinId.ToString()
|
||||
: deck.LeaderSkin.Id != 0
|
||||
? deck.LeaderSkin.Id.ToString()
|
||||
: deck.Class.Id.ToString();
|
||||
var sleeveId = deck.Sleeve.Id != 0
|
||||
? deck.Sleeve.Id.ToString()
|
||||
: defaults.SleeveId.ToString();
|
||||
var deckCardIds = deck.Cards
|
||||
.SelectMany(c => Enumerable.Repeat(c.Card.Id, c.Count))
|
||||
.ToList();
|
||||
|
||||
return new MatchContext(
|
||||
SelfDeckCardIds: deckCardIds,
|
||||
ClassId: (CardClass)deck.Class.Id,
|
||||
CharaId: charaId,
|
||||
CardMasterName: "card_master_node_10015",
|
||||
CountryCode: viewer.Info.CountryCode ?? string.Empty,
|
||||
UserName: viewer.DisplayName,
|
||||
SleeveId: sleeveId,
|
||||
EmblemId: emblemId,
|
||||
DegreeId: degreeId,
|
||||
FieldId: 43,
|
||||
IsOfficial: viewer.Info.IsOfficial ? 1 : 0,
|
||||
BattleModeId: BattleModes.TakeTwo);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,200 @@
|
||||
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>
|
||||
/// Phase 3 curated-deck coverage — the 3 list URLs and 3 register URLs share one
|
||||
/// generic dispatcher; the same scenarios are parameterized across HOF / WindFall / Avatar
|
||||
/// to lock per-pool isolation.
|
||||
/// </summary>
|
||||
public class ArenaColosseumControllerCuratedDeckTests
|
||||
{
|
||||
private static readonly object Envelope =
|
||||
new { viewer_id = "0", steam_id = 0, steam_session_ticket = "" };
|
||||
|
||||
public enum Pool { Hof, WindFall, Avatar }
|
||||
|
||||
private static string ListUrl(Pool pool) => pool switch
|
||||
{
|
||||
Pool.Hof => "/arena_colosseum/get_hof_deck_list",
|
||||
Pool.WindFall => "/arena_colosseum/get_windfall_deck_list",
|
||||
Pool.Avatar => "/arena_colosseum/get_avatar_deck_list",
|
||||
_ => throw new ArgumentOutOfRangeException(),
|
||||
};
|
||||
|
||||
private static string RegisterUrl(Pool pool) => pool switch
|
||||
{
|
||||
Pool.Hof => "/arena_colosseum/register_hof_deck",
|
||||
Pool.WindFall => "/arena_colosseum/register_windfall_deck",
|
||||
Pool.Avatar => "/arena_colosseum/register_avatar_deck",
|
||||
_ => throw new ArgumentOutOfRangeException(),
|
||||
};
|
||||
|
||||
private static async Task SeedCuratedDecksAsync(SVSimTestFactory factory, Pool pool, params int[] deckNos)
|
||||
{
|
||||
using var scope = factory.Services.CreateScope();
|
||||
var db = scope.ServiceProvider.GetRequiredService<SVSimDbContext>();
|
||||
foreach (var no in deckNos)
|
||||
{
|
||||
switch (pool)
|
||||
{
|
||||
case Pool.Hof:
|
||||
db.ColosseumHofDecks.Add(new ColosseumHofDeck
|
||||
{
|
||||
DeckNo = no, ClassId = 1, DisplayOrder = no,
|
||||
CardListJson = "[101,102,103]", SleeveId = 3000011,
|
||||
});
|
||||
break;
|
||||
case Pool.WindFall:
|
||||
db.ColosseumWindFallDecks.Add(new ColosseumWindFallDeck
|
||||
{
|
||||
DeckNo = no, ClassId = 2, DisplayOrder = no,
|
||||
CardListJson = "[201,202,203]",
|
||||
});
|
||||
break;
|
||||
case Pool.Avatar:
|
||||
db.ColosseumAvatarDecks.Add(new ColosseumAvatarDeck
|
||||
{
|
||||
DeckNo = no, ClassId = 3, DisplayOrder = no,
|
||||
CardListJson = "[301,302,303]", LeaderSkinId = 70000,
|
||||
});
|
||||
break;
|
||||
}
|
||||
}
|
||||
await db.SaveChangesAsync();
|
||||
}
|
||||
|
||||
private static async Task SeedRunAsync(SVSimTestFactory factory, long viewerId)
|
||||
{
|
||||
using var scope = factory.Services.CreateScope();
|
||||
var db = scope.ServiceProvider.GetRequiredService<SVSimDbContext>();
|
||||
db.ViewerArenaColosseumRuns.Add(new ViewerArenaColosseumRun
|
||||
{
|
||||
ViewerId = viewerId,
|
||||
EntryId = 9999,
|
||||
SeasonId = 7,
|
||||
RoundId = 1,
|
||||
DeckFormat = Format.Hof,
|
||||
});
|
||||
await db.SaveChangesAsync();
|
||||
}
|
||||
|
||||
[Test]
|
||||
[TestCase(Pool.Hof)]
|
||||
[TestCase(Pool.WindFall)]
|
||||
[TestCase(Pool.Avatar)]
|
||||
public async Task GetDeckList_returns_seeded_entries_as_bare_array(Pool pool)
|
||||
{
|
||||
using var factory = new SVSimTestFactory();
|
||||
await SeedCuratedDecksAsync(factory, pool, 1001, 1002);
|
||||
var vid = await factory.SeedViewerAsync();
|
||||
using var client = factory.CreateAuthenticatedClient(vid);
|
||||
|
||||
var resp = await client.PostAsync(ListUrl(pool), 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.ValueKind, Is.EqualTo(JsonValueKind.Array),
|
||||
$"{pool}: spec requires a BARE array at data — client iterates without a wrapper");
|
||||
Assert.That(doc.RootElement.GetArrayLength(), Is.EqualTo(2));
|
||||
Assert.That(doc.RootElement[0].GetProperty("deck_id").GetInt32(), Is.EqualTo(1001));
|
||||
}
|
||||
|
||||
[Test]
|
||||
[TestCase(Pool.Hof)]
|
||||
[TestCase(Pool.WindFall)]
|
||||
[TestCase(Pool.Avatar)]
|
||||
public async Task RegisterDeck_round_trips_deck_no_list(Pool pool)
|
||||
{
|
||||
using var factory = new SVSimTestFactory();
|
||||
await SeedCuratedDecksAsync(factory, pool, 1001);
|
||||
var vid = await factory.SeedViewerAsync();
|
||||
await SeedRunAsync(factory, vid);
|
||||
using var client = factory.CreateAuthenticatedClient(vid);
|
||||
|
||||
var resp = await client.PostAsync(RegisterUrl(pool),
|
||||
JsonContent.Create(new { deck_no_list = "[1001]", viewer_id = "0", steam_id = 0, steam_session_ticket = "" }));
|
||||
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.RegisteredDeckNoListJson, Is.EqualTo("[1001]"));
|
||||
}
|
||||
|
||||
[Test]
|
||||
[TestCase(Pool.Hof)]
|
||||
[TestCase(Pool.WindFall)]
|
||||
[TestCase(Pool.Avatar)]
|
||||
public async Task RegisterDeck_rejects_unknown_deck_no(Pool pool)
|
||||
{
|
||||
using var factory = new SVSimTestFactory();
|
||||
await SeedCuratedDecksAsync(factory, pool, 1001);
|
||||
var vid = await factory.SeedViewerAsync();
|
||||
await SeedRunAsync(factory, vid);
|
||||
using var client = factory.CreateAuthenticatedClient(vid);
|
||||
|
||||
var resp = await client.PostAsync(RegisterUrl(pool),
|
||||
JsonContent.Create(new { deck_no_list = "[9999]", viewer_id = "0", steam_id = 0, steam_session_ticket = "" }));
|
||||
Assert.That(resp.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest));
|
||||
|
||||
var body = await resp.Content.ReadAsStringAsync();
|
||||
StringAssert.Contains("deck_not_found", body);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public async Task Cross_pool_register_rejected_hof_against_windfall()
|
||||
{
|
||||
using var factory = new SVSimTestFactory();
|
||||
// 1001 lives in HOF only.
|
||||
await SeedCuratedDecksAsync(factory, Pool.Hof, 1001);
|
||||
var vid = await factory.SeedViewerAsync();
|
||||
await SeedRunAsync(factory, vid);
|
||||
using var client = factory.CreateAuthenticatedClient(vid);
|
||||
|
||||
// Register against WindFall — the HOF deck_no should not resolve.
|
||||
var resp = await client.PostAsync(RegisterUrl(Pool.WindFall),
|
||||
JsonContent.Create(new { deck_no_list = "[1001]", viewer_id = "0", steam_id = 0, steam_session_ticket = "" }));
|
||||
Assert.That(resp.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest));
|
||||
|
||||
var body = await resp.Content.ReadAsStringAsync();
|
||||
StringAssert.Contains("deck_not_found", body);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public async Task RegisterDeck_clears_is_published_flag_on_swap_from_constructed()
|
||||
{
|
||||
using var factory = new SVSimTestFactory();
|
||||
await SeedCuratedDecksAsync(factory, Pool.Hof, 1001);
|
||||
var vid = await factory.SeedViewerAsync();
|
||||
await SeedRunAsync(factory, vid);
|
||||
|
||||
// Simulate the viewer having previously registered a constructed deck with is_published=true.
|
||||
using (var scope = factory.Services.CreateScope())
|
||||
{
|
||||
var db = scope.ServiceProvider.GetRequiredService<SVSimDbContext>();
|
||||
var run = await db.ViewerArenaColosseumRuns.FirstAsync(r => r.ViewerId == vid);
|
||||
run.IsPublished = true;
|
||||
await db.SaveChangesAsync();
|
||||
}
|
||||
|
||||
using var client = factory.CreateAuthenticatedClient(vid);
|
||||
await client.PostAsync(RegisterUrl(Pool.Hof),
|
||||
JsonContent.Create(new { deck_no_list = "[1001]", viewer_id = "0", steam_id = 0, steam_session_ticket = "" }));
|
||||
|
||||
using var verifyScope = factory.Services.CreateScope();
|
||||
var verifyDb = verifyScope.ServiceProvider.GetRequiredService<SVSimDbContext>();
|
||||
var verifyRun = await verifyDb.ViewerArenaColosseumRuns.FirstAsync(r => r.ViewerId == vid);
|
||||
Assert.That(verifyRun.IsPublished, Is.False,
|
||||
"curated register has no is_published wire field — server clears it to keep state consistent");
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,221 @@
|
||||
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>
|
||||
/// Phase 3 2-Pick draft coverage on /arena_colosseum/{get_candidate_classes, class_choose,
|
||||
/// get_candidate_cards, card_choose}. Mirrors the existing ArenaTwoPick tests, with the
|
||||
/// pool override sourced from <c>ColosseumSeasonConfig.PoolCardSetIds</c> instead of
|
||||
/// <c>ChallengeConfig.PoolCardSetIds</c>.
|
||||
/// </summary>
|
||||
public class ArenaColosseumControllerDraftTests
|
||||
{
|
||||
private static readonly object Envelope =
|
||||
new { viewer_id = "0", steam_id = 0, steam_session_ticket = "" };
|
||||
|
||||
private static async Task ActivateChaosCapableSeasonAsync(SVSimTestFactory factory)
|
||||
{
|
||||
using var scope = factory.Services.CreateScope();
|
||||
var db = scope.ServiceProvider.GetRequiredService<SVSimDbContext>();
|
||||
|
||||
// Pool override: the test card-set's id (10001) — see SVSimTestFactory.SeedMinimalCardSet.
|
||||
var seasonJson = JsonSerializer.Serialize(new
|
||||
{
|
||||
IsColosseumPeriod = true,
|
||||
SeasonId = 7,
|
||||
DeckFormat = (int)Format.TwoPick,
|
||||
IsNormalTwoPick = true,
|
||||
PoolCardSetIds = new[] { 10001 },
|
||||
});
|
||||
await UpsertConfigAsync(db, "ColosseumSeason", seasonJson);
|
||||
}
|
||||
|
||||
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)
|
||||
{
|
||||
using var scope = factory.Services.CreateScope();
|
||||
var db = scope.ServiceProvider.GetRequiredService<SVSimDbContext>();
|
||||
db.ViewerArenaColosseumRuns.Add(new ViewerArenaColosseumRun
|
||||
{
|
||||
ViewerId = viewerId,
|
||||
EntryId = 9999,
|
||||
SeasonId = 7,
|
||||
RoundId = 1,
|
||||
DeckFormat = Format.TwoPick,
|
||||
});
|
||||
|
||||
// The pool service filters cards by `CollectionInfo != null` — the minimal SVSimTestFactory
|
||||
// seed lacks that. Stamp it on every card in the test set so the pool service can
|
||||
// actually emit a candidate pair for any class.
|
||||
var cards = await db.Cards.ToListAsync();
|
||||
foreach (var c in cards)
|
||||
{
|
||||
c.CollectionInfo = new CardCollectionInfo { CraftCost = 40, DustReward = 10 };
|
||||
}
|
||||
await db.SaveChangesAsync();
|
||||
}
|
||||
|
||||
[Test]
|
||||
public async Task GetCandidateClasses_seeds_three_classes_on_run()
|
||||
{
|
||||
using var factory = new SVSimTestFactory();
|
||||
await ActivateChaosCapableSeasonAsync(factory);
|
||||
var vid = await factory.SeedViewerAsync();
|
||||
await SeedRunAsync(factory, vid);
|
||||
using var client = factory.CreateAuthenticatedClient(vid);
|
||||
|
||||
var resp = await client.PostAsync("/arena_colosseum/get_candidate_classes",
|
||||
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("class_id_1").GetInt32(), Is.GreaterThan(0));
|
||||
Assert.That(root.GetProperty("class_id_2").GetInt32(), Is.GreaterThan(0));
|
||||
Assert.That(root.GetProperty("class_id_3").GetInt32(), Is.GreaterThan(0));
|
||||
|
||||
using var verifyScope = factory.Services.CreateScope();
|
||||
var db = verifyScope.ServiceProvider.GetRequiredService<SVSimDbContext>();
|
||||
var run = await db.ViewerArenaColosseumRuns.FirstAsync(r => r.ViewerId == vid);
|
||||
var stored = JsonSerializer.Deserialize<List<int>>(run.CandidateClassIdsJson)!;
|
||||
Assert.That(stored.Count, Is.EqualTo(3),
|
||||
"the slate must be persisted onto the run so /class_choose can validate against it");
|
||||
}
|
||||
|
||||
[Test]
|
||||
public async Task ClassChoose_rejects_class_not_in_slate()
|
||||
{
|
||||
using var factory = new SVSimTestFactory();
|
||||
await ActivateChaosCapableSeasonAsync(factory);
|
||||
var vid = await factory.SeedViewerAsync();
|
||||
await SeedRunAsync(factory, vid);
|
||||
|
||||
// Force a known slate.
|
||||
using (var scope = factory.Services.CreateScope())
|
||||
{
|
||||
var db = scope.ServiceProvider.GetRequiredService<SVSimDbContext>();
|
||||
var run = await db.ViewerArenaColosseumRuns.FirstAsync(r => r.ViewerId == vid);
|
||||
run.CandidateClassIdsJson = "[1,2,3]";
|
||||
await db.SaveChangesAsync();
|
||||
}
|
||||
|
||||
using var client = factory.CreateAuthenticatedClient(vid);
|
||||
var resp = await client.PostAsync("/arena_colosseum/class_choose",
|
||||
JsonContent.Create(new { class_id = 8, viewer_id = "0", steam_id = 0, steam_session_ticket = "" }));
|
||||
Assert.That(resp.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest));
|
||||
|
||||
var body = await resp.Content.ReadAsStringAsync();
|
||||
StringAssert.Contains("class_not_offered", body);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public async Task ClassChoose_normal_advances_run_to_turn_1_with_a_pair_offered()
|
||||
{
|
||||
using var factory = new SVSimTestFactory();
|
||||
await ActivateChaosCapableSeasonAsync(factory);
|
||||
var vid = await factory.SeedViewerAsync();
|
||||
await SeedRunAsync(factory, vid);
|
||||
using (var scope = factory.Services.CreateScope())
|
||||
{
|
||||
var db = scope.ServiceProvider.GetRequiredService<SVSimDbContext>();
|
||||
var run = await db.ViewerArenaColosseumRuns.FirstAsync(r => r.ViewerId == vid);
|
||||
run.CandidateClassIdsJson = "[1,2,3]";
|
||||
await db.SaveChangesAsync();
|
||||
}
|
||||
|
||||
using var client = factory.CreateAuthenticatedClient(vid);
|
||||
var resp = await client.PostAsync("/arena_colosseum/class_choose",
|
||||
JsonContent.Create(new { class_id = 1, viewer_id = "0", steam_id = 0, steam_session_ticket = "" }));
|
||||
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("class_info").GetProperty("selected_class_id").GetString(), Is.EqualTo("1"),
|
||||
"selected_class_id is wire-stringified per existing TwoPick convention");
|
||||
Assert.That(root.GetProperty("candidate_card_list").GetArrayLength(), Is.EqualTo(2),
|
||||
"the pool service emits exactly 2 candidate pairs per turn");
|
||||
|
||||
using var verifyScope = factory.Services.CreateScope();
|
||||
var verifyDb = verifyScope.ServiceProvider.GetRequiredService<SVSimDbContext>();
|
||||
var verifyRun = await verifyDb.ViewerArenaColosseumRuns.FirstAsync(r => r.ViewerId == vid);
|
||||
Assert.That(verifyRun.ClassId, Is.EqualTo(1));
|
||||
Assert.That(verifyRun.SelectTurn, Is.EqualTo(1));
|
||||
}
|
||||
|
||||
[Test]
|
||||
public async Task CardChoose_appends_to_selected_cards_and_advances_turn()
|
||||
{
|
||||
using var factory = new SVSimTestFactory();
|
||||
await ActivateChaosCapableSeasonAsync(factory);
|
||||
var vid = await factory.SeedViewerAsync();
|
||||
await SeedRunAsync(factory, vid);
|
||||
using (var scope = factory.Services.CreateScope())
|
||||
{
|
||||
var db = scope.ServiceProvider.GetRequiredService<SVSimDbContext>();
|
||||
var run = await db.ViewerArenaColosseumRuns.FirstAsync(r => r.ViewerId == vid);
|
||||
run.CandidateClassIdsJson = "[1,2,3]";
|
||||
await db.SaveChangesAsync();
|
||||
}
|
||||
|
||||
using var client = factory.CreateAuthenticatedClient(vid);
|
||||
// Drive /class_choose to populate the pending pair.
|
||||
var classResp = await client.PostAsync("/arena_colosseum/class_choose",
|
||||
JsonContent.Create(new { class_id = 1, viewer_id = "0", steam_id = 0, steam_session_ticket = "" }));
|
||||
var classBody = await classResp.Content.ReadAsStringAsync();
|
||||
using var classDoc = JsonDocument.Parse(classBody);
|
||||
long firstPairId = long.Parse(classDoc.RootElement.GetProperty("candidate_card_list")[0].GetProperty("id").GetString()!);
|
||||
|
||||
var cardResp = await client.PostAsync("/arena_colosseum/card_choose",
|
||||
JsonContent.Create(new { selected_id = firstPairId, viewer_id = "0", steam_id = 0, steam_session_ticket = "" }));
|
||||
Assert.That(cardResp.StatusCode, Is.EqualTo(HttpStatusCode.OK));
|
||||
|
||||
using var verifyScope = factory.Services.CreateScope();
|
||||
var verifyDb = verifyScope.ServiceProvider.GetRequiredService<SVSimDbContext>();
|
||||
var verifyRun = await verifyDb.ViewerArenaColosseumRuns.FirstAsync(r => r.ViewerId == vid);
|
||||
var picks = JsonSerializer.Deserialize<List<long>>(verifyRun.SelectedCardIdsJson)!;
|
||||
Assert.That(picks.Count, Is.EqualTo(2),
|
||||
"first card_choose appends both cards from the picked pair");
|
||||
Assert.That(verifyRun.SelectTurn, Is.EqualTo(2));
|
||||
}
|
||||
|
||||
[Test]
|
||||
public async Task ClassChoose_chaos_branch_stores_chaos_id_on_run()
|
||||
{
|
||||
using var factory = new SVSimTestFactory();
|
||||
await ActivateChaosCapableSeasonAsync(factory);
|
||||
var vid = await factory.SeedViewerAsync();
|
||||
await SeedRunAsync(factory, vid);
|
||||
|
||||
using var client = factory.CreateAuthenticatedClient(vid);
|
||||
var resp = await client.PostAsync("/arena_colosseum/class_choose",
|
||||
JsonContent.Create(new { chaos_id = 101, viewer_id = "0", steam_id = 0, steam_session_ticket = "" }));
|
||||
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.ChaosId, Is.EqualTo(101));
|
||||
Assert.That(run.ClassId, Is.GreaterThan(0),
|
||||
"chaos id must resolve to a non-zero class for the pool service");
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,238 @@
|
||||
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>
|
||||
/// Phase 1 entry + register-deck coverage. Activating the Colosseum season requires writing
|
||||
/// a <c>ColosseumSeason</c> + <c>ColosseumRounds</c> row to <c>GameConfigs</c> — see
|
||||
/// <see cref="ActivateSeasonAsync"/> for the test-only equivalent of the admin flow.
|
||||
/// </summary>
|
||||
public class ArenaColosseumControllerEntryTests
|
||||
{
|
||||
private static readonly object Envelope =
|
||||
new { viewer_id = "0", steam_id = 0, steam_session_ticket = "" };
|
||||
|
||||
private static async Task ActivateSeasonAsync(SVSimTestFactory factory, int crystalCost = 300)
|
||||
{
|
||||
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,
|
||||
CrystalCost = crystalCost,
|
||||
RupyCost = 3000,
|
||||
TicketCost = 1,
|
||||
IsAllowedFreeEntry = false,
|
||||
});
|
||||
await UpsertConfigAsync(db, "ColosseumSeason", seasonJson);
|
||||
|
||||
var roundsJson = JsonSerializer.Serialize(new
|
||||
{
|
||||
Rounds = new[]
|
||||
{
|
||||
new
|
||||
{
|
||||
RoundId = 1,
|
||||
StartTime = DateTime.UtcNow.AddDays(-1),
|
||||
EndTime = DateTime.UtcNow.AddDays(7),
|
||||
Groups = new[]
|
||||
{
|
||||
new { Group = "", MaxBattleCount = 5, BreakthroughNumber = 4, EntryNumber = 100_000 },
|
||||
},
|
||||
},
|
||||
},
|
||||
});
|
||||
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 SetViewerCurrencyAsync(SVSimTestFactory factory, long viewerId, ulong crystals = 0, ulong rupees = 0)
|
||||
{
|
||||
using var scope = factory.Services.CreateScope();
|
||||
var db = scope.ServiceProvider.GetRequiredService<SVSimDbContext>();
|
||||
var viewer = await db.Viewers.FirstAsync(v => v.Id == viewerId);
|
||||
viewer.Currency.Crystals = crystals;
|
||||
viewer.Currency.Rupees = rupees;
|
||||
await db.SaveChangesAsync();
|
||||
}
|
||||
|
||||
[Test]
|
||||
public async Task Entry_debits_crystal_and_creates_run()
|
||||
{
|
||||
using var factory = new SVSimTestFactory();
|
||||
await ActivateSeasonAsync(factory, crystalCost: 300);
|
||||
var viewerId = await factory.SeedViewerAsync();
|
||||
await SetViewerCurrencyAsync(factory, viewerId, crystals: 1000);
|
||||
using var client = factory.CreateAuthenticatedClient(viewerId);
|
||||
|
||||
var resp = await client.PostAsync("/arena_colosseum/entry",
|
||||
JsonContent.Create(new { consume_item_type = 1, now_round_id = 1, viewer_id = "0", steam_id = 0, steam_session_ticket = "" }));
|
||||
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("reward_list").GetArrayLength(), Is.EqualTo(1));
|
||||
Assert.That(root.GetProperty("reward_list")[0].GetProperty("reward_type").GetInt32(), Is.EqualTo((int)UserGoodsType.Crystal));
|
||||
Assert.That(root.GetProperty("entry_info").GetProperty("deck_format").GetInt32(), Is.EqualTo((int)Format.Rotation));
|
||||
|
||||
using var scope = factory.Services.CreateScope();
|
||||
var db = scope.ServiceProvider.GetRequiredService<SVSimDbContext>();
|
||||
var run = await db.ViewerArenaColosseumRuns.FirstOrDefaultAsync(r => r.ViewerId == viewerId);
|
||||
Assert.That(run, Is.Not.Null);
|
||||
Assert.That(run!.SeasonId, Is.EqualTo(42));
|
||||
Assert.That(run.MaxBattleCountThisRound, Is.EqualTo(5));
|
||||
Assert.That(run.BreakthroughNumberThisRound, Is.EqualTo(4));
|
||||
|
||||
var viewerAfter = await db.Viewers.FirstAsync(v => v.Id == viewerId);
|
||||
Assert.That(viewerAfter.Currency.Crystals, Is.EqualTo(700UL), "1000 - 300 cost");
|
||||
}
|
||||
|
||||
[Test]
|
||||
public async Task Entry_rejects_when_season_inactive()
|
||||
{
|
||||
using var factory = new SVSimTestFactory();
|
||||
var viewerId = await factory.SeedViewerAsync();
|
||||
using var client = factory.CreateAuthenticatedClient(viewerId);
|
||||
|
||||
var resp = await client.PostAsync("/arena_colosseum/entry",
|
||||
JsonContent.Create(new { consume_item_type = 1, now_round_id = 1, viewer_id = "0", steam_id = 0, steam_session_ticket = "" }));
|
||||
Assert.That(resp.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest));
|
||||
|
||||
var body = await resp.Content.ReadAsStringAsync();
|
||||
StringAssert.Contains("colosseum_period_closed", body);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public async Task Entry_rejects_when_already_in_run()
|
||||
{
|
||||
using var factory = new SVSimTestFactory();
|
||||
await ActivateSeasonAsync(factory);
|
||||
var viewerId = await factory.SeedViewerAsync();
|
||||
await SetViewerCurrencyAsync(factory, viewerId, crystals: 1000);
|
||||
|
||||
using (var scope = factory.Services.CreateScope())
|
||||
{
|
||||
var db = scope.ServiceProvider.GetRequiredService<SVSimDbContext>();
|
||||
db.ViewerArenaColosseumRuns.Add(new ViewerArenaColosseumRun
|
||||
{
|
||||
ViewerId = viewerId,
|
||||
EntryId = 999,
|
||||
SeasonId = 42,
|
||||
RoundId = 1,
|
||||
DeckFormat = Format.Rotation,
|
||||
});
|
||||
await db.SaveChangesAsync();
|
||||
}
|
||||
|
||||
using var client = factory.CreateAuthenticatedClient(viewerId);
|
||||
var resp = await client.PostAsync("/arena_colosseum/entry",
|
||||
JsonContent.Create(new { consume_item_type = 1, now_round_id = 1, viewer_id = "0", steam_id = 0, steam_session_ticket = "" }));
|
||||
Assert.That(resp.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest));
|
||||
|
||||
var body = await resp.Content.ReadAsStringAsync();
|
||||
StringAssert.Contains("arena_colosseum_already_in_progress", body);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public async Task Entry_rejects_when_now_round_id_mismatch()
|
||||
{
|
||||
using var factory = new SVSimTestFactory();
|
||||
await ActivateSeasonAsync(factory);
|
||||
var viewerId = await factory.SeedViewerAsync();
|
||||
await SetViewerCurrencyAsync(factory, viewerId, crystals: 1000);
|
||||
using var client = factory.CreateAuthenticatedClient(viewerId);
|
||||
|
||||
var resp = await client.PostAsync("/arena_colosseum/entry",
|
||||
JsonContent.Create(new { consume_item_type = 1, now_round_id = 7, viewer_id = "0", steam_id = 0, steam_session_ticket = "" }));
|
||||
Assert.That(resp.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest));
|
||||
|
||||
var body = await resp.Content.ReadAsStringAsync();
|
||||
StringAssert.Contains("now_round_id_mismatch", body);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public async Task RegisterDeck_round_trips_deck_no_list()
|
||||
{
|
||||
using var factory = new SVSimTestFactory();
|
||||
await ActivateSeasonAsync(factory);
|
||||
var viewerId = await factory.SeedViewerAsync();
|
||||
await factory.SeedDeckAsync(viewerId, Format.Rotation, number: 3, name: "Colo Deck 3");
|
||||
|
||||
using (var scope = factory.Services.CreateScope())
|
||||
{
|
||||
var db = scope.ServiceProvider.GetRequiredService<SVSimDbContext>();
|
||||
db.ViewerArenaColosseumRuns.Add(new ViewerArenaColosseumRun
|
||||
{
|
||||
ViewerId = viewerId,
|
||||
EntryId = 999,
|
||||
SeasonId = 42,
|
||||
RoundId = 1,
|
||||
DeckFormat = Format.Rotation,
|
||||
});
|
||||
await db.SaveChangesAsync();
|
||||
}
|
||||
|
||||
using var client = factory.CreateAuthenticatedClient(viewerId);
|
||||
var resp = await client.PostAsync("/arena_colosseum/register_deck",
|
||||
JsonContent.Create(new { deck_no_list = "[3]", is_published = true, viewer_id = "0", steam_id = 0, steam_session_ticket = "" }));
|
||||
Assert.That(resp.StatusCode, Is.EqualTo(HttpStatusCode.OK));
|
||||
|
||||
using var verifyScope = factory.Services.CreateScope();
|
||||
var verifyDb = verifyScope.ServiceProvider.GetRequiredService<SVSimDbContext>();
|
||||
var run = await verifyDb.ViewerArenaColosseumRuns.FirstAsync(r => r.ViewerId == viewerId);
|
||||
Assert.That(run.RegisteredDeckNoListJson, Is.EqualTo("[3]"));
|
||||
Assert.That(run.IsPublished, Is.True);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public async Task RegisterDeck_rejects_when_deck_not_found()
|
||||
{
|
||||
using var factory = new SVSimTestFactory();
|
||||
await ActivateSeasonAsync(factory);
|
||||
var viewerId = await factory.SeedViewerAsync();
|
||||
|
||||
using (var scope = factory.Services.CreateScope())
|
||||
{
|
||||
var db = scope.ServiceProvider.GetRequiredService<SVSimDbContext>();
|
||||
db.ViewerArenaColosseumRuns.Add(new ViewerArenaColosseumRun
|
||||
{
|
||||
ViewerId = viewerId,
|
||||
EntryId = 999,
|
||||
SeasonId = 42,
|
||||
RoundId = 1,
|
||||
DeckFormat = Format.Rotation,
|
||||
});
|
||||
await db.SaveChangesAsync();
|
||||
}
|
||||
|
||||
using var client = factory.CreateAuthenticatedClient(viewerId);
|
||||
var resp = await client.PostAsync("/arena_colosseum/register_deck",
|
||||
JsonContent.Create(new { deck_no_list = "[99]", is_published = false, viewer_id = "0", steam_id = 0, steam_session_ticket = "" }));
|
||||
Assert.That(resp.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest));
|
||||
|
||||
var body = await resp.Content.ReadAsStringAsync();
|
||||
StringAssert.Contains("deck_not_found", body);
|
||||
}
|
||||
}
|
||||
138
SVSim.UnitTests/Controllers/ArenaColosseumControllerTests.cs
Normal file
138
SVSim.UnitTests/Controllers/ArenaColosseumControllerTests.cs
Normal file
@@ -0,0 +1,138 @@
|
||||
using System.Net;
|
||||
using System.Net.Http.Json;
|
||||
using System.Text.Json;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using SVSim.Database;
|
||||
using SVSim.Database.Enums;
|
||||
using SVSim.Database.Models;
|
||||
using SVSim.UnitTests.Infrastructure;
|
||||
|
||||
namespace SVSim.UnitTests.Controllers;
|
||||
|
||||
/// <summary>
|
||||
/// Phase 1 lobby read coverage: /arena_colosseum/{top, get_fee_info, event_info}.
|
||||
/// Defaults (no <c>ColosseumSeason</c> override) must render an empty "no event scheduled"
|
||||
/// payload — flipping the season on is an admin operation.
|
||||
/// </summary>
|
||||
public class ArenaColosseumControllerTests
|
||||
{
|
||||
private static readonly object Envelope =
|
||||
new { viewer_id = "0", steam_id = 0, steam_session_ticket = "" };
|
||||
|
||||
[Test]
|
||||
public async Task Top_unauthenticated_returns_401()
|
||||
{
|
||||
using var factory = new SVSimTestFactory();
|
||||
using var client = factory.CreateClient();
|
||||
var resp = await client.PostAsync("/arena_colosseum/top", JsonContent.Create(Envelope));
|
||||
Assert.That(resp.StatusCode, Is.EqualTo(HttpStatusCode.Unauthorized));
|
||||
}
|
||||
|
||||
[Test]
|
||||
public async Task Top_returns_no_period_when_no_season_active()
|
||||
{
|
||||
using var factory = new SVSimTestFactory();
|
||||
var viewerId = await factory.SeedViewerAsync();
|
||||
using var client = factory.CreateAuthenticatedClient(viewerId);
|
||||
|
||||
var resp = await client.PostAsync("/arena_colosseum/top", JsonContent.Create(Envelope));
|
||||
Assert.That(resp.StatusCode, Is.EqualTo(HttpStatusCode.OK));
|
||||
|
||||
var body = await resp.Content.ReadAsStringAsync();
|
||||
StringAssert.Contains("\"is_colosseum_period\":false", body);
|
||||
// leader_skin_id must always be emitted (even when 0) per project_wire_null_policy.
|
||||
StringAssert.Contains("\"leader_skin_id\":0", body);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public async Task GetFeeInfo_returns_no_period_when_no_season_active()
|
||||
{
|
||||
using var factory = new SVSimTestFactory();
|
||||
var viewerId = await factory.SeedViewerAsync();
|
||||
using var client = factory.CreateAuthenticatedClient(viewerId);
|
||||
|
||||
var resp = await client.PostAsync("/arena_colosseum/get_fee_info", JsonContent.Create(Envelope));
|
||||
Assert.That(resp.StatusCode, Is.EqualTo(HttpStatusCode.OK));
|
||||
|
||||
var body = await resp.Content.ReadAsStringAsync();
|
||||
StringAssert.Contains("\"is_colosseum_period\":false", body);
|
||||
// fee_list, is_unfinished_entry_exists, deck_format must be ABSENT when no event.
|
||||
StringAssert.DoesNotContain("\"fee_list\"", body);
|
||||
StringAssert.DoesNotContain("\"is_unfinished_entry_exists\"", body);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public async Task EventInfo_returns_empty_rounds_when_default_config()
|
||||
{
|
||||
using var factory = new SVSimTestFactory();
|
||||
var viewerId = await factory.SeedViewerAsync();
|
||||
using var client = factory.CreateAuthenticatedClient(viewerId);
|
||||
|
||||
var resp = await client.PostAsync("/arena_colosseum/event_info", JsonContent.Create(Envelope));
|
||||
Assert.That(resp.StatusCode, Is.EqualTo(HttpStatusCode.OK));
|
||||
|
||||
var body = await resp.Content.ReadAsStringAsync();
|
||||
|
||||
// The rounds object MUST be string-keyed "1"/"2"/"3" — locking the wire shape per
|
||||
// event_info.md. Custom STJ converter avoided; explicit [JsonPropertyName("1"|"2"|"3")]
|
||||
// produces the same on-the-wire bytes.
|
||||
using var doc = JsonDocument.Parse(body);
|
||||
var root = doc.RootElement;
|
||||
Assert.That(root.TryGetProperty("1", out var r1), Is.True, "round '1' must be present");
|
||||
Assert.That(root.TryGetProperty("2", out var r2), Is.True, "round '2' must be present");
|
||||
Assert.That(root.TryGetProperty("3", out var r3), Is.True, "round '3' must be present");
|
||||
|
||||
// Default config → no schedule → is_now_round false on all three.
|
||||
Assert.That(r1.GetProperty("is_now_round").GetBoolean(), Is.False);
|
||||
Assert.That(r2.GetProperty("is_now_round").GetBoolean(), Is.False);
|
||||
Assert.That(r3.GetProperty("is_now_round").GetBoolean(), Is.False);
|
||||
|
||||
Assert.That(r1.GetProperty("round_detail").GetArrayLength(), Is.EqualTo(0));
|
||||
}
|
||||
|
||||
[Test]
|
||||
public async Task Top_round_trips_after_entry_seeded()
|
||||
{
|
||||
using var factory = new SVSimTestFactory();
|
||||
var viewerId = await factory.SeedViewerAsync();
|
||||
|
||||
// Seed an active run directly — Task 3's /entry endpoint will own creation, but
|
||||
// /top must reflect the row's identity when one exists.
|
||||
const long entryId = 12_345L;
|
||||
using (var scope = factory.Services.CreateScope())
|
||||
{
|
||||
var db = scope.ServiceProvider.GetRequiredService<SVSimDbContext>();
|
||||
db.ViewerArenaColosseumRuns.Add(new ViewerArenaColosseumRun
|
||||
{
|
||||
ViewerId = viewerId,
|
||||
EntryId = entryId,
|
||||
SeasonId = 1,
|
||||
RoundId = 1,
|
||||
DeckFormat = Format.Rotation,
|
||||
LeaderSkinId = 0,
|
||||
ConsumeItemType = 2,
|
||||
MaxBattleCountThisRound = 5,
|
||||
BreakthroughNumberThisRound = 4,
|
||||
RestEntryNum = 0,
|
||||
WinCount = 1,
|
||||
LossCount = 0,
|
||||
ResultListJson = "[1]",
|
||||
});
|
||||
await db.SaveChangesAsync();
|
||||
}
|
||||
|
||||
using var client = factory.CreateAuthenticatedClient(viewerId);
|
||||
var resp = await client.PostAsync("/arena_colosseum/top", 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("entry_info").GetProperty("id").GetInt64(), Is.EqualTo(entryId));
|
||||
Assert.That(root.GetProperty("now_round_id").GetInt32(), Is.EqualTo(1));
|
||||
Assert.That(root.GetProperty("max_battle_count").GetInt32(), Is.EqualTo(5));
|
||||
Assert.That(root.GetProperty("battle_results").GetProperty("win_count").GetInt32(), Is.EqualTo(1));
|
||||
Assert.That(root.GetProperty("battle_results").GetProperty("result_list").GetArrayLength(), Is.EqualTo(1));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,46 @@
|
||||
using System.Linq;
|
||||
using Microsoft.Extensions.Configuration;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using NUnit.Framework;
|
||||
using SVSim.Database;
|
||||
using SVSim.Database.Models.Config;
|
||||
using SVSim.EmulatedEntrypoint.Services;
|
||||
using SVSim.UnitTests.Infrastructure;
|
||||
|
||||
namespace SVSim.UnitTests.Database.Config;
|
||||
|
||||
[TestFixture]
|
||||
public class ColosseumRoundsConfigTests
|
||||
{
|
||||
[Test]
|
||||
public void ShippedDefaults_emits_empty_rounds()
|
||||
{
|
||||
var cfg = ColosseumRoundsConfig.ShippedDefaults();
|
||||
Assert.That(cfg.Rounds, Is.Empty,
|
||||
"default ship state has no rounds — /event_info renders a benign empty payload");
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Has_ConfigSection_attribute_with_name_ColosseumRounds()
|
||||
{
|
||||
var attr = typeof(ColosseumRoundsConfig)
|
||||
.GetCustomAttributes(typeof(ConfigSectionAttribute), false)
|
||||
.Cast<ConfigSectionAttribute>()
|
||||
.FirstOrDefault();
|
||||
Assert.That(attr, Is.Not.Null);
|
||||
Assert.That(attr!.Name, Is.EqualTo("ColosseumRounds"));
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Get_through_GameConfigService_round_trips_shipped_defaults()
|
||||
{
|
||||
using var factory = new SVSimTestFactory();
|
||||
using var scope = factory.Services.CreateScope();
|
||||
var db = scope.ServiceProvider.GetRequiredService<SVSimDbContext>();
|
||||
var svc = new GameConfigService(db, new ConfigurationBuilder().Build());
|
||||
|
||||
var cfg = svc.Get<ColosseumRoundsConfig>();
|
||||
|
||||
Assert.That(cfg.Rounds, Is.Empty);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,47 @@
|
||||
using System.Linq;
|
||||
using Microsoft.Extensions.Configuration;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using NUnit.Framework;
|
||||
using SVSim.Database;
|
||||
using SVSim.Database.Models.Config;
|
||||
using SVSim.EmulatedEntrypoint.Services;
|
||||
using SVSim.UnitTests.Infrastructure;
|
||||
|
||||
namespace SVSim.UnitTests.Database.Config;
|
||||
|
||||
[TestFixture]
|
||||
public class ColosseumSeasonConfigTests
|
||||
{
|
||||
[Test]
|
||||
public void ShippedDefaults_emits_no_period()
|
||||
{
|
||||
var cfg = ColosseumSeasonConfig.ShippedDefaults();
|
||||
Assert.That(cfg.IsColosseumPeriod, Is.False,
|
||||
"default ship state is no event scheduled — lobby reads must render the empty payload");
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Has_ConfigSection_attribute_with_name_ColosseumSeason()
|
||||
{
|
||||
var attr = typeof(ColosseumSeasonConfig)
|
||||
.GetCustomAttributes(typeof(ConfigSectionAttribute), false)
|
||||
.Cast<ConfigSectionAttribute>()
|
||||
.FirstOrDefault();
|
||||
Assert.That(attr, Is.Not.Null);
|
||||
Assert.That(attr!.Name, Is.EqualTo("ColosseumSeason"));
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Get_through_GameConfigService_round_trips_shipped_defaults()
|
||||
{
|
||||
using var factory = new SVSimTestFactory();
|
||||
using var scope = factory.Services.CreateScope();
|
||||
var db = scope.ServiceProvider.GetRequiredService<SVSimDbContext>();
|
||||
var svc = new GameConfigService(db, new ConfigurationBuilder().Build());
|
||||
|
||||
var cfg = svc.Get<ColosseumSeasonConfig>();
|
||||
|
||||
Assert.That(cfg.IsColosseumPeriod, Is.False);
|
||||
Assert.That(cfg.PoolCardSetIds, Is.Empty);
|
||||
}
|
||||
}
|
||||
232
SVSim.UnitTests/Integration/ArenaColosseumEndToEndTests.cs
Normal file
232
SVSim.UnitTests/Integration/ArenaColosseumEndToEndTests.cs
Normal file
@@ -0,0 +1,232 @@
|
||||
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.Integration;
|
||||
|
||||
/// <summary>
|
||||
/// Phase 2 ship gate: a viewer walks the full bracket — entry → register_deck →
|
||||
/// (battle_finish × N) → /finish (champion path), plus a separate retire-mid-round
|
||||
/// variant. Exercises every Phase 2 endpoint plus Phase 1's /entry + /register_deck.
|
||||
/// </summary>
|
||||
public class ArenaColosseumEndToEndTests
|
||||
{
|
||||
private static readonly object Envelope =
|
||||
new { viewer_id = "0", steam_id = 0, steam_session_ticket = "" };
|
||||
|
||||
private static async Task ConfigureSeasonAsync(SVSimTestFactory factory)
|
||||
{
|
||||
using var scope = factory.Services.CreateScope();
|
||||
var db = scope.ServiceProvider.GetRequiredService<SVSimDbContext>();
|
||||
|
||||
// Season active, free entry allowed (so we don't have to seed currency).
|
||||
var seasonJson = JsonSerializer.Serialize(new
|
||||
{
|
||||
IsColosseumPeriod = true,
|
||||
SeasonId = 100,
|
||||
ColosseumName = "E2E Cup",
|
||||
DeckFormat = (int)Format.Rotation,
|
||||
CrystalCost = 0,
|
||||
RupyCost = 0,
|
||||
TicketCost = 0,
|
||||
IsAllowedFreeEntry = true,
|
||||
FinalRoundEliminateCount = 100,
|
||||
});
|
||||
await UpsertConfigAsync(db, "ColosseumSeason", seasonJson);
|
||||
|
||||
// 3-round bracket. Round 1: BR=2 (clear with 2 wins). Round 2: BR=2. Round 3: BR=2.
|
||||
var roundsJson = JsonSerializer.Serialize(new
|
||||
{
|
||||
Rounds = new[]
|
||||
{
|
||||
BuildRound(1, breakthrough: 2, finishCount: 50),
|
||||
BuildRound(2, breakthrough: 2, finishCount: 100),
|
||||
BuildRound(3, breakthrough: 2, finishCount: 500),
|
||||
},
|
||||
ChampionRewards = new[]
|
||||
{
|
||||
new { Type = (int)UserGoodsType.Crystal, DetailId = 0L, Count = 9999, Name = "E2E Champion" },
|
||||
},
|
||||
});
|
||||
await UpsertConfigAsync(db, "ColosseumRounds", roundsJson);
|
||||
}
|
||||
|
||||
private static object BuildRound(int roundId, int breakthrough, int finishCount) => new
|
||||
{
|
||||
RoundId = roundId,
|
||||
Groups = new[]
|
||||
{
|
||||
new
|
||||
{
|
||||
Group = $"R{roundId}",
|
||||
MaxBattleCount = 5,
|
||||
BreakthroughNumber = breakthrough,
|
||||
EntryNumber = 100,
|
||||
},
|
||||
},
|
||||
FinishRewards = new[]
|
||||
{
|
||||
new
|
||||
{
|
||||
Type = (int)UserGoodsType.Crystal,
|
||||
DetailId = 0L,
|
||||
Count = finishCount,
|
||||
Name = $"R{roundId} finish",
|
||||
},
|
||||
},
|
||||
RetireRewards = new object[]
|
||||
{
|
||||
new
|
||||
{
|
||||
Type = (int)UserGoodsType.Rupy,
|
||||
DetailId = 0L,
|
||||
Count = 10 * roundId,
|
||||
Name = $"R{roundId} retire",
|
||||
},
|
||||
},
|
||||
};
|
||||
|
||||
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 HttpContent BattleFinishPayload(int battleResult, int isRetire) =>
|
||||
JsonContent.Create(new
|
||||
{
|
||||
battle_result = battleResult,
|
||||
is_retire = isRetire,
|
||||
class_id = 1,
|
||||
total_turn = 5,
|
||||
evolve_count = 1,
|
||||
enemy_evolve_count = 0,
|
||||
recovery_data = "",
|
||||
viewer_id = "0",
|
||||
steam_id = 0,
|
||||
steam_session_ticket = "",
|
||||
});
|
||||
|
||||
private static async Task PromoteRunToRoundAsync(
|
||||
SVSimTestFactory factory, long viewerId, int newRoundId)
|
||||
{
|
||||
using var scope = factory.Services.CreateScope();
|
||||
var db = scope.ServiceProvider.GetRequiredService<SVSimDbContext>();
|
||||
var run = await db.ViewerArenaColosseumRuns.FirstAsync(r => r.ViewerId == viewerId);
|
||||
run.RoundId = newRoundId;
|
||||
run.WinCount = 0;
|
||||
run.LossCount = 0;
|
||||
run.BattleCountThisRound = 0;
|
||||
run.ResultListJson = "[]";
|
||||
// Pull the per-round thresholds for the new round (mirrors what /entry copies on
|
||||
// initial create — Phase 2 doesn't have a real intra-bracket promotion endpoint yet).
|
||||
run.MaxBattleCountThisRound = 5;
|
||||
run.BreakthroughNumberThisRound = 2;
|
||||
await db.SaveChangesAsync();
|
||||
}
|
||||
|
||||
[Test]
|
||||
public async Task Full_three_round_bracket_walk_ends_as_champion()
|
||||
{
|
||||
using var factory = new SVSimTestFactory();
|
||||
await ConfigureSeasonAsync(factory);
|
||||
var vid = await factory.SeedViewerAsync();
|
||||
await factory.SeedDeckAsync(vid, Format.Rotation, number: 1);
|
||||
using var client = factory.CreateAuthenticatedClient(vid);
|
||||
|
||||
// /entry (free)
|
||||
var entryResp = await client.PostAsync("/arena_colosseum/entry",
|
||||
JsonContent.Create(new { consume_item_type = 5, now_round_id = 1, viewer_id = "0", steam_id = 0, steam_session_ticket = "" }));
|
||||
Assert.That(entryResp.StatusCode, Is.EqualTo(HttpStatusCode.OK), "entry must succeed");
|
||||
|
||||
// /register_deck
|
||||
var registerResp = await client.PostAsync("/arena_colosseum/register_deck",
|
||||
JsonContent.Create(new { deck_no_list = "[1]", is_published = true, viewer_id = "0", steam_id = 0, steam_session_ticket = "" }));
|
||||
Assert.That(registerResp.StatusCode, Is.EqualTo(HttpStatusCode.OK), "register_deck must succeed");
|
||||
|
||||
// Round 1: 2 wins → clears breakthrough.
|
||||
for (int i = 0; i < 2; i++)
|
||||
{
|
||||
var r = await client.PostAsync("/colosseum_battle/finish", BattleFinishPayload(battleResult: 1, isRetire: 0));
|
||||
Assert.That(r.StatusCode, Is.EqualTo(HttpStatusCode.OK), $"R1 battle {i} must succeed");
|
||||
}
|
||||
await PromoteRunToRoundAsync(factory, vid, newRoundId: 2);
|
||||
|
||||
// Round 2: 2 wins.
|
||||
for (int i = 0; i < 2; i++)
|
||||
{
|
||||
var r = await client.PostAsync("/colosseum_battle/finish", BattleFinishPayload(battleResult: 1, isRetire: 0));
|
||||
Assert.That(r.StatusCode, Is.EqualTo(HttpStatusCode.OK), $"R2 battle {i} must succeed");
|
||||
}
|
||||
await PromoteRunToRoundAsync(factory, vid, newRoundId: 3);
|
||||
|
||||
// Round 3: 2 wins → champion path on /finish.
|
||||
for (int i = 0; i < 2; i++)
|
||||
{
|
||||
var r = await client.PostAsync("/colosseum_battle/finish", BattleFinishPayload(battleResult: 1, isRetire: 0));
|
||||
Assert.That(r.StatusCode, Is.EqualTo(HttpStatusCode.OK), $"R3 battle {i} must succeed");
|
||||
}
|
||||
|
||||
// /arena_colosseum/finish (champion path)
|
||||
var finishResp = await client.PostAsync("/arena_colosseum/finish", JsonContent.Create(Envelope));
|
||||
Assert.That(finishResp.StatusCode, Is.EqualTo(HttpStatusCode.OK));
|
||||
|
||||
var body = await finishResp.Content.ReadAsStringAsync();
|
||||
using var doc = JsonDocument.Parse(body);
|
||||
var root = doc.RootElement;
|
||||
Assert.That(root.GetProperty("colosseum_status").GetProperty("is_champion").GetBoolean(), Is.True);
|
||||
// Final R3 finish reward + champion bundle = 2 entries.
|
||||
Assert.That(root.GetProperty("reward_list").GetArrayLength(), Is.EqualTo(2));
|
||||
|
||||
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, "champion run must be deleted on /finish");
|
||||
}
|
||||
|
||||
[Test]
|
||||
public async Task Retire_during_round_2_emits_round_capped_consolation()
|
||||
{
|
||||
using var factory = new SVSimTestFactory();
|
||||
await ConfigureSeasonAsync(factory);
|
||||
var vid = await factory.SeedViewerAsync();
|
||||
await factory.SeedDeckAsync(vid, Format.Rotation, number: 1);
|
||||
using var client = factory.CreateAuthenticatedClient(vid);
|
||||
|
||||
// entry + register_deck + clear R1 + promote
|
||||
await client.PostAsync("/arena_colosseum/entry",
|
||||
JsonContent.Create(new { consume_item_type = 5, now_round_id = 1, viewer_id = "0", steam_id = 0, steam_session_ticket = "" }));
|
||||
await client.PostAsync("/arena_colosseum/register_deck",
|
||||
JsonContent.Create(new { deck_no_list = "[1]", is_published = false, viewer_id = "0", steam_id = 0, steam_session_ticket = "" }));
|
||||
for (int i = 0; i < 2; i++)
|
||||
await client.PostAsync("/colosseum_battle/finish", BattleFinishPayload(battleResult: 1, isRetire: 0));
|
||||
await PromoteRunToRoundAsync(factory, vid, newRoundId: 2);
|
||||
|
||||
// One mid-round battle, then retire.
|
||||
await client.PostAsync("/colosseum_battle/finish", BattleFinishPayload(battleResult: 2, isRetire: 0));
|
||||
|
||||
var retireResp = await client.PostAsync("/arena_colosseum/retire", JsonContent.Create(Envelope));
|
||||
Assert.That(retireResp.StatusCode, Is.EqualTo(HttpStatusCode.OK));
|
||||
|
||||
var body = await retireResp.Content.ReadAsStringAsync();
|
||||
using var doc = JsonDocument.Parse(body);
|
||||
var rewards = doc.RootElement.GetProperty("rewards");
|
||||
Assert.That(rewards.GetArrayLength(), Is.EqualTo(1));
|
||||
Assert.That(rewards[0].GetProperty("name").GetString(), Is.EqualTo("R2 retire"),
|
||||
"retire payload must reflect the round the viewer was IN, not their starting round");
|
||||
|
||||
using var scope = factory.Services.CreateScope();
|
||||
var db = scope.ServiceProvider.GetRequiredService<SVSimDbContext>();
|
||||
Assert.That(await db.ViewerArenaColosseumRuns.AnyAsync(r => r.ViewerId == vid), Is.False);
|
||||
}
|
||||
}
|
||||
@@ -25,14 +25,14 @@ public class GameConfigurationJsonbTests
|
||||
var rows = await db.GameConfigs.AsNoTracking().ToListAsync();
|
||||
var byName = rows.ToDictionary(r => r.SectionName);
|
||||
|
||||
// One row per [ConfigSection]-marked POCO (13 sections today: Player, DefaultGrants,
|
||||
// One row per [ConfigSection]-marked POCO (15 sections today: Player, DefaultGrants,
|
||||
// DefaultLoadout, Challenge, Rotation, PackRates, MyRotationSchedule, Story, ResourceConfig,
|
||||
// Freeplay, ArenaTwoPick, Matching, CardMasterConfig).
|
||||
// Freeplay, ArenaTwoPick, Matching, CardMasterConfig, ColosseumSeason, ColosseumRounds).
|
||||
Assert.That(byName.Keys, Is.EquivalentTo(new[]
|
||||
{
|
||||
"Player", "DefaultGrants", "DefaultLoadout", "Challenge", "Rotation", "PackRates",
|
||||
"MyRotationSchedule", "Story", "ResourceConfig", "Freeplay", "ArenaTwoPick", "Matching",
|
||||
"CardMasterConfig",
|
||||
"CardMasterConfig", "ColosseumSeason", "ColosseumRounds",
|
||||
}));
|
||||
|
||||
var resources = JsonSerializer.Deserialize<ResourceConfig>(byName["ResourceConfig"].ValueJson)!;
|
||||
|
||||
@@ -0,0 +1,181 @@
|
||||
using NUnit.Framework;
|
||||
using SVSim.Database.Enums;
|
||||
using SVSim.Database.Models;
|
||||
using SVSim.Database.Models.Config;
|
||||
using SVSim.EmulatedEntrypoint.Services.ArenaColosseum;
|
||||
|
||||
namespace SVSim.UnitTests.Services.ArenaColosseum;
|
||||
|
||||
/// <summary>
|
||||
/// Pure-logic tests for the bracket-advancement / promotion / reward-bundle service.
|
||||
/// No DB, no controllers, no HTTP — these are the only place to lock the spec README's
|
||||
/// "< FinalB" cap rule + the 3008 promotion trigger semantics.
|
||||
/// </summary>
|
||||
[TestFixture]
|
||||
public class ColosseumProgressionServiceTests
|
||||
{
|
||||
private static ColosseumRoundsConfig BuildThreeRoundConfig() => new()
|
||||
{
|
||||
Rounds = new()
|
||||
{
|
||||
new ColosseumRoundsConfig.RoundEntry
|
||||
{
|
||||
RoundId = 1,
|
||||
Groups = new() { new() { Group = "", MaxBattleCount = 5, BreakthroughNumber = 3, EntryNumber = 100_000 } },
|
||||
FinishRewards = new()
|
||||
{
|
||||
new() { Type = UserGoodsType.Crystal, DetailId = 0, Count = 100, Name = "Round 1 bonus" },
|
||||
},
|
||||
RetireRewards = new()
|
||||
{
|
||||
new() { Type = UserGoodsType.Rupy, DetailId = 0, Count = 50, Name = "Consolation" },
|
||||
},
|
||||
},
|
||||
new ColosseumRoundsConfig.RoundEntry
|
||||
{
|
||||
RoundId = 2,
|
||||
Groups = new() { new() { Group = "Group A", MaxBattleCount = 5, BreakthroughNumber = 4, EntryNumber = 10_000 } },
|
||||
FinishRewards = new()
|
||||
{
|
||||
new() { Type = UserGoodsType.Crystal, DetailId = 0, Count = 250, Name = "Round 2 bonus" },
|
||||
},
|
||||
},
|
||||
new ColosseumRoundsConfig.RoundEntry
|
||||
{
|
||||
RoundId = 3,
|
||||
Groups = new() { new() { Group = "Final", MaxBattleCount = 5, BreakthroughNumber = 4, EntryNumber = 1_000 } },
|
||||
FinishRewards = new()
|
||||
{
|
||||
new() { Type = UserGoodsType.Crystal, DetailId = 0, Count = 1000, Name = "Final clear" },
|
||||
},
|
||||
},
|
||||
},
|
||||
ChampionRewards = new()
|
||||
{
|
||||
new() { Type = UserGoodsType.Item, DetailId = 5, Count = 1, Name = "Champion Pack" },
|
||||
},
|
||||
};
|
||||
|
||||
[Test]
|
||||
public void Win_threshold_advances_round_1_to_round_2()
|
||||
{
|
||||
var svc = new ColosseumProgressionService();
|
||||
var rounds = BuildThreeRoundConfig();
|
||||
var run = new ViewerArenaColosseumRun { RoundId = 1, WinCount = 3, BattleCountThisRound = 3 };
|
||||
|
||||
var decision = svc.DecideAdvancement(run, rounds);
|
||||
|
||||
Assert.That(decision.NextRoundId, Is.EqualTo(2));
|
||||
Assert.That(decision.IsBracketEnd, Is.False);
|
||||
Assert.That(decision.IsChampion, Is.False);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Loss_cap_ends_bracket_at_current_round()
|
||||
{
|
||||
var svc = new ColosseumProgressionService();
|
||||
var rounds = BuildThreeRoundConfig();
|
||||
var run = new ViewerArenaColosseumRun
|
||||
{
|
||||
RoundId = 2,
|
||||
WinCount = 3, // one short of breakthrough (4)
|
||||
BattleCountThisRound = 5, // hit the cap
|
||||
LossCount = 2,
|
||||
};
|
||||
|
||||
var decision = svc.DecideAdvancement(run, rounds);
|
||||
|
||||
Assert.That(decision.NextRoundId, Is.EqualTo(2));
|
||||
Assert.That(decision.IsBracketEnd, Is.True);
|
||||
Assert.That(decision.IsChampion, Is.False);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Final_round_breakthrough_marks_champion()
|
||||
{
|
||||
var svc = new ColosseumProgressionService();
|
||||
var rounds = BuildThreeRoundConfig();
|
||||
var run = new ViewerArenaColosseumRun
|
||||
{
|
||||
RoundId = 3,
|
||||
WinCount = 4, // hit breakthrough on the final round
|
||||
BattleCountThisRound = 4,
|
||||
};
|
||||
|
||||
var decision = svc.DecideAdvancement(run, rounds);
|
||||
|
||||
Assert.That(decision.NextRoundId, Is.EqualTo(3));
|
||||
Assert.That(decision.IsBracketEnd, Is.True);
|
||||
Assert.That(decision.IsChampion, Is.True);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void ShouldPromoteToRankMatching_flips_once_on_3008()
|
||||
{
|
||||
var svc = new ColosseumProgressionService();
|
||||
var run = new ViewerArenaColosseumRun { IsRankMatching = false };
|
||||
|
||||
Assert.That(svc.ShouldPromoteToRankMatching(run, 3004), Is.False,
|
||||
"3004 SUCCEEDED is not the promotion signal");
|
||||
Assert.That(svc.ShouldPromoteToRankMatching(run, 3008), Is.True,
|
||||
"3008 is the colosseum-specific promotion trigger per do-matching.md");
|
||||
|
||||
run.IsRankMatching = true;
|
||||
Assert.That(svc.ShouldPromoteToRankMatching(run, 3008), Is.False,
|
||||
"already promoted — no second flip");
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void BuildRetireRewards_returns_round_specific_bundle()
|
||||
{
|
||||
var svc = new ColosseumProgressionService();
|
||||
var rounds = BuildThreeRoundConfig();
|
||||
var run = new ViewerArenaColosseumRun { RoundId = 1 };
|
||||
|
||||
var rewards = svc.BuildRetireRewards(run, rounds);
|
||||
|
||||
Assert.That(rewards.Count, Is.EqualTo(1));
|
||||
Assert.That(rewards[0].Type, Is.EqualTo(UserGoodsType.Rupy));
|
||||
Assert.That(rewards[0].Count, Is.EqualTo(50));
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void BuildRetireRewards_returns_empty_when_round_has_none()
|
||||
{
|
||||
var svc = new ColosseumProgressionService();
|
||||
var rounds = BuildThreeRoundConfig();
|
||||
// Round 2 has no RetireRewards configured — server still emits an empty list per spec.
|
||||
var run = new ViewerArenaColosseumRun { RoundId = 2 };
|
||||
|
||||
var rewards = svc.BuildRetireRewards(run, rounds);
|
||||
|
||||
Assert.That(rewards, Is.Empty);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void BuildFinishRewards_appends_champion_bundle_when_champion()
|
||||
{
|
||||
var svc = new ColosseumProgressionService();
|
||||
var rounds = BuildThreeRoundConfig();
|
||||
var run = new ViewerArenaColosseumRun { RoundId = 3, IsChampion = true };
|
||||
|
||||
var rewards = svc.BuildFinishRewards(run, rounds);
|
||||
|
||||
Assert.That(rewards.Count, Is.EqualTo(2), "round 3 finish + champion bundle");
|
||||
Assert.That(rewards.Any(r => r.Name == "Final clear"), Is.True);
|
||||
Assert.That(rewards.Any(r => r.Name == "Champion Pack"), Is.True);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void BuildFinishRewards_omits_champion_bundle_when_not_champion()
|
||||
{
|
||||
var svc = new ColosseumProgressionService();
|
||||
var rounds = BuildThreeRoundConfig();
|
||||
var run = new ViewerArenaColosseumRun { RoundId = 1, IsChampion = false };
|
||||
|
||||
var rewards = svc.BuildFinishRewards(run, rounds);
|
||||
|
||||
Assert.That(rewards.Count, Is.EqualTo(1));
|
||||
Assert.That(rewards[0].Name, Is.EqualTo("Round 1 bonus"));
|
||||
}
|
||||
}
|
||||
@@ -24,6 +24,8 @@ public class ArenaTwoPickServiceDraftTests
|
||||
new() { Id = startingPairId + 1, Turn = turn, SetNum = 2,
|
||||
CardId1 = 2000 + turn * 10 + 1, CardId2 = 2000 + turn * 10 + 2, IsSelected = false },
|
||||
};
|
||||
public List<CandidatePair> GeneratePickSetsForTurn(int classId, int turn, long startingPairId, IRandom rng, IReadOnlyList<int>? poolCardSetIds)
|
||||
=> GeneratePickSetsForTurn(classId, turn, startingPairId, rng);
|
||||
}
|
||||
|
||||
private static async Task<(IArenaTwoPickService, IArenaTwoPickRunRepository, long viewerId)> SetupWithActiveRunAsync(int classChosen = 0)
|
||||
|
||||
@@ -22,6 +22,8 @@ public class ArenaTwoPickServiceEntryTests
|
||||
{
|
||||
public List<CandidatePair> GeneratePickSetsForTurn(int classId, int turn, long startingPairId, IRandom rng)
|
||||
=> throw new NotSupportedException("pool not used in EntryAsync");
|
||||
public List<CandidatePair> GeneratePickSetsForTurn(int classId, int turn, long startingPairId, IRandom rng, IReadOnlyList<int>? poolCardSetIds)
|
||||
=> throw new NotSupportedException("pool not used in EntryAsync");
|
||||
}
|
||||
|
||||
private static async Task<(SVSimDbContext db, IArenaTwoPickService svc, long viewerId)> SetupAsync(
|
||||
|
||||
@@ -21,6 +21,7 @@ public class ArenaTwoPickServiceFinishTests
|
||||
private sealed class FakePool : IArenaTwoPickCardPoolService
|
||||
{
|
||||
public List<CandidatePair> GeneratePickSetsForTurn(int classId, int turn, long startingPairId, IRandom rng) => new();
|
||||
public List<CandidatePair> GeneratePickSetsForTurn(int classId, int turn, long startingPairId, IRandom rng, IReadOnlyList<int>? poolCardSetIds) => new();
|
||||
}
|
||||
|
||||
private static async Task<(SVSimDbContext db, IArenaTwoPickService svc, long viewerId)> SetupWithRunAsync(
|
||||
|
||||
@@ -21,6 +21,7 @@ public class ArenaTwoPickServiceWeightedRewardsTests
|
||||
private sealed class FakePool : IArenaTwoPickCardPoolService
|
||||
{
|
||||
public List<CandidatePair> GeneratePickSetsForTurn(int classId, int turn, long startingPairId, IRandom rng) => new();
|
||||
public List<CandidatePair> GeneratePickSetsForTurn(int classId, int turn, long startingPairId, IRandom rng, IReadOnlyList<int>? poolCardSetIds) => new();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
||||
Reference in New Issue
Block a user