Fixes #457, refactor sengrid get method of Mail class

Author: Prashant-Surya

sendgrid/helpers/mail/mail.py

@@ -41,60 +41,27 @@ def get(self):
         :return: response body dict
         """
         mail = {}
-        if self.from_email is not None:
-            mail["from"] = self.from_email.get()
-        if self.subject is not None:
-            mail["subject"] = self.subject
-
-        if self.personalizations is not None:
-            mail["personalizations"] = [
-                personalization.get()
-                for personalization in self.personalizations
-            ]
-
-        if self.contents is not None:
-            mail["content"] = [ob.get() for ob in self.contents]
-
-        if self.attachments is not None:
-            mail["attachments"] = [ob.get() for ob in self.attachments]
-
-        if self.template_id is not None:
-            mail["template_id"] = self.template_id
-
-        if self.sections is not None:
-            sections = {}
-            for key in self.sections:
-                sections.update(key.get())
-            mail["sections"] = sections
-
-        if self.headers is not None:
-            headers = {}
-            for key in self.headers:
-                headers.update(key.get())
-            mail["headers"] = headers
 
-        if self.categories is not None:
-            mail["categories"] = [category.get() for category in
-                                  self.categories]
+        KEYS_TO_BE_SENT = [
+            'subject', 'personalizations','attachments', 'template_id',
+            'sections', 'headers', 'categories', 'custom_args',
+            'send_at', 'batch_id', 'ip_pool_name'
+        ]
 
-        if self.custom_args is not None:
-            custom_args = {}
-            for key in self.custom_args:
-                custom_args.update(key.get())
-            mail["custom_args"] = custom_args
+        for key in KEYS_TO_BE_SENT:
+            value = getattr(self, key, None)
+            if value is not None:
+                mail[key] = value
 
-        if self.send_at is not None:
-            mail["send_at"] = self.send_at
+        if self.contents is not None:
+            mail["content"] = self.contents
 
-        if self.batch_id is not None:
-            mail["batch_id"] = self.batch_id
+        if self.from_email is not None:
+            mail["from"] = self.from_email.get()
 
         if self.asm is not None:
             mail["asm"] = self.asm.get()
 
-        if self.ip_pool_name is not None:
-            mail["ip_pool_name"] = self.ip_pool_name
-
         if self.mail_settings is not None:
             mail["mail_settings"] = self.mail_settings.get()
 
@@ -103,6 +70,7 @@ def get(self):
 
         if self.reply_to is not None:
             mail["reply_to"] = self.reply_to.get()
+
         return mail
 
     @property
@@ -187,7 +155,14 @@ def reply_to(self, value):
 
     @property
     def personalizations(self):
-        return self._personalizations
+        """Returns personalizations as a list of dictionaries as returned
+        by Personalization class"""
+        if self._personalizations is not None:
+            return [
+                personalization.get()
+                for personalization in self._personalizations
+            ]
+        return None
 
     def add_personalization(self, personalizations):
         if self._personalizations is None:
@@ -196,7 +171,11 @@ def add_personalization(self, personalizations):
 
     @property
     def contents(self):
-        return self._contents
+        """Returns contents as a list of dictionaries as returned by
+        Content class"""
+        if self._contents is not None:
+            return [ob.get() for ob in self._contents]
+        return None
 
     def add_content(self, content):
         if self._contents is None:
@@ -205,7 +184,9 @@ def add_content(self, content):
 
     @property
     def attachments(self):
-        return self._attachments
+        if self._attachments is not None:
+            return [ob.get() for ob in self._attachments]
+        return None
 
     def add_attachment(self, attachment):
         if self._attachments is None:
@@ -214,7 +195,12 @@ def add_attachment(self, attachment):
 
     @property
     def sections(self):
-        return self._sections
+        if self._sections is not None:
+            sections = {}
+            for key in self._sections:
+                sections.update(key.get())
+            return sections
+        return None
 
     def add_section(self, section):
         if self._sections is None:
@@ -223,7 +209,13 @@ def add_section(self, section):
 
     @property
     def headers(self):
-        return self._headers
+        """Returns headers of emails as dicationary"""
+        if self._headers is not None:
+            headers = {}
+            for key in self._headers:
+                headers.update(key.get())
+            return headers
+        return None
 
     def add_header(self, header):
         if self._headers is None:
@@ -236,7 +228,11 @@ def add_header(self, header):
 
     @property
     def categories(self):
-        return self._categories
+        """Returns list of categories"""
+        if self._categories is not None:
+            return [category.get() for category in
+                                  self._categories]
+        return None
 
     def add_category(self, category):
         if self._categories is None:
@@ -245,7 +241,13 @@ def add_category(self, category):
 
     @property
     def custom_args(self):
-        return self._custom_args
+        """Returns custom_args as a dicationary"""
+        if self._custom_args is not None:
+            custom_args = {}
+            for key in self._custom_args:
+                custom_args.update(key.get())
+            return custom_args
+        return None
 
     def add_custom_arg(self, custom_arg):
         if self._custom_args is None: