return updated_content instead of 204 for move endpoint

tracim/models/context_models.py

@@ -291,6 +291,11 @@ class ContentInContext(object):
 
     @property
     def parent_id(self) -> int:
+        """
+        Return parent_id of the content, if it doesn't exist return 0
+        """
+        if not self.content.parent_id:
+            return 0
         return self.content.parent_id
 
     @property

tracim/tests/functional/test_workspaces.py

@@ -807,12 +807,16 @@ class TestWorkspaceContents(FunctionalTest):
         res = self.testapp.put_json(
             '/api/v2/workspaces/2/contents/8/move',
             params=params,
-            status=204
+            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_root(self):
         """
@@ -857,6 +861,10 @@ class TestWorkspaceContents(FunctionalTest):
         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'] == 0
+        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):
         """
@@ -902,6 +910,10 @@ class TestWorkspaceContents(FunctionalTest):
         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):
         """
@@ -946,6 +958,10 @@ class TestWorkspaceContents(FunctionalTest):
         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):
         """
@@ -991,6 +1007,10 @@ class TestWorkspaceContents(FunctionalTest):
         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'] == 0
+        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):
         """

tracim/views/core_api/schemas.py

@@ -85,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.'

tracim/views/core_api/workspace_controller.py

@@ -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(), default_http_code=HTTPStatus.NO_CONTENT)  # nopep8
+    @hapic.output_body(ContentDigestSchema())  # nopep8
     def move_content(
             self,
             context,
@@ -209,7 +209,11 @@ class WorkspaceController(Controller):
                 new_workspace=new_workspace,
                 must_stay_in_same_workspace=False,
             )
-        return
+        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.handle_exception(NotAuthenticated, HTTPStatus.UNAUTHORIZED)