add simple get last active content endpoint

tracim/lib/core/content.py

@@ -789,7 +789,7 @@ class ContentApi(object):
 
         return resultset.all()
 
-    def get_last_active(self, parent_id: int, content_type: str, workspace: Workspace=None, limit=10) -> typing.List[Content]:
+    def get_last_active(self, parent_id: typing.Optional[int], content_type: str, workspace: Workspace=None, limit=10, offset=1) -> typing.List[Content]:
         assert parent_id is None or isinstance(parent_id, int) # DYN_REMOVE
         assert content_type is not None# DYN_REMOVE
         assert isinstance(content_type, str) # DYN_REMOVE
@@ -805,26 +805,27 @@ class ContentApi(object):
         if parent_id:
             resultset = resultset.filter(Content.parent_id==parent_id)
 
-        result = []
-        for item in resultset:
-            new_item = None
-            if ContentType.Comment == item.type:
-                new_item = item.parent
-            else:
-                new_item = item
+        resultset = resultset.slice(start=offset, stop=limit)
+        # result = []
+        # for item in resultset:
+        #     new_item = None
+        #     if ContentType.Comment == item.type:
+        #         new_item = item.parent
+        #     else:
+        #         new_item = item
+        #
+        #     # INFO - D.A. - 2015-05-20
+        #     # We do not want to show only one item if the last 10 items are
+        #     # comments about one thread for example
+        #     if new_item not in result:
+        #         result.append(new_item)
+        #
+        #     if len(result) >= limit:
+        #         break
 
-            # INFO - D.A. - 2015-05-20
-            # We do not want to show only one item if the last 10 items are
-            # comments about one thread for example
-            if new_item not in result:
-                result.append(new_item)
-
-            if len(result) >= limit:
-                break
-
-        return result
+        return resultset.all()
 
-    def get_last_unread(self, parent_id: int, content_type: str,
+    def get_last_unread(self, parent_id: typing.Optional[int], content_type: str,
                         workspace: Workspace=None, limit=10) -> typing.List[Content]:
         assert parent_id is None or isinstance(parent_id, int) # DYN_REMOVE
         assert content_type is not None# DYN_REMOVE

tracim/models/context_models.py

@@ -64,15 +64,32 @@ class ContentFilter(object):
     """
     def __init__(
             self,
+            workspace_id: int = None,
             parent_id: int = None,
             show_archived: int = 0,
             show_deleted: int = 0,
             show_active: int = 1,
+            nb_elem: typing.Optional[int] = None,
+            offset: typing.Optional[int] = None,
     ) -> None:
+        # 0 is same as None here
+        if parent_id == 0:
+            parent_id = None
+        if workspace_id == 0:
+            workspace_id = None
+        if offset == 0:
+            offset = None
+        if nb_elem == 0:
+            nb_elem = None
+
         self.parent_id = parent_id
+        self.workspace_id = workspace_id
         self.show_archived = bool(show_archived)
         self.show_deleted = bool(show_deleted)
         self.show_active = bool(show_active)
+        self.nb_elem = nb_elem
+        self.offset = offset
+        self.content_type = ContentType.Any
 
 
 class ContentCreation(object):

tracim/views/core_api/schemas.py

@@ -167,6 +167,35 @@ class FilterContentQuerySchema(marshmallow.Schema):
     @post_load
     def make_content_filter(self, data):
         return ContentFilter(**data)
+
+
+class PaginationSchema(marshmallow.Schema):
+    nb_elem = marshmallow.fields.Int(
+        example=2,
+        default=0,
+        description='if 0 or not set, return all elements, else return only '
+                    'the first nb_elem (according to offset)',
+        validate=Range(min=0, error="Value must be positive or 0"),
+    )
+    offset = marshmallow.fields.Int(
+        example=5,
+        default=0,
+        description='if 0 or not set, do not set offset, else set offset for'
+                    'query',
+        validate=Range(min=0, error="Value must be positive or 0"),
+    )
+
+
+class ExtendedFilterQuerySchema(FilterContentQuerySchema, PaginationSchema):
+    workspace_id = marshmallow.fields.Int(
+        example=2,
+        default=0,
+        description='allow to filter items in a workspace.'
+                    ' If not set,'
+                    'then return contents from all known workspace',
+        validate=Range(min=0, error="Value must be positive or 0"),
+    )
+
 ###
 
 

tracim/views/core_api/user_controller.py

@@ -1,6 +1,6 @@
 from pyramid.config import Configurator
-from sqlalchemy.orm.exc import NoResultFound
 
+from tracim.lib.core.content import ContentApi
 from tracim.lib.utils.authorization import require_same_user_or_profile
 from tracim.models import Group
 from tracim.models.context_models import WorkspaceInContext
@@ -12,13 +12,13 @@ except ImportError:
 
 from tracim import hapic, TracimRequest
 
-from tracim.exceptions import NotAuthenticated
-from tracim.exceptions import InsufficientUserProfile
-from tracim.exceptions import UserDoesNotExist
 from tracim.lib.core.workspace import WorkspaceApi
 from tracim.views.controllers import Controller
 from tracim.views.core_api.schemas import UserIdPathSchema
+from tracim.views.core_api.schemas import ContentDigestSchema
+from tracim.views.core_api.schemas import ExtendedFilterQuerySchema
 from tracim.views.core_api.schemas import WorkspaceDigestSchema
+from tracim.models.contents import ContentTypeLegacy as ContentType
 
 USER_ENDPOINTS_TAG = 'Users'
 
@@ -46,12 +46,50 @@ class UserController(Controller):
             for workspace in workspaces
         ]
 
+    @hapic.with_api_doc(tags=[USER_ENDPOINTS_TAG])
+    @require_same_user_or_profile(Group.TIM_ADMIN)
+    @hapic.input_path(UserIdPathSchema())
+    @hapic.input_query(ExtendedFilterQuerySchema())
+    @hapic.output_body(ContentDigestSchema(many=True))
+    def last_active_content(self, context, request: TracimRequest, hapic_data=None):  # nopep8
+        """
+        Get last_active_content for user
+        """
+        app_config = request.registry.settings['CFG']
+        api = ContentApi(
+            current_user=request.current_user,  # User
+            session=request.dbsession,
+            config=app_config,
+        )
+        wapi = WorkspaceApi(
+            current_user=request.current_user,  # User
+            session=request.dbsession,
+            config=app_config,
+        )
+        workspace = None
+        if 'workspace_id' in hapic_data.body:
+            workspace = wapi.get_one(hapic_data.body.workspace_id)
+        last_actives = api.get_last_active(
+            parent_id=hapic_data.body.parent_id,
+            content_type=hapic_data.body.content_type,
+            workspace=workspace,
+            offset=None,
+            limit=None,
+        )
+        return [
+            api.get_content_in_context(content) for content in last_actives
+        ]
+
     def bind(self, configurator: Configurator) -> None:
         """
         Create all routes and views using pyramid configurator
         for this controller
         """
 
-        # Applications
+        # user worskpace
         configurator.add_route('user_workspace', '/users/{user_id}/workspaces', request_method='GET')  # nopep8
         configurator.add_view(self.user_workspace, route_name='user_workspace')
+
+        # last active content for user
+        configurator.add_route('last_active_content', '/users/{user_id}/contents/actives', request_method='GET')  # nopep8
+        configurator.add_view(self.last_active_content, route_name='last_active_content')  # nopep8