Correctly handle webhooks

zf-fr · Mar 28, 2015 · a071f10 · a071f10
1 parent f44c86c
commit a071f10
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 1.2.3
+
+* Fix a bug where discount webhook were not correctly handled, which resulted in updates not being updated
+* Fix a bug where subscription webhook were not correctly handled, which resulted in updates not being updated
+
 ## 1.2.2
 
 * Fix logic for the `isExpired` method on card entity

diff --git a/src/Listener/WebhookListener.php b/src/Listener/WebhookListener.php
@@ -152,10 +152,10 @@ private function handleCustomerDiscountEvent(array $stripeEvent)
             if (null !== $customer && ($discount = $customer->getDiscount())) {
                 $customerDiscountService->remove($discount);
             }
+        } else {
+            $customerDiscountService->syncFromStripeResource($stripeDiscount);
         }
 
-        $customerDiscountService->syncFromStripeResource($stripeEvent);
-
         return 'Event has been properly processed';
     }
 
@@ -179,10 +179,10 @@ private function handleSubscriptionDiscountEvent(array $stripeEvent)
             if (null !== $subscription && ($discount = $subscription->getDiscount())) {
                 $subscriptionDiscountService->remove($discount);
             }
+        } else {
+            $subscriptionDiscountService->syncFromStripeResource($stripeDiscount);
         }
 
-        $subscriptionDiscountService->syncFromStripeResource($stripeEvent);
-
         return 'Event has been properly processed';
     }
 
@@ -212,7 +212,7 @@ private function handleSubscriptionEvent(array $stripeEvent)
     {
         /** @var SubscriptionService $subscriptionService */
         $subscriptionService = $this->serviceLocator->get(SubscriptionService::class);
-        $subscriptionService->syncFromStripeResource($stripeEvent);
+        $subscriptionService->syncFromStripeResource($stripeEvent['data']['object']);
 
         return 'Event has been properly processed';
     }

diff --git a/src/Service/SubscriptionService.php b/src/Service/SubscriptionService.php
@@ -281,7 +281,7 @@ public function syncFromStripeResource(array $stripeSubscription)
         }
 
         /** @var Subscription $subscription */
-        $subscription = $this->subscriptionRepository->findOneBy(['stripe_id' => $stripeSubscription['id']]);
+        $subscription = $this->subscriptionRepository->findOneBy(['stripeId' => $stripeSubscription['id']]);
 
         if (null === $subscription) {
             return; // We do not handle creation