DNF90 服务端与启动器完整源码（含 GM 工具功能增强）
服务端（Go）： - GM 塞背包/带属性装备发放：在线角色推送 op14 增量物品行，背包实时刷新，无需回角色选择界面 - GM 改金币/改等级：去掉在线拒绝，落库后推送 op14 钱包/op37 等级状态，在线实时刷新 - 等级端点统一切换到新版 GMSetCharacterLevel（自带在线刷新） - 无限/锁死疲劳模式 + 燃烧疲劳：每房间消耗 2 点、打怪与通关经验双倍 - 燃烧疲劳开关时给所有在线角色推送系统提示（op12 mode 0） - 深渊史诗掉率：GM 全局倍率 + 城镇增益药剂窗口倍率，真实接入掉落结算 启动器（Python/JS）： - 标题栏自绘、窗口 1204x717、禁止拖拽改大小、仅最小化/关闭 - GM 工具：疲劳与燃烧、深渊史诗掉率、拍卖行上架（单一定价对齐） - 拍卖行上架前端对齐服务端单一价格语义，修复 400 报错
This commit is contained in:
hanfuit committed
commit
645b64fe21
4388 files changed
+1405457
No files matched your search
@@ -0,0 +1,363 @@
|
||||
package rental
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"fmt"
|
||||
"math"
|
||||
"strconv"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
dnfrepo "longheng.io/server/internal/modules/dnf/repository"
|
||||
)
|
||||
|
||||
const PointMetadataKey = "rental_lucky_stars"
|
||||
|
||||
var (
|
||||
ErrOwnerUnavailable = errors.New("rental owner is unavailable")
|
||||
ErrAccountRequired = errors.New("rental account id is required")
|
||||
ErrCharacterRequired = errors.New("rental character id is required")
|
||||
ErrStateMissing = errors.New("rental asset state is missing")
|
||||
ErrOwnerMismatch = errors.New("rental asset owner mismatch")
|
||||
ErrPointsInsufficient = errors.New("rental points are insufficient")
|
||||
ErrGoldInsufficient = errors.New("rental point gold is insufficient")
|
||||
ErrPointLimit = errors.New("rental point limit exceeded")
|
||||
ErrProjectorRequired = errors.New("rental mutation projector is required")
|
||||
ErrCommandInvalid = errors.New("rental command is invalid")
|
||||
)
|
||||
|
||||
type WalletResult struct {
|
||||
Points uint32
|
||||
Gold int64
|
||||
}
|
||||
|
||||
type Assets struct {
|
||||
Character *dnfrepo.CharacterRecord
|
||||
Inventory *dnfrepo.InventoryRecord
|
||||
Equipment *dnfrepo.EquipmentRecord
|
||||
}
|
||||
|
||||
type Changes struct {
|
||||
Inventory bool
|
||||
Equipment bool
|
||||
}
|
||||
|
||||
type Projector func(*Assets) (Changes, error)
|
||||
|
||||
type ChargeCommand struct {
|
||||
AccountID string
|
||||
CharacterID string
|
||||
Count uint32
|
||||
Limit uint32
|
||||
GoldPerPoint int64
|
||||
UpdatedAt time.Time
|
||||
}
|
||||
|
||||
type RentCommand struct {
|
||||
AccountID string
|
||||
CharacterID string
|
||||
PointCost uint32
|
||||
UpdatedAt time.Time
|
||||
Project Projector
|
||||
}
|
||||
|
||||
type CleanupCommand struct {
|
||||
AccountID string
|
||||
CharacterID string
|
||||
UpdatedAt time.Time
|
||||
Project Projector
|
||||
}
|
||||
|
||||
// Owner owns rental wallet rules, account/character authorization, and the
|
||||
// atomic account, character, inventory, and equipment commit. PVF validation
|
||||
// and current-client raw-row projection remain in the bridge.
|
||||
type Owner struct {
|
||||
assets dnfrepo.RentalAssetUnitOfWork
|
||||
}
|
||||
|
||||
func NewOwner(repositories dnfrepo.Group) (*Owner, error) {
|
||||
if repositories.RentalAssets == nil {
|
||||
return nil, ErrOwnerUnavailable
|
||||
}
|
||||
return &Owner{assets: repositories.RentalAssets}, nil
|
||||
}
|
||||
|
||||
func (o *Owner) Charge(ctx context.Context, command ChargeCommand) (WalletResult, error) {
|
||||
if command.Count == 0 || command.Limit == 0 || command.GoldPerPoint <= 0 {
|
||||
return WalletResult{}, ErrCommandInvalid
|
||||
}
|
||||
if int64(command.Count) > math.MaxInt64/command.GoldPerPoint {
|
||||
return WalletResult{}, ErrPointLimit
|
||||
}
|
||||
cost := int64(command.Count) * command.GoldPerPoint
|
||||
var result WalletResult
|
||||
err := o.withinOwners(ctx, command.AccountID, command.CharacterID, func(
|
||||
accounts dnfrepo.AccountRepository,
|
||||
characters dnfrepo.CharacterRepository,
|
||||
_ dnfrepo.InventoryRepository,
|
||||
_ dnfrepo.EquipmentRepository,
|
||||
account dnfrepo.AccountRecord,
|
||||
character dnfrepo.CharacterRecord,
|
||||
) error {
|
||||
points, err := Points(account)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if uint64(points)+uint64(command.Count) > uint64(command.Limit) {
|
||||
return ErrPointLimit
|
||||
}
|
||||
gold := character.Stats["gold"]
|
||||
if gold < cost {
|
||||
return ErrGoldInsufficient
|
||||
}
|
||||
points += command.Count
|
||||
gold -= cost
|
||||
if character.Stats == nil {
|
||||
character.Stats = make(map[string]int64)
|
||||
}
|
||||
character.Stats["gold"] = gold
|
||||
SetPoints(&account, points)
|
||||
now := normalizedTime(command.UpdatedAt)
|
||||
account.UpdatedAt = now
|
||||
character.UpdatedAt = now
|
||||
if err := accounts.Save(ctx, account); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := dnfrepo.SaveCharacterFields(ctx, characters, character, dnfrepo.CharacterFieldStats); err != nil {
|
||||
return err
|
||||
}
|
||||
result = WalletResult{Points: points, Gold: gold}
|
||||
return nil
|
||||
})
|
||||
if err != nil {
|
||||
return WalletResult{}, err
|
||||
}
|
||||
return result, nil
|
||||
}
|
||||
|
||||
func (o *Owner) Rent(ctx context.Context, command RentCommand) (WalletResult, error) {
|
||||
if command.PointCost == 0 {
|
||||
return WalletResult{}, ErrCommandInvalid
|
||||
}
|
||||
if command.Project == nil {
|
||||
return WalletResult{}, ErrProjectorRequired
|
||||
}
|
||||
var result WalletResult
|
||||
err := o.withinOwners(ctx, command.AccountID, command.CharacterID, func(
|
||||
accounts dnfrepo.AccountRepository,
|
||||
_ dnfrepo.CharacterRepository,
|
||||
inventories dnfrepo.InventoryRepository,
|
||||
equipmentRepo dnfrepo.EquipmentRepository,
|
||||
account dnfrepo.AccountRecord,
|
||||
character dnfrepo.CharacterRecord,
|
||||
) error {
|
||||
points, err := Points(account)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if points < command.PointCost {
|
||||
return ErrPointsInsufficient
|
||||
}
|
||||
inventory, equipment, err := loadRentalItems(ctx, inventories, equipmentRepo, command.CharacterID)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
changes, err := command.Project(&Assets{
|
||||
Character: &character,
|
||||
Inventory: &inventory,
|
||||
Equipment: &equipment,
|
||||
})
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
points -= command.PointCost
|
||||
SetPoints(&account, points)
|
||||
now := normalizedTime(command.UpdatedAt)
|
||||
account.UpdatedAt = now
|
||||
if err := accounts.Save(ctx, account); err != nil {
|
||||
return err
|
||||
}
|
||||
if changes.Inventory {
|
||||
inventory.UpdatedAt = now
|
||||
if err := dnfrepo.SaveInventoryFields(ctx, inventories, inventory, dnfrepo.InventoryFieldSlots); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
if changes.Equipment {
|
||||
equipment.UpdatedAt = now
|
||||
if err := dnfrepo.SaveEquipmentFields(ctx, equipmentRepo, equipment, dnfrepo.EquipmentFieldEntries); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
result = WalletResult{Points: points, Gold: character.Stats["gold"]}
|
||||
return nil
|
||||
})
|
||||
if err != nil {
|
||||
return WalletResult{}, err
|
||||
}
|
||||
return result, nil
|
||||
}
|
||||
|
||||
func (o *Owner) Cleanup(ctx context.Context, command CleanupCommand) error {
|
||||
if command.Project == nil {
|
||||
return ErrProjectorRequired
|
||||
}
|
||||
return o.withinOwners(ctx, command.AccountID, command.CharacterID, func(
|
||||
_ dnfrepo.AccountRepository,
|
||||
_ dnfrepo.CharacterRepository,
|
||||
inventories dnfrepo.InventoryRepository,
|
||||
equipmentRepo dnfrepo.EquipmentRepository,
|
||||
_ dnfrepo.AccountRecord,
|
||||
character dnfrepo.CharacterRecord,
|
||||
) error {
|
||||
inventory, equipment, err := loadRentalItems(ctx, inventories, equipmentRepo, command.CharacterID)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
changes, err := command.Project(&Assets{
|
||||
Character: &character,
|
||||
Inventory: &inventory,
|
||||
Equipment: &equipment,
|
||||
})
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
now := normalizedTime(command.UpdatedAt)
|
||||
if changes.Inventory {
|
||||
inventory.UpdatedAt = now
|
||||
if err := dnfrepo.SaveInventoryFields(ctx, inventories, inventory, dnfrepo.InventoryFieldSlots); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
if changes.Equipment {
|
||||
equipment.UpdatedAt = now
|
||||
if err := dnfrepo.SaveEquipmentFields(ctx, equipmentRepo, equipment, dnfrepo.EquipmentFieldEntries); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
return nil
|
||||
})
|
||||
}
|
||||
|
||||
func (o *Owner) withinOwners(
|
||||
ctx context.Context,
|
||||
accountID string,
|
||||
characterID string,
|
||||
apply func(
|
||||
dnfrepo.AccountRepository,
|
||||
dnfrepo.CharacterRepository,
|
||||
dnfrepo.InventoryRepository,
|
||||
dnfrepo.EquipmentRepository,
|
||||
dnfrepo.AccountRecord,
|
||||
dnfrepo.CharacterRecord,
|
||||
) error,
|
||||
) error {
|
||||
if o == nil || o.assets == nil {
|
||||
return ErrOwnerUnavailable
|
||||
}
|
||||
accountID = strings.TrimSpace(accountID)
|
||||
characterID = strings.TrimSpace(characterID)
|
||||
if accountID == "" {
|
||||
return ErrAccountRequired
|
||||
}
|
||||
if characterID == "" {
|
||||
return ErrCharacterRequired
|
||||
}
|
||||
if ctx == nil {
|
||||
ctx = context.Background()
|
||||
}
|
||||
if err := ctx.Err(); err != nil {
|
||||
return err
|
||||
}
|
||||
return dnfrepo.WithinRentalAssetsScoped(ctx, o.assets, accountID, characterID, func(
|
||||
accounts dnfrepo.AccountRepository,
|
||||
characters dnfrepo.CharacterRepository,
|
||||
inventories dnfrepo.InventoryRepository,
|
||||
equipment dnfrepo.EquipmentRepository,
|
||||
) error {
|
||||
if accounts == nil || characters == nil || inventories == nil || equipment == nil {
|
||||
return ErrOwnerUnavailable
|
||||
}
|
||||
account, accountFound, err := accounts.Load(ctx, accountID)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
character, characterFound, err := characters.Load(ctx, characterID)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if !accountFound || !characterFound {
|
||||
return ErrStateMissing
|
||||
}
|
||||
if strings.TrimSpace(account.AccountID) != accountID ||
|
||||
strings.TrimSpace(character.CharacterID) != characterID ||
|
||||
strings.TrimSpace(character.AccountID) != accountID {
|
||||
return ErrOwnerMismatch
|
||||
}
|
||||
account = dnfrepo.CloneAccount(account)
|
||||
character = dnfrepo.CloneCharacter(character)
|
||||
return apply(accounts, characters, inventories, equipment, account, character)
|
||||
})
|
||||
}
|
||||
|
||||
func Points(account dnfrepo.AccountRecord) (uint32, error) {
|
||||
raw := ""
|
||||
if account.Metadata != nil {
|
||||
raw = strings.TrimSpace(account.Metadata[PointMetadataKey])
|
||||
}
|
||||
if raw == "" {
|
||||
return 0, nil
|
||||
}
|
||||
value, err := strconv.ParseUint(raw, 10, 32)
|
||||
if err != nil {
|
||||
return 0, fmt.Errorf("invalid %s=%q: %w", PointMetadataKey, raw, err)
|
||||
}
|
||||
return uint32(value), nil
|
||||
}
|
||||
|
||||
func SetPoints(account *dnfrepo.AccountRecord, points uint32) {
|
||||
if account.Metadata == nil {
|
||||
account.Metadata = make(map[string]string)
|
||||
}
|
||||
account.Metadata[PointMetadataKey] = strconv.FormatUint(uint64(points), 10)
|
||||
}
|
||||
|
||||
func loadRentalItems(
|
||||
ctx context.Context,
|
||||
inventories dnfrepo.InventoryRepository,
|
||||
equipment dnfrepo.EquipmentRepository,
|
||||
characterID string,
|
||||
) (dnfrepo.InventoryRecord, dnfrepo.EquipmentRecord, error) {
|
||||
inventory, inventoryFound, err := inventories.Load(ctx, characterID)
|
||||
if err != nil {
|
||||
return dnfrepo.InventoryRecord{}, dnfrepo.EquipmentRecord{}, err
|
||||
}
|
||||
if !inventoryFound {
|
||||
inventory = dnfrepo.InventoryRecord{CharacterID: characterID}
|
||||
}
|
||||
inventory = dnfrepo.CloneInventory(inventory)
|
||||
if inventory.Slots == nil {
|
||||
inventory.Slots = make(map[string]dnfrepo.ItemStack)
|
||||
}
|
||||
worn, equipmentFound, err := equipment.Load(ctx, characterID)
|
||||
if err != nil {
|
||||
return dnfrepo.InventoryRecord{}, dnfrepo.EquipmentRecord{}, err
|
||||
}
|
||||
if !equipmentFound {
|
||||
worn = dnfrepo.EquipmentRecord{CharacterID: characterID}
|
||||
}
|
||||
worn = dnfrepo.CloneEquipment(worn)
|
||||
if worn.Entries == nil {
|
||||
worn.Entries = make(map[string]dnfrepo.EquipmentEntry)
|
||||
}
|
||||
return inventory, worn, nil
|
||||
}
|
||||
|
||||
func normalizedTime(value time.Time) time.Time {
|
||||
value = value.UTC()
|
||||
if value.IsZero() {
|
||||
return time.Now().UTC()
|
||||
}
|
||||
return value
|
||||
}
|
||||
@@ -0,0 +1,234 @@
|
||||
package rental
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"testing"
|
||||
|
||||
dnfrepo "longheng.io/server/internal/modules/dnf/repository"
|
||||
dnfrepomemory "longheng.io/server/internal/modules/dnf/repository/memory"
|
||||
)
|
||||
|
||||
func TestOwnerChargeCommitsPointsAndGold(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
repositories := dnfrepomemory.NewMemoryGroup()
|
||||
seedRentalOwner(t, ctx, repositories)
|
||||
owner, err := NewOwner(repositories)
|
||||
if err != nil {
|
||||
t.Fatalf("NewOwner error = %v", err)
|
||||
}
|
||||
|
||||
result, err := owner.Charge(ctx, ChargeCommand{
|
||||
AccountID: "dnf:1",
|
||||
CharacterID: "77",
|
||||
Count: 2,
|
||||
Limit: 20,
|
||||
GoldPerPoint: 100,
|
||||
})
|
||||
if err != nil {
|
||||
t.Fatalf("Charge error = %v", err)
|
||||
}
|
||||
if result.Points != 7 || result.Gold != 800 {
|
||||
t.Fatalf("Charge result = %+v", result)
|
||||
}
|
||||
account, _, _ := repositories.Account.Load(ctx, "dnf:1")
|
||||
character, _, _ := repositories.Character.Load(ctx, "77")
|
||||
if account.Metadata[PointMetadataKey] != "7" || character.Stats["gold"] != 800 {
|
||||
t.Fatalf("persisted account=%+v character=%+v", account, character)
|
||||
}
|
||||
}
|
||||
|
||||
func TestOwnerRentCommitsWalletAndProjectedItemsAtomically(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
repositories := dnfrepomemory.NewMemoryGroup()
|
||||
seedRentalOwner(t, ctx, repositories)
|
||||
owner, err := NewOwner(repositories)
|
||||
if err != nil {
|
||||
t.Fatalf("NewOwner error = %v", err)
|
||||
}
|
||||
|
||||
result, err := owner.Rent(ctx, RentCommand{
|
||||
AccountID: "dnf:1",
|
||||
CharacterID: "77",
|
||||
PointCost: 3,
|
||||
Project: func(assets *Assets) (Changes, error) {
|
||||
assets.Inventory.Slots["0:9"] = dnfrepo.ItemStack{ItemID: 416000000, Count: 1}
|
||||
assets.Equipment.Entries["weapon"] = dnfrepo.EquipmentEntry{ItemID: 416000001, SlotIndex: 0}
|
||||
return Changes{Inventory: true, Equipment: true}, nil
|
||||
},
|
||||
})
|
||||
if err != nil {
|
||||
t.Fatalf("Rent error = %v", err)
|
||||
}
|
||||
if result.Points != 2 || result.Gold != 1000 {
|
||||
t.Fatalf("Rent result = %+v", result)
|
||||
}
|
||||
account, _, _ := repositories.Account.Load(ctx, "dnf:1")
|
||||
inventory, _, _ := repositories.Inventory.Load(ctx, "77")
|
||||
equipment, _, _ := repositories.Equipment.Load(ctx, "77")
|
||||
if account.Metadata[PointMetadataKey] != "2" ||
|
||||
inventory.Slots["0:9"].ItemID != 416000000 ||
|
||||
equipment.Entries["weapon"].ItemID != 416000001 {
|
||||
t.Fatalf("persisted account=%+v inventory=%+v equipment=%+v", account, inventory, equipment)
|
||||
}
|
||||
}
|
||||
|
||||
func TestOwnerRentRollsBackProjectionAndRejectsCrossAccount(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
repositories := dnfrepomemory.NewMemoryGroup()
|
||||
seedRentalOwner(t, ctx, repositories)
|
||||
owner, err := NewOwner(repositories)
|
||||
if err != nil {
|
||||
t.Fatalf("NewOwner error = %v", err)
|
||||
}
|
||||
wantErr := errors.New("reject rental projection")
|
||||
errResult, err := owner.Rent(ctx, RentCommand{
|
||||
AccountID: "dnf:1",
|
||||
CharacterID: "77",
|
||||
PointCost: 3,
|
||||
Project: func(assets *Assets) (Changes, error) {
|
||||
assets.Inventory.Slots["0:9"] = dnfrepo.ItemStack{ItemID: 416000000, Count: 1}
|
||||
return Changes{Inventory: true}, wantErr
|
||||
},
|
||||
})
|
||||
if !errors.Is(err, wantErr) || errResult != (WalletResult{}) {
|
||||
t.Fatalf("Rent result=%+v error=%v", errResult, err)
|
||||
}
|
||||
account, _, _ := repositories.Account.Load(ctx, "dnf:1")
|
||||
inventory, _, _ := repositories.Inventory.Load(ctx, "77")
|
||||
if account.Metadata[PointMetadataKey] != "5" || len(inventory.Slots) != 0 {
|
||||
t.Fatalf("rollback account=%+v inventory=%+v", account, inventory)
|
||||
}
|
||||
|
||||
if err := repositories.Account.Save(ctx, dnfrepo.AccountRecord{
|
||||
AccountID: "dnf:2",
|
||||
Metadata: map[string]string{PointMetadataKey: "5"},
|
||||
}); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
called := false
|
||||
_, err = owner.Rent(ctx, RentCommand{
|
||||
AccountID: "dnf:2",
|
||||
CharacterID: "77",
|
||||
PointCost: 1,
|
||||
Project: func(*Assets) (Changes, error) {
|
||||
called = true
|
||||
return Changes{}, nil
|
||||
},
|
||||
})
|
||||
if !errors.Is(err, ErrOwnerMismatch) || called {
|
||||
t.Fatalf("cross-account Rent error=%v called=%t", err, called)
|
||||
}
|
||||
}
|
||||
|
||||
func TestOwnerCleanupPersistsOnlyProjectedContainers(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
repositories := dnfrepomemory.NewMemoryGroup()
|
||||
seedRentalOwner(t, ctx, repositories)
|
||||
if err := repositories.Inventory.Save(ctx, dnfrepo.InventoryRecord{
|
||||
CharacterID: "77",
|
||||
Slots: map[string]dnfrepo.ItemStack{"0:9": {ItemID: 416000000, Count: 1}},
|
||||
}); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
owner, err := NewOwner(repositories)
|
||||
if err != nil {
|
||||
t.Fatalf("NewOwner error = %v", err)
|
||||
}
|
||||
err = owner.Cleanup(ctx, CleanupCommand{
|
||||
AccountID: "dnf:1",
|
||||
CharacterID: "77",
|
||||
Project: func(assets *Assets) (Changes, error) {
|
||||
delete(assets.Inventory.Slots, "0:9")
|
||||
return Changes{Inventory: true}, nil
|
||||
},
|
||||
})
|
||||
if err != nil {
|
||||
t.Fatalf("Cleanup error = %v", err)
|
||||
}
|
||||
inventory, _, _ := repositories.Inventory.Load(ctx, "77")
|
||||
account, _, _ := repositories.Account.Load(ctx, "dnf:1")
|
||||
if len(inventory.Slots) != 0 || account.Metadata[PointMetadataKey] != "5" {
|
||||
t.Fatalf("cleanup inventory=%+v account=%+v", inventory, account)
|
||||
}
|
||||
}
|
||||
|
||||
func TestOwnerUsesScopedRentalAssetTransactionWhenAvailable(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
repositories := dnfrepomemory.NewMemoryGroup()
|
||||
seedRentalOwner(t, ctx, repositories)
|
||||
spy := &rentalAssetTransactionSpy{delegate: repositories.RentalAssets}
|
||||
repositories.RentalAssets = spy
|
||||
owner, err := NewOwner(repositories)
|
||||
if err != nil {
|
||||
t.Fatalf("NewOwner error = %v", err)
|
||||
}
|
||||
|
||||
if _, err := owner.Charge(ctx, ChargeCommand{
|
||||
AccountID: "dnf:1",
|
||||
CharacterID: "77",
|
||||
Count: 1,
|
||||
Limit: 20,
|
||||
GoldPerPoint: 100,
|
||||
}); err != nil {
|
||||
t.Fatalf("Charge error = %v", err)
|
||||
}
|
||||
if spy.scopedCalls != 1 || spy.legacyCalls != 0 {
|
||||
t.Fatalf("rental transaction routes scoped=%d legacy=%d, want scoped only", spy.scopedCalls, spy.legacyCalls)
|
||||
}
|
||||
}
|
||||
|
||||
type rentalAssetTransactionSpy struct {
|
||||
delegate dnfrepo.RentalAssetUnitOfWork
|
||||
scopedCalls int
|
||||
legacyCalls int
|
||||
}
|
||||
|
||||
func (s *rentalAssetTransactionSpy) WithinRentalAssets(
|
||||
ctx context.Context,
|
||||
accountID string,
|
||||
characterID string,
|
||||
apply func(dnfrepo.AccountRepository, dnfrepo.CharacterRepository, dnfrepo.InventoryRepository, dnfrepo.EquipmentRepository) error,
|
||||
) error {
|
||||
s.legacyCalls++
|
||||
return s.delegate.WithinRentalAssets(ctx, accountID, characterID, apply)
|
||||
}
|
||||
|
||||
func (s *rentalAssetTransactionSpy) WithinRentalAssetsScoped(
|
||||
ctx context.Context,
|
||||
accountID string,
|
||||
characterID string,
|
||||
apply func(dnfrepo.AccountRepository, dnfrepo.CharacterRepository, dnfrepo.InventoryRepository, dnfrepo.EquipmentRepository) error,
|
||||
) error {
|
||||
s.scopedCalls++
|
||||
return s.delegate.WithinRentalAssets(ctx, accountID, characterID, apply)
|
||||
}
|
||||
|
||||
func seedRentalOwner(t *testing.T, ctx context.Context, repositories dnfrepo.Group) {
|
||||
t.Helper()
|
||||
if err := repositories.Account.Save(ctx, dnfrepo.AccountRecord{
|
||||
AccountID: "dnf:1",
|
||||
Metadata: map[string]string{PointMetadataKey: "5"},
|
||||
}); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := repositories.Character.Save(ctx, dnfrepo.CharacterRecord{
|
||||
CharacterID: "77",
|
||||
AccountID: "dnf:1",
|
||||
Stats: map[string]int64{"gold": 1000},
|
||||
}); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := repositories.Inventory.Save(ctx, dnfrepo.InventoryRecord{
|
||||
CharacterID: "77",
|
||||
Slots: map[string]dnfrepo.ItemStack{},
|
||||
}); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := repositories.Equipment.Save(ctx, dnfrepo.EquipmentRecord{
|
||||
CharacterID: "77",
|
||||
Entries: map[string]dnfrepo.EquipmentEntry{},
|
||||
}); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user