From 3729c4605d919e3a26bf8521f8930a729c4a4c79 Mon Sep 17 00:00:00 2001 From: Thomas NOEL Date: Fri, 22 Mar 2024 12:22:56 +0100 Subject: [PATCH] filr_rest: precise folder title when search (#88491) --- passerelle/apps/filr_rest/models.py | 4 +++- tests/test_filr_rest.py | 8 ++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/passerelle/apps/filr_rest/models.py b/passerelle/apps/filr_rest/models.py index 3a5e6a14..9463b194 100644 --- a/passerelle/apps/filr_rest/models.py +++ b/passerelle/apps/filr_rest/models.py @@ -90,7 +90,9 @@ class Filr(BaseResource, HTTPResource): # get or create folder folder_id = None - root_folder_info = self._call('rest/folders/%s/library_folders' % root_folder_id) + root_folder_info = self._call( + 'rest/folders/%s/library_folders' % root_folder_id, params={'title': folder_name} + ) for folder in root_folder_info.get('items', []): if folder.get('title') == folder_name: folder_id = str(folder.get('id')) diff --git a/tests/test_filr_rest.py b/tests/test_filr_rest.py index 03d33ff4..4cd65b7c 100644 --- a/tests/test_filr_rest.py +++ b/tests/test_filr_rest.py @@ -36,7 +36,7 @@ def test_upload(app, connector): } with responses.RequestsMock() as rsps: rsps.get( - 'http://filr.invalid/rest/folders/1234/library_folders', + 'http://filr.invalid/rest/folders/1234/library_folders?title=folder_foo', status=200, json={'items': [{'title': 'folder_foo', 'id': 5678}]}, ) @@ -65,7 +65,11 @@ def test_upload_with_folder_creation(app, connector): 'folder_name': 'folder_foo', } with responses.RequestsMock() as rsps: - rsps.get('http://filr.invalid/rest/folders/1234/library_folders', status=200, json={'items': []}) + rsps.get( + 'http://filr.invalid/rest/folders/1234/library_folders?title=folder_foo', + status=200, + json={'items': []}, + ) rsps.post('http://filr.invalid/rest/folders/1234/library_folders', status=200, json={'id': 82}) rsps.post( 'http://filr.invalid/rest/folders/82/library_files?file_name=bla',