Merge pull request #2324 from MTES-MCT/bugfix/2323-oilhi-remove-usele…

…ss-fields [Oilhi] Supprimer champs problématiques à l'enregistrement Airtable
MTES-MCT · Mar 8, 2024 · a7fa2ba · a7fa2ba
2 parents 568ba3f + 3e0b107
commit a7fa2ba
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 12 deletions.
diff --git a/src/Factory/Interconnection/Oilhi/DossierMessageFactory.php b/src/Factory/Interconnection/Oilhi/DossierMessageFactory.php
@@ -15,6 +15,7 @@
 use App\Entity\Situation;
 use App\Factory\Interconnection\DossierMessageFactoryInterface;
 use App\Messenger\Message\Oilhi\DossierMessage;
+use App\Service\HtmlCleaner;
 use Symfony\Component\DependencyInjection\Attribute\Autowire;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
@@ -146,18 +147,17 @@ private function buildDesordresData(Signalement $signalement): array
             }
 
             if (!$signalement->getDesordrePrecisions()->isEmpty()) {
-                $precisions = implode(
-                    ', ',
-                    $signalement
-                        ->getDesordrePrecisions()
-                        ->filter(function (DesordrePrecision $desordrePrecision) {
-                            return ' - ' !== $desordrePrecision->getLabel();
-                        })
-                        ->map(function (DesordrePrecision $desordrePrecision) {
-                            return $desordrePrecision->getLabel();
-                        })->toArray()
-                );
-                $desordres['precisions'] = str_replace('-', '', $precisions);
+                $precisionsList = $signalement
+                    ->getDesordrePrecisions()
+                    ->filter(function (DesordrePrecision $desordrePrecision) {
+                        return ' - ' !== $desordrePrecision->getLabel();
+                    })
+                    ->map(function (DesordrePrecision $desordrePrecision) {
+                        if (!empty($desordrePrecision->getLabel())) {
+                            return HtmlCleaner::clean($desordrePrecision->getLabel());
+                        }
+                    })->toArray();
+                $desordres['precisions'] = implode(',', array_filter($precisionsList));
             }
 
             return $desordres;

diff --git a/src/Service/Oilhi/HookZapierService.php b/src/Service/Oilhi/HookZapierService.php
@@ -33,6 +33,7 @@ public function __construct(
     public function pushDossier(DossierMessage $dossierMessage): ResponseInterface|JsonResponse
     {
         $payload = $this->normalizer->normalize($dossierMessage);
+        $payload = $this->removeUselessFields($payload);
         $payload['token'] = $this->token;
         $options = [
             'headers' => [
@@ -58,4 +59,15 @@ public function pushDossier(DossierMessage $dossierMessage): ResponseInterface|J
 
         return (new JsonResponse($response))->setStatusCode(Response::HTTP_SERVICE_UNAVAILABLE);
     }
+
+    /**
+     * Utile pour le traitement interne mais inutile à l'enregistrement dans Airtable.
+     */
+    private function removeUselessFields(array $payload): array
+    {
+        unset($payload['signalementId']);
+        unset($payload['partnerId']);
+
+        return $payload;
+    }
 }