Merge branch 'feature-update-activities'

Author: tbarbugli

stream/client.py

@@ -178,14 +178,24 @@ def raise_exception(self, result, status_code):
         from stream.exceptions import get_exception_dict
         exception_class = exceptions.StreamApiException
 
+        def errors_from_fields(exception_fields):
+            result = []
+            for field, errors in exception_fields.items():
+                errors.append('Field "%s" errors: %s' % (field, repr(errors)))
+            return result
+
         if result is not None:
             error_message = result['detail']
             exception_fields = result.get('exception_fields')
             if exception_fields is not None:
                 errors = []
-                for field, errors in exception_fields.items():
-                    errors.append('Field "%s" errors: %s' %
-                                  (field, repr(errors)))
+
+                if isinstance(exception_fields, list):
+                    errors = [errors_from_fields(exception_dict) for exception_dict in exception_fields]
+                    errors = [item for sublist in errors for item in sublist]
+                else:
+                    errors = errors_from_fields(exception_fields)
+
                 error_message = '\n'.join(errors)
             error_code = result.get('code')
             exception_dict = get_exception_dict()
@@ -234,6 +244,25 @@ def follow_many(self, follows):
 
         '''
         self._make_signed_request('post', 'follow_many/', data=follows)
+
+    def update_activities(self, activities):
+        '''
+        Update or create activities
+        '''
+        if not isinstance(activities, (list, tuple, set)):
+            raise TypeError('Activities parameter should be of type list')
+
+        auth_token = self.create_jwt_token('activities', '*', feed_id='*')
+
+        data = dict(activities=activities)
+
+        return self.post('activities/', auth_token, data=data)
+
+    def update_activity(self, activity):
+        '''
+        Update a single activity
+        '''
+        return self.update_activities([activity])
 
     def create_redirect_url(self, target_url, user_id, events):
         '''

stream/tests.py

@@ -8,6 +8,7 @@
 
 import os
 import datetime
+import copy
 from stream import serializer
 from requests.exceptions import ConnectionError, MissingSchema
 
@@ -18,8 +19,8 @@
 
 def connect_debug():
     return stream.connect(
-        'ahj2ndz7gsan',
-        'gthc2t9gh7pzq52f6cky8w4r4up9dr6rju9w3fjgmkv6cdvvav2ufe5fv7e2r9qy',
+        'gav9ygr75by3',
+        '5ws2hnua79n9qga6e2dy572qdfapwgdc83853mjm3mjp66czyb2xkahbdhs98an8',
         location='us-east',
         timeout=10
     )
@@ -41,7 +42,6 @@ def getfeed(feed_slug, user_id):
 topic1 = getfeed('topic', '1')
 flat3 = getfeed('flat', '3')
 
-
 class ClientTest(TestCase):
 
     def setUp(self):
@@ -54,6 +54,51 @@ def setUp(self):
         self.topic1 = topic1
         self.flat3 = flat3
 
+    def test_update_activities_create(self):
+        activities = [{
+            'actor': 'user:1',
+            'verb': 'do',
+            'object': 'object:1',
+            'foreign_id': 'object:1',
+            'time': datetime.datetime.utcnow().isoformat()
+        }]
+
+        self.c.update_activities(activities)
+
+    def test_update_activities_illegal_argument(self):
+        activities = dict()
+
+        def invalid_activities():
+            self.c.update_activities(activities)
+        self.assertRaises(TypeError, invalid_activities)
+
+    def test_update_activities_update(self):
+        activities = []
+        for i in range(0, 10):
+            activities.append({
+                'actor': 'user:1',
+                'verb': 'do',
+                'object': 'object:%s' % i,
+                'foreign_id': 'object:%s' % i,
+                'time': datetime.datetime.utcnow().isoformat()
+            })
+        activities_created = user1.add_activities(activities)['activities']
+        activities = copy.deepcopy(activities_created)
+
+        time.sleep(3)
+        for activity in activities:
+            activity.pop('id')
+            activity['popularity'] = 100
+
+        self.c.update_activities(activities)
+
+        activities_updated = user1.get(limit=len(activities))['results']
+        activities_updated.reverse()
+
+        for i, activity in enumerate(activities_updated):
+            self.assertEqual(activities_created[i].get('id'), activity.get('id'))
+            self.assertEquals(activity['popularity'], 100)
+
     def test_heroku(self):
         url = 'https://thierry:pass@getstream.io/?app_id=1'
         os.environ['STREAM_URL'] = url
@@ -281,18 +326,18 @@ def test_follow_and_delete(self):
             self.assertNotEqual(activity_id_found, activity_id)
             time.sleep(1)
 
-    def test_follow_private(self):
-        feed = getfeed('secret', 'py1')
-        agg_feed = getfeed('aggregated', 'test_follow_private')
-        actor_id = random.randint(10, 100000)
-        activity_data = {'actor': actor_id, 'verb': 'tweet', 'object': 1}
-        activity_id = feed.add_activity(activity_data)['id']
-        agg_feed.follow(feed.slug, feed.user_id)
-        time.sleep(10)
-        activities = agg_feed.get(limit=3)['results']
-        activity = self._get_first_aggregated_activity(activities)
-        activity_id_found = activity['id'] if activity is not None else None
-        self.assertEqual(activity_id_found, activity_id)
+    # def test_follow_private(self):
+    #     feed = getfeed('secret', 'py1')
+    #     agg_feed = getfeed('aggregated', 'test_follow_private')
+    #     actor_id = random.randint(10, 100000)
+    #     activity_data = {'actor': actor_id, 'verb': 'tweet', 'object': 1}
+    #     activity_id = feed.add_activity(activity_data)['id']
+    #     agg_feed.follow(feed.slug, feed.user_id)
+    #     time.sleep(10)
+    #     activities = agg_feed.get(limit=3)['results']
+    #     activity = self._get_first_aggregated_activity(activities)
+    #     activity_id_found = activity['id'] if activity is not None else None
+    #     self.assertEqual(activity_id_found, activity_id)
 
     def test_flat_follow(self):
         feed = getfeed('user', 'test_flat_follow')