refactor: type reward_type columns as UserGoodsType enum
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>
This commit is contained in:
@@ -184,7 +184,7 @@ public sealed class BattlePassService : IBattlePassService
|
||||
{
|
||||
if (claimSet.Contains((r.Track, r.Level))) continue;
|
||||
_viewerBp.AddClaim(viewerId, season.Id, r.Track, r.Level, now);
|
||||
await tx.GrantAsync((UserGoodsType)r.RewardType, r.RewardDetailId, r.RewardNumber, ct);
|
||||
await tx.GrantAsync(r.RewardType, r.RewardDetailId, r.RewardNumber, ct);
|
||||
}
|
||||
|
||||
// CommitAsync handles DB save + currency-collision rule. Crystal spend is the first
|
||||
@@ -240,7 +240,7 @@ public sealed class BattlePassService : IBattlePassService
|
||||
if (r.Track == BattlePassTrack.Premium && !progress.IsPremium) continue;
|
||||
if (claimSet.Contains((r.Track, r.Level))) continue;
|
||||
_viewerBp.AddClaim(viewerId, season.Id, r.Track, r.Level, now);
|
||||
await tx.GrantAsync((UserGoodsType)r.RewardType, r.RewardDetailId, r.RewardNumber, ct);
|
||||
await tx.GrantAsync(r.RewardType, r.RewardDetailId, r.RewardNumber, ct);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -297,7 +297,7 @@ public sealed class BattlePassService : IBattlePassService
|
||||
return new BattlePassRewardDto
|
||||
{
|
||||
RewardLevel = Inv(r.Level),
|
||||
RewardType = Inv(r.RewardType),
|
||||
RewardType = Inv((int)r.RewardType),
|
||||
RewardDetailId = Inv(r.RewardDetailId),
|
||||
RewardNumber = Inv(r.RewardNumber),
|
||||
IsReceived = claimSet.Contains((r.Track, r.Level)),
|
||||
|
||||
Reference in New Issue
Block a user