Merge branch 'master' into show-version-header-11d

Author: mkholt

.gitignore

@@ -184,6 +184,7 @@ temp/
 TestResults.xml
 
 # Nuget outputs
+.nuget/nuget.exe
 nuget/*.nupkg
 nupkg/
 release.cmd

.nuget/nuget.exe

@@ -10,6 +10,7 @@ internal class SendEmailRequestHandler : RequestHandler
     {
         const int EMAIL_STATE_COMPLETED = 1;
         const int EMAIL_STATUS_DRAFT = 1;
+        const int EMAIL_STATUS_FAILED = 8;
         const int EMAIL_STATUS_PENDING_SEND = 6;
         const int EMAIL_STATUS_SENT = 3;
 
@@ -50,15 +51,32 @@ internal override void CheckSecurity(OrganizationRequest orgRequest, EntityRefer
             // Remaining security checks have been omitted to reduce complexity
         }
 
+        private static string GetEmailAddress(Entity entity)
+        {
+            if (entity.LogicalName == "systemuser")
+            {
+                return entity.GetAttributeValue<string>("internalemailaddress");
+            }
+            else if (entity.LogicalName == "queue")
+            {
+                return entity.GetAttributeValue<string>("emailaddress");
+            }
+            else
+            {
+                return entity.GetAttributeValue<string>("emailaddress1");
+            }
+        }
+
         internal override OrganizationResponse Execute(OrganizationRequest orgRequest, EntityReference userRef)
         {
             var request = MakeRequest<SendEmailRequest>(orgRequest);
 
             var email = db.GetEntity(new EntityReference("email", request.EmailId));
 
-            if (email.GetAttributeValue<OptionSetValue>("statuscode").Value != EMAIL_STATUS_DRAFT)
+            var statusCode = email.GetAttributeValue<OptionSetValue>("statuscode").Value;
+            if (statusCode != EMAIL_STATUS_DRAFT && statusCode != EMAIL_STATUS_FAILED)
             {
-                throw new FaultException("Email must be in Draft status to send");
+                throw new FaultException("Email must be in Draft or Failed status to send");
             }
 
             if (email.GetAttributeValue<bool>("directioncode") is false)
@@ -111,7 +129,7 @@ internal override OrganizationResponse Execute(OrganizationRequest orgRequest, E
                         {
                             throw new FaultException($"{partyRef.LogicalName} with Id = {partyRef.Id} does not exist");
                         }
-                        if (string.IsNullOrEmpty(partyEntity.GetAttributeValue<string>("emailaddress1")))
+                        if (string.IsNullOrEmpty(GetEmailAddress(partyEntity)))
                         {
                             throw new FaultException($"{partyRef.LogicalName} with Id = {partyRef.Id} does not have an email address");
                         }

src/XrmMockup365/Requests/SendEmailRequestHandler.cs

@@ -1,5 +1,6 @@
 using DG.XrmFramework.BusinessDomain.ServiceContext;
 using Microsoft.Crm.Sdk.Messages;
+using Microsoft.Xrm.Sdk;
 using System.Linq;
 using System.ServiceModel;
 using Xunit;
@@ -146,6 +147,55 @@ public void TestSendEmailRequestSuccessWithUnresolvedRecipient()
             }
         }
 
+        [Fact]
+        public void TestSendEmailRequestSuccessWhenEmailStatusFailed()
+        {
+            var contact = new Contact
+            {
+                FirstName = "Test",
+                EMailAddress1 = "test@test.com"
+            };
+            contact.Id = orgAdminUIService.Create(contact);
+
+            var email = new Email
+            {
+                From = new ActivityParty[]
+                {
+                    new ActivityParty
+                    {
+                        PartyId = crm.AdminUser
+                    }
+                },
+                To = new ActivityParty[]
+                {
+                    new ActivityParty
+                    {
+                        PartyId = contact.ToEntityReference()
+                    }
+                },
+                Subject = "Test Email",
+                StatusCode = Email_StatusCode.Failed
+            };
+            email.Id = orgAdminUIService.Create(email);
+
+            var sendEmailRequest = new SendEmailRequest
+            {
+                EmailId = email.Id,
+                IssueSend = true
+            };
+
+            var response = orgAdminUIService.Execute(sendEmailRequest) as SendEmailResponse;
+            Assert.NotNull(response);
+            Assert.Equal(email.Subject, response.Subject);
+
+            using (var context = new Xrm(orgAdminUIService))
+            {
+                var retrievedEmail = context.EmailSet.FirstOrDefault();
+                Assert.Equal(EmailState.Completed, retrievedEmail.StateCode);
+                Assert.Equal(Email_StatusCode.PendingSend, retrievedEmail.StatusCode);
+            }
+        }
+
         [Fact]
         public void TestSendEmailRequestFailsWhenTryingToSendAgain()
         {
@@ -393,5 +443,77 @@ public void TestSendEmailRequestFailsWhenRecipientHasNoEmailAddress1()
 
             Assert.Throws<FaultException>(() => orgAdminUIService.Execute(sendEmailRequest));
         }
+
+        [Fact]
+        public void TestSendEmailRequestSuccessWithSystemUserRecipient()
+        {
+            var email = new Email
+            {
+                From = new ActivityParty[]
+                {
+                    new ActivityParty
+                    {
+                        PartyId = crm.AdminUser
+                    }
+                },
+                To = new ActivityParty[]
+                {
+                    new ActivityParty
+                    {
+                        PartyId = testUser1.ToEntityReference()
+                    }
+                },
+                Subject = "Test Email",
+            };
+            email.Id = orgAdminUIService.Create(email);
+
+            var sendEmailRequest = new SendEmailRequest
+            {
+                EmailId = email.Id,
+                IssueSend = true
+            };
+
+            var response = orgAdminUIService.Execute(sendEmailRequest) as SendEmailResponse;
+            Assert.NotNull(response);
+            Assert.Equal(email.Subject, response.Subject);
+        }
+
+        [Fact]
+        public void TestSendEmailRequestFailsWhenSystemUserRecipientHasNoEmailAddress()
+        {
+            var userWithNoEmail = new SystemUser
+            {
+                BusinessUnitId = crm.RootBusinessUnit,
+                IsLicensed = true
+            };
+            userWithNoEmail = crm.CreateUser(orgAdminService, userWithNoEmail, new System.Guid[0]).ToEntity<SystemUser>();
+
+            var email = new Email
+            {
+                From = new ActivityParty[]
+                {
+                    new ActivityParty
+                    {
+                        PartyId = crm.AdminUser
+                    }
+                },
+                To = new ActivityParty[]
+                {
+                    new ActivityParty
+                    {
+                        PartyId = userWithNoEmail.ToEntityReference()
+                    }
+                },
+                Subject = "Test Email",
+            };
+            email.Id = orgAdminUIService.Create(email);
+
+            var sendEmailRequest = new SendEmailRequest
+            {
+                EmailId = email.Id
+            };
+
+            Assert.Throws<FaultException>(() => orgAdminUIService.Execute(sendEmailRequest));
+        }
     }
 }