Merge pull request #88 from tracim/fix/596_move_endpoint_return_updated_content

tracim/exceptions.py

@@ -65,6 +65,10 @@ class WorkspaceNotFound(NotFound):
     pass
 
 
+class WorkspaceNotFoundInTracimRequest(NotFound):
+    pass
+
+
 class InsufficientUserWorkspaceRole(TracimException):
     pass
 
@@ -111,3 +115,7 @@ class UserDoesNotExist(TracimException):
 
 class UserNotFoundInTracimRequest(TracimException):
     pass
+
+
+class WorkspacesDoNotMatch(TracimException):
+    pass

tracim/lib/core/content.py

@@ -25,6 +25,7 @@ from sqlalchemy.sql.elements import and_
 from tracim.lib.utils.utils import cmp_to_key
 from tracim.lib.core.notifications import NotifierFactory
 from tracim.exceptions import SameValueError
+from tracim.exceptions import WorkspacesDoNotMatch
 from tracim.lib.utils.utils import current_date_for_filename
 from tracim.models.revision_protection import new_revision
 from tracim.models.auth import User
@@ -862,19 +863,27 @@ class ContentApi(object):
         else:
             raise ValueError('The given value {} is not allowed'.format(new_status))
 
-    def move(self, item: Content,
+    def move(self,
+             item: Content,
              new_parent: Content,
-             must_stay_in_same_workspace:bool=True,
-             new_workspace:Workspace=None):
+             must_stay_in_same_workspace: bool=True,
+             new_workspace: Workspace=None,
+    ):
         if must_stay_in_same_workspace:
             if new_parent and new_parent.workspace_id != item.workspace_id:
                 raise ValueError('the item should stay in the same workspace')
 
         item.parent = new_parent
-        if new_parent:
-            item.workspace = new_parent.workspace
-        elif new_workspace:
+        if new_workspace:
             item.workspace = new_workspace
+            if new_parent and \
+                    new_parent.workspace_id != new_workspace.workspace_id:
+                raise WorkspacesDoNotMatch(
+                    'new parent workspace and new workspace should be the same.'
+                )
+        else:
+            if new_parent:
+                item.workspace = new_parent.workspace
 
         item.revision_type = ActionDescription.MOVE
 

tracim/lib/utils/authorization.py

@@ -8,9 +8,8 @@ try:
 except ImportError:  # python3.4
     JSONDecodeError = ValueError
 
-from tracim.exceptions import InsufficientUserWorkspaceRole, \
-    InsufficientUserProfile
-
+from tracim.exceptions import InsufficientUserWorkspaceRole
+from tracim.exceptions import InsufficientUserProfile
 if TYPE_CHECKING:
     from tracim import TracimRequest
 ###
@@ -84,8 +83,8 @@ def require_profile(group: int):
 
 def require_workspace_role(minimal_required_role: int):
     """
-    Decorator for view to restrict access of tracim request if role
-    is not high enough
+    Restricts access to endpoint to minimal role or raise an exception.
+    Check role for current_workspace.
     :param minimal_required_role: value from UserInWorkspace Object like
     UserRoleInWorkspace.CONTRIBUTOR or UserRoleInWorkspace.READER
     :return: decorator
@@ -101,3 +100,25 @@ def require_workspace_role(minimal_required_role: int):
 
         return wrapper
     return decorator
+
+
+def require_candidate_workspace_role(minimal_required_role: int):
+    """
+    Restricts access to endpoint to minimal role or raise an exception.
+    Check role for candidate_workspace.
+    :param minimal_required_role: value from UserInWorkspace Object like
+    UserRoleInWorkspace.CONTRIBUTOR or UserRoleInWorkspace.READER
+    :return: decorator
+    """
+    def decorator(func):
+
+        def wrapper(self, context, request: 'TracimRequest'):
+            user = request.current_user
+            workspace = request.candidate_workspace
+
+            if workspace.get_user_role(user) >= minimal_required_role:
+                return func(self, context, request)
+            raise InsufficientUserWorkspaceRole()
+
+        return wrapper
+    return decorator

tracim/lib/utils/request.py

@@ -3,6 +3,7 @@ from pyramid.request import Request
 from sqlalchemy.orm.exc import NoResultFound
 
 from tracim.exceptions import NotAuthenticated
+from tracim.exceptions import WorkspaceNotFoundInTracimRequest
 from tracim.exceptions import UserNotFoundInTracimRequest
 from tracim.exceptions import UserDoesNotExist
 from tracim.exceptions import WorkspaceNotFound
@@ -34,9 +35,12 @@ class TracimRequest(Request):
             decode_param_names,
             **kw
         )
-        # Current workspace, found by request headers or content
+        # Current workspace, found in request path
         self._current_workspace = None  # type: Workspace
 
+        # Candidate workspace found in request body
+        self._candidate_workspace = None  # type: Workspace
+
         # Authenticated user
         self._current_user = None  # type: User
 
@@ -56,7 +60,7 @@ class TracimRequest(Request):
         :return: Workspace of the request
         """
         if self._current_workspace is None:
-            self.current_workspace = self._get_workspace(self.current_user, self)
+            self._current_workspace = self._get_current_workspace(self.current_user, self)
         return self._current_workspace
 
     @current_workspace.setter
@@ -102,6 +106,19 @@ class TracimRequest(Request):
             self.candidate_user = self._get_candidate_user(self)
         return self._candidate_user
 
+    @property
+    def candidate_workspace(self) -> Workspace:
+        """
+        Get workspace from headers/body request. This workspace is not
+        the one found from path. Its the one from json body.
+        """
+        if self._candidate_workspace is None:
+            self._candidate_workspace = self._get_candidate_workspace(
+                self.current_user,
+                self
+            )
+        return self._candidate_workspace
+
     def _cleanup(self, request: 'TracimRequest') -> None:
         """
         Close dbsession at the end of the request in order to avoid exception
@@ -171,7 +188,7 @@ class TracimRequest(Request):
             raise NotAuthenticated('User {} not found'.format(login)) from exc
         return user
 
-    def _get_workspace(
+    def _get_current_workspace(
             self,
             user: User,
             request: 'TracimRequest'
@@ -187,7 +204,39 @@ class TracimRequest(Request):
             if 'workspace_id' in request.matchdict:
                 workspace_id = request.matchdict['workspace_id']
             if not workspace_id:
-                raise WorkspaceNotFound('No workspace_id property found in request')
+                raise WorkspaceNotFoundInTracimRequest('No workspace_id property found in request')
+            wapi = WorkspaceApi(
+                current_user=user,
+                session=request.dbsession,
+                config=request.registry.settings['CFG']
+            )
+            workspace = wapi.get_one(workspace_id)
+        except JSONDecodeError:
+            raise WorkspaceNotFound('Bad json body')
+        except NoResultFound:
+            raise WorkspaceNotFound(
+                'Workspace {} does not exist '
+                'or is not visible for this user'.format(workspace_id)
+            )
+        return workspace
+
+    def _get_candidate_workspace(
+            self,
+            user: User,
+            request: 'TracimRequest'
+    ) -> Workspace:
+        """
+        Get current workspace from request
+        :param user: User who want to check the workspace
+        :param request: pyramid request
+        :return: current workspace
+        """
+        workspace_id = ''
+        try:
+            if 'new_workspace_id' in request.json_body:
+                workspace_id = request.json_body['new_workspace_id']
+            if not workspace_id:
+                raise WorkspaceNotFoundInTracimRequest('No new_workspace_id property found in body')
             wapi = WorkspaceApi(
                 current_user=user,
                 session=request.dbsession,

tracim/models/context_models.py

@@ -17,8 +17,9 @@ class MoveParams(object):
     """
     Json body params for move action
     """
-    def __init__(self, new_parent_id: str):
+    def __init__(self, new_parent_id: str, new_workspace_id: str = None):
         self.new_parent_id = new_parent_id
+        self.new_workspace_id = new_workspace_id
 
 
 class LoginCredentials(object):
@@ -64,10 +65,10 @@ class ContentCreation(object):
     def __init__(
             self,
             label: str,
-            content_type_slug: str,
+            content_type: str,
     ):
         self.label = label
-        self.content_type_slug = content_type_slug
+        self.content_type = content_type
 
 
 class UserInContext(object):
@@ -91,6 +92,10 @@ class UserInContext(object):
         return self.user.user_id
 
     @property
+    def public_name(self) -> str:
+        return self.display_name
+
+    @property
     def display_name(self) -> str:
         return self.user.display_name
 
@@ -108,7 +113,7 @@ class UserInContext(object):
 
     @property
     def profile(self) -> Profile:
-        return self.user.profile
+        return self.user.profile.name
 
     # Context related
 
@@ -226,12 +231,16 @@ class UserRoleWorkspaceInContext(object):
         return self.user_role.role
 
     @property
+    def role(self) -> str:
+        return self.role_slug
+
+    @property
     def role_slug(self) -> str:
         """
         simple name of the role of the user.
         can be anything from UserRoleInWorkspace SLUG, like
         'not_applicable', 'reader',
-        'contributor', 'content_manager', 'workspace_manager'
+        'contributor', 'content-manager', 'workspace-manager'
         :return: user workspace role as slug.
         """
         return UserRoleInWorkspace.SLUG[self.user_role.role]
@@ -272,13 +281,19 @@ class ContentInContext(object):
         self.config = config
 
     # Default
+    @property
+    def content_id(self) -> int:
+        return self.content.content_id
 
     @property
     def id(self) -> int:
-        return self.content.content_id
+        return self.content_id
 
     @property
     def parent_id(self) -> int:
+        """
+        Return parent_id of the content
+        """
         return self.content.parent_id
 
     @property
@@ -290,15 +305,15 @@ class ContentInContext(object):
         return self.content.label
 
     @property
-    def content_type_slug(self) -> str:
+    def content_type(self) -> str:
         return self.content.type
 
     @property
-    def sub_content_type_slug(self) -> typing.List[str]:
+    def sub_content_types(self) -> typing.List[str]:
         return [type.slug for type in self.content.get_allowed_content_types()]
 
     @property
-    def status_slug(self) -> str:
+    def status(self) -> str:
         return self.content.status
 
     @property

tracim/tests/functional/test_session.py

@@ -1,4 +1,5 @@
 # coding=utf-8
+import datetime
 import pytest
 from sqlalchemy.exc import OperationalError
 
@@ -45,12 +46,16 @@ class TestLoginEndpoint(FunctionalTest):
             params=params,
             status=200,
         )
-        assert res.json_body['display_name'] == 'Global manager'
-        assert res.json_body['email'] == 'admin@admin.admin'
         assert res.json_body['created']
+        datetime.datetime.strptime(
+            res.json_body['created'],
+            '%Y-%m-%dT%H:%M:%SZ'
+        )
+        assert res.json_body['public_name'] == 'Global manager'
+        assert res.json_body['email'] == 'admin@admin.admin'
         assert res.json_body['is_active']
         assert res.json_body['profile']
-        assert res.json_body['profile']['slug'] == 'administrators'
+        assert res.json_body['profile'] == 'administrators'
         assert res.json_body['caldav_url'] is None
         assert res.json_body['avatar_url'] is None
 
@@ -103,12 +108,12 @@ class TestWhoamiEndpoint(FunctionalTest):
             )
         )
         res = self.testapp.get('/api/v2/sessions/whoami', status=200)
-        assert res.json_body['display_name'] == 'Global manager'
+        assert res.json_body['public_name'] == 'Global manager'
         assert res.json_body['email'] == 'admin@admin.admin'
         assert res.json_body['created']
         assert res.json_body['is_active']
         assert res.json_body['profile']
-        assert res.json_body['profile']['slug'] == 'administrators'
+        assert res.json_body['profile'] == 'administrators'
         assert res.json_body['caldav_url'] is None
         assert res.json_body['avatar_url'] is None
 

tracim/tests/functional/test_user.py

@@ -28,8 +28,9 @@ class TestUserWorkspaceEndpoint(FunctionalTest):
         res = self.testapp.get('/api/v2/users/1/workspaces', status=200)
         res = res.json_body
         workspace = res[0]
-        assert workspace['id'] == 1
+        assert workspace['workspace_id'] == 1
         assert workspace['label'] == 'Business'
+        assert workspace['slug'] == 'business'
         assert len(workspace['sidebar_entries']) == 7
 
         sidebar_entry = workspace['sidebar_entries'][0]

tracim/tests/functional/test_workspaces.py

@@ -27,7 +27,7 @@ class TestWorkspaceEndpoint(FunctionalTest):
         )
         res = self.testapp.get('/api/v2/workspaces/1', status=200)
         workspace = res.json_body
-        assert workspace['id'] == 1
+        assert workspace['workspace_id'] == 1
         assert workspace['slug'] == 'business'
         assert workspace['label'] == 'Business'
         assert workspace['description'] == 'All importants documents'
@@ -155,10 +155,10 @@ class TestWorkspaceMembersEndpoint(FunctionalTest):
         res = self.testapp.get('/api/v2/workspaces/1/members', status=200).json_body   # nopep8
         assert len(res) == 1
         user_role = res[0]
-        assert user_role['role_slug'] == 'workspace-manager'
+        assert user_role['role'] == 'workspace-manager'
         assert user_role['user_id'] == 1
         assert user_role['workspace_id'] == 1
-        assert user_role['user']['display_name'] == 'Global manager'
+        assert user_role['user']['public_name'] == 'Global manager'
         # TODO - G.M - 24-05-2018 - [Avatar] Replace
         # by correct value when avatar feature will be enabled
         assert user_role['user']['avatar_url'] is None
@@ -239,37 +239,37 @@ class TestWorkspaceContents(FunctionalTest):
         # TODO - G.M - 30-05-2018 - Check this test
         assert len(res) == 3
         content = res[0]
-        assert content['id'] == 1
+        assert content['content_id'] == 1
         assert content['is_archived'] is False
         assert content['is_deleted'] is False
         assert content['label'] == 'Tools'
         assert content['parent_id'] is None
         assert content['show_in_ui'] is True
         assert content['slug'] == 'tools'
-        assert content['status_slug'] == 'open'
-        assert set(content['sub_content_type_slug']) == {'thread', 'page', 'folder', 'file'}  # nopep8
+        assert content['status'] == 'open'
+        assert set(content['sub_content_types']) == {'thread', 'page', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 1
         content = res[1]
-        assert content['id'] == 2
+        assert content['content_id'] == 2
         assert content['is_archived'] is False
         assert content['is_deleted'] is False
         assert content['label'] == 'Menus'
         assert content['parent_id'] is None
         assert content['show_in_ui'] is True
         assert content['slug'] == 'menus'
-        assert content['status_slug'] == 'open'
-        assert set(content['sub_content_type_slug']) == {'thread', 'page', 'folder', 'file'}  # nopep8
+        assert content['status'] == 'open'
+        assert set(content['sub_content_types']) == {'thread', 'page', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 1
         content = res[2]
-        assert content['id'] == 11
+        assert content['content_id'] == 11
         assert content['is_archived'] is False
         assert content['is_deleted'] is False
         assert content['label'] == 'Current Menu'
         assert content['parent_id'] == 2
         assert content['show_in_ui'] is True
         assert content['slug'] == 'current-menu'
-        assert content['status_slug'] == 'open'
-        assert set(content['sub_content_type_slug']) == {'thread', 'page', 'folder', 'file'}  # nopep8
+        assert content['status'] == 'open'
+        assert set(content['sub_content_types']) == {'thread', 'page', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 1
 
     # Root related
@@ -299,42 +299,42 @@ class TestWorkspaceContents(FunctionalTest):
         # TODO - G.M - 30-05-2018 - Check this test
         assert len(res) == 4
         content = res[1]
-        assert content['content_type_slug'] == 'page'
-        assert content['id'] == 15
+        assert content['content_type'] == 'page'
+        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_slug'] == 'open'
-        assert set(content['sub_content_type_slug']) == {'thread', 'page', 'folder', 'file'}  # nopep8
+        assert content['status'] == 'open'
+        assert set(content['sub_content_types']) == {'thread', 'page', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 3
 
         content = res[2]
-        assert content['content_type_slug'] == 'page'
-        assert content['id'] == 16
+        assert content['content_type'] == 'page'
+        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_slug'] == 'open'
-        assert set(content['sub_content_type_slug']) == {'thread', 'page', 'folder', 'file'}  # nopep8
+        assert content['status'] == 'open'
+        assert set(content['sub_content_types']) == {'thread', 'page', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 3
 
         content = res[3]
-        assert content['content_type_slug'] == 'page'
-        assert content['id'] == 17
+        assert content['content_type'] == 'page'
+        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_slug'] == 'open'
-        assert set(content['sub_content_type_slug']) == {'thread', 'page', 'folder', 'file'}  # nopep8
+        assert content['status'] == 'open'
+        assert set(content['sub_content_types']) == {'thread', 'page', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 3
 
     def test_api__get_workspace_content__ok_200__get_only_active_root_content(self):  # nopep8
@@ -362,16 +362,16 @@ class TestWorkspaceContents(FunctionalTest):
         # TODO - G.M - 30-05-2018 - Check this test
         assert len(res) == 2
         content = res[1]
-        assert content['content_type_slug'] == 'page'
-        assert content['id'] == 15
+        assert content['content_type'] == 'page'
+        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_slug'] == 'open'
-        assert set(content['sub_content_type_slug']) == {'thread', 'page', 'folder', 'file'}  # nopep8
+        assert content['status'] == 'open'
+        assert set(content['sub_content_types']) == {'thread', 'page', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 3
 
     def test_api__get_workspace_content__ok_200__get_only_archived_root_content(self):  # nopep8
@@ -398,16 +398,16 @@ class TestWorkspaceContents(FunctionalTest):
         ).json_body   # nopep8
         assert len(res) == 1
         content = res[0]
-        assert content['content_type_slug'] == 'page'
-        assert content['id'] == 16
+        assert content['content_type'] == 'page'
+        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_slug'] == 'open'
-        assert set(content['sub_content_type_slug']) == {'thread', 'page', 'folder', 'file'}  # nopep8
+        assert content['status'] == 'open'
+        assert set(content['sub_content_types']) == {'thread', 'page', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 3
 
     def test_api__get_workspace_content__ok_200__get_only_deleted_root_content(self):  # nopep8
@@ -436,16 +436,16 @@ class TestWorkspaceContents(FunctionalTest):
 
         assert len(res) == 1
         content = res[0]
-        assert content['content_type_slug'] == 'page'
-        assert content['id'] == 17
+        assert content['content_type'] == 'page'
+        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_slug'] == 'open'
-        assert set(content['sub_content_type_slug']) == {'thread', 'page', 'folder', 'file'}  # nopep8
+        assert content['status'] == 'open'
+        assert set(content['sub_content_types']) == {'thread', 'page', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 3
 
     def test_api__get_workspace_content__ok_200__get_nothing_root_content(self):
@@ -500,42 +500,42 @@ class TestWorkspaceContents(FunctionalTest):
         ).json_body   # nopep8
         assert len(res) == 3
         content = res[0]
-        assert content['content_type_slug'] == 'page'
-        assert content['id'] == 12
+        assert content['content_type'] == 'page'
+        assert content['content_id'] == 12
         assert content['is_archived'] is False
         assert content['is_deleted'] is False
         assert content['label'] == 'New Fruit Salad'
         assert content['parent_id'] == 10
         assert content['show_in_ui'] is True
         assert content['slug'] == 'new-fruit-salad'
-        assert content['status_slug'] == 'open'
-        assert set(content['sub_content_type_slug']) == {'thread', 'page', 'folder', 'file'}  # nopep8
+        assert content['status'] == 'open'
+        assert set(content['sub_content_types']) == {'thread', 'page', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 2
 
         content = res[1]
-        assert content['content_type_slug'] == 'page'
-        assert content['id'] == 13
+        assert content['content_type'] == 'page'
+        assert content['content_id'] == 13
         assert content['is_archived'] is True
         assert content['is_deleted'] is False
         assert content['label'].startswith('Fruit Salad')
         assert content['parent_id'] == 10
         assert content['show_in_ui'] is True
         assert content['slug'].startswith('fruit-salad')
-        assert content['status_slug'] == 'open'
-        assert set(content['sub_content_type_slug']) == {'thread', 'page', 'folder', 'file'}  # nopep8
+        assert content['status'] == 'open'
+        assert set(content['sub_content_types']) == {'thread', 'page', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 2
 
         content = res[2]
-        assert content['content_type_slug'] == 'page'
-        assert content['id'] == 14
+        assert content['content_type'] == 'page'
+        assert content['content_id'] == 14
         assert content['is_archived'] is False
         assert content['is_deleted'] is True
         assert content['label'].startswith('Bad Fruit Salad')
         assert content['parent_id'] == 10
         assert content['show_in_ui'] is True
         assert content['slug'].startswith('bad-fruit-salad')
-        assert content['status_slug'] == 'open'
-        assert set(content['sub_content_type_slug']) == {'thread', 'page', 'folder', 'file'}  # nopep8
+        assert content['status'] == 'open'
+        assert set(content['sub_content_types']) == {'thread', 'page', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 2
 
     def test_api__get_workspace_content__ok_200__get_only_active_folder_content(self):  # nopep8
@@ -562,16 +562,16 @@ class TestWorkspaceContents(FunctionalTest):
         ).json_body   # nopep8
         assert len(res) == 1
         content = res[0]
-        assert content['content_type_slug']
-        assert content['id'] == 12
+        assert content['content_type']
+        assert content['content_id'] == 12
         assert content['is_archived'] is False
         assert content['is_deleted'] is False
         assert content['label'] == 'New Fruit Salad'
         assert content['parent_id'] == 10
         assert content['show_in_ui'] is True
         assert content['slug'] == 'new-fruit-salad'
-        assert content['status_slug'] == 'open'
-        assert set(content['sub_content_type_slug']) == {'thread', 'page', 'folder', 'file'}  # nopep8
+        assert content['status'] == 'open'
+        assert set(content['sub_content_types']) == {'thread', 'page', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 2
 
     def test_api__get_workspace_content__ok_200__get_only_archived_folder_content(self):  # nopep8
@@ -598,16 +598,16 @@ class TestWorkspaceContents(FunctionalTest):
         ).json_body   # nopep8
         assert len(res) == 1
         content = res[0]
-        assert content['content_type_slug'] == 'page'
-        assert content['id'] == 13
+        assert content['content_type'] == 'page'
+        assert content['content_id'] == 13
         assert content['is_archived'] is True
         assert content['is_deleted'] is False
         assert content['label'].startswith('Fruit Salad')
         assert content['parent_id'] == 10
         assert content['show_in_ui'] is True
         assert content['slug'].startswith('fruit-salad')
-        assert content['status_slug'] == 'open'
-        assert set(content['sub_content_type_slug']) == {'thread', 'page', 'folder', 'file'}  # nopep8
+        assert content['status'] == 'open'
+        assert set(content['sub_content_types']) == {'thread', 'page', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 2
 
     def test_api__get_workspace_content__ok_200__get_only_deleted_folder_content(self):  # nopep8
@@ -635,16 +635,16 @@ class TestWorkspaceContents(FunctionalTest):
 
         assert len(res) == 1
         content = res[0]
-        assert content['content_type_slug'] == 'page'
-        assert content['id'] == 14
+        assert content['content_type'] == 'page'
+        assert content['content_id'] == 14
         assert content['is_archived'] is False
         assert content['is_deleted'] is True
         assert content['label'].startswith('Bad Fruit Salad')
         assert content['parent_id'] == 10
         assert content['show_in_ui'] is True
         assert content['slug'].startswith('bad-fruit-salad')
-        assert content['status_slug'] == 'open'
-        assert set(content['sub_content_type_slug']) == {'thread', 'page', 'folder', 'file'}  # nopep8
+        assert content['status'] == 'open'
+        assert set(content['sub_content_types']) == {'thread', 'page', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 2
 
     def test_api__get_workspace_content__ok_200__get_nothing_folder_content(self):  # nopep8
@@ -741,7 +741,7 @@ class TestWorkspaceContents(FunctionalTest):
         )
         params = {
             'label': 'GenericCreatedContent',
-            'content_type_slug': 'markdownpage',
+            'content_type': 'markdownpage',
         }
         res = self.testapp.post_json(
             '/api/v2/workspaces/1/contents',
@@ -750,16 +750,16 @@ class TestWorkspaceContents(FunctionalTest):
         )
         assert res
         assert res.json_body
-        assert res.json_body['status_slug'] == 'open'
-        assert res.json_body['id']
-        assert res.json_body['content_type_slug'] == 'markdownpage'
+        assert res.json_body['status'] == 'open'
+        assert res.json_body['content_id']
+        assert res.json_body['content_type'] == 'markdownpage'
         assert res.json_body['is_archived'] is False
         assert res.json_body['is_deleted'] is False
         assert res.json_body['workspace_id'] == 1
         assert res.json_body['slug'] == 'genericcreatedcontent'
         assert res.json_body['parent_id'] is None
         assert res.json_body['show_in_ui'] is True
-        assert res.json_body['sub_content_type_slug']
+        assert res.json_body['sub_content_types']
         params_active = {
             'parent_id': 0,
             'show_archived': 0,
@@ -786,6 +786,7 @@ class TestWorkspaceContents(FunctionalTest):
         )
         params = {
             'new_parent_id': '4',  # Salads
+            'new_workspace_id': '2',
         }
         params_folder1 = {
             'parent_id': 3,
@@ -801,8 +802,8 @@ class TestWorkspaceContents(FunctionalTest):
         }
         folder1_contents = self.testapp.get('/api/v2/workspaces/2/contents', params=params_folder1, status=200).json_body  # nopep8
         folder2_contents = self.testapp.get('/api/v2/workspaces/2/contents', params=params_folder2, status=200).json_body  # nopep8
-        assert [content for content in folder1_contents if content['id'] == 8]  # nopep8
-        assert not [content for content in folder2_contents if content['id'] == 8]  # nopep8
+        assert [content for content in folder1_contents if content['content_id'] == 8]  # nopep8
+        assert not [content for content in folder2_contents if content['content_id'] == 8]  # nopep8
         # TODO - G.M - 2018-06-163 - Check content
         res = self.testapp.put_json(
             '/api/v2/workspaces/2/contents/8/move',
@@ -811,8 +812,245 @@ class TestWorkspaceContents(FunctionalTest):
         )
         new_folder1_contents = self.testapp.get('/api/v2/workspaces/2/contents', params=params_folder1, status=200).json_body  # nopep8
         new_folder2_contents = self.testapp.get('/api/v2/workspaces/2/contents', params=params_folder2, status=200).json_body  # nopep8
-        assert not [content for content in new_folder1_contents if content['id'] == 8]  # nopep8
-        assert [content for content in new_folder2_contents if content['id'] == 8]  # nopep8
+        assert not [content for content in new_folder1_contents if content['content_id'] == 8]  # nopep8
+        assert [content for content in new_folder2_contents if content['content_id'] == 8]  # nopep8
+        assert res.json_body
+        assert res.json_body['parent_id'] == 4
+        assert res.json_body['content_id'] == 8
+        assert res.json_body['workspace_id'] == 2
+
+    def test_api_put_move_content__ok_200__to_root(self):
+        """
+        Move content
+        move Apple_Pie (content_id: 8)
+        from Desserts folder(content_id: 3) to root (content_id: 0)
+        of workspace Recipes.
+        """
+        self.testapp.authorization = (
+            'Basic',
+            (
+                'admin@admin.admin',
+                'admin@admin.admin'
+            )
+        )
+        params = {
+            'new_parent_id': None,  # root
+            'new_workspace_id': 2,
+        }
+        params_folder1 = {
+            'parent_id': 3,
+            'show_archived': 0,
+            'show_deleted': 0,
+            'show_active': 1,
+        }
+        params_folder2 = {
+            'parent_id': 0,
+            'show_archived': 0,
+            'show_deleted': 0,
+            'show_active': 1,
+        }
+        folder1_contents = self.testapp.get('/api/v2/workspaces/2/contents', params=params_folder1, status=200).json_body  # nopep8
+        folder2_contents = self.testapp.get('/api/v2/workspaces/2/contents', params=params_folder2, status=200).json_body  # nopep8
+        assert [content for content in folder1_contents if content['content_id'] == 8]  # nopep8
+        assert not [content for content in folder2_contents if content['content_id'] == 8]  # nopep8
+        # TODO - G.M - 2018-06-163 - Check content
+        res = self.testapp.put_json(
+            '/api/v2/workspaces/2/contents/8/move',
+            params=params,
+            status=200
+        )
+        new_folder1_contents = self.testapp.get('/api/v2/workspaces/2/contents', params=params_folder1, status=200).json_body  # nopep8
+        new_folder2_contents = self.testapp.get('/api/v2/workspaces/2/contents', params=params_folder2, status=200).json_body  # nopep8
+        assert not [content for content in new_folder1_contents if content['content_id'] == 8]  # nopep8
+        assert [content for content in new_folder2_contents if content['content_id'] == 8]  # nopep8
+        assert res.json_body
+        assert res.json_body['parent_id'] is None
+        assert res.json_body['content_id'] == 8
+        assert res.json_body['workspace_id'] == 2
+
+    def test_api_put_move_content__ok_200__with_workspace_id(self):
+        """
+        Move content
+        move Apple_Pie (content_id: 8)
+        from Desserts folder(content_id: 3) to Salads subfolder (content_id: 4)
+        of workspace Recipes.
+        """
+        self.testapp.authorization = (
+            'Basic',
+            (
+                'admin@admin.admin',
+                'admin@admin.admin'
+            )
+        )
+        params = {
+            'new_parent_id': '4',  # Salads
+            'new_workspace_id': '2',
+        }
+        params_folder1 = {
+            'parent_id': 3,
+            'show_archived': 0,
+            'show_deleted': 0,
+            'show_active': 1,
+        }
+        params_folder2 = {
+            'parent_id': 4,
+            'show_archived': 0,
+            'show_deleted': 0,
+            'show_active': 1,
+        }
+        folder1_contents = self.testapp.get('/api/v2/workspaces/2/contents', params=params_folder1, status=200).json_body  # nopep8
+        folder2_contents = self.testapp.get('/api/v2/workspaces/2/contents', params=params_folder2, status=200).json_body  # nopep8
+        assert [content for content in folder1_contents if content['content_id'] == 8]  # nopep8
+        assert not [content for content in folder2_contents if content['content_id'] == 8]  # nopep8
+        # TODO - G.M - 2018-06-163 - Check content
+        res = self.testapp.put_json(
+            '/api/v2/workspaces/2/contents/8/move',
+            params=params,
+            status=200
+        )
+        new_folder1_contents = self.testapp.get('/api/v2/workspaces/2/contents', params=params_folder1, status=200).json_body  # nopep8
+        new_folder2_contents = self.testapp.get('/api/v2/workspaces/2/contents', params=params_folder2, status=200).json_body  # nopep8
+        assert not [content for content in new_folder1_contents if content['content_id'] == 8]  # nopep8
+        assert [content for content in new_folder2_contents if content['content_id'] == 8]  # nopep8
+        assert res.json_body
+        assert res.json_body['parent_id'] == 4
+        assert res.json_body['content_id'] == 8
+        assert res.json_body['workspace_id'] == 2
+
+    def test_api_put_move_content__ok_200__to_another_workspace(self):
+        """
+        Move content
+        move Apple_Pie (content_id: 8)
+        from Desserts folder(content_id: 3) to Menus subfolder (content_id: 2)
+        of workspace Business.
+        """
+        self.testapp.authorization = (
+            'Basic',
+            (
+                'admin@admin.admin',
+                'admin@admin.admin'
+            )
+        )
+        params = {
+            'new_parent_id': '2',  # Menus
+            'new_workspace_id': '1',
+        }
+        params_folder1 = {
+            'parent_id': 3,
+            'show_archived': 0,
+            'show_deleted': 0,
+            'show_active': 1,
+        }
+        params_folder2 = {
+            'parent_id': 2,
+            'show_archived': 0,
+            'show_deleted': 0,
+            'show_active': 1,
+        }
+        folder1_contents = self.testapp.get('/api/v2/workspaces/2/contents', params=params_folder1, status=200).json_body  # nopep8
+        folder2_contents = self.testapp.get('/api/v2/workspaces/1/contents', params=params_folder2, status=200).json_body  # nopep8
+        assert [content for content in folder1_contents if content['content_id'] == 8]  # nopep8
+        assert not [content for content in folder2_contents if content['content_id'] == 8]  # nopep8
+        # TODO - G.M - 2018-06-163 - Check content
+        res = self.testapp.put_json(
+            '/api/v2/workspaces/2/contents/8/move',
+            params=params,
+            status=200
+        )
+        new_folder1_contents = self.testapp.get('/api/v2/workspaces/2/contents', params=params_folder1, status=200).json_body  # nopep8
+        new_folder2_contents = self.testapp.get('/api/v2/workspaces/1/contents', params=params_folder2, status=200).json_body  # nopep8
+        assert not [content for content in new_folder1_contents if content['content_id'] == 8]  # nopep8
+        assert [content for content in new_folder2_contents if content['content_id'] == 8]  # nopep8
+        assert res.json_body
+        assert res.json_body['parent_id'] == 2
+        assert res.json_body['content_id'] == 8
+        assert res.json_body['workspace_id'] == 1
+
+    def test_api_put_move_content__ok_200__to_another_workspace_root(self):
+        """
+        Move content
+        move Apple_Pie (content_id: 8)
+        from Desserts folder(content_id: 3) to root (content_id: 0)
+        of workspace Business.
+        """
+        self.testapp.authorization = (
+            'Basic',
+            (
+                'admin@admin.admin',
+                'admin@admin.admin'
+            )
+        )
+        params = {
+            'new_parent_id': None,  # root
+            'new_workspace_id': '1',
+        }
+        params_folder1 = {
+            'parent_id': 3,
+            'show_archived': 0,
+            'show_deleted': 0,
+            'show_active': 1,
+        }
+        params_folder2 = {
+            'parent_id': 0,
+            'show_archived': 0,
+            'show_deleted': 0,
+            'show_active': 1,
+        }
+        folder1_contents = self.testapp.get('/api/v2/workspaces/2/contents', params=params_folder1, status=200).json_body  # nopep8
+        folder2_contents = self.testapp.get('/api/v2/workspaces/1/contents', params=params_folder2, status=200).json_body  # nopep8
+        assert [content for content in folder1_contents if content['content_id'] == 8]  # nopep8
+        assert not [content for content in folder2_contents if content['content_id'] == 8]  # nopep8
+        # TODO - G.M - 2018-06-163 - Check content
+        res = self.testapp.put_json(
+            '/api/v2/workspaces/2/contents/8/move',
+            params=params,
+            status=200
+        )
+        new_folder1_contents = self.testapp.get('/api/v2/workspaces/2/contents', params=params_folder1, status=200).json_body  # nopep8
+        new_folder2_contents = self.testapp.get('/api/v2/workspaces/1/contents', params=params_folder2, status=200).json_body  # nopep8
+        assert not [content for content in new_folder1_contents if content['content_id'] == 8]  # nopep8
+        assert [content for content in new_folder2_contents if content['content_id'] == 8]  # nopep8
+        assert res.json_body
+        assert res.json_body['parent_id'] is None
+        assert res.json_body['content_id'] == 8
+        assert res.json_body['workspace_id'] == 1
+
+    def test_api_put_move_content__err_400__wrong_workspace_id(self):
+        """
+        Move content
+        move Apple_Pie (content_id: 8)
+        from Desserts folder(content_id: 3) to Salads subfolder (content_id: 4)
+        of workspace Recipes.
+        Workspace_id of parent_id don't match with workspace_id of workspace
+        """
+        self.testapp.authorization = (
+            'Basic',
+            (
+                'admin@admin.admin',
+                'admin@admin.admin'
+            )
+        )
+        params = {
+            'new_parent_id': '4',  # Salads
+            'new_workspace_id': '1',
+        }
+        params_folder1 = {
+            'parent_id': 3,
+            'show_archived': 0,
+            'show_deleted': 0,
+            'show_active': 1,
+        }
+        params_folder2 = {
+            'parent_id': 4,
+            'show_archived': 0,
+            'show_deleted': 0,
+            'show_active': 1,
+        }
+        res = self.testapp.put_json(
+            '/api/v2/workspaces/2/contents/8/move',
+            params=params,
+            status=400,
+        )
 
     def test_api_put_delete_content__ok_200__nominal_case(self):
         """
@@ -840,18 +1078,18 @@ class TestWorkspaceContents(FunctionalTest):
         }
         active_contents = self.testapp.get('/api/v2/workspaces/2/contents', params=params_active, status=200).json_body  # nopep8
         deleted_contents = self.testapp.get('/api/v2/workspaces/2/contents', params=params_deleted, status=200).json_body  # nopep8
-        assert [content for content in active_contents if content['id'] == 8]  # nopep8
-        assert not [content for content in deleted_contents if content['id'] == 8]  # nopep8
+        assert [content for content in active_contents if content['content_id'] == 8]  # nopep8
+        assert not [content for content in deleted_contents if content['content_id'] == 8]  # nopep8
         # TODO - G.M - 2018-06-163 - Check content
         res = self.testapp.put_json(
             # INFO - G.M - 2018-06-163 - delete Apple_Pie
             '/api/v2/workspaces/2/contents/8/delete',
-            status=200
+            status=204
         )
         new_active_contents = self.testapp.get('/api/v2/workspaces/2/contents', params=params_active, status=200).json_body  # nopep8
         new_deleted_contents = self.testapp.get('/api/v2/workspaces/2/contents', params=params_deleted, status=200).json_body  # nopep8
-        assert not [content for content in new_active_contents if content['id'] == 8]  # nopep8
-        assert [content for content in new_deleted_contents if content['id'] == 8]  # nopep8
+        assert not [content for content in new_active_contents if content['content_id'] == 8]  # nopep8
+        assert [content for content in new_deleted_contents if content['content_id'] == 8]  # nopep8
 
     def test_api_put_archive_content__ok_200__nominal_case(self):
         """
@@ -879,16 +1117,16 @@ class TestWorkspaceContents(FunctionalTest):
         }
         active_contents = self.testapp.get('/api/v2/workspaces/2/contents', params=params_active, status=200).json_body  # nopep8
         archived_contents = self.testapp.get('/api/v2/workspaces/2/contents', params=params_archived, status=200).json_body  # nopep8
-        assert [content for content in active_contents if content['id'] == 8]  # nopep8
-        assert not [content for content in archived_contents if content['id'] == 8]  # nopep8
+        assert [content for content in active_contents if content['content_id'] == 8]  # nopep8
+        assert not [content for content in archived_contents if content['content_id'] == 8]  # nopep8
         res = self.testapp.put_json(
             '/api/v2/workspaces/2/contents/8/archive',
-            status=200
+            status=204
         )
         new_active_contents = self.testapp.get('/api/v2/workspaces/2/contents', params=params_active, status=200).json_body  # nopep8
         new_archived_contents = self.testapp.get('/api/v2/workspaces/2/contents', params=params_archived, status=200).json_body  # nopep8
-        assert not [content for content in new_active_contents if content['id'] == 8]  # nopep8
-        assert [content for content in new_archived_contents if content['id'] == 8]  # nopep8
+        assert not [content for content in new_active_contents if content['content_id'] == 8]  # nopep8
+        assert [content for content in new_archived_contents if content['content_id'] == 8]  # nopep8
 
     def test_api_put_undelete_content__ok_200__nominal_case(self):
         """
@@ -916,16 +1154,16 @@ class TestWorkspaceContents(FunctionalTest):
         }
         active_contents = self.testapp.get('/api/v2/workspaces/2/contents', params=params_active, status=200).json_body  # nopep8
         deleted_contents = self.testapp.get('/api/v2/workspaces/2/contents', params=params_deleted, status=200).json_body  # nopep8
-        assert not [content for content in active_contents if content['id'] == 14]  # nopep8
-        assert [content for content in deleted_contents if content['id'] == 14]  # nopep8
+        assert not [content for content in active_contents if content['content_id'] == 14]  # nopep8
+        assert [content for content in deleted_contents if content['content_id'] == 14]  # nopep8
         res = self.testapp.put_json(
             '/api/v2/workspaces/2/contents/14/undelete',
-            status=200
+            status=204
         )
         new_active_contents = self.testapp.get('/api/v2/workspaces/2/contents', params=params_active, status=200).json_body  # nopep8
         new_deleted_contents = self.testapp.get('/api/v2/workspaces/2/contents', params=params_deleted, status=200).json_body  # nopep8
-        assert [content for content in new_active_contents if content['id'] == 14]  # nopep8
-        assert not [content for content in new_deleted_contents if content['id'] == 14]  # nopep8
+        assert [content for content in new_active_contents if content['content_id'] == 14]  # nopep8
+        assert not [content for content in new_deleted_contents if content['content_id'] == 14]  # nopep8
 
     def test_api_put_unarchive_content__ok_200__nominal_case(self):
         """
@@ -953,13 +1191,13 @@ class TestWorkspaceContents(FunctionalTest):
         }
         active_contents = self.testapp.get('/api/v2/workspaces/2/contents', params=params_active, status=200).json_body  # nopep8
         archived_contents = self.testapp.get('/api/v2/workspaces/2/contents', params=params_archived, status=200).json_body  # nopep8
-        assert not [content for content in active_contents if content['id'] == 13]  # nopep8
-        assert [content for content in archived_contents if content['id'] == 13]  # nopep8
+        assert not [content for content in active_contents if content['content_id'] == 13]  # nopep8
+        assert [content for content in archived_contents if content['content_id'] == 13]  # nopep8
         res = self.testapp.put_json(
             '/api/v2/workspaces/2/contents/13/unarchive',
-            status=200
+            status=204
         )
         new_active_contents = self.testapp.get('/api/v2/workspaces/2/contents', params=params_active, status=200).json_body  # nopep8
         new_archived_contents = self.testapp.get('/api/v2/workspaces/2/contents', params=params_archived, status=200).json_body  # nopep8
-        assert [content for content in new_active_contents if content['id'] == 13]  # nopep8
-        assert not [content for content in new_archived_contents if content['id'] == 13]  # nopep8
+        assert [content for content in new_active_contents if content['content_id'] == 13]  # nopep8
+        assert not [content for content in new_archived_contents if content['content_id'] == 13]  # nopep8

tracim/tests/library/test_user_api.py

@@ -131,7 +131,7 @@ class TestUserApi(DefaultTest):
         new_user = api.get_user_with_context(user)
         assert isinstance(new_user, UserInContext)
         assert new_user.user == user
-        assert new_user.profile.name == 'nobody'
+        assert new_user.profile == 'nobody'
         assert new_user.user_id == user.user_id
         assert new_user.email == 'admin@tracim.tracim'
         assert new_user.display_name == 'Admin'

tracim/views/core_api/schemas.py

@@ -16,17 +16,6 @@ from tracim.models.context_models import LoginCredentials
 from tracim.models.data import UserRoleInWorkspace
 
 
-class ProfileSchema(marshmallow.Schema):
-    slug = marshmallow.fields.String(
-        attribute='name',
-        validate=OneOf(Profile._NAME),
-        example='managers',
-    )
-
-    class Meta:
-        description = 'User Profile, give user right on whole Tracim instance.'
-
-
 class UserSchema(marshmallow.Schema):
 
     user_id = marshmallow.fields.Int(dump_only=True, example=3)
@@ -34,12 +23,12 @@ class UserSchema(marshmallow.Schema):
         required=True,
         example='suri.cate@algoo.fr'
     )
-    display_name = marshmallow.fields.String(
+    public_name = marshmallow.fields.String(
         example='Suri Cate',
     )
     created = marshmallow.fields.DateTime(
-        format='iso8601',
-        description='User account creation date (iso8601 format).',
+        format='%Y-%m-%dT%H:%M:%SZ',
+        description='User account creation date',
     )
     is_active = marshmallow.fields.Bool(
         example=True,
@@ -64,9 +53,10 @@ class UserSchema(marshmallow.Schema):
                     "If no avatar, then set it to null "
                     "(and frontend will interpret this with a default avatar)",
     )
-    profile = marshmallow.fields.Nested(
-        ProfileSchema,
-        many=False,
+    profile = marshmallow.fields.String(
+        attribute='profile',
+        validate=OneOf(Profile._NAME),
+        example='managers',
     )
 
     class Meta:
@@ -95,9 +85,9 @@ class WorkspaceAndContentIdPathSchema(WorkspaceIdPathSchema, ContentIdPathSchema
 
 
 class FilterContentQuerySchema(marshmallow.Schema):
-    parent_id = workspace_id = marshmallow.fields.Int(
+    parent_id = marshmallow.fields.Int(
         example=2,
-        default=None,
+        default=0,
         description='allow to filter items in a folder.'
                     ' If not set, then return all contents.'
                     ' If set to 0, then return root contents.'
@@ -187,7 +177,8 @@ class WorkspaceMenuEntrySchema(marshmallow.Schema):
 
 
 class WorkspaceDigestSchema(marshmallow.Schema):
-    id = marshmallow.fields.Int(example=4)
+    workspace_id = marshmallow.fields.Int(example=4)
+    slug = marshmallow.fields.String(example='intranet')
     label = marshmallow.fields.String(example='Intranet')
     sidebar_entries = marshmallow.fields.Nested(
         WorkspaceMenuEntrySchema,
@@ -199,7 +190,6 @@ class WorkspaceDigestSchema(marshmallow.Schema):
 
 
 class WorkspaceSchema(WorkspaceDigestSchema):
-    slug = marshmallow.fields.String(example='intranet')
     description = marshmallow.fields.String(example='All intranet data.')
 
     class Meta:
@@ -207,14 +197,14 @@ class WorkspaceSchema(WorkspaceDigestSchema):
 
 
 class WorkspaceMemberSchema(marshmallow.Schema):
-    role_slug = marshmallow.fields.String(
+    role = marshmallow.fields.String(
         example='contributor',
         validate=OneOf(UserRoleInWorkspace.get_all_role_slug())
     )
     user_id = marshmallow.fields.Int(example=3)
     workspace_id = marshmallow.fields.Int(example=4)
     user = marshmallow.fields.Nested(
-        UserSchema(only=('display_name', 'avatar_url'))
+        UserSchema(only=('public_name', 'avatar_url'))
     )
 
     class Meta:
@@ -256,7 +246,7 @@ class StatusSchema(marshmallow.Schema):
                     'Statuses are open, closed-validated, closed-invalidated, closed-deprecated'  # nopep8
     )
     global_status = marshmallow.fields.String(
-        example='Open',
+        example='open',
         description='global_status: open, closed',
         validate=OneOf([status.value for status in GlobalStatus]),
     )
@@ -298,7 +288,14 @@ class ContentMoveSchema(marshmallow.Schema):
     # (the user must be content manager of both workspaces)
     new_parent_id = marshmallow.fields.Int(
         example=42,
-        description='id of the new parent content id.'
+        description='id of the new parent content id.',
+        allow_none=True,
+        required=True,
+    )
+    new_workspace_id = marshmallow.fields.Int(
+        example=2,
+        description='id of the new workspace id.',
+        required=True
     )
 
     @post_load
@@ -311,7 +308,7 @@ class ContentCreationSchema(marshmallow.Schema):
         example='contract for client XXX',
         description='Title of the content to create'
     )
-    content_type_slug = marshmallow.fields.String(
+    content_type = marshmallow.fields.String(
         example='htmlpage',
         validate=OneOf([content.slug for content in CONTENT_DEFAULT_TYPE]),
     )
@@ -322,7 +319,7 @@ class ContentCreationSchema(marshmallow.Schema):
 
 
 class ContentDigestSchema(marshmallow.Schema):
-    id = marshmallow.fields.Int(example=6)
+    content_id = marshmallow.fields.Int(example=6)
     slug = marshmallow.fields.Str(example='intervention-report-12')
     parent_id = marshmallow.fields.Int(
         example=34,
@@ -333,17 +330,17 @@ class ContentDigestSchema(marshmallow.Schema):
         example=19,
     )
     label = marshmallow.fields.Str(example='Intervention Report 12')
-    content_type_slug = marshmallow.fields.Str(
+    content_type = marshmallow.fields.Str(
         example='htmlpage',
         validate=OneOf([content.slug for content in CONTENT_DEFAULT_TYPE]),
     )
-    sub_content_type_slug = marshmallow.fields.List(
+    sub_content_types = marshmallow.fields.List(
         marshmallow.fields.Str,
         description='list of content types allowed as sub contents. '
                     'This field is required for folder contents, '
                     'set it to empty list in other cases'
     )
-    status_slug = marshmallow.fields.Str(
+    status = marshmallow.fields.Str(
         example='closed-deprecated',
         validate=OneOf([status.slug for status in CONTENT_DEFAULT_STATUS]),
         description='this slug is found in content_type available statuses',

tracim/views/core_api/session_controller.py

@@ -16,10 +16,12 @@ from tracim.views.core_api.schemas import BasicAuthSchema
 from tracim.exceptions import NotAuthenticated
 from tracim.exceptions import AuthenticationFailed
 
+SESSION_ENDPOINTS_TAG = 'Session'
+
 
 class SessionController(Controller):
 
-    @hapic.with_api_doc()
+    @hapic.with_api_doc(tags=[SESSION_ENDPOINTS_TAG])
     @hapic.input_headers(LoginOutputHeaders())
     @hapic.input_body(BasicAuthSchema())
     @hapic.handle_exception(AuthenticationFailed, HTTPStatus.BAD_REQUEST)
@@ -42,7 +44,7 @@ class SessionController(Controller):
         user = uapi.authenticate_user(login.email, login.password)
         return uapi.get_user_with_context(user)
 
-    @hapic.with_api_doc()
+    @hapic.with_api_doc(tags=[SESSION_ENDPOINTS_TAG])
     @hapic.output_body(NoContentSchema(), default_http_code=HTTPStatus.NO_CONTENT)  # nopep8
     def logout(self, context, request: TracimRequest, hapic_data=None):
         """
@@ -51,7 +53,7 @@ class SessionController(Controller):
 
         return
 
-    @hapic.with_api_doc()
+    @hapic.with_api_doc(tags=[SESSION_ENDPOINTS_TAG])
     @hapic.handle_exception(NotAuthenticated, HTTPStatus.UNAUTHORIZED)
     @hapic.output_body(UserSchema(),)
     def whoami(self, context, request: TracimRequest, hapic_data=None):

tracim/views/core_api/system_controller.py

@@ -18,10 +18,11 @@ from tracim.views.controllers import Controller
 from tracim.views.core_api.schemas import ApplicationSchema
 from tracim.views.core_api.schemas import ContentTypeSchema
 
+SYSTEM_ENDPOINTS_TAG = 'System'
 
 class SystemController(Controller):
 
-    @hapic.with_api_doc()
+    @hapic.with_api_doc(tags=[SYSTEM_ENDPOINTS_TAG])
     @hapic.handle_exception(NotAuthenticated, HTTPStatus.UNAUTHORIZED)
     @hapic.handle_exception(InsufficientUserProfile, HTTPStatus.FORBIDDEN)
     @require_profile(Group.TIM_USER)
@@ -32,7 +33,7 @@ class SystemController(Controller):
         """
         return applications
 
-    @hapic.with_api_doc()
+    @hapic.with_api_doc(tags=[SYSTEM_ENDPOINTS_TAG])
     @hapic.handle_exception(NotAuthenticated, HTTPStatus.UNAUTHORIZED)
     @hapic.handle_exception(InsufficientUserProfile, HTTPStatus.FORBIDDEN)
     @require_profile(Group.TIM_USER)

tracim/views/core_api/user_controller.py

@@ -20,10 +20,12 @@ from tracim.views.controllers import Controller
 from tracim.views.core_api.schemas import UserIdPathSchema
 from tracim.views.core_api.schemas import WorkspaceDigestSchema
 
+USER_ENDPOINTS_TAG = 'Users'
+
 
 class UserController(Controller):
 
-    @hapic.with_api_doc()
+    @hapic.with_api_doc(tags=[USER_ENDPOINTS_TAG])
     @hapic.handle_exception(NotAuthenticated, HTTPStatus.UNAUTHORIZED)
     @hapic.handle_exception(InsufficientUserProfile, HTTPStatus.FORBIDDEN)
     @hapic.handle_exception(UserDoesNotExist, HTTPStatus.NOT_FOUND)

tracim/views/core_api/workspace_controller.py

@@ -1,5 +1,4 @@
 import typing
-
 import transaction
 from pyramid.config import Configurator
 try:  # Python 3.5+
@@ -7,15 +6,20 @@ try:  # Python 3.5+
 except ImportError:
     from http import client as HTTPStatus
 
-from tracim import hapic, TracimRequest
+from tracim import hapic
+from tracim import TracimRequest
 from tracim.lib.core.workspace import WorkspaceApi
 from tracim.lib.core.content import ContentApi
 from tracim.lib.core.userworkspace import RoleApi
-from tracim.lib.utils.authorization import require_workspace_role
-from tracim.models.data import UserRoleInWorkspace, ActionDescription
+from tracim.lib.utils.authorization import require_workspace_role, \
+    require_candidate_workspace_role
+from tracim.models.data import UserRoleInWorkspace
+from tracim.models.data import ActionDescription
 from tracim.models.context_models import UserRoleWorkspaceInContext
 from tracim.models.context_models import ContentInContext
-from tracim.exceptions import NotAuthenticated
+from tracim.exceptions import NotAuthenticated, InsufficientUserWorkspaceRole
+from tracim.exceptions import WorkspaceNotFoundInTracimRequest
+from tracim.exceptions import WorkspacesDoNotMatch
 from tracim.exceptions import InsufficientUserProfile
 from tracim.exceptions import WorkspaceNotFound
 from tracim.views.controllers import Controller
@@ -31,10 +35,12 @@ from tracim.views.core_api.schemas import WorkspaceMemberSchema
 from tracim.models.contents import ContentTypeLegacy as ContentType
 from tracim.models.revision_protection import new_revision
 
+WORKSPACE_ENDPOINTS_TAG = 'Workspaces'
+
 
 class WorkspaceController(Controller):
 
-    @hapic.with_api_doc()
+    @hapic.with_api_doc(tags=[WORKSPACE_ENDPOINTS_TAG])
     @hapic.handle_exception(NotAuthenticated, HTTPStatus.UNAUTHORIZED)
     @hapic.handle_exception(InsufficientUserProfile, HTTPStatus.FORBIDDEN)
     @hapic.handle_exception(WorkspaceNotFound, HTTPStatus.FORBIDDEN)
@@ -54,7 +60,7 @@ class WorkspaceController(Controller):
         )
         return wapi.get_workspace_with_context(request.current_workspace)
 
-    @hapic.with_api_doc()
+    @hapic.with_api_doc(tags=[WORKSPACE_ENDPOINTS_TAG])
     @hapic.handle_exception(NotAuthenticated, HTTPStatus.UNAUTHORIZED)
     @hapic.handle_exception(InsufficientUserProfile, HTTPStatus.FORBIDDEN)
     @hapic.handle_exception(WorkspaceNotFound, HTTPStatus.FORBIDDEN)
@@ -83,7 +89,7 @@ class WorkspaceController(Controller):
             for user_role in roles
         ]
 
-    @hapic.with_api_doc()
+    @hapic.with_api_doc(tags=[WORKSPACE_ENDPOINTS_TAG])
     @hapic.handle_exception(NotAuthenticated, HTTPStatus.UNAUTHORIZED)
     @hapic.handle_exception(InsufficientUserProfile, HTTPStatus.FORBIDDEN)
     @hapic.handle_exception(WorkspaceNotFound, HTTPStatus.FORBIDDEN)
@@ -119,7 +125,7 @@ class WorkspaceController(Controller):
         ]
         return contents
 
-    @hapic.with_api_doc()
+    @hapic.with_api_doc(tags=[WORKSPACE_ENDPOINTS_TAG])
     @hapic.handle_exception(NotAuthenticated, HTTPStatus.UNAUTHORIZED)
     @hapic.handle_exception(InsufficientUserProfile, HTTPStatus.FORBIDDEN)
     @hapic.handle_exception(WorkspaceNotFound, HTTPStatus.FORBIDDEN)
@@ -145,21 +151,24 @@ class WorkspaceController(Controller):
         )
         content = api.create(
             label=creation_data.label,
-            content_type=creation_data.content_type_slug,
+            content_type=creation_data.content_type,
             workspace=request.current_workspace,
         )
         api.save(content, ActionDescription.CREATION)
         content = api.get_content_in_context(content)
         return content
 
-    @hapic.with_api_doc()
+    @hapic.with_api_doc(tags=[WORKSPACE_ENDPOINTS_TAG])
     @hapic.handle_exception(NotAuthenticated, HTTPStatus.UNAUTHORIZED)
     @hapic.handle_exception(InsufficientUserProfile, HTTPStatus.FORBIDDEN)
     @hapic.handle_exception(WorkspaceNotFound, HTTPStatus.FORBIDDEN)
+    @hapic.handle_exception(InsufficientUserWorkspaceRole, HTTPStatus.FORBIDDEN)
+    @hapic.handle_exception(WorkspacesDoNotMatch, HTTPStatus.BAD_REQUEST)
     @require_workspace_role(UserRoleInWorkspace.CONTRIBUTOR)
+    @require_candidate_workspace_role(UserRoleInWorkspace.CONTRIBUTOR)
     @hapic.input_path(WorkspaceAndContentIdPathSchema())
     @hapic.input_body(ContentMoveSchema())
-    @hapic.output_body(NoContentSchema())
+    @hapic.output_body(ContentDigestSchema())
     def move_content(
             self,
             context,
@@ -172,6 +181,7 @@ class WorkspaceController(Controller):
         app_config = request.registry.settings['CFG']
         path_data = hapic_data.path
         move_data = hapic_data.body
+
         api = ContentApi(
             current_user=request.current_user,
             session=request.dbsession,
@@ -184,21 +194,33 @@ class WorkspaceController(Controller):
         new_parent = api.get_one(
             move_data.new_parent_id, content_type=ContentType.Any
         )
+
+        new_workspace = request.candidate_workspace
+
         with new_revision(
                 session=request.dbsession,
                 tm=transaction.manager,
                 content=content
         ):
-            api.move(content, new_parent=new_parent)
-        return
+            api.move(
+                content,
+                new_parent=new_parent,
+                new_workspace=new_workspace,
+                must_stay_in_same_workspace=False,
+            )
+        updated_content = api.get_one(
+            path_data.content_id,
+            content_type=ContentType.Any
+        )
+        return api.get_content_in_context(updated_content)
 
-    @hapic.with_api_doc()
+    @hapic.with_api_doc(tags=[WORKSPACE_ENDPOINTS_TAG])
     @hapic.handle_exception(NotAuthenticated, HTTPStatus.UNAUTHORIZED)
     @hapic.handle_exception(InsufficientUserProfile, HTTPStatus.FORBIDDEN)
     @hapic.handle_exception(WorkspaceNotFound, HTTPStatus.FORBIDDEN)
     @require_workspace_role(UserRoleInWorkspace.CONTRIBUTOR)
     @hapic.input_path(WorkspaceAndContentIdPathSchema())
-    @hapic.output_body(NoContentSchema())
+    @hapic.output_body(NoContentSchema(), default_http_code=HTTPStatus.NO_CONTENT)  # nopep8
     def delete_content(
             self,
             context,
@@ -227,13 +249,13 @@ class WorkspaceController(Controller):
             api.delete(content)
         return
 
-    @hapic.with_api_doc()
+    @hapic.with_api_doc(tags=[WORKSPACE_ENDPOINTS_TAG])
     @hapic.handle_exception(NotAuthenticated, HTTPStatus.UNAUTHORIZED)
     @hapic.handle_exception(InsufficientUserProfile, HTTPStatus.FORBIDDEN)
     @hapic.handle_exception(WorkspaceNotFound, HTTPStatus.FORBIDDEN)
     @require_workspace_role(UserRoleInWorkspace.CONTRIBUTOR)
     @hapic.input_path(WorkspaceAndContentIdPathSchema())
-    @hapic.output_body(NoContentSchema())
+    @hapic.output_body(NoContentSchema(), default_http_code=HTTPStatus.NO_CONTENT)  # nopep8
     def undelete_content(
             self,
             context,
@@ -263,13 +285,13 @@ class WorkspaceController(Controller):
             api.undelete(content)
         return
 
-    @hapic.with_api_doc()
+    @hapic.with_api_doc(tags=[WORKSPACE_ENDPOINTS_TAG])
     @hapic.handle_exception(NotAuthenticated, HTTPStatus.UNAUTHORIZED)
     @hapic.handle_exception(InsufficientUserProfile, HTTPStatus.FORBIDDEN)
     @hapic.handle_exception(WorkspaceNotFound, HTTPStatus.FORBIDDEN)
     @require_workspace_role(UserRoleInWorkspace.CONTRIBUTOR)
     @hapic.input_path(WorkspaceAndContentIdPathSchema())
-    @hapic.output_body(NoContentSchema())
+    @hapic.output_body(NoContentSchema(), default_http_code=HTTPStatus.NO_CONTENT)  # nopep8
     def archive_content(
             self,
             context,
@@ -295,13 +317,13 @@ class WorkspaceController(Controller):
             api.archive(content)
         return
 
-    @hapic.with_api_doc()
+    @hapic.with_api_doc(tags=[WORKSPACE_ENDPOINTS_TAG])
     @hapic.handle_exception(NotAuthenticated, HTTPStatus.UNAUTHORIZED)
     @hapic.handle_exception(InsufficientUserProfile, HTTPStatus.FORBIDDEN)
     @hapic.handle_exception(WorkspaceNotFound, HTTPStatus.FORBIDDEN)
     @require_workspace_role(UserRoleInWorkspace.CONTRIBUTOR)
     @hapic.input_path(WorkspaceAndContentIdPathSchema())
-    @hapic.output_body(NoContentSchema())
+    @hapic.output_body(NoContentSchema(), default_http_code=HTTPStatus.NO_CONTENT)  # nopep8
     def unarchive_content(
             self,
             context,