Merge branch 'main' into PPF-468-nullable-website

cultuurnet · May 22, 2024 · 4ceb51f · 4ceb51f
2 parents 107a64d + 46caa3b
commit 4ceb51f
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 50 deletions.
diff --git a/app/Auth0/Listeners/UpdateClients.php b/app/Auth0/Listeners/UpdateClients.php
@@ -31,18 +31,16 @@ public function __construct(
     public function handle(
         IntegrationUpdated|IntegrationUrlCreated|IntegrationUrlDeleted|IntegrationUrlUpdated $event
     ): void {
-        $integrationId = $event->integrationId ?? $event->id;
-
-        $integration = $this->integrationRepository->getById($integrationId);
-        $auth0Clients = $this->auth0ClientRepository->getByIntegrationId($integrationId);
+        $integration = $this->integrationRepository->getById($event->id);
+        $auth0Clients = $this->auth0ClientRepository->getByIntegrationId($event->id);
 
         $this->clusterSDK->updateClientsForIntegration($integration, ...$auth0Clients);
 
         $this->logger->info(
             'Auth0 client(s) updated',
             [
                 'domain' => 'auth0',
-                'integration_id' => $integrationId->toString(),
+                'integration_id' => $event->id->toString(),
             ]
         );
     }
@@ -51,10 +49,8 @@ public function failed(
         IntegrationUpdated|IntegrationUrlCreated|IntegrationUrlDeleted|IntegrationUrlUpdated $event,
         Throwable $throwable
     ): void {
-        $integrationId = $event->integrationId ?? $event->id;
-
         $this->logger->error('Failed to update Auth0 client(s)', [
-            'integration_id' => $integrationId->toString(),
+            'integration_id' => $event->id->toString(),
             'exception' => $throwable,
         ]);
     }

diff --git a/app/Domain/Integrations/Events/ClientActivated.php b/app/Domain/Integrations/Events/ClientActivated.php
diff --git a/app/Domain/Integrations/Events/ClientBlocked.php b/app/Domain/Integrations/Events/ClientBlocked.php
diff --git a/app/Domain/Integrations/Events/IntegrationUrlCreated.php b/app/Domain/Integrations/Events/IntegrationUrlCreated.php
@@ -13,7 +13,7 @@ final class IntegrationUrlCreated
 
     public function __construct(
         public readonly UuidInterface $id,
-        public readonly UuidInterface $integrationId
+        public readonly UuidInterface $integrationUrlId,
     ) {
     }
 }
diff --git a/app/Domain/Integrations/Events/IntegrationUrlDeleted.php b/app/Domain/Integrations/Events/IntegrationUrlDeleted.php
@@ -13,7 +13,7 @@ final class IntegrationUrlDeleted
 
     public function __construct(
         public readonly UuidInterface $id,
-        public readonly UuidInterface $integrationId,
+        public readonly UuidInterface $integrationUrlId,
     ) {
     }
 }
diff --git a/app/Domain/Integrations/Events/IntegrationUrlUpdated.php b/app/Domain/Integrations/Events/IntegrationUrlUpdated.php
@@ -13,7 +13,7 @@ final class IntegrationUrlUpdated
 
     public function __construct(
         public readonly UuidInterface $id,
-        public readonly UuidInterface $integrationId,
+        public readonly UuidInterface $integrationUrlId,
     ) {
     }
 }
diff --git a/app/Domain/Integrations/Models/IntegrationUrlModel.php b/app/Domain/Integrations/Models/IntegrationUrlModel.php
@@ -30,20 +30,20 @@ protected static function booted(): void
     {
         self::created(
             static fn (IntegrationUrlModel $integrationUrlModel) => IntegrationUrlCreated::dispatch(
+                Uuid::fromString($integrationUrlModel->integration_id),
                 Uuid::fromString($integrationUrlModel->id),
-                Uuid::fromString($integrationUrlModel->integration_id)
             )
         );
         self::updated(
             static fn (IntegrationUrlModel $integrationUrlModel) => IntegrationUrlUpdated::dispatch(
+                Uuid::fromString($integrationUrlModel->integration_id),
                 Uuid::fromString($integrationUrlModel->id),
-                Uuid::fromString($integrationUrlModel->integration_id)
             )
         );
         self::deleted(
             static fn (IntegrationUrlModel $integrationUrlModel) => IntegrationUrlDeleted::dispatch(
+                Uuid::fromString($integrationUrlModel->integration_id),
                 Uuid::fromString($integrationUrlModel->id),
-                Uuid::fromString($integrationUrlModel->integration_id)
             )
         );
     }

diff --git a/app/Insightly/Objects/Role.php b/app/Insightly/Objects/Role.php
@@ -6,6 +6,6 @@
 
 enum Role: string
 {
-    case Technical = 'Technisch';
-    case Applicant = 'Aanvrager';
+    case Technical = 'Technisch contact';
+    case Applicant = 'Inhoudelijk contact';
 }