Fix deleting related resources (#91)

* Fix issue with nullable billable on events * Prevent firing of events when billable is deleted * wip
lmsqueezy · May 27, 2024 · 4fca113 · 4fca113
1 parent d5be423
commit 4fca113
Showing 1 changed file with 21 additions and 6 deletions.
diff --git a/src/Http/Controllers/WebhookController.php b/src/Http/Controllers/WebhookController.php
@@ -165,7 +165,9 @@ private function handleSubscriptionUpdated(array $payload): void
 
         $subscription = $subscription->sync($payload['data']['attributes']);
 
-        SubscriptionUpdated::dispatch($subscription->billable, $subscription, $payload);
+        if ($subscription->billable) {
+            SubscriptionUpdated::dispatch($subscription->billable, $subscription, $payload);
+        }
     }
 
     private function handleSubscriptionCancelled(array $payload): void
@@ -176,7 +178,9 @@ private function handleSubscriptionCancelled(array $payload): void
 
         $subscription = $subscription->sync($payload['data']['attributes']);
 
-        SubscriptionCancelled::dispatch($subscription->billable, $subscription, $payload);
+        if ($subscription->billable) {
+            SubscriptionCancelled::dispatch($subscription->billable, $subscription, $payload);
+        }
     }
 
     private function handleSubscriptionResumed(array $payload): void
@@ -198,7 +202,9 @@ private function handleSubscriptionExpired(array $payload): void
 
         $subscription = $subscription->sync($payload['data']['attributes']);
 
-        SubscriptionExpired::dispatch($subscription->billable, $subscription, $payload);
+        if ($subscription->billable) {
+            SubscriptionExpired::dispatch($subscription->billable, $subscription, $payload);
+        }
     }
 
     private function handleSubscriptionPaused(array $payload): void
@@ -225,21 +231,30 @@ private function handleSubscriptionUnpaused(array $payload): void
 
     private function handleSubscriptionPaymentSuccess(array $payload): void
     {
-        if ($subscription = $this->findSubscription($payload['data']['attributes']['subscription_id'])) {
+        if (
+            ($subscription = $this->findSubscription($payload['data']['attributes']['subscription_id'])) &&
+            $subscription->billable
+        ) {
             SubscriptionPaymentSuccess::dispatch($subscription->billable, $subscription, $payload);
         }
     }
 
     private function handleSubscriptionPaymentFailed(array $payload): void
     {
-        if ($subscription = $this->findSubscription($payload['data']['attributes']['subscription_id'])) {
+        if (
+            ($subscription = $this->findSubscription($payload['data']['attributes']['subscription_id'])) &&
+            $subscription->billable
+        ) {
             SubscriptionPaymentFailed::dispatch($subscription->billable, $subscription, $payload);
         }
     }
 
     private function handleSubscriptionPaymentRecovered(array $payload): void
     {
-        if ($subscription = $this->findSubscription($payload['data']['attributes']['subscription_id'])) {
+        if (
+            ($subscription = $this->findSubscription($payload['data']['attributes']['subscription_id'])) &&
+            $subscription->billable
+        ) {
             SubscriptionPaymentRecovered::dispatch($subscription->billable, $subscription, $payload);
         }
     }