fixes tests

Author: pcrespov

services/web/server/src/simcore_service_webserver/projects/_jobs_repository.py

@@ -40,18 +40,25 @@ def _apply_job_parent_resource_name_filter(
 def _apply_metadata_filter(
     query: sa.sql.Select, any_of_metadata_fields: list[dict[str, str]]
 ) -> sa.sql.Select:
+    """Apply metadata filters to query.
 
+    For PostgreSQL JSONB fields, we need to extract the text value using ->> operator
+    before applying string comparison operators like ILIKE.
+    """
     assert any_of_metadata_fields  # nosec
 
-    expressions = [
-        projects_metadata.c.custom[key].ilike(
-            # NOTE: we use ilike to be case insensitive
-            # NOTE: supports glob wildcards
-            pattern.replace("*", "%")
-        )
-        for field in any_of_metadata_fields
-        for key, pattern in field.items()
-    ]
+    expressions = []
+    for field in any_of_metadata_fields:
+        for key, pattern in field.items():
+            # Use ->> operator to extract the text value from JSONB
+            # Then apply ILIKE for case-insensitive pattern matching
+            sql_pattern = pattern.replace(
+                "*", "%"
+            )  # Convert glob-like pattern to SQL LIKE
+            expressions.append(
+                projects_metadata.c.custom[key].astext.ilike(sql_pattern)
+            )
+
     return query.where(sa.or_(*expressions))
 
 
@@ -88,7 +95,7 @@ async def list_projects_marked_as_jobs(
         pagination_offset: int = 0,
         pagination_limit: int = 10,
         filter_by_job_parent_resource_name_prefix: str | None = None,
-        filter_by_any_of_metadata_fields: list[dict[str, str]] | None = None,
+        filter_by_any_custom_metadata: list[dict[str, str]] | None = None,
     ) -> tuple[int, list[ProjectJobDBGet]]:
         """Lists projects marked as jobs for a specific user and product
 
@@ -127,6 +134,11 @@ async def list_projects_marked_as_jobs(
                     project_to_groups,
                     projects_to_jobs.c.project_uuid == project_to_groups.c.project_uuid,
                 )
+                .join(
+                    # NOTE: avoids `SAWarning: SELECT statement has a cartesian product ...`
+                    projects,
+                    projects_to_jobs.c.project_uuid == projects.c.uuid,
+                )
                 .outerjoin(
                     projects_metadata,
                     projects_to_jobs.c.project_uuid == projects_metadata.c.project_uuid,
@@ -149,9 +161,9 @@ async def list_projects_marked_as_jobs(
                 access_query, filter_by_job_parent_resource_name_prefix
             )
 
-        if filter_by_any_of_metadata_fields:
+        if filter_by_any_custom_metadata:
             access_query = _apply_metadata_filter(
-                access_query, filter_by_any_of_metadata_fields
+                access_query, filter_by_any_custom_metadata
             )
 
         # Step 4. Convert access_query to a subquery

services/web/server/src/simcore_service_webserver/projects/_jobs_service.py

@@ -57,7 +57,7 @@ async def list_my_projects_marked_as_jobs(
     offset: int = 0,
     limit: int = 10,
     filter_by_job_parent_resource_name_prefix: str | None = None,
-    filter_by_any_of_metadata: list[dict[str, str]] | None = None,
+    filter_by_any_custom_metadata: list[dict[str, str]] | None = None,
 ) -> tuple[int, list[ProjectJobDBGet]]:
     """
     Lists paginated projects marked as jobs for the given user and product.
@@ -70,5 +70,5 @@ async def list_my_projects_marked_as_jobs(
         pagination_offset=offset,
         pagination_limit=limit,
         filter_by_job_parent_resource_name_prefix=filter_by_job_parent_resource_name_prefix,
-        filter_by_any_of_metadata_fields=filter_by_any_of_metadata,
+        filter_by_any_custom_metadata=filter_by_any_custom_metadata,
     )

services/web/server/tests/unit/with_dbs/02/test_projects__jobs_service.py

@@ -242,7 +242,7 @@ async def test_filter_projects_by_metadata(
         app=client.app,
         product_name=osparc_product_name,
         user_id=user_id,
-        filter_by_any_of_metadata=filter_exact,
+        filter_by_any_custom_metadata=filter_exact,
     )
     assert total_count == 1
     assert len(result) == 1
@@ -254,7 +254,7 @@ async def test_filter_projects_by_metadata(
         app=client.app,
         product_name=osparc_product_name,
         user_id=user_id,
-        filter_by_any_of_metadata=filter_multiple_keys,
+        filter_by_any_custom_metadata=filter_multiple_keys,
     )
     assert total_count == 1
     assert len(result) == 1
@@ -269,7 +269,7 @@ async def test_filter_projects_by_metadata(
         app=client.app,
         product_name=osparc_product_name,
         user_id=user_id,
-        filter_by_any_of_metadata=filter_alternative,
+        filter_by_any_custom_metadata=filter_alternative,
     )
     assert total_count == 1
     assert len(result) == 1
@@ -281,7 +281,7 @@ async def test_filter_projects_by_metadata(
         app=client.app,
         product_name=osparc_product_name,
         user_id=user_id,
-        filter_by_any_of_metadata=filter_non_matching,
+        filter_by_any_custom_metadata=filter_non_matching,
     )
     assert total_count == 0
     assert len(result) == 0
@@ -293,7 +293,7 @@ async def test_filter_projects_by_metadata(
         app=client.app,
         product_name=osparc_product_name,
         user_id=user_id,
-        filter_by_any_of_metadata=filter_wildcard,
+        filter_by_any_custom_metadata=filter_wildcard,
     )
     assert total_count == 1
     assert len(result) == 1
@@ -305,7 +305,7 @@ async def test_filter_projects_by_metadata(
         product_name=osparc_product_name,
         user_id=user_id,
         filter_by_job_parent_resource_name_prefix="test/resource",
-        filter_by_any_of_metadata=[{"category": "simulation"}],
+        filter_by_any_custom_metadata=[{"category": "simulation"}],
     )
     assert total_count == 1
     assert len(result) == 1
@@ -317,7 +317,7 @@ async def test_filter_projects_by_metadata(
         product_name=osparc_product_name,
         user_id=user_id,
         filter_by_job_parent_resource_name_prefix="non-matching",
-        filter_by_any_of_metadata=[{"category": "simulation"}],
+        filter_by_any_custom_metadata=[{"category": "simulation"}],
     )
     assert total_count == 0
     assert len(result) == 0