From 49f054545efbfaf8a567f4021fb180b85c2f259b Mon Sep 17 00:00:00 2001 From: Hugo bessa Date: Sat, 21 Dec 2024 00:35:06 -0300 Subject: [PATCH] Send adapter import string to store on notification --- .../notification_backends/asyncio_base.py | 6 +++++- .../services/notification_backends/base.py | 7 ++++++- vintasend/services/notification_service.py | 19 ++++++++++++++++--- 3 files changed, 27 insertions(+), 5 deletions(-) diff --git a/vintasend/services/notification_backends/asyncio_base.py b/vintasend/services/notification_backends/asyncio_base.py index b041c5f..bcb5691 100644 --- a/vintasend/services/notification_backends/asyncio_base.py +++ b/vintasend/services/notification_backends/asyncio_base.py @@ -129,7 +129,11 @@ async def get_user_email_from_notification( @abstractmethod async def store_context_used( - self, notification_id: int | str | uuid.UUID, context: dict, lock: asyncio.Lock | None = None + self, + notification_id: int | str | uuid.UUID, + context: dict, + adapter_import_str: str, + lock: asyncio.Lock | None = None, ) -> None: ... \ No newline at end of file diff --git a/vintasend/services/notification_backends/base.py b/vintasend/services/notification_backends/base.py index 4dd23c1..b67c988 100644 --- a/vintasend/services/notification_backends/base.py +++ b/vintasend/services/notification_backends/base.py @@ -123,5 +123,10 @@ def get_user_email_from_notification(self, notification_id: int | str | uuid.UUI raise NotImplementedError @abstractmethod - def store_context_used(self, notification_id: int | str | uuid.UUID, context: dict) -> None: + def store_context_used( + self, + notification_id: int | str | uuid.UUID, + context: dict, + adapter_import_str: str, + ) -> None: raise NotImplementedError diff --git a/vintasend/services/notification_service.py b/vintasend/services/notification_service.py index 62229b3..6b80d0a 100644 --- a/vintasend/services/notification_service.py +++ b/vintasend/services/notification_service.py @@ -207,7 +207,11 @@ def send(self, notification: Notification) -> None: raise e try: self.notification_backend.mark_pending_as_sent(notification.id) - self.notification_backend.store_context_used(notification.id, context) + self.notification_backend.store_context_used( + notification.id, + context, + adapter.adapter_import_str, + ) except NotificationUpdateError as e: raise NotificationMarkSentError("Failed to mark notification as sent") from e @@ -532,7 +536,11 @@ def delayed_send(self, notification_dict: NotificationDict, context_dict: dict) raise e try: self.notification_backend.mark_pending_as_sent(notification_dict["id"]) - self.notification_backend.store_context_used(notification_dict["id"], context_dict) + self.notification_backend.store_context_used( + notification_dict["id"], + context_dict, + async_adapter.adapter_import_str, + ) except NotificationUpdateError as e: raise NotificationMarkSentError("Failed to mark notification as sent") from e @@ -651,7 +659,12 @@ async def send(self, notification: Notification, lock: asyncio.Lock | None = Non raise e try: await self.notification_backend.mark_pending_as_sent(notification.id, lock) - await self.notification_backend.store_context_used(notification.id, context, lock) + await self.notification_backend.store_context_used( + notification.id, + context, + adapter.adapter_import_str, + lock + ) except NotificationUpdateError as e: raise NotificationMarkSentError("Failed to mark notification as sent") from e return None