fixes notifications and cleanup tests

Author: pcrespov

packages/notifications-library/src/notifications_library/_models.py

@@ -2,10 +2,18 @@
 
 from models_library.products import ProductName
 
-
 #
 # *Data are models used for rendering
 #
+
+
+@dataclass(frozen=True)
+class JinjaTemplateDbGet:
+    product_name: ProductName
+    name: str
+    content: str
+
+
 @dataclass(frozen=True)
 class UserData:
     first_name: str

packages/notifications-library/src/notifications_library/_repository.py

@@ -1,7 +1,12 @@
+from collections.abc import AsyncIterable
+
 import sqlalchemy as sa
 from models_library.products import ProductName
 from models_library.users import UserID
-from notifications_library._models import UserData
+from notifications_library._models import (
+    JinjaTemplateDbGet,
+    UserData,
+)
 from simcore_postgres_database.models.jinja2_templates import jinja2_templates
 from simcore_postgres_database.models.products_to_templates import products_to_templates
 from simcore_postgres_database.models.users import users
@@ -37,7 +42,9 @@ async def get_user_data(self, user_id: UserID) -> UserData:
 
 
 class TemplatesRepo(_BaseRepo):
-    async def iter_email_templates(self, product_name: ProductName):
+    async def iter_email_templates(
+        self, product_name: ProductName
+    ) -> AsyncIterable[JinjaTemplateDbGet]:
         async with pass_or_acquire_connection(self.db_engine) as conn:
             async for row in await conn.stream(
                 sa.select(
@@ -50,9 +57,13 @@ async def iter_email_templates(self, product_name: ProductName):
                     & (jinja2_templates.c.name.ilike("%.email.%"))
                 )
             ):
-                yield row
+                yield JinjaTemplateDbGet(
+                    product_name=product_name, name=row.name, content=row.content
+                )
 
-    async def iter_product_templates(self, product_name: ProductName):
+    async def iter_product_templates(
+        self, product_name: ProductName
+    ) -> AsyncIterable[JinjaTemplateDbGet]:
         async with pass_or_acquire_connection(self.db_engine) as conn:
             async for row in await conn.stream(
                 sa.select(
@@ -63,4 +74,6 @@ async def iter_product_templates(self, product_name: ProductName):
                 .select_from(products_to_templates.join(jinja2_templates))
                 .where(products_to_templates.c.product_name == product_name)
             ):
-                yield row
+                yield JinjaTemplateDbGet(
+                    product_name=row.product_name, name=row.name, content=row.template
+                )

packages/notifications-library/src/notifications_library/_templates.py

@@ -10,7 +10,7 @@
 from aiofiles.os import wrap as sync_to_async
 from models_library.products import ProductName
 
-from ._db import TemplatesRepo
+from ._repository import TemplatesRepo
 
 _logger = logging.getLogger(__name__)
 

packages/notifications-library/tests/with_db/test__repository.py

@@ -33,7 +33,7 @@ async def test_user_data_repo(
 
     repo = UsersRepo(sqlalchemy_async_engine)
     got = await repo.get_user_data(user_id)
-    assert UserData(*got) == user_data
+    assert got == user_data
 
 
 async def test_payments_data_repo(

services/web/server/src/simcore_service_webserver/login/_confirmation_web.py

@@ -1,16 +1,16 @@
 from urllib.parse import quote
 
 from aiohttp import web
-from models_library.basic_types import IDStr
 from yarl import URL
 
 
-def _url_for_confirmation(app: web.Application, code: IDStr) -> URL:
+def _url_for_confirmation(app: web.Application, code: str) -> URL:
     # NOTE: this is in a query parameter, and can contain ? for example.
     safe_code = quote(code, safe="")
     return app.router["auth_confirmation"].url_for(code=safe_code)
 
 
-def make_confirmation_link(request: web.Request, code: IDStr) -> str:
+def make_confirmation_link(request: web.Request, code: str) -> str:
+    assert code  # nosec
     link = _url_for_confirmation(request.app, code=code)
     return f"{request.scheme}://{request.host}{link}"

services/web/server/src/simcore_service_webserver/login/_login_repository_legacy.py

@@ -4,7 +4,6 @@
 
 import asyncpg
 from aiohttp import web
-from models_library.basic_types import IDStr
 from servicelib.utils_secrets import generate_passcode
 
 from . import _login_repository_legacy_sql
@@ -22,7 +21,7 @@
 
 
 class BaseConfirmationTokenDict(TypedDict):
-    code: IDStr
+    code: str
     action: ActionLiteralStr