Merge branch 'develop' of github.com:tracim/tracim_backend into feature/612_user_account_endpoint

tracim/exceptions.py

@@ -175,3 +175,7 @@ class UserNotActive(TracimException):
 
 class NoUserSetted(TracimException):
     pass
+
+
+class ParentNotFound(NotFound):
+    pass

tracim/lib/webdav/dav_provider.py

@@ -70,7 +70,12 @@ class Provider(DAVProvider):
 
         # If the requested path is the root, then we return a RootResource resource
         if path == root_path:
-            return resources.RootResource(path, environ, user=user, session=session)
+            return resources.RootResource(
+                path=path,
+                environ=environ,
+                user=user,
+                session=session
+            )
 
         workspace_api = WorkspaceApi(
             current_user=user,
@@ -111,10 +116,24 @@ class Provider(DAVProvider):
 
         # Easy cases : path either end with /.deleted, /.archived or /.history, then we return corresponding resources
         if path.endswith(SpecialFolderExtension.Archived) and self._show_archive:
-            return resources.ArchivedFolderResource(path, environ, workspace, content)
+            return resources.ArchivedFolderResource(
+                path=path,
+                environ=environ,
+                workspace=workspace,
+                user=user,
+                content=content,
+                session=session,
+            )
 
         if path.endswith(SpecialFolderExtension.Deleted) and self._show_delete:
-            return resources.DeletedFolderResource(path, environ, workspace, content)
+            return resources.DeletedFolderResource(
+                path=path,
+                environ=environ,
+                workspace=workspace,
+                user=user,
+                content=content,
+                session=session,
+            )
 
         if path.endswith(SpecialFolderExtension.History) and self._show_history:
             is_deleted_folder = re.search(r'/\.deleted/\.history$', path) is not None
@@ -124,7 +143,15 @@ class Provider(DAVProvider):
                 else HistoryType.Archived if is_archived_folder \
                 else HistoryType.Standard
 
-            return resources.HistoryFolderResource(path, environ, workspace, content, type)
+            return resources.HistoryFolderResource(
+                path=path,
+                environ=environ,
+                workspace=workspace,
+                user=user,
+                content=content,
+                session=session,
+                type=type
+            )
 
         # Now that's more complicated, we're trying to find out if the path end with /.history/file_name
         is_history_file_folder = re.search(r'/\.history/([^/]+)$', path) is not None
@@ -133,9 +160,10 @@ class Provider(DAVProvider):
             return resources.HistoryFileFolderResource(
                 path=path,
                 environ=environ,
-                content=content
+                user=user,
+                content=content,
+                session=session,
             )
-
         # And here next step :
         is_history_file = re.search(r'/\.history/[^/]+/\((\d+) - [a-zA-Z]+\) .+', path) is not None
 
@@ -147,9 +175,23 @@ class Provider(DAVProvider):
             content = self.get_content_from_revision(content_revision, content_api)
 
             if content.type == ContentType.File:
-                return resources.HistoryFileResource(path, environ, content, content_revision)
+                return resources.HistoryFileResource(
+                    path=path,
+                    environ=environ,
+                    user=user,
+                    content=content,
+                    content_revision=content_revision,
+                    session=session,
+                )
             else:
-                return resources.HistoryOtherFile(path, environ, content, content_revision)
+                return resources.HistoryOtherFile(
+                    path=path,
+                    environ=environ,
+                    user=user,
+                    content=content,
+                    content_revision=content_revision,
+                    session=session,
+                )
 
         # And if we're still going, the client is asking for a standard Folder/File/Page/Thread so we check the type7
         # and return the corresponding resource

tracim/lib/webdav/resources.py

@@ -516,6 +516,7 @@ class FolderResource(WorkspaceResource):
         workspace_api = WorkspaceApi(
             current_user=self.user,
             session=self.session,
+            config=self.provider.app_config,
         )
         workspace = self.provider.get_workspace_from_path(
             normpath(destpath), workspace_api
@@ -1308,6 +1309,7 @@ class FileResource(DAVNonCollection):
         workspace_api = WorkspaceApi(
             current_user=self.user,
             session=self.session,
+            config=self.provider.app_config,
         )
         content_api = ContentApi(
             current_user=self.user,

tracim/models/context_models.py

@@ -144,9 +144,11 @@ class ContentCreation(object):
             self,
             label: str,
             content_type: str,
+            parent_id: typing.Optional[int] = None,
     ) -> None:
         self.label = label
         self.content_type = content_type
+        self.parent_id = parent_id
 
 
 class CommentCreation(object):

tracim/tests/functional/test_workspaces.py

@@ -834,6 +834,49 @@ 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__ok_200__in_folder(self) -> None:  # nopep8
+        """
+        Create generic content in folder
+        """
+        self.testapp.authorization = (
+            'Basic',
+            (
+                'admin@admin.admin',
+                'admin@admin.admin'
+            )
+        )
+        params = {
+            'label': 'GenericCreatedContent',
+            'content_type': 'markdownpage',
+            'parent_id': 10,
+        }
+        res = self.testapp.post_json(
+            '/api/v2/workspaces/1/contents',
+            params=params,
+            status=200
+        )
+        assert res
+        assert res.json_body
+        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'] == 10
+        assert res.json_body['show_in_ui'] is True
+        assert res.json_body['sub_content_types']
+        params_active = {
+            'parent_id': 10,
+            'show_archived': 0,
+            'show_deleted': 0,
+            'show_active': 1,
+        }
+        # INFO - G.M - 2018-06-165 - Verify if new content is correctly created
+        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

tracim/views/core_api/schemas.py

@@ -447,6 +447,11 @@ class ContentCreationSchema(marshmallow.Schema):
         example='html-documents',
         validate=OneOf(ContentType.allowed_types_for_folding()),  # nopep8
     )
+    parent_id = marshmallow.fields.Integer(
+        example=35,
+        description='content_id of parent content, if content should be placed in a folder, this should be folder content_id.'
+    )
+
 
     @post_load
     def make_content_filter(self, data):

tracim/views/core_api/workspace_controller.py

@@ -18,7 +18,9 @@ from tracim.models.data import ActionDescription
 from tracim.models.context_models import UserRoleWorkspaceInContext
 from tracim.models.context_models import ContentInContext
 from tracim.exceptions import EmptyLabelNotAllowed
+from tracim.exceptions import ContentNotFound
 from tracim.exceptions import WorkspacesDoNotMatch
+from tracim.exceptions import ParentNotFound
 from tracim.views.controllers import Controller
 from tracim.views.core_api.schemas import FilterContentQuerySchema
 from tracim.views.core_api.schemas import ContentMoveSchema
@@ -133,12 +135,21 @@ class WorkspaceController(Controller):
         api = ContentApi(
             current_user=request.current_user,
             session=request.dbsession,
-            config=app_config,
+            config=app_config
         )
+        parent = None
+        if creation_data.parent_id:
+            try:
+                parent = api.get_one(content_id=creation_data.parent_id, content_type=ContentType.Any)  # nopep8
+            except ContentNotFound as exc:
+                raise ParentNotFound(
+                    'Parent with content_id {} not found'.format(creation_data.parent_id)
+                ) from exc
         content = api.create(
             label=creation_data.label,
             content_type=creation_data.content_type,
             workspace=request.current_workspace,
+            parent=parent,
         )
         api.save(content, ActionDescription.CREATION)
         content = api.get_content_in_context(content)