From 05d81690128d57180e69f9102080b7e8182dfb34 Mon Sep 17 00:00:00 2001 From: gamer147 Date: Wed, 3 Jun 2026 07:50:49 -0400 Subject: [PATCH] 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 --- .../Importers/AchievementCatalogImporter.cs | 3 ++- .../Importers/ArenaTwoPickRewardImporter.cs | 5 ++-- .../BattlePassMonthlyMissionImporter.cs | 3 ++- .../Importers/BattlePassRewardImporter.cs | 4 ++-- .../Importers/BuildDeckImporter.cs | 5 ++-- .../Importers/LeaderSkinShopImporter.cs | 5 ++-- .../Importers/MissionCatalogImporter.cs | 3 ++- SVSim.Bootstrap/Importers/PuzzleImporter.cs | 3 ++- .../Importers/SleeveShopImporter.cs | 3 ++- SVSim.Bootstrap/Importers/StoryImporter.cs | 3 ++- .../Entities/Story/StoryChapterReward.cs | 4 +++- .../Models/AchievementCatalogEntry.cs | 3 ++- SVSim.Database/Models/ArenaTwoPickReward.cs | 2 +- .../Models/BattlePassMonthlyMissionEntry.cs | 3 ++- .../Models/BattlePassRewardEntry.cs | 2 +- .../Models/BuildDeckProductRewardEntry.cs | 3 ++- .../Models/BuildDeckSeriesRewardEntry.cs | 3 ++- .../LeaderSkinShopProductRewardEntry.cs | 3 ++- .../Models/LeaderSkinShopSeriesRewardEntry.cs | 3 ++- SVSim.Database/Models/MissionCatalogEntry.cs | 3 ++- SVSim.Database/Models/PuzzleMissionEntry.cs | 3 ++- .../Models/SleeveShopProductRewardEntry.cs | 3 ++- .../Services/Inventory/InventoryGrantTypes.cs | 2 +- .../Inventory/InventoryTransaction.cs | 14 +++++------ .../Controllers/AchievementController.cs | 6 ++--- .../Controllers/BattlePassController.cs | 4 ++-- .../Controllers/BuildDeckController.cs | 14 +++++------ .../Controllers/CardController.cs | 4 ++-- .../Controllers/ItemPurchaseController.cs | 4 +--- .../Controllers/LeaderSkinController.cs | 24 +++++++------------ .../Controllers/PackController.cs | 4 +--- .../Controllers/PuzzleController.cs | 8 +++---- .../Controllers/SleeveController.cs | 10 ++++---- .../Controllers/SpotCardExchangeController.cs | 10 +------- .../Models/Dtos/RewardListExtensions.cs | 21 ++++++++++++++++ .../Services/ArenaTwoPickService.cs | 8 +++---- .../Services/BattlePassService.cs | 6 ++--- .../Services/GachaPointService.cs | 4 +--- .../Services/MissionAssembler.cs | 6 ++--- .../Services/StoryService.cs | 6 ++--- .../BattlePassControllerBuyTests.cs | 2 +- .../BattlePassControllerInfoTests.cs | 4 ++-- .../BuildDeckControllerBuyTests.cs | 6 ++--- .../LeaderSkinShopControllerTests.cs | 7 +++--- .../Controllers/SleeveControllerTests.cs | 5 ++-- .../AchievementCatalogImporterTests.cs | 3 ++- .../ArenaTwoPickRewardImporterTests.cs | 9 +++---- .../BattlePassRewardImporterTests.cs | 4 ++-- .../Importers/MissionCatalogImporterTests.cs | 3 ++- .../Importers/PuzzleSeedingPipelineTests.cs | 2 +- .../Importers/SleeveShopImporterTests.cs | 5 ++-- .../CardInventoryRepositoryTests.cs | 6 ++--- ...ArenaTwoPickServiceWeightedRewardsTests.cs | 12 +++++----- .../Services/BattlePassServiceTests.cs | 6 ++--- .../Inventory/InventoryCommitTests.cs | 8 +++---- .../Inventory/InventoryGrantCardTests.cs | 4 ++-- .../Inventory/InventoryGrantCosmeticTests.cs | 2 +- .../Inventory/InventoryGrantCurrencyTests.cs | 2 +- .../Services/MissionProgressServiceTests.cs | 3 ++- SVSim.UnitTests/Story/StoryServiceTests.cs | 13 +++++----- 60 files changed, 179 insertions(+), 154 deletions(-) create mode 100644 SVSim.EmulatedEntrypoint/Models/Dtos/RewardListExtensions.cs diff --git a/SVSim.Bootstrap/Importers/AchievementCatalogImporter.cs b/SVSim.Bootstrap/Importers/AchievementCatalogImporter.cs index da327a4..5d2349c 100644 --- a/SVSim.Bootstrap/Importers/AchievementCatalogImporter.cs +++ b/SVSim.Bootstrap/Importers/AchievementCatalogImporter.cs @@ -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; diff --git a/SVSim.Bootstrap/Importers/ArenaTwoPickRewardImporter.cs b/SVSim.Bootstrap/Importers/ArenaTwoPickRewardImporter.cs index 5bca51d..509a618 100644 --- a/SVSim.Bootstrap/Importers/ArenaTwoPickRewardImporter.cs +++ b/SVSim.Bootstrap/Importers/ArenaTwoPickRewardImporter.cs @@ -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, }); diff --git a/SVSim.Bootstrap/Importers/BattlePassMonthlyMissionImporter.cs b/SVSim.Bootstrap/Importers/BattlePassMonthlyMissionImporter.cs index 8986c15..4518544 100644 --- a/SVSim.Bootstrap/Importers/BattlePassMonthlyMissionImporter.cs +++ b/SVSim.Bootstrap/Importers/BattlePassMonthlyMissionImporter.cs @@ -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; diff --git a/SVSim.Bootstrap/Importers/BattlePassRewardImporter.cs b/SVSim.Bootstrap/Importers/BattlePassRewardImporter.cs index f689ed7..cd84ca7 100644 --- a/SVSim.Bootstrap/Importers/BattlePassRewardImporter.cs +++ b/SVSim.Bootstrap/Importers/BattlePassRewardImporter.cs @@ -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++; diff --git a/SVSim.Bootstrap/Importers/BuildDeckImporter.cs b/SVSim.Bootstrap/Importers/BuildDeckImporter.cs index e02c2a1..ac166e6 100644 --- a/SVSim.Bootstrap/Importers/BuildDeckImporter.cs +++ b/SVSim.Bootstrap/Importers/BuildDeckImporter.cs @@ -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, diff --git a/SVSim.Bootstrap/Importers/LeaderSkinShopImporter.cs b/SVSim.Bootstrap/Importers/LeaderSkinShopImporter.cs index 9ccc5a2..5a9dc2e 100644 --- a/SVSim.Bootstrap/Importers/LeaderSkinShopImporter.cs +++ b/SVSim.Bootstrap/Importers/LeaderSkinShopImporter.cs @@ -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, }); diff --git a/SVSim.Bootstrap/Importers/MissionCatalogImporter.cs b/SVSim.Bootstrap/Importers/MissionCatalogImporter.cs index 036eb20..5eab683 100644 --- a/SVSim.Bootstrap/Importers/MissionCatalogImporter.cs +++ b/SVSim.Bootstrap/Importers/MissionCatalogImporter.cs @@ -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; diff --git a/SVSim.Bootstrap/Importers/PuzzleImporter.cs b/SVSim.Bootstrap/Importers/PuzzleImporter.cs index 15dceb8..ee819d6 100644 --- a/SVSim.Bootstrap/Importers/PuzzleImporter.cs +++ b/SVSim.Bootstrap/Importers/PuzzleImporter.cs @@ -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; diff --git a/SVSim.Bootstrap/Importers/SleeveShopImporter.cs b/SVSim.Bootstrap/Importers/SleeveShopImporter.cs index ee71026..1fa1a76 100644 --- a/SVSim.Bootstrap/Importers/SleeveShopImporter.cs +++ b/SVSim.Bootstrap/Importers/SleeveShopImporter.cs @@ -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, }); diff --git a/SVSim.Bootstrap/Importers/StoryImporter.cs b/SVSim.Bootstrap/Importers/StoryImporter.cs index 9549078..7ced07d 100644 --- a/SVSim.Bootstrap/Importers/StoryImporter.cs +++ b/SVSim.Bootstrap/Importers/StoryImporter.cs @@ -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, }); diff --git a/SVSim.Database/Entities/Story/StoryChapterReward.cs b/SVSim.Database/Entities/Story/StoryChapterReward.cs index 265eadd..0f04846 100644 --- a/SVSim.Database/Entities/Story/StoryChapterReward.cs +++ b/SVSim.Database/Entities/Story/StoryChapterReward.cs @@ -1,9 +1,11 @@ +using SVSim.Database.Enums; + namespace SVSim.Database.Entities.Story; [Microsoft.EntityFrameworkCore.Owned] public class StoryChapterReward { - public int RewardType { get; set; } + public UserGoodsType RewardType { get; set; } public long RewardDetailId { get; set; } public int RewardNumber { get; set; } } diff --git a/SVSim.Database/Models/AchievementCatalogEntry.cs b/SVSim.Database/Models/AchievementCatalogEntry.cs index 5db492b..0f6bc82 100644 --- a/SVSim.Database/Models/AchievementCatalogEntry.cs +++ b/SVSim.Database/Models/AchievementCatalogEntry.cs @@ -1,4 +1,5 @@ using SVSim.Database.Common; +using SVSim.Database.Enums; namespace SVSim.Database.Models; @@ -14,7 +15,7 @@ public class AchievementCatalogEntry public int Level { get; set; } public string Name { get; set; } = ""; public int RequireNumber { get; set; } - public int RewardType { get; set; } + public UserGoodsType RewardType { get; set; } public long RewardDetailId { get; set; } public int RewardNumber { get; set; } public int OrderNum { get; set; } diff --git a/SVSim.Database/Models/ArenaTwoPickReward.cs b/SVSim.Database/Models/ArenaTwoPickReward.cs index e168147..cb8aedb 100644 --- a/SVSim.Database/Models/ArenaTwoPickReward.cs +++ b/SVSim.Database/Models/ArenaTwoPickReward.cs @@ -31,7 +31,7 @@ public class ArenaTwoPickReward public int Weight { get; set; } = 1; /// on the wire (e.g. Item=4, Rupy=9). - public int RewardType { get; set; } + public UserGoodsType RewardType { get; set; } /// Item id for Item; 0 for currencies. public long RewardId { get; set; } diff --git a/SVSim.Database/Models/BattlePassMonthlyMissionEntry.cs b/SVSim.Database/Models/BattlePassMonthlyMissionEntry.cs index 4ddec79..45803f9 100644 --- a/SVSim.Database/Models/BattlePassMonthlyMissionEntry.cs +++ b/SVSim.Database/Models/BattlePassMonthlyMissionEntry.cs @@ -1,5 +1,6 @@ using System.ComponentModel.DataAnnotations.Schema; using SVSim.Database.Common; +using SVSim.Database.Enums; namespace SVSim.Database.Models; @@ -20,7 +21,7 @@ public class BattlePassMonthlyMissionEntry : BaseEntity public string Name { get; set; } = ""; public int RequireNumber { get; set; } public int BattlePassPoint { get; set; } - public int? RewardType { get; set; } + public UserGoodsType? RewardType { get; set; } public long? RewardDetailId { get; set; } public int? RewardNumber { get; set; } public string? EventType { get; set; } diff --git a/SVSim.Database/Models/BattlePassRewardEntry.cs b/SVSim.Database/Models/BattlePassRewardEntry.cs index c226359..2312818 100644 --- a/SVSim.Database/Models/BattlePassRewardEntry.cs +++ b/SVSim.Database/Models/BattlePassRewardEntry.cs @@ -13,7 +13,7 @@ public class BattlePassRewardEntry : BaseEntity public int SeasonId { get; set; } public BattlePassTrack Track { get; set; } public int Level { get; set; } - public int RewardType { get; set; } + public UserGoodsType RewardType { get; set; } public long RewardDetailId { get; set; } public int RewardNumber { get; set; } public bool IsAppealExclusion { get; set; } diff --git a/SVSim.Database/Models/BuildDeckProductRewardEntry.cs b/SVSim.Database/Models/BuildDeckProductRewardEntry.cs index 4edd619..87bec71 100644 --- a/SVSim.Database/Models/BuildDeckProductRewardEntry.cs +++ b/SVSim.Database/Models/BuildDeckProductRewardEntry.cs @@ -1,4 +1,5 @@ using Microsoft.EntityFrameworkCore; +using SVSim.Database.Enums; namespace SVSim.Database.Models; @@ -11,7 +12,7 @@ namespace SVSim.Database.Models; public class BuildDeckProductRewardEntry { public int RewardIndex { get; set; } - public int RewardType { get; set; } // Wizard.UserGoods.Type + public UserGoodsType RewardType { get; set; } public long RewardDetailId { get; set; } public int RewardNumber { get; set; } public int MessageId { get; set; } diff --git a/SVSim.Database/Models/BuildDeckSeriesRewardEntry.cs b/SVSim.Database/Models/BuildDeckSeriesRewardEntry.cs index 07a64c2..a084679 100644 --- a/SVSim.Database/Models/BuildDeckSeriesRewardEntry.cs +++ b/SVSim.Database/Models/BuildDeckSeriesRewardEntry.cs @@ -1,4 +1,5 @@ using Microsoft.EntityFrameworkCore; +using SVSim.Database.Enums; namespace SVSim.Database.Models; @@ -13,7 +14,7 @@ public class BuildDeckSeriesRewardEntry { public int TierIndex { get; set; } // 1, 2, 3, ... — unlock threshold public int ItemIndex { get; set; } // ordinal within tier - public int RewardType { get; set; } + public UserGoodsType RewardType { get; set; } public long RewardDetailId { get; set; } public int RewardNumber { get; set; } public int MessageId { get; set; } diff --git a/SVSim.Database/Models/LeaderSkinShopProductRewardEntry.cs b/SVSim.Database/Models/LeaderSkinShopProductRewardEntry.cs index d5886fd..5920f3d 100644 --- a/SVSim.Database/Models/LeaderSkinShopProductRewardEntry.cs +++ b/SVSim.Database/Models/LeaderSkinShopProductRewardEntry.cs @@ -1,4 +1,5 @@ using Microsoft.EntityFrameworkCore; +using SVSim.Database.Enums; namespace SVSim.Database.Models; @@ -11,7 +12,7 @@ namespace SVSim.Database.Models; public class LeaderSkinShopProductRewardEntry { public int OrderIndex { get; set; } - public int RewardType { get; set; } // Wizard.UserGoods.Type + public UserGoodsType RewardType { get; set; } public long RewardDetailId { get; set; } public int RewardNumber { get; set; } } diff --git a/SVSim.Database/Models/LeaderSkinShopSeriesRewardEntry.cs b/SVSim.Database/Models/LeaderSkinShopSeriesRewardEntry.cs index 7971f9f..136c10b 100644 --- a/SVSim.Database/Models/LeaderSkinShopSeriesRewardEntry.cs +++ b/SVSim.Database/Models/LeaderSkinShopSeriesRewardEntry.cs @@ -1,4 +1,5 @@ using Microsoft.EntityFrameworkCore; +using SVSim.Database.Enums; namespace SVSim.Database.Models; @@ -12,7 +13,7 @@ namespace SVSim.Database.Models; public class LeaderSkinShopSeriesRewardEntry { public int OrderIndex { get; set; } - public int RewardType { get; set; } + public UserGoodsType RewardType { get; set; } public long RewardDetailId { get; set; } public int RewardNumber { get; set; } } diff --git a/SVSim.Database/Models/MissionCatalogEntry.cs b/SVSim.Database/Models/MissionCatalogEntry.cs index 7301a6c..30bdb6c 100644 --- a/SVSim.Database/Models/MissionCatalogEntry.cs +++ b/SVSim.Database/Models/MissionCatalogEntry.cs @@ -1,4 +1,5 @@ using SVSim.Database.Common; +using SVSim.Database.Enums; namespace SVSim.Database.Models; @@ -14,7 +15,7 @@ public class MissionCatalogEntry : BaseEntity public string Name { get; set; } = ""; public int LotType { get; set; } public int RequireNumber { get; set; } - public int RewardType { get; set; } + public UserGoodsType RewardType { get; set; } public long RewardDetailId { get; set; } public int RewardNumber { get; set; } public int BattlePassPoint { get; set; } diff --git a/SVSim.Database/Models/PuzzleMissionEntry.cs b/SVSim.Database/Models/PuzzleMissionEntry.cs index 11e0ab9..51d0db3 100644 --- a/SVSim.Database/Models/PuzzleMissionEntry.cs +++ b/SVSim.Database/Models/PuzzleMissionEntry.cs @@ -1,4 +1,5 @@ using SVSim.Database.Common; +using SVSim.Database.Enums; namespace SVSim.Database.Models; @@ -21,7 +22,7 @@ public class PuzzleMissionEntry : BaseEntity public int OrderId { get; set; } // Reward (single-entry per mission) - public int RewardType { get; set; } // UserGoodsType + public UserGoodsType RewardType { get; set; } public long RewardDetailId { get; set; } public int RewardNumber { get; set; } diff --git a/SVSim.Database/Models/SleeveShopProductRewardEntry.cs b/SVSim.Database/Models/SleeveShopProductRewardEntry.cs index 5e7d1da..48cbe5c 100644 --- a/SVSim.Database/Models/SleeveShopProductRewardEntry.cs +++ b/SVSim.Database/Models/SleeveShopProductRewardEntry.cs @@ -1,4 +1,5 @@ using Microsoft.EntityFrameworkCore; +using SVSim.Database.Enums; namespace SVSim.Database.Models; @@ -11,7 +12,7 @@ namespace SVSim.Database.Models; public class SleeveShopProductRewardEntry { public int OrderIndex { get; set; } - public int RewardType { get; set; } // Wizard.UserGoods.Type + public UserGoodsType RewardType { get; set; } public long RewardDetailId { get; set; } public int RewardNumber { get; set; } } diff --git a/SVSim.Database/Services/Inventory/InventoryGrantTypes.cs b/SVSim.Database/Services/Inventory/InventoryGrantTypes.cs index fd0d3b0..f5ca823 100644 --- a/SVSim.Database/Services/Inventory/InventoryGrantTypes.cs +++ b/SVSim.Database/Services/Inventory/InventoryGrantTypes.cs @@ -11,7 +11,7 @@ namespace SVSim.Database.Services; /// /story/*/finish. reward_num is a POST-STATE TOTAL for currencies and a count for /// collection grants — see . /// -public sealed record GrantedReward(int RewardType, long RewardId, int RewardNum); +public sealed record GrantedReward(UserGoodsType RewardType, long RewardId, int RewardNum); /// /// Cosmetic projection bundle for /load/index. The four id-lists are "what the viewer owns" diff --git a/SVSim.Database/Services/Inventory/InventoryTransaction.cs b/SVSim.Database/Services/Inventory/InventoryTransaction.cs index f36c2c0..9d0d273 100644 --- a/SVSim.Database/Services/Inventory/InventoryTransaction.cs +++ b/SVSim.Database/Services/Inventory/InventoryTransaction.cs @@ -309,7 +309,7 @@ internal sealed class InventoryTransaction : IInventoryTransaction var output = new List(); 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 BuildDeltas() => _ops.OfType() .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 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 { - 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)); } } diff --git a/SVSim.EmulatedEntrypoint/Controllers/AchievementController.cs b/SVSim.EmulatedEntrypoint/Controllers/AchievementController.cs index e345258..6f25c72 100644 --- a/SVSim.EmulatedEntrypoint/Controllers/AchievementController.cs +++ b/SVSim.EmulatedEntrypoint/Controllers/AchievementController.cs @@ -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, diff --git a/SVSim.EmulatedEntrypoint/Controllers/BattlePassController.cs b/SVSim.EmulatedEntrypoint/Controllers/BattlePassController.cs index a032ec9..fe7ff3b 100644 --- a/SVSim.EmulatedEntrypoint/Controllers/BattlePassController.cs +++ b/SVSim.EmulatedEntrypoint/Controllers/BattlePassController.cs @@ -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(), diff --git a/SVSim.EmulatedEntrypoint/Controllers/BuildDeckController.cs b/SVSim.EmulatedEntrypoint/Controllers/BuildDeckController.cs index 414befd..a42c156 100644 --- a/SVSim.EmulatedEntrypoint/Controllers/BuildDeckController.cs +++ b/SVSim.EmulatedEntrypoint/Controllers/BuildDeckController.cs @@ -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, }; } diff --git a/SVSim.EmulatedEntrypoint/Controllers/CardController.cs b/SVSim.EmulatedEntrypoint/Controllers/CardController.cs index ab01bb4..9cc985e 100644 --- a/SVSim.EmulatedEntrypoint/Controllers/CardController.cs +++ b/SVSim.EmulatedEntrypoint/Controllers/CardController.cs @@ -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, }); diff --git a/SVSim.EmulatedEntrypoint/Controllers/ItemPurchaseController.cs b/SVSim.EmulatedEntrypoint/Controllers/ItemPurchaseController.cs index 900dcd6..5d2fe59 100644 --- a/SVSim.EmulatedEntrypoint/Controllers/ItemPurchaseController.cs +++ b/SVSim.EmulatedEntrypoint/Controllers/ItemPurchaseController.cs @@ -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(), }; } diff --git a/SVSim.EmulatedEntrypoint/Controllers/LeaderSkinController.cs b/SVSim.EmulatedEntrypoint/Controllers/LeaderSkinController.cs index 0024540..7446fc2 100644 --- a/SVSim.EmulatedEntrypoint/Controllers/LeaderSkinController.cs +++ b/SVSim.EmulatedEntrypoint/Controllers/LeaderSkinController.cs @@ -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 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 diff --git a/SVSim.EmulatedEntrypoint/Controllers/PackController.cs b/SVSim.EmulatedEntrypoint/Controllers/PackController.cs index 06fbf4c..4644c50 100644 --- a/SVSim.EmulatedEntrypoint/Controllers/PackController.cs +++ b/SVSim.EmulatedEntrypoint/Controllers/PackController.cs @@ -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 { diff --git a/SVSim.EmulatedEntrypoint/Controllers/PuzzleController.cs b/SVSim.EmulatedEntrypoint/Controllers/PuzzleController.cs index bde4c48..947df8d 100644 --- a/SVSim.EmulatedEntrypoint/Controllers/PuzzleController.cs +++ b/SVSim.EmulatedEntrypoint/Controllers/PuzzleController.cs @@ -109,7 +109,7 @@ public class PuzzleController : SVSimController RewardList = new List { 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, }); diff --git a/SVSim.EmulatedEntrypoint/Controllers/SleeveController.cs b/SVSim.EmulatedEntrypoint/Controllers/SleeveController.cs index 4f70bee..48e281b 100644 --- a/SVSim.EmulatedEntrypoint/Controllers/SleeveController.cs +++ b/SVSim.EmulatedEntrypoint/Controllers/SleeveController.cs @@ -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; diff --git a/SVSim.EmulatedEntrypoint/Controllers/SpotCardExchangeController.cs b/SVSim.EmulatedEntrypoint/Controllers/SpotCardExchangeController.cs index c5be16e..3d17112 100644 --- a/SVSim.EmulatedEntrypoint/Controllers/SpotCardExchangeController.cs +++ b/SVSim.EmulatedEntrypoint/Controllers/SpotCardExchangeController.cs @@ -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 { diff --git a/SVSim.EmulatedEntrypoint/Models/Dtos/RewardListExtensions.cs b/SVSim.EmulatedEntrypoint/Models/Dtos/RewardListExtensions.cs new file mode 100644 index 0000000..078137a --- /dev/null +++ b/SVSim.EmulatedEntrypoint/Models/Dtos/RewardListExtensions.cs @@ -0,0 +1,21 @@ +using SVSim.Database.Services; + +namespace SVSim.EmulatedEntrypoint.Models.Dtos; + +/// +/// Projects inventory results (post-state totals or per-grant deltas) +/// into the wire shape. The reward_type 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). +/// +public static class RewardListExtensions +{ + public static List ToRewardList(this IEnumerable grants) => + grants.Select(g => new RewardListEntry + { + RewardType = (int)g.RewardType, + RewardId = g.RewardId, + RewardNum = g.RewardNum, + }).ToList(); +} diff --git a/SVSim.EmulatedEntrypoint/Services/ArenaTwoPickService.cs b/SVSim.EmulatedEntrypoint/Services/ArenaTwoPickService.cs index d05f568..29df13b 100644 --- a/SVSim.EmulatedEntrypoint/Services/ArenaTwoPickService.cs +++ b/SVSim.EmulatedEntrypoint/Services/ArenaTwoPickService.cs @@ -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); diff --git a/SVSim.EmulatedEntrypoint/Services/BattlePassService.cs b/SVSim.EmulatedEntrypoint/Services/BattlePassService.cs index 15df87c..ceac93d 100644 --- a/SVSim.EmulatedEntrypoint/Services/BattlePassService.cs +++ b/SVSim.EmulatedEntrypoint/Services/BattlePassService.cs @@ -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)), diff --git a/SVSim.EmulatedEntrypoint/Services/GachaPointService.cs b/SVSim.EmulatedEntrypoint/Services/GachaPointService.cs index c909991..5202933 100644 --- a/SVSim.EmulatedEntrypoint/Services/GachaPointService.cs +++ b/SVSim.EmulatedEntrypoint/Services/GachaPointService.cs @@ -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); } diff --git a/SVSim.EmulatedEntrypoint/Services/MissionAssembler.cs b/SVSim.EmulatedEntrypoint/Services/MissionAssembler.cs index cbd181e..faa2f2b 100644 --- a/SVSim.EmulatedEntrypoint/Services/MissionAssembler.cs +++ b/SVSim.EmulatedEntrypoint/Services/MissionAssembler.cs @@ -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(), }; diff --git a/SVSim.EmulatedEntrypoint/Services/StoryService.cs b/SVSim.EmulatedEntrypoint/Services/StoryService.cs index d2ff5df..24a91ce 100644 --- a/SVSim.EmulatedEntrypoint/Services/StoryService.cs +++ b/SVSim.EmulatedEntrypoint/Services/StoryService.cs @@ -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(), }); diff --git a/SVSim.UnitTests/Controllers/BattlePassControllerBuyTests.cs b/SVSim.UnitTests/Controllers/BattlePassControllerBuyTests.cs index 08f8c24..1a80507 100644 --- a/SVSim.UnitTests/Controllers/BattlePassControllerBuyTests.cs +++ b/SVSim.UnitTests/Controllers/BattlePassControllerBuyTests.cs @@ -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); diff --git a/SVSim.UnitTests/Controllers/BattlePassControllerInfoTests.cs b/SVSim.UnitTests/Controllers/BattlePassControllerInfoTests.cs index e3060d8..2133ff3 100644 --- a/SVSim.UnitTests/Controllers/BattlePassControllerInfoTests.cs +++ b/SVSim.UnitTests/Controllers/BattlePassControllerInfoTests.cs @@ -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(); diff --git a/SVSim.UnitTests/Controllers/BuildDeckControllerBuyTests.cs b/SVSim.UnitTests/Controllers/BuildDeckControllerBuyTests.cs index f8d1fd5..b7ff1a9 100644 --- a/SVSim.UnitTests/Controllers/BuildDeckControllerBuyTests.cs +++ b/SVSim.UnitTests/Controllers/BuildDeckControllerBuyTests.cs @@ -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, }, }, diff --git a/SVSim.UnitTests/Controllers/LeaderSkinShopControllerTests.cs b/SVSim.UnitTests/Controllers/LeaderSkinShopControllerTests.cs index c543231..1973258 100644 --- a/SVSim.UnitTests/Controllers/LeaderSkinShopControllerTests.cs +++ b/SVSim.UnitTests/Controllers/LeaderSkinShopControllerTests.cs @@ -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(); diff --git a/SVSim.UnitTests/Controllers/SleeveControllerTests.cs b/SVSim.UnitTests/Controllers/SleeveControllerTests.cs index 70068a8..a8ac7af 100644 --- a/SVSim.UnitTests/Controllers/SleeveControllerTests.cs +++ b/SVSim.UnitTests/Controllers/SleeveControllerTests.cs @@ -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 }, }, }, }, diff --git a/SVSim.UnitTests/Importers/AchievementCatalogImporterTests.cs b/SVSim.UnitTests/Importers/AchievementCatalogImporterTests.cs index 2768b17..eaa3135 100644 --- a/SVSim.UnitTests/Importers/AchievementCatalogImporterTests.cs +++ b/SVSim.UnitTests/Importers/AchievementCatalogImporterTests.cs @@ -2,6 +2,7 @@ using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; using SVSim.Bootstrap.Importers; using SVSim.Database; +using SVSim.Database.Enums; using SVSim.UnitTests.Infrastructure; namespace SVSim.UnitTests.Importers; @@ -40,7 +41,7 @@ public class AchievementCatalogImporterTests { AchievementType = 12, Level = 99, Name = "Reach level 999 in Swordcraft (synthetic)", RequireNumber = 999, - RewardType = 5, RewardDetailId = 100211062, RewardNumber = 3, OrderNum = 10, + RewardType = (UserGoodsType)5, RewardDetailId = 100211062, RewardNumber = 3, OrderNum = 10, EventType = "class_level_up:swordcraft", EventArg = null, }); await db.SaveChangesAsync(); diff --git a/SVSim.UnitTests/Importers/ArenaTwoPickRewardImporterTests.cs b/SVSim.UnitTests/Importers/ArenaTwoPickRewardImporterTests.cs index 59fbc96..ca41c40 100644 --- a/SVSim.UnitTests/Importers/ArenaTwoPickRewardImporterTests.cs +++ b/SVSim.UnitTests/Importers/ArenaTwoPickRewardImporterTests.cs @@ -2,6 +2,7 @@ using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; using SVSim.Bootstrap.Importers; using SVSim.Database; +using SVSim.Database.Enums; using SVSim.UnitTests.Infrastructure; namespace SVSim.UnitTests.Importers; @@ -32,12 +33,12 @@ public class ArenaTwoPickRewardImporterTests var w0 = rows.Where(r => r.WinCount == 0).ToList(); Assert.That(w0.Count, Is.EqualTo(2)); - Assert.That(w0.Single(r => r.RewardType == 4).RewardNum, Is.EqualTo(1)); - Assert.That(w0.Single(r => r.RewardType == 9).RewardNum, Is.EqualTo(100)); + Assert.That(w0.Single(r => r.RewardType == (UserGoodsType)4).RewardNum, Is.EqualTo(1)); + Assert.That(w0.Single(r => r.RewardType == (UserGoodsType)9).RewardNum, Is.EqualTo(100)); var w5 = rows.Where(r => r.WinCount == 5).ToList(); - Assert.That(w5.Single(r => r.RewardType == 4).RewardNum, Is.EqualTo(1)); - Assert.That(w5.Single(r => r.RewardType == 9).RewardNum, Is.EqualTo(1000)); + Assert.That(w5.Single(r => r.RewardType == (UserGoodsType)4).RewardNum, Is.EqualTo(1)); + Assert.That(w5.Single(r => r.RewardType == (UserGoodsType)9).RewardNum, Is.EqualTo(1000)); // New columns: all rows should have weight=1 and win5 should span 2 distinct groups. Assert.That(w5.All(r => r.Weight == 1), "all win5 rows should have Weight=1"); diff --git a/SVSim.UnitTests/Importers/BattlePassRewardImporterTests.cs b/SVSim.UnitTests/Importers/BattlePassRewardImporterTests.cs index b14d5ba..8fac952 100644 --- a/SVSim.UnitTests/Importers/BattlePassRewardImporterTests.cs +++ b/SVSim.UnitTests/Importers/BattlePassRewardImporterTests.cs @@ -65,7 +65,7 @@ public class BattlePassRewardImporterTests db.BattlePassRewards.Add(new SVSim.Database.Models.BattlePassRewardEntry { Id = 230_099, // MakeId(23, Normal=0, 99) == 23*10_000 + 0*1_000 + 99 - SeasonId = 23, Track = BattlePassTrack.Normal, Level = 99, RewardType = 9, + SeasonId = 23, Track = BattlePassTrack.Normal, Level = 99, RewardType = (UserGoodsType)9, RewardDetailId = 0, RewardNumber = 9999, IsAppealExclusion = false, }); await db.SaveChangesAsync(); @@ -93,7 +93,7 @@ public class BattlePassRewardImporterTests }); db.BattlePassRewards.Add(new SVSim.Database.Models.BattlePassRewardEntry { - SeasonId = 22, Track = BattlePassTrack.Normal, Level = 1, RewardType = 9, + SeasonId = 22, Track = BattlePassTrack.Normal, Level = 1, RewardType = (UserGoodsType)9, RewardDetailId = 0, RewardNumber = 100, IsAppealExclusion = false, }); await db.SaveChangesAsync(); diff --git a/SVSim.UnitTests/Importers/MissionCatalogImporterTests.cs b/SVSim.UnitTests/Importers/MissionCatalogImporterTests.cs index bae3970..963d673 100644 --- a/SVSim.UnitTests/Importers/MissionCatalogImporterTests.cs +++ b/SVSim.UnitTests/Importers/MissionCatalogImporterTests.cs @@ -2,6 +2,7 @@ using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; using SVSim.Bootstrap.Importers; using SVSim.Database; +using SVSim.Database.Enums; using SVSim.UnitTests.Infrastructure; namespace SVSim.UnitTests.Importers; @@ -58,7 +59,7 @@ public class MissionCatalogImporterTests db.MissionCatalog.Add(new SVSim.Database.Models.MissionCatalogEntry { Id = 99999, Name = "preserved", LotType = 2, - RequireNumber = 1, RewardType = 9, RewardDetailId = 0, RewardNumber = 10, + RequireNumber = 1, RewardType = (UserGoodsType)9, RewardDetailId = 0, RewardNumber = 10, BattlePassPoint = 0, DefaultFlag = false, StartTime = 0, }); await db.SaveChangesAsync(); diff --git a/SVSim.UnitTests/Importers/PuzzleSeedingPipelineTests.cs b/SVSim.UnitTests/Importers/PuzzleSeedingPipelineTests.cs index 7ffc10d..9ccfe33 100644 --- a/SVSim.UnitTests/Importers/PuzzleSeedingPipelineTests.cs +++ b/SVSim.UnitTests/Importers/PuzzleSeedingPipelineTests.cs @@ -53,7 +53,7 @@ public class PuzzleSeedingPipelineTests Assert.That(round1.TargetPuzzleGroupId, Is.EqualTo(301)); Assert.That(round1.AchievedMessage, Is.EqualTo("Cleared all Round 1 puzzles")); Assert.That(round1.RequireNumber, Is.EqualTo(3)); - Assert.That(round1.RewardType, Is.EqualTo(10)); // LeaderSkin + Assert.That((int)round1.RewardType, Is.EqualTo(10)); // LeaderSkin Assert.That(round1.RewardDetailId, Is.EqualTo(3704L)); // chara_id matching group 301 Assert.That(round1.RewardNumber, Is.EqualTo(1)); diff --git a/SVSim.UnitTests/Importers/SleeveShopImporterTests.cs b/SVSim.UnitTests/Importers/SleeveShopImporterTests.cs index 7fc9313..2be6cf6 100644 --- a/SVSim.UnitTests/Importers/SleeveShopImporterTests.cs +++ b/SVSim.UnitTests/Importers/SleeveShopImporterTests.cs @@ -2,6 +2,7 @@ using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; using SVSim.Bootstrap.Importers; using SVSim.Database; +using SVSim.Database.Enums; using SVSim.Database.Models; using SVSim.UnitTests.Infrastructure; @@ -72,7 +73,7 @@ public class SleeveShopImporterTests int originalCount = product.Rewards.Count; product.Rewards.Add(new SleeveShopProductRewardEntry { - OrderIndex = 99, RewardType = 99, RewardDetailId = 99, RewardNumber = 99, + OrderIndex = 99, RewardType = (UserGoodsType)99, RewardDetailId = 99, RewardNumber = 99, }); await db.SaveChangesAsync(); @@ -82,6 +83,6 @@ public class SleeveShopImporterTests .Include(p => p.Rewards) .FirstAsync(p => p.Id == product.Id); Assert.That(reloaded.Rewards.Count, Is.EqualTo(originalCount), "extra reward should be wiped on re-import"); - Assert.That(reloaded.Rewards.Any(r => r.RewardType == 99), Is.False); + Assert.That(reloaded.Rewards.Any(r => r.RewardType == (UserGoodsType)99), Is.False); } } diff --git a/SVSim.UnitTests/Repositories/CardInventoryRepositoryTests.cs b/SVSim.UnitTests/Repositories/CardInventoryRepositoryTests.cs index 38e3d87..88ec236 100644 --- a/SVSim.UnitTests/Repositories/CardInventoryRepositoryTests.cs +++ b/SVSim.UnitTests/Repositories/CardInventoryRepositoryTests.cs @@ -300,7 +300,7 @@ public class CardInventoryRepositoryTests Assert.That(outcome.Result!.NewRedEtherTotal, Is.EqualTo(800UL), "1000 - 200 = 800"); var grants = outcome.Result!.Grants; - Assert.That(grants.Any(g => g.RewardType == (int)UserGoodsType.Card + Assert.That(grants.Any(g => g.RewardType == UserGoodsType.Card && g.RewardId == 10001001L && g.RewardNum == 1), Is.True); @@ -506,8 +506,8 @@ public class CardInventoryRepositoryTests var grants = outcome.Result!.Grants; // One Card grant + one Skin cascade grant - Assert.That(grants.Any(g => g.RewardType == (int)UserGoodsType.Card && g.RewardId == cardId), Is.True); - Assert.That(grants.Any(g => g.RewardType == (int)UserGoodsType.Skin && g.RewardId == skinId), Is.True); + Assert.That(grants.Any(g => g.RewardType == UserGoodsType.Card && g.RewardId == cardId), Is.True); + Assert.That(grants.Any(g => g.RewardType == UserGoodsType.Skin && g.RewardId == skinId), Is.True); var viewer = await ctx.Viewers .Include(v => v.LeaderSkins) diff --git a/SVSim.UnitTests/Services/ArenaTwoPickServiceWeightedRewardsTests.cs b/SVSim.UnitTests/Services/ArenaTwoPickServiceWeightedRewardsTests.cs index c5a17ad..f4596af 100644 --- a/SVSim.UnitTests/Services/ArenaTwoPickServiceWeightedRewardsTests.cs +++ b/SVSim.UnitTests/Services/ArenaTwoPickServiceWeightedRewardsTests.cs @@ -110,11 +110,11 @@ public class ArenaTwoPickServiceWeightedRewardsTests // Seed catalog: two rows, same group, same WinCount=3. db.ArenaTwoPickRewards.Add(new ArenaTwoPickReward { - WinCount = 3, RewardGroup = 1, Weight = 1, RewardType = 9, RewardId = 0, RewardNum = 100 + WinCount = 3, RewardGroup = 1, Weight = 1, RewardType = (UserGoodsType)9, RewardId = 0, RewardNum = 100 }); db.ArenaTwoPickRewards.Add(new ArenaTwoPickReward { - WinCount = 3, RewardGroup = 1, Weight = 9, RewardType = 9, RewardId = 0, RewardNum = 999 + WinCount = 3, RewardGroup = 1, Weight = 9, RewardType = (UserGoodsType)9, RewardId = 0, RewardNum = 999 }); await db.SaveChangesAsync(); @@ -134,11 +134,11 @@ public class ArenaTwoPickServiceWeightedRewardsTests db.ArenaTwoPickRewards.Add(new ArenaTwoPickReward { - WinCount = 2, RewardGroup = 1, Weight = 0, RewardType = 9, RewardId = 0, RewardNum = 9999 + WinCount = 2, RewardGroup = 1, Weight = 0, RewardType = (UserGoodsType)9, RewardId = 0, RewardNum = 9999 }); db.ArenaTwoPickRewards.Add(new ArenaTwoPickReward { - WinCount = 2, RewardGroup = 1, Weight = 1, RewardType = 9, RewardId = 0, RewardNum = 500 + WinCount = 2, RewardGroup = 1, Weight = 1, RewardType = (UserGoodsType)9, RewardId = 0, RewardNum = 500 }); await db.SaveChangesAsync(); @@ -158,7 +158,7 @@ public class ArenaTwoPickServiceWeightedRewardsTests db.ArenaTwoPickRewards.Add(new ArenaTwoPickReward { - WinCount = 1, RewardGroup = 1, Weight = 1, RewardType = 9, RewardId = 0, RewardNum = 0 + WinCount = 1, RewardGroup = 1, Weight = 1, RewardType = (UserGoodsType)9, RewardId = 0, RewardNum = 0 }); await db.SaveChangesAsync(); @@ -189,7 +189,7 @@ public class ArenaTwoPickServiceWeightedRewardsTests // still satisfies the >=5 check so Retire works regardless). db.ArenaTwoPickRewards.Add(new ArenaTwoPickReward { - WinCount = 0, RewardGroup = 1, Weight = 1, RewardType = 9, RewardId = 0, RewardNum = 50 + WinCount = 0, RewardGroup = 1, Weight = 1, RewardType = (UserGoodsType)9, RewardId = 0, RewardNum = 50 }); await db.SaveChangesAsync(); diff --git a/SVSim.UnitTests/Services/BattlePassServiceTests.cs b/SVSim.UnitTests/Services/BattlePassServiceTests.cs index 7e0c294..fc8d1bc 100644 --- a/SVSim.UnitTests/Services/BattlePassServiceTests.cs +++ b/SVSim.UnitTests/Services/BattlePassServiceTests.cs @@ -40,13 +40,13 @@ public class BattlePassServiceTests db.BattlePassRewards.Add(new BattlePassRewardEntry { Id = MakeRewardId(23, BattlePassTrack.Normal, 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 = 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, }); if (isPremium) @@ -75,7 +75,7 @@ public class BattlePassServiceTests Assert.That(grant.AfterLevel, Is.EqualTo(2)); Assert.That(grant.PointAdd, Is.EqualTo(500)); Assert.That(grant.NewlyClaimed.Count, Is.EqualTo(1), "premium level-2 must be skipped"); - Assert.That(grant.NewlyClaimed[0].RewardType, Is.EqualTo((int)UserGoodsType.Rupy)); + Assert.That(grant.NewlyClaimed[0].RewardType, Is.EqualTo(UserGoodsType.Rupy)); Assert.That(grant.NewlyClaimed[0].RewardNum, Is.EqualTo(50), "post-state rupy total"); } diff --git a/SVSim.UnitTests/Services/Inventory/InventoryCommitTests.cs b/SVSim.UnitTests/Services/Inventory/InventoryCommitTests.cs index 45e11dc..edac078 100644 --- a/SVSim.UnitTests/Services/Inventory/InventoryCommitTests.cs +++ b/SVSim.UnitTests/Services/Inventory/InventoryCommitTests.cs @@ -27,7 +27,7 @@ public class InventoryCommitTests await tx.GrantAsync(UserGoodsType.Crystal, 0, 200); var result = await tx.CommitAsync(); - var crystals = result.RewardList.Where(r => r.RewardType == (int)UserGoodsType.Crystal).ToList(); + var crystals = result.RewardList.Where(r => r.RewardType == UserGoodsType.Crystal).ToList(); Assert.That(crystals, Has.Count.EqualTo(1)); Assert.That(crystals[0].RewardNum, Is.EqualTo(700), "spend 500 then grant 200 → 1000-500+200=700, grant's post-state wins"); } @@ -49,7 +49,7 @@ public class InventoryCommitTests await tx.TrySpendAsync(SpendCurrency.Crystal, 500); var result = await tx.CommitAsync(); - var crystals = result.RewardList.Where(r => r.RewardType == (int)UserGoodsType.Crystal).ToList(); + var crystals = result.RewardList.Where(r => r.RewardType == UserGoodsType.Crystal).ToList(); Assert.That(crystals, Has.Count.EqualTo(1)); Assert.That(crystals[0].RewardNum, Is.EqualTo(700)); } @@ -97,8 +97,8 @@ public class InventoryCommitTests var result = await tx.CommitAsync(); Assert.That(result.Deltas, Has.Count.EqualTo(1), "verbatim — card only, no cascade"); - Assert.That(result.Deltas[0].RewardType, Is.EqualTo((int)UserGoodsType.Card)); - Assert.That(result.RewardList.Any(e => e.RewardType == (int)UserGoodsType.Sleeve), Is.True, + Assert.That(result.Deltas[0].RewardType, Is.EqualTo(UserGoodsType.Card)); + Assert.That(result.RewardList.Any(e => e.RewardType == UserGoodsType.Sleeve), Is.True, "cascade appears in RewardList but not Deltas"); } } diff --git a/SVSim.UnitTests/Services/Inventory/InventoryGrantCardTests.cs b/SVSim.UnitTests/Services/Inventory/InventoryGrantCardTests.cs index 4710c30..419df9b 100644 --- a/SVSim.UnitTests/Services/Inventory/InventoryGrantCardTests.cs +++ b/SVSim.UnitTests/Services/Inventory/InventoryGrantCardTests.cs @@ -23,7 +23,7 @@ public class InventoryGrantCardTests var granted = await tx.GrantAsync(UserGoodsType.Card, cardId, 2); Assert.That(granted, Has.Count.EqualTo(1)); - Assert.That(granted[0].RewardType, Is.EqualTo((int)UserGoodsType.Card)); + Assert.That(granted[0].RewardType, Is.EqualTo(UserGoodsType.Card)); Assert.That(granted[0].RewardId, Is.EqualTo(cardId)); Assert.That(granted[0].RewardNum, Is.EqualTo(2)); } @@ -46,7 +46,7 @@ public class InventoryGrantCardTests var granted = await tx.GrantAsync(UserGoodsType.Card, cardId, 1); Assert.That(granted, Has.Count.EqualTo(2)); - Assert.That(granted[1].RewardType, Is.EqualTo((int)UserGoodsType.Sleeve)); + Assert.That(granted[1].RewardType, Is.EqualTo(UserGoodsType.Sleeve)); Assert.That(granted[1].RewardId, Is.EqualTo(sleeveId)); } diff --git a/SVSim.UnitTests/Services/Inventory/InventoryGrantCosmeticTests.cs b/SVSim.UnitTests/Services/Inventory/InventoryGrantCosmeticTests.cs index 0f73c1d..1b74576 100644 --- a/SVSim.UnitTests/Services/Inventory/InventoryGrantCosmeticTests.cs +++ b/SVSim.UnitTests/Services/Inventory/InventoryGrantCosmeticTests.cs @@ -26,7 +26,7 @@ public class InventoryGrantCosmeticTests var granted = await tx.GrantAsync(UserGoodsType.Sleeve, sleeveId, 1); Assert.That(granted, Has.Count.EqualTo(1)); - Assert.That(granted[0].RewardType, Is.EqualTo((int)UserGoodsType.Sleeve)); + Assert.That(granted[0].RewardType, Is.EqualTo(UserGoodsType.Sleeve)); Assert.That(granted[0].RewardId, Is.EqualTo(sleeveId)); Assert.That(granted[0].RewardNum, Is.EqualTo(1)); Assert.That(tx.Viewer.Sleeves.Any(s => s.Id == sleeveId), Is.True); diff --git a/SVSim.UnitTests/Services/Inventory/InventoryGrantCurrencyTests.cs b/SVSim.UnitTests/Services/Inventory/InventoryGrantCurrencyTests.cs index 1c1db7d..711b575 100644 --- a/SVSim.UnitTests/Services/Inventory/InventoryGrantCurrencyTests.cs +++ b/SVSim.UnitTests/Services/Inventory/InventoryGrantCurrencyTests.cs @@ -35,7 +35,7 @@ public class InventoryGrantCurrencyTests var granted = await tx.GrantAsync(type, detailId: 0, num: 50); Assert.That(granted, Has.Count.EqualTo(1)); - Assert.That(granted[0].RewardType, Is.EqualTo((int)type)); + Assert.That(granted[0].RewardType, Is.EqualTo(type)); Assert.That(granted[0].RewardNum, Is.EqualTo(150)); } } diff --git a/SVSim.UnitTests/Services/MissionProgressServiceTests.cs b/SVSim.UnitTests/Services/MissionProgressServiceTests.cs index 02ea1ee..46bbf8f 100644 --- a/SVSim.UnitTests/Services/MissionProgressServiceTests.cs +++ b/SVSim.UnitTests/Services/MissionProgressServiceTests.cs @@ -1,6 +1,7 @@ using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; using SVSim.Database; +using SVSim.Database.Enums; using SVSim.Database.Models; using SVSim.EmulatedEntrypoint.Services; using SVSim.UnitTests.Infrastructure; @@ -95,7 +96,7 @@ public class MissionProgressServiceTests db.AchievementCatalog.Add(new AchievementCatalogEntry { AchievementType = 31, Level = 3, Name = "Win 50 ranked matches", - RequireNumber = 50, RewardType = 9, RewardDetailId = 0, RewardNumber = 20, + RequireNumber = 50, RewardType = (UserGoodsType)9, RewardDetailId = 0, RewardNumber = 20, OrderNum = 18, EventType = "ranked_win", EventArg = null, }); // Set viewer's current level to 3. diff --git a/SVSim.UnitTests/Story/StoryServiceTests.cs b/SVSim.UnitTests/Story/StoryServiceTests.cs index 1599ad5..1d55d51 100644 --- a/SVSim.UnitTests/Story/StoryServiceTests.cs +++ b/SVSim.UnitTests/Story/StoryServiceTests.cs @@ -5,6 +5,7 @@ using Moq; using NUnit.Framework; using SVSim.Database; using SVSim.Database.Entities.Story; +using SVSim.Database.Enums; using SVSim.Database.Models; using SVSim.Database.Repositories.Story; using SVSim.Database.Services; @@ -556,7 +557,7 @@ public class StoryServiceTests public async Task FinishAsync_skip_shape_sets_isSkipped_and_grants_nothing() { var chapter = Ch(100, 1, 2, "1", "2"); - chapter.Rewards.Add(new StoryChapterReward { RewardType = 1, RewardNumber = 20 }); + chapter.Rewards.Add(new StoryChapterReward { RewardType = (UserGoodsType)1, RewardNumber = 20 }); _master.Setup(m => m.GetChapterByIdAsync(100)).ReturnsAsync(chapter); _viewer.Setup(v => v.GetProgressForChaptersAsync(7L, It.IsAny>())) .ReturnsAsync(new Dictionary()); @@ -606,7 +607,7 @@ public class StoryServiceTests using (scope) { var chapter = Ch(100, 1, 2, "1", "2"); - chapter.Rewards.Add(new StoryChapterReward { RewardType = 1, RewardDetailId = 0, RewardNumber = 100 }); + chapter.Rewards.Add(new StoryChapterReward { RewardType = (UserGoodsType)1, RewardDetailId = 0, RewardNumber = 100 }); _master.Setup(m => m.GetChapterByIdAsync(100)).ReturnsAsync(chapter); _viewer.Setup(v => v.GetProgressForChaptersAsync(viewerId, It.IsAny>())) .ReturnsAsync(new Dictionary()); @@ -642,7 +643,7 @@ public class StoryServiceTests using (scope) { var chapter = Ch(100, 1, 2, "1", "2"); - chapter.Rewards.Add(new StoryChapterReward { RewardType = 1, RewardDetailId = 0, RewardNumber = 100 }); + chapter.Rewards.Add(new StoryChapterReward { RewardType = (UserGoodsType)1, RewardDetailId = 0, RewardNumber = 100 }); _master.Setup(m => m.GetChapterByIdAsync(100)).ReturnsAsync(chapter); _viewer.Setup(v => v.GetProgressForChaptersAsync(viewerId, It.IsAny>())) .ReturnsAsync(new Dictionary { @@ -669,7 +670,7 @@ public class StoryServiceTests using (scope) { var chapter = Ch(100, 1, 2, "1", "2"); - chapter.Rewards.Add(new StoryChapterReward { RewardType = 1, RewardDetailId = 0, RewardNumber = 100 }); + chapter.Rewards.Add(new StoryChapterReward { RewardType = (UserGoodsType)1, RewardDetailId = 0, RewardNumber = 100 }); _master.Setup(m => m.GetChapterByIdAsync(100)).ReturnsAsync(chapter); // Previously skipped but never finished — should be treated as first clear. _viewer.Setup(v => v.GetProgressForChaptersAsync(viewerId, It.IsAny>())) @@ -719,7 +720,7 @@ public class StoryServiceTests var chapter = Ch(testStoryId, 1, 2, "1", "2"); chapter.Rewards.Add(new StoryChapterReward { - RewardType = 5, // UserGoodsType.Card + RewardType = (UserGoodsType)5, // UserGoodsType.Card RewardDetailId = testCardId, RewardNumber = 1, }); @@ -791,7 +792,7 @@ public class StoryServiceTests var chapter = Ch(testStoryId, 1, 2, "1", "2"); chapter.Rewards.Add(new StoryChapterReward { - RewardType = 5, // UserGoodsType.Card + RewardType = (UserGoodsType)5, // UserGoodsType.Card RewardDetailId = testCardId, RewardNumber = 1, });