Refactor: move message handlers to Messages namespace (#637)

KrzysztofPajak · web-flow · commit aaaad64e5061 · 2026-01-05T18:24:18.000+01:00
Reorganized MediatR command handlers related to message token generation and notifications into the new Grand.Business.Messages.Commands.Handlers namespaces. Also moved common handlers (ClearMostViewed, GetSitemapXml) to Grand.Business.Messages.Commands.Handlers.Common. Updated using statements and project references accordingly. Improved test assertions in CustomerTagServiceTests for clarity. No functional changes to handler logic.
diff --git a/src/Business/Grand.Business.Messages/Commands/Handlers/Catalog/SendNotificationsToSubscribersCommandHandler.cs b/src/Business/Grand.Business.Messages/Commands/Handlers/Catalog/SendNotificationsToSubscribersCommandHandler.cs
diff --git a/src/Business/Grand.Business.Messages/Commands/Handlers/Catalog/SendOutBidCustomerNotificationCommandHandler.cs b/src/Business/Grand.Business.Messages/Commands/Handlers/Catalog/SendOutBidCustomerNotificationCommandHandler.cs
diff --git a/src/Business/Grand.Business.Messages/Commands/Handlers/Catalog/SendQuantityBelowStoreOwnerNotificationCommandHandler.cs b/src/Business/Grand.Business.Messages/Commands/Handlers/Catalog/SendQuantityBelowStoreOwnerNotificationCommandHandler.cs
diff --git a/src/Business/Grand.Business.Messages/Commands/Handlers/Common/ClearMostViewedCommandHandler.cs b/src/Business/Grand.Business.Messages/Commands/Handlers/Common/ClearMostViewedCommandHandler.cs
@@ -3,7 +3,7 @@
 using Grand.Domain.Catalog;
 using MediatR;
 
-namespace Grand.Business.System.Commands.Handlers.Common;
+namespace Grand.Business.Messages.Commands.Handlers.Common;
 
 public class ClearMostViewedCommandHandler : IRequestHandler<ClearMostViewedCommand, bool>
 {
diff --git a/src/Business/Grand.Business.Messages/Commands/Handlers/Common/GetSitemapXMLCommandHandler.cs b/src/Business/Grand.Business.Messages/Commands/Handlers/Common/GetSitemapXMLCommandHandler.cs
@@ -19,7 +19,7 @@
 using System.Text.RegularExpressions;
 using System.Xml;
 
-namespace Grand.Business.System.Commands.Handlers.Common;
+namespace Grand.Business.Messages.Commands.Handlers.Common;
 
 public class GetSitemapXmlCommandHandler : IRequestHandler<GetSitemapXmlCommand, string>
 {
@@ -216,8 +216,11 @@ private async Task<IEnumerable<SitemapUrl>> GetCategoryUrls(string parentCategor
             var imageurl = string.Empty;
             if (_commonSettings.SitemapIncludeImage)
                 if (!string.IsNullOrEmpty(category.PictureId))
+                {
                     imageurl = await _pictureService.GetPictureUrl(category.PictureId, showDefaultPicture: false,
                         storeLocation: storeLocation);
+                }
+
             categories.Add(new SitemapUrl(url, imageurl, UpdateFrequency.Weekly,
                 category.UpdatedOnUtc ?? category.CreatedOnUtc));
             categories.AddRange(await GetCategoryUrls(category.Id, language));
@@ -244,8 +247,11 @@ private async Task<IEnumerable<SitemapUrl>> GetBrandUrls(Language language, Stor
             var imageUrl = string.Empty;
             if (_commonSettings.SitemapIncludeImage)
                 if (!string.IsNullOrEmpty(brand.PictureId))
+                {
                     imageUrl = await _pictureService.GetPictureUrl(brand.PictureId, showDefaultPicture: false,
                         storeLocation: storeLocation);
+                }
+
             brandUrls.Add(new SitemapUrl(url, imageUrl, UpdateFrequency.Weekly,
                 brand.UpdatedOnUtc ?? brand.CreatedOnUtc));
         }
@@ -272,8 +278,11 @@ private async Task<IEnumerable<SitemapUrl>> GetProductUrls(Language language, St
             var imageUrl = string.Empty;
             if (_commonSettings.SitemapIncludeImage)
                 if (!string.IsNullOrEmpty(product.ProductPictures.FirstOrDefault()?.PictureId))
+                {
                     imageUrl = await _pictureService.GetPictureUrl(product.ProductPictures.FirstOrDefault()?.PictureId,
                         showDefaultPicture: false, storeLocation: storeLocation);
+                }
+
             products.Add(new SitemapUrl(url, imageUrl, UpdateFrequency.Weekly,
                 product.UpdatedOnUtc ?? product.CreatedOnUtc));
         }
@@ -319,8 +328,11 @@ private async Task<IEnumerable<SitemapUrl>> GetBlogPostsUrls(Language language,
             var imageurl = string.Empty;
             if (_commonSettings.SitemapIncludeImage)
                 if (!string.IsNullOrEmpty(blogpost.PictureId))
+                {
                     imageurl = await _pictureService.GetPictureUrl(blogpost.PictureId, showDefaultPicture: false,
                         storeLocation: storeLocation);
+                }
+
             blog.Add(new SitemapUrl(url, imageurl, UpdateFrequency.Weekly, DateTime.UtcNow));
         }
 
diff --git a/src/Business/Grand.Business.Messages/Commands/Handlers/Messages/GetAttributeCombinationTokensCommandHandler.cs b/src/Business/Grand.Business.Messages/Commands/Handlers/Messages/GetAttributeCombinationTokensCommandHandler.cs
@@ -4,11 +4,9 @@
 using Grand.Domain.Catalog;
 using MediatR;
 
-namespace Grand.Business.System.Commands.Handlers.Messages;
+namespace Grand.Business.Messages.Commands.Handlers.Messages;
 
-public class
-    GetAttributeCombinationTokensCommandHandler : IRequestHandler<GetAttributeCombinationTokensCommand,
-    LiquidAttributeCombination>
+public class GetAttributeCombinationTokensCommandHandler : IRequestHandler<GetAttributeCombinationTokensCommand, LiquidAttributeCombination>
 {
     private readonly IProductAttributeFormatter _productAttributeFormatter;
 
diff --git a/src/Business/Grand.Business.Messages/Commands/Handlers/Messages/GetAuctionTokensCommandHandler.cs b/src/Business/Grand.Business.Messages/Commands/Handlers/Messages/GetAuctionTokensCommandHandler.cs
@@ -5,7 +5,7 @@
 using MediatR;
 using System.Globalization;
 
-namespace Grand.Business.System.Commands.Handlers.Messages;
+namespace Grand.Business.Messages.Commands.Handlers.Messages;
 
 public class GetAuctionTokensCommandHandler : IRequestHandler<GetAuctionTokensCommand, LiquidAuctions>
 {
diff --git a/src/Business/Grand.Business.Messages/Commands/Handlers/Messages/GetGiftVoucherTokensCommandHandler.cs b/src/Business/Grand.Business.Messages/Commands/Handlers/Messages/GetGiftVoucherTokensCommandHandler.cs
@@ -4,7 +4,7 @@
 using Grand.Business.Core.Utilities.Messages.DotLiquidDrops;
 using MediatR;
 
-namespace Grand.Business.System.Commands.Handlers.Messages;
+namespace Grand.Business.Messages.Commands.Handlers.Messages;
 
 public class GetGiftVoucherTokensCommandHandler : IRequestHandler<GetGiftVoucherTokensCommand, LiquidGiftVoucher>
 {
diff --git a/src/Business/Grand.Business.Messages/Commands/Handlers/Messages/GetMerchandiseReturnTokensCommandHandler.cs b/src/Business/Grand.Business.Messages/Commands/Handlers/Messages/GetMerchandiseReturnTokensCommandHandler.cs
@@ -5,7 +5,7 @@
 using Grand.Business.Core.Utilities.Messages.DotLiquidDrops;
 using MediatR;
 
-namespace Grand.Business.System.Commands.Handlers.Messages;
+namespace Grand.Business.Messages.Commands.Handlers.Messages;
 
 public class
     GetMerchandiseReturnTokensCommandHandler : IRequestHandler<GetMerchandiseReturnTokensCommand,
diff --git a/src/Business/Grand.Business.Messages/Commands/Handlers/Messages/GetOrderTokensCommandHandler.cs b/src/Business/Grand.Business.Messages/Commands/Handlers/Messages/GetOrderTokensCommandHandler.cs
@@ -16,7 +16,7 @@
 using System.Globalization;
 using System.Net;
 
-namespace Grand.Business.System.Commands.Handlers.Messages;
+namespace Grand.Business.Messages.Commands.Handlers.Messages;
 
 public class GetOrderTokensCommandHandler : IRequestHandler<GetOrderTokensCommand, LiquidOrder>
 {
diff --git a/src/Business/Grand.Business.Messages/Commands/Handlers/Messages/GetShipmentTokensCommandHandler.cs b/src/Business/Grand.Business.Messages/Commands/Handlers/Messages/GetShipmentTokensCommandHandler.cs
@@ -3,7 +3,7 @@
 using Grand.Business.Core.Utilities.Messages.DotLiquidDrops;
 using MediatR;
 
-namespace Grand.Business.System.Commands.Handlers.Messages;
+namespace Grand.Business.Messages.Commands.Handlers.Messages;
 
 public class GetShipmentTokensCommandHandler : IRequestHandler<GetShipmentTokensCommand, LiquidShipment>
 {
diff --git a/src/Business/Grand.Business.Messages/Commands/Handlers/Messages/GetShoppingCartTokensCommandHandler.cs b/src/Business/Grand.Business.Messages/Commands/Handlers/Messages/GetShoppingCartTokensCommandHandler.cs
@@ -4,7 +4,7 @@
 using Grand.Business.Core.Utilities.Messages.DotLiquidDrops;
 using MediatR;
 
-namespace Grand.Business.System.Commands.Handlers.Messages;
+namespace Grand.Business.Messages.Commands.Handlers.Messages;
 
 public class GetShoppingCartTokensCommandHandler : IRequestHandler<GetShoppingCartTokensCommand, LiquidShoppingCart>
 {
diff --git a/src/Business/Grand.Business.Messages/Commands/Handlers/Messages/GetStoreTokensCommandHandler.cs b/src/Business/Grand.Business.Messages/Commands/Handlers/Messages/GetStoreTokensCommandHandler.cs
@@ -3,7 +3,7 @@
 using Grand.Domain.Stores;
 using MediatR;
 
-namespace Grand.Business.System.Commands.Handlers.Messages;
+namespace Grand.Business.Messages.Commands.Handlers.Messages;
 
 public class GetStoreTokensCommandHandler : IRequestHandler<GetStoreTokensCommand, LiquidStore>
 {
diff --git a/src/Business/Grand.Business.Messages/Commands/Handlers/Messages/GetVendorTokensCommandHandler.cs b/src/Business/Grand.Business.Messages/Commands/Handlers/Messages/GetVendorTokensCommandHandler.cs
@@ -4,7 +4,7 @@
 using Grand.Business.Core.Utilities.Messages.DotLiquidDrops;
 using MediatR;
 
-namespace Grand.Business.System.Commands.Handlers.Messages;
+namespace Grand.Business.Messages.Commands.Handlers.Messages;
 
 public class GetVendorTokensCommandHandler : IRequestHandler<GetVendorTokensCommand, LiquidVendor>
 {
diff --git a/src/Tests/Grand.Business.Marketing.Tests/Services/Customers/CustomerTagServiceTests.cs b/src/Tests/Grand.Business.Marketing.Tests/Services/Customers/CustomerTagServiceTests.cs
@@ -179,8 +179,8 @@ public async Task InsertTagToCustomerTest()
         await _customerTagService.InsertTagToCustomer(customerTag.Id, customer.Id);
 
         //Assert
-        Assert.IsTrue(_repositoryCustomer.Table.FirstOrDefault(x => x.Id == customer.Id).CustomerTags
-            .Contains(customerTag.Id));
+        Assert.Contains(customerTag.Id, _repositoryCustomer.Table.FirstOrDefault(x => x.Id == customer.Id).CustomerTags
+);
     }
 
     [TestMethod]
@@ -198,8 +198,8 @@ public async Task DeleteTagFromCustomerTest()
         await _customerTagService.DeleteTagFromCustomer(customerTag.Id, customer.Id);
 
         //Assert
-        Assert.IsFalse(_repositoryCustomer.Table.FirstOrDefault(x => x.Id == customer.Id).CustomerTags
-            .Contains(customerTag.Id));
+        Assert.DoesNotContain(customerTag.Id, _repositoryCustomer.Table.FirstOrDefault(x => x.Id == customer.Id).CustomerTags
+);
     }
 
     [TestMethod]
diff --git a/src/Tests/Grand.Modules.Tests/Commands/SendOutBidCustomerNotificationCommandHandlerTests.cs b/src/Tests/Grand.Modules.Tests/Commands/SendOutBidCustomerNotificationCommandHandlerTests.cs
@@ -3,7 +3,6 @@
 using Grand.Domain.Catalog;
 using Grand.Domain.Localization;
 using Grand.Module.ScheduledTasks.Commands.Handlers.Catalog;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
 
 namespace Grand.Modules.Tests.Commands;
diff --git a/src/Tests/Grand.Modules.Tests/Grand.Modules.Tests.csproj b/src/Tests/Grand.Modules.Tests/Grand.Modules.Tests.csproj
@@ -18,6 +18,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\Business\Grand.Business.Core\Grand.Business.Core.csproj" />
+    <ProjectReference Include="..\..\Business\Grand.Business.Messages\Grand.Business.Messages.csproj" />
     <ProjectReference Include="..\..\Modules\Grand.Module.Migration\Grand.Module.Migration.csproj" />
     <ProjectReference Include="..\..\Modules\Grand.Module.ScheduledTasks\Grand.Module.ScheduledTasks.csproj" />
   </ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`using Grand.Domain.Catalog;`
`4`	`4`	`using MediatR;`
`5`	`5`
`6`		`-namespace Grand.Business.System.Commands.Handlers.Common;`
	`6`	`+namespace Grand.Business.Messages.Commands.Handlers.Common;`
`7`	`7`
`8`	`8`	`public class ClearMostViewedCommandHandler : IRequestHandler<ClearMostViewedCommand, bool>`
`9`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`using MediatR;`
`6`	`6`	`using System.Globalization;`
`7`	`7`
`8`		`-namespace Grand.Business.System.Commands.Handlers.Messages;`
	`8`	`+namespace Grand.Business.Messages.Commands.Handlers.Messages;`
`9`	`9`
`10`	`10`	`public class GetAuctionTokensCommandHandler : IRequestHandler<GetAuctionTokensCommand, LiquidAuctions>`
`11`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`using Grand.Business.Core.Utilities.Messages.DotLiquidDrops;`
`5`	`5`	`using MediatR;`
`6`	`6`
`7`		`-namespace Grand.Business.System.Commands.Handlers.Messages;`
	`7`	`+namespace Grand.Business.Messages.Commands.Handlers.Messages;`
`8`	`8`
`9`	`9`	`public class GetGiftVoucherTokensCommandHandler : IRequestHandler<GetGiftVoucherTokensCommand, LiquidGiftVoucher>`
`10`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`using System.Globalization;`
`17`	`17`	`using System.Net;`
`18`	`18`
`19`		`-namespace Grand.Business.System.Commands.Handlers.Messages;`
	`19`	`+namespace Grand.Business.Messages.Commands.Handlers.Messages;`
`20`	`20`
`21`	`21`	`public class GetOrderTokensCommandHandler : IRequestHandler<GetOrderTokensCommand, LiquidOrder>`
`22`	`22`	`{`