Support for deleted/archived filter

tracim/fixtures/content.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 from depot.io.utils import FileIntent
+import transaction
 
 from tracim import models
 from tracim.fixtures import Fixture
@@ -9,6 +10,7 @@ from tracim.lib.core.userworkspace import RoleApi
 from tracim.lib.core.workspace import WorkspaceApi
 from tracim.models.data import ContentType
 from tracim.models.data import UserRoleInWorkspace
+from tracim.models.revision_protection import new_revision
 
 
 class Content(Fixture):
@@ -160,4 +162,42 @@ class Content(Fixture):
             label='Current Menu',
             do_save=True,
         )
+
+        new_fruit_salad = content_api.create(
+            content_type=ContentType.Page,
+            workspace=recipe_workspace,
+            parent=fruits_desserts_folder,
+            label='New Fruit Salad',
+            do_save=True,
+        )
+        old_fruit_salad = content_api.create(
+            content_type=ContentType.Page,
+            workspace=recipe_workspace,
+            parent=fruits_desserts_folder,
+            label='Fruit Salad',
+            do_save=True,
+        )
+        with new_revision(
+                session=self._session,
+                tm=transaction.manager,
+                content=old_fruit_salad,
+        ):
+            content_api.archive(old_fruit_salad)
+        content_api.save(old_fruit_salad)
+
+        bad_fruit_salad = content_api.create(
+            content_type=ContentType.Page,
+            workspace=recipe_workspace,
+            parent=fruits_desserts_folder,
+            label='Bad Fruit Salad',
+            do_save=True,
+        )
+        with new_revision(
+                session=self._session,
+                tm=transaction.manager,
+                content=bad_fruit_salad,
+        ):
+            content_api.delete(bad_fruit_salad)
+        content_api.save(bad_fruit_salad)
+
         self._session.flush()

tracim/lib/core/content.py

@@ -3,7 +3,7 @@ from contextlib import contextmanager
 
 import os
 
-from operator import itemgetter
+from operator import itemgetter, not_
 
 import transaction
 from sqlalchemy import func
@@ -241,6 +241,11 @@ class ContentApi(object):
     def _base_query(self, workspace: Workspace=None) -> Query:
         result = self.__real_base_query(workspace)
 
+        if not self._show_active:
+            result = result.filter(or_(
+                Content.is_deleted==True,
+                Content.is_archived==True,
+            ))
         if not self._show_deleted:
             result = result.filter(Content.is_deleted==False)
 
@@ -250,9 +255,6 @@ class ContentApi(object):
         if not self._show_temporary:
             result = result.filter(Content.is_temporary==False)
 
-        if not self._show_active:
-            result = result.filter(Content.is_active==False)
-
         return result
 
     def __revisions_real_base_query(

tracim/tests/functional/test_workspaces.py

@@ -465,13 +465,13 @@ class TestWorkspaceContents(FunctionalTest):
         assert set(content['sub_content_type_slug']) == set(['thread', 'page', 'folder', 'file'])
         assert content['workspace_id'] == 1
 
-    @pytest.mark.xfail()
+
     def test_api__get_workspace_content__ok_200__get_only_active_folder_content(self):
         """
          Check obtain workspace folder active contents
          """
         params = {
-            'parent_id': 2,  # TODO - G.M - 30-05-2018 - Find a real id
+            'parent_id': 10,
             'show_archived': 0,
             'show_deleted': 0,
             'show_active': 1,
@@ -484,23 +484,22 @@ class TestWorkspaceContents(FunctionalTest):
             )
         )
         res = self.testapp.get(
-            '/api/v2/workspaces/1/contents',
+            '/api/v2/workspaces/2/contents',
             status=200,
             params=params,
         ).json_body   # nopep8
         # TODO - G.M - 30-05-2018 - Check this test
         raise NotImplementedError()
 
-    @pytest.mark.xfail()
     def test_api__get_workspace_content__ok_200__get_only_archived_folder_content(self):
         """
          Check obtain workspace folder archived contents
          """
         params = {
-            'parent_id': 2,  # TODO - G.M - 30-05-2018 - Find a real id
-            'show_archived': 0,
+            'parent_id': 10,
+            'show_archived': 1,
             'show_deleted': 0,
-            'show_active': 1,
+            'show_active': 0,
         }
         self.testapp.authorization = (
             'Basic',
@@ -510,23 +509,22 @@ class TestWorkspaceContents(FunctionalTest):
             )
         )
         res = self.testapp.get(
-            '/api/v2/workspaces/1/contents',
+            '/api/v2/workspaces/2/contents',
             status=200,
             params=params,
         ).json_body   # nopep8
         # TODO - G.M - 30-05-2018 - Check this test
         raise NotImplementedError()
 
-    @pytest.mark.xfail()
     def test_api__get_workspace_content__ok_200__get_only_deleted_folder_content(self):
         """
          Check obtain workspace folder deleted contents
          """
         params = {
-            'parent_id': 2,  # TODO - G.M - 30-05-2018 - Find a real id
+            'parent_id': 10,
             'show_archived': 0,
-            'show_deleted': 0,
-            'show_active': 1,
+            'show_deleted': 1,
+            'show_active': 0,
         }
         self.testapp.authorization = (
             'Basic',
@@ -536,7 +534,7 @@ class TestWorkspaceContents(FunctionalTest):
             )
         )
         res = self.testapp.get(
-            '/api/v2/workspaces/1/contents',
+            '/api/v2/workspaces/2/contents',
             status=200,
             params=params,
         ).json_body   # nopep8
@@ -549,7 +547,7 @@ class TestWorkspaceContents(FunctionalTest):
         (archived, deleted, active) result should be empty list.
         """
         params = {
-            'parent_id': 2,  # TODO - G.M - 30-05-2018 - Find a real id
+            'parent_id': 10,
             'show_archived': 0,
             'show_deleted': 0,
             'show_active': 0,
@@ -562,7 +560,7 @@ class TestWorkspaceContents(FunctionalTest):
             )
         )
         res = self.testapp.get(
-            '/api/v2/workspaces/1/contents',
+            '/api/v2/workspaces/2/contents',
             status=200,
             params=params,
         ).json_body   # nopep8

tracim/views/core_api/workspace_controller.py

@@ -93,7 +93,6 @@ class WorkspaceController(Controller):
         """
         return list of contents found in the workspace
         """
-        #hapic_data.query=
         app_config = request.registry.settings['CFG']
         content_filter = hapic_data.query
         api = ContentApi(