Gère le cas Matières dangereuses dans le DATEX (ramène le coverage à …

…100%) (#724) * Ramène le coverage à 100% * Drop unused duplicate message
MTES-MCT · Apr 11, 2024 · 9286e22 · 9286e22
1 parent 0b0d3c1
commit 9286e22
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/src/Infrastructure/Persistence/Doctrine/Fixtures/VehicleSetFixture.php b/src/Infrastructure/Persistence/Doctrine/Fixtures/VehicleSetFixture.php
@@ -26,7 +26,7 @@ public function load(ObjectManager $manager): void
         $complexVehicleSet = new VehicleSet(
             '981f0260-948e-45e9-8788-efa23859a884',
             measure: $this->getReference('publishedMeasure'),
-            restrictedTypes: [VehicleTypeEnum::HEAVY_GOODS_VEHICLE->value, VehicleTypeEnum::DIMENSIONS->value, VehicleTypeEnum::CRITAIR->value],
+            restrictedTypes: [VehicleTypeEnum::HEAVY_GOODS_VEHICLE->value, VehicleTypeEnum::DIMENSIONS->value, VehicleTypeEnum::CRITAIR->value, VehicleTypeEnum::HAZARDOUS_MATERIALS->value],
             exemptedTypes: [VehicleTypeEnum::PEDESTRIANS->value, VehicleTypeEnum::EMERGENCY_SERVICES->value, VehicleTypeEnum::OTHER->value],
             otherExemptedTypeText: 'Convois exceptionnels',
             heavyweightMaxWeight: 3.5,

diff --git a/templates/api/regulations.xml.twig b/templates/api/regulations.xml.twig
@@ -153,7 +153,9 @@
                                                             <com:emissionClassificationOther>{{ vehicle.emissionClassificationOther }}</com:emissionClassificationOther>
                                                         </com:emissions>
                                                     {% else %}
-                                                        {% if vehicle.type == 'dimensions' %}
+                                                        {% if vehicle.isDangerousSubstances %}
+                                                            <com:loadType>hazardousMaterials</com:loadType>
+                                                        {% elseif vehicle.type == 'dimensions' %}
                                                             {% if vehicle.maxHeight %}
                                                                 <com:heightCharacteristic>
                                                                     <com:comparisonOperator>lessThanOrEqualTo</com:comparisonOperator>

diff --git a/tests/Integration/Infrastructure/Controller/Api/get-regulations-expected-result.xml b/tests/Integration/Infrastructure/Controller/Api/get-regulations-expected-result.xml
@@ -679,6 +679,12 @@
                                 </com:emissions>
                             </vehicleCharacteristics>
                         </conditions>
+                        <conditions xsi:type="VehicleCondition">
+                            <negate>false</negate>
+                            <vehicleCharacteristics>
+                                <com:loadType>hazardousMaterials</com:loadType>
+                            </vehicleCharacteristics>
+                        </conditions>
                         <conditions xsi:type="NonVehicularRoadUserCondition">
                             <negate>true</negate>
                             <nonVehicularRoadUser>pedestrians</nonVehicularRoadUser>

diff --git a/...s/Integration/Infrastructure/Controller/Regulation/Fragments/GetMeasureControllerTest.php b/...s/Integration/Infrastructure/Controller/Regulation/Fragments/GetMeasureControllerTest.php
@@ -45,7 +45,7 @@ public function testGetWithComplexVehicles(): void
         $measure1Content = $crawler->filter('[data-testid="measure-content"]')->eq(0);
 
         $this->assertSame('Circulation interdite', $measure1Header->filter('h3')->text());
-        $this->assertSame('pour les véhicules de plus de 3,5 tonnes, 12 mètres de long ou 2,4 mètres de haut, Crit\'Air 4 et Crit\'Air 5, sauf piétons, véhicules d\'urgence et convois exceptionnels', $measure1Content->filter('li')->eq(0)->text());
+        $this->assertSame('pour les véhicules de plus de 3,5 tonnes, 12 mètres de long ou 2,4 mètres de haut, matières dangereuses, Crit\'Air 4 et Crit\'Air 5, sauf piétons, véhicules d\'urgence et convois exceptionnels', $measure1Content->filter('li')->eq(0)->text());
         $this->assertSame('tous les jours', $measure1Content->filter('li')->eq(1)->text());
         $this->assertSame('Rue de l\'Hôtel de Ville du n° 30 au n° 12 Montauban (82000)', $measure1Content->filter('li')->eq(3)->text());
         $this->assertSame('Rue Gamot Montauban (82000)', $measure1Content->filter('li')->eq(4)->text());

diff --git a/translations/messages.fr.xlf b/translations/messages.fr.xlf
@@ -1637,10 +1637,6 @@
                 <source>regulation.vehicle_set.type.dimensions</source>
                 <target>Gabarit</target>
             </trans-unit>
-            <trans-unit id="regulation.vehicle_set.type.hazardousmaterials">
-                <source>regulation.vehicle_set.type.hazardousmaterials</source>
-                <target>Matières dangeureuses</target>
-            </trans-unit>
             <trans-unit id="regulation.vehicle_set.critair">
                 <source>regulation.vehicle_set.critair</source>
                 <target>Catégorie Crit'Air</target>
@@ -1672,7 +1668,7 @@
             </trans-unit>
             <trans-unit id="regulation.vehicle_set.type.hazardousMaterials">
                 <source>regulation.vehicle_set.type.hazardousMaterials</source>
-                <target>Matières dangeureuses</target>
+                <target>Matières dangereuses</target>
             </trans-unit>
             <trans-unit id="regulation.vehicle_set.type.pedestrians">
                 <source>regulation.vehicle_set.type.pedestrians</source>