Small refactoring

JhumanJ · JhumanJ · commit b7e4029481fd · 2024-03-13T16:03:05.000+01:00
diff --git a/app/Listeners/Forms/NotifyFormSubmission.php b/app/Listeners/Forms/NotifyFormSubmission.php
@@ -4,6 +4,7 @@
 
 use App\Events\Forms\FormSubmitted;
 use App\Models\Integration\FormIntegration;
+use App\Service\Forms\Integrations\AbstractIntegrationHandler;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Queue\InteractsWithQueue;
 
@@ -21,7 +22,7 @@ public function handle(FormSubmitted $event)
     {
         $formIntegrations = FormIntegration::where([['form_id', $event->form->id], ['status', FormIntegration::STATUS_ACTIVE]])->get();
         foreach ($formIntegrations as $formIntegration) {
-            $this->integrationHandler(
+            $this->getIntegrationHandler(
                 $event,
                 $formIntegration
             )->handle();
@@ -37,7 +38,7 @@ public function handle(FormSubmitted $event)
         */
     }
 
-    public static function integrationHandler(FormSubmitted $event, FormIntegration $formIntegration)
+    public static function getIntegrationHandler(FormSubmitted $event, FormIntegration $formIntegration): AbstractIntegrationHandler
     {
         $integration = FormIntegration::getIntegration($formIntegration->integration_id);
         if ($integration && isset($integration['file_name']) && class_exists('App\Service\Forms\Webhooks\\' . $integration['file_name'])) {
diff --git a/app/Models/Integration/FormZapierWebhook.php b/app/Models/Integration/FormZapierWebhook.php
@@ -3,7 +3,7 @@
 namespace App\Models\Integration;
 
 use App\Models\Forms\Form;
-use App\Service\Forms\Webhooks\WebhookHandlerProvider;
+use App\Service\Forms\Integrations\WebhookHandlerProvider;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
diff --git a/app/Service/Forms/Integrations/AbstractIntegrationHandler.php b/app/Service/Forms/Integrations/AbstractIntegrationHandler.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Service\Forms\Webhooks;
+namespace App\Service\Forms\Integrations;
 
 use App\Models\Integration\FormIntegration;
 use App\Events\Forms\FormSubmitted;
@@ -27,7 +27,7 @@ protected function getProviderName(): string
         return $this->integration['name'] ?? '';
     }
 
-    protected function isValidLogic(): bool
+    protected function logicConditionsMet(): bool
     {
         if (!$this->formIntegration->logic) {
             return true;
@@ -37,7 +37,7 @@ protected function isValidLogic(): bool
 
     protected function shouldRun(): bool
     {
-        return true;
+        return $this->logicConditionsMet();
     }
 
     protected function getWebhookUrl(): ?string
@@ -76,7 +76,7 @@ protected function getWebhookData(): array
      */
     public function handle()
     {
-        if (!$this->shouldRun() || !$this->isValidLogic()) {
+        if (!$this->shouldRun()) {
             return;
         }
 
diff --git a/app/Service/Forms/Integrations/AbstractWebhookHandler.php b/app/Service/Forms/Integrations/AbstractWebhookHandler.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Service\Forms\Webhooks;
+namespace App\Service\Forms\Integrations;
 
 use App\Models\Forms\Form;
 use App\Service\Forms\FormSubmissionFormatter;
diff --git a/app/Service/Forms/Integrations/DiscordHandler.php b/app/Service/Forms/Integrations/DiscordHandler.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Service\Forms\Webhooks;
+namespace App\Service\Forms\Integrations;
 
 use App\Service\Forms\FormSubmissionFormatter;
 use Illuminate\Support\Arr;
diff --git a/app/Service/Forms/Integrations/DiscordNotification.php b/app/Service/Forms/Integrations/DiscordNotification.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Service\Forms\Webhooks;
+namespace App\Service\Forms\Integrations;
 
 use App\Service\Forms\FormSubmissionFormatter;
 use Illuminate\Support\Arr;
@@ -18,7 +18,7 @@ protected function shouldRun(): bool
     {
         return !is_null($this->getWebhookUrl())
             && str_contains($this->getWebhookUrl(), 'https://discord.com/api/webhooks')
-            && $this->form->is_pro;
+            && $this->form->is_pro && parent::shouldRun();
     }
 
     protected function getWebhookData(): array
diff --git a/app/Service/Forms/Integrations/EmailNotification.php b/app/Service/Forms/Integrations/EmailNotification.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Service\Forms\Webhooks;
+namespace App\Service\Forms\Integrations;
 
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Notification;
@@ -10,20 +10,19 @@ class EmailNotification extends AbstractIntegrationHandler
 {
     protected function shouldRun(): bool
     {
-        return !(!$this->form->is_pro || !$this->formIntegrationData->notification_emails);
+        return !(!$this->form->is_pro || !$this->formIntegrationData->notification_emails) && parent::shouldRun();
     }
 
     public function handle()
     {
-        if (!$this->shouldRun() || !$this->isValidLogic()) {
+        if (!$this->shouldRun()) {
             return;
         }
 
-        $subscribers = collect(preg_split("/\r\n|\n|\r/", $this->formIntegrationData->notification_emails))->filter(function (
-            $email
-        ) {
-            return filter_var($email, FILTER_VALIDATE_EMAIL);
-        });
+        $subscribers = collect(preg_split("/\r\n|\n|\r/", $this->formIntegrationData->notification_emails))
+            ->filter(function ($email) {
+                return filter_var($email, FILTER_VALIDATE_EMAIL);
+            });
         Log::debug('Sending email notification', [
             'recipients' => $subscribers->toArray(),
             'form_id' => $this->form->id,
diff --git a/app/Service/Forms/Integrations/SimpleWebhookHandler.php b/app/Service/Forms/Integrations/SimpleWebhookHandler.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Service\Forms\Webhooks;
+namespace App\Service\Forms\Integrations;
 
 class SimpleWebhookHandler extends AbstractWebhookHandler
 {
diff --git a/app/Service/Forms/Integrations/SlackHandler.php b/app/Service/Forms/Integrations/SlackHandler.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Service\Forms\Webhooks;
+namespace App\Service\Forms\Integrations;
 
 use App\Service\Forms\FormSubmissionFormatter;
 use Illuminate\Support\Arr;
diff --git a/app/Service/Forms/Integrations/SlackNotification.php b/app/Service/Forms/Integrations/SlackNotification.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Service\Forms\Webhooks;
+namespace App\Service\Forms\Integrations;
 
 use App\Service\Forms\FormSubmissionFormatter;
 use Illuminate\Support\Arr;
@@ -17,7 +17,8 @@ protected function shouldRun(): bool
     {
         return !is_null($this->getWebhookUrl())
             && str_contains($this->getWebhookUrl(), 'https://hooks.slack.com/')
-            && $this->form->is_pro;
+            && $this->form->is_pro
+            && parent::shouldRun();
     }
 
     protected function getWebhookData(): array
diff --git a/app/Service/Forms/Integrations/SubmissionConfirmation.php b/app/Service/Forms/Integrations/SubmissionConfirmation.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Service\Forms\Webhooks;
+namespace App\Service\Forms\Integrations;
 
 use App\Mail\Forms\SubmissionConfirmationMail;
 use Illuminate\Support\Facades\Mail;
@@ -15,12 +15,12 @@ class SubmissionConfirmation extends AbstractIntegrationHandler
 
     protected function shouldRun(): bool
     {
-        return !(!$this->form->is_pro);
+        return !(!$this->form->is_pro) && parent::shouldRun() && !$this->riskLimitReached();
     }
 
     public function handle()
     {
-        if (!$this->shouldRun() || !$this->isValidLogic() || $this->riskLimitReached()) {
+        if (!$this->shouldRun()) {
             return;
         }
 
diff --git a/app/Service/Forms/Integrations/WebhookHandlerProvider.php b/app/Service/Forms/Integrations/WebhookHandlerProvider.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Service\Forms\Webhooks;
+namespace App\Service\Forms\Integrations;
 
 use App\Models\Forms\Form;
 
diff --git a/app/Service/Forms/Integrations/WebhookNotification.php b/app/Service/Forms/Integrations/WebhookNotification.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Service\Forms\Webhooks;
+namespace App\Service\Forms\Integrations;
 
 class WebhookNotification extends AbstractIntegrationHandler
 {
@@ -11,6 +11,6 @@ protected function getWebhookUrl(): ?string
 
     protected function shouldRun(): bool
     {
-        return !is_null($this->getWebhookUrl()) && $this->form->is_pro;
+        return !is_null($this->getWebhookUrl()) && $this->form->is_pro && parent::shouldRun();
     }
 }
diff --git a/app/Service/Forms/Integrations/ZapierHandler.php b/app/Service/Forms/Integrations/ZapierHandler.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Service\Forms\Webhooks;
+namespace App\Service\Forms\Integrations;
 
 use App\Models\Forms\Form;
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`		`-namespace App\Service\Forms\Webhooks;`
	`3`	`+namespace App\Service\Forms\Integrations;`
`4`	`4`
`5`	`5`	`use App\Models\Integration\FormIntegration;`
`6`	`6`	`use App\Events\Forms\FormSubmitted;`
`@@ -27,7 +27,7 @@ protected function getProviderName(): string`
`27`	`27`	`return $this->integration['name'] ?? '';`
`28`	`28`	`}`
`29`	`29`
`30`		`- protected function isValidLogic(): bool`
	`30`	`+ protected function logicConditionsMet(): bool`
`31`	`31`	`{`
`32`	`32`	`if (!$this->formIntegration->logic) {`
`33`	`33`	`return true;`
`@@ -37,7 +37,7 @@ protected function isValidLogic(): bool`
`37`	`37`
`38`	`38`	`protected function shouldRun(): bool`
`39`	`39`	`{`
`40`		`- return true;`
	`40`	`+ return $this->logicConditionsMet();`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`protected function getWebhookUrl(): ?string`
`@@ -76,7 +76,7 @@ protected function getWebhookData(): array`
`76`	`76`	`*/`
`77`	`77`	`public function handle()`
`78`	`78`	`{`
`79`		`- if (!$this->shouldRun() \|\| !$this->isValidLogic()) {`
	`79`	`+ if (!$this->shouldRun()) {`
`80`	`80`	`return;`
`81`	`81`	`}`
`82`	`82`