disallow empty raw_content for comment and empty label for others contents + tests

tracim/exceptions.py

@@ -131,3 +131,15 @@ class ContentTypeNotAllowed(TracimException):
 
 class WorkspacesDoNotMatch(TracimException):
     pass
+
+
+class EmptyValueNotAllowed(TracimException):
+    pass
+
+
+class EmptyLabelNotAllowed(EmptyValueNotAllowed):
+    pass
+
+
+class EmptyRawContentNotAllowed(EmptyValueNotAllowed):
+    pass

tracim/lib/core/content.py

@@ -5,7 +5,6 @@ import datetime
 import re
 import typing
 from operator import itemgetter
-from operator import not_
 
 import transaction
 from sqlalchemy import func
@@ -25,7 +24,8 @@ 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 SameValueError, EmptyRawContentNotAllowed
+from tracim.exceptions import EmptyLabelNotAllowed
 from tracim.exceptions import ContentNotFound
 from tracim.exceptions import WorkspacesDoNotMatch
 from tracim.lib.utils.utils import current_date_for_filename
@@ -393,18 +393,26 @@ class ContentApi(object):
 
         return result
 
-    def create(self, content_type: str, workspace: Workspace, parent: Content=None, label:str ='', do_save=False, is_temporary: bool=False, do_notify=True) -> Content:
+    def create(self, content_type: str, workspace: Workspace, parent: Content=None, label: str ='', filename: str = '', do_save=False, is_temporary: bool=False, do_notify=True) -> Content:
         assert content_type in ContentType.allowed_types()
 
         if content_type == ContentType.Folder and not label:
             label = self.generate_folder_label(workspace, parent)
 
         content = Content()
+        if label:
+            content.label = label
+        elif filename:
+            # TODO - G.M - 2018-07-04 - File_name setting automatically
+            # set label and file_extension
+            content.file_name = label
+        else:
+            raise EmptyLabelNotAllowed()
+
         content.owner = self._user
         content.parent = parent
         content.workspace = workspace
         content.type = content_type
-        content.label = label
         content.is_temporary = is_temporary
         content.revision_type = ActionDescription.CREATION
 
@@ -419,9 +427,10 @@ class ContentApi(object):
             self.save(content, ActionDescription.CREATION, do_notify=do_notify)
         return content
 
-
     def create_comment(self, workspace: Workspace=None, parent: Content=None, content:str ='', do_save=False) -> Content:
-        assert parent  and parent.type!=ContentType.Folder
+        assert parent and parent.type != ContentType.Folder
+        if not content:
+            raise EmptyRawContentNotAllowed()
         item = Content()
         item.owner = self._user
         item.parent = parent
@@ -972,6 +981,8 @@ class ContentApi(object):
             # TODO - G.M - 20-03-2018 - Fix internatization for webdav access.
             # Internatization disabled in libcontent for now.
             raise SameValueError('The content did not changed')
+        if not new_label:
+            raise EmptyLabelNotAllowed()
         item.owner = self._user
         item.label = new_label
         item.description = new_content if new_content else item.description # TODO: convert urls into links

tracim/lib/webdav/utils.py

@@ -176,6 +176,7 @@ class FakeFileStream(object):
         is_temporary = self._file_name.startswith('.~') or self._file_name.startswith('~')
 
         file = self._api.create(
+            filename=self._file_name,
             content_type=ContentType.File,
             workspace=self._workspace,
             parent=self._parent,

tracim/tests/functional/test_comments.py

@@ -94,6 +94,25 @@ class TestCommentsEndpoint(FunctionalTest):
         assert len(res.json_body) == 4
         assert comment == res.json_body[3]
 
+    def test_api__post_content_comment__err_400__empty_raw_content(self) -> None:
+        """
+        Get alls comments of a content
+        """
+        self.testapp.authorization = (
+            'Basic',
+            (
+                'admin@admin.admin',
+                'admin@admin.admin'
+            )
+        )
+        params = {
+            'raw_content': ''
+        }
+        res = self.testapp.post_json(
+            '/api/v2/workspaces/2/contents/7/comments',
+            params=params,
+            status=400
+        )
     def test_api__delete_content_comment__ok_200__user_is_owner_and_workspace_manager(self) -> None:  # nopep8
         """
         delete comment (user is workspace_manager and owner)

tracim/tests/functional/test_contents.py

@@ -192,6 +192,27 @@ class TestHtmlDocuments(FunctionalTest):
             status=400
         )
 
+    def test_api__update_html_document__err_400__empty_label(self) -> None:  # nopep8
+        """
+        Update(put) one html document of a content
+        """
+        self.testapp.authorization = (
+            'Basic',
+            (
+                'admin@admin.admin',
+                'admin@admin.admin'
+            )
+        )
+        params = {
+            'label': '',
+            'raw_content': '<p> Le nouveau contenu </p>',
+        }
+        res = self.testapp.put_json(
+            '/api/v2/workspaces/2/html-documents/6',
+            params=params,
+            status=400
+        )
+
     def test_api__update_html_document__ok_200__nominal_case(self) -> None:
         """
         Update(put) one html document of a content
@@ -603,6 +624,27 @@ class TestThreads(FunctionalTest):
         assert content['last_modifier'] == content['author']
         assert content['raw_content'] == '<p> Le nouveau contenu </p>'
 
+    def test_api__update_thread__err_400__empty_label(self) -> None:
+        """
+        Update(put) thread
+        """
+        self.testapp.authorization = (
+            'Basic',
+            (
+                'admin@admin.admin',
+                'admin@admin.admin'
+            )
+        )
+        params = {
+            'label': '',
+            'raw_content': '<p> Le nouveau contenu </p>',
+        }
+        res = self.testapp.put_json(
+            '/api/v2/workspaces/2/threads/7',
+            params=params,
+            status=400
+        )
+
     def test_api__get_thread_revisions__ok_200__nominal_case(
             self
     ) -> None:

tracim/tests/functional/test_workspaces.py

@@ -834,6 +834,48 @@ class TestWorkspaceContents(FunctionalTest):
         active_contents = self.testapp.get('/api/v2/workspaces/1/contents', params=params_active, status=200).json_body  # nopep8
         assert res.json_body in active_contents
 
+    def test_api__post_content_create_generic_content__err_400__empty_label(self) -> None:  # nopep8
+        """
+        Create generic content
+        """
+        self.testapp.authorization = (
+            'Basic',
+            (
+                'admin@admin.admin',
+                'admin@admin.admin'
+            )
+        )
+        params = {
+            'label': '',
+            'content_type': 'markdownpage',
+        }
+        res = self.testapp.post_json(
+            '/api/v2/workspaces/1/contents',
+            params=params,
+            status=400
+        )
+
+    def test_api__post_content_create_generic_content__err_400__wrong_content_type(self) -> None:  # nopep8
+        """
+        Create generic content
+        """
+        self.testapp.authorization = (
+            'Basic',
+            (
+                'admin@admin.admin',
+                'admin@admin.admin'
+            )
+        )
+        params = {
+            'label': 'GenericCreatedContent',
+            'content_type': 'unexistent-content-type',
+        }
+        res = self.testapp.post_json(
+            '/api/v2/workspaces/1/contents',
+            params=params,
+            status=400,
+        )
+
     def test_api_put_move_content__ok_200__nominal_case(self):
         """
         Move content

tracim/tests/library/test_content_api.py

@@ -128,10 +128,20 @@ class TestContentApi(DefaultTest):
             session=self.session,
             config=self.app_config,
         )
-        item = api.create(ContentType.Folder, workspace, None,
-                          'not_deleted', True)
-        item2 = api.create(ContentType.Folder, workspace, None,
-                           'to_delete', True)
+        item = api.create(
+            content_type=ContentType.Folder,
+            workspace=workspace,
+            parent=None,
+            label='not_deleted',
+            do_save=True
+        )
+        item2 = api.create(
+            content_type=ContentType.Folder,
+            workspace=workspace,
+            parent=None,
+            label='to_delete',
+            do_save=True
+        )
         uid = user.user_id
         wid = workspace.workspace_id
         transaction.commit()
@@ -229,10 +239,20 @@ class TestContentApi(DefaultTest):
             session=self.session,
             config=self.app_config,
         )
-        item = api.create(ContentType.Folder, workspace, None,
-                          'not_archived', True)
-        item2 = api.create(ContentType.Folder, workspace, None,
-                           'to_archive', True)
+        item = api.create(
+            content_type=ContentType.Folder,
+            workspace=workspace,
+            parent=None,
+            label='not_archived',
+            do_save=True
+        )
+        item2 = api.create(
+            content_type=ContentType.Folder,
+            workspace=workspace,
+            parent=None,
+            label='to_archive',
+            do_save=True
+        )
         uid = user.user_id
         wid = workspace.workspace_id
         transaction.commit()
@@ -337,9 +357,20 @@ class TestContentApi(DefaultTest):
             session=self.session,
             config=self.app_config,
         )
-        item = api.create(ContentType.Folder, workspace, None,
-                          'thefolder', True)
-        item2 = api.create(ContentType.File, workspace, None, 'thefile', True)
+        item = api.create(
+            content_type=ContentType.Folder,
+            workspace=workspace,
+            parent=None,
+            label='thefolder',
+            do_save=True
+        )
+        item2 = api.create(
+            content_type=ContentType.File,
+            workspace=workspace,
+            parent=None,
+            label='thefile',
+            do_save=True
+        )
         uid = user.user_id
         wid = workspace.workspace_id
         transaction.commit()
@@ -1248,8 +1279,13 @@ class TestContentApi(DefaultTest):
             config=self.app_config,
         )
 
-        p = api.create(ContentType.Page, workspace, None,
-                       'this_is_a_page', True)
+        p = api.create(
+            content_type=ContentType.Page,
+            workspace=workspace,
+            parent=None,
+            label='this_is_a_page',
+            do_save=True
+        )
 
         u1id = user1.user_id
         u2id = user2.user_id
@@ -1453,8 +1489,13 @@ class TestContentApi(DefaultTest):
             session=self.session,
             config=self.app_config,
         )
-        p = api.create(ContentType.File, workspace, None,
-                       'this_is_a_page', True)
+        p = api.create(
+            content_type=ContentType.File,
+            workspace=workspace,
+            parent=None,
+            label='this_is_a_page',
+            do_save=True
+        )
 
         u1id = user1.user_id
         u2id = user2.user_id
@@ -1666,8 +1707,13 @@ class TestContentApi(DefaultTest):
             show_archived=True,
             config=self.app_config,
         )
-        p = api.create(ContentType.File, workspace, None,
-                       'this_is_a_page', True)
+        p = api.create(
+            content_type=ContentType.File,
+            workspace=workspace,
+            parent=None,
+            label='this_is_a_page',
+            do_save=True
+        )
 
         u1id = user1.user_id
         u2id = user2.user_id
@@ -1822,8 +1868,13 @@ class TestContentApi(DefaultTest):
             config=self.app_config,
             show_deleted=True,
         )
-        p = api.create(ContentType.File, workspace, None,
-                       'this_is_a_page', True)
+        p = api.create(
+            content_type=ContentType.File,
+            workspace=workspace,
+            parent=None,
+            label='this_is_a_page',
+            do_save=True
+        )
 
         u1id = user1.user_id
         u2id = user2.user_id
@@ -2065,11 +2116,27 @@ class TestContentApi(DefaultTest):
             session=self.session,
             config=self.app_config,
         )
-        a = api.create(ContentType.Folder, workspace, None,
-                       'this is randomized folder', True)
-        p1 = api.create(ContentType.Page, workspace, a,
-                        'this is dummy label content', True)
-        p2 = api.create(ContentType.Page, workspace, a, 'Hey ! Jon !', True)
+        a = api.create(
+            content_type=ContentType.Folder,
+            workspace=workspace,
+            parent=None,
+            label='this is randomized folder',
+            do_save=True
+        )
+        p1 = api.create(
+            content_type=ContentType.Page,
+            workspace=workspace,
+            parent=a,
+            label='this is dummy label content',
+            do_save=True
+        )
+        p2 = api.create(
+            content_type=ContentType.Page,
+            workspace=workspace,
+            parent=a,
+            label='Hey ! Jon !',
+            do_save=True
+        )
 
         with new_revision(
             session=self.session,

tracim/tests/library/test_webdav.py

@@ -95,6 +95,7 @@ class TestWebDav(StandardTest):
                        self.session,
                        self.app_config
                        ).get_one_by_email(email)
+
     def _put_new_text_file(
             self,
             provider,

tracim/views/contents_api/comment_controller.py

@@ -19,7 +19,7 @@ from tracim.views.core_api.schemas import CommentsPathSchema
 from tracim.views.core_api.schemas import SetCommentSchema
 from tracim.views.core_api.schemas import WorkspaceAndContentIdPathSchema
 from tracim.views.core_api.schemas import NoContentSchema
-from tracim.exceptions import WorkspaceNotFound
+from tracim.exceptions import WorkspaceNotFound, EmptyRawContentNotAllowed
 from tracim.exceptions import InsufficientUserRoleInWorkspace
 from tracim.exceptions import NotAuthenticated
 from tracim.exceptions import AuthenticationFailed
@@ -59,6 +59,7 @@ class CommentController(Controller):
         ]
 
     @hapic.with_api_doc(tags=[COMMENT_ENDPOINTS_TAG])
+    @hapic.handle_exception(EmptyRawContentNotAllowed, HTTPStatus.BAD_REQUEST)
     @require_workspace_role(UserRoleInWorkspace.CONTRIBUTOR)
     @hapic.input_path(WorkspaceAndContentIdPathSchema())
     @hapic.input_body(SetCommentSchema())

tracim/views/contents_api/html_document_controller.py

@@ -23,11 +23,7 @@ from tracim.views.core_api.schemas import WorkspaceAndContentIdPathSchema
 from tracim.views.core_api.schemas import NoContentSchema
 from tracim.lib.utils.authorization import require_content_types
 from tracim.lib.utils.authorization import require_workspace_role
-from tracim.exceptions import WorkspaceNotFound
-from tracim.exceptions import ContentTypeNotAllowed
-from tracim.exceptions import InsufficientUserRoleInWorkspace
-from tracim.exceptions import NotAuthenticated
-from tracim.exceptions import AuthenticationFailed
+from tracim.exceptions import EmptyLabelNotAllowed
 from tracim.models.context_models import ContentInContext
 from tracim.models.context_models import RevisionInContext
 from tracim.models.contents import ContentTypeLegacy as ContentType
@@ -61,6 +57,7 @@ class HTMLDocumentController(Controller):
         return api.get_content_in_context(content)
 
     @hapic.with_api_doc(tags=[HTML_DOCUMENT_ENDPOINTS_TAG])
+    @hapic.handle_exception(EmptyLabelNotAllowed, HTTPStatus.BAD_REQUEST)
     @require_workspace_role(UserRoleInWorkspace.CONTRIBUTOR)
     @require_content_types([html_documents_type])
     @hapic.input_path(WorkspaceAndContentIdPathSchema())

tracim/views/contents_api/threads_controller.py

@@ -22,10 +22,7 @@ from tracim.views.core_api.schemas import WorkspaceAndContentIdPathSchema
 from tracim.views.core_api.schemas import NoContentSchema
 from tracim.lib.utils.authorization import require_content_types
 from tracim.lib.utils.authorization import require_workspace_role
-from tracim.exceptions import WorkspaceNotFound, ContentTypeNotAllowed
-from tracim.exceptions import InsufficientUserRoleInWorkspace
-from tracim.exceptions import NotAuthenticated
-from tracim.exceptions import AuthenticationFailed
+from tracim.exceptions import EmptyLabelNotAllowed
 from tracim.models.context_models import ContentInContext
 from tracim.models.context_models import RevisionInContext
 from tracim.models.contents import ContentTypeLegacy as ContentType
@@ -59,6 +56,7 @@ class ThreadController(Controller):
         return api.get_content_in_context(content)
 
     @hapic.with_api_doc(tags=[THREAD_ENDPOINTS_TAG])
+    @hapic.handle_exception(EmptyLabelNotAllowed, HTTPStatus.BAD_REQUEST)
     @require_workspace_role(UserRoleInWorkspace.CONTRIBUTOR)
     @require_content_types([thread_type])
     @hapic.input_path(WorkspaceAndContentIdPathSchema())

tracim/views/core_api/schemas.py

@@ -459,6 +459,7 @@ class SetCommentSchema(marshmallow.Schema):
 
 class ContentModifyAbstractSchema(marshmallow.Schema):
     label = marshmallow.fields.String(
+        required=True,
         example='contract for client XXX',
         description='New title of the content'
     )

tracim/views/core_api/workspace_controller.py

@@ -11,16 +11,14 @@ 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, \
-    require_candidate_workspace_role
+from tracim.lib.utils.authorization import require_workspace_role
+from tracim.lib.utils.authorization import 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, InsufficientUserRoleInWorkspace
-from tracim.exceptions import WorkspaceNotFoundInTracimRequest
+from tracim.exceptions import EmptyLabelNotAllowed
 from tracim.exceptions import WorkspacesDoNotMatch
-from tracim.exceptions import WorkspaceNotFound
 from tracim.views.controllers import Controller
 from tracim.views.core_api.schemas import FilterContentQuerySchema
 from tracim.views.core_api.schemas import ContentMoveSchema
@@ -117,6 +115,7 @@ class WorkspaceController(Controller):
 
     @hapic.with_api_doc(tags=[WORKSPACE_ENDPOINTS_TAG])
     @require_workspace_role(UserRoleInWorkspace.CONTRIBUTOR)
+    @hapic.handle_exception(EmptyLabelNotAllowed, HTTPStatus.BAD_REQUEST)
     @hapic.input_path(WorkspaceIdPathSchema())
     @hapic.input_body(ContentCreationSchema())
     @hapic.output_body(ContentDigestSchema())
@@ -125,7 +124,7 @@ class WorkspaceController(Controller):
             context,
             request: TracimRequest,
             hapic_data=None,
-    ) -> typing.List[ContentInContext]:
+    ) -> ContentInContext:
         """
         create a generic empty content
         """