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 },
},
},
},

3
SVSim.UnitTests/Importers/AchievementCatalogImporterTests.cs
View File

@@ -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();

9
SVSim.UnitTests/Importers/ArenaTwoPickRewardImporterTests.cs
View File

@@ -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");

4
SVSim.UnitTests/Importers/BattlePassRewardImporterTests.cs
View File

@@ -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();

3
SVSim.UnitTests/Importers/MissionCatalogImporterTests.cs
View File

@@ -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();

2
SVSim.UnitTests/Importers/PuzzleSeedingPipelineTests.cs
View File

@@ -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));

5
SVSim.UnitTests/Importers/SleeveShopImporterTests.cs
View File

@@ -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);
}
}

6
SVSim.UnitTests/Repositories/CardInventoryRepositoryTests.cs
View File

@@ -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)

12
SVSim.UnitTests/Services/ArenaTwoPickServiceWeightedRewardsTests.cs
View File

@@ -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();

6
SVSim.UnitTests/Services/BattlePassServiceTests.cs
View File

@@ -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");
}

8
SVSim.UnitTests/Services/Inventory/InventoryCommitTests.cs
View File

@@ -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");
}
}

4
SVSim.UnitTests/Services/Inventory/InventoryGrantCardTests.cs
View File

@@ -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));
}

2
SVSim.UnitTests/Services/Inventory/InventoryGrantCosmeticTests.cs
View File

@@ -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);

2
SVSim.UnitTests/Services/Inventory/InventoryGrantCurrencyTests.cs
View File

@@ -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));
}
}

3
SVSim.UnitTests/Services/MissionProgressServiceTests.cs
View File

@@ -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.

13
SVSim.UnitTests/Story/StoryServiceTests.cs
View File

@@ -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<IEnumerable<int>>()))
.ReturnsAsync(new Dictionary<int, ViewerStoryProgress>());
@@ -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<IEnumerable<int>>()))
.ReturnsAsync(new Dictionary<int, ViewerStoryProgress>());
@@ -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<IEnumerable<int>>()))
.ReturnsAsync(new Dictionary<int, ViewerStoryProgress> {
@@ -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<IEnumerable<int>>()))
@@ -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,
});