Replace bare `int RewardType` on 12 catalog/reward entities and GrantedReward
with the existing UserGoodsType enum. Verified against the decompiled client:
every wire reward_type decodes through the single Wizard.UserGoods.Type enum, so
one enum is correct across all endpoint families (item_type is a separate
Item.Type axis, left untouched). EF stores the enum as the same int column, so
there is no migration.
- Importers cast seed int -> UserGoodsType at the ingest boundary.
- New GrantedReward.ToRewardList() extension replaces 8 copy-pasted
GrantedReward -> RewardListEntry projections.
- Fix 3 .ToString() sites that would otherwise emit enum names ("Crystal")
instead of the int wire value ("2").
- Wire DTOs keep int; the enum is widened to int at the wire boundary only.
Build green; 962/962 tests pass.
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
55 lines
1.9 KiB
C#
55 lines
1.9 KiB
C#
using Microsoft.EntityFrameworkCore;
|
|
using SVSim.Bootstrap.Models.Seed;
|
|
using SVSim.Database;
|
|
using SVSim.Database.Enums;
|
|
using SVSim.Database.Models;
|
|
|
|
namespace SVSim.Bootstrap.Importers;
|
|
|
|
/// <summary>
|
|
/// Idempotent upsert of <see cref="ArenaTwoPickReward"/> rows from
|
|
/// <c>arena-two-pick-rewards.json</c>. Key = (WinCount, RewardGroup, RewardType, RewardId, RewardNum).
|
|
/// </summary>
|
|
public class ArenaTwoPickRewardImporter
|
|
{
|
|
public async Task<int> ImportAsync(SVSimDbContext context, string seedDir)
|
|
{
|
|
var path = Path.Combine(seedDir, "arena-two-pick-rewards.json");
|
|
if (!File.Exists(path))
|
|
{
|
|
Console.WriteLine($"[ArenaTwoPickRewardImporter] missing {path}; skipping.");
|
|
return 0;
|
|
}
|
|
|
|
var seeds = SeedLoader.LoadList<ArenaTwoPickRewardSeed>(path);
|
|
var existing = await context.ArenaTwoPickRewards
|
|
.ToDictionaryAsync(r => (r.WinCount, r.RewardGroup, r.RewardType, r.RewardId, r.RewardNum));
|
|
|
|
int upserted = 0;
|
|
foreach (var s in seeds)
|
|
{
|
|
if (existing.TryGetValue((s.WinCount, s.RewardGroup, (UserGoodsType)s.RewardType, s.RewardId, s.RewardNum), out var row))
|
|
{
|
|
row.Weight = s.Weight;
|
|
}
|
|
else
|
|
{
|
|
context.ArenaTwoPickRewards.Add(new ArenaTwoPickReward
|
|
{
|
|
WinCount = s.WinCount,
|
|
RewardGroup = s.RewardGroup,
|
|
Weight = s.Weight,
|
|
RewardType = (UserGoodsType)s.RewardType,
|
|
RewardId = s.RewardId,
|
|
RewardNum = s.RewardNum,
|
|
});
|
|
}
|
|
upserted++;
|
|
}
|
|
|
|
await context.SaveChangesAsync();
|
|
Console.WriteLine($"[ArenaTwoPickRewardImporter] upserted={upserted}");
|
|
return upserted;
|
|
}
|
|
}
|