[#795] filter on deleted, archived full compatibility for get_last_active function

backend/tracim_backend/lib/core/content.py

@@ -1001,6 +1001,13 @@ class ContentApi(object):
             else:
                 related_active_content = content
 
+            # INFO - G.M - 2018-08-10 - re-apply general filters here to avoid
+            # issue with comments
+            if not self._show_deleted and related_active_content.is_deleted:
+                continue
+            if not self._show_archived and related_active_content.is_archived:
+                continue
+
             if related_active_content not in active_contents and related_active_content not in too_recent_content:  # nopep8
 
                 if not before_content or before_content_find:

backend/tracim_backend/tests/library/test_content_api.py

@@ -2057,6 +2057,101 @@ class TestContentApi(DefaultTest):
         # (workspace2)
         assert last_actives[8] == main_folder_workspace2
 
+    def test_unit__get_last_active__ok__do_no_show_deleted_archived(self):
+        uapi = UserApi(
+            session=self.session,
+            config=self.app_config,
+            current_user=None,
+        )
+        group_api = GroupApi(
+            current_user=None,
+            session=self.session,
+            config=self.app_config,
+        )
+        groups = [group_api.get_one(Group.TIM_USER),
+                  group_api.get_one(Group.TIM_MANAGER),
+                  group_api.get_one(Group.TIM_ADMIN)]
+
+        user = uapi.create_minimal_user(email='this.is@user',
+                                        groups=groups, save_now=True)
+        workspace = WorkspaceApi(
+            current_user=user,
+            session=self.session,
+            config=self.app_config,
+        ).create_workspace(
+            'test workspace',
+            save_now=True
+        )
+        workspace2 = WorkspaceApi(
+            current_user=user,
+            session=self.session,
+            config=self.app_config,
+        ).create_workspace(
+            'test workspace2',
+            save_now=True
+        )
+
+        api = ContentApi(
+            current_user=user,
+            session=self.session,
+            config=self.app_config,
+            show_deleted=False,
+            show_archived=False,
+        )
+        main_folder = api.create(CONTENT_TYPES.Folder.slug, workspace, None, 'this is randomized folder', '', True)  # nopep8
+        archived = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'archived', '', True)  # nopep8
+        deleted = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'deleted', '', True)  # nopep8
+        comment_archived = api.create_comment(workspace, parent=archived, content='just a comment', do_save=True)  # nopep8
+        comment_deleted = api.create_comment(workspace, parent=deleted, content='just a comment', do_save=True)  # nopep8
+        with new_revision(
+            session=self.session,
+            tm=transaction.manager,
+            content=archived,
+        ):
+            api.archive(archived)
+            api.save(archived)
+
+        with new_revision(
+            session=self.session,
+            tm=transaction.manager,
+            content=deleted,
+        ):
+            api.delete(deleted)
+            api.save(deleted)
+        normal = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'normal', '', True)  # nopep8
+        comment_normal = api.create_comment(workspace, parent=normal, content='just a comment', do_save=True)  # nopep8
+
+        last_actives = api.get_last_active()
+        assert len(last_actives) == 2
+        assert last_actives[0].content_id == normal.content_id
+        assert last_actives[1].content_id == main_folder.content_id
+
+
+        api._show_deleted = True
+        api._show_archived = False
+        last_actives = api.get_last_active()
+        assert len(last_actives) == 3
+        assert last_actives[0] == normal
+        assert last_actives[1] == deleted
+        assert last_actives[2] == main_folder
+
+        api._show_deleted = False
+        api._show_archived = True
+        last_actives = api.get_last_active()
+        assert len(last_actives) == 3
+        assert last_actives[0]== normal
+        assert last_actives[1] == archived
+        assert last_actives[2] == main_folder
+
+        api._show_deleted = True
+        api._show_archived = True
+        last_actives = api.get_last_active()
+        assert len(last_actives) == 4
+        assert last_actives[0] == normal
+        assert last_actives[1] == deleted
+        assert last_actives[2] == archived
+        assert last_actives[3] == main_folder
+
     def test_unit__get_last_active__ok__workspace_filter_workspace_full(self):
         uapi = UserApi(
             session=self.session,