Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.
C# aspnet-corecsharpdockerdotnetecommerceecommerce-platformmongodbmulti-storemulti-vendornosqlonline-shopshoppingcart
Changes in Affiliate
KrzysztofPajakc2ce0c26480e
diff --git a/src/Business/Grand.Business.Core/Extensions/AffiliateExtensions.cs b/src/Business/Grand.Business.Core/Extensions/AffiliateExtensions.csindex f83c1eef3..2958e8e5a 100644--- a/src/Business/Grand.Business.Core/Extensions/AffiliateExtensions.cs+++ b/src/Business/Grand.Business.Core/Extensions/AffiliateExtensions.cs@@ -62,49 +62,4 @@ public static class AffiliateExtensionsuriBuilder.Query = query.ToString();return uriBuilder.ToString();}-- /// <summary>- /// Validate friendly URL name- /// </summary>- /// <param name="affiliate">Affiliate</param>- /// <param name="seoSettings"></param>- /// <param name="friendlyUrlName">Friendly URL name</param>- /// <param name="affiliateService"></param>- /// <param name="name"></param>- /// <returns>Valid friendly name</returns>- public static async Task<string> ValidateFriendlyUrlName(this Affiliate affiliate,- IAffiliateService affiliateService, SeoSettings seoSettings, string friendlyUrlName, string name)- {- ArgumentNullException.ThrowIfNull(affiliate);-- if (string.IsNullOrEmpty(friendlyUrlName))- friendlyUrlName = name;-- //ensure we have only valid chars- friendlyUrlName = SeoExtensions.GetSeName(friendlyUrlName, seoSettings.ConvertNonWesternChars,- seoSettings.AllowUnicodeCharsInUrls, seoSettings.SeoCharConversion);-- //max length- friendlyUrlName = CommonHelper.EnsureMaximumLength(friendlyUrlName, 200);-- if (string.IsNullOrEmpty(friendlyUrlName))- return friendlyUrlName;- //check whether such friendly URL name already exists (and that is not the current affiliate)- var i = 2;- var tempName = friendlyUrlName;- while (true)- {- var affiliateByFriendlyUrlName = await affiliateService.GetAffiliateByFriendlyUrlName(tempName);- var reserved = affiliateByFriendlyUrlName != null && affiliateByFriendlyUrlName.Id != affiliate.Id;- if (!reserved)- break;-- tempName = $"{friendlyUrlName}-{i}";- i++;- }-- friendlyUrlName = tempName;-- return friendlyUrlName;- }}\ No newline at end of filediff --git a/src/Tests/Grand.Business.Customers.Tests/Extensions/AffiliateExtensionsTests.cs b/src/Tests/Grand.Business.Customers.Tests/Extensions/AffiliateExtensionsTests.csindex 9bdda8948..76bb5fa14 100644--- a/src/Tests/Grand.Business.Customers.Tests/Extensions/AffiliateExtensionsTests.cs+++ b/src/Tests/Grand.Business.Customers.Tests/Extensions/AffiliateExtensionsTests.cs@@ -100,39 +100,4 @@ public class AffiliateExtensionsTestsAssert.AreEqual(string.Format(_expectedFormat, "affiliate", friendlyUrl),affiliate.GenerateUrl("http://localhost/"));}-- [TestMethod]- public async Task ValidateFriendlyUrlName_UrlNameDontExist_ReturnUrl()- {- //Don't exist- _affiliateServiceMock.Setup(c => c.GetAffiliateByFriendlyUrlName(It.IsAny<string>()))- .Returns(() => Task.FromResult<Affiliate>(null));- var friendlyUrl = "macbool-pro";- var affiliate = new Affiliate {- FriendlyUrlName = friendlyUrl- };- var result =- await affiliate.ValidateFriendlyUrlName(_affiliateServiceMock.Object, new SeoSettings(), friendlyUrl, "");- Assert.AreEqual(result, friendlyUrl);- }-- [TestMethod]- public async Task ValidateFriendlyUrlName_UrlNameExist_IncreaseUrl()- {- var invokeNumber = 1;- _affiliateServiceMock.Setup(c => c.GetAffiliateByFriendlyUrlName(It.IsAny<string>()))- .Returns(() =>- {- if (invokeNumber <= 2) return Task.FromResult(new Affiliate());- return Task.FromResult<Affiliate>(null);- }).Callback(() => invokeNumber++);- var friendlyUrl = "macbool-pro";- var expectedUrl = "macbool-pro-3";- var affiliate = new Affiliate {- FriendlyUrlName = friendlyUrl- };- var result =- await affiliate.ValidateFriendlyUrlName(_affiliateServiceMock.Object, new SeoSettings(), friendlyUrl, "");- Assert.AreEqual(result, expectedUrl);- }}\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Services/AffiliateViewModelService.cs b/src/Web/Grand.Web.Admin/Services/AffiliateViewModelService.csindex 93d771471..94cd03749 100644--- a/src/Web/Grand.Web.Admin/Services/AffiliateViewModelService.cs+++ b/src/Web/Grand.Web.Admin/Services/AffiliateViewModelService.cs@@ -10,6 +10,7 @@ using Grand.Domain.Payments;using Grand.Domain.Seo;using Grand.Domain.Shipping;using Grand.Infrastructure;+using Grand.SharedKernel.Extensions;using Grand.Web.Admin.Extensions.Mapping;using Grand.Web.Admin.Interfaces;using Grand.Web.Admin.Models.Affiliates;@@ -145,8 +146,7 @@ public class AffiliateViewModelService : IAffiliateViewModelServiceName = model.Name};//validate friendly URL name- var friendlyUrlName =- await affiliate.ValidateFriendlyUrlName(_affiliateService, _seoSettings, model.FriendlyUrlName, model.Name);+ var friendlyUrlName = await ValidateFriendlyUrlName(affiliate, model.FriendlyUrlName, model.Name);affiliate.FriendlyUrlName = friendlyUrlName.ToLowerInvariant();affiliate.Address = model.Address.ToEntity();//some validation@@ -160,8 +160,7 @@ public class AffiliateViewModelService : IAffiliateViewModelServiceaffiliate.AdminComment = model.AdminComment;affiliate.Name = model.Name;//validate friendly URL name- var friendlyUrlName =- await affiliate.ValidateFriendlyUrlName(_affiliateService, _seoSettings, model.FriendlyUrlName, model.Name);+ var friendlyUrlName = await ValidateFriendlyUrlName(affiliate, model.FriendlyUrlName, model.Name);affiliate.FriendlyUrlName = friendlyUrlName.ToLowerInvariant();affiliate.Address = model.Address.ToEntity(affiliate.Address);await _affiliateService.UpdateAffiliate(affiliate);@@ -233,4 +232,48 @@ public class AffiliateViewModelService : IAffiliateViewModelServicereturn customerModel;}), customers.TotalCount);}++ /// <summary>+ /// Validate friendly URL name+ /// </summary>+ /// <param name="affiliate">Affiliate</param>+ /// <param name="seoSettings"></param>+ /// <param name="friendlyUrlName">Friendly URL name</param>+ /// <param name="affiliateService"></param>+ /// <param name="name"></param>+ /// <returns>Valid friendly name</returns>+ private async Task<string> ValidateFriendlyUrlName(Affiliate affiliate, string friendlyUrlName, string name)+ {+ ArgumentNullException.ThrowIfNull(affiliate);++ if (string.IsNullOrEmpty(friendlyUrlName))+ friendlyUrlName = name;++ //ensure we have only valid chars+ friendlyUrlName = SeoExtensions.GetSeName(friendlyUrlName, _seoSettings.ConvertNonWesternChars,+ _seoSettings.AllowUnicodeCharsInUrls, _seoSettings.SeoCharConversion);++ //max length+ friendlyUrlName = CommonHelper.EnsureMaximumLength(friendlyUrlName, 200);++ if (string.IsNullOrEmpty(friendlyUrlName))+ return friendlyUrlName;+ //check whether such friendly URL name already exists (and that is not the current affiliate)+ var i = 2;+ var tempName = friendlyUrlName;+ while (true)+ {+ var affiliateByFriendlyUrlName = await _affiliateService.GetAffiliateByFriendlyUrlName(tempName);+ var reserved = affiliateByFriendlyUrlName != null && affiliateByFriendlyUrlName.Id != affiliate.Id;+ if (!reserved)+ break;++ tempName = $"{friendlyUrlName}-{i}";+ i++;+ }++ friendlyUrlName = tempName;++ return friendlyUrlName;+ }}\ No newline at end of file