From 3dcdd2e4c31bba12610e788ccac41b9b78cdbce6 Mon Sep 17 00:00:00 2001 From: QXgu Date: Fri, 13 Oct 2023 15:37:58 -0400 Subject: [PATCH 1/2] PILOT-3921: Update the ARCHIVED to TRASHED for metadata item status --- app/services/file_manager/file_upload/models.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/services/file_manager/file_upload/models.py b/app/services/file_manager/file_upload/models.py index fa0875e9..7db18404 100644 --- a/app/services/file_manager/file_upload/models.py +++ b/app/services/file_manager/file_upload/models.py @@ -29,13 +29,13 @@ class ItemStatus(str, Enum): Enum type for item status where: - REGISTERED means file is created by upload service but not complete yet. either in progress or fail. - ACTIVE means file uploading is complete. - - ARCHIVED means the file has been deleted + - TRASHED means the file has been deleted The status will be stored at metadata table. """ REGISTERED = 'REGISTERED' ACTIVE = 'ACTIVE' - ARCHIVED = 'ARCHIVED' + TRASHED = 'TRASHED' def __str__(self): return self.name From 4b889d20399d435a101f771f636d4f9f4aa54a67 Mon Sep 17 00:00:00 2001 From: QXgu Date: Tue, 17 Oct 2023 10:59:55 -0400 Subject: [PATCH 2/2] Update the unit test --- tests/app/utils/test_aggregated.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/app/utils/test_aggregated.py b/tests/app/utils/test_aggregated.py index 5617376e..9ddadd2f 100644 --- a/tests/app/utils/test_aggregated.py +++ b/tests/app/utils/test_aggregated.py @@ -21,7 +21,7 @@ def test_search_file_should_return_200(requests_mock, mocker): 'parent': 'parent-id', 'parent_path': 'folder1', 'restore_path': None, - 'archived': False, + 'status': 'ACTIVE', 'type': 'file', 'zone': 0, 'name': 'test-file', @@ -42,7 +42,7 @@ def test_search_file_should_return_200(requests_mock, mocker): 'parent': 'parent-id', 'parent_path': 'folder1', 'restore_path': None, - 'archived': False, + 'status': 'ACTIVE', 'type': 'file', 'zone': 0, 'name': 'test-file',