Merge pull request #15 from timhanlon/handle-subscription-created-webhook

Handle subscription created webhook

Author: FPurchess

djpaddle/models.py

@@ -155,19 +155,19 @@ class Meta:
     def _sanitize_webhook_payload(cls, payload):
         data = {}
 
-        data["id"] = data.pop("subscription_id", None)
+        data["id"] = payload.pop("subscription_id", None)
 
         # transform `user_id` to subscriber ref
         data["subscriber"] = None
-        subscriber_id = data.pop("user_id", None)
+        subscriber_id = payload.pop("user_id", None)
         if subscriber_id not in ["", None]:
-            data["subscriber"] = settings.get_subscriber_model().objects.get(
-                pk=subscriber_id
+            data["subscriber"], created = settings.get_subscriber_model().objects.get_or_create(
+                email=payload["email"]
             )
 
         # transform `subscription_plan_id` to plan ref
         data["plan"] = None
-        plan_id = data.pop("subscription_plan_id", None)
+        plan_id = payload.pop("subscription_plan_id", None)
         if plan_id not in ["", None]:
             data["plan"] = Plan.objects.get(pk=plan_id)
 
@@ -186,7 +186,7 @@ def _sanitize_webhook_payload(cls, payload):
     @classmethod
     def from_subscription_created(cls, payload):
         data = cls._sanitize_webhook_payload(payload)
-        return cls(**data)
+        return cls.objects.get_or_create(**data)
 
     @classmethod
     def update_by_payload(cls, payload):

tests/test_webhooks.py

@@ -1,10 +1,12 @@
 from copy import deepcopy
 from unittest import mock
 
+from django.conf import settings
 from django.urls import reverse
 from django.test import TestCase, Client
 
 from . import FAKE_ALERT_TEST_SUBSCRIPTION_CREATED
+from djpaddle.models import Plan, Subscription
 
 
 class TestWebhook(TestCase):
@@ -15,6 +17,7 @@ def _send_alert(self, data):
     def test_webhook_is_valid_alert(self, is_valid_webhook):
         valid_alert = deepcopy(FAKE_ALERT_TEST_SUBSCRIPTION_CREATED)
         valid_alert["p_signature"] = "valid-signature"
+        plan = Plan.objects.create(pk=1, name="monthly-subscription", billing_type="month", billing_period=1, trial_days=0)
 
         resp = self._send_alert(valid_alert)
         self.assertTrue(is_valid_webhook.called)
@@ -26,3 +29,13 @@ def test_webhook_is_invalid_signature(self):
 
         resp = self._send_alert(invalid_alert)
         self.assertEqual(resp.status_code, 400)
+
+    @mock.patch("djpaddle.views.is_valid_webhook", return_value=True)
+    def test_subscription_created_webhook(self, is_valid_webhook):
+        payload = deepcopy(FAKE_ALERT_TEST_SUBSCRIPTION_CREATED)
+        payload["p_signature"] = "valid-signature"
+        plan = Plan.objects.create(pk=1, name="monthly-subscription", billing_type="month", billing_period=1, trial_days=0)
+
+        resp = self._send_alert(payload)
+        subscription = Subscription.objects.get(email=payload["email"])
+        self.assertEqual(subscription.email, "gardner.wuckert@example.org")