proper reaction filtering

Link512 · Link512 · commit 75cbed74bbe3 · 2018-12-04T17:42:26.000+02:00
diff --git a/stream/reactions.py b/stream/reactions.py
@@ -46,7 +46,7 @@ def add_child(self, kind, parent_id, user_id, data=None, target_feeds=None):
             "reaction/", service_name="api", signature=self.token, data=payload
         )
 
-    def filter(self, **params):
+    def filter(self, kind, **params):
         lookup_field = ""
         lookup_value = ""
 
@@ -61,7 +61,7 @@ def filter(self, **params):
             lookup_value = params.pop("user_id")
 
         return self.client.get(
-            "reaction/%s/%s/" % (lookup_field, lookup_value),
+            "reaction/%s/%s/%s/" % (lookup_field, lookup_value, kind),
             service_name="api",
             signature=self.token,
             params=params,
diff --git a/stream/tests/test_client.py b/stream/tests/test_client.py
@@ -1238,14 +1238,17 @@ def test_reaction_add_child(self):
 
     def test_reaction_filter_random(self):
         self.c.reactions.filter(
+            kind="like",
             reaction_id="54a60c1e-4ee3-494b-a1e3-50c06acb5ed4",
             id_lte="54a60c1e-4ee3-494b-a1e3-50c06acb5ed4",
         )
         self.c.reactions.filter(
+            kind="dunno",
             activity_id="54a60c1e-4ee3-494b-a1e3-50c06acb5ed4",
             id_lte="54a60c1e-4ee3-494b-a1e3-50c06acb5ed4",
         )
         self.c.reactions.filter(
+            kind="val",
             user_id="mike", id_lte="54a60c1e-4ee3-494b-a1e3-50c06acb5ed4"
         )
 
@@ -1262,15 +1265,22 @@ def test_reaction_filter(self):
         response = self.c.reactions.add("like", activity_id, user)
         child = self.c.reactions.add_child("like", response["id"], user)
         reaction = self.c.reactions.get(response["id"])
-        r = self.c.reactions.filter(reaction_id=reaction["id"])
+
+        response = self.c.reactions.add("comment", activity_id, user)
+        reaction_comment = self.c.reactions.get(response["id"])
+
+        r = self.c.reactions.filter(kind="like", reaction_id=reaction["id"])
         self._first_result_should_be(r, child)
 
-        r = self.c.reactions.filter(activity_id=activity_id, id_lte=reaction["id"])
+        r = self.c.reactions.filter(kind="like", activity_id=activity_id, id_lte=reaction["id"])
         self._first_result_should_be(r, reaction)
 
-        r = self.c.reactions.filter(user_id=user, id_lte=reaction["id"])
+        r = self.c.reactions.filter(kind="like", user_id=user, id_lte=reaction["id"])
         self._first_result_should_be(r, reaction)
 
+        r = self.c.reactions.filter(kind="comment", activity_id=activity_id)
+        self._first_result_should_be(r, reaction_comment)
+
     def test_user_add(self):
         self.c.users.add(str(uuid1()))
 
