Using Django JSON Encoder

Author: sximba

rest_hooks_delivery/deliverers.py

@@ -7,6 +7,7 @@
 import requests
 
 from django.db.models import F
+from django.core.serializers.json import DjangoJSONEncoder
 
 from rest_hooks_delivery.models import FailedHook
 from rest_hooks_delivery.tasks import store_hook
@@ -107,15 +108,11 @@ def sync_flush(self):
 
 client = Client()
 
-def data_handler(obj):
-    return obj.isoformat() if hasattr(obj, 'isoformat') else obj
-
-
 def retry(target, payload, instance=None, hook=None, cleanup=False, **kwargs):
     client.post(
         url=target,
-        data=json.dumps(payload, default=data_handler) if not isinstance(payload, str) else
-             payload,
+        data=json.dumps(payload, cls=DjangoJSONEncoder)\
+          if not isinstance(payload, str) else payload,
         headers={'Content-Type': 'application/json'},
         _hook_id=hook.pk,
         _hook_event=hook.event,
@@ -126,8 +123,8 @@ def retry(target, payload, instance=None, hook=None, cleanup=False, **kwargs):
 def batch(target, payload, instance=None, hook=None, cleanup=False, **kwargs):
     store_hook.delay(
         url=target,
-        data=json.dumps(payload, default=data_handler) if not isinstance(payload, str) else
-             payload,
+        data=json.dumps(payload, cls=DjangoJSONEncoder)\
+          if not isinstance(payload, str) else payload,
         _hook_id=hook.pk,
         _hook_event=hook.event,
         _hook_user_id=hook.user.pk

rest_hooks_delivery/tasks.py

@@ -7,6 +7,7 @@
 from rest_hooks_delivery.models import StoredHook
 
 from django.conf import settings
+from django.core.serializers.json import DjangoJSONEncoder
 
 import requests, json
 
@@ -75,7 +76,7 @@ def batch_and_send(target_url):
             batch_data_list.append(event.payload)
         r = requests.post(
             target_url,
-            data=json.dumps(batch_data_list),
+            data=json.dumps(batch_data_list, cls=DjangoJSONEncoder),
             headers={'Content-Type': 'application/json'})
         if (r.status_code > 299 and not 'retry' in HOOK_DELIVERER_SETTINGS) or\
             (r.status_code < 300):