renate notification metadata to adapter_extra_parameters

vintasoftware · Dec 21, 2024 · 86356fb · 86356fb
1 parent 6fc2241
commit 86356fb
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 14 deletions.
diff --git a/vintasend/services/dataclasses.py b/vintasend/services/dataclasses.py
@@ -68,7 +68,8 @@ class Notification:
     preheader_template: str
     status: str
     context_used: dict | None = None
-    metadata: dict | None = None
+    adapter_used: str | None = None
+    adapter_extra_parameters: dict | None = None
 
 
 class UpdateNotificationKwargs(TypedDict, total=False):
@@ -79,4 +80,4 @@ class UpdateNotificationKwargs(TypedDict, total=False):
     send_after: datetime.datetime | None
     subject_template: str | None
     preheader_template: str | None
-    metadata: dict | None
+    adapter_extra_parameters: dict | None
diff --git a/vintasend/services/notification_adapters/async_base.py b/vintasend/services/notification_adapters/async_base.py
@@ -19,7 +19,7 @@ class NotificationDict(TypedDict):
     preheader_template: str
     status: str
     context_used: dict | None
-    metadata: dict | None
+    adapter_extra_parameters: dict | None
 
 
 @runtime_checkable

diff --git a/vintasend/services/notification_backends/asyncio_base.py b/vintasend/services/notification_backends/asyncio_base.py
@@ -60,7 +60,7 @@ async def persist_notification(
         send_after: datetime.datetime | None,
         subject_template: str,
         preheader_template: str,
-        metadata: dict | None = None,
+        adapter_extra_parameters: dict | None = None,
         lock: asyncio.Lock | None = None
     ) -> "Notification":
         ...

diff --git a/vintasend/services/notification_backends/base.py b/vintasend/services/notification_backends/base.py
@@ -67,7 +67,7 @@ def persist_notification(
         send_after: datetime.datetime | None,
         subject_template: str,
         preheader_template: str,
-        metadata: dict | None = None,
+        adapter_extra_parameters: dict | None = None,
     ) -> "Notification":
         raise NotImplementedError
 

diff --git a/vintasend/services/notification_backends/stubs/fake_backend.py b/vintasend/services/notification_backends/stubs/fake_backend.py
@@ -85,7 +85,7 @@ def _convert_notification_to_json(self, notification: Notification) -> dict:
             "preheader_template": notification.preheader_template,
             "status": notification.status,
             "context_used": notification.context_used,
-            "metadata": notification.metadata,
+            "adapter_extra_parameters": notification.adapter_extra_parameters,
         }
 
     def _convert_json_to_notification(self, notification: dict) -> Notification:
@@ -106,7 +106,7 @@ def _convert_json_to_notification(self, notification: dict) -> Notification:
             preheader_template=notification["preheader_template"],
             status=notification["status"],
             context_used=notification.get("context_used"),
-            metadata=notification.get("metadata"),
+            adapter_extra_parameters=notification.get("adapter_extra_parameters"),
         )
 
     def _store_notifications(self):
@@ -134,7 +134,7 @@ def persist_notification(
         send_after: datetime.datetime | None,
         subject_template: str,
         preheader_template: str,
-        metadata: dict | None = None,
+        adapter_extra_parameters: dict | None = None,
     ) -> Notification:
         notification = Notification(
             id=str(uuid.uuid4()),
@@ -148,7 +148,7 @@ def persist_notification(
             subject_template=subject_template,
             preheader_template=preheader_template,
             status=NotificationStatus.PENDING_SEND.value,
-            metadata=metadata,
+            adapter_extra_parameters=adapter_extra_parameters,
         )
         self.notifications.append(notification)
         self._store_notifications()
@@ -377,7 +377,7 @@ async def persist_notification(
         send_after: datetime.datetime | None,
         subject_template: str,
         preheader_template: str,
-        metadata: dict | None = None,
+        adapter_extra_parameters: dict | None = None,
         lock: asyncio.Lock | None = None,
     ) -> Notification:
         notification = Notification(
@@ -392,7 +392,7 @@ async def persist_notification(
             subject_template=subject_template,
             preheader_template=preheader_template,
             status=NotificationStatus.PENDING_SEND.value,
-            metadata=metadata,
+            adapter_extra_parameters=adapter_extra_parameters,
         )
         self.notifications.append(notification)
         await self._store_notifications(lock)

diff --git a/vintasend/services/notification_service.py b/vintasend/services/notification_service.py
@@ -222,7 +222,7 @@ def create_notification(
         send_after: datetime.datetime | None = None,
         subject_template: str = "",
         preheader_template: str = "",
-        metadata: dict | None = None,
+        adapter_extra_parameters: dict | None = None,
     ) -> Notification:
         """
         Create a notification and send it if it is due to be sent immediately.
@@ -254,7 +254,7 @@ def create_notification(
             send_after=send_after,
             subject_template=subject_template,
             preheader_template=preheader_template,
-            metadata=metadata,
+            adapter_extra_parameters=adapter_extra_parameters,
         )
         if notification.send_after is None or notification.send_after <= datetime.datetime.now(
             tz=datetime.timezone.utc
@@ -667,6 +667,7 @@ async def create_notification(
         send_after: datetime.datetime | None = None,
         subject_template: str = "",
         preheader_template: str = "",
+        adapter_extra_parameters: dict | None = None,
     ) -> Notification:
         """
         Create a notification and send it if it is due to be sent immediately.
@@ -698,6 +699,7 @@ async def create_notification(
             send_after=send_after,
             subject_template=subject_template,
             preheader_template=preheader_template,
+            adapter_extra_parameters=adapter_extra_parameters,
         )
         if notification.send_after is None or notification.send_after <= datetime.datetime.now(
             tz=datetime.timezone.utc

diff --git a/vintasend/tests/test_services/test_notification_service.py b/vintasend/tests/test_services/test_notification_service.py
@@ -52,7 +52,7 @@ def notification_to_dict(notification: "Notification") -> NotificationDict:
         preheader_template=notification.preheader_template,
         status=notification.status,
         context_used=notification.context_used,
-        metadata=notification.metadata,
+        adapter_extra_parameters=notification.adapter_extra_parameters,
     )
 
 class NotificationServiceTestCase(TestCase):