Merge pull request #1361 from Scifabric/fix-update-feed-info

Fix update feed info
Scifabric · Dec 29, 2016 · d560b8a · d560b8a
2 parents 9a0133d + 0040c78
commit d560b8a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/pybossa/model/event_listeners.py b/pybossa/model/event_listeners.py
@@ -52,7 +52,8 @@ def add_blog_event(mapper, conn, target):
     for r in results:
         obj['name'] = r.name
         obj['short_name'] = r.short_name
-        obj['info'] = r.info
+        # TODO: add only public info
+        # obj['info'] = r.info
     update_feed(obj)
     # Notify volunteers
     mail_queue.enqueue(notify_blog_users,
@@ -84,7 +85,8 @@ def add_task_event(mapper, conn, target):
     for r in results:
         obj['name'] = r.name
         obj['short_name'] = r.short_name
-        obj['info'] = r.info
+        # TODO: add only public info
+        # obj['info'] = r.info
     update_feed(obj)
 
 
@@ -105,7 +107,8 @@ def add_user_contributed_to_feed(conn, user_id, project_obj):
             obj = dict(id=user_id,
                        name=r.name,
                        fullname=r.fullname,
-                       info=r.info,
+                       # TODO: update with only public items.
+                       #info=r.info,
                        project_name=project_obj['name'],
                        project_short_name=project_obj['short_name'],
                        action_updated='UserContribution')

diff --git a/test/test_activity_update.py b/test/test_activity_update.py
@@ -29,7 +29,7 @@ def test_user_creation(self):
         err_msg = "It should be the same user"
         assert update_feed[0]['fullname'] == user.fullname, err_msg
         assert update_feed[0]['name'] == user.name, err_msg
-        assert update_feed[0].get('info') is not None, err_msg
+        # assert update_feed[0].get('info') is not None, err_msg
         err_msg = "The update action should be User"
         assert update_feed[0]['action_updated'] == 'User', err_msg
 
@@ -41,7 +41,7 @@ def test_project_creation(self):
         assert update_feed[0]['id'] == project.id, err_msg
         assert update_feed[0]['name'] == project.name, err_msg
         assert update_feed[0]['short_name'] == project.short_name, err_msg
-        assert update_feed[0].get('info') is None, err_msg
+        # assert update_feed[0].get('info') is None, err_msg
         err_msg = "The update action should be Project"
         assert update_feed[0]['action_updated'] == 'Project', err_msg
 
@@ -53,7 +53,7 @@ def test_blogpost_creation(self):
         assert update_feed[0]['id'] == blogpost.project_id, err_msg
         assert update_feed[0]['name'] == blogpost.project.name, err_msg
         assert update_feed[0]['short_name'] == blogpost.project.short_name, err_msg
-        assert update_feed[0].get('info') is not None, err_msg
+        # assert update_feed[0].get('info') is not None, err_msg
         err_msg = "The update action should be Project"
         assert update_feed[0]['action_updated'] == 'Blog', err_msg
 
@@ -65,7 +65,7 @@ def test_task_creation(self):
         assert update_feed[0]['id'] == task.project_id, err_msg
         assert update_feed[0]['name'] == task.project.name, err_msg
         assert update_feed[0]['short_name'] == task.project.short_name, err_msg
-        assert update_feed[0].get('info') is not None, err_msg
+        # assert update_feed[0].get('info') is not None, err_msg
         err_msg = "The update action should be Project"
         assert update_feed[0]['action_updated'] == 'Task', err_msg
 
@@ -79,7 +79,7 @@ def test_taskrun_creation(self):
         assert update_feed[0]['fullname'] == task_run.user.fullname, err_msg
         assert update_feed[0]['project_name'] == task_run.project.name, err_msg
         assert update_feed[0]['project_short_name'] == task_run.project.short_name, err_msg
-        assert update_feed[0].get('info') is not None, err_msg
+        # assert update_feed[0].get('info') is not None, err_msg
         err_msg = "The update action should be Project"
         assert update_feed[0]['action_updated'] == 'UserContribution', err_msg
 
@@ -92,7 +92,7 @@ def test_taskrun_creation_state_completed(self):
         assert update_feed[0]['id'] == task_run.project.id, err_msg
         assert update_feed[0]['name'] == task_run.project.name, err_msg
         assert update_feed[0]['short_name'] == task_run.project.short_name, err_msg
-        assert update_feed[0].get('info') is not None, err_msg
+        # assert update_feed[0].get('info') is not None, err_msg
         err_msg = "The update action should be Project"
         assert update_feed[0]['action_updated'] == 'TaskCompleted', err_msg