Améliore la description de l'export CIFS

Author: mmarchois

src/Application/Regulation/Query/GetCifsIncidentsQueryHandler.php

@@ -18,13 +18,15 @@
 use App\Domain\Regulation\Measure;
 use App\Domain\Regulation\RegulationOrderRecord;
 use App\Domain\Regulation\Repository\RegulationOrderRecordRepositoryInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 final class GetCifsIncidentsQueryHandler
 {
     public function __construct(
         private RegulationOrderRecordRepositoryInterface $repository,
         private PolylineMakerInterface $polylineMaker,
         private DateUtilsInterface $dateUtils,
+        private TranslatorInterface $translator,
         private CifsFilterSet $cifsFilterSet = new CifsFilterSet(),
     ) {
     }
@@ -131,7 +133,6 @@ public function __invoke(GetCifsIncidentsQuery $query): array
                 /** @var Location $location */
                 foreach ($measure->getLocations() as $location) {
                     $locationId = $location->getUuid();
-                    $street = $location->getCifsStreetLabel();
 
                     $geometry = $location->getGeometry();
                     if ($geometry === null) {
@@ -171,7 +172,7 @@ public function __invoke(GetCifsIncidentsQuery $query): array
                             creationTime: $incidentCreationTime,
                             type: $measureType->getCifsKey(),
                             subType: $this->getSubType($regulationSubject, $measureType),
-                            street: $street,
+                            description: $this->translator->trans('regulation.measure.type.' . $measureType->value),
                             direction: $direction,
                             polyline: $polyline,
                             startTime: $incidentPeriod['start'],

src/Application/Regulation/View/CifsIncidentView.php

@@ -10,7 +10,7 @@ public function __construct(
         public string $id,
         public \DateTimeInterface $creationTime,
         public string $type,
-        public string $street,
+        public string $description,
         public string $direction,
         public string $polyline,
         public \DateTimeInterface $startTime,

templates/api/regulations/cifs.xml.twig

@@ -4,7 +4,7 @@
         <incident id="{{ incident.id }}">
             <creationtime>{{ incident.creationTime|date('Y-m-d\\TH:i:sP') }}</creationtime>
             <type>{{ incident.type }}</type>
-            <description>{{ 'api.cifs.incident.description'|trans({'%street%': incident.street}) }}</description>
+            <description>{{ incident.description}}</description>
             <street>{{ incident.street }}</street>
             <direction>{{ incident.direction }}</direction>
             <polyline>{{ incident.polyline }}</polyline>

tests/Integration/Infrastructure/Controller/Api/cifs-incidents-expected-result.xml

@@ -3,7 +3,7 @@
     <incident id="F/CIFS/2023:06548f85-d545-7b45-8000-8a23c45850b3:06548fe3-7bfb-73af-8000-f7f34af31312">
         <creationtime>2023-09-06T00:00:00+00:00</creationtime>
         <type>ROAD_CLOSED</type>
-        <description>Rue Claude Monet : circulation interdite tous les jours pour tous les véhicules</description>
+        <description>Circulation interdite</description>
         <street>Rue Claude Monet</street>
         <direction>BOTH_DIRECTIONS</direction>
         <polyline>48.910599408 2.337514404 48.910695641 2.337678265 48.911459354 2.338854183 48.911521022 2.338947542 48.911545625 2.339005897 48.911549433 2.339044051 48.911546991 2.339090471 48.911532934 2.339150682 48.911316524 2.339535452</polyline>
@@ -21,7 +21,7 @@
     <incident id="F/CIFS/2023:06548f85-d545-7b45-8000-8a23c45850b3:0654b639-cd33-7507-8000-e2ea21673135">
         <creationtime>2023-09-06T00:00:00+00:00</creationtime>
         <type>ROAD_CLOSED</type>
-        <description>Rue Claude Monet : circulation interdite tous les jours pour tous les véhicules</description>
+        <description>Circulation interdite</description>
         <street>Rue Claude Monet</street>
         <direction>BOTH_DIRECTIONS</direction>
         <polyline>48.910599408 2.337514404 48.910695641 2.337678265 48.911459354 2.338854183 48.911521022 2.338947542 48.911545625 2.339005897 48.911549433 2.339044051 48.911546991 2.339090471 48.911532934 2.339150682 48.911316524 2.339535452</polyline>
@@ -39,7 +39,7 @@
     <incident id="F/CIFS/2023:06548f85-d545-7b45-8000-8a23c45850b3:0654b63a-838d-798b-8000-044b619f225d">
         <creationtime>2023-09-06T00:00:00+00:00</creationtime>
         <type>ROAD_CLOSED</type>
-        <description>Rue Claude Monet : circulation interdite tous les jours pour tous les véhicules</description>
+        <description>Circulation interdite</description>
         <street>Rue Claude Monet</street>
         <direction>BOTH_DIRECTIONS</direction>
         <polyline>48.910599408 2.337514404 48.910695641 2.337678265 48.911459354 2.338854183 48.911521022 2.338947542 48.911545625 2.339005897 48.911549433 2.339044051 48.911546991 2.339090471 48.911532934 2.339150682 48.911316524 2.339535452</polyline>
@@ -58,7 +58,7 @@
     <incident id="F/CIFS/2023:065f94ef-ea0a-7ab5-8000-bd5686102151:06548fe3-7bfb-73af-8000-f7f34af31312">
         <creationtime>2023-09-06T00:00:00+00:00</creationtime>
         <type>ROAD_CLOSED</type>
-        <description>D14 : circulation interdite tous les jours pour tous les véhicules</description>
+        <description>Circulation interdite</description>
         <street>D14</street>
         <direction>BOTH_DIRECTIONS</direction>
         <polyline>48.911986097 2.344241283 48.908845831 2.344182729</polyline>
@@ -76,7 +76,7 @@
     <incident id="F/CIFS/2023:065f94ef-ea0a-7ab5-8000-bd5686102151:0654b639-cd33-7507-8000-e2ea21673135">
         <creationtime>2023-09-06T00:00:00+00:00</creationtime>
         <type>ROAD_CLOSED</type>
-        <description>D14 : circulation interdite tous les jours pour tous les véhicules</description>
+        <description>Circulation interdite</description>
         <street>D14</street>
         <direction>BOTH_DIRECTIONS</direction>
         <polyline>48.911986097 2.344241283 48.908845831 2.344182729</polyline>
@@ -94,7 +94,7 @@
     <incident id="F/CIFS/2023:065f94ef-ea0a-7ab5-8000-bd5686102151:0654b63a-838d-798b-8000-044b619f225d">
         <creationtime>2023-09-06T00:00:00+00:00</creationtime>
         <type>ROAD_CLOSED</type>
-        <description>D14 : circulation interdite tous les jours pour tous les véhicules</description>
+        <description>Circulation interdite</description>
         <street>D14</street>
         <direction>BOTH_DIRECTIONS</direction>
         <polyline>48.911986097 2.344241283 48.908845831 2.344182729</polyline>
@@ -113,7 +113,7 @@
     <incident id="117374#24-A-0473:066e984f-4746-78f8-8000-dce555b28604:0671628e-04f8-7c89-8000-43928d1376ba">
         <creationtime>2024-09-05T00:00:00+00:00</creationtime>
         <type>ROAD_CLOSED</type>
-        <description>ROUTE 147 (NOYELLES-LÈS-SECLIN) DU PR7 +779 AU PR8 +413 : circulation interdite tous les jours pour tous les véhicules</description>
+        <description>Circulation interdite</description>
         <street>ROUTE 147 (NOYELLES-LÈS-SECLIN) DU PR7 +779 AU PR8 +413</street>
         <direction>BOTH_DIRECTIONS</direction>
         <polyline>50.568969715 3.022717354 50.56945561 3.023119183 50.569455721 3.023119275 50.569492048 3.023149663 50.569832708 3.02343789 50.569835923 3.023440948 50.569868822 3.023475742 50.570148629 3.02384667 50.570151247 3.023850386 50.570177599 3.023890325 50.570503315 3.024458944 50.570527945 3.024500711 50.570528488 3.024501619 50.570901355 3.025116052 50.570929555 3.02515503 50.570932711 3.025159053 50.571355649 3.025653937 50.57138952 3.02569009 50.571390856 3.025691455 50.571842058 3.026131049 50.571877523 3.026159516 50.571879188 3.02616073 50.57338937 3.027150974</polyline>

tests/Unit/Application/Regulation/Query/GetCifsIncidentsQueryHandlerTest.php

@@ -23,18 +23,21 @@
 use App\Domain\Regulation\RegulationOrderRecord;
 use App\Domain\Regulation\Repository\RegulationOrderRecordRepositoryInterface;
 use PHPUnit\Framework\TestCase;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 final class GetCifsIncidentsQueryHandlerTest extends TestCase
 {
     private $regulationOrderRecordRepository;
     private $polylineMaker;
     private $dateUtils;
+    private $translator;
 
     protected function setUp(): void
     {
         $this->regulationOrderRecordRepository = $this->createMock(RegulationOrderRecordRepositoryInterface::class);
         $this->polylineMaker = $this->createMock(PolylineMakerInterface::class);
         $this->dateUtils = $this->createMock(DateUtilsInterface::class);
+        $this->translator = $this->createMock(TranslatorInterface::class);
     }
 
     public function testGetAllEmpty(): void
@@ -44,7 +47,7 @@ public function testGetAllEmpty(): void
             ->method('findRegulationOrdersForCifsIncidentFormat')
             ->willReturn([]);
 
-        $handler = new GetCifsIncidentsQueryHandler($this->regulationOrderRecordRepository, $this->polylineMaker, $this->dateUtils);
+        $handler = new GetCifsIncidentsQueryHandler($this->regulationOrderRecordRepository, $this->polylineMaker, $this->dateUtils, $this->translator);
         $regulationOrders = $handler(new GetCifsIncidentsQuery());
 
         $this->assertEquals([], $regulationOrders);
@@ -90,38 +93,40 @@ public function testGetAll(): void
         $period4Id = '0661e7ed-e549-7e4b-8000-945882a092c4';
         $period5Id = '066e2bff-d436-7f16-8000-57d9f6b99960';
 
+        $descriptionNoEntry = 'Interdiction d\'accès';
+        $descriptionAlternateRoad = 'Route à alternance';
+
         $incident1 = new CifsIncidentView(
             id: '2024T1:02d5eb61-9ca3-4e67-aacd-726f124382d0:0',
             creationTime: new \DateTimeImmutable('2023-11-01T00:00:00+00:00'),
             type: 'ROAD_CLOSED',
-            subType: 'ROAD_BLOCKED_HAZARD',
-            street: 'Rue des Arts',
+            description: $descriptionNoEntry,
             direction: 'BOTH_DIRECTIONS',
             polyline: $polyline1Merged,
             startTime: new \DateTimeImmutable('2023-11-02T00:00:00+00:00'),
             endTime: new \DateTimeImmutable('2023-11-07T00:00:00+00:00'),
             schedule: [],
+            subType: 'ROAD_BLOCKED_HAZARD',
         );
 
         $incident1bis = new CifsIncidentView(
             id: '2024T1:066e98a9-0ce0-7e4b-8000-677c1eafc53d:0',
             creationTime: $incident1->creationTime,
             type: $incident1->type,
-            subType: $incident1->subType,
-            street: 'Zone Olympique',
+            description: $descriptionNoEntry,
             direction: $incident1->direction,
             polyline: $polyline1bis,
             startTime: $incident1->startTime,
             endTime: new \DateTimeImmutable('2023-11-07T00:00:00+00:00'),
             schedule: $incident1->schedule,
+            subType: $incident1->subType,
         );
 
         $incident3 = new CifsIncidentView(
             id: \sprintf('2024T2:9698b212-705c-4c46-8968-63b5a55a4d66:%s', $period1Id),
             creationTime: new \DateTimeImmutable('2023-11-01T00:00:00+00:00'),
             type: 'HAZARD',
-            subType: 'HAZARD_ON_ROAD_LANE_CLOSED',
-            street: 'Avenue de Fonneuve',
+            description: $descriptionAlternateRoad,
             direction: 'BOTH_DIRECTIONS',
             polyline: $polyline3,
             startTime: new \DateTimeImmutable('2023-11-02T00:00:00+00:00'),
@@ -148,14 +153,14 @@ public function testGetAll(): void
                     ],
                 ],
             ],
+            subType: 'HAZARD_ON_ROAD_LANE_CLOSED',
         );
 
         $incident4 = new CifsIncidentView(
             id: \sprintf('2024T2:9698b212-705c-4c46-8968-63b5a55a4d66:%s', $period2Id),
             creationTime: $incident3->creationTime,
             type: $incident3->type,
-            subType: $incident3->subType,
-            street: $incident3->street,
+            description: $incident3->description,
             direction: $incident3->direction,
             polyline: $incident3->polyline,
             startTime: new \DateTimeImmutable('2023-11-03T00:00:00+00:00'),
@@ -174,14 +179,14 @@ public function testGetAll(): void
                     ],
                 ],
             ],
+            subType: $incident3->subType,
         );
 
         $incident5 = new CifsIncidentView(
             id: \sprintf('2024T2:9698b212-705c-4c46-8968-63b5a55a4d66:%s', $period3Id),
             creationTime: $incident3->creationTime,
             type: $incident3->type,
-            subType: $incident3->subType,
-            street: $incident3->street,
+            description: $incident3->description,
             direction: $incident3->direction,
             polyline: $incident3->polyline,
             startTime: $incident4->startTime,
@@ -194,14 +199,14 @@ public function testGetAll(): void
                     ],
                 ],
             ],
+            subType: $incident3->subType,
         );
 
         $incident6 = new CifsIncidentView(
             id: \sprintf('2024T2:9698b212-705c-4c46-8968-63b5a55a4d66:%s', $period4Id),
             creationTime: $incident3->creationTime,
             type: $incident3->type,
-            subType: $incident3->subType,
-            street: $incident3->street,
+            description: $incident3->description,
             direction: $incident3->direction,
             polyline: $incident3->polyline,
             startTime: $incident4->startTime,
@@ -214,14 +219,14 @@ public function testGetAll(): void
                     ],
                 ],
             ],
+            subType: $incident3->subType,
         );
 
         $incident7 = new CifsIncidentView(
             id: \sprintf('2024T2:9698b212-705c-4c46-8968-63b5a55a4d66:%s', $period5Id),
             creationTime: $incident3->creationTime,
             type: $incident3->type,
-            subType: $incident3->subType,
-            street: $incident3->street,
+            description: $incident3->description,
             direction: $incident3->direction,
             polyline: $incident3->polyline,
             startTime: $incident4->startTime,
@@ -234,6 +239,7 @@ public function testGetAll(): void
                     ],
                 ],
             ],
+            subType: $incident3->subType,
         );
 
         $regulationOrderRecord1 = $this->createMock(RegulationOrderRecord::class);
@@ -276,15 +282,20 @@ public function testGetAll(): void
             ->with(new \DateTimeImmutable('2023-11-06 00:00:00'), 1)
             ->willReturn(new \DateTimeImmutable('2023-11-07 00:00:00'));
 
+        $this->translator
+            ->expects(self::exactly(7))
+            ->method('trans')
+            ->with(self::logicalOr(
+                self::equalTo('regulation.measure.type.noEntry'),
+                self::equalTo('regulation.measure.type.alternateRoad'),
+            ))
+            ->willReturnCallback(fn (string $id) => $id === 'regulation.measure.type.noEntry' ? $descriptionNoEntry : $descriptionAlternateRoad);
+
         $location1 = $this->createMock(Location::class);
         $location1
             ->expects(self::once())
             ->method('getUuid')
             ->willReturn('02d5eb61-9ca3-4e67-aacd-726f124382d0');
-        $location1
-            ->expects(self::once())
-            ->method('getCifsStreetLabel')
-            ->willReturn('Rue des Arts');
         $location1
             ->expects(self::once())
             ->method('getGeometry')
@@ -300,10 +311,6 @@ public function testGetAll(): void
             ->expects(self::once())
             ->method('getRawGeoJSON')
             ->willReturn($rawGeoJSON);
-        $location1bis
-            ->expects(self::once())
-            ->method('getCifsStreetLabel')
-            ->willReturn('Zone Olympique');
         $location1bis
             ->expects(self::once())
             ->method('getGeometry')
@@ -572,10 +579,6 @@ public function testGetAll(): void
             ->expects(self::once())
             ->method('getUuid')
             ->willReturn('9698b212-705c-4c46-8968-63b5a55a4d66');
-        $location2
-            ->expects(self::once())
-            ->method('getCifsStreetLabel')
-            ->willReturn('Avenue de Fonneuve');
         $location2
             ->expects(self::once())
             ->method('getGeometry')
@@ -621,7 +624,7 @@ public function testGetAll(): void
                 $uuid2 => ['uuid' => $uuid2, 'overallStartDate' => $startDate2, 'overallEndDate' => $endDate2],
             ]);
 
-        $handler = new GetCifsIncidentsQueryHandler($this->regulationOrderRecordRepository, $this->polylineMaker, $this->dateUtils);
+        $handler = new GetCifsIncidentsQueryHandler($this->regulationOrderRecordRepository, $this->polylineMaker, $this->dateUtils, $this->translator);
         $incidents = $handler(new GetCifsIncidentsQuery());
         $this->assertEquals(
             [$incident1, $incident1bis, $incident3, $incident4, $incident5, $incident6, $incident7],
@@ -641,6 +644,7 @@ public function testFilters(): void
             $this->regulationOrderRecordRepository,
             $this->polylineMaker,
             $this->dateUtils,
+            $this->translator,
             new CifsFilterSet(
                 allowedSources: ['my_source'],
                 excludedIdentifiers: ['identifier1'],

translations/messages.fr.xlf

@@ -2318,10 +2318,6 @@
                 <source>register.meta.subtitle</source>
                 <target>Vous pouvez créer votre compte pour votre commune ou collectivité.</target>
             </trans-unit>
-            <trans-unit id="api.cifs.incident.description">
-                <source>api.cifs.incident.description</source>
-                <target>%street% : circulation interdite tous les jours pour tous les véhicules</target>
-            </trans-unit>
             <trans-unit id="map.meta.title">
                 <source>map.meta.title</source>
                 <target>Carte</target>