replaces base repo

Author: pcrespov

services/web/server/src/simcore_service_webserver/db/base_repository.py

@@ -1,46 +1,16 @@
+from dataclasses import dataclass
 from typing import Self
 
-import aiopg.sa
 from aiohttp import web
-from attr import dataclass
 from models_library.users import UserID
 from sqlalchemy.ext.asyncio import AsyncEngine
 
 from ..constants import RQT_USERID_KEY
-from . import _aiopg, _asyncpg
-
-
-class BaseRepository:
-    def __init__(self, engine: aiopg.sa.Engine, user_id: UserID | None = None):
-        self._engine = engine
-        self._user_id = user_id
-
-        assert isinstance(self._engine, aiopg.sa.Engine)  # nosec
-
-    @classmethod
-    def create_from_request(cls, request: web.Request):
-        return cls(
-            engine=_aiopg.get_database_engine(request.app),
-            user_id=request.get(RQT_USERID_KEY),
-        )
-
-    @classmethod
-    def create_from_app(cls, app: web.Application):
-        return cls(engine=_aiopg.get_database_engine(app), user_id=None)
-
-    @property
-    def engine(self) -> aiopg.sa.Engine:
-        return self._engine
-
-    @property
-    def user_id(self) -> int | None:
-        return self._user_id
+from . import _asyncpg
 
 
 @dataclass(frozen=True)
-class BaseRepositoryV2:
-    # NOTE: Will replace BaseRepository
-    # https://github.com/ITISFoundation/osparc-simcore/issues/4529
+class BaseRepository:
     engine: AsyncEngine
     user_id: UserID | None = None
 

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

@@ -26,7 +26,7 @@
 from sqlalchemy.ext.asyncio import AsyncConnection
 
 from ..constants import FRONTEND_APPS_AVAILABLE
-from ..db.base_repository import BaseRepositoryV2
+from ..db.base_repository import BaseRepository
 from ._models import PaymentFieldsTuple, Product
 
 _logger = logging.getLogger(__name__)
@@ -93,7 +93,7 @@ async def _get_product_payment_fields(
     )
 
 
-class ProductRepository(BaseRepositoryV2):
+class ProductRepository(BaseRepository):
 
     async def list_products(
         self,