From 4deac9fdb22db199acedf5fad70773236e3bfbba Mon Sep 17 00:00:00 2001 From: Andvelavi <54145562+Andvelavi@users.noreply.github.com> Date: Tue, 17 Oct 2023 13:34:49 -0500 Subject: [PATCH 1/4] feat: delete file endpoint Endpoint to delete files, no tests implemented yet --- src/controllers/files/__init__.py | 2 ++ src/controllers/files/remove_file/_handler.py | 16 ++++++++++++++++ .../files/remove_file/_remove_file_test.py | 0 src/views/_file_views.py | 7 +++++++ 4 files changed, 25 insertions(+) create mode 100644 src/controllers/files/remove_file/_handler.py create mode 100644 src/controllers/files/remove_file/_remove_file_test.py diff --git a/src/controllers/files/__init__.py b/src/controllers/files/__init__.py index 70f4c83..213b5da 100644 --- a/src/controllers/files/__init__.py +++ b/src/controllers/files/__init__.py @@ -7,6 +7,7 @@ from .download_file._handler import download_file_handler from .share_file._handler import share_handler from .move_a_file._handler import file_move_handler +from .remove_file._handler import remove_file_handler FILES_HANDLERS = { "CHECK_STATE": check_state_handler, @@ -18,4 +19,5 @@ "DOWNLOAD_FILE": download_file_handler, "SHARE": share_handler, "MOVE_FILE": file_move_handler, + "DELETE_FILE": remove_file_handler, } diff --git a/src/controllers/files/remove_file/_handler.py b/src/controllers/files/remove_file/_handler.py new file mode 100644 index 0000000..a404276 --- /dev/null +++ b/src/controllers/files/remove_file/_handler.py @@ -0,0 +1,16 @@ +from src.config.soap_client import soap_client + + +def remove_file_handler(token, file_uuid): + try: + request_data = {"fileUUID": file_uuid, "token": token} + response = soap_client.service.file_delete(request_data) + + if response["error"] is True: + return {"msg": response["msg"]}, response["code"] + else: + return {"msg": "File successfully deleted"}, 200 + + except Exception as e: + print("[Exception] remove_file_handler ->", e) + return {"msg": "There was an error deleting the file"}, 500 diff --git a/src/controllers/files/remove_file/_remove_file_test.py b/src/controllers/files/remove_file/_remove_file_test.py new file mode 100644 index 0000000..e69de29 diff --git a/src/views/_file_views.py b/src/views/_file_views.py index 8adbd56..c81236e 100644 --- a/src/views/_file_views.py +++ b/src/views/_file_views.py @@ -58,3 +58,10 @@ def file_share(token): @auth_middlewares.token_required def move_file(token, file_uuid): return FILES_HANDLERS["MOVE_FILE"](token, file_uuid) + + +@views.route("/file/", methods=["DELETE"]) +@auth_middlewares.token_required +def remove_file(token, file_uuid): + return FILES_HANDLERS["DELETE_FILE"](token, file_uuid) + From 0a09a76a5843caf8a53f67d5d58e06cbddd1ebf2 Mon Sep 17 00:00:00 2001 From: Andvelavi <54145562+Andvelavi@users.noreply.github.com> Date: Tue, 17 Oct 2023 13:38:16 -0500 Subject: [PATCH 2/4] fix: check format check format error --- src/views/_file_views.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/views/_file_views.py b/src/views/_file_views.py index c81236e..dc2be76 100644 --- a/src/views/_file_views.py +++ b/src/views/_file_views.py @@ -64,4 +64,3 @@ def move_file(token, file_uuid): @auth_middlewares.token_required def remove_file(token, file_uuid): return FILES_HANDLERS["DELETE_FILE"](token, file_uuid) - From c4b8649ed44dc1a73f9601771f5bfe3922ade6e5 Mon Sep 17 00:00:00 2001 From: Andvelavi <54145562+Andvelavi@users.noreply.github.com> Date: Tue, 17 Oct 2023 21:41:56 -0500 Subject: [PATCH 3/4] fix: Removing changes to init.py in controllers files_view.py files --- src/controllers/files/__init__.py | 1 - src/views/_file_views.py | 6 ------ 2 files changed, 7 deletions(-) diff --git a/src/controllers/files/__init__.py b/src/controllers/files/__init__.py index 213b5da..d898e6b 100644 --- a/src/controllers/files/__init__.py +++ b/src/controllers/files/__init__.py @@ -19,5 +19,4 @@ "DOWNLOAD_FILE": download_file_handler, "SHARE": share_handler, "MOVE_FILE": file_move_handler, - "DELETE_FILE": remove_file_handler, } diff --git a/src/views/_file_views.py b/src/views/_file_views.py index dc2be76..8adbd56 100644 --- a/src/views/_file_views.py +++ b/src/views/_file_views.py @@ -58,9 +58,3 @@ def file_share(token): @auth_middlewares.token_required def move_file(token, file_uuid): return FILES_HANDLERS["MOVE_FILE"](token, file_uuid) - - -@views.route("/file/", methods=["DELETE"]) -@auth_middlewares.token_required -def remove_file(token, file_uuid): - return FILES_HANDLERS["DELETE_FILE"](token, file_uuid) From d615488e250e1c8c40b6b0ac7f34cadc71d1ddf1 Mon Sep 17 00:00:00 2001 From: Andvelavi <54145562+Andvelavi@users.noreply.github.com> Date: Tue, 17 Oct 2023 21:44:31 -0500 Subject: [PATCH 4/4] fix: check-linter problem --- src/controllers/files/__init__.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/controllers/files/__init__.py b/src/controllers/files/__init__.py index d898e6b..70f4c83 100644 --- a/src/controllers/files/__init__.py +++ b/src/controllers/files/__init__.py @@ -7,7 +7,6 @@ from .download_file._handler import download_file_handler from .share_file._handler import share_handler from .move_a_file._handler import file_move_handler -from .remove_file._handler import remove_file_handler FILES_HANDLERS = { "CHECK_STATE": check_state_handler,