feat: wire HuntingController/HuntingModule and enrich current-location with monster pool
Registers HuntingModule (POST /api/hunts) into the DI graph alongside its new entities, and adds possibleMonsters (enabled LocationMonster pool, weight-descending, empty when hunting is disabled) to WorldService.getCurrentLocation. Also updates the pre-existing DB-less app.e2e-spec.ts to override HuntingModule the same way the other feature modules already are, since it now needs a real DataSource.
This commit is contained in:
@@ -5,6 +5,7 @@ import {
|
||||
BURNED_ROAD_ID,
|
||||
SOUTH_GATE_ID,
|
||||
} from '../database/seeds/vertical-slice.constants';
|
||||
import { LocationMonster } from '../monsters/entities/location-monster.entity';
|
||||
import { TravelService } from '../travel/travel.service';
|
||||
import { LocationConnection } from './entities/location-connection.entity';
|
||||
import { LocationDefinition } from './entities/location-definition.entity';
|
||||
@@ -102,7 +103,16 @@ describe('WorldService', () => {
|
||||
const connections = {
|
||||
find: findConnections,
|
||||
} as unknown as Repository<LocationConnection>;
|
||||
const service = new WorldService(travelService, characters, connections);
|
||||
const findLocationMonsters = jest.fn();
|
||||
const locationMonsters = {
|
||||
find: findLocationMonsters,
|
||||
} as unknown as Repository<LocationMonster>;
|
||||
const service = new WorldService(
|
||||
travelService,
|
||||
characters,
|
||||
connections,
|
||||
locationMonsters,
|
||||
);
|
||||
|
||||
const result = await service.getCurrentLocation(CHARACTER_ID);
|
||||
|
||||
@@ -131,6 +141,7 @@ describe('WorldService', () => {
|
||||
danger: 'LOW',
|
||||
},
|
||||
],
|
||||
possibleMonsters: [],
|
||||
});
|
||||
expect(findCharacter).toHaveBeenCalledWith({
|
||||
where: { id: CHARACTER_ID },
|
||||
@@ -140,6 +151,51 @@ describe('WorldService', () => {
|
||||
where: { fromLocationId: SOUTH_GATE_ID, enabled: true },
|
||||
relations: { toLocation: true },
|
||||
});
|
||||
expect(findLocationMonsters).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it('returns the enabled monster pool by name, ordered by weight descending, when hunting is enabled', async () => {
|
||||
const location = burnedRoad();
|
||||
const travelService = {
|
||||
completeTravelIfDue: jest.fn().mockResolvedValue({ status: 'IDLE' }),
|
||||
} as unknown as TravelService;
|
||||
const characters = {
|
||||
findOne: jest.fn().mockResolvedValue({
|
||||
id: CHARACTER_ID,
|
||||
currentLocationId: BURNED_ROAD_ID,
|
||||
currentLocation: location,
|
||||
}),
|
||||
} as unknown as Repository<Character>;
|
||||
const connections = {
|
||||
find: jest.fn().mockResolvedValue([]),
|
||||
} as unknown as Repository<LocationConnection>;
|
||||
const findLocationMonsters = jest
|
||||
.fn()
|
||||
.mockResolvedValue([
|
||||
{ monster: { name: 'Aschenratte' } },
|
||||
{ monster: { name: 'Stra\u00dfenr\u00e4uber' } },
|
||||
]);
|
||||
const locationMonsters = {
|
||||
find: findLocationMonsters,
|
||||
} as unknown as Repository<LocationMonster>;
|
||||
const service = new WorldService(
|
||||
travelService,
|
||||
characters,
|
||||
connections,
|
||||
locationMonsters,
|
||||
);
|
||||
|
||||
const result = await service.getCurrentLocation(CHARACTER_ID);
|
||||
|
||||
expect(result.possibleMonsters).toEqual([
|
||||
'Aschenratte',
|
||||
'Stra\u00dfenr\u00e4uber',
|
||||
]);
|
||||
expect(findLocationMonsters).toHaveBeenCalledWith({
|
||||
where: { locationId: BURNED_ROAD_ID, enabled: true },
|
||||
relations: { monster: true },
|
||||
order: { weight: 'DESC' },
|
||||
});
|
||||
});
|
||||
|
||||
it('reports a missing character after travel completion', async () => {
|
||||
@@ -157,11 +213,21 @@ describe('WorldService', () => {
|
||||
const connections = {
|
||||
find: findConnections,
|
||||
} as unknown as Repository<LocationConnection>;
|
||||
const service = new WorldService(travelService, characters, connections);
|
||||
const findLocationMonsters = jest.fn();
|
||||
const locationMonsters = {
|
||||
find: findLocationMonsters,
|
||||
} as unknown as Repository<LocationMonster>;
|
||||
const service = new WorldService(
|
||||
travelService,
|
||||
characters,
|
||||
connections,
|
||||
locationMonsters,
|
||||
);
|
||||
|
||||
await expect(
|
||||
service.getCurrentLocation(CHARACTER_ID),
|
||||
).rejects.toBeInstanceOf(NotFoundException);
|
||||
expect(findConnections).not.toHaveBeenCalled();
|
||||
expect(findLocationMonsters).not.toHaveBeenCalled();
|
||||
});
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user