SVSim/SVSimServer
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix(gift): drop RowVersion (SQLite incompatible) + restore wire reward_type map

Browse Source 
[Timestamp] byte[] doesn't work under SQLite (the test backend) — EF
expects the DB to populate it on insert, but SQLite has no equivalent
of Postgres's xmin. The WHERE Status = Unclaimed filter plus
IInventoryService's viewer-level concurrency is the practical defense;
RowVersion was only a backstop. Regenerated the migration without the
RowVersion column.

Wire reward_type on the gift endpoint uses a gift-specific scheme that
diverges from UserGoodsType for currencies: wire 1 = Crystal (enum=2),
wire 9 = Rupy (enum=9), wire 4 = Item (enum=4). A naked cast resolves
wire 1 to UserGoodsType.RedEther and silently grants the wrong wallet
— restored the explicit WireRewardTypeToUserGoodsType map from the old
tutorial controller.

Retrofits existing GiftControllerTests to call SeedTutorialPresentsAsync
on the new helper (RegisterViewer doesn't auto-seed; only the prod
signup path does). All 7 existing tests pass.
This commit is contained in:
gamer147
2026-06-08 20:44:52 -04:00
parent ca36792be3
commit f1d881b26a
6 changed files with 22 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
SVSim.Database/Migrations/20260609003820_AddViewerPresents.Designer.cs → SVSim.Database/Migrations/20260609004113_AddViewerPresents.Designer.cs generated
View File

@@ -12,7 +12,7 @@ using SVSim.Database;
namespace SVSim.Database.Migrations
{
[DbContext(typeof(SVSimDbContext))]
[Migration("20260609003820_AddViewerPresents")]
[Migration("20260609004113_AddViewerPresents")]
partial class AddViewerPresents
{
/// <inheritdoc />
@@ -2902,12 +2902,6 @@ namespace SVSim.Database.Migrations
b.Property<int>("RewardType")
.HasColumnType("integer");
b.Property<byte[]>("RowVersion")
.IsConcurrencyToken()
.IsRequired()
.ValueGeneratedOnAddOrUpdate()
.HasColumnType("bytea");
b.Property<string>("Source")
.HasMaxLength(64)
.HasColumnType("character varying(64)");

3
SVSim.Database/Migrations/20260609003820_AddViewerPresents.cs → SVSim.Database/Migrations/20260609004113_AddViewerPresents.cs
View File

@@ -34,8 +34,7 @@ namespace SVSim.Database.Migrations
Message = table.Column<string>(type: "text", nullable: false),
CreatedAt = table.Column<DateTime>(type: "timestamp with time zone", nullable: false),
ClaimedAt = table.Column<DateTime>(type: "timestamp with time zone", nullable: true),
Source = table.Column<string>(type: "character varying(64)", maxLength: 64, nullable: true),
RowVersion = table.Column<byte[]>(type: "bytea", rowVersion: true, nullable: false)
Source = table.Column<string>(type: "character varying(64)", maxLength: 64, nullable: true)
},
constraints: table =>
{

6
SVSim.Database/Migrations/SVSimDbContextModelSnapshot.cs
View File

@@ -2899,12 +2899,6 @@ namespace SVSim.Database.Migrations
b.Property<int>("RewardType")
.HasColumnType("integer");
b.Property<byte[]>("RowVersion")
.IsConcurrencyToken()
.IsRequired()
.ValueGeneratedOnAddOrUpdate()
.HasColumnType("bytea");
b.Property<string>("Source")
.HasMaxLength(64)
.HasColumnType("character varying(64)");

9
SVSim.Database/Models/ViewerPresent.cs
View File

@@ -1,5 +1,3 @@
using System.ComponentModel.DataAnnotations;
namespace SVSim.Database.Models;
/// <summary>
@@ -39,13 +37,6 @@ public class ViewerPresent
/// this today — the tutorial-step advance is route-gated, not Source-gated.
/// </summary>
public string? Source { get; set; }
/// <summary>
/// EF Core optimistic concurrency for the claim path. Two concurrent claims of the
/// same PresentId: first wins, second's CommitAsync throws DbUpdateConcurrencyException.
/// </summary>
[Timestamp]
public byte[] RowVersion { get; set; } = Array.Empty<byte>();
}
public enum PresentStatus : byte

14
SVSim.EmulatedEntrypoint/Controllers/GiftController.cs
View File

@@ -84,8 +84,12 @@ public class GiftController : SVSimController
{
if (state == 1)
{
// Wire reward_type on the gift endpoint follows a gift-specific scheme that
// diverges from UserGoodsType for currencies: wire "1" means Crystal (enum=2),
// wire "9" means Rupy (enum=9), wire "4" means Item (enum=4). A naked cast would
// resolve wire 1 -> UserGoodsType.RedEther and silently grant the wrong wallet.
var granted = await tx.GrantAsync(
(UserGoodsType)p.RewardType,
WireRewardTypeToUserGoodsType(p.RewardType),
p.RewardDetailId,
(int)p.RewardCount);
@@ -161,6 +165,14 @@ public class GiftController : SVSimController
};
}
private static UserGoodsType WireRewardTypeToUserGoodsType(int wireType) => wireType switch
{
1 => UserGoodsType.Crystal,
4 => UserGoodsType.Item,
9 => UserGoodsType.Rupy,
_ => throw new InvalidOperationException($"Unmapped gift wire reward_type {wireType}"),
};
private async Task<(List<ViewerPresent> Unclaimed, List<ViewerPresent> History)> ReadTopWindowAsync(
long viewerId, int page)
{

7
SVSim.UnitTests/Controllers/GiftControllerTests.cs
View File

@@ -16,6 +16,7 @@ public class GiftControllerTests
{
using var factory = new SVSimTestFactory();
long viewerId = await factory.SeedViewerAsync(tutorialState: 31);
await factory.SeedTutorialPresentsAsync(viewerId);
using var client = factory.CreateAuthenticatedClient(viewerId);
var response = await client.PostAsync("/tutorial/gift_top",
@@ -54,6 +55,7 @@ public class GiftControllerTests
using var factory = new SVSimTestFactory();
await factory.SeedGlobalsAsync();
long viewerId = await factory.SeedViewerAsync(tutorialState: 31);
await factory.SeedTutorialPresentsAsync(viewerId);
using var client = factory.CreateAuthenticatedClient(viewerId);
var pre = await factory.GetViewerCurrencyAsync(viewerId);
@@ -100,6 +102,7 @@ public class GiftControllerTests
using var factory = new SVSimTestFactory();
await factory.SeedGlobalsAsync();
long viewerId = await factory.SeedViewerAsync(tutorialState: 31);
await factory.SeedTutorialPresentsAsync(viewerId);
using var client = factory.CreateAuthenticatedClient(viewerId);
var json = $$"""{"present_id_array":["71478626"],"state":1,{{BaseAuthBlock}}}""";
@@ -129,6 +132,7 @@ public class GiftControllerTests
using var factory = new SVSimTestFactory();
await factory.SeedGlobalsAsync();
long viewerId = await factory.SeedViewerAsync(tutorialState: 31);
await factory.SeedTutorialPresentsAsync(viewerId);
using var client = factory.CreateAuthenticatedClient(viewerId);
var json = $$"""{"present_id_array":["71478626","71478627"],"state":1,{{BaseAuthBlock}}}""";
@@ -167,6 +171,7 @@ public class GiftControllerTests
// 100, not the hardcoded 41 the endpoint used to emit, or the client's tutorial
// state machine regresses on a no-op retry.
long viewerId = await factory.SeedViewerAsync(tutorialState: 100);
await factory.SeedTutorialPresentsAsync(viewerId);
using var client = factory.CreateAuthenticatedClient(viewerId);
var json = $$"""{"present_id_array":["71478626"],"state":1,{{BaseAuthBlock}}}""";
@@ -192,6 +197,7 @@ public class GiftControllerTests
// found and incremented, not duplicated. The (ViewerId, ItemId) unique index
// added 2026-05-25 would otherwise throw on SaveChanges → 500 to the client.
await factory.SeedOwnedItemAsync(viewerId, itemId: 1, count: 5, itemName: "PreOwnedItem");
await factory.SeedTutorialPresentsAsync(viewerId);
using var client = factory.CreateAuthenticatedClient(viewerId);
@@ -224,6 +230,7 @@ public class GiftControllerTests
using var factory = new SVSimTestFactory();
await factory.SeedGlobalsAsync();
long viewerId = await factory.SeedViewerAsync(tutorialState: 31);
await factory.SeedTutorialPresentsAsync(viewerId);
using var client = factory.CreateAuthenticatedClient(viewerId);
var preFirst = await factory.GetViewerCurrencyAsync(viewerId);