From cf2bdcbc470967f5df2a4f57b6b080fe96f2803e Mon Sep 17 00:00:00 2001
From: "J.-S. Caux" <J.S.Caux@uva.nl>
Date: Thu, 13 Feb 2020 21:45:55 +0100
Subject: [PATCH] debug mailgun_get_stored_messages

---
 .../commands/mailgun_get_stored_messages.py   | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/apimail/management/commands/mailgun_get_stored_messages.py b/apimail/management/commands/mailgun_get_stored_messages.py
index eb417c420..51078e22e 100644
--- a/apimail/management/commands/mailgun_get_stored_messages.py
+++ b/apimail/management/commands/mailgun_get_stored_messages.py
@@ -32,13 +32,6 @@ class Command(BaseCommand):
             if orphan.stored_message:
                 # FK link to message created through other event in this loop
                 continue
-            response = requests.get(
-                orphan.data['storage']['url'],
-                auth=("api", settings.MAILGUN_API_KEY)
-            )
-            if not response.status_code == 200:
-                continue
-            response = response.json()
 
             try:
                 sm = StoredMessage.objects.get(
@@ -52,7 +45,18 @@ class Command(BaseCommand):
 
             except StoredMessage.DoesNotExist:
 
-                # Need to create the message
+                # Need to get and create the message
+                try:
+                    storage_url = orphan.data['storage']['url']
+                except KeyError:
+                    continue
+                response = requests.get(
+                    storage_url,
+                    auth=("api", settings.MAILGUN_API_KEY)
+                )
+                if not response.status_code == 200:
+                    continue
+                response = response.json()
                 sm = StoredMessage.objects.create(
                     data=response,
                     datetimestamp=parsedate_to_datetime(response['Date']))
-- 
GitLab