Merge branch 'master' into improve-celery-task-error-messages-and-improve-taskid-name

Author: bisgaard-itis

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

@@ -94,6 +94,12 @@ def _list_filter_with_partial_file_id_stmt(
                 ),
             )
         )
+    else:
+        project_ids = user_or_project_filter.project_ids
+        if len(project_ids) > 0:
+            conditions.append(
+                file_meta_data.c.project_id.in_(f"{_}" for _ in project_ids)
+            )
 
     # Optional filters
     if file_id_prefix:

services/storage/tests/unit/test_db_file_meta_data.py

@@ -6,6 +6,7 @@
 
 from uuid import uuid4
 
+import pytest
 from faker import Faker
 from simcore_postgres_database.utils import as_postgres_sql_query_str
 from simcore_service_storage.models import UserOrProjectFilter
@@ -14,16 +15,20 @@
 )
 
 
+def _get_sql_stmt_string(func_smt, **kwargs):
+    print()
+    print(f"{func_smt.__name__:*^100}")
+    stmt = func_smt(**kwargs)
+    print()
+    stmt_str = as_postgres_sql_query_str(stmt)
+    print(stmt_str)
+    print()
+    return stmt_str
+
+
 def test_building_sql_statements(faker: Faker):
-    def _check(func_smt, **kwargs):
-        print()
-        print(f"{func_smt.__name__:*^100}")
-        stmt = func_smt(**kwargs)
-        print()
-        print(as_postgres_sql_query_str(stmt))
-        print()
 
-    _check(
+    _get_sql_stmt_string(
         _list_filter_with_partial_file_id_stmt,
         user_or_project_filter=UserOrProjectFilter(
             user_id=None, project_ids=[uuid4() for _ in range(2)]
@@ -35,7 +40,7 @@ def _check(func_smt, **kwargs):
     )
     # WHERE file_meta_data.is_directory IS false ORDER BY file_meta_data.created_at ASC
 
-    _check(
+    _get_sql_stmt_string(
         _list_filter_with_partial_file_id_stmt,
         user_or_project_filter=UserOrProjectFilter(user_id=42, project_ids=[]),
         file_id_prefix=None,
@@ -45,7 +50,7 @@ def _check(func_smt, **kwargs):
     )
     # WHERE file_meta_data.user_id = '42' AND file_meta_data.is_directory IS false ORDER BY file_meta_data.created_at ASC
 
-    _check(
+    _get_sql_stmt_string(
         _list_filter_with_partial_file_id_stmt,
         user_or_project_filter=UserOrProjectFilter(
             user_id=42, project_ids=[uuid4() for _ in range(2)]
@@ -57,7 +62,7 @@ def _check(func_smt, **kwargs):
     )
     # WHERE (file_meta_data.user_id = '42' OR file_meta_data.project_id IN ('18d5'..., )) AND file_meta_data.is_directory IS false ORDER BY file_meta_data.created_at ASC
 
-    _check(
+    _get_sql_stmt_string(
         _list_filter_with_partial_file_id_stmt,
         user_or_project_filter=UserOrProjectFilter(
             user_id=42, project_ids=[uuid4() for _ in range(2)]
@@ -72,7 +77,7 @@ def _check(func_smt, **kwargs):
     # (file_meta_data.user_id = '42' OR file_meta_data.project_id IN ('3cd9704db' ...)) AND file_meta_data.is_directory IS false ORDER BY file_meta_data.created_at ASC LIMIT 10 OFFSET 1
 
     # As used in SimcoreS3DataManager.list_files
-    _check(
+    _get_sql_stmt_string(
         _list_filter_with_partial_file_id_stmt,
         user_or_project_filter=UserOrProjectFilter(user_id=42, project_ids=[]),
         file_id_prefix=None,
@@ -82,7 +87,7 @@ def _check(func_smt, **kwargs):
     )
 
     # As used in SimcoreS3DataManager.search_owned_files
-    _check(
+    _get_sql_stmt_string(
         _list_filter_with_partial_file_id_stmt,
         user_or_project_filter=UserOrProjectFilter(user_id=42, project_ids=[]),
         file_id_prefix="api/",
@@ -92,3 +97,36 @@ def _check(func_smt, **kwargs):
         limit=10,
         offset=0,
     )
+
+
+@pytest.mark.parametrize(
+    "user_id,project_ids",
+    [(None, [uuid4() for _ in range(2)]), (42, []), (42, [uuid4() for _ in range(2)])],
+)
+def test_list_filter_with_partial_file_id_stmt(user_id, project_ids, faker: Faker):
+    sql_stmt_string = _get_sql_stmt_string(
+        _list_filter_with_partial_file_id_stmt,
+        user_or_project_filter=UserOrProjectFilter(
+            user_id=user_id, project_ids=project_ids
+        ),
+        file_id_prefix=None,
+        partial_file_id=None,
+        sha256_checksum=None,
+        is_directory=False,
+        limit=10,
+        offset=0,
+    )
+    if user_id:
+        assert f"file_meta_data.user_id = '{user_id}'" in sql_stmt_string
+    else:
+        assert "file_meta_data.user_id = " not in sql_stmt_string
+    if len(project_ids) > 0:
+        assert "file_meta_data.project_id IN" in sql_stmt_string
+    else:
+        assert "file_meta_data.project_id IN" not in sql_stmt_string
+    if user_id and len(project_ids) > 0:
+        project_ids_as_strings = [f"'{pid}'" for pid in project_ids]
+        assert (
+            f"file_meta_data.user_id = '{user_id}' OR file_meta_data.project_id IN ({', '.join(project_ids_as_strings)})"
+            in sql_stmt_string
+        )