Merge branch 'fix/592_fix_schema_and_http_code_in_endpoints' of github.com:tracim/tracim_backend into fix/596_move_endpoint_return_updated_content

tracim/models/context_models.py

@@ -65,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):
@@ -92,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
 
@@ -109,7 +113,7 @@ class UserInContext(object):
 
     @property
     def profile(self) -> Profile:
-        return self.user.profile
+        return self.user.profile.name
 
     # Context related
 
@@ -227,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]
@@ -273,10 +281,13 @@ 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:
@@ -291,15 +302,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,
@@ -801,18 +801,18 @@ 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',
             params=params,
-            status=200
+            status=204
         )
         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
 
     def test_api_put_move_content__ok_200__to_root(self):
         """
@@ -1055,18 +1055,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):
         """
@@ -1094,16 +1094,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):
         """
@@ -1131,16 +1131,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):
         """
@@ -1168,13 +1168,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:
@@ -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]),
     )
@@ -317,7 +307,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]),
     )
@@ -328,7 +318,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,
@@ -339,17 +329,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/workspace_controller.py

@@ -149,7 +149,7 @@ 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)
@@ -166,7 +166,7 @@ class WorkspaceController(Controller):
     @require_candidate_workspace_role(UserRoleInWorkspace.CONTRIBUTOR)
     @hapic.input_path(WorkspaceAndContentIdPathSchema())
     @hapic.input_body(ContentMoveSchema())
-    @hapic.output_body(NoContentSchema())
+    @hapic.output_body(NoContentSchema(), default_http_code=HTTPStatus.NO_CONTENT)  # nopep8
     def move_content(
             self,
             context,
@@ -217,7 +217,7 @@ class WorkspaceController(Controller):
     @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,
@@ -252,7 +252,7 @@ class WorkspaceController(Controller):
     @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,
@@ -288,7 +288,7 @@ class WorkspaceController(Controller):
     @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,
@@ -320,7 +320,7 @@ class WorkspaceController(Controller):
     @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,