PILOT-6667: add error handler when user dont have trash/delete permis…

…sion within project (#192)

* add error handler when user dont have trash/delete permission within project

* fixup test cases

* change copyright to 2025

app/resources/custom_error.py

@@ -105,6 +105,7 @@ class Error:
         'DELETE_PATH_NOT_EXIST': 'Selected path: %s does not exist.',
         'TRASH_FAIL': 'Failed to trash items: %s.',
         'DELETE_FAIL': 'Failed to delete items: %s.',
+        'TRASH_FAIL_PERMISSION': 'Failed to delete items due to permission issue.',
         'ALREADY_TRASHED': 'Selected path: %s is already in the trash. Please use permanent delete to remove it.',
         # file metadata related error
         'LOCAL_METADATA_FILE_EXISTS': 'Following metadata file already exists in the local directory: ',

app/services/file_manager/file_trash/file_trash_client.py

@@ -8,10 +8,14 @@
 from typing import List
 from uuid import UUID
 
+from httpx import HTTPStatusError
+
 from app.configs.app_config import AppConfig
 from app.models.item import ItemStatus
 from app.services.clients.base_auth_client import BaseAuthClient
 from app.services.output_manager import message_handler
+from app.services.output_manager.error_handler import ECustomizedError
+from app.services.output_manager.error_handler import SrvErrorHandler
 from app.utils.aggregated import get_file_info_by_geid
 from app.utils.aggregated import get_zone
 
@@ -53,7 +57,14 @@ def move_to_trash(self) -> Dict[str, Any]:
             'source_id': self.parent_id,
             'zone': self.zone,
         }
-        response = self._delete(f'{self.project_code}/files', params=params)
+        try:
+            response = self._delete(f'{self.project_code}/files', params=params)
+        except HTTPStatusError as e:
+            response = e.response
+            if response.status_code == 403:
+                SrvErrorHandler.customized_handle(ECustomizedError.TRASH_FAIL_PERMISSION, True)
+            else:
+                SrvErrorHandler.customized_handle(ECustomizedError.TRASH_FAIL, True)
 
         return response.json()
 
@@ -66,7 +77,15 @@ def permanently_delete(self) -> Dict[str, Any]:
             'target_ids': self.object_ids,
             'zone': self.zone,
         }
-        response = self._delete(f'{self.project_code}/files/purge', params=params)
+
+        try:
+            response = self._delete(f'{self.project_code}/files/purge', params=params)
+        except HTTPStatusError as e:
+            response = e.response
+            if response.status_code == 403:
+                SrvErrorHandler.customized_handle(ECustomizedError.TRASH_FAIL_PERMISSION, True)
+            else:
+                SrvErrorHandler.customized_handle(ECustomizedError.DELETE_FAIL, True)
 
         return response.json()
 

app/services/output_manager/error_handler.py

@@ -72,6 +72,7 @@ class ECustomizedError(enum.Enum):
     DELETE_PATH_NOT_EXIST = 'DELETE_PATH_NOT_EXIST'
     TRASH_FAIL = 'TRASH_FAIL'
     DELETE_FAIL = 'DELETE_FAIL'
+    TRASH_FAIL_PERMISSION = 'TRASH_FAIL_PERMISSION'
     ALREADY_TRASHED = 'ALREADY_TRASHED'
 
     # file metadata related error

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "app"
-version = "3.10.0"
+version = "3.10.1"
 description = "This service is designed to support pilot platform"
 authors = ["Indoc Systems"]
 

tests/app/services/file_manager/file_trash/test_file_trash_client.py

@@ -3,16 +3,25 @@
 # Contact Indoc Systems for any questions regarding the use of this source code.
 
 import pytest
-from httpx import HTTPStatusError
 
 from app.configs.app_config import AppConfig
 from app.models.item import ItemStatus
 from app.services.file_manager.file_trash.file_trash_client import FileTrashClient
+from app.services.output_manager.error_handler import ECustomizedError
+from app.services.output_manager.error_handler import customized_error_msg
 from tests.conftest import decoded_token
 
 
-@pytest.mark.parametrize('status_code', [400, 403, 404, 500])
-def test_trash_api_error_handling(httpx_mock, status_code):
+@pytest.mark.parametrize(
+    'status_code, error_message',
+    [
+        (400, ECustomizedError.TRASH_FAIL),
+        (403, ECustomizedError.TRASH_FAIL_PERMISSION),
+        (404, ECustomizedError.TRASH_FAIL),
+        (500, ECustomizedError.TRASH_FAIL),
+    ],
+)
+def test_trash_api_error_handling(httpx_mock, capfd, status_code, error_message):
     test_project_code = 'test_code'
     test_parent_id = 'test_parent_id'
     test_object_ids = ['test_object_id']
@@ -33,14 +42,22 @@ def test_trash_api_error_handling(httpx_mock, status_code):
     try:
         result = file_trash_client.move_to_trash()
         assert result == {}
-    except HTTPStatusError as e:
-        assert e.response.status_code == status_code
-    else:
-        raise AssertionError()
-
-
-@pytest.mark.parametrize('status_code', [400, 403, 404, 500])
-def test_permanent_delete_error_handling(httpx_mock, status_code):
+    except SystemExit:
+        out, _ = capfd.readouterr()
+
+        assert customized_error_msg(error_message) in out
+
+
+@pytest.mark.parametrize(
+    'status_code, error_message',
+    [
+        (400, ECustomizedError.DELETE_FAIL),
+        (403, ECustomizedError.TRASH_FAIL_PERMISSION),
+        (404, ECustomizedError.DELETE_FAIL),
+        (500, ECustomizedError.DELETE_FAIL),
+    ],
+)
+def test_permanent_delete_error_handling(httpx_mock, capfd, status_code, error_message):
     test_project_code = 'test_code'
     test_parent_id = 'test_parent_id'
     test_object_ids = ['test_object_id']
@@ -61,10 +78,10 @@ def test_permanent_delete_error_handling(httpx_mock, status_code):
     try:
         result = file_trash_client.permanently_delete()
         assert result == {}
-    except HTTPStatusError as e:
-        assert e.response.status_code == status_code
-    else:
-        assert AssertionError()
+    except SystemExit:
+        out, _ = capfd.readouterr()
+
+        assert customized_error_msg(error_message) in out
 
 
 @pytest.mark.parametrize('file_status', [ItemStatus.TRASHED, ItemStatus.DELETED, ItemStatus.ACTIVE])
@@ -149,3 +166,6 @@ def test_check_file_status_not_matched(mocker, httpx_mock):
     file_trash_client.max_status_check = 1
     res = file_trash_client.check_status(ItemStatus.TRASHED)
     assert res == ['test_parent_path/test_name']
+
+
+# def test_trash_item_with_permission_denied