Write provider_id from sendgrid payload

Author: kalekseev

src/jemail/models.py

@@ -37,6 +37,7 @@ class TrackingEventProtocol(Protocol):
     timestamp: Any
     event_type: Any  # EventType
     metadata: dict[str, Any]
+    esp_event: None | object
 
 
 class EmailAttachment(models.Model):
@@ -351,6 +352,13 @@ def fill_from_anymail_event(self, anymail_event: TrackingEventProtocol) -> None:
                 self.clicks_count += 1
             if anymail_event.event_type == EventType.OPENED:
                 self.opens_count += 1
+        if self.provider_id == "" and isinstance(anymail_event.esp_event, dict):
+            # Sendgrid doesn't return message id in response to send request
+            # if SENDGRID_GENERATE_MESSAGE_ID = false then anymail won't
+            # generate custom id thus `provider_id` will be empty.
+            # Write message id from webhook payload `sg_message_id`.
+            if "sg_message_id" in anymail_event.esp_event:
+                self.provider_id = anymail_event.esp_event["sg_message_id"]
 
 
 def is_webhook_event_supported(anymail_event: TrackingEventProtocol) -> bool:

tests/test_jemail.py

@@ -95,7 +95,10 @@ def test_fill_from_anymail_event_tracking_not_exist():
     anymail_event = AnymailTrackingEvent(
         event_type=EventType.BOUNCED,
         timestamp=from_utc_timestamp(1),
-        esp_event={"data": "abc"},
+        esp_event={
+            "data": "abc",
+            "sg_message_id": "6b0f6f28-515d-4658-ae1e-d5d13fee2fc4",
+        },
         recipient="[email protected]",
     )
     recipient = EmailRecipient(timestamp=None)
@@ -105,6 +108,7 @@ def test_fill_from_anymail_event_tracking_not_exist():
     assert recipient.timestamp.timestamp() == 1
     assert recipient.clicks_count == 0
     assert recipient.opens_count == 0
+    assert recipient.provider_id == "6b0f6f28-515d-4658-ae1e-d5d13fee2fc4"
 
 
 def test_fill_from_anymail_event_old_event():