fix(tk2): honor consume_item_type (ticket/crystal/rupy/free) + correct entry ticket id

- ArenaTwoPickConfig: add TicketItemId=1, TicketCost=1, CrystalCost=150, RupyCost=150 scalars
- ArenaTwoPickService.EntryAsync: switch on eARENA_PAY (1/3/4/5); crystal/rupy go through
  ICurrencySpendService.TrySpendAsync; ticket uses item id 1 (challenge ticket, not 80001);
  free entry returns empty reward_list; invalid type throws
- Tests: fix ticket id 80001→1 in entry/e2e; add 4 new path tests; update ctor (10th arg)
  across all 4 service test files; fix e2e retire assertion (reward ticket 80001 post-state=1)

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
gamer147
2026-05-31 12:26:57 -04:00
parent 668779e8a4
commit dc19289818
7 changed files with 166 additions and 51 deletions

View File

@@ -76,7 +76,8 @@ public class ArenaTwoPickServiceDraftTests
scope.ServiceProvider.GetRequiredService<RewardGrantService>(),
new FakeEntitlements(),
new SystemRandom(seed: 1),
db);
db,
scope.ServiceProvider.GetRequiredService<ICurrencySpendService>());
return (svc, runs, 7);
}

View File

@@ -14,7 +14,7 @@ namespace SVSim.UnitTests.Services;
public class ArenaTwoPickServiceEntryTests
{
private const long TicketItemId = 80001;
private const long TicketItemId = 1;
/// <summary>Minimal stub — EntryAsync never calls pool methods.</summary>
private sealed class NullCardPoolService : IArenaTwoPickCardPoolService
@@ -38,7 +38,7 @@ public class ArenaTwoPickServiceEntryTests
}
private static async Task<(SVSimDbContext db, IArenaTwoPickService svc, long viewerId)> SetupAsync(
int ticketCount, bool freeplay = false)
int ticketCount, bool freeplay = false, ulong crystals = 0, ulong rupees = 0)
{
var factory = new SVSimTestFactory();
var scope = factory.Services.CreateScope();
@@ -50,7 +50,7 @@ public class ArenaTwoPickServiceEntryTests
var viewer = new SVSim.Database.Models.Viewer
{
Id = 99, DisplayName = "X",
Currency = new ViewerCurrency(),
Currency = new ViewerCurrency { Crystals = crystals, Rupees = rupees },
};
viewer.Items.Add(new OwnedItemEntry { Item = ticketItem, Count = ticketCount });
db.Viewers.Add(viewer);
@@ -72,7 +72,8 @@ public class ArenaTwoPickServiceEntryTests
grants,
new FakeEntitlements { IsFreeplay = freeplay },
new SystemRandom(seed: 1234),
db);
db,
scope.ServiceProvider.GetRequiredService<ICurrencySpendService>());
return (db, svc, viewer.Id);
}
@@ -137,4 +138,62 @@ public class ArenaTwoPickServiceEntryTests
var ex = Assert.ThrowsAsync<ArenaTwoPickException>(() => svc.EntryAsync(viewerId, 3));
Assert.That(ex!.ErrorCode, Is.EqualTo("arena_two_pick_already_in_progress"));
}
[Test]
public async Task EntryAsync_with_crystals_debits_150_and_emits_reward_list_with_post_state_crystal_balance()
{
var (db, svc, viewerId) = await SetupAsync(ticketCount: 0, crystals: 500);
await using var _ = db;
var dto = await svc.EntryAsync(viewerId, consumeItemType: 1);
Assert.That(dto.RewardList.Count, Is.EqualTo(1));
Assert.That(dto.RewardList[0].RewardType, Is.EqualTo((int)SVSim.Database.Enums.UserGoodsType.Crystal));
Assert.That(dto.RewardList[0].RewardId, Is.EqualTo(0));
Assert.That(dto.RewardList[0].RewardNum, Is.EqualTo(350), "post-state = 500 - 150");
var updated = await db.Viewers.Include(v => v.Currency).FirstAsync(v => v.Id == viewerId);
Assert.That((long)updated.Currency!.Crystals, Is.EqualTo(350));
}
[Test]
public async Task EntryAsync_with_rupies_debits_150_and_emits_reward_list_with_post_state_rupy_balance()
{
var (db, svc, viewerId) = await SetupAsync(ticketCount: 0, rupees: 500);
await using var _ = db;
var dto = await svc.EntryAsync(viewerId, consumeItemType: 4);
Assert.That(dto.RewardList.Count, Is.EqualTo(1));
Assert.That(dto.RewardList[0].RewardType, Is.EqualTo((int)SVSim.Database.Enums.UserGoodsType.Rupy));
Assert.That(dto.RewardList[0].RewardId, Is.EqualTo(0));
Assert.That(dto.RewardList[0].RewardNum, Is.EqualTo(350), "post-state = 500 - 150");
var updated = await db.Viewers.Include(v => v.Currency).FirstAsync(v => v.Id == viewerId);
Assert.That((long)updated.Currency!.Rupees, Is.EqualTo(350));
}
[Test]
public async Task EntryAsync_free_entry_emits_empty_reward_list_and_creates_run()
{
var (db, svc, viewerId) = await SetupAsync(ticketCount: 0);
await using var _ = db;
var dto = await svc.EntryAsync(viewerId, consumeItemType: 5);
Assert.That(dto.RewardList, Is.Empty, "free entry emits no fee entry");
var run = await db.ViewerArenaTwoPickRuns.FirstAsync(r => r.ViewerId == viewerId);
Assert.That(run, Is.Not.Null);
}
[Test]
public async Task EntryAsync_with_invalid_consume_item_type_throws()
{
var (db, svc, viewerId) = await SetupAsync(ticketCount: 5);
await using var _ = db;
var ex = Assert.ThrowsAsync<ArenaTwoPickException>(() => svc.EntryAsync(viewerId, consumeItemType: 99));
Assert.That(ex!.ErrorCode, Is.EqualTo("invalid_consume_item_type"));
Assert.That(await db.ViewerArenaTwoPickRuns.AnyAsync(), Is.False);
}
}

View File

@@ -93,7 +93,8 @@ public class ArenaTwoPickServiceFinishTests
scope.ServiceProvider.GetRequiredService<RewardGrantService>(),
new FakeEntitlements(),
new SystemRandom(seed: 1),
db);
db,
scope.ServiceProvider.GetRequiredService<ICurrencySpendService>());
return (db, svc, 7L);
}

View File

@@ -82,6 +82,6 @@ public class ArenaTwoPickServiceTopTests
{
// 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);
return new ArenaTwoPickService(runRepo, null!, null!, null!, null!, null!, null!, null!, db, null!);
}
}