Add a api.event helper

matthiask · Oct 30, 2018 · 77e9d20 · 77e9d20
1 parent 5340532
commit 77e9d20
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 25 deletions.
diff --git a/README.rst b/README.rst
@@ -37,33 +37,19 @@ matter):
         if not challenge.is_active:
             return
 
-        yield {
-            "group": 'challenge_created',
-            "key": 'challenge_created_%s' % challenge.pk,
-            "context": {"challenge": challenge},
-        }
+        context = {"challenge": challenge}
+
+        yield api.event("challenge_created", challenge.pk, context)
 
         if (date.today() - challenge.start_date).days > 2:
             if challenge.donations.count() < 2:
-                yield {
-                    "group": 'challenge_inactivity_2d',
-                    "key": 'challenge_inactivity_2d_%s' % challenge.pk,
-                    "context": {"challenge": challenge},
-                }
+                yield api.event("challenge_inactivity_2d", challenge.pk, context)
 
         if (challenge.end_date - date.today()).days <= 2:
-            yield {
-                "group": 'challenge_ends_2d',
-                "key": 'challenge_ends_2d_%s' % challenge.pk,
-                "context": {"challenge": challenge},
-            }
+            yield api.event("challenge_ends_2d", challenge.pk, context)
 
         if challenge.end_date < date.today():
-            yield {
-                "group": 'challenge_ended',
-                "key": 'challenge_ended_%s' % challenge.pk,
-                "context": {"challenge": challenge},
-            }
+            yield api.event("challenge_ended", challenge.pk, context)
 
 
 Send mails related to challenges (uses django-authlib's

diff --git a/spark/api.py b/spark/api.py
@@ -7,6 +7,14 @@
 HANDLERS = []
 
 
+def event(group, instance_id, context=None):
+    return {
+        "group": group,
+        "key": "{}_{}".format(group, instance_id),
+        "context": {} if context is None else context,
+    }
+
+
 def only_new_events(iterable):
     from .models import Event
 

diff --git a/spark/spark_generators/api.py b/spark/spark_generators/api.py
@@ -1,3 +1,6 @@
+from spark.api import event
+
+
 def pure_function_memoizer():
     MEMO = {}
 
@@ -27,8 +30,4 @@ def events_from_generators(generators=None):
                 if not condition["test"](context[condition["variable"]]):
                     break
             else:
-                yield {
-                    "group": generator["group"],
-                    "key": "{}_{}".format(generator["group"], candidate.pk),
-                    "context": context,
-                }
+                yield event(generator["group"], candidate.pk, context)