test: add comprehensive filter combination tests for list_services_paginated

Author: pcrespov

services/catalog/tests/unit/with_dbs/test_api_rpc.py

@@ -11,8 +11,13 @@
 import pytest
 from faker import Faker
 from fastapi import FastAPI
+from models_library.api_schemas_catalog.services import (
+    ServiceListFilters,
+    ServiceUpdateV2,
+)
 from models_library.products import ProductName
 from models_library.rest_pagination import MAXIMUM_NUMBER_OF_ITEMS_PER_PAGE
+from models_library.services_enums import ServiceType
 from models_library.services_history import ServiceRelease
 from models_library.services_types import ServiceKey, ServiceVersion
 from models_library.users import UserID
@@ -145,11 +150,133 @@ async def test_rpc_list_services_paginated_with_filters(
         rpc_client,
         product_name=product_name,
         user_id=user_id,
-        filters={"service_type": "dynamic"},
+        filters=ServiceListFilters(service_type=ServiceType.DYNAMIC),
     )
     assert page.meta.total == 0
 
 
+async def test_rpc_list_services_paginated_with_filter_combinations(
+    background_sync_task_mocked: None,
+    mocked_director_rest_api: MockRouter,
+    rpc_client: RabbitMQRPCClient,
+    product_name: ProductName,
+    user_id: UserID,
+    app: FastAPI,
+    create_fake_service_data: Callable,
+    services_db_tables_injector: Callable,
+):
+    """Tests all combinations of filters for list_services_paginated"""
+    # Setup: Create test services with different patterns and types
+    test_services = [
+        # Computational services
+        create_fake_service_data(
+            "simcore/services/comp/test-service1",
+            "1.0.0",
+            team_access=None,
+            everyone_access=None,
+            product=product_name,
+            version_display="2023 Release",
+        ),
+        create_fake_service_data(
+            "simcore/services/comp/test-service2",
+            "1.0.0",
+            team_access=None,
+            everyone_access=None,
+            product=product_name,
+            version_display=None,
+        ),
+        # Dynamic services
+        create_fake_service_data(
+            "simcore/services/dynamic/jupyter-lab",
+            "1.0.0",
+            team_access=None,
+            everyone_access=None,
+            product=product_name,
+            version_display="2024 Beta",
+        ),
+        create_fake_service_data(
+            "simcore/services/dynamic/jupyter-python",
+            "1.0.0",
+            team_access=None,
+            everyone_access=None,
+            product=product_name,
+            version_display=None,
+        ),
+    ]
+    await services_db_tables_injector(test_services)
+
+    # Test 1: Filter by service type only
+    page = await catalog_rpc.list_services_paginated(
+        rpc_client,
+        product_name=product_name,
+        user_id=user_id,
+        filters=ServiceListFilters(service_type=ServiceType.COMPUTATIONAL),
+    )
+    assert page.meta.total == 2
+    assert all("services/comp/" in item.key for item in page.data)
+
+    # Test 2: Filter by key pattern only
+    page = await catalog_rpc.list_services_paginated(
+        rpc_client,
+        product_name=product_name,
+        user_id=user_id,
+        filters=ServiceListFilters(service_key_pattern="*/jupyter-*"),
+    )
+    assert page.meta.total == 2
+    assert all("jupyter-" in item.key for item in page.data)
+
+    # Test 3: Filter by version display pattern only
+    page = await catalog_rpc.list_services_paginated(
+        rpc_client,
+        product_name=product_name,
+        user_id=user_id,
+        filters=ServiceListFilters(version_display_pattern="*2023*"),
+    )
+    assert page.meta.total == 1
+    assert page.data[0].version_display == "2023 Release"
+
+    # Test 4: Combined filters - type and key pattern
+    page = await catalog_rpc.list_services_paginated(
+        rpc_client,
+        product_name=product_name,
+        user_id=user_id,
+        filters=ServiceListFilters(
+            service_type=ServiceType.DYNAMIC, service_key_pattern="*/jupyter-*"
+        ),
+    )
+    assert page.meta.total == 2
+    assert all(
+        "services/dynamic/" in item.key and "jupyter-" in item.key for item in page.data
+    )
+
+    # Test 5: Combined filters with version display pattern
+    page = await catalog_rpc.list_services_paginated(
+        rpc_client,
+        product_name=product_name,
+        user_id=user_id,
+        filters=ServiceListFilters(
+            service_type=ServiceType.DYNAMIC,
+            service_key_pattern="*/jupyter-*",
+            version_display_pattern="*2024*",
+        ),
+    )
+    assert page.meta.total == 1
+    assert page.data[0].key == "simcore/services/dynamic/jupyter-lab"
+    assert page.data[0].version_display == "2024 Beta"
+    page = await catalog_rpc.list_services_paginated(
+        rpc_client,
+        product_name=product_name,
+        user_id=user_id,
+        filters=ServiceListFilters(
+            service_type=ServiceType.DYNAMIC,
+            service_key_pattern="*/jupyter-*",
+            version_display_pattern="*2024*",
+        ),
+    )
+    assert page.meta.total == 1
+    assert page.data[0].version_display == "2024 Beta"
+
+
 async def test_rpc_catalog_client_workflow(
     background_sync_task_mocked: None,
     mocked_director_rest_api: MockRouter,
@@ -199,13 +326,13 @@ async def test_rpc_catalog_client_workflow(
         user_id=user_id,
         service_key=service_key,
         service_version=service_version,
-        update={
-            "name": "foo",
-            "description": "bar",
-            "icon": random_icon_url(faker),
-            "version_display": "this is a nice version",
-            "description_ui": True,  # owner activates wiki view
-        },  # type: ignore
+        update=ServiceUpdateV2(
+            name="foo",
+            description="bar",
+            icon=random_icon_url(faker),
+            version_display="this is a nice version",
+            description_ui=True,  # owner activates wiki view
+        ),
     )
 
     assert updated.key == got.key