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:
gamer147
2026-06-03 07:50:49 -04:00
parent fb1e91cdf1
commit 05d8169012
60 changed files with 179 additions and 154 deletions

View File

@@ -301,7 +301,7 @@ public class ArenaTwoPickService : IArenaTwoPickService
// Pre-load item_type for any Item-typed reward so we can populate it on the
// per-grant delta entries. Currencies don't need a lookup (item_type stays 0).
var itemRewardIds = rewardRows
.Where(r => r.RewardType == (int)UserGoodsType.Item)
.Where(r => r.RewardType == UserGoodsType.Item)
.Select(r => (int)r.RewardId)
.Distinct()
.ToList();
@@ -325,10 +325,10 @@ public class ArenaTwoPickService : IArenaTwoPickService
// Skip when the rolled outcome is "nothing" (RewardNum == 0).
if (pick.RewardNum <= 0) continue;
await tx.GrantAsync((UserGoodsType)pick.RewardType, pick.RewardId, pick.RewardNum);
await tx.GrantAsync(pick.RewardType, pick.RewardId, pick.RewardNum);
deltas.Add(new TwoPickRewardReceivedDto
{
RewardType = pick.RewardType,
RewardType = (int)pick.RewardType,
RewardDetailId = pick.RewardId,
RewardCount = pick.RewardNum,
ItemType = itemTypeById.TryGetValue((int)pick.RewardId, out var t) ? t : 0,
@@ -339,7 +339,7 @@ public class ArenaTwoPickService : IArenaTwoPickService
var result = await tx.CommitAsync();
var postStates = result.RewardList
.Select(g => new RewardEntryDto { RewardType = g.RewardType, RewardId = g.RewardId, RewardNum = g.RewardNum })
.Select(g => new RewardEntryDto { RewardType = (int)g.RewardType, RewardId = g.RewardId, RewardNum = g.RewardNum })
.ToList();
await _runs.DeleteAsync(viewerId);

View File

@@ -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)),

View File

@@ -210,9 +210,7 @@ public sealed class GachaPointService : IGachaPointService
// Emblem (standard legendary) or Skin+Emblem (leader). Convert at the wire boundary
// so ExchangeOutcome still carries RewardListEntry for the controller response.
var granted = await tx.GrantAsync(UserGoodsType.Card, cardId, 1);
var rewardList = granted
.Select(g => new RewardListEntry { RewardType = g.RewardType, RewardId = g.RewardId, RewardNum = g.RewardNum })
.ToList();
var rewardList = granted.ToRewardList();
return ExchangeOutcome.Ok(rewardList);
}

View File

@@ -92,7 +92,7 @@ public sealed class MissionAssembler : IMissionAssembler
LotType = cat.LotType.ToString(),
BattlePassPoint = cat.BattlePassPoint.ToString(),
RequireNumber = cat.RequireNumber,
RewardType = cat.RewardType,
RewardType = (int)cat.RewardType,
RewardDetailId = cat.RewardDetailId,
RewardNumber = cat.RewardNumber,
DefaultFlag = cat.DefaultFlag,
@@ -117,7 +117,7 @@ public sealed class MissionAssembler : IMissionAssembler
TotalCount = total,
AchievementName = catalog.Name,
RequireNumber = catalog.RequireNumber,
RewardType = catalog.RewardType,
RewardType = (int)catalog.RewardType,
RewardDetailId = catalog.RewardDetailId,
RewardNumber = catalog.RewardNumber,
MaxLevel = maxLevel,
@@ -164,7 +164,7 @@ public sealed class MissionAssembler : IMissionAssembler
{
entry.RewardInfo = new BPMonthlyMissionRewardInfoDto
{
RewardType = mm.RewardType.Value.ToString(),
RewardType = ((int)mm.RewardType.Value).ToString(),
RewardDetailId = (mm.RewardDetailId ?? 0).ToString(),
RewardNumber = (mm.RewardNumber ?? 0).ToString(),
};

View File

@@ -150,7 +150,7 @@ public class StoryService : IStoryService
}).ToList(),
StoryReward = c.Rewards.Select(r => new RewardDto
{
RewardType = r.RewardType.ToString(),
RewardType = ((int)r.RewardType).ToString(),
RewardDetailId = r.RewardDetailId.ToString(),
RewardNumber = r.RewardNumber.ToString(),
}).ToList(),
@@ -539,7 +539,7 @@ public class StoryService : IStoryService
{
try
{
await tx.GrantAsync((UserGoodsType)r.RewardType, r.RewardDetailId, r.RewardNumber);
await tx.GrantAsync(r.RewardType, r.RewardDetailId, r.RewardNumber);
}
catch (NotSupportedException ex)
{
@@ -564,7 +564,7 @@ public class StoryService : IStoryService
{
resp.RewardList.Add(new RewardGrant
{
RewardType = g.RewardType.ToString(),
RewardType = ((int)g.RewardType).ToString(),
RewardId = g.RewardId.ToString(),
RewardNum = g.RewardNum.ToString(),
});