Formatting fixes

Author: Andrew-Dickinson

django_webhook/http.py

@@ -16,7 +16,9 @@ def prepare_request(webhook: Webhook, payload: dict):
     now = timezone.now()
     timestamp = int(datetime.timestamp(now))
 
-    encoder_cls = cast(JSONEncoder, settings.DJANGO_WEBHOOK["PAYLOAD_ENCODER_CLASS"])
+    encoder_cls = cast(
+        type[JSONEncoder], settings.DJANGO_WEBHOOK["PAYLOAD_ENCODER_CLASS"]
+    )
     signatures = [
         sign_payload(payload, secret, timestamp, encoder_cls)
         for secret in webhook.secrets.values_list("token", flat=True)
@@ -36,8 +38,10 @@ def prepare_request(webhook: Webhook, payload: dict):
     return r.prepare()
 
 
-def sign_payload(payload: dict, secret: str, timestamp: int, encoder_cls: JSONEncoder):
-    combined_payload = f"{timestamp}:{json.dumps(payload, cls=encoder_cls)}"  # type: ignore
+def sign_payload(
+    payload: dict, secret: str, timestamp: int, encoder_cls: type[JSONEncoder]
+):
+    combined_payload = f"{timestamp}:{json.dumps(payload, cls=encoder_cls)}"
     return hmac.new(
         key=secret.encode(), msg=combined_payload.encode(), digestmod=hashlib.sha256
     ).hexdigest()

tests/model_data.py

@@ -0,0 +1,11 @@
+from datetime import date, datetime
+
+TEST_JOIN_DATE = date(1970, 1, 1)
+TEST_LAST_ACTIVE = datetime(2000, 1, 1, 12, 0, 0)
+TEST_USER = {
+    "id": 1,
+    "name": "Dani",
+    "email": "dani@doo.com",
+    "join_date": "1970-01-01",
+    "last_active": "2000-01-01T12:00:00",
+}

tests/test_signals.py

@@ -1,7 +1,7 @@
 import hashlib
 import hmac
 import json
-from datetime import date, datetime, timedelta
+from datetime import datetime, timedelta
 
 import pytest
 from django.test import override_settings
@@ -14,13 +14,11 @@
     WebhookSecretFactory,
     WebhookTopicFactory,
 )
+from tests.model_data import TEST_JOIN_DATE, TEST_LAST_ACTIVE, TEST_USER
 from tests.models import Country, User
 
 pytestmark = pytest.mark.django_db
 
-TEST_JOIN_DATE = date(1970, 1, 1)
-TEST_LAST_ACTIVE = datetime(2000, 1, 1, 12, 0, 0)
-
 
 @freeze_time("2012-01-14 03:21:34")
 def test_create(responses):
@@ -44,13 +42,7 @@ def test_create(responses):
     assert req.headers["Django-Webhook-UUID"] == str(webhook.uuid)
     assert json.loads(req.body) == {
         "topic": "tests.User/create",
-        "object": {
-            "id": 1,
-            "name": "Dani",
-            "email": "dani@doo.com",
-            "join_date": "1970-01-01",
-            "last_active": "2000-01-01T12:00:00",
-        },
+        "object": TEST_USER,
         "object_type": "tests.User",
         "webhook_uuid": "54c10b6e-42e7-4edc-a047-a53c7ff80c77",
     }
@@ -80,15 +72,11 @@ def test_update(responses):
     user.save()
     assert len(responses.calls) == 1
     req = responses.calls[0].request
+    expected_object = TEST_USER.copy()
+    expected_object["name"] = "Adin"
     assert json.loads(req.body) == {
         "topic": "tests.User/update",
-        "object": {
-            "id": 1,
-            "name": "Adin",
-            "email": "dani@doo.com",
-            "join_date": "1970-01-01",
-            "last_active": "2000-01-01T12:00:00",
-        },
+        "object": expected_object,
         "object_type": "tests.User",
         "webhook_uuid": str(webhook.uuid),
     }
@@ -111,13 +99,7 @@ def test_delete(responses):
     req = responses.calls[0].request
     assert json.loads(req.body) == {
         "topic": "tests.User/delete",
-        "object": {
-            "id": 1,
-            "name": "Dani",
-            "email": "dani@doo.com",
-            "join_date": "1970-01-01",
-            "last_active": "2000-01-01T12:00:00",
-        },
+        "object": TEST_USER,
         "object_type": "tests.User",
         "webhook_uuid": str(webhook.uuid),
     }

tests/test_stores_events.py

@@ -12,6 +12,7 @@
     WebhookFactory,
     WebhookTopicFactory,
 )
+from tests.model_data import TEST_USER
 from tests.models import User
 
 pytestmark = pytest.mark.django_db
@@ -42,13 +43,7 @@ def test_creates_events_when_enabled(responses):
     assert event.webhook == webhook
     assert event.object == {
         "topic": "tests.User/create",
-        "object": {
-            "id": 1,
-            "name": "Dani",
-            "email": "dani@doo.com",
-            "join_date": "1970-01-01",
-            "last_active": "2000-01-01T12:00:00",
-        },
+        "object": TEST_USER,
         "object_type": "tests.User",
         "webhook_uuid": str(webhook.uuid),
     }