Merge branch 'main' into chore/fix-deprecated

mmarchois · web-flow · commit 06cb828c91de · 2026-04-02T10:23:21.000+02:00
diff --git a/composer.lock b/composer.lock
diff --git a/src/Application/Integration/EudonetParis/Command/ImportEudonetParisRegulationCommand.php b/src/Application/Integration/EudonetParis/Command/ImportEudonetParisRegulationCommand.php
@@ -11,9 +11,11 @@
 
 final class ImportEudonetParisRegulationCommand implements CommandInterface
 {
+    /**
+     * @param SaveMeasureCommand[] $measureCommands
+     */
     public function __construct(
         public readonly SaveRegulationGeneralInfoCommand $generalInfoCommand,
-        /** @var SaveMeasureCommand[] */
         public readonly array $measureCommands,
     ) {
         $generalInfoCommand->source = RegulationOrderRecordSourceEnum::EUDONET_PARIS->value;
diff --git a/src/Application/Integration/Litteralis/Command/ImportLitteralisRegulationCommand.php b/src/Application/Integration/Litteralis/Command/ImportLitteralisRegulationCommand.php
@@ -11,9 +11,9 @@
 
 final class ImportLitteralisRegulationCommand implements CommandInterface
 {
+    /** @param SaveMeasureCommand[] $measureCommands */
     public function __construct(
         public SaveRegulationGeneralInfoCommand $generalInfoCommand,
-        /** @var SaveMeasureCommand[] */
         public readonly array $measureCommands,
         public readonly ?string $downloadUrl = null,
     ) {
diff --git a/src/Application/Regulation/Command/GenerateDatexCommand.php b/src/Application/Regulation/Command/GenerateDatexCommand.php
@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Application\Regulation\Command;
+
+use App\Application\AsyncCommandInterface;
+
+final class GenerateDatexCommand implements AsyncCommandInterface
+{
+}
diff --git a/src/Application/Regulation/Command/GenerateDatexCommandHandler.php b/src/Application/Regulation/Command/GenerateDatexCommandHandler.php
@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Application\Regulation\Command;
+
+use App\Application\Regulation\DatexGeneratorInterface;
+
+final class GenerateDatexCommandHandler
+{
+    public function __construct(
+        private readonly DatexGeneratorInterface $datexGenerator,
+    ) {
+    }
+
+    public function __invoke(GenerateDatexCommand $command): void
+    {
+        $this->datexGenerator->generate();
+    }
+}
diff --git a/src/Application/Regulation/DatexGeneratorInterface.php b/src/Application/Regulation/DatexGeneratorInterface.php
@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Application\Regulation;
+
+interface DatexGeneratorInterface
+{
+    public function generate(): void;
+
+    public function getCachedDatex(): string;
+}
diff --git a/src/Infrastructure/Adapter/DatexGenerator.php b/src/Infrastructure/Adapter/DatexGenerator.php
@@ -0,0 +1,67 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Infrastructure\Adapter;
+
+use App\Application\DateUtilsInterface;
+use App\Application\QueryBusInterface;
+use App\Application\Regulation\DatexGeneratorInterface;
+use App\Application\Regulation\Query\GetRegulationOrdersToDatexFormatQuery;
+use Symfony\Component\Filesystem\Filesystem;
+use Symfony\Component\Filesystem\Path;
+
+final class DatexGenerator implements DatexGeneratorInterface
+{
+    private string $datexFilePath;
+
+    public function __construct(
+        private \Twig\Environment $twig,
+        private DateUtilsInterface $dateUtils,
+        private QueryBusInterface $queryBus,
+        private Filesystem $filesystem,
+        string $projectDir,
+    ) {
+        $this->datexFilePath = Path::join($projectDir, '/var/datex/regulations.xml');
+    }
+
+    public function generate(): void
+    {
+        $regulationOrders = $this->queryBus->handle(
+            new GetRegulationOrdersToDatexFormatQuery(),
+        );
+
+        $dir = Path::getDirectory($this->datexFilePath);
+
+        if (!$this->filesystem->exists($dir)) {
+            $this->filesystem->mkdir($dir, 0o755);
+        }
+
+        $tmpFile = $this->datexFilePath . '.tmp';
+        $handle = fopen($tmpFile, 'w');
+
+        ob_start(function (string $buffer) use ($handle): string {
+            fwrite($handle, $buffer);
+
+            return '';
+        }, 262144);
+
+        $this->twig->display('api/regulations.xml.twig', [
+            'publicationTime' => $this->dateUtils->getNow(),
+            'regulationOrders' => $regulationOrders,
+        ]);
+
+        ob_end_flush();
+        fclose($handle);
+        $this->filesystem->rename($tmpFile, $this->datexFilePath, overwrite: true);
+    }
+
+    public function getCachedDatex(): string
+    {
+        if (!$this->filesystem->exists($this->datexFilePath)) {
+            $this->generate();
+        }
+
+        return $this->filesystem->readFile($this->datexFilePath);
+    }
+}
diff --git a/src/Infrastructure/Controller/Api/Regulations/DeleteRegulationController.php b/src/Infrastructure/Controller/Api/Regulations/DeleteRegulationController.php
@@ -8,6 +8,7 @@
 use App\Application\Organization\Command\UpdateApiClientLastUsedAtCommand;
 use App\Application\QueryBusInterface;
 use App\Application\Regulation\Command\DeleteRegulationCommand;
+use App\Application\Regulation\Command\GenerateDatexCommand;
 use App\Application\Regulation\Query\GetRegulationOrderRecordByIdentifierQuery;
 use App\Domain\Regulation\Exception\RegulationOrderRecordCannotBeDeletedException;
 use App\Domain\Regulation\Exception\RegulationOrderRecordNotFoundException;
@@ -103,6 +104,8 @@ public function __invoke(string $identifier): JsonResponse
             ], Response::HTTP_FORBIDDEN);
         }
 
+        $this->commandBus->dispatchAsync(new GenerateDatexCommand());
+
         return new JsonResponse(null, Response::HTTP_NO_CONTENT);
     }
 }
diff --git a/src/Infrastructure/Controller/Api/Regulations/GetRegulationsController.php b/src/Infrastructure/Controller/Api/Regulations/GetRegulationsController.php
@@ -6,6 +6,7 @@
 
 use App\Application\DateUtilsInterface;
 use App\Application\QueryBusInterface;
+use App\Application\Regulation\DatexGeneratorInterface;
 use App\Application\Regulation\Query\GetRegulationOrdersToDatexFormatQuery;
 use OpenApi\Attributes as OA;
 use Symfony\Component\HttpFoundation\Response;
@@ -19,6 +20,7 @@ public function __construct(
         private \Twig\Environment $twig,
         private DateUtilsInterface $dateUtils,
         private QueryBusInterface $queryBus,
+        private DatexGeneratorInterface $datexGenerator,
     ) {
     }
 
@@ -37,6 +39,18 @@ public function __invoke(
         #[MapQueryParameter]
         bool $includeExpired = false,
     ): Response {
+        $isDefaultParams = $includePermanent && $includeTemporary && !$includeExpired;
+
+        if ($isDefaultParams) {
+            $regulationOrders = $this->datexGenerator->getCachedDatex();
+
+            return new Response(
+                $regulationOrders,
+                Response::HTTP_OK,
+                ['Content-Type' => 'text/xml; charset=UTF-8'],
+            );
+        }
+
         $regulationOrders = $this->queryBus->handle(
             new GetRegulationOrdersToDatexFormatQuery(
                 includePermanent: $includePermanent,
diff --git a/src/Infrastructure/Controller/Api/Regulations/PublishRegulationController.php b/src/Infrastructure/Controller/Api/Regulations/PublishRegulationController.php
@@ -7,6 +7,7 @@
 use App\Application\CommandBusInterface;
 use App\Application\Organization\Command\UpdateApiClientLastUsedAtCommand;
 use App\Application\QueryBusInterface;
+use App\Application\Regulation\Command\GenerateDatexCommand;
 use App\Application\Regulation\Command\PublishRegulationCommand;
 use App\Application\Regulation\Query\GetRegulationOrderRecordByIdentifierQuery;
 use App\Domain\Regulation\Enum\RegulationOrderRecordStatusEnum;
@@ -106,6 +107,8 @@ public function __invoke(string $identifier): JsonResponse
             ], Response::HTTP_BAD_REQUEST);
         }
 
+        $this->commandBus->dispatchAsync(new GenerateDatexCommand());
+
         return new JsonResponse([
             'identifier' => $regulationOrderRecord->getRegulationOrder()->getIdentifier(),
             'status' => RegulationOrderRecordStatusEnum::PUBLISHED->value,
diff --git a/src/Infrastructure/Controller/Regulation/DeleteRegulationController.php b/src/Infrastructure/Controller/Regulation/DeleteRegulationController.php
@@ -7,6 +7,7 @@
 use App\Application\CommandBusInterface;
 use App\Application\QueryBusInterface;
 use App\Application\Regulation\Command\DeleteRegulationCommand;
+use App\Application\Regulation\Command\GenerateDatexCommand;
 use App\Application\Regulation\Query\GetRegulationOrderRecordByUuidQuery;
 use App\Domain\Regulation\Exception\RegulationOrderRecordCannotBeDeletedException;
 use App\Domain\Regulation\Exception\RegulationOrderRecordNotFoundException;
@@ -62,6 +63,8 @@ public function __invoke(Request $request, string $uuid): Response
             throw new AccessDeniedHttpException();
         }
 
+        $this->commandBus->dispatchAsync(new GenerateDatexCommand());
+
         $redirectQueryParams = $request->query->get('_redirectQueryParams')
             ? json_decode($request->query->get('_redirectQueryParams'), true)
             : [];
diff --git a/src/Infrastructure/Controller/Regulation/PublishRegulationController.php b/src/Infrastructure/Controller/Regulation/PublishRegulationController.php
@@ -6,6 +6,7 @@
 
 use App\Application\CommandBusInterface;
 use App\Application\QueryBusInterface;
+use App\Application\Regulation\Command\GenerateDatexCommand;
 use App\Application\Regulation\Command\PublishRegulationCommand;
 use App\Domain\Regulation\Exception\RegulationOrderRecordCannotBePublishedException;
 use App\Domain\Regulation\Specification\CanOrganizationAccessToRegulation;
@@ -53,6 +54,8 @@ public function __invoke(Request $request, string $uuid): Response
             throw new AccessDeniedHttpException();
         }
 
+        $this->commandBus->dispatchAsync(new GenerateDatexCommand());
+
         return new RedirectResponse(
             url: $this->router->generate('app_regulation_detail', [
                 'uuid' => $uuid,
diff --git a/src/Infrastructure/Integration/BacIdf/BacIdfExecutor.php b/src/Infrastructure/Integration/BacIdf/BacIdfExecutor.php
@@ -7,6 +7,7 @@
 use App\Application\CommandBusInterface;
 use App\Application\DateUtilsInterface;
 use App\Application\Integration\BacIdf\Exception\ImportBacIdfRegulationFailedException;
+use App\Application\Regulation\Command\GenerateDatexCommand;
 use App\Domain\Regulation\Enum\RegulationOrderRecordSourceEnum;
 use App\Domain\Regulation\Repository\RegulationOrderRecordRepositoryInterface;
 use App\Infrastructure\Integration\BacIdf\Exception\BacIdfException;
@@ -74,6 +75,8 @@ public function execute(): void
                     }
                 }
             }
+
+            $this->commandBus->dispatchAsync(new GenerateDatexCommand());
         } catch (\Exception $exc) {
             $this->logger->error('exception', ['exc' => $exc]);
 
diff --git a/src/Infrastructure/Integration/EudonetParis/EudonetParisExecutor.php b/src/Infrastructure/Integration/EudonetParis/EudonetParisExecutor.php
@@ -8,6 +8,7 @@
 use App\Application\DateUtilsInterface;
 use App\Application\Integration\EudonetParis\Exception\ImportEudonetParisRegulationFailedException;
 use App\Application\QueryBusInterface;
+use App\Application\Regulation\Command\GenerateDatexCommand;
 use App\Application\User\Query\GetOrganizationByUuidQuery;
 use App\Domain\Regulation\Enum\RegulationOrderRecordSourceEnum;
 use App\Domain\Regulation\Repository\RegulationOrderRecordRepositoryInterface;
@@ -86,6 +87,8 @@ public function execute(\DateTimeInterface $laterThanUTC): void
 
             $numberOfRegulationsInsideEudonet = $this->eudonetParisExtractor->getNumberOfRegulations();
             $numberOfMeasuresInsideEudonet = $this->eudonetParisExtractor->getNumberOfMeasures();
+
+            $this->commandBus->dispatchAsync(new GenerateDatexCommand());
         } catch (\Exception $exc) {
             $this->logger->error($exc);
 
diff --git a/src/Infrastructure/Integration/JOP/JOPExecutor.php b/src/Infrastructure/Integration/JOP/JOPExecutor.php
@@ -7,6 +7,7 @@
 use App\Application\CommandBusInterface;
 use App\Application\QueryBusInterface;
 use App\Application\Regulation\Command\DeleteRegulationCommand;
+use App\Application\Regulation\Command\GenerateDatexCommand;
 use App\Application\Regulation\Query\GetRegulationOrderRecordByUuidQuery;
 use App\Application\User\Query\GetOrganizationByUuidQuery;
 use App\Domain\Regulation\Repository\RegulationOrderRecordRepositoryInterface;
@@ -62,6 +63,8 @@ public function execute(): void
             throw $exc;
         }
 
+        $this->commandBus->dispatchAsync(new GenerateDatexCommand());
+
         $this->logger->info('done');
     }
 }
diff --git a/src/Infrastructure/Integration/Litteralis/LitteralisExecutor.php b/src/Infrastructure/Integration/Litteralis/LitteralisExecutor.php
@@ -9,6 +9,7 @@
 use App\Application\Integration\Litteralis\Command\CleanUpLitteralisRegulationsBeforeImportCommand;
 use App\Application\Integration\Litteralis\DTO\LitteralisCredentials;
 use App\Application\QueryBusInterface;
+use App\Application\Regulation\Command\GenerateDatexCommand;
 use App\Application\User\Query\GetOrganizationByUuidQuery;
 use App\Domain\User\Exception\OrganizationNotFoundException;
 use App\Domain\User\Organization;
@@ -97,6 +98,8 @@ public function execute(string $name, string $orgId, \DateTimeInterface $laterTh
             throw $e;
         }
 
+        $this->commandBus->dispatchAsync(new GenerateDatexCommand());
+
         $reporter->addCount(LitteralisRecordEnum::COUNT_IMPORTED_FEATURES->value, $numImportedFeatures, ['regulationsCount' => $numImportedRegulations]);
 
         $reporter->end(endTime: $this->dateUtils->getNow());
diff --git a/templates/api/regulations.xml.twig b/templates/api/regulations.xml.twig
@@ -10,7 +10,7 @@
   xmlns:loc="http://datex2.eu/schema/3/locationReferencing"
   xmlns:dx="https://raw.githubusercontent.com/MTES-MCT/dialog/main/docs/spec/datex2"
   xmlns="http://datex2.eu/schema/3/trafficRegulation"
-  xsi:schemaLocation="http://datex2.eu/schema/3/d2Payload DATEXII_3_D2Payload.xsd"
+  xsi:schemaLocation="http://datex2.eu/schema/3/d2Payload/DATEXII_3_D2Payload.xsd"
   xsi:type="TrafficRegulationPublication"
   id="910928b3-58a1-4462-881b-53dec84602f9"
 >
diff --git a/tests/Integration/Infrastructure/Controller/Api/GetRegulationsControllerTest.php b/tests/Integration/Infrastructure/Controller/Api/GetRegulationsControllerTest.php
@@ -45,7 +45,6 @@ public function testGetRegulationsToDatexFormat(): void
         $client->request('GET', '/api/regulations.xml');
         $response = $client->getResponse();
 
-        $this->assertInstanceOf(StreamedResponse::class, $response);
         $this->assertSame('text/xml; charset=UTF-8', $response->headers->get('content-type'));
         $this->assertResponseStatusCodeSame(200);
         $this->assertSecurityHeaders();
diff --git a/tests/Unit/Application/Regulation/Command/GenerateDatexCommandHandlerTest.php b/tests/Unit/Application/Regulation/Command/GenerateDatexCommandHandlerTest.php
@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Tests\Unit\Application\Regulation\Command;
+
+use App\Application\Regulation\Command\GenerateDatexCommand;
+use App\Application\Regulation\Command\GenerateDatexCommandHandler;
+use App\Application\Regulation\DatexGeneratorInterface;
+use PHPUnit\Framework\TestCase;
+
+final class GenerateDatexCommandHandlerTest extends TestCase
+{
+    public function testHandle(): void
+    {
+        $datexGenerator = $this->createMock(DatexGeneratorInterface::class);
+        $datexGenerator
+            ->expects(self::once())
+            ->method('generate');
+
+        $handler = new GenerateDatexCommandHandler($datexGenerator);
+        $handler(new GenerateDatexCommand());
+    }
+}
diff --git a/tests/Unit/Infrastructure/Adapter/DatexGeneratorTest.php b/tests/Unit/Infrastructure/Adapter/DatexGeneratorTest.php
diff --git a/tests/Unit/Infrastructure/Controller/Api/Regulations/GetRegulationsControllerTest.php b/tests/Unit/Infrastructure/Controller/Api/Regulations/GetRegulationsControllerTest.php
diff --git a/tests/Unit/Infrastructure/Integration/BacIdf/BacIdfExecutorTest.php b/tests/Unit/Infrastructure/Integration/BacIdf/BacIdfExecutorTest.php
diff --git a/tests/Unit/Infrastructure/Integration/EudonetParis/EudonetParisExecutorTest.php b/tests/Unit/Infrastructure/Integration/EudonetParis/EudonetParisExecutorTest.php
diff --git a/tests/Unit/Infrastructure/Integration/JOP/JOPExecutorTest.php b/tests/Unit/Infrastructure/Integration/JOP/JOPExecutorTest.php
diff --git a/tests/Unit/Infrastructure/Integration/Litteralis/LitteralisExecutorTest.php b/tests/Unit/Infrastructure/Integration/Litteralis/LitteralisExecutorTest.php

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`use App\Application\Organization\Command\UpdateApiClientLastUsedAtCommand;`
`9`	`9`	`use App\Application\QueryBusInterface;`
`10`	`10`	`use App\Application\Regulation\Command\DeleteRegulationCommand;`
	`11`	`+use App\Application\Regulation\Command\GenerateDatexCommand;`
`11`	`12`	`use App\Application\Regulation\Query\GetRegulationOrderRecordByIdentifierQuery;`
`12`	`13`	`use App\Domain\Regulation\Exception\RegulationOrderRecordCannotBeDeletedException;`
`13`	`14`	`use App\Domain\Regulation\Exception\RegulationOrderRecordNotFoundException;`
`@@ -103,6 +104,8 @@ public function __invoke(string $identifier): JsonResponse`
`103`	`104`	`], Response::HTTP_FORBIDDEN);`
`104`	`105`	`}`
`105`	`106`
	`107`	`+ $this->commandBus->dispatchAsync(new GenerateDatexCommand());`
	`108`	`+`
`106`	`109`	`return new JsonResponse(null, Response::HTTP_NO_CONTENT);`
`107`	`110`	`}`
`108`	`111`	`}`