fixes tests

Author: pcrespov

services/catalog/src/simcore_service_catalog/service/catalog_services.py

@@ -194,7 +194,6 @@ async def list_latest_catalog_services(
                     filters=filters,
                     limit=limit,
                     offset=offset,
-                    access_rights=access_rights,
                 ),
                 tip="This might be due to malfunction of the background-task or that this call was done while the sync was taking place",
             )

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

@@ -14,9 +14,6 @@
 from models_library.products import ProductName
 from models_library.rest_pagination import MAXIMUM_NUMBER_OF_ITEMS_PER_PAGE
 from models_library.services_history import ServiceRelease
-from models_library.services_regex import (
-    DYNAMIC_SERVICE_KEY_PREFIX,
-)
 from models_library.services_types import ServiceKey, ServiceVersion
 from models_library.users import UserID
 from packaging import version
@@ -131,6 +128,35 @@ async def test_rpc_list_services_paginated_with_no_services_returns_empty_page(
     assert page.meta.total == 0
 
 
+async def test_rpc_list_services_paginated_with_filters(
+    background_sync_task_mocked: None,
+    mocked_director_rest_api: MockRouter,
+    rpc_client: RabbitMQRPCClient,
+    product_name: ProductName,
+    user_id: UserID,
+    app: FastAPI,
+):
+    assert app
+
+    # only computational services introduced by the background_sync_task_mocked
+    page = await list_services_paginated(
+        rpc_client,
+        product_name=product_name,
+        user_id=user_id,
+        filters={"service_type": "computational"},
+    )
+    assert page.meta.total == page.meta.count
+    assert page.meta.total > 0
+
+    page = await list_services_paginated(
+        rpc_client,
+        product_name=product_name,
+        user_id=user_id,
+        filters={"service_type": "dynamic"},
+    )
+    assert page.meta.total == 0
+
+
 async def test_rpc_catalog_client(
     background_sync_task_mocked: None,
     mocked_director_rest_api: MockRouter,
@@ -556,68 +582,3 @@ async def test_rpc_list_my_service_history_paginated(
     assert len(release_history) == 2
     assert release_history[0].version == service_version_2, "expected newest first"
     assert release_history[1].version == service_version_1
-
-
-async def test_rpc_list_services_paginated_with_filters(
-    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,
-):
-    assert app
-
-    # only computational services introduced by the background_sync_task_mocked
-    page = await list_services_paginated(
-        rpc_client,
-        product_name=product_name,
-        user_id=user_id,
-        filters={"service_type": "computational"},
-    )
-    assert page.meta.total == page.meta.count
-    assert page.meta.total > 0
-
-    page = await list_services_paginated(
-        rpc_client,
-        product_name=product_name,
-        user_id=user_id,
-        filters={"service_type": "dynamic"},
-    )
-    assert page.meta.total == 0
-
-    # Create fake services with different types
-    service_key_1 = f"{DYNAMIC_SERVICE_KEY_PREFIX}/test-filter-service"
-    service_version = "1.2.3"
-
-    fake_services = [
-        create_fake_service_data(
-            service_key_1,
-            service_version,
-            team_access=None,
-            everyone_access=None,
-            product=product_name,
-        ),
-    ]
-
-    # Inject fake services into the database
-    await services_db_tables_injector(fake_services)
-
-    # Apply a filter to match only computational services
-    page = await list_services_paginated(
-        rpc_client,
-        product_name=product_name,
-        user_id=user_id,
-        filters={"service_type": "dynamic"},
-    )
-
-    # Validate the response
-    assert page.meta.total == 1
-    assert page.meta.count == 1
-    assert len(page.data) == 1
-    assert page.data[0].key == service_key_1
-    assert page.data[0].service_type == "frontend"
-    assert page.links.next is None
-    assert page.links.prev is None