Skip to content

owner-id-is-multiplied #1549

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 8 commits into
base: develop
Choose a base branch
from
Draft

owner-id-is-multiplied #1549

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7c1e411
use of owner_id_and_collection_id helper
Oct 24, 2025
0fb77b5
use of owner_id_and_collection_id helper
Oct 24, 2025
e9958dc
support colon op
Oct 27, 2025
ce98d50
refactoring
Oct 27, 2025
5db08a6
Merge remote-tracking branch 'origin/develop' into fix-rspy835/owner-…
Oct 27, 2025
8ac740e
add owner id when missing
Oct 28, 2025
fb1ac58
check collection existance after owner_id concatenation
Oct 28, 2025
5d6e10f
correct format
Oct 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions services/catalog/rs_server_catalog/user_catalog.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,6 +542,12 @@ async def manage_search_request( # pylint: disable=too-many-statements,too-many
if not await self.collection_exists(request, collection):
content["collections"][i] = f"{self.request_ids['owner_id']}_{collection}"
logger.debug(f"Using collection name: {content['collections'][i]}")
# Check the existence of the collection after concatenation of owner_id
if not await self.collection_exists(request, content["collections"][i]):
raise log_http_exception(
status_code=HTTP_404_NOT_FOUND,
detail=f"Collection {collection} not found.",
)

self.request_ids["collection_ids"] = content["collections"]
request = self.override_request_body(request, content)
Expand Down Expand Up @@ -571,6 +577,13 @@ async def manage_search_request( # pylint: disable=too-many-statements,too-many
for i, collection in enumerate(coll_list):
if not await self.collection_exists(request, collection):
coll_list[i] = f"{self.request_ids['owner_id']}_{collection}"
logger.debug(f"Using collection name: {coll_list[i]}")
# Check the existence of the collection after concatenation of owner_id
if not await self.collection_exists(request, coll_list[i]):
raise log_http_exception(
status_code=HTTP_404_NOT_FOUND,
detail=f"Collection {collection} not found.",
)

self.request_ids["collection_ids"] = coll_list
query_params_dict["collections"] = ",".join(coll_list)
Expand Down