Merge branch 'main' into feat/can-organization-intervene-on-geometry

mmarchois · web-flow · commit 3ff4b716914a · 2025-03-17T17:03:13.000+01:00
diff --git a/config/validator/Application/SigningAuthority/SaveSigningAuthorityCommand.xml b/config/validator/Application/SigningAuthority/SaveSigningAuthorityCommand.xml
@@ -21,7 +21,13 @@
                 <option name="max">100</option>
             </constraint>
         </property>
-        <property name="address">
+        <property name="roadName">
+            <constraint name="NotBlank"/>
+        </property>
+        <property name="cityCode">
+            <constraint name="NotBlank"/>
+        </property>
+        <property name="cityLabel">
             <constraint name="NotBlank"/>
         </property>
     </class>
diff --git a/src/Application/Organization/SigningAuthority/Command/SaveSigningAuthorityCommand.php b/src/Application/Organization/SigningAuthority/Command/SaveSigningAuthorityCommand.php
@@ -26,7 +26,7 @@ public function __construct(
         $this->address = $signingAuthority?->getAddress();
         $this->roadName = $signingAuthority?->getRoadName();
         $this->cityCode = $signingAuthority?->getCityCode();
-        $this->roadName = $signingAuthority?->getCityLabel();
+        $this->cityLabel = $signingAuthority?->getCityLabel();
         $this->placeOfSignature = $signingAuthority?->getPlaceOfSignature();
         $this->signatoryName = $signingAuthority?->getSignatoryName();
     }
diff --git a/src/Application/Organization/SigningAuthority/Command/SaveSigningAuthorityCommandHandler.php b/src/Application/Organization/SigningAuthority/Command/SaveSigningAuthorityCommandHandler.php
@@ -19,10 +19,6 @@ public function __construct(
     public function __invoke(SaveSigningAuthorityCommand $command): SigningAuthority
     {
         if ($signingAuthority = $command->signingAuthority) {
-            $command->roadName = null;
-            $command->cityCode = null;
-            $command->cityLabel = null;
-
             $signingAuthority->update(
                 name: $command->name,
                 address: $command->address,
diff --git a/src/Domain/Organization/SigningAuthority/SigningAuthority.php b/src/Domain/Organization/SigningAuthority/SigningAuthority.php
@@ -11,13 +11,13 @@ class SigningAuthority
     public function __construct(
         private string $uuid,
         private string $name,
-        private string $address,
         private string $placeOfSignature,
         private string $signatoryName,
         private Organization $organization,
         private ?string $roadName = null,
         private ?string $cityCode = null,
         private ?string $cityLabel = null,
+        private ?string $address = null,
     ) {
     }
 
@@ -31,7 +31,7 @@ public function getName(): string
         return $this->name;
     }
 
-    public function getAddress(): string
+    public function getAddress(): ?string
     {
         return $this->address;
     }
@@ -68,19 +68,19 @@ public function getOrganization(): Organization
 
     public function update(
         string $name,
-        string $address,
         string $placeOfSignature,
         string $signatoryName,
         ?string $roadName,
         ?string $cityCode,
         ?string $cityLabel,
+        ?string $address,
     ): void {
         $this->name = $name;
-        $this->address = $address;
         $this->placeOfSignature = $placeOfSignature;
         $this->signatoryName = $signatoryName;
         $this->roadName = $roadName;
         $this->cityCode = $cityCode;
         $this->cityLabel = $cityLabel;
+        $this->address = $address;
     }
 }
diff --git a/src/Infrastructure/Form/Organization/SigningAuthorityFormType.php b/src/Infrastructure/Form/Organization/SigningAuthorityFormType.php
@@ -6,7 +6,6 @@
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
-use Symfony\Component\Form\Extension\Core\Type\TextareaType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 
@@ -24,11 +23,25 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
                 ],
             )
             ->add(
-                'address',
-                TextareaType::class,
+                'roadName',
+                TextType::class,
+                options: [
+                    'label' => 'signing_authority.roadName',
+                    'help' => 'signing_authority.roadName.help',
+                ],
+            )
+            ->add(
+                'cityCode',
+                TextType::class,
+                options: [
+                    'label' => 'signing_authority.cityCode',
+                ],
+            )
+            ->add(
+                'cityLabel',
+                TextType::class,
                 options: [
-                    'label' => 'signing_authority.address',
-                    'help' => 'signing_authority.address.help',
+                    'label' => 'signing_authority.cityLabel',
                 ],
             )
             ->add(
diff --git a/src/Infrastructure/Persistence/Doctrine/Fixtures/SigningAuthorityFixture.php b/src/Infrastructure/Persistence/Doctrine/Fixtures/SigningAuthorityFixture.php
@@ -17,13 +17,13 @@ public function load(ObjectManager $manager): void
         $signatoryAuthority = new SigningAuthority(
             uuid: '9cebe00d-04d8-48da-89b1-059f6b7bfe44',
             name: 'Monsieur le maire de Savenay',
-            address: '3 rue de la Concertation',
             placeOfSignature: 'Savenay',
             signatoryName: 'Monsieur X, Maire de Savenay',
             organization: $this->getReference('mainOrg', Organization::class),
-            roadName: null,
-            cityCode: null,
-            cityLabel: null,
+            roadName: '3 rue de la Concertation',
+            cityCode: '75018',
+            cityLabel: 'Paris',
+            address: null,
         );
 
         $manager->persist($signatoryAuthority);
diff --git a/src/Infrastructure/Persistence/Doctrine/Mapping/Organization.SigningAuthority.SigningAuthority.orm.xml b/src/Infrastructure/Persistence/Doctrine/Mapping/Organization.SigningAuthority.SigningAuthority.orm.xml
@@ -5,7 +5,7 @@
     table="signing_authority">
     <id name="uuid" type="guid" column="uuid"/>
     <field name="name" type="string" length="100" nullable="false"/>
-    <field name="address" type="string" nullable="false"/>
+    <field name="address" type="string" nullable="true"/>
     <field name="roadName" type="string" nullable="true"/>
     <field name="cityCode" type="string" nullable="true"/>
     <field name="cityLabel" type="string" nullable="true"/>
diff --git a/src/Infrastructure/Persistence/Doctrine/Migrations/Version20250306142031.php b/src/Infrastructure/Persistence/Doctrine/Migrations/Version20250306142031.php
@@ -23,6 +23,7 @@ public function up(Schema $schema): void
         $this->addSql('ALTER TABLE signing_authority ADD road_name VARCHAR(255) DEFAULT NULL');
         $this->addSql('ALTER TABLE signing_authority ADD city_code VARCHAR(255) DEFAULT NULL');
         $this->addSql('ALTER TABLE signing_authority ADD city_label VARCHAR(255) DEFAULT NULL');
+        $this->addSql('ALTER TABLE signing_authority ALTER address DROP NOT NULL');
     }
 
     public function down(Schema $schema): void
@@ -31,5 +32,6 @@ public function down(Schema $schema): void
         $this->addSql('ALTER TABLE signing_authority DROP road_name');
         $this->addSql('ALTER TABLE signing_authority DROP city_code');
         $this->addSql('ALTER TABLE signing_authority DROP city_label');
+        $this->addSql('ALTER TABLE signing_authority ALTER address SET NOT NULL');
     }
 }
diff --git a/templates/my_area/organization/signing_authority/detail.html.twig b/templates/my_area/organization/signing_authority/detail.html.twig
@@ -23,7 +23,8 @@
                         </p>
                         <ul>
                             <li><b>{{ 'signing_authority.name'|trans }}</b> : {{ signingAuthority.name|default('N/D') }}</li>
-                            <li><b>{{ 'signing_authority.address'|trans }}</b> : {{ signingAuthority.address|default('N/D') }}</li>
+                            <li><b>{{ 'signing_authority.address'|trans }}</b> : {{ signingAuthority.roadName|default('N/D') }} {{ signingAuthority.cityCode|default('N/D') }}
+                            {{ signingAuthority.cityLabel|default('N/D') }}</li>
                             <li><b>{{ 'signing_authority.placeOfSignature'|trans }}</b> : {{ signingAuthority.placeOfSignature|default('N/D') }}</li>
                             <li><b>{{ 'signing_authority.signatoryName'|trans }}</b>  : {{ signingAuthority.signatoryName|default('N/D') }}</li>
                         </ul>
diff --git a/templates/my_area/organization/signing_authority/form.html.twig b/templates/my_area/organization/signing_authority/form.html.twig
@@ -21,7 +21,17 @@
                     <div class="fr-grid-row fr-grid-row--gutters fr-grid-row--end fr-mb-2w">
                         <div class="fr-col-12 fr-col-md-6">
                             {{ form_row(form.name, { group_class: 'fr-input-group', widget_class: 'fr-input' }) }}
-                            {{ form_row(form.address, { group_class: 'fr-input-group', widget_class: 'fr-input' }) }}
+                            {{ form_row(form.roadName, { group_class: 'fr-input-group', widget_class: 'fr-input' }) }}
+                            
+                                <div class="fr-grid-row fr-grid-row--gutters fr-grid-row--end fr-mb-2w">
+                                    <div class="fr-col-12 fr-col-xl-4">
+                                        {{ form_row(form.cityCode, { group_class: 'fr-input-group', widget_class: 'fr-input' }) }}
+                                    </div>
+                                    <div class="fr-col-12 fr-col-xl-8">
+                                        {{ form_row(form.cityLabel, { group_class: 'fr-input-group', widget_class: 'fr-input' }) }}
+                                    </div>
+                                </div>
+
                             {{ form_row(form.placeOfSignature, { group_class: 'fr-input-group', widget_class: 'fr-input' }) }}
                             {{ form_row(form.signatoryName, { group_class: 'fr-input-group', widget_class: 'fr-input' }) }}
                         </div>
diff --git a/tests/Integration/Infrastructure/Controller/MyArea/Organization/SigningAuthority/EditSigningAuthorityControllerTest.php b/tests/Integration/Infrastructure/Controller/MyArea/Organization/SigningAuthority/EditSigningAuthorityControllerTest.php
@@ -25,7 +25,9 @@ public function testEdit(): void
         // Get the raw values.
         $values = $form->getPhpValues();
         $values['signing_authority_form']['name'] = 'Madame la maire de Pau';
-        $values['signing_authority_form']['address'] = '3 rue de la Concertation';
+        $values['signing_authority_form']['roadName'] = '3 rue de la Concertation';
+        $values['signing_authority_form']['cityCode'] = '75018';
+        $values['signing_authority_form']['cityLabel'] = 'Paris';
         $values['signing_authority_form']['signatoryName'] = 'Madame X, maire de Pau';
         $values['signing_authority_form']['placeOfSignature'] = 'Savenay';
 
@@ -47,14 +49,18 @@ public function testBadFormValues(): void
         // Get the raw values.
         $values = $form->getPhpValues();
         $values['signing_authority_form']['name'] = '';
-        $values['signing_authority_form']['address'] = '';
+        $values['signing_authority_form']['roadName'] = '';
+        $values['signing_authority_form']['cityCode'] = '';
+        $values['signing_authority_form']['cityLabel'] = '';
         $values['signing_authority_form']['signatoryName'] = '';
         $values['signing_authority_form']['placeOfSignature'] = '';
         $crawler = $client->request($form->getMethod(), $form->getUri(), $values, $form->getPhpFiles());
 
         $this->assertResponseStatusCodeSame(422);
         $this->assertSame('Cette valeur ne doit pas être vide.', $crawler->filter('#signing_authority_form_name_error')->text());
-        $this->assertSame('Cette valeur ne doit pas être vide.', $crawler->filter('#signing_authority_form_address_error')->text());
+        $this->assertSame('Cette valeur ne doit pas être vide.', $crawler->filter('#signing_authority_form_roadName_error')->text());
+        $this->assertSame('Cette valeur ne doit pas être vide.', $crawler->filter('#signing_authority_form_cityCode_error')->text());
+        $this->assertSame('Cette valeur ne doit pas être vide.', $crawler->filter('#signing_authority_form_cityLabel_error')->text());
         $this->assertSame('Cette valeur ne doit pas être vide.', $crawler->filter('#signing_authority_form_placeOfSignature_error')->text());
         $this->assertSame('Cette valeur ne doit pas être vide.', $crawler->filter('#signing_authority_form_signatoryName_error')->text());
 
diff --git a/tests/Integration/Infrastructure/Controller/MyArea/Organization/SigningAuthority/SigningAuthorityDetailControllerTest.php b/tests/Integration/Infrastructure/Controller/MyArea/Organization/SigningAuthority/SigningAuthorityDetailControllerTest.php
@@ -19,7 +19,7 @@ public function testDetail(): void
         $this->assertSame('Autorité signataire', $crawler->filter('h2')->text());
         $this->assertMetaTitle('Autorité signataire - DiaLog', $crawler);
 
-        $this->assertSame($crawler->filter('[data-testid="signing_authority"] ul')->text(), 'Intitulé du signataire : Monsieur le maire de Savenay Adresse de l\'établissement : 3 rue de la Concertation Fait à : Savenay Nom du signataire : Monsieur X, Maire de Savenay');
+        $this->assertSame($crawler->filter('[data-testid="signing_authority"] ul')->text(), 'Intitulé du signataire : Monsieur le maire de Savenay Adresse de l\'établissement : 3 rue de la Concertation 75018 Paris Fait à : Savenay Nom du signataire : Monsieur X, Maire de Savenay');
     }
 
     public function testNotAdministrator(): void
diff --git a/tests/Unit/Application/Organization/SigningAuthority/Command/SaveSigningAuthorityCommandHandlerTest.php b/tests/Unit/Application/Organization/SigningAuthority/Command/SaveSigningAuthorityCommandHandlerTest.php
@@ -31,10 +31,12 @@ public function testAdd(): void
         $signingAuthority = new SigningAuthority(
             uuid: '9cebe00d-04d8-48da-89b1-059f6b7bfe44',
             name: 'Monsieur le maire de Savenay',
-            address: '3 rue de la Concertation',
             placeOfSignature: 'Savenay',
             signatoryName: 'Monsieur X, Maire de Savenay',
             organization: $organization,
+            roadName: '3 rue de la Concertation',
+            cityCode: '75018',
+            cityLabel: 'Paris',
         );
 
         $this->signingAuthorityRepository
@@ -54,9 +56,11 @@ public function testAdd(): void
         );
         $command = new SaveSigningAuthorityCommand($organization);
         $command->name = 'Monsieur le maire de Savenay';
-        $command->address = '3 rue de la Concertation';
         $command->placeOfSignature = 'Savenay';
         $command->signatoryName = 'Monsieur X, Maire de Savenay';
+        $command->roadName = '3 rue de la Concertation';
+        $command->cityCode = '75018';
+        $command->cityLabel = 'Paris';
 
         $handler($command);
     }
@@ -70,9 +74,12 @@ public function testUpdate(): void
             ->method('update')
             ->with(
                 'Madame la maire de Savenay',
-                '4 rue de la Concertation',
                 'Savenay',
                 'Madame X, Maire de Savenay',
+                '3 rue de la Concertation',
+                '75018',
+                'Paris',
+                null,
             );
 
         $this->signingAuthorityRepository
@@ -90,9 +97,11 @@ public function testUpdate(): void
 
         $command = new SaveSigningAuthorityCommand($organization, $signingAuthority);
         $command->name = 'Madame la maire de Savenay';
-        $command->address = '4 rue de la Concertation';
         $command->placeOfSignature = 'Savenay';
         $command->signatoryName = 'Madame X, Maire de Savenay';
+        $command->roadName = '3 rue de la Concertation';
+        $command->cityCode = '75018';
+        $command->cityLabel = 'Paris';
 
         $handler($command);
     }
diff --git a/translations/messages.fr.xlf b/translations/messages.fr.xlf
@@ -2497,6 +2497,22 @@
                 <source>signing_authority.address.help</source>
                 <target>Entrez l'adresse de l'établissement, par exemple de la mairie</target>
             </trans-unit>
+            <trans-unit id="signing_authority.roadName">
+                <source>signing_authority.roadName</source>
+                <target>Adresse de l'établissement</target>
+            </trans-unit>
+            <trans-unit id="signing_authority.roadName.help">
+                <source>signing_authority.roadName.help</source>
+                <target>Numéro et voie</target>
+            </trans-unit>
+            <trans-unit id="signing_authority.cityCode">
+                <source>signing_authority.cityCode</source>
+                <target>Code postal</target>
+            </trans-unit>
+            <trans-unit id="signing_authority.cityLabel">
+                <source>signing_authority.cityLabel</source>
+                <target>Ville</target>
+            </trans-unit>
             <trans-unit id="signing_authority.placeOfSignature">
                 <source>signing_authority.placeOfSignature</source>
                 <target>Fait à</target>

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public function __construct(`
`26`	`26`	`$this->address = $signingAuthority?->getAddress();`
`27`	`27`	`$this->roadName = $signingAuthority?->getRoadName();`
`28`	`28`	`$this->cityCode = $signingAuthority?->getCityCode();`
`29`		`- $this->roadName = $signingAuthority?->getCityLabel();`
	`29`	`+ $this->cityLabel = $signingAuthority?->getCityLabel();`
`30`	`30`	`$this->placeOfSignature = $signingAuthority?->getPlaceOfSignature();`
`31`	`31`	`$this->signatoryName = $signingAuthority?->getSignatoryName();`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ public function up(Schema $schema): void`
`23`	`23`	`$this->addSql('ALTER TABLE signing_authority ADD road_name VARCHAR(255) DEFAULT NULL');`
`24`	`24`	`$this->addSql('ALTER TABLE signing_authority ADD city_code VARCHAR(255) DEFAULT NULL');`
`25`	`25`	`$this->addSql('ALTER TABLE signing_authority ADD city_label VARCHAR(255) DEFAULT NULL');`
	`26`	`+ $this->addSql('ALTER TABLE signing_authority ALTER address DROP NOT NULL');`
`26`	`27`	`}`
`27`	`28`
`28`	`29`	`public function down(Schema $schema): void`
`@@ -31,5 +32,6 @@ public function down(Schema $schema): void`
`31`	`32`	`$this->addSql('ALTER TABLE signing_authority DROP road_name');`
`32`	`33`	`$this->addSql('ALTER TABLE signing_authority DROP city_code');`
`33`	`34`	`$this->addSql('ALTER TABLE signing_authority DROP city_label');`
	`35`	`+ $this->addSql('ALTER TABLE signing_authority ALTER address SET NOT NULL');`
`34`	`36`	`}`
`35`	`37`	`}`