fix: models

Author: giancarloromeo

packages/models-library/src/models_library/rpc/notifications/events/__init__.py

@@ -4,6 +4,9 @@
     AccountApprovedEvent,
     AccountRejectedEvent,
     AccountRequestedEvent,
+    ProductData,
+    ProductUIData,
+    UserData,
 )
 
 Event: TypeAlias = AccountRequestedEvent | AccountApprovedEvent | AccountRejectedEvent
@@ -14,6 +17,9 @@
     "AccountRejectedEvent",
     "AccountRequestedEvent",
     "Event",
+    "ProductData",
+    "ProductUIData",
+    "UserData",
 )
 
 # nopycln: file

packages/models-library/src/models_library/rpc/notifications/events/_account_events.py

@@ -1,19 +1,46 @@
 from typing import Literal
 
 from common_library.pydantic_basic_types import NotEmptyStr
+from models_library.products import ProductName
 from pydantic import BaseModel, EmailStr
 
 
-class AccountRequestedEvent(BaseModel):
-    type: Literal["account_requested"] = "account_requested"
-
+class UserData(BaseModel):
+    username: str
     first_name: str
     last_name: str
     email: EmailStr
 
     # TODO: add more fields as needed
 
 
+class ProductUIData(BaseModel):
+    project_alias: str
+    logo_url: str | None = (
+        None  # default_logo = "https://raw.githubusercontent.com/ITISFoundation/osparc-simcore/refs/heads/master/services/static-webserver/client/source/resource/osparc/osparc-white.svg" in base.html
+    )
+    strong_color: str | None = (
+        None  # default_strong_color = "rgb(131, 0, 191)" in base.html
+    )
+
+
+class ProductData(BaseModel):
+    product_name: ProductName
+    display_name: str
+    vendor_display_inline: str
+    support_email: str
+    homepage_url: str | None  # default_homepage = "https://osparc.io/" in base.html
+    ui: ProductUIData
+
+
+class AccountRequestedEvent(BaseModel):
+    type: Literal["account_requested"] = "account_requested"
+
+    user: UserData
+    product: ProductData
+    host: str
+
+
 class AccountApprovedEvent(BaseModel):
     type: Literal["account_approved"] = "account_approved"
 

services/notifications/src/simcore_service_notifications/core/events.py

@@ -45,7 +45,7 @@ def create_app_lifespan(settings: ApplicationSettings) -> LifespanManager:
     app_lifespan.add(postgres_database_lifespan)
     app_lifespan.add(postgres_lifespan)
 
-    if settings.NOTIFICATIONS_CELERY and not settings.NOTIFICATIONS_WORKER_MODE:
+    if not settings.NOTIFICATIONS_WORKER_MODE:
         # - rabbitmq
         app_lifespan.add(rabbitmq_lifespan)
 

services/notifications/tests/unit/conftest.py

@@ -38,43 +38,42 @@ def app_environment(
     mock_environment: EnvVarsDict,
     postgres_db: sa.engine.Engine,  # wait for postgres service to start
     postgres_env_vars_dict: EnvVarsDict,
+    rabbit_service: RabbitSettings,
+    redis_service: RedisSettings,
 ) -> EnvVarsDict:
     return setenvs_from_dict(
         monkeypatch,
         {
             **mock_environment,
             **postgres_env_vars_dict,
+            "RABBIT_HOST": rabbit_service.RABBIT_HOST,
+            "RABBIT_PASSWORD": rabbit_service.RABBIT_PASSWORD.get_secret_value(),
+            "RABBIT_PORT": f"{rabbit_service.RABBIT_PORT}",
+            "RABBIT_SECURE": f"{rabbit_service.RABBIT_SECURE}",
+            "RABBIT_USER": rabbit_service.RABBIT_USER,
+            "REDIS_SECURE": redis_service.REDIS_SECURE,
+            "REDIS_HOST": redis_service.REDIS_HOST,
+            "REDIS_PORT": f"{redis_service.REDIS_PORT}",
+            "REDIS_PASSWORD": redis_service.REDIS_PASSWORD.get_secret_value(),
         },
     )
 
 
-@pytest.fixture
-def enabled_rabbitmq(
-    app_environment: EnvVarsDict, rabbit_service: RabbitSettings
-) -> RabbitSettings:
-    return rabbit_service
-
-
-@pytest.fixture
-def enabled_redis(
-    app_environment: EnvVarsDict, redis_service: RedisSettings
-) -> RedisSettings:
-    return redis_service
-
-
 @pytest.fixture
 def app_settings(
     app_environment: EnvVarsDict,
-    enabled_rabbitmq: RabbitSettings,
-    enabled_redis: RedisSettings,
+    monkeypatch: pytest.MonkeyPatch,
 ) -> ApplicationSettings:
+    monkeypatch.setenv("NOTIFICATIONS_WORKER_MODE", "false")
     settings = ApplicationSettings.create_from_envs()
     print(f"{settings.model_dump_json(indent=2)=}")
     return settings
 
 
 @pytest.fixture
-async def fastapi_app(app_settings: ApplicationSettings) -> AsyncIterator[FastAPI]:
+async def mock_fastapi_app(
+    mock_celery_app: None, app_settings: ApplicationSettings
+) -> AsyncIterator[FastAPI]:
     app: FastAPI = create_app(app_settings)
 
     async with LifespanManager(app, startup_timeout=30, shutdown_timeout=30):
@@ -111,7 +110,6 @@ def mock_celery_app(mocker: MockerFixture, celery_config: dict[str, Any]) -> Cel
 async def mock_celery_worker(
     app_environment: EnvVarsDict,
     celery_app: Celery,
-    fastapi_app: FastAPI,
     monkeypatch: pytest.MonkeyPatch,
 ) -> AsyncIterator[Any]:
     monkeypatch.setenv("NOTIFICATIONS_WORKER_MODE", "true")
@@ -121,7 +119,7 @@ def _on_worker_init_wrapper(sender: WorkController, **_kwargs):
         assert app_settings.NOTIFICATIONS_CELERY  # nosec
         return partial(
             on_worker_init,
-            FastAPIAppServer(app=fastapi_app),
+            FastAPIAppServer(app=create_app(app_settings)),
             app_settings.NOTIFICATIONS_CELERY,
         )(sender, **_kwargs)
 

services/notifications/tests/unit/test_send_email_tasks.py

@@ -4,6 +4,9 @@
 from models_library.rpc.notifications.channels import EmailAddress, EmailChannel
 from models_library.rpc.notifications.events import (
     AccountRequestedEvent,
+    ProductData,
+    ProductUIData,
+    UserData,
 )
 from servicelib.rabbitmq import RabbitMQRPCClient
 from servicelib.rabbitmq.rpc_interfaces.notifications import (
@@ -18,9 +21,8 @@
 
 
 @pytest.mark.usefixtures(
-    "mock_celery_app",
     "mock_celery_worker",
-    "fastapi_app",
+    "mock_fastapi_app",
 )
 async def test_account_requested(
     notifications_rabbitmq_rpc_client: RabbitMQRPCClient,
@@ -32,9 +34,25 @@ async def test_account_requested(
         notifications_rabbitmq_rpc_client,
         notification=Notification(
             event=AccountRequestedEvent(
-                first_name=faker.first_name(),
-                last_name=faker.last_name(),
-                email=user_email,
+                user=UserData(
+                    username=faker.user_name(),
+                    first_name=faker.first_name(),
+                    last_name=faker.last_name(),
+                    email=user_email,
+                ),
+                product=ProductData(
+                    product_name=faker.company(),
+                    display_name=faker.company(),
+                    vendor_display_inline=faker.company_suffix(),
+                    support_email=faker.email(),
+                    homepage_url=faker.url(),
+                    ui=ProductUIData(
+                        project_alias=faker.word(),
+                        logo_url=faker.image_url(),
+                        strong_color=faker.color_name(),
+                    ),
+                ),
+                host=faker.url(),
             ),
             channel=EmailChannel(
                 from_addr=EmailAddress(addr_spec=faker.email()),