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

MTES-MCT · Oct 17, 2024 · e7fb12f · e7fb12f
1 parent a79d93e
commit e7fb12f
Show file tree

Hide file tree

Showing 29 changed files with 108 additions and 349 deletions.
diff --git a/src/Application/Regulation/Command/DuplicateRegulationCommandHandler.php b/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();
 

diff --git a/src/Application/Regulation/Command/SaveRegulationGeneralInfoCommand.php b/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 = [];
 
@@ -40,8 +38,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() ?? [];
 

diff --git a/src/Application/Regulation/Command/SaveRegulationGeneralInfoCommandHandler.php b/src/Application/Regulation/Command/SaveRegulationGeneralInfoCommandHandler.php
@@ -33,8 +33,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,
@@ -60,8 +58,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,

diff --git a/src/Application/Regulation/Query/GetGeneralInfoQueryHandler.php b/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,
+        );
     }
 }
diff --git a/src/Application/Regulation/Query/GetRegulationsQueryHandler.php b/src/Application/Regulation/Query/GetRegulationsQueryHandler.php
@@ -46,8 +46,8 @@ public function __invoke(GetRegulationsQuery $query): Pagination
                 organizationName: $row['organizationName'],
                 organizationUuid: $row['organizationUuid'],
                 location: $locationView,
-                startDate: $row['startDate'],
-                endDate: $row['endDate'],
+                startDate: $row['overallStartDate'] ? new \DateTimeImmutable($row['overallStartDate']) : null,
+                endDate: $row['overallEndDate'] ? new \DateTimeImmutable($row['overallEndDate']) : null,
             );
         }
 

diff --git a/src/Domain/Regulation/RegulationOrder.php b/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,14 +52,16 @@ public function getDescription(): string
         return $this->description;
     }
 
+    // TODO used in DATEX and CIFS exports only, replace with dedicated queries
     public function getStartDate(): ?\DateTimeInterface
     {
-        return $this->startDate;
+        return new \DateTimeImmutable('2024-10-01');
     }
 
+    // TODO used in DATEX and CIFS exports only, replace with dedicated queries
     public function getEndDate(): ?\DateTimeInterface
     {
-        return $this->endDate;
+        return new \DateTimeImmutable('2024-10-02');
     }
 
     public function getMeasures(): iterable
@@ -80,9 +81,10 @@ public function getRegulationOrderRecord(): ?RegulationOrderRecord
         return $this->regulationOrderRecord;
     }
 
+    // TODO force-set category in migration when regulation order had no endDate
     public function isPermanent(): bool
     {
-        return !$this->endDate;
+        return $this->category === RegulationOrderCategoryEnum::PERMANENT_REGULATION->value;
     }
 
     public function getVisaModel(): ?VisaModel
@@ -104,17 +106,13 @@ public function update(
         string $identifier,
         string $category,
         string $description,
-        \DateTimeInterface $startDate,
-        ?\DateTimeInterface $endDate = null,
         ?string $otherCategoryText = null,
         array $additionalVisas = [],
         array $additionalReasons = [],
     ): void {
         $this->identifier = $identifier;
         $this->category = $category;
         $this->description = $description;
-        $this->startDate = $startDate;
-        $this->endDate = $endDate;
         $this->otherCategoryText = $otherCategoryText;
         $this->additionalVisas = $additionalVisas;
         $this->additionalReasons = $additionalReasons;

diff --git a/src/Infrastructure/BacIdf/BacIdfTransformer.php b/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;

diff --git a/src/Infrastructure/EudonetParis/EudonetParisTransformer.php b/src/Infrastructure/EudonetParis/EudonetParisTransformer.php
@@ -63,26 +63,6 @@ public function transform(array $row, Organization $organization): EudonetParisT
         return new EudonetParisTransformerResult($command, $errors);
     }
 
-    private function parseDate(string $value): ?\DateTimeInterface
-    {
-        if ($date = \DateTimeImmutable::createFromFormat('Y/m/d H:i:s', $value, new \DateTimeZone('Europe/Paris'))) {
-            return $date;
-        }
-
-        if (\DateTimeImmutable::createFromFormat('Y/m/d', $value, new \DateTimeZone('Europe/Paris'))) {
-            // Need to add a datetime otherwise PHP would use the current server time, not midnight.
-            return $this->parseDate($value . ' 00:00:00');
-        }
-
-        if (\DateTimeImmutable::createFromFormat('d/m/Y', $value, new \DateTimeZone('Europe/Paris'))) {
-            // This format is somtimes used by some Eudonet Paris data input users.
-            // Again, we need to ensure there is a datetime.
-            return \DateTimeImmutable::createFromFormat('d/m/Y H:i:s', $value . ' 00:00:00', new \DateTimeZone('Europe/Paris'));
-        }
-
-        return null;
-    }
-
     private function buildGeneralInfoCommand(array $row, Organization $organization): array
     {
         $command = new SaveRegulationGeneralInfoCommand();
@@ -98,26 +78,6 @@ private function buildGeneralInfoCommand(array $row, Organization $organization)
 
         $command->organization = $organization;
 
-        $startDate = $this->parseDate($row['fields'][EudonetParisExtractor::ARRETE_DATE_DEBUT]);
-
-        if (!$startDate) {
-            $error = ['loc' => ['fieldname' => 'ARRETE_DATE_DEBUT'], 'reason' => EudonetParisErrorEnum::PARSING_FAILED->value, 'value' => $row['fields'][EudonetParisExtractor::ARRETE_DATE_DEBUT]];
-
-            return [null, $error];
-        }
-
-        $command->startDate = $startDate;
-
-        $endDate = $this->parseDate($row['fields'][EudonetParisExtractor::ARRETE_DATE_FIN]);
-
-        if (!$endDate) {
-            $error = ['loc' => ['fieldname' => 'ARRETE_DATE_FIN'], 'reason' => EudonetParisErrorEnum::PARSING_FAILED->value, 'value' => $row['fields'][EudonetParisExtractor::ARRETE_DATE_FIN]];
-
-            return [null, $error];
-        }
-
-        $command->endDate = $endDate;
-
         return [$command, null];
     }
 

diff --git a/src/Infrastructure/Form/Regulation/GeneralInfoFormType.php b/src/Infrastructure/Form/Regulation/GeneralInfoFormType.php
@@ -12,7 +12,6 @@
 use Symfony\Component\Form\CallbackTransformer;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\CollectionType;
-use Symfony\Component\Form\Extension\Core\Type\DateType;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\Form\Extension\Core\Type\TextareaType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
@@ -22,7 +21,6 @@
 final class GeneralInfoFormType extends AbstractType
 {
     public function __construct(
-        private string $clientTimezone,
         private EntityManagerInterface $entityManager,
     ) {
     }
@@ -38,27 +36,6 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
                     'help' => 'regulation.general_info.identifier.help',
                 ],
             )
-            ->add(
-                'startDate',
-                DateType::class,
-                options: [
-                    'label' => 'regulation.general_info.start_date',
-                    'help' => 'regulation.general_info.start_date.help',
-                    'widget' => 'single_text',
-                    'view_timezone' => $this->clientTimezone,
-                ],
-            )
-            ->add(
-                'endDate',
-                DateType::class,
-                options: [
-                    'label' => 'regulation.general_info.end_date',
-                    'help' => 'regulation.general_info.end_date.help',
-                    'widget' => 'single_text',
-                    'view_timezone' => $this->clientTimezone,
-                    'required' => false,
-                ],
-            )
             ->add(
                 'organization',
                 ChoiceType::class,

diff --git a/src/Infrastructure/JOP/JOPTransformer.php b/src/Infrastructure/JOP/JOPTransformer.php
@@ -119,9 +119,6 @@ public function transform(array $geoJSON, Organization $organization): ImportJOP
             $measureCommands[] = $measureCommand;
         }
 
-        $generalInfoCommand->startDate = min($startDates);
-        $generalInfoCommand->endDate = max($endDates);
-
         return new ImportJOPRegulationCommand($generalInfoCommand, $measureCommands);
     }
 }
diff --git a/src/Infrastructure/Litteralis/LitteralisTransformer.php b/src/Infrastructure/Litteralis/LitteralisTransformer.php
@@ -65,7 +65,6 @@ public function transform(
         $this->setCategory($generalInfoCommand, $properties);
         $generalInfoCommand->description = $this->buildDescription($properties);
         $generalInfoCommand->organization = $organization;
-        $this->setRegulationDates($generalInfoCommand, $properties, $reporter);
 
         // (2) Parsing des mesures et leur contenu
 
@@ -163,38 +162,6 @@ private function parseRegulationParameters(array $properties): array
         return $parameters;
     }
 
-    private function setRegulationDates(SaveRegulationGeneralInfoCommand $command, array $properties, Reporter $reporter): void
-    {
-        $startDate = \DateTimeImmutable::createFromFormat(\DateTimeInterface::ISO8601, $properties['arretedebut']);
-
-        if ($startDate) {
-            $command->startDate = $startDate;
-        } else {
-            $reporter->addError(LitteralisRecordEnum::ERROR_REGULATION_START_DATE_PARSING_FAILED->value, [
-                CommonRecordEnum::ATTR_REGULATION_ID->value => $properties['arretesrcid'],
-                CommonRecordEnum::ATTR_URL->value => $properties['shorturl'],
-                'arretedebut' => $properties['arretedebut'],
-            ]);
-        }
-
-        if ($properties['arretefin'] === null) {
-            // It's a temporary regulation
-            return;
-        }
-
-        $endDate = \DateTimeImmutable::createFromFormat(\DateTimeInterface::ISO8601, $properties['arretefin']);
-
-        if ($endDate) {
-            $command->endDate = $endDate;
-        } else {
-            $reporter->addError(LitteralisRecordEnum::ERROR_REGULATION_END_DATE_PARSING_FAILED->value, [
-                CommonRecordEnum::ATTR_REGULATION_ID->value => $properties['arretesrcid'],
-                CommonRecordEnum::ATTR_URL->value => $properties['shorturl'],
-                'arretefin' => $properties['arretefin'],
-            ]);
-        }
-    }
-
     private function parseLocation(array $feature): SaveLocationCommand
     {
         $properties = $feature['properties'];