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.UnitTests/Controllers/BattlePassControllerBuyTests.cs
View File

@@ -37,7 +37,7 @@ public class BattlePassControllerBuyTests
db.BattlePassRewards.Add(new BattlePassRewardEntry
{
Id = MakeRewardId(23, BattlePassTrack.Premium, 2),
SeasonId = 23, Track = BattlePassTrack.Premium, Level = 2, RewardType = 9,
SeasonId = 23, Track = BattlePassTrack.Premium, Level = 2, RewardType = (UserGoodsType)9,
RewardDetailId = 0, RewardNumber = 20, IsAppealExclusion = false,
});
var v = await db.Viewers.FirstAsync(x => x.Id == viewerId);

4
SVSim.UnitTests/Controllers/BattlePassControllerInfoTests.cs
View File

@@ -35,13 +35,13 @@ public class BattlePassControllerInfoTests
db.BattlePassRewards.Add(new BattlePassRewardEntry
{
Id = 23 * 10_000L + 0 * 1_000 + 2, // MakeId(23, Normal=0, 2)
SeasonId = 23, Track = BattlePassTrack.Normal, Level = 2, RewardType = 9,
SeasonId = 23, Track = BattlePassTrack.Normal, Level = 2, RewardType = (UserGoodsType)9,
RewardDetailId = 0, RewardNumber = 50, IsAppealExclusion = false,
});
db.BattlePassRewards.Add(new BattlePassRewardEntry
{
Id = 23 * 10_000L + 1 * 1_000 + 2, // MakeId(23, Premium=1, 2)
SeasonId = 23, Track = BattlePassTrack.Premium, Level = 2, RewardType = 9,
SeasonId = 23, Track = BattlePassTrack.Premium, Level = 2, RewardType = (UserGoodsType)9,
RewardDetailId = 0, RewardNumber = 20, IsAppealExclusion = false,
});
await db.SaveChangesAsync();

6
SVSim.UnitTests/Controllers/BuildDeckControllerBuyTests.cs
View File

@@ -113,7 +113,7 @@ public class BuildDeckControllerBuyTests
{
new BuildDeckProductRewardEntry
{
RewardIndex = 1, RewardType = 6 /* Sleeve */,
RewardIndex = 1, RewardType = (UserGoodsType)6 /* Sleeve */,
RewardDetailId = 3000021, RewardNumber = 1, MessageId = 51004,
},
},
@@ -383,13 +383,13 @@ public class BuildDeckControllerBuyTests
// Tier 1: one card reward, unlocked on the 1st series purchase.
new BuildDeckSeriesRewardEntry
{
TierIndex = 1, ItemIndex = 0, RewardType = 5,
TierIndex = 1, ItemIndex = 0, RewardType = (UserGoodsType)5,
RewardDetailId = 10001001L, RewardNumber = 1, MessageId = 51004,
},
// Tier 2: one card reward, unlocked on the 2nd series purchase.
new BuildDeckSeriesRewardEntry
{
TierIndex = 2, ItemIndex = 0, RewardType = 5,
TierIndex = 2, ItemIndex = 0, RewardType = (UserGoodsType)5,
RewardDetailId = 10001002L, RewardNumber = 1, MessageId = 51004,
},
},

7
SVSim.UnitTests/Controllers/LeaderSkinShopControllerTests.cs
View File

@@ -4,6 +4,7 @@ using System.Text.Json;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.DependencyInjection;
using SVSim.Database;
using SVSim.Database.Enums;
using SVSim.Database.Models;
using SVSim.UnitTests.Infrastructure;
@@ -46,19 +47,19 @@ public class LeaderSkinShopControllerTests
Id = 90011, SeriesId = 9001, LeaderSkinId = 9101,
ProductNameKey = "LSPPN_test_1", IntroductionKey = "LSPI_test_1", CvNameKey = "LSPCN_test_1",
SinglePriceCrystal = 500, SinglePriceRupy = 500, IsEnabled = true,
Rewards = { new LeaderSkinShopProductRewardEntry { OrderIndex = 0, RewardType = 10, RewardDetailId = 9101, RewardNumber = 1 } },
Rewards = { new LeaderSkinShopProductRewardEntry { OrderIndex = 0, RewardType = (UserGoodsType)10, RewardDetailId = 9101, RewardNumber = 1 } },
},
new LeaderSkinShopProductEntry
{
Id = 90012, SeriesId = 9001, LeaderSkinId = 9102,
ProductNameKey = "LSPPN_test_2", IntroductionKey = "LSPI_test_2", CvNameKey = "LSPCN_test_2",
SinglePriceCrystal = 500, SinglePriceRupy = 500, IsEnabled = true,
Rewards = { new LeaderSkinShopProductRewardEntry { OrderIndex = 0, RewardType = 10, RewardDetailId = 9102, RewardNumber = 1 } },
Rewards = { new LeaderSkinShopProductRewardEntry { OrderIndex = 0, RewardType = (UserGoodsType)10, RewardDetailId = 9102, RewardNumber = 1 } },
},
},
SetCompletionRewards =
{
new LeaderSkinShopSeriesRewardEntry { OrderIndex = 0, RewardType = 9, RewardDetailId = 0, RewardNumber = 500 },
new LeaderSkinShopSeriesRewardEntry { OrderIndex = 0, RewardType = (UserGoodsType)9, RewardDetailId = 0, RewardNumber = 500 },
},
});
await db.SaveChangesAsync();

5
SVSim.UnitTests/Controllers/SleeveControllerTests.cs
View File

@@ -4,6 +4,7 @@ using System.Text.Json;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.DependencyInjection;
using SVSim.Database;
using SVSim.Database.Enums;
using SVSim.Database.Models;
using SVSim.UnitTests.Infrastructure;
@@ -44,8 +45,8 @@ public class SleeveControllerTests
IsEnabled = true,
Rewards =
{
new SleeveShopProductRewardEntry { OrderIndex = 0, RewardType = 7, RewardDetailId = testEmblemId, RewardNumber = 1 },
new SleeveShopProductRewardEntry { OrderIndex = 1, RewardType = 6, RewardDetailId = testSleeveId, RewardNumber = 1 },
new SleeveShopProductRewardEntry { OrderIndex = 0, RewardType = (UserGoodsType)7, RewardDetailId = testEmblemId, RewardNumber = 1 },
new SleeveShopProductRewardEntry { OrderIndex = 1, RewardType = (UserGoodsType)6, RewardDetailId = testSleeveId, RewardNumber = 1 },
},
},
},