From ab724101c8405517e23d227efbeeb175285d4d6c Mon Sep 17 00:00:00 2001 From: zhiren Date: Thu, 21 Mar 2024 17:01:50 -0400 Subject: [PATCH 1/5] add [p] prefix for project folder when listing items under project --- app/models/folder.py | 22 -------- app/models/item.py | 55 +++++++++++++++++++ app/services/file_manager/file_list.py | 12 +++- .../file_manager/file_upload/file_upload.py | 4 +- app/utils/aggregated.py | 12 ++-- tests/app/commands/test_file.py | 2 +- .../file_upload/test_file_upload.py | 10 ++-- tests/app/utils/test_aggregated.py | 10 ++-- 8 files changed, 84 insertions(+), 43 deletions(-) delete mode 100644 app/models/folder.py create mode 100644 app/models/item.py diff --git a/app/models/folder.py b/app/models/folder.py deleted file mode 100644 index 180c337c..00000000 --- a/app/models/folder.py +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright (C) 2023-2024 Indoc Systems -# -# Contact Indoc Systems for any questions regarding the use of this source code. - -from enum import Enum - - -class FolderType(str, Enum): - """Available folder types.""" - - NAMEFOLDER = 'namefolder' - PROJECTFOLDER = 'projectfolder' - - def get_prefix(self) -> str: - """Get the prefix for the folder type.""" - - prefix = { - 'namefolder': '', - 'projectfolder': 'shared/', - } - - return prefix.get(self.value) diff --git a/app/models/item.py b/app/models/item.py new file mode 100644 index 00000000..233bca73 --- /dev/null +++ b/app/models/item.py @@ -0,0 +1,55 @@ +# Copyright (C) 2023-2024 Indoc Systems +# +# Contact Indoc Systems for any questions regarding the use of this source code. + +from enum import Enum + + +class FolderPrefix(str, Enum): + """In database, name folders and project folders will prefix with different path. and user will need to key in the + keyword to get the correct path. eg. + + - project folder: + - key in: /projectfolder/ + - path: /shared/ + - name folder: + - key in: // + - path: // + """ + + NAMEFOLDER = 'namefolder' + PROJECTFOLDER = 'projectfolder' + + def get_prefix(self) -> str: + """Get the prefix for the folder type.""" + + prefix = { + 'namefolder': '', + 'projectfolder': 'shared/', + } + + return prefix.get(self.value) + + +class ItemType(str, Enum): + """The class to reflect the type of item in database.""" + + FILE = 'file' + Folder = 'folder' + NAMEFOLDER = 'name_folder' + PROJECTFOLDER = 'project_folder' + + @classmethod + def get_item_type(cls, value): + # Define a mapping for alternative values + alternative_mapping = { + 'namefolder': cls.NAMEFOLDER, + } + # Check if the value is in the alternative mapping + if value in alternative_mapping: + return alternative_mapping[value] + # Fall back to normal lookup by value + for item in cls: + if item.value == value: + return item + return None diff --git a/app/services/file_manager/file_list.py b/app/services/file_manager/file_list.py index 39982cd9..45b00cbc 100644 --- a/app/services/file_manager/file_list.py +++ b/app/services/file_manager/file_list.py @@ -9,6 +9,7 @@ import app.services.logger_services.log_functions as logger from app.configs.app_config import AppConfig from app.configs.user_config import UserConfig +from app.models.item import ItemType from app.models.service_meta_class import MetaService from app.services.output_manager.error_handler import ECustomizedError from app.services.output_manager.error_handler import SrvErrorHandler @@ -59,10 +60,17 @@ def list_files(self, paths, zone, page, page_size): # then format the console output files, folders = '', '' for f in res: - if 'file' == f.get('type'): + item_type = ItemType(f.get('type')) + + if item_type == ItemType.FILE: files = files + f.get('name') + ' ...' - elif f.get('type') in ['folder', 'name_folder', 'project_folder']: + else: + # add [p] in front of the project folder + if item_type == ItemType.PROJECTFOLDER: + f['name'] = f'[p]{f.get("name")}' + folders = folders + f"\033[34m{f.get('name')}\033[0m ..." + f_string = folders + files return f_string diff --git a/app/services/file_manager/file_upload/file_upload.py b/app/services/file_manager/file_upload/file_upload.py index 4dda080b..9f5e335f 100644 --- a/app/services/file_manager/file_upload/file_upload.py +++ b/app/services/file_manager/file_upload/file_upload.py @@ -18,7 +18,7 @@ import app.services.logger_services.log_functions as logger import app.services.output_manager.message_handler as mhandler from app.configs.app_config import AppConfig -from app.models.folder import FolderType +from app.models.item import FolderPrefix from app.services.file_manager.file_upload.models import FileObject from app.services.file_manager.file_upload.models import ItemStatus from app.services.file_manager.file_upload.models import UploadType @@ -44,7 +44,7 @@ def compress_folder_to_zip(path): def assemble_path( - f: str, target_folder: str, project_code: str, folder_type: FolderType, zone: str + f: str, target_folder: str, project_code: str, folder_type: FolderPrefix, zone: str ) -> Tuple[str, Dict, bool, str]: ''' Summary: diff --git a/app/utils/aggregated.py b/app/utils/aggregated.py index 662db673..e18c21eb 100644 --- a/app/utils/aggregated.py +++ b/app/utils/aggregated.py @@ -17,7 +17,7 @@ from app.configs.app_config import AppConfig from app.configs.config import ConfigClass from app.configs.user_config import UserConfig -from app.models.folder import FolderType +from app.models.item import FolderPrefix from app.services.output_manager.error_handler import ECustomizedError from app.services.output_manager.error_handler import SrvErrorHandler from app.services.user_authentication.decorator import require_valid_token @@ -166,7 +166,7 @@ def get_file_in_folder(path): return files_list -def identify_target_folder(project_path: str) -> Tuple[str, FolderType, str]: +def identify_target_folder(project_path: str) -> Tuple[str, FolderPrefix, str]: ''' Summary: the function will validate if input folder path doesn't @@ -187,14 +187,14 @@ def identify_target_folder(project_path: str) -> Tuple[str, FolderType, str]: # check folder type if is project folder or name folder # there will be a extra string for project folder between project code and folder name if len(temp_paths) == 2: - folder_type = FolderType.NAMEFOLDER + folder_type = FolderPrefix.NAMEFOLDER folder_name = temp_paths[1] elif len(temp_paths) >= 3: - if temp_paths[1] == FolderType.PROJECTFOLDER.value: - folder_type = FolderType.PROJECTFOLDER + if temp_paths[1] == FolderPrefix.PROJECTFOLDER.value: + folder_type = FolderPrefix.PROJECTFOLDER folder_name = temp_paths[2] else: - folder_type = FolderType.NAMEFOLDER + folder_type = FolderPrefix.NAMEFOLDER folder_name = os.path.join(temp_paths[1], temp_paths[2]) else: SrvErrorHandler.customized_handle(ECustomizedError.INVALID_NAMEFOLDER, True) diff --git a/tests/app/commands/test_file.py b/tests/app/commands/test_file.py index 3abe2cab..2492102c 100644 --- a/tests/app/commands/test_file.py +++ b/tests/app/commands/test_file.py @@ -193,7 +193,7 @@ def test_file_list_with_pagination_with_name_project_folder(requests_mock, mocke questionary.select.return_value.ask.return_value = 'exit' result = cli_runner.invoke(file_list, ['testproject/admin', '-z', 'greenroom']) outputs = result.output.split('\n') - assert outputs[0] == 'folder1 name_folder1 project_folder1 ' + assert outputs[0] == 'folder1 name_folder1 [p]project_folder1 ' def test_empty_file_list_with_pagination(requests_mock, mocker, cli_runner): diff --git a/tests/app/services/file_manager/file_upload/test_file_upload.py b/tests/app/services/file_manager/file_upload/test_file_upload.py index b4a9ffb2..655f823b 100644 --- a/tests/app/services/file_manager/file_upload/test_file_upload.py +++ b/tests/app/services/file_manager/file_upload/test_file_upload.py @@ -3,7 +3,7 @@ # Contact Indoc Systems for any questions regarding the use of this source code. from app.configs.app_config import AppConfig -from app.models.folder import FolderType +from app.models.item import FolderPrefix from app.services.file_manager.file_upload.file_upload import assemble_path from app.services.file_manager.file_upload.file_upload import resume_upload from app.services.file_manager.file_upload.file_upload import simple_upload @@ -34,7 +34,7 @@ def test_assemble_path_at_name_folder(mocker): ) current_file_path, parent_folder, create_folder_flag, _ = assemble_path( - local_file_path, target_folder, project_code, FolderType.NAMEFOLDER, zone + local_file_path, target_folder, project_code, FolderPrefix.NAMEFOLDER, zone ) assert current_file_path == 'admin/file.txt' assert parent_folder.get('name') == 'admin' @@ -73,7 +73,7 @@ def test_assemble_path_at_exsting_folder(mocker): mocker.patch('app.services.file_manager.file_upload.file_upload.search_item', side_effect=node_list) current_file_path, parent_folder, create_folder_flag, _ = assemble_path( - local_file_path, target_folder, project_code, FolderType.NAMEFOLDER, zone + local_file_path, target_folder, project_code, FolderPrefix.NAMEFOLDER, zone ) assert current_file_path == 'admin/test_folder_exist/file.txt' assert parent_folder.get('name') == 'test_folder_exist' @@ -104,7 +104,7 @@ def test_assemble_path_at_non_existing_folder(mocker): mocker.patch('app.services.file_manager.file_upload.file_upload.click.confirm', return_value=None) current_file_path, parent_folder, create_folder_flag, _ = assemble_path( - local_file_path, target_folder, project_code, FolderType.NAMEFOLDER, zone + local_file_path, target_folder, project_code, FolderPrefix.NAMEFOLDER, zone ) assert current_file_path == 'admin/test_folder_not_exist' assert parent_folder.get('name') == 'admin' @@ -132,7 +132,7 @@ def test_assemble_path_at_project_folder(mocker): ) current_file_path, parent_folder, create_folder_flag, target_folder = assemble_path( - local_file_path, target_folder, project_code, FolderType.PROJECTFOLDER, zone + local_file_path, target_folder, project_code, FolderPrefix.PROJECTFOLDER, zone ) assert current_file_path == 'shared/project_folder/file.txt' assert parent_folder.get('name') == 'project_folder' diff --git a/tests/app/utils/test_aggregated.py b/tests/app/utils/test_aggregated.py index 88194ca2..d6912e00 100644 --- a/tests/app/utils/test_aggregated.py +++ b/tests/app/utils/test_aggregated.py @@ -5,7 +5,7 @@ import pytest from app.configs.app_config import AppConfig -from app.models.folder import FolderType +from app.models.item import FolderPrefix from app.utils.aggregated import check_item_duplication from app.utils.aggregated import identify_target_folder from app.utils.aggregated import search_item @@ -136,10 +136,10 @@ def test_validate_folder_name(folder_name): @pytest.mark.parametrize( 'input_path,expected_result', [ - ('project_code/username', ('project_code', FolderType.NAMEFOLDER, 'username')), - ('project_code/username/folder1', ('project_code', FolderType.NAMEFOLDER, 'username/folder1')), - ('project_code/projectfolder/folder1', ('project_code', FolderType.PROJECTFOLDER, 'folder1')), - ('project_code/projectfolder/folder1/folder2', ('project_code', FolderType.PROJECTFOLDER, 'folder1/folder2')), + ('project_code/username', ('project_code', FolderPrefix.NAMEFOLDER, 'username')), + ('project_code/username/folder1', ('project_code', FolderPrefix.NAMEFOLDER, 'username/folder1')), + ('project_code/projectfolder/folder1', ('project_code', FolderPrefix.PROJECTFOLDER, 'folder1')), + ('project_code/projectfolder/folder1/folder2', ('project_code', FolderPrefix.PROJECTFOLDER, 'folder1/folder2')), ], ) def test_identify_target_folder_success_with_different_path(mocker, input_path, expected_result): From 777843726688a987678d38d4e3f272c87695de68 Mon Sep 17 00:00:00 2001 From: zhiren Date: Fri, 22 Mar 2024 11:52:58 -0400 Subject: [PATCH 2/5] group itemprefix class with itemtype class --- app/models/item.py | 57 +++++++------------ .../file_manager/file_upload/file_upload.py | 8 +-- app/utils/aggregated.py | 11 ++-- .../file_upload/test_file_upload.py | 11 ++-- tests/app/utils/test_aggregated.py | 10 ++-- 5 files changed, 39 insertions(+), 58 deletions(-) diff --git a/app/models/item.py b/app/models/item.py index 233bca73..2269bc40 100644 --- a/app/models/item.py +++ b/app/models/item.py @@ -5,32 +5,6 @@ from enum import Enum -class FolderPrefix(str, Enum): - """In database, name folders and project folders will prefix with different path. and user will need to key in the - keyword to get the correct path. eg. - - - project folder: - - key in: /projectfolder/ - - path: /shared/ - - name folder: - - key in: // - - path: // - """ - - NAMEFOLDER = 'namefolder' - PROJECTFOLDER = 'projectfolder' - - def get_prefix(self) -> str: - """Get the prefix for the folder type.""" - - prefix = { - 'namefolder': '', - 'projectfolder': 'shared/', - } - - return prefix.get(self.value) - - class ItemType(str, Enum): """The class to reflect the type of item in database.""" @@ -40,16 +14,25 @@ class ItemType(str, Enum): PROJECTFOLDER = 'project_folder' @classmethod - def get_item_type(cls, value): - # Define a mapping for alternative values + def get_type_from_keyword(self, keyword: str): + """The function will return the type of the item based on the keyword. + + - name folder will have keyword 'namefolder' as input + - project folder will not have any keyword + """ + alternative_mapping = { - 'namefolder': cls.NAMEFOLDER, + 'projectfolder': self.PROJECTFOLDER, + } + + return alternative_mapping.get(keyword, self.NAMEFOLDER) + + def get_prefix_by_type(self) -> str: + """Get the prefix for the folder type.""" + + prefix = { + self.NAMEFOLDER: '', + self.PROJECTFOLDER: 'shared/', } - # Check if the value is in the alternative mapping - if value in alternative_mapping: - return alternative_mapping[value] - # Fall back to normal lookup by value - for item in cls: - if item.value == value: - return item - return None + + return prefix.get(self.value, '') diff --git a/app/services/file_manager/file_upload/file_upload.py b/app/services/file_manager/file_upload/file_upload.py index 9f5e335f..952ec259 100644 --- a/app/services/file_manager/file_upload/file_upload.py +++ b/app/services/file_manager/file_upload/file_upload.py @@ -18,7 +18,7 @@ import app.services.logger_services.log_functions as logger import app.services.output_manager.message_handler as mhandler from app.configs.app_config import AppConfig -from app.models.item import FolderPrefix +from app.models.item import ItemType from app.services.file_manager.file_upload.models import FileObject from app.services.file_manager.file_upload.models import ItemStatus from app.services.file_manager.file_upload.models import UploadType @@ -44,7 +44,7 @@ def compress_folder_to_zip(path): def assemble_path( - f: str, target_folder: str, project_code: str, folder_type: FolderPrefix, zone: str + f: str, target_folder: str, project_code: str, folder_type: ItemType, zone: str ) -> Tuple[str, Dict, bool, str]: ''' Summary: @@ -80,8 +80,8 @@ def assemble_path( current_folder_node = target_folder if os.path.isfile(f) else current_file_path create_folder_flag = False # add prefix to folder - current_folder_node = folder_type.get_prefix() + current_folder_node - target_folder = folder_type.get_prefix() + target_folder + current_folder_node = folder_type.get_prefix_by_type() + current_folder_node + target_folder = folder_type.get_prefix_by_type() + target_folder if len(current_file_path.split('/')) > 2: sub_path = target_folder.split('/') diff --git a/app/utils/aggregated.py b/app/utils/aggregated.py index e18c21eb..025c5008 100644 --- a/app/utils/aggregated.py +++ b/app/utils/aggregated.py @@ -17,7 +17,7 @@ from app.configs.app_config import AppConfig from app.configs.config import ConfigClass from app.configs.user_config import UserConfig -from app.models.item import FolderPrefix +from app.models.item import ItemType from app.services.output_manager.error_handler import ECustomizedError from app.services.output_manager.error_handler import SrvErrorHandler from app.services.user_authentication.decorator import require_valid_token @@ -166,7 +166,7 @@ def get_file_in_folder(path): return files_list -def identify_target_folder(project_path: str) -> Tuple[str, FolderPrefix, str]: +def identify_target_folder(project_path: str) -> Tuple[str, ItemType, str]: ''' Summary: the function will validate if input folder path doesn't @@ -187,14 +187,13 @@ def identify_target_folder(project_path: str) -> Tuple[str, FolderPrefix, str]: # check folder type if is project folder or name folder # there will be a extra string for project folder between project code and folder name if len(temp_paths) == 2: - folder_type = FolderPrefix.NAMEFOLDER + folder_type = ItemType.NAMEFOLDER folder_name = temp_paths[1] elif len(temp_paths) >= 3: - if temp_paths[1] == FolderPrefix.PROJECTFOLDER.value: - folder_type = FolderPrefix.PROJECTFOLDER + folder_type = ItemType.get_type_from_keyword(temp_paths[1]) + if folder_type == ItemType.PROJECTFOLDER: folder_name = temp_paths[2] else: - folder_type = FolderPrefix.NAMEFOLDER folder_name = os.path.join(temp_paths[1], temp_paths[2]) else: SrvErrorHandler.customized_handle(ECustomizedError.INVALID_NAMEFOLDER, True) diff --git a/tests/app/services/file_manager/file_upload/test_file_upload.py b/tests/app/services/file_manager/file_upload/test_file_upload.py index 655f823b..5fa26447 100644 --- a/tests/app/services/file_manager/file_upload/test_file_upload.py +++ b/tests/app/services/file_manager/file_upload/test_file_upload.py @@ -3,7 +3,7 @@ # Contact Indoc Systems for any questions regarding the use of this source code. from app.configs.app_config import AppConfig -from app.models.item import FolderPrefix +from app.models.item import ItemType from app.services.file_manager.file_upload.file_upload import assemble_path from app.services.file_manager.file_upload.file_upload import resume_upload from app.services.file_manager.file_upload.file_upload import simple_upload @@ -34,7 +34,7 @@ def test_assemble_path_at_name_folder(mocker): ) current_file_path, parent_folder, create_folder_flag, _ = assemble_path( - local_file_path, target_folder, project_code, FolderPrefix.NAMEFOLDER, zone + local_file_path, target_folder, project_code, ItemType.NAMEFOLDER, zone ) assert current_file_path == 'admin/file.txt' assert parent_folder.get('name') == 'admin' @@ -71,9 +71,8 @@ def test_assemble_path_at_exsting_folder(mocker): ] mocker.patch('app.services.file_manager.file_upload.file_upload.search_item', side_effect=node_list) - current_file_path, parent_folder, create_folder_flag, _ = assemble_path( - local_file_path, target_folder, project_code, FolderPrefix.NAMEFOLDER, zone + local_file_path, target_folder, project_code, ItemType.NAMEFOLDER, zone ) assert current_file_path == 'admin/test_folder_exist/file.txt' assert parent_folder.get('name') == 'test_folder_exist' @@ -104,7 +103,7 @@ def test_assemble_path_at_non_existing_folder(mocker): mocker.patch('app.services.file_manager.file_upload.file_upload.click.confirm', return_value=None) current_file_path, parent_folder, create_folder_flag, _ = assemble_path( - local_file_path, target_folder, project_code, FolderPrefix.NAMEFOLDER, zone + local_file_path, target_folder, project_code, ItemType.NAMEFOLDER, zone ) assert current_file_path == 'admin/test_folder_not_exist' assert parent_folder.get('name') == 'admin' @@ -132,7 +131,7 @@ def test_assemble_path_at_project_folder(mocker): ) current_file_path, parent_folder, create_folder_flag, target_folder = assemble_path( - local_file_path, target_folder, project_code, FolderPrefix.PROJECTFOLDER, zone + local_file_path, target_folder, project_code, ItemType.PROJECTFOLDER, zone ) assert current_file_path == 'shared/project_folder/file.txt' assert parent_folder.get('name') == 'project_folder' diff --git a/tests/app/utils/test_aggregated.py b/tests/app/utils/test_aggregated.py index d6912e00..b81254df 100644 --- a/tests/app/utils/test_aggregated.py +++ b/tests/app/utils/test_aggregated.py @@ -5,7 +5,7 @@ import pytest from app.configs.app_config import AppConfig -from app.models.item import FolderPrefix +from app.models.item import ItemType from app.utils.aggregated import check_item_duplication from app.utils.aggregated import identify_target_folder from app.utils.aggregated import search_item @@ -136,10 +136,10 @@ def test_validate_folder_name(folder_name): @pytest.mark.parametrize( 'input_path,expected_result', [ - ('project_code/username', ('project_code', FolderPrefix.NAMEFOLDER, 'username')), - ('project_code/username/folder1', ('project_code', FolderPrefix.NAMEFOLDER, 'username/folder1')), - ('project_code/projectfolder/folder1', ('project_code', FolderPrefix.PROJECTFOLDER, 'folder1')), - ('project_code/projectfolder/folder1/folder2', ('project_code', FolderPrefix.PROJECTFOLDER, 'folder1/folder2')), + ('project_code/username', ('project_code', ItemType.NAMEFOLDER, 'username')), + ('project_code/username/folder1', ('project_code', ItemType.NAMEFOLDER, 'username/folder1')), + ('project_code/projectfolder/folder1', ('project_code', ItemType.PROJECTFOLDER, 'folder1')), + ('project_code/projectfolder/folder1/folder2', ('project_code', ItemType.PROJECTFOLDER, 'folder1/folder2')), ], ) def test_identify_target_folder_success_with_different_path(mocker, input_path, expected_result): From e86765f65a1180798afce7bf617530eb4fa7559d Mon Sep 17 00:00:00 2001 From: zhiren Date: Fri, 22 Mar 2024 16:50:42 -0400 Subject: [PATCH 3/5] add double quotation when item name contains space --- app/services/file_manager/file_list.py | 3 +++ tests/app/commands/test_file.py | 7 +++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/services/file_manager/file_list.py b/app/services/file_manager/file_list.py index 45b00cbc..35338de2 100644 --- a/app/services/file_manager/file_list.py +++ b/app/services/file_manager/file_list.py @@ -61,6 +61,9 @@ def list_files(self, paths, zone, page, page_size): files, folders = '', '' for f in res: item_type = ItemType(f.get('type')) + # if there is space within the nane add double quotation to aviod confusion + if ' ' in f.get('name'): + f['name'] = f'"{f.get("name")}"' if item_type == ItemType.FILE: files = files + f.get('name') + ' ...' diff --git a/tests/app/commands/test_file.py b/tests/app/commands/test_file.py index 2492102c..ab9e64bc 100644 --- a/tests/app/commands/test_file.py +++ b/tests/app/commands/test_file.py @@ -185,7 +185,9 @@ def test_file_list_with_pagination_with_name_project_folder(requests_mock, mocke 'result': [ {'type': 'folder', 'name': 'folder1'}, {'type': 'name_folder', 'name': 'name_folder1'}, - {'type': 'project_folder', 'name': 'project_folder1'}, + {'type': 'project_folder', 'name': 'project folder1'}, + {'type': 'folder', 'name': 'test folder2'}, + {'type': 'project_folder', 'name': 'project folder2'}, ], }, ) @@ -193,7 +195,8 @@ def test_file_list_with_pagination_with_name_project_folder(requests_mock, mocke questionary.select.return_value.ask.return_value = 'exit' result = cli_runner.invoke(file_list, ['testproject/admin', '-z', 'greenroom']) outputs = result.output.split('\n') - assert outputs[0] == 'folder1 name_folder1 [p]project_folder1 ' + assert outputs[0] == 'folder1 name_folder1 [p]"project folder1" ' + assert outputs[1] == '"test folder2" [p]"project folder2" ' def test_empty_file_list_with_pagination(requests_mock, mocker, cli_runner): From 3d76446bb3a24ce665103764bdafe05c8b8f6dba Mon Sep 17 00:00:00 2001 From: zhiren Date: Mon, 1 Apr 2024 16:50:57 -0400 Subject: [PATCH 4/5] change enum type PROJECTFOLDER to SHAREDFOLDER --- app/models/item.py | 6 +++--- app/services/file_manager/file_list.py | 2 +- app/utils/aggregated.py | 2 +- .../services/file_manager/file_upload/test_file_upload.py | 2 +- tests/app/utils/test_aggregated.py | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/models/item.py b/app/models/item.py index 2269bc40..a7a91029 100644 --- a/app/models/item.py +++ b/app/models/item.py @@ -11,7 +11,7 @@ class ItemType(str, Enum): FILE = 'file' Folder = 'folder' NAMEFOLDER = 'name_folder' - PROJECTFOLDER = 'project_folder' + SHAREDFOLDER = 'project_folder' @classmethod def get_type_from_keyword(self, keyword: str): @@ -22,7 +22,7 @@ def get_type_from_keyword(self, keyword: str): """ alternative_mapping = { - 'projectfolder': self.PROJECTFOLDER, + 'projectfolder': self.SHAREDFOLDER, } return alternative_mapping.get(keyword, self.NAMEFOLDER) @@ -32,7 +32,7 @@ def get_prefix_by_type(self) -> str: prefix = { self.NAMEFOLDER: '', - self.PROJECTFOLDER: 'shared/', + self.SHAREDFOLDER: 'shared/', } return prefix.get(self.value, '') diff --git a/app/services/file_manager/file_list.py b/app/services/file_manager/file_list.py index 35338de2..2131903a 100644 --- a/app/services/file_manager/file_list.py +++ b/app/services/file_manager/file_list.py @@ -69,7 +69,7 @@ def list_files(self, paths, zone, page, page_size): files = files + f.get('name') + ' ...' else: # add [p] in front of the project folder - if item_type == ItemType.PROJECTFOLDER: + if item_type == ItemType.SHAREDFOLDER: f['name'] = f'[p]{f.get("name")}' folders = folders + f"\033[34m{f.get('name')}\033[0m ..." diff --git a/app/utils/aggregated.py b/app/utils/aggregated.py index 025c5008..e338ae5f 100644 --- a/app/utils/aggregated.py +++ b/app/utils/aggregated.py @@ -191,7 +191,7 @@ def identify_target_folder(project_path: str) -> Tuple[str, ItemType, str]: folder_name = temp_paths[1] elif len(temp_paths) >= 3: folder_type = ItemType.get_type_from_keyword(temp_paths[1]) - if folder_type == ItemType.PROJECTFOLDER: + if folder_type == ItemType.SHAREDFOLDER: folder_name = temp_paths[2] else: folder_name = os.path.join(temp_paths[1], temp_paths[2]) diff --git a/tests/app/services/file_manager/file_upload/test_file_upload.py b/tests/app/services/file_manager/file_upload/test_file_upload.py index 5fa26447..fb385057 100644 --- a/tests/app/services/file_manager/file_upload/test_file_upload.py +++ b/tests/app/services/file_manager/file_upload/test_file_upload.py @@ -131,7 +131,7 @@ def test_assemble_path_at_project_folder(mocker): ) current_file_path, parent_folder, create_folder_flag, target_folder = assemble_path( - local_file_path, target_folder, project_code, ItemType.PROJECTFOLDER, zone + local_file_path, target_folder, project_code, ItemType.SHAREDFOLDER, zone ) assert current_file_path == 'shared/project_folder/file.txt' assert parent_folder.get('name') == 'project_folder' diff --git a/tests/app/utils/test_aggregated.py b/tests/app/utils/test_aggregated.py index b81254df..91454cbb 100644 --- a/tests/app/utils/test_aggregated.py +++ b/tests/app/utils/test_aggregated.py @@ -138,8 +138,8 @@ def test_validate_folder_name(folder_name): [ ('project_code/username', ('project_code', ItemType.NAMEFOLDER, 'username')), ('project_code/username/folder1', ('project_code', ItemType.NAMEFOLDER, 'username/folder1')), - ('project_code/projectfolder/folder1', ('project_code', ItemType.PROJECTFOLDER, 'folder1')), - ('project_code/projectfolder/folder1/folder2', ('project_code', ItemType.PROJECTFOLDER, 'folder1/folder2')), + ('project_code/projectfolder/folder1', ('project_code', ItemType.SHAREDFOLDER, 'folder1')), + ('project_code/projectfolder/folder1/folder2', ('project_code', ItemType.SHAREDFOLDER, 'folder1/folder2')), ], ) def test_identify_target_folder_success_with_different_path(mocker, input_path, expected_result): From 2ef59d3fe8101101d7e957bee89593ea74244e96 Mon Sep 17 00:00:00 2001 From: zhiren Date: Thu, 4 Apr 2024 11:03:56 -0400 Subject: [PATCH 5/5] bumpup versions --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 07a4eeb4..0ad2804c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "app" -version = "2.10.0" +version = "2.10.1" description = "This service is designed to support pilot platform" authors = ["Indoc Systems"]