Merge pull request #6 from ebmdatalab/delayed-bounce

Skip delayed bounce events
ebmdatalab · Jan 9, 2024 · f7f8b8c · f7f8b8c
2 parents f2d9d0b + e51c43d
commit f7f8b8c
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/retractions/management/commands/retrieve_mailgun_events.py b/retractions/management/commands/retrieve_mailgun_events.py
@@ -35,8 +35,12 @@ def handle(self, *args, **options):
 
             # Loop through them
             for i in list(items):
-                message_id = i["message"]["headers"]["message-id"]
                 event = i["event"]
+                try:
+                    message_id = i["message"]["headers"]["message-id"]
+                except KeyError:
+                    logging.warning(f"{i['event']} has no message id, skipped")
+                    continue
                 when = datetime.datetime.utcfromtimestamp(i["timestamp"])
                 url = None
                 if event == "clicked":
@@ -109,6 +113,8 @@ def handle(self, *args, **options):
                             or when > mail_sent.clicked_other
                         ):
                             mail_sent.clicked_other = when
+                elif event == "failed":
+                    continue
                 else:
                     logging.warning("Unknown event '%s'" % event)