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

3
SVSim.Bootstrap/Importers/AchievementCatalogImporter.cs
View File

@@ -1,6 +1,7 @@
using Microsoft.EntityFrameworkCore;
using SVSim.Bootstrap.Models.Seed;
using SVSim.Database;
using SVSim.Database.Enums;
using SVSim.Database.Models;
namespace SVSim.Bootstrap.Importers;
@@ -36,7 +37,7 @@ public class AchievementCatalogImporter
};
entry.Name = s.Name;
entry.RequireNumber = s.RequireNumber;
entry.RewardType = s.RewardType;
entry.RewardType = (UserGoodsType)s.RewardType;
entry.RewardDetailId = s.RewardDetailId;
entry.RewardNumber = s.RewardNumber;
entry.OrderNum = s.OrderNum;

5
SVSim.Bootstrap/Importers/ArenaTwoPickRewardImporter.cs
View File

@@ -1,6 +1,7 @@
using Microsoft.EntityFrameworkCore;
using SVSim.Bootstrap.Models.Seed;
using SVSim.Database;
using SVSim.Database.Enums;
using SVSim.Database.Models;
namespace SVSim.Bootstrap.Importers;
@@ -27,7 +28,7 @@ public class ArenaTwoPickRewardImporter
int upserted = 0;
foreach (var s in seeds)
{
if (existing.TryGetValue((s.WinCount, s.RewardGroup, s.RewardType, s.RewardId, s.RewardNum), out var row))
if (existing.TryGetValue((s.WinCount, s.RewardGroup, (UserGoodsType)s.RewardType, s.RewardId, s.RewardNum), out var row))
{
row.Weight = s.Weight;
}
@@ -38,7 +39,7 @@ public class ArenaTwoPickRewardImporter
WinCount = s.WinCount,
RewardGroup = s.RewardGroup,
Weight = s.Weight,
RewardType = s.RewardType,
RewardType = (UserGoodsType)s.RewardType,
RewardId = s.RewardId,
RewardNum = s.RewardNum,
});

3
SVSim.Bootstrap/Importers/BattlePassMonthlyMissionImporter.cs
View File

@@ -1,6 +1,7 @@
using Microsoft.EntityFrameworkCore;
using SVSim.Bootstrap.Models.Seed;
using SVSim.Database;
using SVSim.Database.Enums;
using SVSim.Database.Models;
namespace SVSim.Bootstrap.Importers;
@@ -38,7 +39,7 @@ public class BattlePassMonthlyMissionImporter
entry.Name = s.Name;
entry.RequireNumber = s.RequireNumber;
entry.BattlePassPoint = s.BattlePassPoint;
entry.RewardType = s.RewardType;
entry.RewardType = (UserGoodsType?)s.RewardType;
entry.RewardDetailId = s.RewardDetailId;
entry.RewardNumber = s.RewardNumber;
entry.EventType = s.EventType;

4
SVSim.Bootstrap/Importers/BattlePassRewardImporter.cs
View File

@@ -38,7 +38,7 @@ public class BattlePassRewardImporter
seenKeys.Add(key);
if (dbByKey.TryGetValue(key, out var ex))
{
ex.RewardType = s.RewardType;
ex.RewardType = (UserGoodsType)s.RewardType;
ex.RewardDetailId = s.RewardDetailId;
ex.RewardNumber = s.RewardNumber;
ex.IsAppealExclusion = s.IsAppealExclusion;
@@ -50,7 +50,7 @@ public class BattlePassRewardImporter
{
Id = MakeId(s.SeasonId, track, s.Level),
SeasonId = s.SeasonId, Track = track, Level = s.Level,
RewardType = s.RewardType, RewardDetailId = s.RewardDetailId,
RewardType = (UserGoodsType)s.RewardType, RewardDetailId = s.RewardDetailId,
RewardNumber = s.RewardNumber, IsAppealExclusion = s.IsAppealExclusion,
});
created++;

5
SVSim.Bootstrap/Importers/BuildDeckImporter.cs
View File

@@ -1,6 +1,7 @@
using Microsoft.EntityFrameworkCore;
using SVSim.Bootstrap.Models.Seed;
using SVSim.Database;
using SVSim.Database.Enums;
using SVSim.Database.Models;
namespace SVSim.Bootstrap.Importers;
@@ -174,7 +175,7 @@ public class BuildDeckImporter
{
TierIndex = r.TierIndex,
ItemIndex = r.ItemIndex,
RewardType = r.RewardType,
RewardType = (UserGoodsType)r.RewardType,
RewardDetailId = r.RewardDetailId,
RewardNumber = r.RewardNumber,
MessageId = r.MessageId,
@@ -208,7 +209,7 @@ public class BuildDeckImporter
productRow.Rewards.Add(new BuildDeckProductRewardEntry
{
RewardIndex = r.RewardIndex,
RewardType = r.RewardType,
RewardType = (UserGoodsType)r.RewardType,
RewardDetailId = r.RewardDetailId,
RewardNumber = r.RewardNumber,
MessageId = r.MessageId,

5
SVSim.Bootstrap/Importers/LeaderSkinShopImporter.cs
View File

@@ -1,6 +1,7 @@
using Microsoft.EntityFrameworkCore;
using SVSim.Bootstrap.Models.Seed;
using SVSim.Database;
using SVSim.Database.Enums;
using SVSim.Database.Models;
namespace SVSim.Bootstrap.Importers;
@@ -61,7 +62,7 @@ public class LeaderSkinShopImporter
series.SetCompletionRewards.Add(new LeaderSkinShopSeriesRewardEntry
{
OrderIndex = r.OrderIndex,
RewardType = r.RewardType,
RewardType = (UserGoodsType)r.RewardType,
RewardDetailId = r.RewardDetailId,
RewardNumber = r.RewardNumber,
});
@@ -98,7 +99,7 @@ public class LeaderSkinShopImporter
product.Rewards.Add(new LeaderSkinShopProductRewardEntry
{
OrderIndex = r.OrderIndex,
RewardType = r.RewardType,
RewardType = (UserGoodsType)r.RewardType,
RewardDetailId = r.RewardDetailId,
RewardNumber = r.RewardNumber,
});

3
SVSim.Bootstrap/Importers/MissionCatalogImporter.cs
View File

@@ -1,6 +1,7 @@
using Microsoft.EntityFrameworkCore;
using SVSim.Bootstrap.Models.Seed;
using SVSim.Database;
using SVSim.Database.Enums;
using SVSim.Database.Models;
namespace SVSim.Bootstrap.Importers;
@@ -30,7 +31,7 @@ public class MissionCatalogImporter
entry.Name = s.Name;
entry.LotType = s.LotType;
entry.RequireNumber = s.RequireNumber;
entry.RewardType = s.RewardType;
entry.RewardType = (UserGoodsType)s.RewardType;
entry.RewardDetailId = s.RewardDetailId;
entry.RewardNumber = s.RewardNumber;
entry.BattlePassPoint = s.BattlePassPoint;

3
SVSim.Bootstrap/Importers/PuzzleImporter.cs
View File

@@ -2,6 +2,7 @@ using System.Text.Json;
using Microsoft.EntityFrameworkCore;
using SVSim.Bootstrap.Models.Seed;
using SVSim.Database;
using SVSim.Database.Enums;
using SVSim.Database.Models;
namespace SVSim.Bootstrap.Importers;
@@ -121,7 +122,7 @@ public class PuzzleImporter
entry.RequireNumber = s.RequireNumber;
entry.CampaignCommenceTime = s.CampaignCommenceTime;
entry.OrderId = s.OrderId;
entry.RewardType = s.RewardType;
entry.RewardType = (UserGoodsType)s.RewardType;
entry.RewardDetailId = s.RewardDetailId;
entry.RewardNumber = s.RewardNumber;
entry.TargetPuzzleGroupId = s.TargetPuzzleGroupId;

3
SVSim.Bootstrap/Importers/SleeveShopImporter.cs
View File

@@ -1,6 +1,7 @@
using Microsoft.EntityFrameworkCore;
using SVSim.Bootstrap.Models.Seed;
using SVSim.Database;
using SVSim.Database.Enums;
using SVSim.Database.Models;
namespace SVSim.Bootstrap.Importers;
@@ -72,7 +73,7 @@ public class SleeveShopImporter
product.Rewards.Add(new SleeveShopProductRewardEntry
{
OrderIndex = r.OrderIndex,
RewardType = r.RewardType,
RewardType = (UserGoodsType)r.RewardType,
RewardDetailId = r.RewardDetailId,
RewardNumber = r.RewardNumber,
});

3
SVSim.Bootstrap/Importers/StoryImporter.cs
View File

@@ -3,6 +3,7 @@ using System.Text.Json.Serialization;
using Microsoft.EntityFrameworkCore;
using SVSim.Database;
using SVSim.Database.Entities.Story;
using SVSim.Database.Enums;
namespace SVSim.Bootstrap.Importers;
@@ -185,7 +186,7 @@ public class StoryImporter
foreach (var r in c.StoryReward ?? new())
row.Rewards.Add(new StoryChapterReward
{
RewardType = r.RewardType,
RewardType = (UserGoodsType)r.RewardType,
RewardDetailId = r.RewardDetailId,
RewardNumber = r.RewardNumber,
});