draft implementation

Author: pcrespov

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

@@ -387,24 +387,61 @@ async def list_all_services(
         pagination_offset: int | None = None,
         filters: ServiceDBFilters | None = None,
     ) -> tuple[PositiveInt, list[ServiceMetaDataDBGet]]:
-        # get page count
-        stmt_total = _services_sql.all_services_total_count_stmt(
-            product_name=product_name,
-            user_id=user_id,
-            access_rights=AccessRightsClauses.can_read,
-            filters=filters,
+        # Create base query that's common to both count and content queries
+        base_query = (
+            sa.select(services_meta_data.c.key, services_meta_data.c.version)
+            .select_from(
+                services_meta_data.join(
+                    services_access_rights,
+                    (services_meta_data.c.key == services_access_rights.c.key)
+                    & (
+                        services_meta_data.c.version == services_access_rights.c.version
+                    ),
+                ).join(
+                    user_to_groups,
+                    (user_to_groups.c.gid == services_access_rights.c.gid),
+                )
+            )
+            .where(
+                (services_access_rights.c.product_name == product_name)
+                & (user_to_groups.c.uid == user_id)
+                & AccessRightsClauses.can_read
+            )
+            .distinct()
         )
 
-        # get page content
-        stmt_page = _services_sql.list_all_services_stmt(
-            product_name=product_name,
-            user_id=user_id,
-            access_rights=AccessRightsClauses.can_read,
-            limit=pagination_limit,
-            offset=pagination_offset,
-            filters=filters,
+        if filters:
+            base_query = _services_sql.apply_services_filters(base_query, filters)
+
+        # Subquery for efficient counting and further joins
+        subquery = base_query.subquery()
+
+        # Count query - only counts distinct key/version pairs
+        stmt_total = sa.select(sa.func.count()).select_from(subquery)
+
+        # Content query - gets all details with pagination
+        stmt_page = (
+            sa.select(*SERVICES_META_DATA_COLS)
+            .select_from(
+                subquery.join(
+                    services_meta_data,
+                    (subquery.c.key == services_meta_data.c.key)
+                    & (subquery.c.version == services_meta_data.c.version),
+                )
+            )
+            .order_by(
+                services_meta_data.c.key,
+                sa.desc(_services_sql.by_version(services_meta_data.c.version)),
+            )
         )
 
+        # Apply pagination to content query
+        if pagination_offset is not None:
+            stmt_page = stmt_page.offset(pagination_offset)
+        if pagination_limit is not None:
+            stmt_page = stmt_page.limit(pagination_limit)
+
+        # Execute both queries
         async with self.db_engine.connect() as conn:
             result = await conn.execute(stmt_total)
             total_count = result.scalar() or 0

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

@@ -1052,6 +1052,7 @@ async def test_compare_list_all_and_latest_services(
 
     # Verify pagination
     assert total_all_page1 == 6  # Total count should still be total
+    assert total_all_page2 == 6
     assert len(all_services_page1) == 2  # But only 2 items on first page
     assert len(all_services_page2) == 2  # And 2 items on second page