SVSim/SVSimServer
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

refactor: type reward_type columns as UserGoodsType enum

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

6
SVSim.EmulatedEntrypoint/Controllers/AchievementController.cs
View File

@@ -72,7 +72,7 @@ public class AchievementController : SVSimController
await using var tx = await _inv.BeginAsync(viewerId, ct);
var granted = await tx.GrantAsync(
(UserGoodsType)catalogRow.RewardType,
catalogRow.RewardType,
catalogRow.RewardDetailId,
catalogRow.RewardNumber,
ct);
@@ -108,13 +108,13 @@ public class AchievementController : SVSimController
MissionReceiveType = dto.MissionReceiveType,
RewardList = granted.Select(g => new RewardGrantDto
{
RewardType = g.RewardType,
RewardType = (int)g.RewardType,
RewardId = g.RewardId,
RewardNum = g.RewardNum,
}).ToList(),
TotalReceiveCountList = granted.Select(g => new TotalReceiveCountDto
{
RewardType = g.RewardType,
RewardType = (int)g.RewardType,
RewardDetailId = g.RewardId,
RewardCount = g.RewardNum,
ItemType = 0,

4
SVSim.EmulatedEntrypoint/Controllers/BattlePassController.cs
View File

@@ -64,7 +64,7 @@ public class BattlePassController : SVSimController
BattlePassRewardList = outcome.AchievedRewards
.Select(g => new BattlePassReceivedRewardDto
{
RewardType = g.RewardType,
RewardType = (int)g.RewardType,
RewardDetailId = g.RewardId,
RewardNumber = g.RewardNum,
}).ToList(),
@@ -72,7 +72,7 @@ public class BattlePassController : SVSimController
RewardList = outcome.PostStateTotals
.Select(g => new BattlePassRewardListEntryDto
{
RewardType = g.RewardType,
RewardType = (int)g.RewardType,
RewardId = g.RewardId,
RewardNum = g.RewardNum,
}).ToList(),

14
SVSim.EmulatedEntrypoint/Controllers/BuildDeckController.cs
View File

@@ -94,7 +94,7 @@ public class BuildDeckController : SVSimController
.OrderBy(r => r.RewardIndex)
.Select(r => new BuildDeckProductRewardDto
{
RewardType = r.RewardType,
RewardType = (int)r.RewardType,
RewardDetailId = r.RewardDetailId,
RewardNumber = r.RewardNumber,
MessageId = r.MessageId,
@@ -120,7 +120,7 @@ public class BuildDeckController : SVSimController
IsGet = totalSeriesPurchases >= g.Key,
RewardList = g.OrderBy(r => r.ItemIndex).Select(r => new BuildDeckProductRewardDto
{
RewardType = r.RewardType,
RewardType = (int)r.RewardType,
RewardDetailId = r.RewardDetailId,
RewardNumber = r.RewardNumber,
MessageId = r.MessageId,
@@ -206,7 +206,7 @@ public class BuildDeckController : SVSimController
// Per-buy rewards
foreach (var r in product.Rewards.OrderBy(r => r.RewardIndex))
await tx.GrantAsync((UserGoodsType)r.RewardType, r.RewardDetailId, r.RewardNumber);
await tx.GrantAsync(r.RewardType, r.RewardDetailId, r.RewardNumber);
// Series-reward tier crossings
var crossedTiers = product.Series.SeriesRewards
@@ -220,10 +220,10 @@ public class BuildDeckController : SVSimController
{
foreach (var item in tier.OrderBy(r => r.ItemIndex))
{
await tx.GrantAsync((UserGoodsType)item.RewardType, item.RewardDetailId, item.RewardNumber);
await tx.GrantAsync(item.RewardType, item.RewardDetailId, item.RewardNumber);
seriesRewards.Add(new BuildDeckProductRewardDto
{
RewardType = item.RewardType,
RewardType = (int)item.RewardType,
RewardDetailId = item.RewardDetailId,
RewardNumber = item.RewardNumber,
MessageId = item.MessageId,
@@ -235,9 +235,7 @@ public class BuildDeckController : SVSimController
return new BuildDeckBuyResponse
{
RewardList = result.RewardList
.Select(g => new RewardListEntry { RewardType = g.RewardType, RewardId = g.RewardId, RewardNum = g.RewardNum })
.ToList(),
RewardList = result.RewardList.ToRewardList(),
SeriesRewards = seriesRewards,
};
}

4
SVSim.EmulatedEntrypoint/Controllers/CardController.cs
View File

@@ -91,7 +91,7 @@ public class CardController : SVSimController
foreach (var (cardId, snapshot) in snapshots)
{
int requestedNum = createCounts[cardId];
int postCount = grants.FirstOrDefault(g => g.RewardType == (int)UserGoodsType.Card && g.RewardId == cardId)?.RewardNum ?? 0;
int postCount = grants.FirstOrDefault(g => g.RewardType == UserGoodsType.Card && g.RewardId == cardId)?.RewardNum ?? 0;
int reconstructedPre = postCount - requestedNum;
if (reconstructedPre != snapshot)
{
@@ -114,7 +114,7 @@ public class CardController : SVSimController
{
rewardList.Add(new RewardListEntry
{
RewardType = grant.RewardType,
RewardType = (int)grant.RewardType,
RewardId = grant.RewardId,
RewardNum = grant.RewardNum,
});

4
SVSim.EmulatedEntrypoint/Controllers/ItemPurchaseController.cs
View File

@@ -145,9 +145,7 @@ public class ItemPurchaseController : SVSimController
return new ItemPurchasePurchaseResponse
{
RewardList = result.RewardList
.Select(g => new RewardListEntry { RewardType = g.RewardType, RewardId = g.RewardId, RewardNum = g.RewardNum })
.ToList(),
RewardList = result.RewardList.ToRewardList(),
};
}

24
SVSim.EmulatedEntrypoint/Controllers/LeaderSkinController.cs
View File

@@ -139,7 +139,7 @@ public class LeaderSkinController : SVSimController
Status = rewardStatus,
Items = s.SetCompletionRewards.OrderBy(r => r.OrderIndex).Select(r => new SkinSeriesRewardItemDto
{
RewardType = r.RewardType,
RewardType = (int)r.RewardType,
RewardDetailId = r.RewardDetailId,
RewardNumber = r.RewardNumber,
}).ToList(),
@@ -203,14 +203,12 @@ public class LeaderSkinController : SVSimController
}
foreach (var r in product.Rewards.OrderBy(r => r.OrderIndex))
await tx.GrantAsync((UserGoodsType)r.RewardType, r.RewardDetailId, r.RewardNumber);
await tx.GrantAsync(r.RewardType, r.RewardDetailId, r.RewardNumber);
var result = await tx.CommitAsync(HttpContext.RequestAborted);
return new LeaderSkinBuyResponse
{
RewardList = result.RewardList
.Select(g => new RewardListEntry { RewardType = g.RewardType, RewardId = g.RewardId, RewardNum = g.RewardNum })
.ToList(),
RewardList = result.RewardList.ToRewardList(),
};
}
@@ -260,15 +258,13 @@ public class LeaderSkinController : SVSimController
foreach (var p in series.Products.OrderBy(p => p.Id))
{
foreach (var r in p.Rewards.OrderBy(r => r.OrderIndex))
await tx.GrantAsync((UserGoodsType)r.RewardType, r.RewardDetailId, r.RewardNumber);
await tx.GrantAsync(r.RewardType, r.RewardDetailId, r.RewardNumber);
}
var result = await tx.CommitAsync(HttpContext.RequestAborted);
return new LeaderSkinBuyResponse
{
RewardList = result.RewardList
.Select(g => new RewardListEntry { RewardType = g.RewardType, RewardId = g.RewardId, RewardNum = g.RewardNum })
.ToList(),
RewardList = result.RewardList.ToRewardList(),
};
}
@@ -298,7 +294,7 @@ public class LeaderSkinController : SVSimController
return BadRequest(new { error = "series_not_completed" });
foreach (var r in series.SetCompletionRewards.OrderBy(r => r.OrderIndex))
await tx.GrantAsync((UserGoodsType)r.RewardType, r.RewardDetailId, r.RewardNumber);
await tx.GrantAsync(r.RewardType, r.RewardDetailId, r.RewardNumber);
_db.ViewerLeaderSkinSetClaims.Add(new ViewerLeaderSkinSetClaim
{
@@ -310,9 +306,7 @@ public class LeaderSkinController : SVSimController
var result = await tx.CommitAsync(HttpContext.RequestAborted);
return new LeaderSkinBuyResponse
{
RewardList = result.RewardList
.Select(g => new RewardListEntry { RewardType = g.RewardType, RewardId = g.RewardId, RewardNum = g.RewardNum })
.ToList(),
RewardList = result.RewardList.ToRewardList(),
};
}
@@ -362,7 +356,7 @@ public class LeaderSkinController : SVSimController
},
Rewards = p.Rewards.OrderBy(r => r.OrderIndex).Select(r => new SkinProductRewardDto
{
RewardType = r.RewardType,
RewardType = (int)r.RewardType,
RewardDetailId = r.RewardDetailId,
RewardNumber = r.RewardNumber,
IsOwned = IsRewardOwned(r, ownedSkinIds),
@@ -379,7 +373,7 @@ public class LeaderSkinController : SVSimController
private static bool IsRewardOwned(LeaderSkinShopProductRewardEntry r, IReadOnlySet<int> ownedSkinIds)
{
// Skin reward: direct check.
if (r.RewardType == (int)UserGoodsType.Skin)
if (r.RewardType == UserGoodsType.Skin)
return ownedSkinIds.Contains((int)r.RewardDetailId);
// Other types: we don't have the full cosmetic-owned graph in scope here. The product's
// sibling Skin reward tells us whether the bundle was purchased; piggy-back on that by

4
SVSim.EmulatedEntrypoint/Controllers/PackController.cs
View File

@@ -418,9 +418,7 @@ public class PackController : SVSimController
// CommitAsync saves all mutations and produces reward_list with currency-collision resolved.
// Tutorial path never calls TrySpendAsync so no currency op is in the log — correct.
var result = await tx.CommitAsync(HttpContext.RequestAborted);
var rewardList = result.RewardList
.Select(g => new RewardListEntry { RewardType = g.RewardType, RewardId = g.RewardId, RewardNum = g.RewardNum })
.ToList();
var rewardList = result.RewardList.ToRewardList();
return new PackOpenResponse
{

8
SVSim.EmulatedEntrypoint/Controllers/PuzzleController.cs
View File

@@ -109,7 +109,7 @@ public class PuzzleController : SVSimController
RewardList = new List<PuzzleMissionRewardResponse>
{
new() {
RewardType = s.Mission.RewardType,
RewardType = (int)s.Mission.RewardType,
RewardDetailId = s.Mission.RewardDetailId,
RewardNumber = s.Mission.RewardNumber,
},
@@ -182,7 +182,7 @@ public class PuzzleController : SVSimController
try
{
granted = await tx.GrantAsync(
(UserGoodsType)status.Mission.RewardType,
status.Mission.RewardType,
status.Mission.RewardDetailId,
status.Mission.RewardNumber);
}
@@ -200,7 +200,7 @@ public class PuzzleController : SVSimController
});
response.AchievedInfo.AchievedMissionRewardList.Add(new PuzzleAchievedMissionReward
{
MissionRewardType = status.Mission.RewardType,
MissionRewardType = (int)status.Mission.RewardType,
MissionRewardDetailId = status.Mission.RewardDetailId,
MissionRewardNumber = status.Mission.RewardNumber,
});
@@ -208,7 +208,7 @@ public class PuzzleController : SVSimController
{
response.RewardList.Add(new TreasureRewardResponse
{
RewardType = g.RewardType,
RewardType = (int)g.RewardType,
RewardId = g.RewardId,
RewardNum = g.RewardNum,
});

10
SVSim.EmulatedEntrypoint/Controllers/SleeveController.cs
View File

@@ -68,7 +68,7 @@ public class SleeveController : SVSimController
IsPurchasedProduct = IsProductPurchased(p, ownedSleeveIds),
Rewards = p.Rewards.OrderBy(r => r.OrderIndex).Select(r => new SleeveProductRewardDto
{
RewardType = r.RewardType,
RewardType = (int)r.RewardType,
RewardDetailId = r.RewardDetailId,
RewardNumber = r.RewardNumber,
}).ToList(),
@@ -142,15 +142,13 @@ public class SleeveController : SVSimController
// Grant each catalog reward through the central dispatcher.
foreach (var r in product.Rewards.OrderBy(r => r.OrderIndex))
await tx.GrantAsync((UserGoodsType)r.RewardType, r.RewardDetailId, r.RewardNumber);
await tx.GrantAsync(r.RewardType, r.RewardDetailId, r.RewardNumber);
var result = await tx.CommitAsync(HttpContext.RequestAborted);
return new SleeveBuyResponse
{
RewardList = result.RewardList
.Select(g => new RewardListEntry { RewardType = g.RewardType, RewardId = g.RewardId, RewardNum = g.RewardNum })
.ToList(),
RewardList = result.RewardList.ToRewardList(),
};
}
@@ -164,7 +162,7 @@ public class SleeveController : SVSimController
{
foreach (var r in product.Rewards)
{
if (r.RewardType == (int)UserGoodsType.Sleeve && ownedSleeveIds.Contains(r.RewardDetailId))
if (r.RewardType == UserGoodsType.Sleeve && ownedSleeveIds.Contains(r.RewardDetailId))
return true;
}
return false;

10
SVSim.EmulatedEntrypoint/Controllers/SpotCardExchangeController.cs
View File

@@ -143,15 +143,7 @@ public class SpotCardExchangeController : SVSimController
// Grant the card itself via the inventory tx (handles cosmetic cascade).
var granted = await tx.GrantAsync(UserGoodsType.Card, entry.Id, 1);
foreach (var g in granted)
{
rewardList.Add(new RewardListEntry
{
RewardType = g.RewardType,
RewardId = g.RewardId,
RewardNum = g.RewardNum,
});
}
rewardList.AddRange(granted.ToRewardList());
_db.ViewerSpotCardExchanges.Add(new ViewerSpotCardExchange
{

21
SVSim.EmulatedEntrypoint/Models/Dtos/RewardListExtensions.cs Normal file
View File

@@ -0,0 +1,21 @@
using SVSim.Database.Services;
namespace SVSim.EmulatedEntrypoint.Models.Dtos;
/// <summary>
/// Projects inventory <see cref="GrantedReward"/> results (post-state totals or per-grant deltas)
/// into the wire <see cref="RewardListEntry"/> shape. The <c>reward_type</c> enum is widened to its
/// int wire value at this single boundary. Replaces the per-endpoint copies of this projection
/// (pack/open, leader_skin/buy*, build_deck/buy, sleeve/buy, item_purchase, spot_card_exchange,
/// gacha-point exchange).
/// </summary>
public static class RewardListExtensions
{
public static List<RewardListEntry> ToRewardList(this IEnumerable<GrantedReward> grants) =>
grants.Select(g => new RewardListEntry
{
RewardType = (int)g.RewardType,
RewardId = g.RewardId,
RewardNum = g.RewardNum,
}).ToList();
}

8
SVSim.EmulatedEntrypoint/Services/ArenaTwoPickService.cs
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);

6
SVSim.EmulatedEntrypoint/Services/BattlePassService.cs
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)),

4
SVSim.EmulatedEntrypoint/Services/GachaPointService.cs
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);
}

6
SVSim.EmulatedEntrypoint/Services/MissionAssembler.cs
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(),
};

6
SVSim.EmulatedEntrypoint/Services/StoryService.cs
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(),
});