From 34a7bb9dbd48f5a4037e32b80609b341803bb066 Mon Sep 17 00:00:00 2001 From: Bastian Wagner Date: Fri, 21 Aug 2026 14:19:12 +0200 Subject: [PATCH] fix(api): sweep every remaining test fixture off level/experience/requiredLevel/experienceReward --- apps/api/src/combat/combat-equipment-integration.spec.ts | 3 +-- apps/api/src/equipment/equipment.service.spec.ts | 4 ++-- apps/api/src/hunting/hunting.service.spec.ts | 3 +-- apps/api/src/inventory/inventory.service.spec.ts | 4 +--- apps/api/src/inventory/inventory.service.ts | 2 -- apps/api/src/rewards/combat-reward.service.spec.ts | 6 +++--- apps/api/src/travel/travel.service.spec.ts | 3 +-- 7 files changed, 9 insertions(+), 16 deletions(-) diff --git a/apps/api/src/combat/combat-equipment-integration.spec.ts b/apps/api/src/combat/combat-equipment-integration.spec.ts index a007947..e0fa3c4 100644 --- a/apps/api/src/combat/combat-equipment-integration.spec.ts +++ b/apps/api/src/combat/combat-equipment-integration.spec.ts @@ -257,11 +257,10 @@ function itemDefinition( key: 'worn-short-sword', name: 'Abgenutztes Kurzschwert', description: '', - type: ItemType.WEAPON, + type: ItemType.EQUIPMENT, equipmentSlot: EquipmentSlot.WEAPON, rarity: ItemRarity.COMMON, tier: 1, - requiredLevel: 1, weaponDamage: 8, bonusHp: 0, bonusAttack: 0, diff --git a/apps/api/src/equipment/equipment.service.spec.ts b/apps/api/src/equipment/equipment.service.spec.ts index d75987b..e24d601 100644 --- a/apps/api/src/equipment/equipment.service.spec.ts +++ b/apps/api/src/equipment/equipment.service.spec.ts @@ -168,7 +168,7 @@ function itemDefinition( key: 'worn-short-sword', name: 'Abgenutztes Kurzschwert', description: '', - type: ItemType.WEAPON, + type: ItemType.EQUIPMENT, equipmentSlot: EquipmentSlot.WEAPON, rarity: ItemRarity.COMMON, tier: 1, @@ -365,7 +365,7 @@ describe('EquipmentService', () => { const material = itemDefinition({ id: 'def-ash-pelt', key: 'ash-pelt', - type: ItemType.MATERIAL, + type: ItemType.TRADE_GOOD, equipmentSlot: null, }); const { service } = createHarness({ diff --git a/apps/api/src/hunting/hunting.service.spec.ts b/apps/api/src/hunting/hunting.service.spec.ts index d4bac69..86362ed 100644 --- a/apps/api/src/hunting/hunting.service.spec.ts +++ b/apps/api/src/hunting/hunting.service.spec.ts @@ -233,8 +233,7 @@ function character(currentLocation: LocationDefinition): Character { return { id: CHARACTER_ID, name: 'Aric Duskwalker', - level: 1, - experience: 0, + renown: 1, silver: 0, baseHp: 100, baseAttack: 6, diff --git a/apps/api/src/inventory/inventory.service.spec.ts b/apps/api/src/inventory/inventory.service.spec.ts index dd67bec..15fa969 100644 --- a/apps/api/src/inventory/inventory.service.spec.ts +++ b/apps/api/src/inventory/inventory.service.spec.ts @@ -20,9 +20,8 @@ function characterItem(overrides: Partial = {}): CharacterItem { key: 'worn-short-sword', name: 'Abgenutztes Kurzschwert', rarity: ItemRarity.COMMON, - type: ItemType.WEAPON, + type: ItemType.EQUIPMENT, equipmentSlot: EquipmentSlot.WEAPON, - requiredLevel: 1, weaponDamage: 8, bonusAttack: 0, bonusHp: 0, @@ -69,7 +68,6 @@ describe('InventoryService', () => { name: 'Abgenutztes Kurzschwert', rarity: 'COMMON', equipmentSlot: 'WEAPON', - requiredLevel: 1, weaponDamage: 8, bonusAttack: 0, bonusHp: 0, diff --git a/apps/api/src/inventory/inventory.service.ts b/apps/api/src/inventory/inventory.service.ts index 3eb9a3f..6c13c89 100644 --- a/apps/api/src/inventory/inventory.service.ts +++ b/apps/api/src/inventory/inventory.service.ts @@ -15,7 +15,6 @@ export interface InventoryItemDto { name: string; rarity: ItemRarity; equipmentSlot: EquipmentSlot | null; - requiredLevel: number; weaponDamage: number; bonusAttack: number; bonusHp: number; @@ -58,7 +57,6 @@ export class InventoryService { name: characterItem.itemDefinition.name, rarity: characterItem.itemDefinition.rarity, equipmentSlot: characterItem.itemDefinition.equipmentSlot, - requiredLevel: characterItem.itemDefinition.requiredLevel, weaponDamage: characterItem.itemDefinition.weaponDamage, bonusAttack: characterItem.itemDefinition.bonusAttack, bonusHp: characterItem.itemDefinition.bonusHp, diff --git a/apps/api/src/rewards/combat-reward.service.spec.ts b/apps/api/src/rewards/combat-reward.service.spec.ts index 5962e7f..7acce1e 100644 --- a/apps/api/src/rewards/combat-reward.service.spec.ts +++ b/apps/api/src/rewards/combat-reward.service.spec.ts @@ -159,7 +159,7 @@ function createState(overrides: Partial = {}): State { id: BANDIT_BLADE, key: 'bandit-blade', name: 'Räuberklinge', - type: ItemType.WEAPON, + type: ItemType.EQUIPMENT, rarity: ItemRarity.COMMON, iconPath: '/images/items/bandit-blade.png', } as ItemDefinition, @@ -437,7 +437,7 @@ describe('CombatRewardService', () => { id: BANDIT_BLADE, key: 'bandit-blade', name: 'Räuberklinge', - type: ItemType.WEAPON, + type: ItemType.EQUIPMENT, rarity: ItemRarity.COMMON, iconPath: '/images/items/bandit-blade.png', } as ItemDefinition, @@ -445,7 +445,7 @@ describe('CombatRewardService', () => { id: BANDIT_HOOD, key: 'bandit-hood', name: 'Räuberkapuze', - type: ItemType.ARMOR, + type: ItemType.EQUIPMENT, rarity: ItemRarity.COMMON, iconPath: '/images/items/bandit-hood.png', } as ItemDefinition, diff --git a/apps/api/src/travel/travel.service.spec.ts b/apps/api/src/travel/travel.service.spec.ts index dbfa6d1..9cb28ac 100644 --- a/apps/api/src/travel/travel.service.spec.ts +++ b/apps/api/src/travel/travel.service.spec.ts @@ -177,8 +177,7 @@ function createState(): FakeState { const character: Character = { id: CHARACTER_ID, name: 'Aric Duskwalker', - level: 1, - experience: 0, + renown: 1, silver: 0, baseHp: 100, baseAttack: 6,