fix: NPC controller — charger character depuis req.user (pas req.character)

.gitea/workflows/deploy.yml

@@ -31,7 +31,9 @@ jobs:
       - name: Restart pm2
         if: github.event_name == 'push' && github.ref == 'refs/heads/main'
         run: |
-          su - tetardtek-brain -c 'pm2 reload tetardpg-backend --update-env'
+          pm2 describe tetardpg-backend >/dev/null 2>&1 \
+            && pm2 reload tetardpg-backend --update-env \
+            || (cd /var/www/tetardpg/backend && pm2 start dist/main.js --name tetardpg-backend && pm2 save)
 
       # ── Frontend ─────────────────────────────────────────────────────────────
       - name: Install & build frontend

src/npc/npc.controller.ts

@@ -1,23 +1,36 @@
-import { Controller, Get, Query, Req, UseGuards } from '@nestjs/common';
+import { Controller, Get, Query, Req, UseGuards, BadRequestException } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+import { Repository } from 'typeorm';
 import { NpcService } from './npc.service';
 import { AuthGuard } from '../auth/guards/auth.guard';
+import { Character } from '../character/entities/character.entity';
 
 @Controller('npcs')
 @UseGuards(AuthGuard)
 export class NpcController {
-  constructor(private readonly npcService: NpcService) {}
+  constructor(
+    private readonly npcService: NpcService,
+    @InjectRepository(Character)
+    private readonly characterRepo: Repository<Character>,
+  ) {}
+
+  private async getCharacter(req: any) {
+    const character = await this.characterRepo.findOne({ where: { userId: req.user.id } });
+    if (!character) throw new BadRequestException('Aucun personnage trouvé');
+    return character;
+  }
 
   /** GET /api/npcs — tous les PNJ visibles pour le joueur */
   @Get()
   async getAll(@Req() req: any) {
-    const { characterId, level } = req.character;
+    const char = await this.getCharacter(req);
-    return this.npcService.getVisibleNpcs(characterId, level);
+    return this.npcService.getVisibleNpcs(char.id, char.level);
   }
 
-  /** GET /api/npcs?location=village_plaza — PNJ d'un emplacement */
+  /** GET /api/npcs/location?location=village_plaza — PNJ d'un emplacement */
   @Get('location')
   async getByLocation(@Req() req: any, @Query('location') location: string) {
-    const { characterId, level } = req.character;
+    const char = await this.getCharacter(req);
-    return this.npcService.getNpcsByLocation(characterId, level, location);
+    return this.npcService.getNpcsByLocation(char.id, char.level, location);
   }
 }

src/npc/npc.module.ts

@@ -4,10 +4,11 @@ import { Npc } from './npc.entity';
 import { NpcController } from './npc.controller';
 import { NpcService } from './npc.service';
 import { PlayerQuestArc } from '../quest/player-quest-arc.entity';
+import { Character } from '../character/entities/character.entity';
 import { AuthModule } from '../auth/auth.module';
 
 @Module({
-  imports: [TypeOrmModule.forFeature([Npc, PlayerQuestArc]), AuthModule],
+  imports: [TypeOrmModule.forFeature([Npc, PlayerQuestArc, Character]), AuthModule],
   controllers: [NpcController],
   providers: [NpcService],
   exports: [NpcService],