Activities now have explicit project ID

This allows for directly querying activity on a certain project.
Used in Attract for task/shot activity streams.

pillar/api/activities.py

@@ -1,6 +1,10 @@
+import logging
+
 from flask import g, request, current_app
 from pillar.api.utils import gravatar
 
+log = logging.getLogger(__name__)
+
 
 def notification_parse(notification):
     activities_collection = current_app.data.driver.db['activities']
@@ -131,25 +135,65 @@ def activity_object_add(actor_user_id, verb, object_type, object_id,
     subscriptions = notification_get_subscriptions(
         context_object_type, context_object_id, actor_user_id)
 
-    if subscriptions.count() > 0:
+    if subscriptions.count() == 0:
-        activity = dict(
+        return
-            actor_user=actor_user_id,
-            verb=verb,
-            object_type=object_type,
-            object=object_id,
-            context_object_type=context_object_type,
-            context_object=context_object_id
-        )
 
-        activity = current_app.post_internal('activities', activity)
+    info, status = register_activity(actor_user_id, verb, object_type, object_id,
-        if activity[3] != 201:
+                                     context_object_type, context_object_id)
-            # If creation failed for any reason, do not create a any notifcation
+    if status != 201:
-            return
+        # If creation failed for any reason, do not create a any notifcation
-        for subscription in subscriptions:
+        return
-            notification = dict(
+
-                user=subscription['user'],
+    for subscription in subscriptions:
-                activity=activity[0]['_id'])
+        notification = dict(
-            current_app.post_internal('notifications', notification)
+            user=subscription['user'],
+            activity=info['_id'])
+        current_app.post_internal('notifications', notification)
+
+
+def register_activity(actor_user_id, verb, object_type, object_id,
+                      context_object_type, context_object_id,
+                      project_id=None):
+    """Registers an activity.
+
+    This works using the following pattern:
+
+    ACTOR -> VERB -> OBJECT -> CONTEXT
+
+    :param actor_user_id: id of the user who is changing the object
+    :param verb: the action on the object ('commented', 'replied')
+    :param object_type: hardcoded name, see database schema
+    :param object_id: object id, to be traced with object_type
+    :param context_object_type: the type of the context object, like 'project' or 'node',
+        see database schema
+    :param context_object_id:
+    :param project_id: optional project ID to make the activity easily queryable
+        per project.
+
+    :returns: tuple (info, status_code), where a successful operation should have
+        status_code=201. If it is not 201, a warning is logged.
+    """
+
+    activity = {
+        'actor_user': actor_user_id,
+        'verb': verb,
+        'object_type': object_type,
+        'object': object_id,
+        'context_object_type': context_object_type,
+        'context_object': context_object_id}
+    if project_id:
+        activity['project'] = project_id
+
+    info, _, _, status_code = current_app.post_internal('activities', activity)
+
+    if status_code != 201:
+        log.warning('register_activity: code %i creating activity %s: %s',
+                    status_code, activity, info)
+    else:
+        log.info('register_activity: user %s %s on %s %s, context %s %s',
+                 actor_user_id, verb, object_type, object_id,
+                 context_object_type, context_object_id)
+    return info, status_code
 
 
 def before_returning_item_notifications(response):

pillar/api/eve_settings.py

@@ -676,6 +676,14 @@ activities_schema = {
         'type': 'objectid',
         'required': True
     },
+    'project': {
+        'type': 'objectid',
+        'data_relation': {
+            'resource': 'projects',
+            'field': '_id',
+        },
+        'required': False,
+    },
 }
 
 notifications_schema = {