[OILHI - Interfaçage] Socle technique envoi de données

.env

@@ -44,6 +44,9 @@ ESABORA_CRON_CLOCK_SLEEP_INTERVAL=60 #second
 ESABORA_CRON_SCHEDULE_SYNC_SISH='*/2 * * * *'
 ESABORA_CRON_SCHEDULE_SYNC_SISH_INTERVENTION='*/3 * * * *'
 MATOMO_ENABLE=0
+ZAPIER_OILHI_TOKEN=
+ZAPIER_OILHI_USER_ID=
+ZAPIER_OILHI_CREATE_AIRTABLE_RECORD_ZAP_ID=
 
 ### histologe ###
 

.env.sample

@@ -30,6 +30,9 @@ ESABORA_CRON_CLOCK_SLEEP_INTERVAL=60 #second
 ESABORA_CRON_SCHEDULE_SYNC_SISH='*/2 * * * *'
 ESABORA_CRON_SCHEDULE_SYNC_SISH_INTERVENTION='*/3 * * * *'
 MATOMO_ENABLE=0
+ZAPIER_OILHI_TOKEN=
+ZAPIER_OILHI_ID=
+ZAPIER_OILHI_CREATE_AIRTABLE_RECORD_ZAP_ID=
 
 ###> knplabs/knp-snappy-bundle ###
 WKHTMLTOPDF_PATH=wkhtmltopdf

Makefile

@@ -175,7 +175,7 @@ test: ## Run all tests
 	@$(DOCKER_COMP) exec histologe_phpfpm sh -c "$(PHPUNIT) $(FILE) --stop-on-failure --testdox -d memory_limit=-1"
 
 test-coverage: ## Generate phpunit coverage report in html
-	@$(DOCKER_COMP) exec histologe_phpfpm sh -c "XDEBUG_MODE=coverage $(PHPUNIT) --coverage-html coverage"
+	@$(DOCKER_COMP) exec histologe_phpfpm sh -c "XDEBUG_MODE=coverage $(PHPUNIT) --coverage-html coverage -d memory_limit=-1"
 
 e2e: ## Run E2E tests
 	@$(NPX) cypress open

config/packages/messenger.yaml

@@ -12,8 +12,8 @@ framework:
         routing:
             # Route your messages to the transports
             # Symfony\Component\Mailer\Messenger\SendEmailMessage: sync
-            App\Messenger\Message\DossierMessageSCHS: async
-            App\Messenger\Message\DossierMessageSISH: async
+            App\Messenger\Message\Esabora\DossierMessageSCHS: async
+            App\Messenger\Message\Esabora\DossierMessageSISH: async
             App\Messenger\Message\PdfExportMessage: async
 
 

src/Factory/Esabora/DossierMessageSCHSFactory.php

@@ -5,7 +5,7 @@
 use App\Entity\Affectation;
 use App\Entity\Enum\PartnerType;
 use App\Entity\Signalement;
-use App\Messenger\Message\DossierMessageSCHS;
+use App\Messenger\Message\Esabora\DossierMessageSCHS;
 use App\Service\UploadHandlerService;
 use App\Utils\AddressParser;
 use App\Utils\EtageParser;

src/Factory/Esabora/DossierMessageSISHFactory.php

@@ -6,7 +6,7 @@
 use App\Entity\Enum\PartnerType;
 use App\Entity\Signalement;
 use App\Entity\Suivi;
-use App\Messenger\Message\DossierMessageSISH;
+use App\Messenger\Message\Esabora\DossierMessageSISH;
 use App\Repository\SuiviRepository;
 use App\Service\DataGouv\AddressService;
 use App\Service\Esabora\AbstractEsaboraService;

src/Messenger/Message/DossierMessageSCHS.php → src/Messenger/Message/Esabora/DossierMessageSCHS.php

@@ -1,8 +1,9 @@
 <?php
 
-namespace App\Messenger\Message;
+namespace App\Messenger\Message\Esabora;
 
 use App\Entity\File;
+use App\Messenger\Message\DossierMessageInterface;
 
 final class DossierMessageSCHS implements DossierMessageInterface
 {

src/Messenger/Message/DossierMessageSISH.php → src/Messenger/Message/Esabora/DossierMessageSISH.php

@@ -1,9 +1,10 @@
 <?php
 
-namespace App\Messenger\Message;
+namespace App\Messenger\Message\Esabora;
 
 use App\Entity\Enum\SISHDossierType;
 use App\Entity\File;
+use App\Messenger\Message\DossierMessageInterface;
 use App\Service\Esabora\Enum\PersonneType;
 use App\Service\Esabora\Model\DossierMessageSISHPersonne;
 

src/Messenger/Message/Oilhi/DossierMessage.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace App\Messenger\Message\Oilhi;
+
+final class DossierMessage
+{
+    private ?string $signalementUrl = null;
+    private ?int $signalementId = null;
+    private ?int $partnerId = null;
+
+    public function getSignalementUrl(): ?string
+    {
+        return $this->signalementUrl;
+    }
+
+    public function setSignalementUrl(?string $signalementUrl): self
+    {
+        $this->signalementUrl = $signalementUrl;
+
+        return $this;
+    }
+
+    public function getSignalementId(): ?int
+    {
+        return $this->signalementId;
+    }
+
+    public function setSignalementId(?int $signalementId): self
+    {
+        $this->signalementId = $signalementId;
+
+        return $this;
+    }
+
+    public function getPartnerId(): ?int
+    {
+        return $this->partnerId;
+    }
+
+    public function setPartnerId(?int $partnerId): self
+    {
+        $this->partnerId = $partnerId;
+
+        return $this;
+    }
+}

src/Messenger/MessageHandler/DossierMessageSCHSHandler.php → src/Messenger/MessageHandler/Esabora/DossierMessageSCHSHandler.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Messenger\MessageHandler;
+namespace App\Messenger\MessageHandler\Esabora;
 
 use App\Entity\JobEvent;
 use App\Manager\JobEventManager;
-use App\Messenger\Message\DossierMessageSCHS;
+use App\Messenger\Message\Esabora\DossierMessageSCHS;
 use App\Repository\PartnerRepository;
 use App\Service\Esabora\AbstractEsaboraService;
 use App\Service\Esabora\EsaboraSCHSService;

src/Messenger/MessageHandler/DossierMessageSISHHandler.php → src/Messenger/MessageHandler/Esabora/DossierMessageSISHHandler.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Messenger\MessageHandler;
+namespace App\Messenger\MessageHandler\Esabora;
 
-use App\Messenger\Message\DossierMessageSISH;
+use App\Messenger\Message\Esabora\DossierMessageSISH;
 use App\Service\Esabora\Handler\DossierSISHHandlerInterface;
 use Symfony\Component\DependencyInjection\Attribute\TaggedIterator;
 use Symfony\Component\Messenger\Attribute\AsMessageHandler;

src/Messenger/MessageHandler/Oilhi/DossierMessageHandler.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Messenger\MessageHandler\Oilhi;
+
+use App\Entity\JobEvent;
+use App\Manager\JobEventManager;
+use App\Messenger\Message\Oilhi\DossierMessage;
+use App\Repository\PartnerRepository;
+use App\Service\Oilhi\HookZapierService;
+use Symfony\Component\Serializer\SerializerInterface;
+
+class DossierMessageHandler
+{
+    public function __construct(
+        private SerializerInterface $serializer,
+        private JobEventManager $jobEventManager,
+        private HookZapierService $hookZapierService,
+        private PartnerRepository $partnerRepository,
+    ) {
+    }
+
+    public function __invoke(DossierMessage $dossierMessage): void
+    {
+        $response = $this->hookZapierService->pushDossier($dossierMessage);
+        $partner = $this->partnerRepository->find($partnerId = $dossierMessage->getPartnerId());
+
+        $this->jobEventManager->createJobEvent(
+            service: HookZapierService::TYPE_SERVICE,
+            action: HookZapierService::ACTION_PUSH_DOSSIER,
+            message: $this->serializer->serialize($dossierMessage, 'json'),
+            response: $response->getContent(throw: false),
+            status: 200 === $response->getStatusCode() ? JobEvent::STATUS_SUCCESS : JobEvent::STATUS_FAILED,
+            codeStatus: $response->getStatusCode(),
+            signalementId: $dossierMessage->getSignalementId(),
+            partnerId: $partnerId,
+            partnerType: $partner?->getType(),
+        );
+    }
+}

src/Service/Esabora/EsaboraSCHSService.php

@@ -3,7 +3,7 @@
 namespace App\Service\Esabora;
 
 use App\Entity\Affectation;
-use App\Messenger\Message\DossierMessageSCHS;
+use App\Messenger\Message\Esabora\DossierMessageSCHS;
 use App\Service\Esabora\Response\DossierStateSCHSResponse;
 use App\Service\UploadHandlerService;
 use Psr\Log\LoggerInterface;

src/Service/Esabora/EsaboraSISHService.php

@@ -3,7 +3,7 @@
 namespace App\Service\Esabora;
 
 use App\Entity\Affectation;
-use App\Messenger\Message\DossierMessageSISH;
+use App\Messenger\Message\Esabora\DossierMessageSISH;
 use App\Service\Esabora\Model\DossierMessageSISHPersonne;
 use App\Service\Esabora\Response\DossierArreteSISHCollectionResponse;
 use App\Service\Esabora\Response\DossierPushSISHResponse;

src/Service/Esabora/Handler/AbstractDossierSISHHandler.php

@@ -5,7 +5,7 @@
 use App\Entity\JobEvent;
 use App\Entity\Partner;
 use App\Manager\JobEventManager;
-use App\Messenger\Message\DossierMessageSISH;
+use App\Messenger\Message\Esabora\DossierMessageSISH;
 use App\Repository\PartnerRepository;
 use App\Service\Esabora\AbstractEsaboraService;
 use Symfony\Component\Serializer\SerializerInterface;

src/Service/Esabora/Handler/DossierAdresseServiceHandler.php

@@ -3,7 +3,7 @@
 namespace App\Service\Esabora\Handler;
 
 use App\Manager\JobEventManager;
-use App\Messenger\Message\DossierMessageSISH;
+use App\Messenger\Message\Esabora\DossierMessageSISH;
 use App\Repository\PartnerRepository;
 use App\Service\Esabora\AbstractEsaboraService;
 use App\Service\Esabora\EsaboraSISHService;

src/Service/Esabora/Handler/DossierPersonneServiceHandler.php

@@ -3,7 +3,7 @@
 namespace App\Service\Esabora\Handler;
 
 use App\Manager\JobEventManager;
-use App\Messenger\Message\DossierMessageSISH;
+use App\Messenger\Message\Esabora\DossierMessageSISH;
 use App\Repository\PartnerRepository;
 use App\Service\Esabora\AbstractEsaboraService;
 use App\Service\Esabora\EsaboraSISHService;

src/Service/Esabora/Handler/DossierSISHHandlerInterface.php

@@ -2,7 +2,7 @@
 
 namespace App\Service\Esabora\Handler;
 
-use App\Messenger\Message\DossierMessageSISH;
+use App\Messenger\Message\Esabora\DossierMessageSISH;
 use Symfony\Component\DependencyInjection\Attribute\AutoconfigureTag;
 
 #[AutoconfigureTag('app.dossier_sish_handler')]

src/Service/Esabora/Handler/DossierServiceHandler.php

@@ -3,7 +3,7 @@
 namespace App\Service\Esabora\Handler;
 
 use App\Manager\JobEventManager;
-use App\Messenger\Message\DossierMessageSISH;
+use App\Messenger\Message\Esabora\DossierMessageSISH;
 use App\Repository\PartnerRepository;
 use App\Service\Esabora\AbstractEsaboraService;
 use App\Service\Esabora\EsaboraSISHService;

src/Service/Oilhi/HookZapierService.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Service\Oilhi;
+
+use App\Messenger\Message\Oilhi\DossierMessage;
+use Psr\Log\LoggerInterface;
+use Symfony\Component\DependencyInjection\Attribute\Autowire;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
+use Symfony\Contracts\HttpClient\HttpClientInterface;
+use Symfony\Contracts\HttpClient\ResponseInterface;
+
+class HookZapierService
+{
+    public const ZAPIER_HOOK_URL = 'https://hooks.zapier.com/hooks/catch';
+    public const TYPE_SERVICE = 'oilhi';
+    public const ACTION_PUSH_DOSSIER = 'push_dossier';
+
+    public function __construct(
+        private HttpClientInterface $httpClient,
+        private LoggerInterface $logger,
+        private NormalizerInterface $normalizer,
+        #[Autowire(env: 'ZAPIER_OILHI_TOKEN')]
+        private string $token,
+        #[Autowire(env: 'ZAPIER_OILHI_USER_ID')]
+        private string $userId,
+        #[Autowire(env: 'ZAPIER_OILHI_CREATE_AIRTABLE_RECORD_ZAP_ID')]
+        private string $zapId,
+    ) {
+    }
+
+    public function pushDossier(DossierMessage $dossierMessage): ResponseInterface|JsonResponse
+    {
+        $payload = $this->normalizer->normalize($dossierMessage);
+        $payload['token'] = $this->token;
+        try {
+            return $this->httpClient->request(
+                'POST',
+                self::ZAPIER_HOOK_URL.'/'.$this->userId.'/'.$this->zapId,
+                $payload
+            );
+        } catch (\Throwable $exception) {
+            $this->logger->error($exception->getMessage());
+        }
+
+        $response = [
+            'message' => $exception->getMessage(),
+            'request' => json_encode($payload),
+        ];
+
+        return (new JsonResponse($response))->setStatusCode(Response::HTTP_SERVICE_UNAVAILABLE);
+    }
+}

tests/FixturesHelper.php

@@ -15,8 +15,8 @@
 use App\Entity\Suivi;
 use App\Entity\Territory;
 use App\Entity\User;
-use App\Messenger\Message\DossierMessageSCHS;
-use App\Messenger\Message\DossierMessageSISH;
+use App\Messenger\Message\Esabora\DossierMessageSCHS;
+use App\Messenger\Message\Esabora\DossierMessageSISH;
 use App\Service\Esabora\AbstractEsaboraService;
 use App\Service\Esabora\Enum\PersonneType;
 use App\Service\Esabora\Model\DossierMessageSISHPersonne;

tests/Unit/EventSubscriber/WorkerMessageEventSubscriberTest.php

@@ -6,7 +6,7 @@
 use App\Entity\JobEvent;
 use App\EventSubscriber\WorkerMessageEventSubscriber;
 use App\Manager\JobEventManager;
-use App\Messenger\Message\DossierMessageSCHS;
+use App\Messenger\Message\Esabora\DossierMessageSCHS;
 use App\Repository\PartnerRepository;
 use App\Service\Esabora\AbstractEsaboraService;
 use App\Tests\FixturesHelper;

tests/Unit/Messenger/MessageHandler/DossierMessageHandlerTest.php → tests/Unit/Messenger/MessageHandler/Esabora/DossierMessageHandlerTest.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Tests\Unit\Messenger\MessageHandler;
+namespace App\Tests\Unit\Messenger\MessageHandler\Esabora;
 
 use App\Entity\Partner;
 use App\Manager\JobEventManager;
-use App\Messenger\MessageHandler\DossierMessageSCHSHandler;
+use App\Messenger\MessageHandler\Esabora\DossierMessageSCHSHandler;
 use App\Repository\PartnerRepository;
 use App\Service\Esabora\EsaboraSCHSService;
 use App\Tests\FixturesHelper;
@@ -26,7 +26,7 @@ public function testProcessDossierMessage(): void
     {
         $faker = Factory::create();
         $dossierMessage = $this->getDossierMessageSCHS();
-        $filepath = __DIR__.'/../../../../tools/wiremock/src/Resources/Esabora/schs/ws_import.json';
+        $filepath = __DIR__.'/../../../../../tools/wiremock/src/Resources/Esabora/schs/ws_import.json';
         $mockResponse = new MockResponse(file_get_contents($filepath));
         $mockHttpClient = new MockHttpClient($mockResponse);
         $response = $mockHttpClient->request('POST', $faker->url());