fix team code review comments

Author: caberos

SoftLayer/CLI/email/detail.py

@@ -1,7 +1,8 @@
-"""Display details for a specified email."""
+"""Display details for a specified email account."""
 # :license: MIT, see LICENSE for more details.
 
 import click
+from SoftLayer.CLI.email.list import build_statistics_table
 from SoftLayer.CLI import environment
 from SoftLayer.CLI import formatting
 from SoftLayer.managers.email import EmailManager
@@ -23,11 +24,17 @@ def cli(env, identifier):
 
     table.add_row(['id', result.get('id')])
     table.add_row(['username', result.get('username')])
+    table.add_row(['email_address', result.get('emailAddress')])
     table.add_row(['create_date', result.get('createDate')])
-    table.add_row(['categoryCode', utils.lookup(result, 'billingItem', 'categoryCode')])
+    table.add_row(['category_code', utils.lookup(result, 'billingItem', 'categoryCode')])
     table.add_row(['description', utils.lookup(result, 'billingItem', 'description')])
     table.add_row(['type_description', utils.lookup(result, 'type', 'description')])
     table.add_row(['type', utils.lookup(result, 'type', 'keyName')])
     table.add_row(['vendor', utils.lookup(result, 'vendor', 'keyName')])
 
+    statistics = email_manager.get_statistics(identifier)
+
+    for statistic in statistics:
+        table.add_row(['statistics', build_statistics_table(statistic)])
+
     env.fout(table)

SoftLayer/CLI/email/edit.py

@@ -10,23 +10,32 @@
 
 @click.command()
 @click.argument('identifier')
-@click.option('--username', help="username account")
-@click.option('--email', help="Additional note for the image")
+@click.option('--username', help="Sets username for this account")
+@click.option('--email', help="Sets the contact email for this account")
 @click.option('--password',
               help="Password must be between 8 and 20 characters "
                    "and must contain one letter and one number.")
 @environment.pass_env
 def cli(env, identifier, username, email, password):
     """Edit details of an email delivery account."""
+    email_manager = EmailManager(env.client)
+
     data = {}
+    update = False
+    if email:
+        if email_manager.update_email(identifier, email):
+            update = True
+        else:
+            raise exceptions.CLIAbort("Failed to Edit emailAddress account")
     if username:
         data['username'] = username
-    if email:
-        data['emailAddress'] = email
     if password:
         data['password'] = password
+    if len(data) != 0:
+        if email_manager.editObject(identifier, **data):
+            update = True
+        else:
+            raise exceptions.CLIAbort("Failed to Edit email account")
 
-    email_manager = EmailManager(env.client)
-
-    if not email_manager.editObject(identifier, data):
-        raise exceptions.CLIAbort("Failed to Edit email account")
+    if update:
+        env.fout('Updated Successfully')

SoftLayer/CLI/email/list.py

@@ -36,25 +36,29 @@ def cli(env):
         table.add_row(['email_information', table_information])
         table.add_row(['email_overview', overview_table])
         for statistic in statistics:
-            table.add_row(['statistics', _build_statistics_table(statistic)])
+            table.add_row(['statistics', build_statistics_table(statistic)])
 
     env.fout(table)
 
 
 def _build_overview_table(email_overview):
-    table = formatting.Table(['credit_Allowed', 'credits_Remain', 'package', 'reputation', 'requests'])
+    table = formatting.Table(
+        ['credit_allowed', 'credits_remain', 'credits_overage', 'credits_used',
+         'package', 'reputation', 'requests'])
     table.align['name'] = 'r'
     table.align['value'] = 'l'
 
     table.add_row([email_overview.get('creditsAllowed'), email_overview.get('creditsRemain'),
+                   email_overview.get('creditsOverage'), email_overview.get('creditsUsed'),
                    email_overview.get('package'), email_overview.get('reputation'),
                    email_overview.get('requests')])
 
     return table
 
 
-def _build_statistics_table(statistics):
-    table = formatting.Table(['delivered', 'requests', 'bounces', 'opens', 'clicks', 'spamReports'])
+def build_statistics_table(statistics):
+    """statistics records of Email Delivery account"""
+    table = formatting.Table(['delivered', 'requests', 'bounces', 'opens', 'clicks', 'spam_reports'])
     table.align['name'] = 'r'
     table.align['value'] = 'l'
 

SoftLayer/fixtures/SoftLayer_Network_Message_Delivery_Email_Sendgrid.py

@@ -56,3 +56,4 @@
 }
 
 editObject = True
+updateEmailAddress = True

SoftLayer/managers/email.py

@@ -57,7 +57,7 @@ def get_instance(self, identifier):
         return self.client.call('SoftLayer_Network_Message_Delivery_Email_Sendgrid',
                                 'getObject', id=identifier, mask=_mask)
 
-    def editObject(self, identifier, username=None, emailAddress=None, password=None):
+    def editObject(self, identifier, username=None, password=None):
         """Edit email delivery account related details.
 
                :param int identifier: The ID of the email account
@@ -68,10 +68,18 @@ def editObject(self, identifier, username=None, emailAddress=None, password=None
         data = {}
         if username:
             data['username'] = username
-        if emailAddress:
-            data['emailAddress'] = emailAddress
         if password:
             data['password'] = password
 
         return self.client.call('SoftLayer_Network_Message_Delivery_Email_Sendgrid',
                                 'editObject', data, id=identifier)
+
+    def update_email(self, identifier, email):
+        """Edit email address delivery account .
+
+        :param int identifier: The ID of the email account
+        :param string email: email of the email account.
+
+        """
+        return self.client.call('SoftLayer_Network_Message_Delivery_Email_Sendgrid',
+                                'updateEmailAddress', email, id=identifier)

tests/CLI/modules/email_tests.py

@@ -27,3 +27,5 @@ def test_edit(self):
         self.assert_no_fail(result)
         self.assert_called_with('SoftLayer_Network_Message_Delivery_Email_Sendgrid',
                                 'editObject')
+        self.assert_called_with('SoftLayer_Network_Message_Delivery_Email_Sendgrid',
+                                'updateEmailAddress')

tests/managers/email_tests.py

@@ -27,3 +27,9 @@ def test_get_object(self):
         self.manager.get_instance(1232123)
         self.assert_called_with('SoftLayer_Network_Message_Delivery_Email_Sendgrid',
                                 'getObject')
+
+    def test_update_email_address(self):
+        self.manager = EmailManager(self.client)
+        self.manager.update_email(1232123, 'test@ibm.com')
+        self.assert_called_with('SoftLayer_Network_Message_Delivery_Email_Sendgrid',
+                                'updateEmailAddress')