add retrocompatibility with old 'page' slug + tests

tracim/lib/core/content.py

@@ -104,6 +104,7 @@ class ContentApi(object):
         ContentType.Comment,
         ContentType.Thread,
         ContentType.Page,
+        ContentType.PageLegacy,
         ContentType.MarkdownPage,
     )
 

tracim/lib/utils/authorization.py

@@ -6,12 +6,14 @@ from pyramid.interfaces import IAuthorizationPolicy
 from zope.interface import implementer
 
 from tracim.models.contents import NewContentType
+from tracim.models.context_models import ContentInContext
 
 try:
     from json.decoder import JSONDecodeError
 except ImportError:  # python3.4
     JSONDecodeError = ValueError
 
+from tracim.models.contents import ContentTypeLegacy as ContentType
 from tracim.exceptions import InsufficientUserWorkspaceRole
 from tracim.exceptions import ContentTypeNotAllowed
 from tracim.exceptions import InsufficientUserProfile
@@ -142,7 +144,9 @@ def require_content_types(content_types: typing.List['NewContentType']):
         @functools.wraps(func)
         def wrapper(self, context, request: 'TracimRequest'):
             content = request.current_content
-            if content.type in [content.slug for content in content_types]:
+            current_content_type_slug = ContentType(content.type).slug
+            content_types_slug = [content_type.slug for content_type in content_types]
+            if current_content_type_slug in content_types_slug:
                 return func(self, context, request)
             raise ContentTypeNotAllowed()
         return wrapper

tracim/models/contents.py

@@ -228,6 +228,7 @@ class ContentTypeLegacy(NewContentType):
     File = file_type.slug
     Thread = thread_type.slug
     Page = html_documents_type.slug
+    PageLegacy = 'page'
     MarkdownPage = markdownpluspage_type.slug
 
     def __init__(self, slug: str):

tracim/models/context_models.py

@@ -12,6 +12,7 @@ from tracim.models.data import ContentRevisionRO
 from tracim.models.data import Workspace, UserRoleInWorkspace
 from tracim.models.workspace_menu_entries import default_workspace_menu_entry
 from tracim.models.workspace_menu_entries import WorkspaceMenuEntry
+from tracim.models.contents import ContentTypeLegacy as ContentType
 
 
 class MoveParams(object):
@@ -365,7 +366,11 @@ class ContentInContext(object):
 
     @property
     def content_type(self) -> str:
-        return self.content.type
+        content_type = ContentType(self.content.type)
+        if content_type:
+            return content_type.slug
+        else:
+            return None
 
     @property
     def sub_content_types(self) -> typing.List[str]:
@@ -470,7 +475,11 @@ class RevisionInContext(object):
 
     @property
     def content_type(self) -> str:
-        return self.revision.type
+        content_type = ContentType(self.revision.type)
+        if content_type:
+            return content_type.slug
+        else:
+            return None
 
     @property
     def sub_content_types(self) -> typing.List[str]:

tracim/tests/__init__.py

@@ -8,12 +8,15 @@ from depot.manager import DepotManager
 from pyramid import testing
 from sqlalchemy.exc import IntegrityError
 
-from tracim.command.database import InitializeDBCommand
 from tracim.lib.core.content import ContentApi
 from tracim.lib.core.workspace import WorkspaceApi
-from tracim.models import get_engine, DeclarativeBase, get_session_factory, \
-    get_tm_session
-from tracim.models.data import Workspace, ContentType
+from tracim.models import get_engine
+from tracim.models import DeclarativeBase
+from tracim.models import get_session_factory
+from tracim.models import get_tm_session
+from tracim.models.data import Workspace
+from tracim.models.data import ContentType
+from tracim.models.data import ContentRevisionRO
 from tracim.models.data import Content
 from tracim.lib.utils.logger import logger
 from tracim.fixtures import FixturesLoader
@@ -28,6 +31,28 @@ def eq_(a, b, msg=None):
     # TODO - G.M - 05-04-2018 - Remove this when all old nose code is removed
     assert a == b, msg or "%r != %r" % (a, b)
 
+# TODO - G.M - 2018-06-179 - Refactor slug change function
+#  as a kind of pytest fixture ?
+
+
+def set_html_document_slug_to_legacy(session_factory) -> None:
+    """
+    Simple function to help some functional test. This modify "html-documents"
+    type content in database to legacy "page" slug.
+    :param session_factory: session factory of the test
+    :return: Nothing.
+    """
+    dbsession = get_tm_session(
+        session_factory,
+        transaction.manager
+    )
+    content_query = dbsession.query(ContentRevisionRO).filter(ContentRevisionRO.type == 'page').filter(ContentRevisionRO.content_id == 6)  # nopep8
+    assert content_query.count() == 0
+    html_documents_query = dbsession.query(ContentRevisionRO).filter(ContentRevisionRO.type == 'html-documents')  # nopep8
+    html_documents_query.update({ContentRevisionRO.type: 'page'})
+    transaction.commit()
+    assert content_query.count() > 0
+
 
 class FunctionalTest(unittest.TestCase):
 

tracim/tests/functional/test_contents.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 from tracim.tests import FunctionalTest
+from tracim.tests import set_html_document_slug_to_legacy
 from tracim.fixtures.content import Content as ContentFixtures
 from tracim.fixtures.users_and_groups import Base as BaseFixture
 
@@ -28,6 +29,48 @@ class TestHtmlDocuments(FunctionalTest):
             status=400
         )   # nopep8
 
+    def test_api__get_html_document__ok_200__legacy_slug(self) -> None:
+        """
+        Get one html document of a content
+        """
+        self.testapp.authorization = (
+            'Basic',
+            (
+                'admin@admin.admin',
+                'admin@admin.admin'
+            )
+        )
+        set_html_document_slug_to_legacy(self.session_factory)
+        res = self.testapp.get(
+            '/api/v2/workspaces/2/html-documents/6',
+            status=200
+        )   # nopep8
+        content = res.json_body
+        assert content['content_type'] == 'html-documents'
+        assert content['content_id'] == 6
+        assert content['is_archived'] is False
+        assert content['is_deleted'] is False
+        assert content['label'] == 'Tiramisu Recipe'
+        assert content['parent_id'] == 3
+        assert content['show_in_ui'] is True
+        assert content['slug'] == 'tiramisu-recipe'
+        assert content['status'] == 'open'
+        assert content['workspace_id'] == 2
+        assert content['current_revision_id'] == 27
+        # TODO - G.M - 2018-06-173 - check date format
+        assert content['created']
+        assert content['author']
+        assert content['author']['user_id'] == 1
+        assert content['author']['avatar_url'] is None
+        assert content['author']['public_name'] == 'Global manager'
+        # TODO - G.M - 2018-06-173 - check date format
+        assert content['modified']
+        assert content['last_modifier'] != content['author']
+        assert content['last_modifier']['user_id'] == 3
+        assert content['last_modifier']['public_name'] == 'Bob i.'
+        assert content['last_modifier']['avatar_url'] is None
+        assert content['raw_content'] == '<p>To cook a great Tiramisu, you need many ingredients.</p>'  # nopep8
+
     def test_api__get_html_document__ok_200__nominal_case(self) -> None:
         """
         Get one html document of a content

tracim/tests/functional/test_workspaces.py

@@ -3,6 +3,7 @@
 Tests for /api/v2/workspaces subpath endpoints.
 """
 from tracim.tests import FunctionalTest
+from tracim.tests import set_html_document_slug_to_legacy
 from tracim.fixtures.content import Content as ContentFixtures
 from tracim.fixtures.users_and_groups import Base as BaseFixture
 
@@ -273,6 +274,69 @@ class TestWorkspaceContents(FunctionalTest):
         assert content['workspace_id'] == 1
 
     # Root related
+    def test_api__get_workspace_content__ok_200__get_all_root_content__legacy_html_slug(self):
+        """
+        Check obtain workspace all root contents
+        """
+        set_html_document_slug_to_legacy(self.session_factory)
+        params = {
+            'parent_id': 0,
+            'show_archived': 1,
+            'show_deleted': 1,
+            'show_active': 1,
+        }
+        self.testapp.authorization = (
+            'Basic',
+            (
+                'bob@fsf.local',
+                'foobarbaz'
+            )
+        )
+        res = self.testapp.get(
+            '/api/v2/workspaces/3/contents',
+            status=200,
+            params=params,
+        ).json_body  # nopep8
+        # TODO - G.M - 30-05-2018 - Check this test
+        assert len(res) == 4
+        content = res[1]
+        assert content['content_type'] == 'html-documents'
+        assert content['content_id'] == 15
+        assert content['is_archived'] is False
+        assert content['is_deleted'] is False
+        assert content['label'] == 'New Fruit Salad'
+        assert content['parent_id'] is None
+        assert content['show_in_ui'] is True
+        assert content['slug'] == 'new-fruit-salad'
+        assert content['status'] == 'open'
+        assert set(content['sub_content_types']) == {'thread', 'html-documents', 'folder', 'file'}  # nopep8
+        assert content['workspace_id'] == 3
+
+        content = res[2]
+        assert content['content_type'] == 'html-documents'
+        assert content['content_id'] == 16
+        assert content['is_archived'] is True
+        assert content['is_deleted'] is False
+        assert content['label'].startswith('Fruit Salad')
+        assert content['parent_id'] is None
+        assert content['show_in_ui'] is True
+        assert content['slug'].startswith('fruit-salad')
+        assert content['status'] == 'open'
+        assert set(content['sub_content_types']) == {'thread', 'html-documents', 'folder', 'file'}  # nopep8
+        assert content['workspace_id'] == 3
+
+        content = res[3]
+        assert content['content_type'] == 'html-documents'
+        assert content['content_id'] == 17
+        assert content['is_archived'] is False
+        assert content['is_deleted'] is True
+        assert content['label'].startswith('Bad Fruit Salad')
+        assert content['parent_id'] is None
+        assert content['show_in_ui'] is True
+        assert content['slug'].startswith('bad-fruit-salad')
+        assert content['status'] == 'open'
+        assert set(content['sub_content_types']) == {'thread', 'html-documents', 'folder', 'file'}  # nopep8
+        assert content['workspace_id'] == 3
 
     def test_api__get_workspace_content__ok_200__get_all_root_content(self):
         """