Merge pull request #320 from delegateas/copilot/fix-send-email-request-handler

Fix SendEmailRequestHandler to support all recipient entity types

Author: mkholt

.gitignore

@@ -210,3 +210,4 @@ docs/tools/FSharp.Formatting.svclog
 
 # Claude temp files
 tmpclaude-*-cwd
+.nuget/nuget.exe

src/XrmMockup365/Requests/SendEmailRequestHandler.cs

@@ -50,6 +50,22 @@ 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);
@@ -111,7 +127,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");
                         }

tests/XrmMockup365Test/TestSendEmail.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;
@@ -393,5 +394,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));
+        }
     }
 }