Skip to content

Hotfix20240527: fixup duplication check when uploading folder with cases insensitive updates#145

Merged
colorzzr merged 3 commits intomainfrom
hotfix20240527
May 27, 2024
Merged

Hotfix20240527: fixup duplication check when uploading folder with cases insensitive updates#145
colorzzr merged 3 commits intomainfrom
hotfix20240527

Conversation

@colorzzr
Copy link
Copy Markdown
Member

Summary

With case insensitive updates, cli should be able to detect whether there are duplicated case insensitive files/folders under the path when uploading. And prompt up proper message to notify users

JIRA Issues

Type of Change

Please delete options that are not relevant.

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • This change requires a documentation update
  • Refactor or reformatting

Testing

Are there any new or updated tests to validate the changes?

  • Yes
  • No

Test Directions

adding test cases to simulate case insensitive object

@colorzzr colorzzr added the bug Something isn't working label May 27, 2024
@colorzzr colorzzr requested a review from Samantha77 May 27, 2024 14:18
@colorzzr colorzzr self-assigned this May 27, 2024
@github-actions
Copy link
Copy Markdown
Contributor

Coverage

Coverage Report
FileStmtsMissCoverMissing
__init__.py00100% 
pilotcli.py0310%5, 7–8, 10–14, 17–21, 23–28, 31–39, 42–44
commands
   __init__.py00100% 
   container_registry.py01959%16, 22–24, 31–33, 41–44, 50–53, 62–65
   dataset.py04844%19, 36–38, 41–48, 50–60, 78–80, 83–91, 93–103, 123, 127
   entry_point.py01085%39, 45, 89–91, 93–97
   file.py04184%41, 153–155, 159, 164, 167–169, 185–186, 228, 313–320, 322, 324, 338–344, 346, 375, 377, 380, 426, 429, 444–446, 452–453, 547
   project.py0197%17
   user.py0685%23, 40, 48, 56, 72–73
configs
   __init__.py00100% 
   app_config.py00100% 
   config.py00100% 
   user_config.py01784%61, 70, 114, 124, 131, 135, 139, 143, 147, 151, 155, 159, 163, 167, 171, 175, 179
models
   __init__.py00100% 
   enums.py00100% 
   item.py00100% 
   service_meta_class.py0180%9
   singleton.py00100% 
   upload_form.py0625%30, 42–46
resources
   custom_error.py00100% 
   custom_help.py00100% 
services
   __init__.py00100% 
services/container_registry_manager
   container_registry_manager.py010817%19–20, 23–26, 29–33, 36–44, 48–60, 62–64, 68–82, 84–86, 90–99, 101–103, 107–110, 125–136, 140–143, 147–162, 164, 166–169
services/crypto
   __init__.py00100% 
   crypto.py01940%35, 43–47, 49, 59–61, 69–75, 77, 79
services/dataset_manager
   dataset_detail.py02370%42, 44, 61, 68–73, 75–77, 79–88, 90
   dataset_download.py01983%56, 72–73, 84, 96, 98–99, 101–102, 104, 106–108, 116–119, 153, 165
   dataset_list.py0878%37, 43–46, 48–50
   model.py00100% 
services/file_manager
   __init__.py00100% 
   file_list.py01676%50, 52, 72–74, 82–85, 87, 93–98
   file_manifests.py09525%19–24, 39–43, 47–48, 51–59, 61, 65–68, 71–75, 77, 81–82, 85–87, 91–92, 95–102, 104, 107, 109–110, 112–113, 115–118, 123–129, 134–139, 142–148, 150–152, 155–161, 163–165, 167–170
   file_tag.py03931%23, 27–31, 33, 36–48, 50–52, 54–55, 59–61, 64–68, 70–73, 75–76
services/file_manager/file_download
   __init__.py00100% 
   download_client.py012744%45–46, 48–54, 72–73, 115–120, 122, 125–126, 129–131, 133–135, 137–138, 140–142, 146–154, 157–162, 172–173, 194, 198–199, 205–215, 217–218, 221–222, 227–228, 232–237, 241–242, 245–247, 249–260, 264–267, 270–274, 276–278, 280–282, 284–285, 287, 291–293, 295–308, 310
   model.py00100% 
services/file_manager/file_metadata
   __init__.py00100% 
   file_metadata_client.py0395%98–100
services/file_manager/file_move
   __init__.py00100% 
   file_move_client.py0691%71, 80–82, 84, 111
services/file_manager/file_upload
   __init__.py00100% 
   exception.py0175%10
   file_upload.py02884%36–43, 96–98, 110, 141–142, 146, 151, 188, 208–210, 251–252, 254–256, 330, 333, 337
   models.py0591%24, 44, 150–152
   upload_client.py07760%101–104, 213–215, 229–235, 237–241, 243–255, 257, 301, 304, 308, 310–312, 314–317, 321–325, 327, 331, 333, 335, 337, 356, 386–387, 392, 396–399, 403, 419, 421–423, 430, 435–436, 438, 440–441, 443–446, 448
   upload_validator.py02156%29–31, 34–39, 42–48, 51–52, 57, 59, 61
services/logger_services
   __init__.py00100% 
   log_functions.py00100% 
services/output_manager
   __init__.py00100% 
   error_handler.py00100% 
   help_page.py00100% 
   message_handler.py05770%23, 45, 50, 65–67, 72, 82, 87, 100, 105, 112, 117, 122, 126, 142, 177, 187, 196, 214, 224, 243, 265–276, 287–292, 294–300, 311, 315–316, 320–321, 323–324, 328, 332, 336
services/project_manager
   __init__.py00100% 
   project.py0878%38, 44–47, 49–51
services/user_authentication
   __init__.py00100% 
   decorator.py0293%27, 30
   token_manager.py0986%26, 41–42, 73, 76, 91, 96, 100, 105
   user_login_logout.py04266%30–31, 41, 122, 126–132, 134–136, 140–141, 145–152, 154–156, 160–161, 168–173, 175–177, 181–184
utils
   __init__.py00100% 
   aggregated.py02283%52, 64, 104, 118–119, 129–130, 132, 156–163, 165–166, 194, 202, 219–220
TOTAL312391570% 

@colorzzr colorzzr merged commit 36c49d6 into main May 27, 2024
colorzzr added a commit that referenced this pull request Jun 10, 2024
* PILOT-3962: Port over changes from 2.7.3 to 2.7.4

Former-commit-id: 564ce35

* prepare the release branch


Former-commit-id: 72c1881

* use correct version


Former-commit-id: 3504184

* bumup version


Former-commit-id: f7344ac

* bump up to correct version


Former-commit-id: 6047ee7

* Hotfix20240228: hotfix to staging (#129)

* update folder name restriction to 100 char

* add error handling when uploading with wrong format of tag/attribute files

* fixup the metadata download command cannt download item metadata/tags/attributes from project folder

* bumpup version

---------

Co-authored-by: zhiren <zzhan@indocresearch.org>
Former-commit-id: 7310166

* PILOT-4745: fixup the move command fails when creating a new folder under project folder (#130)

* fixup the move command fails when creating a new folder under project folder

* bumpup the version

---------

Co-authored-by: zhiren <zzhan@indocresearch.org>
Former-commit-id: 9a18ae6

* staging release


Former-commit-id: 6e787f7

* fixup precommit


Former-commit-id: 534ccfd

* prepare release branch

* Hotfix20240527: fixup duplication check when uploading folder with cases insensitive updates (#145)

* fixup the duplication check for case insensitive folder uploading

* add test cases for case insensitive duplication check

* bumpup version

---------

Co-authored-by: Daniel <dfelipe@indocresearch.org>
Co-authored-by: zhiren <zzhan@indocresearch.org>
Co-authored-by: Dušan Andrić <Dusan.Andric@gmail.com>
@colorzzr colorzzr deleted the hotfix20240527 branch July 10, 2024 14:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug Something isn't working

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants