Merge pull request #328 from delegateas/copilot/update-entitylogicalname-requirements

Enforce entitylogicalname requirements on CreateMultiple, UpdateMultiple, UpsertMultiple; implement DeleteMultipleRequestHandler

Author: magesoe

src/XrmMockup365/Core.cs

@@ -439,6 +439,7 @@ private void InitializeDB()
             new InstantiateTemplateRequestHandler(this, db, metadata, security),
             new CreateMultipleRequestHandler(this, db, metadata, security),
             new UpdateMultipleRequestHandler(this, db, metadata, security),
+            new DeleteMultipleRequestHandler(this, db, metadata, security),
             new UpsertMultipleRequestHandler(this, db, metadata, security),
             new ExecuteTransactionRequestHandler(this, db, metadata, security),
             new WinQuoteRequestHandler(this, db, metadata, security),

src/XrmMockup365/Mappings.cs

@@ -17,6 +17,7 @@ internal static class Mappings
             { typeof(AssignRequest), nameof(AssignRequest.Target) },
             { typeof(AssociateRequest), nameof(AssociateRequest.Target) },
             { typeof(CreateMultipleRequest), nameof(CreateMultipleRequest.Targets) },
+            { typeof(DeleteMultipleRequest), nameof(DeleteMultipleRequest.Targets) },
             { typeof(CreateRequest), nameof(CreateRequest.Target) },
             { typeof(DeleteRequest), nameof(DeleteRequest.Target) },
             { typeof(DeliverIncomingEmailRequest), nameof(DeliverIncomingEmailRequest.MessageId) },
@@ -154,7 +155,6 @@ public static Type EventOperationToRequest(EventOperation operation)
             { "yesterday", ConditionOperator.Yesterday }
         };
 
-
         public static EntityReference GetPrimaryEntityReferenceFromRequest(OrganizationRequest request)
         {
             switch (request)

src/XrmMockup365/Requests/CreateMultipleRequestHandler.cs

@@ -1,6 +1,7 @@
 using Microsoft.Xrm.Sdk;
 using Microsoft.Xrm.Sdk.Messages;
 using System.Linq;
+using System.ServiceModel;
 using DG.Tools.XrmMockup.Database;
 using XrmPluginCore.Enums;
 
@@ -17,6 +18,17 @@ internal override OrganizationResponse Execute(OrganizationRequest orgRequest, E
         {
             var request = MakeRequest<CreateMultipleRequest>(orgRequest);
 
+            if (string.IsNullOrEmpty(request.Targets.EntityName))
+            {
+                throw new FaultException("The required field 'EntityName' is missing.");
+            }
+
+            var mismatchedEntity = request.Targets.Entities.FirstOrDefault(e => e.LogicalName != request.Targets.EntityName);
+            if (mismatchedEntity != null)
+            {
+                throw new FaultException($"The entity logical name '{mismatchedEntity.LogicalName}' does not match the expected entity logical name '{request.Targets.EntityName}'.");
+            }
+
             var ids =
                 request.Targets.Entities.Select(entity =>
                 {

src/XrmMockup365/Requests/DeleteMultipleRequestHandler.cs

@@ -0,0 +1,44 @@
+using System.Linq;
+using System.ServiceModel;
+using Microsoft.Xrm.Sdk;
+using Microsoft.Xrm.Sdk.Messages;
+using DG.Tools.XrmMockup.Database;
+
+namespace DG.Tools.XrmMockup
+{
+    internal class DeleteMultipleRequestHandler : RequestHandler
+    {
+        internal DeleteMultipleRequestHandler(Core core, XrmDb db, MetadataSkeleton metadata, Security security)
+            : base(core, db, metadata, security, "DeleteMultiple")
+        {
+        }
+
+        internal override OrganizationResponse Execute(OrganizationRequest orgRequest, EntityReference userRef)
+        {
+            var request = MakeRequest<DeleteMultipleRequest>(orgRequest);
+
+            var invalidRef = request.Targets.FirstOrDefault(e => string.IsNullOrEmpty(e.LogicalName));
+            if (invalidRef != null)
+            {
+                throw new FaultException("The required field 'EntityName' is missing.");
+            }
+
+            var distinctLogicalNames = request.Targets.Select(e => e.LogicalName).Distinct().ToList();
+            if (distinctLogicalNames.Count > 1)
+            {
+                throw new FaultException("All entity references in a DeleteMultipleRequest must have the same entity logical name.");
+            }
+
+            foreach (var entityRef in request.Targets)
+            {
+                var deleteRequest = new DeleteRequest
+                {
+                    Target = entityRef
+                };
+                core.Execute(deleteRequest, userRef);
+            }
+
+            return new OrganizationResponse { ResponseName = "DeleteMultiple" };
+        }
+    }
+}

src/XrmMockup365/Requests/UpdateMultipleRequestHandler.cs

@@ -1,5 +1,7 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
+using System.ServiceModel;
 using Microsoft.Xrm.Sdk;
 using Microsoft.Xrm.Sdk.Messages;
 using DG.Tools.XrmMockup.Database;
@@ -18,6 +20,17 @@ internal override OrganizationResponse Execute(OrganizationRequest orgRequest, E
         {
             var request = MakeRequest<UpdateMultipleRequest>(orgRequest);
 
+            if (string.IsNullOrEmpty(request.Targets.EntityName))
+            {
+                throw new FaultException("The required field 'EntityName' is missing.");
+            }
+
+            var mismatchedEntity = request.Targets.Entities.FirstOrDefault(e => e.LogicalName != request.Targets.EntityName);
+            if (mismatchedEntity != null)
+            {
+                throw new FaultException($"The entity logical name '{mismatchedEntity.LogicalName}' does not match the expected entity logical name '{request.Targets.EntityName}'.");
+            }
+
             var seenIds = new HashSet<Guid>();
             foreach (var entity in request.Targets.Entities)
             {

src/XrmMockup365/Requests/UpsertMultipleRequestHandler.cs

@@ -19,6 +19,18 @@ internal UpsertMultipleRequestHandler(Core core, XrmDb db, MetadataSkeleton meta
         internal override OrganizationResponse Execute(OrganizationRequest orgRequest, EntityReference userRef)
         {
             var request = MakeRequest<UpsertMultipleRequest>(orgRequest);
+
+            if (string.IsNullOrEmpty(request.Targets.EntityName))
+            {
+                throw new FaultException("The required field 'EntityName' is missing.");
+            }
+
+            var mismatchedEntity = request.Targets.Entities.FirstOrDefault(e => e.LogicalName != request.Targets.EntityName);
+            if (mismatchedEntity != null)
+            {
+                throw new FaultException($"The entity logical name '{mismatchedEntity.LogicalName}' does not match the expected entity logical name '{request.Targets.EntityName}'.");
+            }
+
             var seenIds = new HashSet<Guid>();
 
             var results = request.Targets.Entities.Select(entity =>

tests/XrmMockup365Test/TestCreateMultipleRequestHandler.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ServiceModel;
 using Microsoft.Xrm.Sdk;
 using Microsoft.Xrm.Sdk.Messages;
 using DG.XrmFramework.BusinessDomain.ServiceContext;
@@ -36,5 +37,40 @@ public void TestCreateMultipleEntities()
             Assert.Equal(contact1.FirstName, createdContact1.FirstName);
             Assert.Equal(contact2.FirstName, createdContact2.FirstName);
         }
+
+        [Fact]
+        public void TestCreateMultipleThrowsWhenEntityNameMissing()
+        {
+            var contact = new Contact { FirstName = "John", LastName = "Doe" };
+
+            var createMultipleRequest = new CreateMultipleRequest
+            {
+                Targets = new EntityCollection
+                {
+                    Entities = { contact }
+                }
+            };
+
+            var exception = Assert.Throws<FaultException>(() => orgAdminService.Execute(createMultipleRequest));
+            Assert.Equal("The required field 'EntityName' is missing.", exception.Message);
+        }
+
+        [Fact]
+        public void TestCreateMultipleThrowsWhenEntityLogicalNameMismatch()
+        {
+            var account = new Account { Name = "Acme" };
+
+            var createMultipleRequest = new CreateMultipleRequest
+            {
+                Targets = new EntityCollection
+                {
+                    EntityName = Contact.EntityLogicalName,
+                    Entities = { account }
+                }
+            };
+
+            var exception = Assert.Throws<FaultException>(() => orgAdminService.Execute(createMultipleRequest));
+            Assert.Equal($"The entity logical name '{Account.EntityLogicalName}' does not match the expected entity logical name '{Contact.EntityLogicalName}'.", exception.Message);
+        }
     }
 }

tests/XrmMockup365Test/TestDeleteMultipleRequestHandler.cs

@@ -0,0 +1,71 @@
+using System;
+using System.ServiceModel;
+using Microsoft.Xrm.Sdk;
+using Microsoft.Xrm.Sdk.Messages;
+using DG.XrmFramework.BusinessDomain.ServiceContext;
+using Xunit;
+
+namespace DG.XrmMockupTest
+{
+    public class TestDeleteMultipleRequestHandler : UnitTestBase
+    {
+        public TestDeleteMultipleRequestHandler(XrmMockupFixture fixture) : base(fixture) { }
+
+        [Fact]
+        public void TestDeleteMultipleEntities()
+        {
+            var contactId1 = orgGodService.Create(new Contact { FirstName = "John", LastName = "Doe" });
+            var contactId2 = orgGodService.Create(new Contact { FirstName = "Jane", LastName = "Doe" });
+
+            var deleteMultipleRequest = new DeleteMultipleRequest
+            {
+                Targets = new EntityReferenceCollection
+                {
+                    new EntityReference(Contact.EntityLogicalName, contactId1),
+                    new EntityReference(Contact.EntityLogicalName, contactId2)
+                }
+            };
+
+            orgAdminService.Execute(deleteMultipleRequest);
+
+            Assert.Throws<FaultException>(() => orgAdminService.Retrieve(Contact.EntityLogicalName, contactId1, new Microsoft.Xrm.Sdk.Query.ColumnSet(true)));
+            Assert.Throws<FaultException>(() => orgAdminService.Retrieve(Contact.EntityLogicalName, contactId2, new Microsoft.Xrm.Sdk.Query.ColumnSet(true)));
+        }
+
+        [Fact]
+        public void TestDeleteMultipleThrowsWhenEntityNameMissing()
+        {
+            var contactId = orgGodService.Create(new Contact { FirstName = "John", LastName = "Doe" });
+
+            var deleteMultipleRequest = new DeleteMultipleRequest
+            {
+                Targets = new EntityReferenceCollection
+                {
+                    new EntityReference(string.Empty, contactId)
+                }
+            };
+
+            var exception = Assert.Throws<FaultException>(() => orgAdminService.Execute(deleteMultipleRequest));
+            Assert.Equal("The required field 'EntityName' is missing.", exception.Message);
+        }
+
+        [Fact]
+        public void TestDeleteMultipleThrowsWhenEntityLogicalNamesMismatch()
+        {
+            var contactId = orgGodService.Create(new Contact { FirstName = "John", LastName = "Doe" });
+            var accountId = orgGodService.Create(new Account { Name = "Acme" });
+
+            var deleteMultipleRequest = new DeleteMultipleRequest
+            {
+                Targets = new EntityReferenceCollection
+                {
+                    new EntityReference(Contact.EntityLogicalName, contactId),
+                    new EntityReference(Account.EntityLogicalName, accountId)
+                }
+            };
+
+            var exception = Assert.Throws<FaultException>(() => orgAdminService.Execute(deleteMultipleRequest));
+            Assert.Equal("All entity references in a DeleteMultipleRequest must have the same entity logical name.", exception.Message);
+        }
+    }
+}

tests/XrmMockup365Test/TestUpdateMultipleRequestHandler.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ServiceModel;
 using Microsoft.Xrm.Sdk;
 using Microsoft.Xrm.Sdk.Messages;
 using DG.XrmFramework.BusinessDomain.ServiceContext;
@@ -62,5 +63,40 @@ public void TestUpdateMultipleSameKeyIgnoresSubsequent()
             var updatedContact = Contact.Retrieve(orgAdminService, contactId);
             Assert.Equal(updateContact1.FirstName, updatedContact.FirstName);
         }
+
+        [Fact]
+        public void TestUpdateMultipleThrowsWhenEntityNameMissing()
+        {
+            var contactId = orgGodService.Create(new Contact { FirstName = "John", LastName = "Doe" });
+
+            var updateMultipleRequest = new UpdateMultipleRequest
+            {
+                Targets = new EntityCollection
+                {
+                    Entities = { new Contact(contactId) { FirstName = "Johny" } }
+                }
+            };
+
+            var exception = Assert.Throws<FaultException>(() => orgAdminService.Execute(updateMultipleRequest));
+            Assert.Equal("The required field 'EntityName' is missing.", exception.Message);
+        }
+
+        [Fact]
+        public void TestUpdateMultipleThrowsWhenEntityLogicalNameMismatch()
+        {
+            var contactId = orgGodService.Create(new Contact { FirstName = "John", LastName = "Doe" });
+
+            var updateMultipleRequest = new UpdateMultipleRequest
+            {
+                Targets = new EntityCollection
+                {
+                    EntityName = Account.EntityLogicalName,
+                    Entities = { new Contact(contactId) { FirstName = "Johny" } }
+                }
+            };
+
+            var exception = Assert.Throws<FaultException>(() => orgAdminService.Execute(updateMultipleRequest));
+            Assert.Equal($"The entity logical name '{Contact.EntityLogicalName}' does not match the expected entity logical name '{Account.EntityLogicalName}'.", exception.Message);
+        }
     }
 }

tests/XrmMockup365Test/TestUpsertMultiple.cs

@@ -85,5 +85,36 @@ public void TestUpsertMultipleThrowsFaultOnMultipleWithSameKey()
             var exception = Assert.Throws<FaultException>(() => orgAdminUIService.Execute(req));
             Assert.Equal($"Duplicate Ids are not allowed in the Target list of an UpsertMultipleRequest: {_account1id}.", exception.Message);
         }
+
+        [Fact]
+        public void TestUpsertMultipleThrowsWhenEntityNameMissing()
+        {
+            var req = new UpsertMultipleRequest
+            {
+                Targets = new EntityCollection
+                {
+                    Entities = { new Account { Name = "Acme" } }
+                }
+            };
+
+            var exception = Assert.Throws<FaultException>(() => orgAdminUIService.Execute(req));
+            Assert.Equal("The required field 'EntityName' is missing.", exception.Message);
+        }
+
+        [Fact]
+        public void TestUpsertMultipleThrowsWhenEntityLogicalNameMismatch()
+        {
+            var req = new UpsertMultipleRequest
+            {
+                Targets = new EntityCollection
+                {
+                    EntityName = Account.EntityLogicalName,
+                    Entities = { new Contact { FirstName = "John" } }
+                }
+            };
+
+            var exception = Assert.Throws<FaultException>(() => orgAdminUIService.Execute(req));
+            Assert.Equal($"The entity logical name '{Contact.EntityLogicalName}' does not match the expected entity logical name '{Account.EntityLogicalName}'.", exception.Message);
+        }
     }
 }