rm dependency with products domain

Author: pcrespov

.env-devel

@@ -288,7 +288,7 @@ WB_GC_LOGIN=null
 WB_GC_LOGLEVEL=INFO
 WB_GC_NOTIFICATIONS=0
 WB_GC_PAYMENTS=null
-WB_GC_PRODUCTS=1
+WB_GC_PRODUCTS=0
 WB_GC_PROJECTS=null
 WB_GC_PUBLICATIONS=0
 WB_GC_RESOURCE_MANAGER_RESOURCE_TTL_S=60

services/web/server/src/simcore_service_webserver/products/_api.py

@@ -42,6 +42,11 @@ def list_products(app: web.Application) -> list[Product]:
     return products
 
 
+async def list_products_names(app: web.Application) -> list[ProductName]:
+    repo = ProductRepository.create_from_app(app)
+    return await repo.list_products_names()
+
+
 async def get_current_product_credit_price_info(
     request: web.Request,
 ) -> ProductPriceInfo | None:

services/web/server/src/simcore_service_webserver/products/_db.py

@@ -86,6 +86,13 @@ async def iter_products(conn: SAConnection) -> AsyncIterator[ResultProxy]:
 
 
 class ProductRepository(BaseRepository):
+    async def list_products_names(self) -> list[ProductName]:
+        async with self.engine.acquire() as conn:
+            query = sa.select(products.c.name).order_by(products.c.priority)
+            result = await conn.execute(query)
+            rows = await result.fetchall()
+            return [ProductName(row.name) for row in rows]
+
     async def get_product(self, product_name: str) -> Product | None:
         async with self.engine.acquire() as conn:
             result: ResultProxy = await conn.execute(

services/web/server/src/simcore_service_webserver/trash/_service.py

@@ -112,28 +112,30 @@ async def safe_delete_expired_trash_as_admin(app: web.Application) -> None:
     retention = timedelta(days=settings.TRASH_RETENTION_DAYS)
     delete_until = arrow.now().datetime - retention
 
-    for product in products_service.list_products(app):
+    app_products_names = await products_service.list_products_names(app)
+
+    for product_name in app_products_names:
 
         ctx = {
             "delete_until": delete_until,
             "retention": retention,
-            "product_name": product.name,
+            "product_name": product_name,
         }
 
         with log_context(
             _logger,
             logging.DEBUG,
             "Deleting items marked as trashed before %s in %s [trashed_at < %s will be deleted]",
             retention,
-            product.display_name,
+            product_name,
             delete_until,
         ):
             try:
 
                 await folders_trash_service.batch_delete_trashed_folders_as_admin(
                     app,
                     trashed_before=delete_until,
-                    product_name=product.name,
+                    product_name=product_name,
                     fail_fast=False,
                 )