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

2
SVSim.Database/Services/Inventory/InventoryGrantTypes.cs
View File

@@ -11,7 +11,7 @@ namespace SVSim.Database.Services;
/// <c>/story/*/finish</c>. reward_num is a POST-STATE TOTAL for currencies and a count for
/// collection grants — see <see cref="Models.RewardListEntry"/>.
/// </summary>
public sealed record GrantedReward(int RewardType, long RewardId, int RewardNum);
public sealed record GrantedReward(UserGoodsType RewardType, long RewardId, int RewardNum);
/// <summary>
/// Cosmetic projection bundle for /load/index. The four id-lists are "what the viewer owns"

14
SVSim.Database/Services/Inventory/InventoryTransaction.cs
View File

@@ -309,7 +309,7 @@ internal sealed class InventoryTransaction : IInventoryTransaction
var output = new List<GrantedReward>();
foreach (var type in orderedTouches)
{
output.Add(new GrantedReward((int)type, 0, lastCurrencyPost[type]));
output.Add(new GrantedReward(type, 0, lastCurrencyPost[type]));
}
// Pass 2 — non-currency grants: one entry per (type, id) using LAST post-state for items
@@ -326,7 +326,7 @@ internal sealed class InventoryTransaction : IInventoryTransaction
}
foreach (var (type, id) in nonCurrencyOrder)
{
output.Add(new GrantedReward((int)type, id, nonCurrencyKey[(type, id)]));
output.Add(new GrantedReward(type, id, nonCurrencyKey[(type, id)]));
}
return output;
}
@@ -334,7 +334,7 @@ internal sealed class InventoryTransaction : IInventoryTransaction
private IReadOnlyList<GrantedReward> BuildDeltas()
=> _ops.OfType<GrantOp>()
.Where(o => !o.IsCascade)
.Select(o => new GrantedReward((int)o.Type, o.DetailId, o.Num))
.Select(o => new GrantedReward(o.Type, o.DetailId, o.Num))
.ToList();
private static bool IsCurrency(UserGoodsType t) =>
@@ -353,7 +353,7 @@ internal sealed class InventoryTransaction : IInventoryTransaction
};
private static IReadOnlyList<GrantedReward> Single(UserGoodsType type, long id, int num)
=> new[] { new GrantedReward((int)type, id, num) };
=> new[] { new GrantedReward(type, id, num) };
private void ThrowIfCommitted()
{
@@ -381,7 +381,7 @@ internal sealed class InventoryTransaction : IInventoryTransaction
var results = new List<GrantedReward>
{
new((int)UserGoodsType.Card, cardId, postCount),
new(UserGoodsType.Card, cardId, postCount),
};
_ops.Add(new GrantOp(UserGoodsType.Card, cardId, num, postCount, false));
@@ -394,8 +394,8 @@ internal sealed class InventoryTransaction : IInventoryTransaction
{
if (TryAddCascadeCosmetic(reward, lookupId))
{
results.Add(new GrantedReward((int)reward.Type, reward.CosmeticId, 1));
_ops.Add(new GrantOp((UserGoodsType)(int)reward.Type, reward.CosmeticId, 1, 1, true));
results.Add(new GrantedReward((UserGoodsType)reward.Type, reward.CosmeticId, 1));
_ops.Add(new GrantOp((UserGoodsType)reward.Type, reward.CosmeticId, 1, 1, true));
}
}