Supprime la saisie de dates globales sur l'arrêté

config/packages/doctrine.yaml

@@ -21,6 +21,8 @@ doctrine:
                 dql:
                     string_functions:
                         FIRST: App\Infrastructure\Persistence\Doctrine\DBAL\FirstFunction
+                        COALESCE: App\Infrastructure\Persistence\Doctrine\DBAL\CoalesceFunction
+                        INFDATE: App\Infrastructure\Persistence\Doctrine\DBAL\InfDateFunction
                         # Doctrine functions for PostgreSQL
                         # https://github.com/martin-georgiev/postgresql-for-doctrine
                         PG_ILIKE: MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\Ilike

config/validator/Application/Regulation/Command/SaveMeasureCommand.xml

@@ -26,6 +26,12 @@
         </property>
         <property name="periods">
             <constraint name="Valid"/>
+            <constraint name="NotBlank">
+                <option name="message">measure.periods.error.not_blank</option>
+                <option name="groups">
+                    <value>html_form</value>
+                </option>
+            </constraint>
        </property>
        <property name="locations">
         <constraint name="NotBlank">

config/validator/Application/Regulation/Command/SaveRegulationGeneralInfoCommand.xml

@@ -51,21 +51,6 @@
                 <option name="max">255</option>
             </constraint>
         </property>
-        <property name="startDate">
-            <constraint name="NotBlank">
-                <option name="groups">
-                    <value>html_form</value>
-                </option>
-            </constraint>
-            <constraint name="Type">
-                <option name="type">\DateTimeInterface</option>
-            </constraint>
-        </property>
-        <property name="endDate">
-            <constraint name="Type">
-                <option name="type">\DateTimeInterface</option>
-            </constraint>
-        </property>
         <property name="additionalVisas">
             <constraint name="All">
                 <option name="constraints">

src/Application/Regulation/Command/DuplicateRegulationCommandHandler.php

@@ -53,8 +53,6 @@ private function duplicateRegulationOrderRecord(
         $generalInfo->organization = $organization;
         $generalInfo->identifier = $identifier;
         $generalInfo->description = $originalRegulationOrder->getDescription();
-        $generalInfo->startDate = $originalRegulationOrder->getStartDate();
-        $generalInfo->endDate = $originalRegulationOrder->getEndDate();
         $generalInfo->additionalVisas = $originalRegulationOrder->getAdditionalVisas() ?? [];
         $generalInfo->additionalReasons = $originalRegulationOrder->getAdditionalReasons() ?? [];
         $generalInfo->visaModelUuid = $originalRegulationOrder->getVisaModel()?->getUuid();

src/Application/Regulation/Command/SaveMeasureCommand.php

@@ -54,6 +54,7 @@ public static function create(
             }
         } else {
             $command->addLocation(new SaveLocationCommand());
+            $command->periods[] = new SavePeriodCommand();
         }
 
         return $command;

src/Application/Regulation/Command/SaveRegulationGeneralInfoCommand.php

@@ -18,8 +18,6 @@ final class SaveRegulationGeneralInfoCommand implements CommandInterface
     public ?string $otherCategoryText = null;
     public ?string $description;
     public ?Organization $organization;
-    public ?\DateTimeInterface $startDate;
-    public ?\DateTimeInterface $endDate = null;
     public array $additionalVisas = [];
     public array $additionalReasons = [];
     public ?string $visaModelUuid = null;
@@ -41,8 +39,6 @@ public static function create(
         $command->category = $regulationOrder?->getCategory();
         $command->otherCategoryText = $regulationOrder?->getOtherCategoryText();
         $command->description = $regulationOrder?->getDescription();
-        $command->startDate = $startDate ?? $regulationOrder?->getStartDate();
-        $command->endDate = $regulationOrder?->getEndDate();
         $command->additionalVisas = $regulationOrder?->getAdditionalVisas() ?? [];
         $command->additionalReasons = $regulationOrder?->getAdditionalReasons() ?? [];
         $command->visaModelUuid = $regulationOrder?->getVisaModel()?->getUuid();

src/Application/Regulation/Command/SaveRegulationGeneralInfoCommandHandler.php

@@ -39,8 +39,6 @@ public function __invoke(SaveRegulationGeneralInfoCommand $command): RegulationO
                     identifier: $command->identifier,
                     category: $command->category,
                     description: $command->description,
-                    startDate: $command->startDate,
-                    endDate: $command->endDate,
                     otherCategoryText: $command->otherCategoryText,
                     additionalVisas: $command->additionalVisas,
                     additionalReasons: $command->additionalReasons,
@@ -67,8 +65,6 @@ public function __invoke(SaveRegulationGeneralInfoCommand $command): RegulationO
             identifier: $command->identifier,
             category: $command->category,
             description: $command->description,
-            startDate: $command->startDate,
-            endDate: $command->endDate,
             otherCategoryText: $command->otherCategoryText,
             additionalVisas: $command->additionalVisas,
             additionalReasons: $command->additionalReasons,

src/Application/Regulation/Query/GetCifsIncidentsQueryHandler.php

@@ -35,11 +35,21 @@ public function __invoke(GetCifsIncidentsQuery $query): array
             $this->cifsFilterSet->allowedLocationIds,
         );
 
+        $uuids = [];
+
+        /** @var RegulationOrderRecord $regulationOrderRecord */
+        foreach ($regulationOrderRecords as $regulationOrderRecord) {
+            $uuids[] = $regulationOrderRecord->getUuid();
+        }
+
+        $overallDates = $this->repository->getOverallDatesByRegulationUuids($uuids);
+
         // Reference: https://developers.google.com/waze/data-feed/cifs-specification?hl=fr
         $incidents = [];
 
         /** @var RegulationOrderRecord $regulationOrderRecord */
         foreach ($regulationOrderRecords as $regulationOrderRecord) {
+            $uuid = $regulationOrderRecord->getUuid();
             $regulationOrder = $regulationOrderRecord->getRegulationOrder();
             $identifier = $regulationOrder->getIdentifier();
 
@@ -51,8 +61,8 @@ public function __invoke(GetCifsIncidentsQuery $query): array
             };
 
             $incidentCreationTime = $regulationOrderRecord->getCreatedAt();
-            $regulationStart = $regulationOrder->getStartDate();
-            $regulationEnd = $regulationOrder->getEndDate();
+            $regulationStart = $overallDates[$uuid]['overallStartDate'];
+            $regulationEnd = $overallDates[$uuid]['overallEndDate'];
 
             /** @var Measure $measure */
             foreach ($regulationOrder->getMeasures() as $measure) {
@@ -72,11 +82,15 @@ public function __invoke(GetCifsIncidentsQuery $query): array
                         /** @var TimeSlot[] $timeSlots */
                         $timeSlots = $period->getTimeSlots();
 
+                        $isEveryDay = false;
+                        $isAllTheTime = false;
+
                         if (!$applicableDays && $timeSlots) {
+                            $isEveryDay = true;
                             $applicableDays = ['everyday'];
                         }
 
-                        if ($timeSlots) {
+                        if (\count($timeSlots) > 0) {
                             $timeSpans = [];
 
                             foreach ($timeSlots as $timeSlot) {
@@ -86,13 +100,16 @@ public function __invoke(GetCifsIncidentsQuery $query): array
                                 ];
                             }
                         } else {
+                            $isAllTheTime = true;
                             $timeSpans = [['startTime' => new \DateTimeImmutable('00:00'), 'endTime' => new \DateTimeImmutable('23:59')]];
                         }
 
                         $schedule = [];
 
-                        foreach ($applicableDays as $day) {
-                            $schedule[$day] = $timeSpans;
+                        if (!$isEveryDay || !$isAllTheTime) {
+                            foreach ($applicableDays as $day) {
+                                $schedule[$day] = $timeSpans;
+                            }
                         }
 
                         // Adhere to key order in CIFS <schedule> XML element

src/Application/Regulation/Query/GetGeneralInfoQueryHandler.php

@@ -25,6 +25,17 @@ public function __invoke(GetGeneralInfoQuery $query): GeneralInfoView
             throw new RegulationOrderRecordNotFoundException();
         }
 
-        return $row[0];
+        return new GeneralInfoView(
+            uuid: $row['uuid'],
+            identifier: $row['identifier'],
+            organizationName: $row['organizationName'],
+            organizationUuid: $row['organizationUuid'],
+            status: $row['status'],
+            category: $row['category'],
+            otherCategoryText: $row['otherCategoryText'],
+            description: $row['description'],
+            startDate: $row['overallStartDate'] ? new \DateTimeImmutable($row['overallStartDate']) : null,
+            endDate: $row['overallEndDate'] ? new \DateTimeImmutable($row['overallEndDate']) : null,
+        );
     }
 }

src/Application/Regulation/Query/GetRegulationOrdersToDatexFormatQueryHandler.php

@@ -26,10 +26,20 @@ public function __invoke(GetRegulationOrdersToDatexFormatQuery $query): array
     {
         $regulationOrderRecords = $this->repository->findRegulationOrdersForDatexFormat();
 
+        $uuids = [];
+
+        /** @var RegulationOrderRecord $regulationOrderRecord */
+        foreach ($regulationOrderRecords as $regulationOrderRecord) {
+            $uuids[] = $regulationOrderRecord->getUuid();
+        }
+
+        $overallDates = $this->repository->getOverallDatesByRegulationUuids($uuids);
+
         $regulationOrderViews = [];
 
         /** @var RegulationOrderRecord $regulationOrderRecord */
         foreach ($regulationOrderRecords as $regulationOrderRecord) {
+            $uuid = $regulationOrderRecord->getUuid();
             $regulationOrder = $regulationOrderRecord->getRegulationOrder();
 
             $trafficRegulations = [];
@@ -108,7 +118,7 @@ public function __invoke(GetRegulationOrdersToDatexFormatQuery $query): array
                     $dailyRange = $period->getDailyRange();
                     $timeSlots = $period->getTimeSlots() ?? [];
 
-                    if ($dailyRange || $timeSlots) {
+                    if ($dailyRange || \count($timeSlots) > 0) {
                         $recurringTimePeriods = [];
 
                         foreach ($timeSlots as $timeSlot) {
@@ -139,13 +149,13 @@ public function __invoke(GetRegulationOrdersToDatexFormatQuery $query): array
 
             $regulationOrderViews[] = new RegulationOrderDatexListItemView(
                 uuid: $regulationOrder->getUuid(),
-                regulationOrderRecordUuid: $regulationOrderRecord->getUuid(),
+                regulationOrderRecordUuid: $uuid,
                 regulationId: $regulationOrder->getIdentifier() . '#' . $regulationOrderRecord->getOrganizationUuid(),
                 organization: $regulationOrderRecord->getOrganizationName(),
                 source: $regulationOrderRecord->getSource(),
                 description: $regulationOrder->getDescription(),
-                startDate: $regulationOrder->getStartDate(),
-                endDate: $regulationOrder->getEndDate(),
+                startDate: $overallDates[$uuid]['overallStartDate'],
+                endDate: $overallDates[$uuid]['overallEndDate'],
                 trafficRegulations: $trafficRegulations,
             );
         }

src/Application/Regulation/Query/GetRegulationsQueryHandler.php

@@ -9,6 +9,7 @@
 use App\Application\Regulation\View\RawGeoJSONView;
 use App\Application\Regulation\View\RegulationOrderListItemView;
 use App\Domain\Pagination;
+use App\Domain\Regulation\Enum\RegulationOrderCategoryEnum;
 use App\Domain\Regulation\Repository\RegulationOrderRecordRepositoryInterface;
 
 final class GetRegulationsQueryHandler
@@ -38,6 +39,14 @@ public function __invoke(GetRegulationsQuery $query): Pagination
                 $locationView = new RawGeoJSONView($label);
             }
 
+            $startDate = $row['overallStartDate'] ? new \DateTimeImmutable($row['overallStartDate']) : null;
+            $endDate = null;
+
+            // Returning overallEndDate = NULL for permanent regulation orders is too complex in SQL, we do it here in PHP.
+            if ($row['overallEndDate'] && $row['category'] !== RegulationOrderCategoryEnum::PERMANENT_REGULATION->value) {
+                $endDate = new \DateTimeImmutable($row['overallEndDate']);
+            }
+
             $regulationOrderViews[] = new RegulationOrderListItemView(
                 uuid: $row['uuid'],
                 identifier: $row['identifier'],
@@ -46,8 +55,8 @@ public function __invoke(GetRegulationsQuery $query): Pagination
                 organizationName: $row['organizationName'],
                 organizationUuid: $row['organizationUuid'],
                 location: $locationView,
-                startDate: $row['startDate'],
-                endDate: $row['endDate'],
+                startDate: $startDate,
+                endDate: $endDate,
             );
         }
 

src/Domain/Regulation/RegulationOrder.php

@@ -4,6 +4,7 @@
 
 namespace App\Domain\Regulation;
 
+use App\Domain\Regulation\Enum\RegulationOrderCategoryEnum;
 use App\Domain\VisaModel\VisaModel;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
@@ -18,8 +19,6 @@ public function __construct(
         private string $identifier,
         private string $category,
         private string $description,
-        private ?\DateTimeInterface $startDate,
-        private ?\DateTimeInterface $endDate = null,
         private ?string $otherCategoryText = null,
         private ?VisaModel $visaModel = null,
         private ?array $additionalVisas = [],
@@ -53,16 +52,6 @@ public function getDescription(): string
         return $this->description;
     }
 
-    public function getStartDate(): ?\DateTimeInterface
-    {
-        return $this->startDate;
-    }
-
-    public function getEndDate(): ?\DateTimeInterface
-    {
-        return $this->endDate;
-    }
-
     public function getMeasures(): iterable
     {
         return $this->measures;
@@ -82,7 +71,7 @@ public function getRegulationOrderRecord(): ?RegulationOrderRecord
 
     public function isPermanent(): bool
     {
-        return !$this->endDate;
+        return $this->category === RegulationOrderCategoryEnum::PERMANENT_REGULATION->value;
     }
 
     public function getVisaModel(): ?VisaModel
@@ -104,8 +93,6 @@ public function update(
         string $identifier,
         string $category,
         string $description,
-        \DateTimeInterface $startDate,
-        ?\DateTimeInterface $endDate = null,
         ?string $otherCategoryText = null,
         array $additionalVisas = [],
         array $additionalReasons = [],
@@ -114,8 +101,6 @@ public function update(
         $this->identifier = $identifier;
         $this->category = $category;
         $this->description = $description;
-        $this->startDate = $startDate;
-        $this->endDate = $endDate;
         $this->otherCategoryText = $otherCategoryText;
         $this->additionalVisas = $additionalVisas;
         $this->additionalReasons = $additionalReasons;

src/Domain/Regulation/Repository/RegulationOrderRecordRepositoryInterface.php

@@ -26,6 +26,8 @@ public function findOrganizationUuid(string $uuid): ?string;
 
     public function findRegulationOrdersForDatexFormat(): array;
 
+    public function getOverallDatesByRegulationUuids(array $uuids): array;
+
     public function findRegulationOrdersForCifsIncidentFormat(
         array $allowedSources = [],
         array $excludedIdentifiers = [],

src/Infrastructure/BacIdf/BacIdfTransformer.php

@@ -68,7 +68,7 @@ public function transform(array $row): BacIdfTransformerResult
             ]);
         }
 
-        $generalInfo->startDate = new \DateTimeImmutable($date); // $date already contains the timezone (UTC)
+        $overallStartDate = new \DateTimeImmutable($date); // $date already contains the timezone (UTC)
 
         $inseeCode = $row['ARR_COMMUNE']['ARR_INSEE'];
         $siret = $this->cityProcessor->getSiretFromInseeCode($inseeCode);
@@ -150,7 +150,7 @@ public function transform(array $row): BacIdfTransformerResult
                 continue;
             }
 
-            $periodCommands = $this->parsePeriods($circReg, startDate: $generalInfo->startDate);
+            $periodCommands = $this->parsePeriods($circReg, startDate: $overallStartDate);
 
             foreach ($periodCommands as $periodCommand) {
                 $measureCommand->periods[] = $periodCommand;

src/Infrastructure/Controller/Regulation/DuplicateRegulationController.php

@@ -45,7 +45,6 @@ public function __invoke(Request $request, string $uuid): Response
         /** @var FlashBagAwareSessionInterface */
         $session = $request->getSession();
         $regulationOrderRecord = $this->getRegulationOrderRecord($uuid);
-        $regulationOrder = $regulationOrderRecord->getRegulationOrder();
 
         try {
             $duplicatedRegulationOrderRecord = $this->commandBus->handle(
@@ -65,9 +64,7 @@ public function __invoke(Request $request, string $uuid): Response
         }
 
         return new RedirectResponse(
-            url: $this->router->generate('app_regulations_list', [
-                'tab' => $regulationOrder->getEndDate() ? 'temporary' : 'permanent',
-            ]),
+            url: $this->router->generate('app_regulations_list'),
             status: Response::HTTP_SEE_OTHER,
         );
     }

src/Infrastructure/Controller/Regulation/RegulationDetailController.php

@@ -66,6 +66,7 @@ public function __invoke(string $uuid): Response
             'canDelete' => !$isReadOnly && $this->canDeleteMeasures->isSatisfiedBy(new ArrayRegulationMeasures($measures)),
             'isReadOnly' => $isReadOnly,
             'generalInfo' => $generalInfo,
+            'isPermanent' => $regulationOrderRecord->getRegulationOrder()->isPermanent(),
             'measures' => $measures,
             'regulationOrderRecord' => $regulationOrderRecord,
         ];

src/Infrastructure/EudonetParis/Enum/EudonetParisErrorEnum.php

@@ -8,7 +8,6 @@ enum EudonetParisErrorEnum: string
 {
     case NO_MEASURES_FOUND = 'no_measures_found';
     case MEASURE_ERRORS = 'measure_errors';
-    case PARSING_FAILED = 'parsing_failed';
     case MEASURE_MAY_CONTAIN_DATES = 'measure_may_contain_dates';
     case VALUE_DOES_NOT_MATCH_PATTERN = 'value_does_not_match_pattern';
     case UNSUPPORTED_LOCATION_FIELDSET = 'unsupported_location_fieldset';