Merge pull request #13 from alanjcastonguay/sendEmail-feature

Ian Bentley · Ian Bentley · commit 4a173cb6d2b2 · 2014-10-30T14:55:23.000-04:00
Add sendEmail() support.
diff --git a/README.md b/README.md
@@ -36,7 +36,6 @@ this time:
  * queryAll
  * undelete
  * describeSObject
- * sendEmail
  * describeDataCategoryGroups
  * describeDataCategoryGroupStructures
 
@@ -96,6 +95,36 @@ Batches work automatically (though sfdc limits the number to 200 maximum):
     ]
     res = svc.create(contacts)
 
+Send a new email, optionally using templates, including attachments and creating activities for associated objects:
+
+    simple_email = {
+        'subject': 'Test of Salesforce sendEmail()',
+        'plainTextBody': 'This is a simple test message.',
+        'toAddresses': 'johndoe@example.com,
+    }
+    res = svc.sendEmail( [simple_email] )
+    res
+    [{'errors': [], 'success': True}]
+    
+    complex_email = {
+        'templateId': '00X80000002h4TV',    # Id of an EmailTemplate used for Subject and Body, supports field merge from whatId.
+        'targetObjectId':'003808980000GJ',  # Id of a Contact, Lead or User which the email will be sent to.
+        'whatId':'500800000RuJo',           # Id of a SObject to create an Activity in.
+        'saveAsActivity': True,
+        'useSignature': True,
+        'inReplyTo': '<1234567890123456789%example@example.com>',  # RFC2822, a previous email thread.
+        'references': '<1234567890123456789%example@example.com>',
+        'fileAttachments': [{
+            'body': base64_encoded_png,
+            'contentType':'image/png',
+            'fileName':'salesforce_logo.png',
+            'inline':True
+        }]
+    }
+    res = svc.sendEmail( [complex_email] )
+    res
+    [{'errors': [], 'success': True}]
+
 More Examples
 =============
 
diff --git a/src/pyforce/pyforce.py b/src/pyforce/pyforce.py
@@ -1,13 +1,12 @@
 import logging
-from xmlclient import _tPartnerNS, _tSObjectNS
+from xmlclient import _tPartnerNS, _tSObjectNS, _tSchemaInstanceNS
 from xmlclient import Client as BaseClient
 from marshall import marshall
 from types import TupleType, ListType
 import re
 import copy
 from xmltramp import Namespace
 
-_tSchemaInstanceNS = Namespace('http://www.w3.org/2001/XMLSchema-instance')
 _tSchemaNS = Namespace('http://www.w3.org/2001/XMLSchema')
 
 DEFAULT_FIELD_TYPE = "string"
@@ -223,6 +222,40 @@ def convert_leads(self, lead_converts):
                 d['opportunity_id'] = str(resu[_tPartnerNS.opportunityId])
         return data
 
+    def sendEmail(self, emails, mass_type='SingleEmailMessage'):
+        """
+        Send one or more emails from Salesforce.
+        
+        Parameters:
+            emails - a dictionary or list of dictionaries, each representing a single email as described by https://www.salesforce.com/us/developer/docs/api/Content/sforce_api_calls_sendemail.htm
+            massType - 'SingleEmailMessage' or 'MassEmailMessage'. MassEmailMessage is used for mailmerge of up to 250 recepients in a single pass.
+        
+        Note:
+            Newly created Salesforce Sandboxes default to System email only. In this situation, sendEmail() will fail with NO_MASS_MAIL_PERMISSION.
+        """
+        preparedEmails = _prepareSObjects(emails)
+        if isinstance(preparedEmails,dict):
+            # If root element is a dict, then this is a single object not an array
+            del preparedEmails['fieldsToNull']
+        else:
+            # else this is an array, and each elelment should be prepped.
+            for listitems in preparedEmails:
+                del listitems['fieldsToNull']
+        res = BaseClient.sendEmail(self, preparedEmails, mass_type)
+        if type(res) not in (TupleType, ListType):
+            res = [res]
+        data = list()
+        for resu in res:
+            d = dict()
+            data.append(d)
+            d['success'] = success = _bool(resu[_tPartnerNS.success])
+            if not success:
+                d['errors'] = [_extractError(e)
+                               for e in resu[_tPartnerNS.errors:]]
+            else:
+                d['errors'] = list()
+        return data
+
     def retrieve(self, fields, sObjectType, ids):
         resultSet = BaseClient.retrieve(self, fields, sObjectType, ids)
         type_data = self.describeSObjects(sObjectType)[0]
diff --git a/src/pyforce/tests/test_python_client.py b/src/pyforce/tests/test_python_client.py
@@ -856,6 +856,46 @@ def testRetrieveTextWithNewlines(self):
         contact = contacts[0]
         self.assertEqual(data['Description'], contact['Description'])
 
+    def testSendSimpleEmail(self):
+        testemail = {
+            'subject':'pyforce test_xmlclient.py testSendSimpleEmail of Salesforce sendEmail()',
+            'saveAsActivity':False,
+            'toAddresses':str(self.svc.getUserInfo()['userEmail']),
+            'plainTextBody':'This is a test email message with HTML markup.\n\nYou are currently looking at the plain-text body, but the message is sent in both forms.',
+            }
+        res = self.svc.sendEmail( [testemail] )
+        print res
+        self.assertTrue(res[0]['success'])
+
+    def testSendEmailMissingFields(self):
+        testemail = {
+            'toAddresses':str(self.svc.getUserInfo()['userEmail']),
+            }
+        res = self.svc.sendEmail( [testemail] )
+        self.assertFalse(res[0]['success'])
+        self.assertEqual(res[0]['errors'][0]['statusCode'], 'REQUIRED_FIELD_MISSING')
+
+    def testSendHTMLEmailWithAttachment(self):
+        solid_logo = {
+            'body':'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',
+            'contentType':'image/png',
+            'fileName':'salesforce_logo.png',
+            'inline':True
+        }
+        testemail = {
+            'subject':'pyforce test_xmlclient.py testSendHTMLEmailWithAttachment of Salesforce sendEmail()',
+            'useSignature':True,
+            'saveAsActivity':False,
+            'toAddresses':str(svc.getUserInfo()['userEmail']),
+            'plainTextBody':'This is a test email message with HTML markup.\n\nYou are currently looking at the plain-text body, but the message is sent in both forms.',
+            'htmlBody':'<html><head><meta http-equiv="content-type" content="text/html; charset=utf-8"><body><h1>This is a test email message with HTML markup.</h1>\n\n<p>You are currently looking at the <i>HTML</i> body, but the message is sent in both forms.</p></body></html>',
+            'inReplyTo': '<1234567890123456789%example@example.com>',
+            'references': '<1234567890123456789%example@example.com>',
+            'fileAttachments': [solid_logo]
+        }
+        res = svc.sendEmail( [testemail] )
+        self.assertTrue(res[0]['success'])
+
 def test_suite():
     return unittest.TestSuite((
         unittest.makeSuite(TestUtils),
diff --git a/src/pyforce/tests/test_xmlclient.py b/src/pyforce/tests/test_xmlclient.py
@@ -100,7 +100,45 @@ def testSearch(self):
         res = svc.search(sosl)
         self.assertEqual(len(res), 1)
 
+    def testSendSimpleEmail(self):
+        testemail = {
+            'subject':'pyforce test_xmlclient.py testSendSimpleEmail of Salesforce sendEmail()',
+            'saveAsActivity':False,
+            'toAddresses':str(svc.getUserInfo()['userEmail']),
+            'plainTextBody':'This is a test email message with HTML markup.\n\nYou are currently looking at the plain-text body, but the message is sent in both forms.',
+            }
+        res = svc.sendEmail( [testemail] )
+        self.assertEqual(str(res[partnerns.success]), 'true')
+
+    def testSendEmailMissingFields(self):
+        testemail = {
+            'toAddresses':str(svc.getUserInfo()['userEmail']),
+            }
+        res = svc.sendEmail( [testemail] )
+        self.assertEqual(str(res[partnerns.success]), 'false')
+        self.assertEqual(str(res[partnerns.errors][partnerns.statusCode]), 'REQUIRED_FIELD_MISSING')
 
+    def testSendHTMLEmailWithAttachment(self):
+        solid_logo = {
+            'body':'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',
+            'contentType':'image/png',
+            'fileName':'salesforce_logo.png',
+            'inline':True
+        }
+        testemail = {
+            'subject':'pyforce test_xmlclient.py testSendHTMLEmailWithAttachment of Salesforce sendEmail()',
+            'useSignature':True,
+            'saveAsActivity':False,
+            'toAddresses':str(svc.getUserInfo()['userEmail']),
+            'plainTextBody':'This is a test email message with HTML markup.\n\nYou are currently looking at the plain-text body, but the message is sent in both forms.',
+            'htmlBody':'<html><head><meta http-equiv="content-type" content="text/html; charset=utf-8"><body><h1>This is a test email message with HTML markup.</h1>\n\n<p>You are currently looking at the <i>HTML</i> body, but the message is sent in both forms.</p></body></html>',
+            'inReplyTo': '<1234567890123456789%example@example.com>',
+            'references': '<1234567890123456789%example@example.com>',
+            'fileAttachments': [solid_logo]
+        }
+        res = svc.sendEmail( [testemail] )
+        self.assertEqual(str(res[partnerns.success]), 'true')
+    
 def test_suite():
     return unittest.TestSuite((
         unittest.makeSuite(TestBeatbox),
diff --git a/src/pyforce/xmlclient.py b/src/pyforce/xmlclient.py
@@ -19,6 +19,7 @@
 _partnerNs = "urn:partner.soap.sforce.com"
 _sobjectNs = "urn:sobject.partner.soap.sforce.com"
 _envNs = "http://schemas.xmlsoap.org/soap/envelope/"
+_schemaInstanceNs = "http://www.w3.org/2001/XMLSchema-instance"
 _noAttrs = AttributesNSImpl({}, {})
 
 DEFAULT_SERVER_URL = 'https://login.salesforce.com/services/Soap/u/20.0'
@@ -27,6 +28,7 @@
 _tPartnerNS = xmltramp.Namespace(_partnerNs)
 _tSObjectNS = xmltramp.Namespace(_sobjectNs)
 _tSoapNS = xmltramp.Namespace(_envNs)
+_tSchemaInstanceNS = xmltramp.Namespace(_schemaInstanceNs)
 
 # global config
 gzipRequest=True    # are we going to gzip the request ?
@@ -128,6 +130,19 @@ def getUserInfo(self):
     def convertLeads(self, convertLeads):
         return ConvertLeadsRequest(self.__serverUrl, self.sessionId, convertLeads).post(self.__conn)
 
+    def sendEmail(self, emails, massType='SingleEmailMessage'):
+        """
+        Send one or more emails from Salesforce.
+        
+        Parameters:
+            emails - a dictionary or list of dictionaries, each representing a single email as described by https://www.salesforce.com/us/developer/docs/api/Content/sforce_api_calls_sendemail.htm
+            massType - 'SingleEmailMessage' or 'MassEmailMessage'. MassEmailMessage is used for mailmerge of up to 250 recepients in a single pass.
+        
+        Note:
+            Newly created Salesforce Sandboxes default to System email only. In this situation, sendEmail() will fail with NO_MASS_MAIL_PERMISSION.
+        """
+        return SendEmailRequest(self.__serverUrl, self.sessionId, emails, massType).post(self.__conn)
+
 # fixed version of XmlGenerator, handles unqualified attributes correctly
 class BeatBoxXmlGenerator(XMLGenerator):
     def __init__(self, destination, encoding):
@@ -253,10 +268,12 @@ def __init__(self):
         self.startPrefixMapping("s", _envNs)
         self.startPrefixMapping("p", _partnerNs)
         self.startPrefixMapping("o", _sobjectNs)
+        self.startPrefixMapping("x", _schemaInstanceNs)
         self.startElement(_envNs, "Envelope")
 
     def endDocument(self):
         self.endElement()  # envelope
+        self.endPrefixMapping("x")
         self.endPrefixMapping("o")
         self.endPrefixMapping("p")
         self.endPrefixMapping("s")
@@ -501,6 +518,14 @@ def __init__(self, serverUrl, sessionId, sLeads):
     def writeBody(self, s):
         s.writeElement(_partnerNs, "leadConverts", self.__sLeads)
 
+class SendEmailRequest(AuthenticatedRequest):
+    def __init__(self, serverUrl, sessionId, emails, massType="SingleEmailMessage"):
+        AuthenticatedRequest.__init__(self, serverUrl, sessionId, "sendEmail")
+        self.__emails = emails
+        self.__massType = massType
+
+    def writeBody(self, s):
+        s.writeElement(_partnerNs, "messages", self.__emails, attrs={(_schemaInstanceNs, 'type'):'p:'+self.__massType})
 
 class ResetPasswordRequest(AuthenticatedRequest):
     def __init__(self, serverUrl, sessionId, userId):
