Refonte de toute la partie fiche de personnage avec mise en place d'un nouveau bloc de liste d'attribut (pour tout ce qui sera statistiques, compétences etc....)

Passage V0.8.3

core/pom.xml

@@ -14,7 +14,7 @@
 
     <groupId>com.loremind</groupId>
     <artifactId>loremind-core</artifactId>
-    <version>0.8.1</version>
+    <version>0.8.3</version>
     <name>LoreMind Core</name>
     <description>Backend Core - Architecture Hexagonale</description>
 

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

@@ -32,6 +32,7 @@ public class CharacterService {
             String headerImageId,
             Map<String, String> values,
             Map<String, List<String>> imageValues,
+            Map<String, Map<String, String>> keyValueValues,
             String campaignId,
             Integer order
     ) {}
@@ -46,6 +47,7 @@ public class CharacterService {
                 .headerImageId(data.headerImageId())
                 .values(data.values() != null ? new HashMap<>(data.values()) : new HashMap<>())
                 .imageValues(data.imageValues() != null ? new HashMap<>(data.imageValues()) : new HashMap<>())
+                .keyValueValues(data.keyValueValues() != null ? new HashMap<>(data.keyValueValues()) : new HashMap<>())
                 .campaignId(data.campaignId())
                 .order(order)
                 .build();
@@ -68,6 +70,7 @@ public class CharacterService {
         existing.setHeaderImageId(data.headerImageId());
         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<>());
         if (data.order() != null) {
             existing.setOrder(data.order());
         }

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

@@ -27,6 +27,7 @@ public class NpcService {
             String headerImageId,
             Map<String, String> values,
             Map<String, List<String>> imageValues,
+            Map<String, Map<String, String>> keyValueValues,
             String campaignId,
             Integer order
     ) {}
@@ -41,6 +42,7 @@ public class NpcService {
                 .headerImageId(data.headerImageId())
                 .values(data.values() != null ? new HashMap<>(data.values()) : new HashMap<>())
                 .imageValues(data.imageValues() != null ? new HashMap<>(data.imageValues()) : new HashMap<>())
+                .keyValueValues(data.keyValueValues() != null ? new HashMap<>(data.keyValueValues()) : new HashMap<>())
                 .campaignId(data.campaignId())
                 .order(order)
                 .build();
@@ -63,6 +65,7 @@ public class NpcService {
         existing.setHeaderImageId(data.headerImageId());
         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<>());
         if (data.order() != null) {
             existing.setOrder(data.order());
         }

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

@@ -51,6 +51,14 @@ public class Character {
      */
     private Map<String, List<String>> imageValues;
 
+    /**
+     * Valeurs des champs KEY_VALUE_LIST du template PJ. Cle externe = nom du
+     * champ template (ex: "Caracteristiques"), cle interne = label predefini
+     * dans le template (ex: "FOR"), valeur = valeur saisie (ex: "16").
+     * Les labels suivent l'ordre defini dans TemplateField.labels.
+     */
+    private Map<String, Map<String, String>> keyValueValues;
+
     /** Référence vers la Campaign parente. */
     private String campaignId;
 
@@ -70,4 +78,9 @@ public class Character {
         if (imageValues == null) imageValues = new HashMap<>();
         return imageValues;
     }
+
+    public Map<String, Map<String, String>> getKeyValueValues() {
+        if (keyValueValues == null) keyValueValues = new HashMap<>();
+        return keyValueValues;
+    }
 }

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

@@ -40,6 +40,9 @@ public class Npc {
     /** Valeurs IMAGE du template PNJ (listes d'IDs ordonnees par champ). Jamais null. */
     private Map<String, List<String>> imageValues;
 
+    /** Valeurs KEY_VALUE_LIST : fieldName -> label -> value. Jamais null. */
+    private Map<String, Map<String, String>> keyValueValues;
+
     /** Référence vers la Campaign parente (cross-aggregate via ID). */
     private String campaignId;
 
@@ -58,4 +61,9 @@ public class Npc {
         if (imageValues == null) imageValues = new HashMap<>();
         return imageValues;
     }
+
+    public Map<String, Map<String, String>> getKeyValueValues() {
+        if (keyValueValues == null) keyValueValues = new HashMap<>();
+        return keyValueValues;
+    }
 }

core/src/main/java/com/loremind/domain/shared/template/FieldType.java

@@ -3,14 +3,18 @@ package com.loremind.domain.shared.template;
 /**
  * Type d'un champ dynamique de template (kernel partage).
  * <p>
- * - TEXT   : valeur textuelle libre (Map<String, String>)
- * - IMAGE  : galerie d'images, liste d'IDs (Map<String, List<String>>)
- * - NUMBER : valeur numerique stockee en texte (parsee a l'usage)
+ * - TEXT            : valeur textuelle libre (Map<String, String>)
+ * - IMAGE           : galerie d'images, liste d'IDs (Map<String, List<String>>)
+ * - NUMBER          : valeur numerique stockee en texte (parsee a l'usage)
+ * - KEY_VALUE_LIST  : liste de paires {label, value} avec labels figes au template
+ *                     (Map<String, Map<String, String>> : fieldName -> label -> value).
+ *                     Usage : stat blocks, listes de competences, traits.
  * <p>
- * Extension future possible : RICH_TEXT, DATE, BOOLEAN, KEY_VALUE_LIST, REFERENCE...
+ * Extension future possible : RICH_TEXT, DATE, BOOLEAN, REFERENCE...
  */
 public enum FieldType {
     TEXT,
     IMAGE,
-    NUMBER
+    NUMBER,
+    KEY_VALUE_LIST
 }

core/src/main/java/com/loremind/domain/shared/template/TemplateField.java

@@ -5,6 +5,8 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.List;
+
 /**
  * Value Object d'un champ de Template (kernel partage).
  * <p>
@@ -27,29 +29,45 @@ public class TemplateField {
     private FieldType type;
     /** Variante de rendu pour les champs IMAGE. Null = GALLERY. */
     private ImageLayout layout;
+    /**
+     * Labels predefinis pour les champs KEY_VALUE_LIST (ordre significatif).
+     * Ex: ["FOR","DEX","CON","INT","SAG","CHA"] pour un champ "Caracteristiques".
+     * Null/vide pour les autres types.
+     */
+    private List<String> labels;
 
-    /** Constructeur de retrocompat : type seul, layout=null. */
+    /** Constructeur de retrocompat : type seul, layout/labels=null. */
     public TemplateField(String name, FieldType type) {
-        this(name, type, null);
+        this(name, type, null, null);
+    }
+
+    /** Constructeur de retrocompat : type + layout, labels=null. */
+    public TemplateField(String name, FieldType type, ImageLayout layout) {
+        this(name, type, layout, null);
     }
 
     /** Raccourci : construit un champ de type TEXT (cas le plus courant). */
     public static TemplateField text(String name) {
-        return new TemplateField(name, FieldType.TEXT, null);
+        return new TemplateField(name, FieldType.TEXT, null, null);
     }
 
     /** Raccourci : construit un champ de type IMAGE avec layout GALLERY. */
     public static TemplateField image(String name) {
-        return new TemplateField(name, FieldType.IMAGE, ImageLayout.GALLERY);
+        return new TemplateField(name, FieldType.IMAGE, ImageLayout.GALLERY, null);
     }
 
     /** Raccourci : construit un champ IMAGE avec un layout specifique. */
     public static TemplateField image(String name, ImageLayout layout) {
-        return new TemplateField(name, FieldType.IMAGE, layout);
+        return new TemplateField(name, FieldType.IMAGE, layout, null);
     }
 
     /** Raccourci : construit un champ de type NUMBER. */
     public static TemplateField number(String name) {
-        return new TemplateField(name, FieldType.NUMBER, null);
+        return new TemplateField(name, FieldType.NUMBER, null, null);
+    }
+
+    /** Raccourci : construit un champ KEY_VALUE_LIST avec labels predefinis. */
+    public static TemplateField keyValueList(String name, List<String> labels) {
+        return new TemplateField(name, FieldType.KEY_VALUE_LIST, null, labels);
     }
 }

core/src/main/java/com/loremind/infrastructure/persistence/GameSystemSeeder.java

@@ -152,12 +152,8 @@ public class GameSystemSeeder {
                 TemplateField.number("Niveau"),
                 TemplateField.number("PV max"),
                 TemplateField.number("CA"),
-                TemplateField.number("FOR"),
-                TemplateField.number("DEX"),
-                TemplateField.number("CON"),
-                TemplateField.number("INT"),
-                TemplateField.number("SAG"),
-                TemplateField.number("CHA"),
+                TemplateField.keyValueList("Caracteristiques",
+                        List.of("FOR", "DEX", "CON", "INT", "SAG", "CHA")),
                 TemplateField.text("Competences"),
                 TemplateField.text("Equipement"),
                 TemplateField.text("Sorts"),

core/src/main/java/com/loremind/infrastructure/persistence/converter/StringMapMapJsonConverter.java

@@ -0,0 +1,49 @@
+package com.loremind.infrastructure.persistence.converter;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.persistence.AttributeConverter;
+import jakarta.persistence.Converter;
+
+import java.util.Collections;
+import java.util.Map;
+
+/**
+ * Convertit une Map<String, Map<String, String>> en JSON et inversement.
+ * <p>
+ * Utilise pour Character/Npc.keyValueValues : pour chaque champ KEY_VALUE_LIST
+ * du template, stocke une map label -> value. Exemple :
+ *   {"Caracteristiques": {"FOR":"16","DEX":"12","CON":"14"}}
+ * <p>
+ * Adaptateur technique pur : le domaine ignore ce converter.
+ */
+@Converter
+public class StringMapMapJsonConverter
+        implements AttributeConverter<Map<String, Map<String, String>>, String> {
+
+    private static final ObjectMapper MAPPER = new ObjectMapper();
+    private static final TypeReference<Map<String, Map<String, String>>> TYPE_REF =
+            new TypeReference<>() {};
+
+    @Override
+    public String convertToDatabaseColumn(Map<String, Map<String, String>> attribute) {
+        if (attribute == null || attribute.isEmpty()) return "{}";
+        try {
+            return MAPPER.writeValueAsString(attribute);
+        } catch (Exception e) {
+            throw new IllegalStateException(
+                    "Erreur serialisation Map<String, Map<String,String>> -> JSON", e);
+        }
+    }
+
+    @Override
+    public Map<String, Map<String, String>> convertToEntityAttribute(String dbData) {
+        if (dbData == null || dbData.isBlank()) return Collections.emptyMap();
+        try {
+            return MAPPER.readValue(dbData, TYPE_REF);
+        } catch (Exception e) {
+            throw new IllegalStateException(
+                    "Erreur deserialisation JSON -> Map<String, Map<String,String>>", e);
+        }
+    }
+}

core/src/main/java/com/loremind/infrastructure/persistence/converter/TemplateFieldListJsonConverter.java

@@ -85,8 +85,18 @@ public class TemplateFieldListJsonConverter
                             }
                         }
                     }
+                    List<String> labels = null;
+                    if (type == FieldType.KEY_VALUE_LIST) {
+                        JsonNode labelsNode = item.path("labels");
+                        if (labelsNode.isArray()) {
+                            labels = new ArrayList<>();
+                            for (JsonNode label : labelsNode) {
+                                if (label.isTextual()) labels.add(label.asText());
+                            }
+                        }
+                    }
                     if (name != null && !name.isBlank()) {
-                        result.add(new TemplateField(name, type, layout));
+                        result.add(new TemplateField(name, type, layout, labels));
                     }
                 }
                 // Autres types de noeuds (nombre, booleen...) : ignores silencieusement.

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

@@ -2,6 +2,7 @@ package com.loremind.infrastructure.persistence.entity;
 
 import com.loremind.infrastructure.persistence.converter.StringListMapJsonConverter;
 import com.loremind.infrastructure.persistence.converter.StringMapJsonConverter;
+import com.loremind.infrastructure.persistence.converter.StringMapMapJsonConverter;
 import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -53,6 +54,11 @@ public class CharacterJpaEntity {
     @Column(name = "image_values", columnDefinition = "TEXT")
     private Map<String, List<String>> imageValues;
 
+    /** Valeurs KEY_VALUE_LIST serialisees JSON (fieldName -> label -> value). */
+    @Convert(converter = StringMapMapJsonConverter.class)
+    @Column(name = "key_value_values", columnDefinition = "TEXT")
+    private Map<String, Map<String, String>> keyValueValues;
+
     @Column(name = "campaign_id", nullable = false)
     private Long campaignId;
 
@@ -71,6 +77,7 @@ public class CharacterJpaEntity {
         updatedAt = LocalDateTime.now();
         if (values == null) values = new HashMap<>();
         if (imageValues == null) imageValues = new HashMap<>();
+        if (keyValueValues == null) keyValueValues = new HashMap<>();
     }
 
     @PreUpdate

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

@@ -2,6 +2,7 @@ package com.loremind.infrastructure.persistence.entity;
 
 import com.loremind.infrastructure.persistence.converter.StringListMapJsonConverter;
 import com.loremind.infrastructure.persistence.converter.StringMapJsonConverter;
+import com.loremind.infrastructure.persistence.converter.StringMapMapJsonConverter;
 import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -46,6 +47,10 @@ public class NpcJpaEntity {
     @Column(name = "image_values", columnDefinition = "TEXT")
     private Map<String, List<String>> imageValues;
 
+    @Convert(converter = StringMapMapJsonConverter.class)
+    @Column(name = "key_value_values", columnDefinition = "TEXT")
+    private Map<String, Map<String, String>> keyValueValues;
+
     @Column(name = "campaign_id", nullable = false)
     private Long campaignId;
 
@@ -64,6 +69,7 @@ public class NpcJpaEntity {
         updatedAt = LocalDateTime.now();
         if (values == null) values = new HashMap<>();
         if (imageValues == null) imageValues = new HashMap<>();
+        if (keyValueValues == null) keyValueValues = new HashMap<>();
     }
 
     @PreUpdate

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

@@ -57,6 +57,7 @@ public class PostgresCharacterRepository implements CharacterRepository {
                 .headerImageId(e.getHeaderImageId())
                 .values(e.getValues() != null ? new HashMap<>(e.getValues()) : new HashMap<>())
                 .imageValues(e.getImageValues() != null ? new HashMap<>(e.getImageValues()) : new HashMap<>())
+                .keyValueValues(e.getKeyValueValues() != null ? new HashMap<>(e.getKeyValueValues()) : new HashMap<>())
                 .campaignId(e.getCampaignId().toString())
                 .order(e.getOrder())
                 .createdAt(e.getCreatedAt())
@@ -73,6 +74,7 @@ public class PostgresCharacterRepository implements CharacterRepository {
                 .headerImageId(c.getHeaderImageId())
                 .values(c.getValues() != null ? new HashMap<>(c.getValues()) : new HashMap<>())
                 .imageValues(c.getImageValues() != null ? new HashMap<>(c.getImageValues()) : new HashMap<>())
+                .keyValueValues(c.getKeyValueValues() != null ? new HashMap<>(c.getKeyValueValues()) : new HashMap<>())
                 .campaignId(Long.parseLong(c.getCampaignId()))
                 .order(c.getOrder())
                 .createdAt(c.getCreatedAt())

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

@@ -57,6 +57,7 @@ public class PostgresNpcRepository implements NpcRepository {
                 .headerImageId(e.getHeaderImageId())
                 .values(e.getValues() != null ? new HashMap<>(e.getValues()) : new HashMap<>())
                 .imageValues(e.getImageValues() != null ? new HashMap<>(e.getImageValues()) : new HashMap<>())
+                .keyValueValues(e.getKeyValueValues() != null ? new HashMap<>(e.getKeyValueValues()) : new HashMap<>())
                 .campaignId(e.getCampaignId().toString())
                 .order(e.getOrder())
                 .createdAt(e.getCreatedAt())
@@ -73,6 +74,7 @@ public class PostgresNpcRepository implements NpcRepository {
                 .headerImageId(n.getHeaderImageId())
                 .values(n.getValues() != null ? new HashMap<>(n.getValues()) : new HashMap<>())
                 .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()))
                 .order(n.getOrder())
                 .createdAt(n.getCreatedAt())

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

@@ -62,6 +62,7 @@ public class CharacterController {
                 dto.getHeaderImageId(),
                 dto.getValues(),
                 dto.getImageValues(),
+                dto.getKeyValueValues(),
                 dto.getCampaignId(),
                 order
         );

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

@@ -62,6 +62,7 @@ public class NpcController {
                 dto.getHeaderImageId(),
                 dto.getValues(),
                 dto.getImageValues(),
+                dto.getKeyValueValues(),
                 dto.getCampaignId(),
                 order
         );

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

@@ -21,6 +21,7 @@ public class CharacterDTO {
     private String headerImageId;
     private Map<String, String> values = new HashMap<>();
     private Map<String, List<String>> imageValues = new HashMap<>();
+    private Map<String, Map<String, String>> keyValueValues = new HashMap<>();
     private String campaignId;
     private int order;
 }

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

@@ -18,6 +18,7 @@ public class NpcDTO {
     private String headerImageId;
     private Map<String, String> values = new HashMap<>();
     private Map<String, List<String>> imageValues = new HashMap<>();
+    private Map<String, Map<String, String>> keyValueValues = new HashMap<>();
     private String campaignId;
     private int order;
 }

core/src/main/java/com/loremind/infrastructure/web/dto/shared/TemplateFieldDTO.java

@@ -4,6 +4,8 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.List;
+
 /**
  * DTO pour un champ de Template.
  * <p>
@@ -17,13 +19,20 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 public class TemplateFieldDTO {
     private String name;
-    /** "TEXT" ou "IMAGE" (string pour serialisation JSON transparente). */
+    /** "TEXT" | "IMAGE" | "NUMBER" | "KEY_VALUE_LIST". */
     private String type;
-    /** "GALLERY" | "HERO" | "MASONRY" | "CAROUSEL", null si type=TEXT. */
+    /** "GALLERY" | "HERO" | "MASONRY" | "CAROUSEL", uniquement pour IMAGE. */
     private String layout;
+    /** Labels predefinis pour KEY_VALUE_LIST (ordre significatif). */
+    private List<String> labels;
 
-    /** Retrocompat : constructeur sans layout. */
+    /** Retrocompat : constructeur sans labels. */
+    public TemplateFieldDTO(String name, String type, String layout) {
+        this(name, type, layout, null);
+    }
+
+    /** Retrocompat : constructeur sans layout ni labels. */
     public TemplateFieldDTO(String name, String type) {
-        this(name, type, null);
+        this(name, type, null, null);
     }
 }

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

@@ -18,6 +18,7 @@ public class CharacterMapper {
         dto.setHeaderImageId(c.getHeaderImageId());
         dto.setValues(c.getValues() != null ? new HashMap<>(c.getValues()) : new HashMap<>());
         dto.setImageValues(c.getImageValues() != null ? new HashMap<>(c.getImageValues()) : new HashMap<>());
+        dto.setKeyValueValues(c.getKeyValueValues() != null ? new HashMap<>(c.getKeyValueValues()) : new HashMap<>());
         dto.setCampaignId(c.getCampaignId());
         dto.setOrder(c.getOrder());
         return dto;
@@ -32,6 +33,7 @@ public class CharacterMapper {
                 .headerImageId(dto.getHeaderImageId())
                 .values(dto.getValues() != null ? new HashMap<>(dto.getValues()) : new HashMap<>())
                 .imageValues(dto.getImageValues() != null ? new HashMap<>(dto.getImageValues()) : new HashMap<>())
+                .keyValueValues(dto.getKeyValueValues() != null ? new HashMap<>(dto.getKeyValueValues()) : new HashMap<>())
                 .campaignId(dto.getCampaignId())
                 .order(dto.getOrder())
                 .build();

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

@@ -18,6 +18,7 @@ public class NpcMapper {
         dto.setHeaderImageId(n.getHeaderImageId());
         dto.setValues(n.getValues() != null ? new HashMap<>(n.getValues()) : new HashMap<>());
         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.setOrder(n.getOrder());
         return dto;
@@ -32,6 +33,7 @@ public class NpcMapper {
                 .headerImageId(dto.getHeaderImageId())
                 .values(dto.getValues() != null ? new HashMap<>(dto.getValues()) : new HashMap<>())
                 .imageValues(dto.getImageValues() != null ? new HashMap<>(dto.getImageValues()) : new HashMap<>())
+                .keyValueValues(dto.getKeyValueValues() != null ? new HashMap<>(dto.getKeyValueValues()) : new HashMap<>())
                 .campaignId(dto.getCampaignId())
                 .order(dto.getOrder())
                 .build();

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

@@ -6,14 +6,16 @@ import com.loremind.domain.shared.template.TemplateField;
 import com.loremind.infrastructure.web.dto.shared.TemplateFieldDTO;
 import org.springframework.stereotype.Component;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Mapper pour convertir entre {@link TemplateField} (domaine) et
  * {@link TemplateFieldDTO} (wire).
  * <p>
- * Tolerance : un type inconnu recu du client est interprete comme TEXT
- * (plus safe que de rejeter la requete et d'interrompre la sauvegarde).
+ * Tolerance : un type inconnu recu du client est interprete comme TEXT.
  * Un layout inconnu ou absent sur un champ IMAGE est interprete comme GALLERY.
- * Le layout est force a null pour les champs TEXT.
+ * Layout/labels forces a null pour les types qui ne les utilisent pas.
  */
 @Component
 public class TemplateFieldMapper {
@@ -26,7 +28,11 @@ public class TemplateFieldMapper {
             ImageLayout layout = field.getLayout() != null ? field.getLayout() : ImageLayout.GALLERY;
             layoutStr = layout.name();
         }
-        return new TemplateFieldDTO(field.getName(), typeStr, layoutStr);
+        List<String> labels = null;
+        if (field.getType() == FieldType.KEY_VALUE_LIST && field.getLabels() != null) {
+            labels = new ArrayList<>(field.getLabels());
+        }
+        return new TemplateFieldDTO(field.getName(), typeStr, layoutStr, labels);
     }
 
     public TemplateField toDomain(TemplateFieldDTO dto) {
@@ -47,6 +53,10 @@ public class TemplateFieldMapper {
                 layout = ImageLayout.GALLERY;
             }
         }
-        return new TemplateField(dto.getName(), type, layout);
+        List<String> labels = null;
+        if (type == FieldType.KEY_VALUE_LIST && dto.getLabels() != null) {
+            labels = new ArrayList<>(dto.getLabels());
+        }
+        return new TemplateField(dto.getName(), type, layout, labels);
     }
 }

core/src/test/java/com/loremind/application/campaigncontext/NpcServiceTest.java

@@ -51,7 +51,7 @@ public class NpcServiceTest {
 
         Npc result = npcService.createNpc(
                 new NpcService.NpcData("Borin le forgeron", null, null,
-                        Map.of("Notes", "Borin"), null, "camp-1", 5));
+                        Map.of("Notes", "Borin"), null, null, "camp-1", 5));
 
         assertNotNull(result);
         ArgumentCaptor<Npc> captor = ArgumentCaptor.forClass(Npc.class);
@@ -67,7 +67,7 @@ public class NpcServiceTest {
         when(npcRepository.findByCampaignId("camp-1")).thenReturn(List.of(a, b));
         when(npcRepository.save(any(Npc.class))).thenReturn(testNpc);
 
-        npcService.createNpc(new NpcService.NpcData("Nouveau", null, null, null, null, "camp-1", null));
+        npcService.createNpc(new NpcService.NpcData("Nouveau", null, null, null, null, null, "camp-1", null));
 
         ArgumentCaptor<Npc> captor = ArgumentCaptor.forClass(Npc.class);
         verify(npcRepository).save(captor.capture());
@@ -79,7 +79,7 @@ public class NpcServiceTest {
         when(npcRepository.findByCampaignId("camp-1")).thenReturn(List.of());
         when(npcRepository.save(any(Npc.class))).thenReturn(testNpc);
 
-        npcService.createNpc(new NpcService.NpcData("Premier", null, null, null, null, "camp-1", null));
+        npcService.createNpc(new NpcService.NpcData("Premier", null, null, null, null, null, "camp-1", null));
 
         ArgumentCaptor<Npc> captor = ArgumentCaptor.forClass(Npc.class);
         verify(npcRepository).save(captor.capture());
@@ -124,7 +124,7 @@ public class NpcServiceTest {
 
         Npc result = npcService.updateNpc("npc-1",
                 new NpcService.NpcData("Borin renommé", null, null,
-                        Map.of("Notes", "v2"), null, "camp-1", 7));
+                        Map.of("Notes", "v2"), null, null, "camp-1", 7));
 
         assertEquals("Borin renommé", result.getName());
         assertEquals("v2", result.getValues().get("Notes"));
@@ -138,7 +138,7 @@ public class NpcServiceTest {
 
         Npc result = npcService.updateNpc("npc-1",
                 new NpcService.NpcData("Borin", null, null,
-                        Map.of("Notes", "txt"), null, "camp-1", null));
+                        Map.of("Notes", "txt"), null, null, "camp-1", null));
 
         // testNpc avait order=1 → préservé
         assertEquals(1, result.getOrder());
@@ -150,7 +150,7 @@ public class NpcServiceTest {
 
         IllegalArgumentException ex = assertThrows(IllegalArgumentException.class,
                 () -> npcService.updateNpc("missing",
-                        new NpcService.NpcData("x", null, null, null, null, "camp-1", null)));
+                        new NpcService.NpcData("x", null, null, null, null, null, "camp-1", null)));
         assertTrue(ex.getMessage().contains("missing"));
         verify(npcRepository, never()).save(any());
     }