fixes fixture

Author: pcrespov

services/catalog/src/simcore_service_catalog/repository/services.py

@@ -164,7 +164,7 @@ async def get_latest_release(self, key: str) -> ServiceMetaDataDBGet | None:
         services_latest = create_select_latest_services_query().alias("services_latest")
 
         query = (
-            sa.select(SERVICES_META_DATA_COLS)
+            sa.select(*SERVICES_META_DATA_COLS)
             .select_from(
                 services_latest.join(
                     services_meta_data,

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

@@ -467,23 +467,25 @@ def create_director_list_services_from() -> (
 ):
     """Convenience function to merge outputs of
     - `create_fake_service_data` callable with those of
-    - `expected_director_list_services` fixture
+    - `expected_director_rest_api_list_services` fixture
 
-    to produce a new expected_director_list_services
+    to produce a new expected_director_rest_api_list_services
     """
 
     class _Loader(ServiceMetaDataPublished):
         model_config = ConfigDict(extra="ignore", populate_by_name=True)
 
     def _(
-        expected_director_list_services: list[dict[str, Any]],
+        expected_director_rest_api_list_services: list[dict[str, Any]],
         fake_services_data: list,
     ):
         return [
             jsonable_encoder(
                 _Loader.model_validate(
                     {
-                        **next(itertools.cycle(expected_director_list_services)),
+                        **next(
+                            itertools.cycle(expected_director_rest_api_list_services)
+                        ),
                         **data[0],  # service, **access_rights = data
                     }
                 ),

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

@@ -87,15 +87,15 @@ def fake_data_for_services(
 
 
 @pytest.fixture
-def expected_director_list_services(
-    expected_director_list_services: list[dict[str, Any]],
+def expected_director_rest_api_list_services(
+    expected_director_rest_api_list_services: list[dict[str, Any]],
     fake_data_for_services: list,
     create_director_list_services_from: Callable,
 ) -> list[dict[str, Any]]:
     # OVERRIDES: Changes the values returned by the mocked_director_service_api
 
     return create_director_list_services_from(
-        expected_director_list_services, fake_data_for_services
+        expected_director_rest_api_list_services, fake_data_for_services
     )
 
 

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

@@ -72,15 +72,15 @@ def fake_services_data(
 
 
 @pytest.fixture
-def expected_director_list_services(
-    expected_director_list_services: list[dict[str, Any]],
+def expected_director_rest_api_list_services(
+    expected_director_rest_api_list_services: list[dict[str, Any]],
     fake_services_data: list,
     create_director_list_services_from: Callable,
 ) -> list[dict[str, Any]]:
     # OVERRIDES: Changes the values returned by the mocked_director_service_api
 
     return create_director_list_services_from(
-        expected_director_list_services, fake_services_data
+        expected_director_rest_api_list_services, fake_services_data
     )