chore : bump version to v1.9.31

Reviewed-on: #3

config/services.yaml

@@ -69,3 +69,8 @@ when@test:
             autowire: true
             autoconfigure: true
             public: true
+
+        App\Service\SkeletonStructureService:
+            autowire: true
+            autoconfigure: true
+            public: true

config/version.yaml

@@ -1,2 +1,2 @@
 parameters:
-    app.version: '1.9.30'
+    app.version: '1.9.31'

frontend/app/components/model-types/ModelTypeForm.vue

@@ -204,7 +204,7 @@ const formulaBuilderCustomFields = computed(() => {
 
 const extractFormulaFields = (formula: string | null | undefined): string[] => {
   if (!formula) return []
-  const matches = [...formula.matchAll(/\{(\w+)\}/g)]
+  const matches = [...formula.matchAll(/\{([^}]+)\}/gu)]
   return [...new Set(matches.map(m => m[1]).filter((n): n is string => n !== undefined))]
 }
 

frontend/app/components/model-types/ReferenceFormulaBuilder.vue

@@ -91,7 +91,7 @@ const preview = computed(() => {
       fieldMap.set(f.name, previewExamples[f.type] ?? 'VALEUR')
     }
   }
-  return props.modelValue.replace(/\{(\w+)\}/g, (_, name) => fieldMap.get(name) ?? '???')
+  return props.modelValue.replace(/\{([^}]+)\}/gu, (_, name) => fieldMap.get(name) ?? '???')
 })
 
 const insertField = (fieldName: string) => {

frontend/app/pages/component-category/[id]/edit.vue

@@ -159,6 +159,7 @@ const handleSubmit = async (payload: Parameters<typeof updateModelType>[1]) => {
       await updateModelType(id, enrichedPayload)
       await syncExecute(id, { confirmDeletions: false, confirmTypeChanges: false })
       await loadComponentTypes({ force: true })
+      await loadCategory()
       showSuccess('Catégorie de composant mise à jour avec succès.')
     }
   } catch (error) {
@@ -183,6 +184,7 @@ const handleSyncConfirm = async () => {
       confirmTypeChanges: !!hasModifications,
     })
     await loadComponentTypes({ force: true })
+    await loadCategory()
     showSuccess('Catégorie de composant mise à jour avec succès.')
   } catch (error) {
     showError(normalizeError(error))

frontend/app/pages/piece-category/[id]/edit.vue

@@ -157,6 +157,7 @@ const handleSubmit = async (payload: Parameters<typeof updateModelType>[1]) => {
       await updateModelType(id, enrichedPayload)
       await syncExecute(id, { confirmDeletions: false, confirmTypeChanges: false })
       await loadPieceTypes({ force: true })
+      await loadCategory()
       showSuccess('Catégorie de pièce mise à jour avec succès.')
     }
   } catch (error) {
@@ -181,6 +182,7 @@ const handleSyncConfirm = async () => {
       confirmTypeChanges: !!hasModifications,
     })
     await loadPieceTypes({ force: true })
+    await loadCategory()
     showSuccess('Catégorie de pièce mise à jour avec succès.')
   } catch (error) {
     showError(normalizeError(error))

src/Service/ReferenceAutoGenerator.php

@@ -32,7 +32,7 @@ class ReferenceAutoGenerator
             }
         }
 
-        return preg_replace_callback('/\{(\w+)\}/', static function (array $matches) use ($valueMap): string {
+        return preg_replace_callback('/\{([^}]+)\}/u', static function (array $matches) use ($valueMap): string {
             return $valueMap[$matches[1]] ?? '';
         }, $modelType->getReferenceFormula());
     }

src/Service/SkeletonStructureService.php

@@ -226,6 +226,13 @@ class SkeletonStructureService
             }
 
             if ($existingField) {
+                // Propagate rename to the parent ModelType's reference formula and required-fields list
+                // so existing `{oldName}` placeholders keep resolving after the field is renamed.
+                $oldName = $existingField->getName();
+                if ($oldName !== $normalized['name']) {
+                    $this->propagateCustomFieldRename($modelType, $oldName, $normalized['name']);
+                }
+
                 // Update existing field
                 $existingField->setName($normalized['name']);
                 $existingField->setType($normalized['type']);
@@ -264,6 +271,38 @@ class SkeletonStructureService
         }
     }
 
+    private function propagateCustomFieldRename(ModelType $modelType, string $oldName, string $newName): void
+    {
+        $formula = $modelType->getReferenceFormula();
+        if (null !== $formula && '' !== $formula) {
+            $newFormula = preg_replace(
+                '/\{'.preg_quote($oldName, '/').'\}/',
+                '{'.$newName.'}',
+                $formula
+            );
+            if (null !== $newFormula && $newFormula !== $formula) {
+                $modelType->setReferenceFormula($newFormula);
+            }
+        }
+
+        $required = $modelType->getRequiredFieldsForReference();
+        if ($required) {
+            $changed     = false;
+            $newRequired = [];
+            foreach ($required as $fieldName) {
+                if ($fieldName === $oldName) {
+                    $newRequired[] = $newName;
+                    $changed       = true;
+                } else {
+                    $newRequired[] = $fieldName;
+                }
+            }
+            if ($changed) {
+                $modelType->setRequiredFieldsForReference($newRequired);
+            }
+        }
+    }
+
     /**
      * Normalize frontend custom field data to a common shape.
      *

tests/Service/ReferenceAutoGeneratorTest.php

@@ -145,6 +145,69 @@ class ReferenceAutoGeneratorTest extends AbstractApiTestCase
         self::assertSame('U507', $result);
     }
 
+    public function testGenerateWithAccentedFieldName(): void
+    {
+        $mt = $this->createModelType('Palier', 'PAL-ACCENT', ModelCategory::PIECE);
+        $mt->setReferenceFormula('PA-{Diamètre}-33');
+        $mt->setRequiredFieldsForReference(['Diamètre']);
+
+        $em = $this->getEntityManager();
+        $em->flush();
+
+        $cf    = $this->createCustomField('Diamètre', 'number', typePiece: $mt);
+        $piece = $this->createPiece('Palier 70', null, $mt);
+        $this->createCustomFieldValue($cf, '70', piece: $piece);
+
+        $em->refresh($piece);
+
+        $generator = self::getContainer()->get('App\Service\ReferenceAutoGenerator');
+        $result    = $generator->generate($piece);
+
+        self::assertSame('PA-70-33', $result);
+    }
+
+    public function testGenerateWithNumberTypeField(): void
+    {
+        $mt = $this->createModelType('NumberField', 'NUM-001', ModelCategory::PIECE);
+        $mt->setReferenceFormula('R-{taille}');
+        $mt->setRequiredFieldsForReference(['taille']);
+
+        $em = $this->getEntityManager();
+        $em->flush();
+
+        $cf    = $this->createCustomField('taille', 'number', typePiece: $mt);
+        $piece = $this->createPiece('Piece Number', null, $mt);
+        $this->createCustomFieldValue($cf, '42', piece: $piece);
+
+        $em->refresh($piece);
+
+        $generator = self::getContainer()->get('App\Service\ReferenceAutoGenerator');
+        $result    = $generator->generate($piece);
+
+        self::assertSame('R-42', $result);
+    }
+
+    public function testGenerateWithDecimalNumberField(): void
+    {
+        $mt = $this->createModelType('NumberDec', 'NUM-002', ModelCategory::PIECE);
+        $mt->setReferenceFormula('R-{taille}');
+        $mt->setRequiredFieldsForReference(['taille']);
+
+        $em = $this->getEntityManager();
+        $em->flush();
+
+        $cf    = $this->createCustomField('taille', 'number', typePiece: $mt);
+        $piece = $this->createPiece('Piece Dec', null, $mt);
+        $this->createCustomFieldValue($cf, '12.5', piece: $piece);
+
+        $em->refresh($piece);
+
+        $generator = self::getContainer()->get('App\Service\ReferenceAutoGenerator');
+        $result    = $generator->generate($piece);
+
+        self::assertSame('R-12.5', $result);
+    }
+
     public function testGenerateWithSpaceInFormula(): void
     {
         $mt = $this->createModelType('Palier2', 'PAL-002', ModelCategory::PIECE);

tests/Service/SkeletonStructureServiceTest.php

@@ -0,0 +1,76 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Tests\Service;
+
+use App\Enum\ModelCategory;
+use App\Service\SkeletonStructureService;
+use App\Tests\AbstractApiTestCase;
+
+/**
+ * @internal
+ */
+class SkeletonStructureServiceTest extends AbstractApiTestCase
+{
+    public function testRenameCustomFieldPropagatesToReferenceFormulaAndRequiredFields(): void
+    {
+        $mt = $this->createModelType('Roulement', 'ROUL-RENAME', ModelCategory::PIECE);
+        $mt->setReferenceFormula('{material}-{size}');
+        $mt->setRequiredFieldsForReference(['material', 'size']);
+
+        $em = $this->getEntityManager();
+        $em->flush();
+
+        $cfMaterial = $this->createCustomField('material', 'text', typePiece: $mt, orderIndex: 0);
+        $cfSize     = $this->createCustomField('size', 'text', typePiece: $mt, orderIndex: 1);
+
+        /** @var SkeletonStructureService $service */
+        $service = static::getContainer()->get(SkeletonStructureService::class);
+
+        // Same fields, but `material` is renamed to `materiau` (matched by customFieldId)
+        $service->updateSkeletonRequirements($mt, [
+            'customFields' => [
+                ['customFieldId' => $cfMaterial->getId(), 'name' => 'materiau', 'type' => 'text', 'orderIndex' => 0],
+                ['customFieldId' => $cfSize->getId(), 'name' => 'size', 'type' => 'text', 'orderIndex' => 1],
+            ],
+        ]);
+
+        $em->flush();
+        $em->refresh($mt);
+        $em->refresh($cfMaterial);
+
+        self::assertSame('materiau', $cfMaterial->getName());
+        self::assertSame('{materiau}-{size}', $mt->getReferenceFormula());
+        self::assertSame(['materiau', 'size'], $mt->getRequiredFieldsForReference());
+    }
+
+    public function testRenameLeavesFormulaUnchangedWhenFieldNotInFormula(): void
+    {
+        $mt = $this->createModelType('Roulement2', 'ROUL-RENAME2', ModelCategory::PIECE);
+        $mt->setReferenceFormula('{material}');
+        $mt->setRequiredFieldsForReference(['material']);
+
+        $em = $this->getEntityManager();
+        $em->flush();
+
+        $cfMaterial = $this->createCustomField('material', 'text', typePiece: $mt, orderIndex: 0);
+        $cfUnused   = $this->createCustomField('unused', 'text', typePiece: $mt, orderIndex: 1);
+
+        /** @var SkeletonStructureService $service */
+        $service = static::getContainer()->get(SkeletonStructureService::class);
+
+        $service->updateSkeletonRequirements($mt, [
+            'customFields' => [
+                ['customFieldId' => $cfMaterial->getId(), 'name' => 'material', 'type' => 'text', 'orderIndex' => 0],
+                ['customFieldId' => $cfUnused->getId(), 'name' => 'renamed', 'type' => 'text', 'orderIndex' => 1],
+            ],
+        ]);
+
+        $em->flush();
+        $em->refresh($mt);
+
+        self::assertSame('{material}', $mt->getReferenceFormula());
+        self::assertSame(['material'], $mt->getRequiredFieldsForReference());
+    }
+}