Merge remote-tracking branch 'origin/main'

7project/src/backend/app/core/queue.py

@@ -1,6 +0,0 @@
-import app.celery_app  # noqa: F401
-from app.workers.celery_tasks import send_email
-
-
-def enqueue_email(to: str, subject: str, body: str) -> None:
-    send_email.delay(to, subject, body)

7project/src/backend/app/services/user_service.py

@@ -14,11 +14,10 @@ from httpx_oauth.oauth2 import BaseOAuth2
 
 from app.models.user import User
 from app.oauth.bank_id import BankID
-from app.oauth.csas import CSASOAuth
+from app.workers.celery_tasks import send_email
 from app.oauth.custom_openid import CustomOpenID
 from app.oauth.moje_id import MojeIDOAuth
 from app.services.db import get_user_db
-from app.core.queue import enqueue_email
 
 SECRET = os.getenv("SECRET", "CHANGE_ME_SECRET")
 
@@ -87,7 +86,7 @@ class UserManager(UUIDIDMixin, BaseUserManager[User, uuid.UUID]):
             "Pokud jsi registraci neprováděl(a), tento email ignoruj.\n"
         )
         try:
-            enqueue_email(to=user.email, subject=subject, body=body)
+            send_email.delay(user.email, subject, body)
         except Exception as e:
             print("[Email Fallback] To:", user.email)
             print("[Email Fallback] Subject:", subject)

7project/src/backend/tests/test_unit_user_service.py

@@ -34,15 +34,16 @@ def test_authenticated_route_requires_auth(client):
 async def test_on_after_request_verify_enqueues_email(monkeypatch):
     calls = {}
 
-    def fake_enqueue_email(to: str, subject: str, body: str):
+    class FakeCeleryTask:
-        calls.setdefault("emails", []).append({
+        def delay(to: str, subject: str, body: str):
-            "to": to,
+            calls.setdefault("emails", []).append({
-            "subject": subject,
+                "to": to,
-            "body": body,
+                "subject": subject,
-        })
+                "body": body,
+            })
 
     # Patch the enqueue_email used inside user_service
-    monkeypatch.setattr(user_service, "enqueue_email", fake_enqueue_email)
+    monkeypatch.setattr(user_service, "send_email", FakeCeleryTask)
 
     class DummyUser:
         def __init__(self, email):