Résolution d'un bug de switch entre les PNJ lorsqu'on essai de passer directement de l'un à l'autre

Ajout de dossiers pour la partie PNJ pour qu'on puisse les regrouper par cité par exemple et que ce soit plus lisible

core/src/main/java/com/loremind/application/campaigncontext/NpcService.java

@@ -29,6 +29,7 @@ public class NpcService {
             Map<String, List<String>> imageValues,
             Map<String, Map<String, String>> keyValueValues,
             String campaignId,
+            String folder,
             Integer order
     ) {}
 
@@ -44,6 +45,7 @@ public class NpcService {
                 .imageValues(data.imageValues() != null ? new HashMap<>(data.imageValues()) : new HashMap<>())
                 .keyValueValues(data.keyValueValues() != null ? new HashMap<>(data.keyValueValues()) : new HashMap<>())
                 .campaignId(data.campaignId())
+                .folder(normalizeFolder(data.folder()))
                 .order(order)
                 .build();
         return npcRepository.save(npc);
@@ -66,6 +68,7 @@ public class NpcService {
         existing.setValues(data.values() != null ? new HashMap<>(data.values()) : new HashMap<>());
         existing.setImageValues(data.imageValues() != null ? new HashMap<>(data.imageValues()) : new HashMap<>());
         existing.setKeyValueValues(data.keyValueValues() != null ? new HashMap<>(data.keyValueValues()) : new HashMap<>());
+        existing.setFolder(normalizeFolder(data.folder()));
         if (data.order() != null) {
             existing.setOrder(data.order());
         }
@@ -76,6 +79,13 @@ public class NpcService {
         npcRepository.deleteById(id);
     }
 
+    /** Trim le dossier ; chaîne vide → null (= non classé). */
+    private static String normalizeFolder(String folder) {
+        if (folder == null) return null;
+        String trimmed = folder.trim();
+        return trimmed.isEmpty() ? null : trimmed;
+    }
+
     private int nextOrderFor(String campaignId) {
         return npcRepository.findByCampaignId(campaignId).stream()
                 .mapToInt(Npc::getOrder)

core/src/main/java/com/loremind/domain/campaigncontext/Npc.java

@@ -46,6 +46,9 @@ public class Npc {
     /** Référence vers la Campaign parente (cross-aggregate via ID). */
     private String campaignId;
 
+    /** Dossier de classement (texte libre, ex. « Bard's Gate »). Nullable = non classé. */
+    private String folder;
+
     /** Ordre d'affichage dans la liste des PNJ de la campagne. */
     private int order;
 

core/src/main/java/com/loremind/infrastructure/persistence/entity/NpcJpaEntity.java

@@ -54,6 +54,9 @@ public class NpcJpaEntity {
     @Column(name = "campaign_id", nullable = false)
     private Long campaignId;
 
+    @Column(name = "folder")
+    private String folder;
+
     @Column(name = "\"order\"", nullable = false)
     private int order;
 

core/src/main/java/com/loremind/infrastructure/persistence/postgres/PostgresNpcRepository.java

@@ -59,6 +59,7 @@ public class PostgresNpcRepository implements NpcRepository {
                 .imageValues(e.getImageValues() != null ? new HashMap<>(e.getImageValues()) : new HashMap<>())
                 .keyValueValues(e.getKeyValueValues() != null ? new HashMap<>(e.getKeyValueValues()) : new HashMap<>())
                 .campaignId(e.getCampaignId().toString())
+                .folder(e.getFolder())
                 .order(e.getOrder())
                 .createdAt(e.getCreatedAt())
                 .updatedAt(e.getUpdatedAt())
@@ -76,6 +77,7 @@ public class PostgresNpcRepository implements NpcRepository {
                 .imageValues(n.getImageValues() != null ? new HashMap<>(n.getImageValues()) : new HashMap<>())
                 .keyValueValues(n.getKeyValueValues() != null ? new HashMap<>(n.getKeyValueValues()) : new HashMap<>())
                 .campaignId(Long.parseLong(n.getCampaignId()))
+                .folder(n.getFolder())
                 .order(n.getOrder())
                 .createdAt(n.getCreatedAt())
                 .updatedAt(n.getUpdatedAt())

core/src/main/java/com/loremind/infrastructure/web/controller/NpcController.java

@@ -64,6 +64,7 @@ public class NpcController {
                 dto.getImageValues(),
                 dto.getKeyValueValues(),
                 dto.getCampaignId(),
+                dto.getFolder(),
                 order
         );
     }

core/src/main/java/com/loremind/infrastructure/web/dto/campaigncontext/NpcDTO.java

@@ -20,5 +20,6 @@ public class NpcDTO {
     private Map<String, List<String>> imageValues = new HashMap<>();
     private Map<String, Map<String, String>> keyValueValues = new HashMap<>();
     private String campaignId;
+    private String folder;
     private int order;
 }

core/src/main/java/com/loremind/infrastructure/web/mapper/NpcMapper.java

@@ -20,6 +20,7 @@ public class NpcMapper {
         dto.setImageValues(n.getImageValues() != null ? new HashMap<>(n.getImageValues()) : new HashMap<>());
         dto.setKeyValueValues(n.getKeyValueValues() != null ? new HashMap<>(n.getKeyValueValues()) : new HashMap<>());
         dto.setCampaignId(n.getCampaignId());
+        dto.setFolder(n.getFolder());
         dto.setOrder(n.getOrder());
         return dto;
     }
@@ -35,6 +36,7 @@ public class NpcMapper {
                 .imageValues(dto.getImageValues() != null ? new HashMap<>(dto.getImageValues()) : new HashMap<>())
                 .keyValueValues(dto.getKeyValueValues() != null ? new HashMap<>(dto.getKeyValueValues()) : new HashMap<>())
                 .campaignId(dto.getCampaignId())
+                .folder(dto.getFolder())
                 .order(dto.getOrder())
                 .build();
     }