Skip to content

Commit 704df3a

Browse files
committed
ongoing
1 parent 838797d commit 704df3a

File tree

2 files changed

+15
-5
lines changed

2 files changed

+15
-5
lines changed

services/storage/src/simcore_service_storage/modules/db/file_meta_data.py

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
import datetime
22
from collections.abc import AsyncGenerator
3+
from pathlib import Path
4+
from typing import Iterable
35

46
import sqlalchemy as sa
57
from models_library.basic_types import SHA256Str
@@ -136,13 +138,21 @@ async def list_filter_with_partial_file_id(
136138
]
137139

138140

139-
async def list_direct_children(
141+
async def list_fmds_children(
140142
conn: AsyncConnection,
141143
*,
142-
user_id: UserID | None = None,
143-
limit: int | None = None,
144-
offset: int | None = None,
144+
filter_by_user_id: UserID | None,
145+
filter_by_project_ids: Iterable[ProjectID] | None,
146+
filter_by_file_prefix: Path | None,
147+
limit: int | None,
148+
offset: int | None,
145149
) -> list[FileMetaDataAtDB]:
150+
"""returns a list of FileMetaDataAtDB that are one level deep.
151+
e.g. when no filter is used, these are top level objects
152+
"""
153+
stmt = sa.select(sa.distinct(file_meta_data)).where(
154+
sa.func.split_part(file_meta_data.c.file_id, "/", 1)
155+
)
146156
return []
147157

148158

services/storage/src/simcore_service_storage/simcore_s3_dsm.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ async def list_files_paginated(
170170
else:
171171
accessible_projects_ids = await get_readable_project_ids(conn, user_id)
172172

173-
file_and_directory_meta_data = await file_meta_data.list_direct_children(
173+
file_and_directory_meta_data = await file_meta_data.list_fmds_children(
174174
conn,
175175
filter_by_user_id=user_id,
176176
file_id_prefix=None,

0 commit comments

Comments
 (0)