From b6bf9b749589e463057ec12bd66812a898362a85 Mon Sep 17 00:00:00 2001 From: gamer147 Date: Sun, 31 May 2026 16:51:03 -0400 Subject: [PATCH] refactor(arena-two-pick): route entry/finish through InventoryService Replace RewardGrantService + ICurrencySpendService + IViewerEntitlements with IInventoryService. tx.IsFreeplay replaces FakeEntitlements.IsFreeplay; debit helpers take IInventoryTransaction. ComputePostStateRewardList deleted (replaced by result.RewardList from CommitAsync). Update 5 test files to new 8-arg ctor. Co-Authored-By: Claude Opus 4.7 --- .../Services/ArenaTwoPickService.cs | 109 ++++++++---------- .../Services/ArenaTwoPickServiceDraftTests.cs | 20 +--- .../Services/ArenaTwoPickServiceEntryTests.cs | 25 +--- .../ArenaTwoPickServiceFinishTests.cs | 20 +--- .../Services/ArenaTwoPickServiceTopTests.cs | 4 +- ...ArenaTwoPickServiceWeightedRewardsTests.cs | 20 +--- 6 files changed, 62 insertions(+), 136 deletions(-) diff --git a/SVSim.EmulatedEntrypoint/Services/ArenaTwoPickService.cs b/SVSim.EmulatedEntrypoint/Services/ArenaTwoPickService.cs index 2652db0..d05f568 100644 --- a/SVSim.EmulatedEntrypoint/Services/ArenaTwoPickService.cs +++ b/SVSim.EmulatedEntrypoint/Services/ArenaTwoPickService.cs @@ -1,10 +1,12 @@ using System.Text.Json; using Microsoft.EntityFrameworkCore; using SVSim.Database; +using SVSim.Database.Enums; using SVSim.Database.Models; using SVSim.Database.Repositories.Globals; using SVSim.Database.Repositories.Viewer; using SVSim.Database.Services; +using SVSim.Database.Services.Inventory; using SVSim.EmulatedEntrypoint.Models.Dtos.Common.ArenaTwoPick; using SVSim.EmulatedEntrypoint.Models.Dtos.Responses.ArenaTwoPick; @@ -17,11 +19,9 @@ public class ArenaTwoPickService : IArenaTwoPickService private readonly IArenaTwoPickCardPoolService _pool; private readonly IGameConfigService _config; private readonly IViewerRepository _viewers; - private readonly RewardGrantService _grants; - private readonly IViewerEntitlements _entitlements; + private readonly IInventoryService _inv; private readonly IRandom _rng; private readonly SVSimDbContext _db; - private readonly ICurrencySpendService _spend; public ArenaTwoPickService( IArenaTwoPickRunRepository runs, @@ -29,15 +29,12 @@ public class ArenaTwoPickService : IArenaTwoPickService IArenaTwoPickCardPoolService pool, IGameConfigService config, IViewerRepository viewers, - RewardGrantService grants, - IViewerEntitlements entitlements, + IInventoryService inv, IRandom rng, - SVSimDbContext db, - ICurrencySpendService spend) + SVSimDbContext db) { _runs = runs; _rewards = rewards; _pool = pool; _config = config; - _viewers = viewers; _grants = grants; _entitlements = entitlements; _rng = rng; _db = db; - _spend = spend; + _viewers = viewers; _inv = inv; _rng = rng; _db = db; } public async Task GetTopAsync(long viewerId) @@ -66,14 +63,16 @@ public class ArenaTwoPickService : IArenaTwoPickService throw new ArenaTwoPickException("arena_two_pick_already_in_progress"); var aCfg = _config.Get(); - var viewer = await LoadViewerForGrantsAsync(viewerId); + + // Open inventory tx for currency/item debit. + await using var tx = await _inv.BeginAsync(viewerId); // Dispatch on the client's chosen payment method (ArenaData.eARENA_PAY). RewardEntryDto? feeEntry = consumeItemType switch { - 1 => await DebitCrystalsAsync(viewer, aCfg.CrystalCost), - 3 => DebitTicket(viewer, aCfg.TicketItemId, aCfg.TicketCost), - 4 => await DebitRupiesAsync(viewer, aCfg.RupyCost), + 1 => await DebitCrystalsAsync(tx, aCfg.CrystalCost), + 3 => await DebitTicketAsync(tx, aCfg.TicketItemId, aCfg.TicketCost), + 4 => await DebitRupiesAsync(tx, aCfg.RupyCost), 5 => null, // Free entry — no fee. _ => throw new ArenaTwoPickException("invalid_consume_item_type"), }; @@ -102,9 +101,12 @@ public class ArenaTwoPickService : IArenaTwoPickService IsRetire = false, }; await _runs.UpsertAsync(run); + // Save to get auto-generated Id before CommitAsync. + await _db.SaveChangesAsync(); run.EntryId = run.Id; await _runs.UpsertAsync(run); - await _db.SaveChangesAsync(); + // CommitAsync saves all pending changes (including run update) and commits the db tx. + await tx.CommitAsync(); var rewardList = feeEntry is null ? new List() : new List { feeEntry }; @@ -117,50 +119,50 @@ public class ArenaTwoPickService : IArenaTwoPickService }; } - private RewardEntryDto DebitTicket(SVSim.Database.Models.Viewer viewer, int ticketItemId, int ticketCost) + private async Task DebitTicketAsync(IInventoryTransaction tx, int ticketItemId, int ticketCost) { - var ticket = viewer.Items.FirstOrDefault(i => i.Item.Id == ticketItemId); - int postStateCount; - if (_entitlements.IsFreeplay) + if (tx.IsFreeplay) { - postStateCount = ticket?.Count ?? 0; - } - else - { - if (ticket is null || ticket.Count < ticketCost) - throw new ArenaTwoPickException("insufficient_ticket"); - ticket.Count -= ticketCost; - postStateCount = ticket.Count; + var ticket = tx.Viewer.Items.FirstOrDefault(i => i.Item.Id == ticketItemId); + return new RewardEntryDto + { + RewardType = (int)UserGoodsType.Item, + RewardId = ticketItemId, + RewardNum = ticket?.Count ?? 0, + }; } + var debitResult = await tx.TryDebitAsync(UserGoodsType.Item, ticketItemId, ticketCost); + if (!debitResult.Success) + throw new ArenaTwoPickException("insufficient_ticket"); return new RewardEntryDto { - RewardType = (int)SVSim.Database.Enums.UserGoodsType.Item, + RewardType = (int)UserGoodsType.Item, RewardId = ticketItemId, - RewardNum = postStateCount, + RewardNum = (int)debitResult.PostStateTotal, }; } - private async Task DebitCrystalsAsync(SVSim.Database.Models.Viewer viewer, int cost) + private async Task DebitCrystalsAsync(IInventoryTransaction tx, int cost) { - var result = await _spend.TrySpendAsync(viewer, SVSim.Database.Services.SpendCurrency.Crystal, cost); + var result = await tx.TrySpendAsync(SpendCurrency.Crystal, cost); if (!result.Success) throw new ArenaTwoPickException("insufficient_crystal"); return new RewardEntryDto { - RewardType = (int)SVSim.Database.Enums.UserGoodsType.Crystal, + RewardType = (int)UserGoodsType.Crystal, RewardId = 0, RewardNum = (int)result.PostStateTotal, }; } - private async Task DebitRupiesAsync(SVSim.Database.Models.Viewer viewer, int cost) + private async Task DebitRupiesAsync(IInventoryTransaction tx, int cost) { - var result = await _spend.TrySpendAsync(viewer, SVSim.Database.Services.SpendCurrency.Rupee, cost); + var result = await tx.TrySpendAsync(SpendCurrency.Rupee, cost); if (!result.Success) throw new ArenaTwoPickException("insufficient_rupy"); return new RewardEntryDto { - RewardType = (int)SVSim.Database.Enums.UserGoodsType.Rupy, + RewardType = (int)UserGoodsType.Rupy, RewardId = 0, RewardNum = (int)result.PostStateTotal, }; @@ -295,12 +297,11 @@ public class ArenaTwoPickService : IArenaTwoPickService throw new ArenaTwoPickException("arena_two_pick_run_not_complete"); var rewardRows = await _rewards.GetRewardsByWinCountAsync(run.WinCount); - var viewer = await LoadViewerForGrantsAsync(viewerId); // 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)SVSim.Database.Enums.UserGoodsType.Item) + .Where(r => r.RewardType == (int)UserGoodsType.Item) .Select(r => (int)r.RewardId) .Distinct() .ToList(); @@ -310,7 +311,9 @@ public class ArenaTwoPickService : IArenaTwoPickService .ToDictionaryAsync(i => i.Id, i => i.Type); var deltas = new List(); - var picks = new List(); + + // Open inventory tx for grants. + await using var tx = await _inv.BeginAsync(viewerId); // Group by RewardGroup, weighted-pick one row per group (Weight==0 excluded). foreach (var group in rewardRows.GroupBy(r => r.RewardGroup)) @@ -318,13 +321,11 @@ public class ArenaTwoPickService : IArenaTwoPickService var pickable = group.Where(r => r.Weight > 0).ToList(); if (pickable.Count == 0) continue; var pick = WeightedPick(pickable, _rng); - picks.Add(pick); // Skip when the rolled outcome is "nothing" (RewardNum == 0). if (pick.RewardNum <= 0) continue; - var goodsType = (SVSim.Database.Enums.UserGoodsType)pick.RewardType; - await _grants.ApplyAsync(viewer, goodsType, pick.RewardId, pick.RewardNum); + await tx.GrantAsync((UserGoodsType)pick.RewardType, pick.RewardId, pick.RewardNum); deltas.Add(new TwoPickRewardReceivedDto { RewardType = pick.RewardType, @@ -334,11 +335,12 @@ public class ArenaTwoPickService : IArenaTwoPickService IsUsable = true, }); } - await _db.SaveChangesAsync(); - // ComputePostStateRewardList reads from the picked rows only — same set the - // grants were applied for — so the post-state list mirrors the deltas exactly. - var postStates = ComputePostStateRewardList(picks.Where(p => p.RewardNum > 0).ToList(), viewer); + var result = await tx.CommitAsync(); + + var postStates = result.RewardList + .Select(g => new RewardEntryDto { RewardType = g.RewardType, RewardId = g.RewardId, RewardNum = g.RewardNum }) + .ToList(); await _runs.DeleteAsync(viewerId); return new FinishResponseDto { Rewards = deltas, RewardList = postStates }; @@ -358,25 +360,6 @@ public class ArenaTwoPickService : IArenaTwoPickService return rows[^1]; } - private static List ComputePostStateRewardList( - IReadOnlyList rows, SVSim.Database.Models.Viewer viewer) - { - var entries = new List(); - foreach (var r in rows) - { - int postState = r.RewardType switch - { - (int)SVSim.Database.Enums.UserGoodsType.Rupy => (int)viewer.Currency!.Rupees, - (int)SVSim.Database.Enums.UserGoodsType.Crystal => (int)viewer.Currency!.Crystals, - (int)SVSim.Database.Enums.UserGoodsType.RedEther => (int)viewer.Currency!.RedEther, - (int)SVSim.Database.Enums.UserGoodsType.Item => viewer.Items.FirstOrDefault(i => i.Item.Id == (int)r.RewardId)?.Count ?? r.RewardNum, - _ => r.RewardNum, - }; - entries.Add(new RewardEntryDto { RewardType = r.RewardType, RewardId = r.RewardId, RewardNum = postState }); - } - return entries; - } - public async Task RecordBattleResultAsync(long viewerId, bool isWin) { var run = await _runs.GetByViewerIdAsync(viewerId) diff --git a/SVSim.UnitTests/Services/ArenaTwoPickServiceDraftTests.cs b/SVSim.UnitTests/Services/ArenaTwoPickServiceDraftTests.cs index 3cee2a5..e23331c 100644 --- a/SVSim.UnitTests/Services/ArenaTwoPickServiceDraftTests.cs +++ b/SVSim.UnitTests/Services/ArenaTwoPickServiceDraftTests.cs @@ -7,6 +7,7 @@ using SVSim.Database.Models; using SVSim.Database.Repositories.Globals; using SVSim.Database.Repositories.Viewer; using SVSim.Database.Services; +using SVSim.Database.Services.Inventory; using SVSim.EmulatedEntrypoint.Services; using SVSim.UnitTests.Infrastructure; @@ -25,19 +26,6 @@ public class ArenaTwoPickServiceDraftTests }; } - private sealed class FakeEntitlements : IViewerEntitlements - { - public bool IsFreeplay { get; init; } - - public long EffectiveBalance(SVSim.Database.Models.Viewer viewer, SpendCurrency currency) => 0; - public bool OwnsCard(SVSim.Database.Models.Viewer viewer, long cardId) => IsFreeplay; - public bool OwnsCosmetic(SVSim.Database.Models.Viewer viewer, CosmeticType type, int id) => IsFreeplay; - public Task> EffectiveOwnedCardsAsync(SVSim.Database.Models.Viewer viewer, CancellationToken ct = default) - => Task.FromResult>(new List()); - public Task EffectiveCosmeticsAsync(SVSim.Database.Models.Viewer viewer, CancellationToken ct = default) - => throw new NotSupportedException(); - } - private static async Task<(IArenaTwoPickService, IArenaTwoPickRunRepository, long viewerId)> SetupWithActiveRunAsync(int classChosen = 0) { var factory = new SVSimTestFactory(); @@ -73,11 +61,9 @@ public class ArenaTwoPickServiceDraftTests new FakePool(), scope.ServiceProvider.GetRequiredService(), scope.ServiceProvider.GetRequiredService(), - scope.ServiceProvider.GetRequiredService(), - new FakeEntitlements(), + scope.ServiceProvider.GetRequiredService(), new SystemRandom(seed: 1), - db, - scope.ServiceProvider.GetRequiredService()); + db); return (svc, runs, 7); } diff --git a/SVSim.UnitTests/Services/ArenaTwoPickServiceEntryTests.cs b/SVSim.UnitTests/Services/ArenaTwoPickServiceEntryTests.cs index dba71fc..faf1c8a 100644 --- a/SVSim.UnitTests/Services/ArenaTwoPickServiceEntryTests.cs +++ b/SVSim.UnitTests/Services/ArenaTwoPickServiceEntryTests.cs @@ -7,6 +7,7 @@ using SVSim.Database.Models; using SVSim.Database.Repositories.Globals; using SVSim.Database.Repositories.Viewer; using SVSim.Database.Services; +using SVSim.Database.Services.Inventory; using SVSim.EmulatedEntrypoint.Services; using SVSim.UnitTests.Infrastructure; @@ -23,24 +24,10 @@ public class ArenaTwoPickServiceEntryTests => throw new NotSupportedException("pool not used in EntryAsync"); } - /// Minimal fake that exposes only . - private sealed class FakeEntitlements : IViewerEntitlements - { - public bool IsFreeplay { get; init; } - - public long EffectiveBalance(SVSim.Database.Models.Viewer viewer, SpendCurrency currency) => 0; - public bool OwnsCard(SVSim.Database.Models.Viewer viewer, long cardId) => IsFreeplay; - public bool OwnsCosmetic(SVSim.Database.Models.Viewer viewer, CosmeticType type, int id) => IsFreeplay; - public Task> EffectiveOwnedCardsAsync(SVSim.Database.Models.Viewer viewer, CancellationToken ct = default) - => Task.FromResult>(new List()); - public Task EffectiveCosmeticsAsync(SVSim.Database.Models.Viewer viewer, CancellationToken ct = default) - => throw new NotSupportedException(); - } - private static async Task<(SVSimDbContext db, IArenaTwoPickService svc, long viewerId)> SetupAsync( int ticketCount, bool freeplay = false, ulong crystals = 0, ulong rupees = 0) { - var factory = new SVSimTestFactory(); + var factory = new SVSimTestFactory(freeplayEnabled: freeplay); var scope = factory.Services.CreateScope(); var db = scope.ServiceProvider.GetRequiredService(); await db.Database.EnsureCreatedAsync(); @@ -56,8 +43,8 @@ public class ArenaTwoPickServiceEntryTests db.Viewers.Add(viewer); await db.SaveChangesAsync(); - var grants = scope.ServiceProvider.GetRequiredService(); var config = scope.ServiceProvider.GetRequiredService(); + var inv = scope.ServiceProvider.GetRequiredService(); // Seed reward catalog so GetMaxWinCountAsync returns 7. await new ArenaTwoPickRewardImporter() @@ -69,11 +56,9 @@ public class ArenaTwoPickServiceEntryTests new NullCardPoolService(), config, scope.ServiceProvider.GetRequiredService(), - grants, - new FakeEntitlements { IsFreeplay = freeplay }, + inv, new SystemRandom(seed: 1234), - db, - scope.ServiceProvider.GetRequiredService()); + db); return (db, svc, viewer.Id); } diff --git a/SVSim.UnitTests/Services/ArenaTwoPickServiceFinishTests.cs b/SVSim.UnitTests/Services/ArenaTwoPickServiceFinishTests.cs index b50d066..2069664 100644 --- a/SVSim.UnitTests/Services/ArenaTwoPickServiceFinishTests.cs +++ b/SVSim.UnitTests/Services/ArenaTwoPickServiceFinishTests.cs @@ -8,6 +8,7 @@ using SVSim.Database.Models; using SVSim.Database.Repositories.Globals; using SVSim.Database.Repositories.Viewer; using SVSim.Database.Services; +using SVSim.Database.Services.Inventory; using SVSim.EmulatedEntrypoint.Services; using SVSim.UnitTests.Infrastructure; @@ -17,19 +18,6 @@ public class ArenaTwoPickServiceFinishTests { private const long TicketItemId = 80001; - private sealed class FakeEntitlements : IViewerEntitlements - { - public bool IsFreeplay { get; init; } - - public long EffectiveBalance(SVSim.Database.Models.Viewer viewer, SpendCurrency currency) => 0; - public bool OwnsCard(SVSim.Database.Models.Viewer viewer, long cardId) => IsFreeplay; - public bool OwnsCosmetic(SVSim.Database.Models.Viewer viewer, CosmeticType type, int id) => IsFreeplay; - public Task> EffectiveOwnedCardsAsync(SVSim.Database.Models.Viewer viewer, CancellationToken ct = default) - => Task.FromResult>(new List()); - public Task EffectiveCosmeticsAsync(SVSim.Database.Models.Viewer viewer, CancellationToken ct = default) - => throw new NotSupportedException(); - } - private sealed class FakePool : IArenaTwoPickCardPoolService { public List GeneratePickSetsForTurn(int classId, int turn, long startingPairId, IRandom rng) => new(); @@ -90,11 +78,9 @@ public class ArenaTwoPickServiceFinishTests new FakePool(), scope.ServiceProvider.GetRequiredService(), scope.ServiceProvider.GetRequiredService(), - scope.ServiceProvider.GetRequiredService(), - new FakeEntitlements(), + scope.ServiceProvider.GetRequiredService(), new SystemRandom(seed: 1), - db, - scope.ServiceProvider.GetRequiredService()); + db); return (db, svc, 7L); } diff --git a/SVSim.UnitTests/Services/ArenaTwoPickServiceTopTests.cs b/SVSim.UnitTests/Services/ArenaTwoPickServiceTopTests.cs index aa786e3..2bf7121 100644 --- a/SVSim.UnitTests/Services/ArenaTwoPickServiceTopTests.cs +++ b/SVSim.UnitTests/Services/ArenaTwoPickServiceTopTests.cs @@ -81,7 +81,7 @@ public class ArenaTwoPickServiceTopTests private static IArenaTwoPickService BuildService(SVSimDbContext db, IArenaTwoPickRunRepository runRepo) { // GetTopAsync only uses _runs — every other dep can be null! because the test path - // never touches them. The 9th positional arg (db) is required from Task 13 onward. - return new ArenaTwoPickService(runRepo, null!, null!, null!, null!, null!, null!, null!, db, null!); + // never touches them. + return new ArenaTwoPickService(runRepo, null!, null!, null!, null!, null!, null!, db); } } diff --git a/SVSim.UnitTests/Services/ArenaTwoPickServiceWeightedRewardsTests.cs b/SVSim.UnitTests/Services/ArenaTwoPickServiceWeightedRewardsTests.cs index 52c0324..c5a17ad 100644 --- a/SVSim.UnitTests/Services/ArenaTwoPickServiceWeightedRewardsTests.cs +++ b/SVSim.UnitTests/Services/ArenaTwoPickServiceWeightedRewardsTests.cs @@ -8,6 +8,7 @@ using SVSim.Database.Models; using SVSim.Database.Repositories.Globals; using SVSim.Database.Repositories.Viewer; using SVSim.Database.Services; +using SVSim.Database.Services.Inventory; using SVSim.EmulatedEntrypoint.Services; using SVSim.UnitTests.Infrastructure; @@ -17,19 +18,6 @@ public class ArenaTwoPickServiceWeightedRewardsTests { private const long TicketItemId = 80001; - private sealed class FakeEntitlements : IViewerEntitlements - { - public bool IsFreeplay { get; init; } - - public long EffectiveBalance(SVSim.Database.Models.Viewer viewer, SpendCurrency currency) => 0; - public bool OwnsCard(SVSim.Database.Models.Viewer viewer, long cardId) => IsFreeplay; - public bool OwnsCosmetic(SVSim.Database.Models.Viewer viewer, CosmeticType type, int id) => IsFreeplay; - public Task> EffectiveOwnedCardsAsync(SVSim.Database.Models.Viewer viewer, CancellationToken ct = default) - => Task.FromResult>(new List()); - public Task EffectiveCosmeticsAsync(SVSim.Database.Models.Viewer viewer, CancellationToken ct = default) - => throw new NotSupportedException(); - } - private sealed class FakePool : IArenaTwoPickCardPoolService { public List GeneratePickSetsForTurn(int classId, int turn, long startingPairId, IRandom rng) => new(); @@ -100,11 +88,9 @@ public class ArenaTwoPickServiceWeightedRewardsTests new FakePool(), scope.ServiceProvider.GetRequiredService(), scope.ServiceProvider.GetRequiredService(), - scope.ServiceProvider.GetRequiredService(), - new FakeEntitlements(), + scope.ServiceProvider.GetRequiredService(), rng, - db, - scope.ServiceProvider.GetRequiredService()); + db); return (db, svc, 7L); }