code cleaning

Author: prashantramangupta

Diff for: application/service.py

@@ -67,33 +67,26 @@ def validate_parameters(self):
 
     def send_notification(self):
         self.validate_parameters()
-        email = Email(
-            from_address=self.__from_address,
-            to_address=self.__to_address_list,
-            reply_to_address=self.__from_address,
-            subject=self.__subject,
-            message_body=self.__message_body,
-            attachment_path=self.__attachment_path
-        )
         message = MIMEMultipart('mixed')
-        message['Subject'] = email.subject
-        message['From'] = email.from_address
-        message['To'] = ', '.join(email.to_address)
-        if bool(email.__reply_to):
-            message.add_header('reply-to', email.reply_to)
+        message['Subject'] = self.__email.subject
+        message['From'] = self.__email.from_address
+        message['To'] = ', '.join(self.__email.to_address)
+        if bool(self.__email.__reply_to):
+            message.add_header('reply-to', self.__email.reply_to)
         message_body = MIMEMultipart('alternative')
-        htmlpart = MIMEText(email.message, 'html', "utf-8")
+        htmlpart = MIMEText(self.__email.message_body, 'html', "utf-8")
         message_body.attach(htmlpart)
         message.attach(message_body)
         if self.filepath:
             attachment = MIMEApplication(open(self.filepath, 'rb').read())
-            attachment.add_header('Content-Disposition', 'Report', filename=os.path.basename(email.attachment_path))
+            attachment.add_header('Content-Disposition', 'Report',
+                                  filename=os.path.basename(self.__email.attachment_path))
             message.attach(attachment)
 
         client = boto3.client('ses', region_name=self.__ses_region_name)
         response = client.send_raw_email(
-            Source=email.from_address,
-            Destinations=email.to_address,
+            Source=self.__email.from_address,
+            Destinations=self.__email.to_address,
             RawMessage={
                 'Data': message.as_string(),
             }

Diff for: constant.py

@@ -9,8 +9,8 @@ class SendEmail(Enum):
     S3_REGION_NAME = "S3_REGION_NAME"
     SES_REGION_NAME = "SES_REGION_NAME"
     TYPE = "TYPE"
-    S3_BUCKET = "BUCKET"
-    S3_PATH = "PATH"
+    S3_BUCKET = "S3_BUCKET"
+    S3_PATH = "S3_PATH"
     CONTEXT = "CONTEXT"
     TEMPLATE_NAME = "TEMPLATE_NAME"
     MESSAGE_TEMPLATE = "MESSAGE_TEMPLATE"

Diff for: domain/email.py

@@ -10,7 +10,7 @@ def __init__(self, from_address, to_address, reply_to_address, subject, message_
         self.__to_address = to_address
         self.__reply_to_address = reply_to_address
         self.__subject = subject
-        self.__message = message_body
+        self.__message_body = message_body
         self.__attachment_path = attachment_path
 
     @property
@@ -34,12 +34,12 @@ def subject(self, subject):
         self.__subject = subject
 
     @property
-    def message(self):
-        return self.__message
+    def message_body(self):
+        return self.__message_body
 
-    @message.setter
-    def message(self, message):
-        self.__message = message
+    @message_body.setter
+    def message_body(self, message_body):
+        self.__message_body = message_body
 
     @property
     def attachment_path(self):
@@ -60,4 +60,4 @@ def generate_message_body(self, template_name, context):
         except Exception as e:
             logger.info(f"Error in fetching template:: {repr(e)}")
             raise Exception("Template name is not valid.")
-        self.__message = template_name.render(context)
+        self.__message_body = template_name.render(context)

Diff for: requirement.txt

@@ -1,5 +1,4 @@
 Jinja2==2.11.2
 requests==2.20.1
-urllib3==1.24.1
 coverage==4.5.3
 boto3==1.10.9