apunkt/SurfSense
1
0
Fork 0
mirror of https://github.com/MODSetter/SurfSense.git synced 2026-06-06 20:15:17 +02:00
Code Issues Projects Releases Packages Wiki Activity

refactor: use pure metadata core in base handler

Browse source
This commit is contained in:
CREDO23 2026-06-03 21:52:58 +02:00
parent d53707ebbf
commit 7618c3aafb
1 changed files with 10 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

33
surfsense_backend/app/notifications/service/base.py
View file

@ -3,7 +3,6 @@
from __future__ import annotations from __future__ import annotations
import logging import logging
from datetime import UTC, datetime
from typing import Any from typing import Any
from uuid import UUID from uuid import UUID
@ -12,6 +11,7 @@ from sqlalchemy.ext.asyncio import AsyncSession
from sqlalchemy.orm.attributes import flag_modified from sqlalchemy.orm.attributes import flag_modified
from app.notifications.persistence import Notification from app.notifications.persistence import Notification
from app.notifications.service.metadata import apply_update, start_metadata
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -60,10 +60,10 @@ class BaseNotificationHandler:
notification.title = title notification.title = title
notification.message = message notification.message = message
if initial_metadata: if initial_metadata:
notification.notification_metadata = { notification.notification_metadata = apply_update(
**notification.notification_metadata, notification.notification_metadata,
**initial_metadata, metadata_updates=initial_metadata,
} )
# Tell SQLAlchemy the JSONB dict changed in place. # Tell SQLAlchemy the JSONB dict changed in place.
flag_modified(notification, "notification_metadata") flag_modified(notification, "notification_metadata")
await session.commit() await session.commit()
@ -73,10 +73,7 @@ class BaseNotificationHandler:
) )
return notification return notification
metadata = initial_metadata or {} metadata = start_metadata(operation_id, initial_metadata)
metadata["operation_id"] = operation_id
metadata["status"] = "in_progress"
metadata["started_at"] = datetime.now(UTC).isoformat()
notification = Notification( notification = Notification(
user_id=user_id, user_id=user_id,
@ -109,20 +106,10 @@ class BaseNotificationHandler:
if message is not None: if message is not None:
notification.message = message notification.message = message
if status is not None: if status is not None or metadata_updates:
notification.notification_metadata["status"] = status notification.notification_metadata = apply_update(
if status in ("completed", "failed"): notification.notification_metadata, status, metadata_updates
notification.notification_metadata["completed_at"] = datetime.now( )
UTC
).isoformat()
# Tell SQLAlchemy the JSONB dict changed in place.
flag_modified(notification, "notification_metadata")
if metadata_updates:
notification.notification_metadata = {
**notification.notification_metadata,
**metadata_updates,
}
# Tell SQLAlchemy the JSONB dict changed in place. # Tell SQLAlchemy the JSONB dict changed in place.
flag_modified(notification, "notification_metadata") flag_modified(notification, "notification_metadata")