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
Refactor SEO handling to use ISeNameService Refactored multiple services and controllers to centralize SEO name handling by replacing ISlugService, SeoSettings, and ILanguageService dependencies with ISeNameService. Introduced new SeNameService class and updated ISeNameService interface. Updated various ViewModel services and controllers to use new methods for validating and saving SEO names, and translating SEO name properties. Added new interfaces and moved existing ones to different namespaces.
KrzysztofPajaka26a56b9dbf8
diff --git a/src/Business/Grand.Business.Catalog/Services/Products/ProductService.cs b/src/Business/Grand.Business.Catalog/Services/Products/ProductService.csindex ed22bb8d4..0e5994c76 100644--- a/src/Business/Grand.Business.Catalog/Services/Products/ProductService.cs+++ b/src/Business/Grand.Business.Catalog/Services/Products/ProductService.cs@@ -187,6 +187,7 @@ public class ProductService : IProductService//updatevar update = UpdateBuilder<Product>.Create().Set(x => x.AdditionalShippingCharge, product.AdditionalShippingCharge)+ .Set(x => x.AppliedDiscounts, product.AppliedDiscounts).Set(x => x.AdminComment, product.AdminComment).Set(x => x.AllowOutOfStockSubscriptions, product.AllowOutOfStockSubscriptions).Set(x => x.AllowCustomerReviews, product.AllowCustomerReviews)diff --git a/src/Business/Grand.Business.Common/Services/Seo/SeNameService.cs b/src/Business/Grand.Business.Common/Services/Seo/SeNameService.csnew file mode 100644index 000000000..b549f3678--- /dev/null+++ b/src/Business/Grand.Business.Common/Services/Seo/SeNameService.cs@@ -0,0 +1,154 @@+using Grand.Business.Core.Extensions;+using Grand.Business.Core.Interfaces.Common.Localization;+using Grand.Business.Core.Interfaces.Common.Seo;+using Grand.Domain;+using Grand.Domain.Localization;+using Grand.Domain.Seo;+using Grand.Infrastructure.Models;+using Grand.SharedKernel.Extensions;+using System.Linq.Expressions;+using System.Reflection;++namespace Grand.Business.Common.Services.Seo;++public class SeNameService(ISlugService slugService, ILanguageService languageService, SeoSettings seoSettings) : ISeNameService+{+ public async Task<string> ValidateSeName<T>(T entity, string seName, string name, bool ensureNotEmpty) where T : BaseEntity, ISlugEntity+ {+ ArgumentNullException.ThrowIfNull(entity);++ if (string.IsNullOrWhiteSpace(seName) && !string.IsNullOrWhiteSpace(name))+ seName = name;++ seName = GetSeName(seName);++ seName = CommonHelper.EnsureMaximumLength(seName, 200);++ if (string.IsNullOrWhiteSpace(seName))+ {+ if (ensureNotEmpty)+ seName = entity.Id;+ else+ return seName;+ }++ var entityName = typeof(T).Name;+ var i = 1;+ var tempSeName = seName;++ while (true)+ {+ var entityUrl = await slugService.GetBySlug(tempSeName);+ var reserved1 = entityUrl != null && !(entityUrl.EntityId == entity.Id &&+ entityUrl.EntityName.Equals(entityName,+ StringComparison.OrdinalIgnoreCase));++ var reserved2 = seoSettings.ReservedEntityUrlSlugs.Contains(tempSeName, StringComparer.OrdinalIgnoreCase);+ var reserved3 = (await languageService.GetAllLanguages(true)).Any(language =>+ language.UniqueSeoCode.Equals(tempSeName, StringComparison.OrdinalIgnoreCase));++ if (!reserved1 && !reserved2 && !reserved3)+ break;++ tempSeName = $"{seName}-{i}";+ i++;+ if (i <= 4) continue;+ tempSeName = $"{seName}-{Guid.NewGuid()}";+ break;+ }++ seName = tempSeName;++ return seName;+ }++ public async Task<List<TranslationEntity>> TranslationSeNameProperties<T, TE>(IList<T> list, TE entity, Expression<Func<T, string>> keySelector)+ where T : ILocalizedModelLocal where TE : BaseEntity, ISlugEntity+ {+ var local = new List<TranslationEntity>();+ foreach (var item in list)+ {+ var interfaces = item.GetType().GetInterfaces();+ var props = item.GetType()+ .GetProperties(BindingFlags.Public | BindingFlags.Instance | BindingFlags.FlattenHierarchy);+ foreach (var prop in props)+ {+ var insert = true;++ foreach (var i in interfaces)+ {+ if (HasProperty(i, prop.Name) && typeof(ILocalizedModelLocal).IsAssignableFrom(i)) insert = false;+ if (HasProperty(i, prop.Name) && typeof(ISlugModelLocal).IsAssignableFrom(i))+ {+ if (keySelector.Body is not MemberExpression member)+ throw new ArgumentException(+ $"Expression '{keySelector}' refers to a method, not a property.");++ var propInfo = member.Member as PropertyInfo;+ if (propInfo == null)+ throw new ArgumentException(+ $"Expression '{keySelector}' refers to a field, not a property.");++ var value = item.GetType().GetProperty(propInfo.Name)?.GetValue(item, null);+ if (value != null)+ {+ var name = value.ToString();+ var itemValue = prop.GetValue(item) ?? "";+ var seName = await ValidateSeName(entity, itemValue.ToString(), name, false);+ prop.SetValue(item, seName);+ }+ else+ {+ var itemValue = prop.GetValue(item) ?? "";+ if (!string.IsNullOrEmpty(itemValue.ToString()))+ {+ var seName = await ValidateSeName(entity, itemValue.ToString(), "", false);+ prop.SetValue(item, seName);+ }+ else+ {+ insert = false;+ }+ }+ }+ }++ if (insert && prop.GetValue(item) != null)+ local.Add(new TranslationEntity {+ LanguageId = item.LanguageId,+ LocaleKey = prop.Name,+ LocaleValue = prop.GetValue(item)?.ToString()+ });+ }+ }++ return local;+ }++ public async Task SaveSeName<T>(T entity) where T : BaseEntity, ISlugEntity+ {+ //save main entity+ await slugService.SaveSlug(entity, entity.SeName, "");+ if (entity is ITranslationEntity translationEntity)+ {+ //save translation entities+ foreach (var locale in translationEntity.Locales+ .Where(x => x.LocaleKey == nameof(ISlugEntity.SeName)+ && !x.LocaleValue.Equals(entity.SeName, StringComparison.InvariantCulture)))+ {+ await slugService.SaveSlug(entity, locale.LocaleValue, locale.LanguageId);+ }+ }+ }++ private static bool HasProperty(Type obj, string propertyName)+ {+ return obj.GetProperty(propertyName) != null;+ }++ private string GetSeName(string name)+ {+ return SeoExtensions.GenerateSlug(name, seoSettings.ConvertNonWesternChars, seoSettings.AllowUnicodeCharsInUrls,+ seoSettings.AllowSlashChar, seoSettings.SeoCharConversion);+ }+}\ No newline at end of filediff --git a/src/Business/Grand.Business.Common/Services/Seo/SlugNameValidator.cs b/src/Business/Grand.Business.Common/Services/Seo/SlugNameValidator.csdeleted file mode 100644index f8dbf5b61..000000000--- a/src/Business/Grand.Business.Common/Services/Seo/SlugNameValidator.cs+++ /dev/null@@ -1,66 +0,0 @@-using Grand.Business.Core.Extensions;-using Grand.Business.Core.Interfaces.Common.Localization;-using Grand.Business.Core.Interfaces.Common.Seo;-using Grand.Domain;-using Grand.Domain.Seo;-using Grand.SharedKernel.Extensions;--namespace Grand.Business.Common.Services.Seo;--public class SeNameService(ISlugService slugService, ILanguageService languageService, SeoSettings seoSettings) : ISeNameService-{- public async Task<string> ValidateSeName<T>(T entity, string seName, string name, bool ensureNotEmpty) where T : BaseEntity, ISlugEntity- {- ArgumentNullException.ThrowIfNull(entity);-- if (string.IsNullOrWhiteSpace(seName) && !string.IsNullOrWhiteSpace(name))- seName = name;-- seName = GetSeName(seName);-- seName = CommonHelper.EnsureMaximumLength(seName, 200);-- if (string.IsNullOrWhiteSpace(seName))- {- if (ensureNotEmpty)- seName = entity.Id;- else- return seName;- }-- var entityName = typeof(T).Name;- var i = 1;- var tempSeName = seName;-- while (true)- {- var entityUrl = await slugService.GetBySlug(tempSeName);- var reserved1 = entityUrl != null && !(entityUrl.EntityId == entity.Id &&- entityUrl.EntityName.Equals(entityName,- StringComparison.OrdinalIgnoreCase));-- var reserved2 = seoSettings.ReservedEntityUrlSlugs.Contains(tempSeName, StringComparer.OrdinalIgnoreCase);- var reserved3 = (await languageService.GetAllLanguages(true)).Any(language =>- language.UniqueSeoCode.Equals(tempSeName, StringComparison.OrdinalIgnoreCase));-- if (!reserved1 && !reserved2 && !reserved3)- break;-- tempSeName = $"{seName}-{i}";- i++;- if (i <= 4) continue;- tempSeName = $"{seName}-{Guid.NewGuid()}";- break;- }-- seName = tempSeName;-- return seName;- }-- private string GetSeName(string name)- {- return SeoExtensions.GenerateSlug(name, seoSettings.ConvertNonWesternChars, seoSettings.AllowUnicodeCharsInUrls,- seoSettings.AllowSlashChar, seoSettings.SeoCharConversion);- }-}\ No newline at end of filediff --git a/src/Business/Grand.Business.Core/Interfaces/Common/Seo/ISeNameService.cs b/src/Business/Grand.Business.Core/Interfaces/Common/Seo/ISeNameService.csindex 1b7f51ef0..9bbf66ad6 100644--- a/src/Business/Grand.Business.Core/Interfaces/Common/Seo/ISeNameService.cs+++ b/src/Business/Grand.Business.Core/Interfaces/Common/Seo/ISeNameService.cs@@ -1,9 +1,15 @@using Grand.Domain;+using Grand.Domain.Localization;using Grand.Domain.Seo;+using Grand.Infrastructure.Models;+using System.Linq.Expressions;namespace Grand.Business.Core.Interfaces.Common.Seo;public interface ISeNameService{Task<string> ValidateSeName<T>(T entity, string seName, string name, bool ensureNotEmpty) where T : BaseEntity, ISlugEntity;+ Task<List<TranslationEntity>> TranslationSeNameProperties<T, TE>(IList<T> list, TE entity, Expression<Func<T, string>> keySelector)+ where T : ILocalizedModelLocal where TE : BaseEntity, ISlugEntity;+ Task SaveSeName<T>(T entity) where T : BaseEntity, ISlugEntity;}\ No newline at end of filediff --git a/src/Core/Grand.Infrastructure/Models/ILocalizedModelLocal.cs b/src/Core/Grand.Infrastructure/Models/ILocalizedModelLocal.csnew file mode 100644index 000000000..9c4a4fa10--- /dev/null+++ b/src/Core/Grand.Infrastructure/Models/ILocalizedModelLocal.cs@@ -0,0 +1,6 @@+namespace Grand.Infrastructure.Models;++public interface ILocalizedModelLocal+{+ string LanguageId { get; set; }+}\ No newline at end of filediff --git a/src/Web/Grand.Web.Common/Models/ISlugModelLocal.cs b/src/Core/Grand.Infrastructure/Models/ISlugModelLocal.cssimilarity index 61%rename from src/Web/Grand.Web.Common/Models/ISlugModelLocal.csrename to src/Core/Grand.Infrastructure/Models/ISlugModelLocal.csindex 4bbdd4451..2b182f706 100644--- a/src/Web/Grand.Web.Common/Models/ISlugModelLocal.cs+++ b/src/Core/Grand.Infrastructure/Models/ISlugModelLocal.cs@@ -1,4 +1,4 @@-namespace Grand.Web.Common.Models;+namespace Grand.Infrastructure.Models;public interface ISlugModelLocal{diff --git a/src/Plugins/Widgets.Slider/Extensions.cs b/src/Plugins/Widgets.Slider/Extensions.csindex 4adabb6cb..2e2c1adb5 100644--- a/src/Plugins/Widgets.Slider/Extensions.cs+++ b/src/Plugins/Widgets.Slider/Extensions.cs@@ -1,6 +1,7 @@using Grand.Business.Core.Interfaces.Common.Directory;using Grand.Domain.Localization;using Grand.Infrastructure.Mapper;+using Grand.Infrastructure.Models;using Grand.Web.Common.Extensions;using Grand.Web.Common.Models;using System.Reflection;diff --git a/src/Web/Grand.Web.Admin/Services/BlogViewModelService.cs b/src/Web/Grand.Web.Admin/Services/BlogViewModelService.csindex f71eb3d48..232724a28 100644--- a/src/Web/Grand.Web.Admin/Services/BlogViewModelService.cs+++ b/src/Web/Grand.Web.Admin/Services/BlogViewModelService.cs@@ -8,7 +8,6 @@ using Grand.Business.Core.Interfaces.Customers;using Grand.Business.Core.Interfaces.Storage;using Grand.Domain.Blogs;using Grand.Domain.Catalog;-using Grand.Domain.Seo;using Grand.Infrastructure;using Grand.SharedKernel.Extensions;using Grand.Web.Admin.Extensions;@@ -26,36 +25,35 @@ public class BlogViewModelService : IBlogViewModelServiceprivate readonly IBlogService _blogService;private readonly ICustomerService _customerService;private readonly IDateTimeService _dateTimeService;- private readonly ILanguageService _languageService;private readonly IPictureService _pictureService;private readonly IProductService _productService;- private readonly SeoSettings _seoSettings;- private readonly ISlugService _slugService;private readonly IStoreService _storeService;private readonly ITranslationService _translationService;private readonly IVendorService _vendorService;private readonly IWorkContext _workContext;private readonly ISeNameService _seNameService;- public BlogViewModelService(IBlogService blogService, IDateTimeService dateTimeService, IStoreService storeService,- ISlugService slugService,- IPictureService pictureService, ICustomerService customerService, ITranslationService translationService,+ public BlogViewModelService(+ IBlogService blogService,+ IDateTimeService dateTimeService,+ IStoreService storeService,+ IPictureService pictureService,+ ICustomerService customerService,+ ITranslationService translationService,IProductService productService,- IVendorService vendorService, ILanguageService languageService, IWorkContext workContext,- SeoSettings seoSettings, ISeNameService seNameService)+ IVendorService vendorService,+ IWorkContext workContext,+ ISeNameService seNameService){_blogService = blogService;_dateTimeService = dateTimeService;_storeService = storeService;- _slugService = slugService;_pictureService = pictureService;_customerService = customerService;_translationService = translationService;_productService = productService;_vendorService = vendorService;- _languageService = languageService;_workContext = workContext;- _seoSettings = seoSettings;_seNameService = seNameService;}@@ -81,16 +79,13 @@ public class BlogViewModelService : IBlogViewModelServicepublic virtual async Task<BlogPost> InsertBlogPostModel(BlogPostModel model){var blogPost = model.ToEntity(_dateTimeService);- await _blogService.InsertBlogPost(blogPost);//search engine name- var seName = await _seNameService.ValidateSeName(blogPost, model.SeName, model.Title, true);- blogPost.SeName = seName;- blogPost.Locales =- await model.Locales.ToTranslationProperty(blogPost, x => x.Title, _seoSettings, _slugService,- _languageService);- await _blogService.UpdateBlogPost(blogPost);- await _slugService.SaveSlug(blogPost, seName, "");+ blogPost.Locales = await _seNameService.TranslationSeNameProperties(model.Locales, blogPost, x => x.Title);+ blogPost.SeName = await _seNameService.ValidateSeName(blogPost, model.SeName, blogPost.Title, true);++ await _blogService.InsertBlogPost(blogPost);+ await _seNameService.SaveSeName(blogPost);//update picture seo file nameawait _pictureService.UpdatePictureSeoNames(blogPost.PictureId, blogPost.Title);@@ -102,16 +97,13 @@ public class BlogViewModelService : IBlogViewModelService{var prevPictureId = blogPost.PictureId;blogPost = model.ToEntity(blogPost, _dateTimeService);- await _blogService.UpdateBlogPost(blogPost);//search engine name- var seName = await _seNameService.ValidateSeName(blogPost, model.SeName, model.Title, true);- blogPost.SeName = seName;- blogPost.Locales =- await model.Locales.ToTranslationProperty(blogPost, x => x.Title, _seoSettings, _slugService,- _languageService);+ blogPost.Locales = await _seNameService.TranslationSeNameProperties(model.Locales, blogPost, x => x.Title);+ blogPost.SeName = await _seNameService.ValidateSeName(blogPost, model.SeName, blogPost.Title, true);+await _blogService.UpdateBlogPost(blogPost);- await _slugService.SaveSlug(blogPost, seName, "");+ await _seNameService.SaveSeName(blogPost);//delete an old picture (if deleted or updated)if (!string.IsNullOrEmpty(prevPictureId) && prevPictureId != blogPost.PictureId)diff --git a/src/Web/Grand.Web.Admin/Services/BrandViewModelService.cs b/src/Web/Grand.Web.Admin/Services/BrandViewModelService.csindex ac4dd9605..d39d4bc21 100644--- a/src/Web/Grand.Web.Admin/Services/BrandViewModelService.cs+++ b/src/Web/Grand.Web.Admin/Services/BrandViewModelService.cs@@ -1,12 +1,10 @@using Grand.Business.Core.Interfaces.Catalog.Brands;using Grand.Business.Core.Interfaces.Catalog.Discounts;using Grand.Business.Core.Interfaces.Common.Directory;-using Grand.Business.Core.Interfaces.Common.Localization;using Grand.Business.Core.Interfaces.Common.Seo;using Grand.Business.Core.Interfaces.Storage;using Grand.Domain.Catalog;using Grand.Domain.Discounts;-using Grand.Domain.Seo;using Grand.Infrastructure;using Grand.Web.Admin.Extensions;using Grand.Web.Admin.Extensions.Mapping;@@ -24,13 +22,10 @@ public class BrandViewModelService : IBrandViewModelServiceprivate readonly IBrandService _brandService;private readonly IBrandLayoutService _brandLayoutService;- private readonly ISlugService _slugService;private readonly IPictureService _pictureService;private readonly IDiscountService _discountService;private readonly IDateTimeService _dateTimeService;- private readonly ILanguageService _languageService;private readonly IWorkContext _workContext;- private readonly SeoSettings _seoSettings;private readonly ISeNameService _seNameService;#endregion@@ -40,24 +35,18 @@ public class BrandViewModelService : IBrandViewModelServicepublic BrandViewModelService(IBrandService brandService,IBrandLayoutService brandLayoutService,- ISlugService slugService,IPictureService pictureService,IDiscountService discountService,IDateTimeService dateTimeService,- ILanguageService languageService,IWorkContext workContext,- SeoSettings seoSettings,ISeNameService seNameService){_brandLayoutService = brandLayoutService;_brandService = brandService;- _slugService = slugService;_pictureService = pictureService;_discountService = discountService;_dateTimeService = dateTimeService;- _languageService = languageService;_workContext = workContext;- _seoSettings = seoSettings;_seNameService = seNameService;}@@ -104,16 +93,15 @@ public class BrandViewModelService : IBrandViewModelServiceforeach (var discount in allDiscounts)if (model.SelectedDiscountIds != null && model.SelectedDiscountIds.Contains(discount.Id))brand.AppliedDiscounts.Add(discount.Id);++ //search engine name+ brand.Locales = await _seNameService.TranslationSeNameProperties(model.Locales, brand, x => x.Name);+ brand.SeName = await _seNameService.ValidateSeName(brand, model.SeName, brand.Name, true);await _brandService.InsertBrand(brand);- //search engine name- brand.Locales =- await model.Locales.ToTranslationProperty(brand, x => x.Name, _seoSettings, _slugService, _languageService);- model.SeName = await _seNameService.ValidateSeName(brand, model.SeName, brand.Name, true);- brand.SeName = model.SeName;- await _brandService.UpdateBrand(brand);- await _slugService.SaveSlug(brand, model.SeName, "");+ //search engine name+ await _seNameService.SaveSeName(brand);//update picture seo file nameawait _pictureService.UpdatePictureSeoNames(brand.PictureId, brand.Name);@@ -125,8 +113,10 @@ public class BrandViewModelService : IBrandViewModelService{var prevPictureId = brand.PictureId;brand = model.ToEntity(brand);- brand.Locales =- await model.Locales.ToTranslationProperty(brand, x => x.Name, _seoSettings, _slugService, _languageService);++ brand.Locales = await _seNameService.TranslationSeNameProperties(model.Locales, brand, x => x.Name);+ brand.SeName = await _seNameService.ValidateSeName(brand, model.SeName, brand.Name, true);+//discountsvar allDiscounts = await _discountService.GetDiscountsQuery(DiscountType.AssignedToBrands);foreach (var discount in allDiscounts)@@ -143,12 +133,11 @@ public class BrandViewModelService : IBrandViewModelServicebrand.AppliedDiscounts.Remove(discount.Id);}- model.SeName = await _seNameService.ValidateSeName(brand, model.SeName, brand.Name, true);- brand.SeName = model.SeName;-+ //update brandawait _brandService.UpdateBrand(brand);+//search engine name- await _slugService.SaveSlug(brand, model.SeName, "");+ await _seNameService.SaveSeName(brand);//delete an old picture (if deleted or updated)if (!string.IsNullOrEmpty(prevPictureId) && prevPictureId != brand.PictureId)diff --git a/src/Web/Grand.Web.Admin/Services/CategoryViewModelService.cs b/src/Web/Grand.Web.Admin/Services/CategoryViewModelService.csindex 5458ed72e..1a5eef464 100644--- a/src/Web/Grand.Web.Admin/Services/CategoryViewModelService.cs+++ b/src/Web/Grand.Web.Admin/Services/CategoryViewModelService.cs@@ -8,7 +8,6 @@ using Grand.Business.Core.Interfaces.Customers;using Grand.Business.Core.Interfaces.Storage;using Grand.Domain.Catalog;using Grand.Domain.Discounts;-using Grand.Domain.Seo;using Grand.Web.Admin.Extensions;using Grand.Web.Admin.Extensions.Mapping;using Grand.Web.Admin.Interfaces;@@ -24,12 +23,9 @@ public class CategoryViewModelService : ICategoryViewModelServiceprivate readonly ICategoryLayoutService _categoryLayoutService;private readonly ICategoryService _categoryService;private readonly IDiscountService _discountService;- private readonly ILanguageService _languageService;private readonly IPictureService _pictureService;private readonly IProductCategoryService _productCategoryService;private readonly IProductService _productService;- private readonly SeoSettings _seoSettings;- private readonly ISlugService _slugService;private readonly IStoreService _storeService;private readonly ITranslationService _translationService;private readonly IVendorService _vendorService;@@ -43,12 +39,9 @@ public class CategoryViewModelService : ICategoryViewModelServiceITranslationService translationService,IStoreService storeService,IPictureService pictureService,- ISlugService slugService,IProductService productService,IVendorService vendorService,- ILanguageService languageService,CatalogSettings catalogSettings,- SeoSettings seoSettings,ISeNameService seNameService){_categoryService = categoryService;@@ -57,13 +50,10 @@ public class CategoryViewModelService : ICategoryViewModelService_discountService = discountService;_translationService = translationService;_storeService = storeService;- _slugService = slugService;_productService = productService;_pictureService = pictureService;_vendorService = vendorService;- _languageService = languageService;_catalogSettings = catalogSettings;- _seoSettings = seoSettings;_seNameService = seNameService;}@@ -137,17 +127,13 @@ public class CategoryViewModelService : ICategoryViewModelServiceforeach (var discount in allDiscounts)if (model.SelectedDiscountIds != null && model.SelectedDiscountIds.Contains(discount.Id))category.AppliedDiscounts.Add(discount.Id);- await _categoryService.InsertCategory(category);//locales- category.Locales =- await model.Locales.ToTranslationProperty(category, x => x.Name, _seoSettings, _slugService,- _languageService);- model.SeName = await _seNameService.ValidateSeName(category, model.SeName, category.Name, true);- category.SeName = model.SeName;- await _categoryService.UpdateCategory(category);+ category.Locales = await _seNameService.TranslationSeNameProperties(model.Locales, category, x => x.Name);+ category.SeName = await _seNameService.ValidateSeName(category, model.SeName, category.Name, true);- await _slugService.SaveSlug(category, model.SeName, "");+ await _categoryService.InsertCategory(category);+ await _seNameService.SaveSeName(category);//update picture seo file nameawait _pictureService.UpdatePictureSeoNames(category.PictureId, category.Name);@@ -159,12 +145,10 @@ public class CategoryViewModelService : ICategoryViewModelService{var prevPictureId = category.PictureId;category = model.ToEntity(category);- model.SeName = await _seNameService.ValidateSeName(category, model.SeName, category.Name, true);- category.SeName = model.SeName;- //locales- category.Locales =- await model.Locales.ToTranslationProperty(category, x => x.Name, _seoSettings, _slugService,- _languageService);++ category.Locales = await _seNameService.TranslationSeNameProperties(model.Locales, category, x => x.Name);+ category.SeName = await _seNameService.ValidateSeName(category, model.SeName, category.Name, true);+//discountsvar allDiscounts = await _discountService.GetDiscountsQuery(DiscountType.AssignedToCategories);foreach (var discount in allDiscounts)@@ -184,7 +168,7 @@ public class CategoryViewModelService : ICategoryViewModelServiceawait _categoryService.UpdateCategory(category);//search engine name- await _slugService.SaveSlug(category, model.SeName, "");+ await _seNameService.SaveSeName(category);//delete an old picture (if deleted or updated)if (!string.IsNullOrEmpty(prevPictureId) && prevPictureId != category.PictureId)diff --git a/src/Web/Grand.Web.Admin/Services/CollectionViewModelService.cs b/src/Web/Grand.Web.Admin/Services/CollectionViewModelService.csindex 87ba98f4f..b79ff2064 100644--- a/src/Web/Grand.Web.Admin/Services/CollectionViewModelService.cs+++ b/src/Web/Grand.Web.Admin/Services/CollectionViewModelService.cs@@ -8,7 +8,6 @@ using Grand.Business.Core.Interfaces.Customers;using Grand.Business.Core.Interfaces.Storage;using Grand.Domain.Catalog;using Grand.Domain.Discounts;-using Grand.Domain.Seo;using Grand.Infrastructure;using Grand.Web.Admin.Extensions;using Grand.Web.Admin.Extensions.Mapping;@@ -29,14 +28,11 @@ public class CollectionViewModelService : ICollectionViewModelServiceprivate readonly ICollectionLayoutService _collectionLayoutService;private readonly IProductService _productService;private readonly IStoreService _storeService;- private readonly ISlugService _slugService;private readonly IPictureService _pictureService;private readonly ITranslationService _translationService;private readonly IDiscountService _discountService;private readonly IVendorService _vendorService;- private readonly ILanguageService _languageService;private readonly IWorkContext _workContext;- private readonly SeoSettings _seoSettings;private readonly ISeNameService _seNameService;#endregion@@ -49,14 +45,11 @@ public class CollectionViewModelService : ICollectionViewModelServiceICollectionLayoutService collectionLayoutService,IProductService productService,IStoreService storeService,- ISlugService slugService,IPictureService pictureService,ITranslationService translationService,IDiscountService discountService,IVendorService vendorService,- ILanguageService languageService,IWorkContext workContext,- SeoSettings seoSettings,ISeNameService seNameService){_collectionLayoutService = collectionLayoutService;@@ -64,14 +57,11 @@ public class CollectionViewModelService : ICollectionViewModelService_productCollectionService = productCollectionService;_productService = productService;_storeService = storeService;- _slugService = slugService;_pictureService = pictureService;_translationService = translationService;_discountService = discountService;_vendorService = vendorService;- _languageService = languageService;_workContext = workContext;- _seoSettings = seoSettings;_seNameService = seNameService;}@@ -118,17 +108,13 @@ public class CollectionViewModelService : ICollectionViewModelServiceforeach (var discount in allDiscounts)if (model.SelectedDiscountIds != null && model.SelectedDiscountIds.Contains(discount.Id))collection.AppliedDiscounts.Add(discount.Id);-- await _collectionService.InsertCollection(collection);+//search engine name- collection.Locales =- await model.Locales.ToTranslationProperty(collection, x => x.Name, _seoSettings, _slugService,- _languageService);- model.SeName = await _seNameService.ValidateSeName(collection, model.SeName, collection.Name, true);- collection.SeName = model.SeName;- await _collectionService.UpdateCollection(collection);+ collection.Locales = await _seNameService.TranslationSeNameProperties(model.Locales, collection, x => x.Name);+ collection.SeName = await _seNameService.ValidateSeName(collection, model.SeName, collection.Name, true);- await _slugService.SaveSlug(collection, model.SeName, "");+ await _collectionService.InsertCollection(collection);+ await _seNameService.SaveSeName(collection);//update picture seo file nameawait _pictureService.UpdatePictureSeoNames(collection.PictureId, collection.Name);@@ -140,9 +126,10 @@ public class CollectionViewModelService : ICollectionViewModelService{var prevPictureId = collection.PictureId;collection = model.ToEntity(collection);- collection.Locales =- await model.Locales.ToTranslationProperty(collection, x => x.Name, _seoSettings, _slugService,- _languageService);++ collection.Locales = await _seNameService.TranslationSeNameProperties(model.Locales, collection, x => x.Name);+ collection.SeName = await _seNameService.ValidateSeName(collection, model.SeName, collection.Name, true);+//discountsvar allDiscounts = await _discountService.GetDiscountsQuery(DiscountType.AssignedToCollections);foreach (var discount in allDiscounts)@@ -159,12 +146,9 @@ public class CollectionViewModelService : ICollectionViewModelServicecollection.AppliedDiscounts.Remove(discount.Id);}- model.SeName = await _seNameService.ValidateSeName(collection, model.SeName, collection.Name, true);- collection.SeName = model.SeName;-await _collectionService.UpdateCollection(collection);//search engine name- await _slugService.SaveSlug(collection, model.SeName, "");+ await _seNameService.SaveSeName(collection);//delete an old picture (if deleted or updated)if (!string.IsNullOrEmpty(prevPictureId) && prevPictureId != collection.PictureId)diff --git a/src/Web/Grand.Web.Admin/Services/CourseViewModelService.cs b/src/Web/Grand.Web.Admin/Services/CourseViewModelService.csindex 136e18bc8..78959e269 100644--- a/src/Web/Grand.Web.Admin/Services/CourseViewModelService.cs+++ b/src/Web/Grand.Web.Admin/Services/CourseViewModelService.cs@@ -7,7 +7,6 @@ using Grand.Business.Core.Interfaces.Marketing.Courses;using Grand.Business.Core.Interfaces.Storage;using Grand.Domain.Catalog;using Grand.Domain.Courses;-using Grand.Domain.Seo;using Grand.Web.Admin.Extensions;using Grand.Web.Admin.Extensions.Mapping;using Grand.Web.Admin.Interfaces;@@ -23,16 +22,13 @@ public class CourseViewModelService(ICourseLevelService courseLevelService,ICourseLessonService courseLessonService,ICourseSubjectService courseSubjectService,- ISlugService slugService,IPictureService pictureService,- ILanguageService languageService,ITranslationService translationService,IProductCourseService productCourseService,IDownloadService downloadService,IProductService productService,IStoreService storeService,IVendorService vendorService,- SeoSettings seoSettings,ISeNameService seNameService): ICourseViewModelService{@@ -55,15 +51,14 @@ public class CourseViewModelService(public virtual async Task<Course> InsertCourseModel(CourseModel model){var course = model.ToEntity();- await courseService.Insert(course);//locales- model.SeName = await seNameService.ValidateSeName(course, model.SeName, course.Name, true);- course.SeName = model.SeName;- await courseService.Update(course);-- await slugService.SaveSlug(course, model.SeName, "");-+ course.Locales = await seNameService.TranslationSeNameProperties(model.Locales, course, x => x.Name);+ course.SeName = await seNameService.ValidateSeName(course, model.SeName, course.Name, true);++ await courseService.Insert(course);+ await seNameService.SaveSeName(course);+//update picture seo file nameawait pictureService.UpdatePictureSeoNames(course.PictureId, course.Name);@@ -80,14 +75,15 @@ public class CourseViewModelService(var prevProductId = course.ProductId;course = model.ToEntity(course);- model.SeName = await seNameService.ValidateSeName(course, model.SeName, course.Name, true);- course.SeName = model.SeName;+//locales- course.Locales =- await model.Locales.ToTranslationProperty(course, x => x.Name, seoSettings, slugService, languageService);+ course.Locales = await seNameService.TranslationSeNameProperties(model.Locales, course, x => x.Name);+ course.SeName = await seNameService.ValidateSeName(course, model.SeName, course.Name, true);+await courseService.Update(course);+//search engine name- await slugService.SaveSlug(course, model.SeName, "");+ await seNameService.SaveSeName(course);//delete an old picture (if deleted or updated)if (!string.IsNullOrEmpty(prevPictureId) && prevPictureId != course.PictureId)diff --git a/src/Web/Grand.Web.Admin/Services/KnowledgebaseViewModelService.cs b/src/Web/Grand.Web.Admin/Services/KnowledgebaseViewModelService.csindex a25e956b3..55a0fb4e4 100644--- a/src/Web/Grand.Web.Admin/Services/KnowledgebaseViewModelService.cs+++ b/src/Web/Grand.Web.Admin/Services/KnowledgebaseViewModelService.cs@@ -1,13 +1,10 @@using Grand.Business.Core.Interfaces.Cms;-using Grand.Business.Core.Interfaces.Common.Localization;using Grand.Business.Core.Interfaces.Common.Seo;using Grand.Domain.Knowledgebase;-using Grand.Domain.Seo;using Grand.Web.Admin.Extensions;using Grand.Web.Admin.Extensions.Mapping;using Grand.Web.Admin.Interfaces;using Grand.Web.Admin.Models.Knowledgebase;-using Grand.Web.Common.Extensions;using Microsoft.AspNetCore.Mvc.Rendering;namespace Grand.Web.Admin.Services;@@ -15,22 +12,13 @@ namespace Grand.Web.Admin.Services;public class KnowledgebaseViewModelService : IKnowledgebaseViewModelService{private readonly IKnowledgebaseService _knowledgebaseService;- private readonly ILanguageService _languageService;private readonly ISeNameService _seNameService;- private readonly SeoSettings _seoSettings;- private readonly ISlugService _slugService;public KnowledgebaseViewModelService(IKnowledgebaseService knowledgebaseService,- ISlugService slugService,- ILanguageService languageService,- SeoSettings seoSettings,ISeNameService seNameService){_knowledgebaseService = knowledgebaseService;- _slugService = slugService;- _languageService = languageService;- _seoSettings = seoSettings;_seNameService = seNameService;}@@ -110,27 +98,26 @@ public class KnowledgebaseViewModelService : IKnowledgebaseViewModelServicepublic virtual async Task<KnowledgebaseCategory> InsertKnowledgebaseCategoryModel(KnowledgebaseCategoryModel model){- var knowledgebaseCategory = model.ToEntity();- knowledgebaseCategory.Locales = await model.Locales.ToTranslationProperty(knowledgebaseCategory, x => x.Name,- _seoSettings, _slugService, _languageService);- model.SeName = await _seNameService.ValidateSeName(knowledgebaseCategory, model.SeName, knowledgebaseCategory.Name, true);- knowledgebaseCategory.SeName = model.SeName;- await _knowledgebaseService.InsertKnowledgebaseCategory(knowledgebaseCategory);- await _slugService.SaveSlug(knowledgebaseCategory, model.SeName, "");+ var knowledgeBaseCategory = model.ToEntity();++ knowledgeBaseCategory.Locales = await _seNameService.TranslationSeNameProperties(model.Locales, knowledgeBaseCategory, x => x.Name);+ knowledgeBaseCategory.SeName = await _seNameService.ValidateSeName(knowledgeBaseCategory, model.SeName, knowledgeBaseCategory.Name, true);- return knowledgebaseCategory;+ await _knowledgebaseService.InsertKnowledgebaseCategory(knowledgeBaseCategory);+ await _seNameService.SaveSeName(knowledgeBaseCategory);++ return knowledgeBaseCategory;}public virtual async Task<KnowledgebaseCategory> UpdateKnowledgebaseCategoryModel(KnowledgebaseCategory knowledgebaseCategory, KnowledgebaseCategoryModel model){knowledgebaseCategory = model.ToEntity(knowledgebaseCategory);- knowledgebaseCategory.Locales = await model.Locales.ToTranslationProperty(knowledgebaseCategory, x => x.Name,- _seoSettings, _slugService, _languageService);- model.SeName = await _seNameService.ValidateSeName(knowledgebaseCategory, model.SeName, knowledgebaseCategory.Name, true);- knowledgebaseCategory.SeName = model.SeName;+ knowledgebaseCategory.Locales = await _seNameService.TranslationSeNameProperties(model.Locales, knowledgebaseCategory, x => x.Name);+ knowledgebaseCategory.SeName = await _seNameService.ValidateSeName(knowledgebaseCategory, model.SeName, knowledgebaseCategory.Name, true);+await _knowledgebaseService.UpdateKnowledgebaseCategory(knowledgebaseCategory);- await _slugService.SaveSlug(knowledgebaseCategory, model.SeName, "");+ await _seNameService.SaveSeName(knowledgebaseCategory);return knowledgebaseCategory;}@@ -152,31 +139,31 @@ public class KnowledgebaseViewModelService : IKnowledgebaseViewModelServicepublic virtual async Task<KnowledgebaseArticle> InsertKnowledgebaseArticleModel(KnowledgebaseArticleModel model){- var knowledgebaseArticle = model.ToEntity();- knowledgebaseArticle.Locales = await model.Locales.ToTranslationProperty(knowledgebaseArticle, x => x.Name,- _seoSettings, _slugService, _languageService);- model.SeName = await _seNameService.ValidateSeName(knowledgebaseArticle, model.SeName, knowledgebaseArticle.Name, true);- knowledgebaseArticle.SeName = model.SeName;- knowledgebaseArticle.AllowComments = model.AllowComments;- await _knowledgebaseService.InsertKnowledgebaseArticle(knowledgebaseArticle);- await _slugService.SaveSlug(knowledgebaseArticle, model.SeName, "");+ var knowledgeBaseArticle = model.ToEntity();+ knowledgeBaseArticle.Locales = await _seNameService.TranslationSeNameProperties(model.Locales, knowledgeBaseArticle, x => x.Name);+ knowledgeBaseArticle.SeName = await _seNameService.ValidateSeName(knowledgeBaseArticle, model.SeName, knowledgeBaseArticle.Name, true);- return knowledgebaseArticle;+ knowledgeBaseArticle.AllowComments = model.AllowComments;++ await _knowledgebaseService.InsertKnowledgebaseArticle(knowledgeBaseArticle);+ await _seNameService.SaveSeName(knowledgeBaseArticle);++ return knowledgeBaseArticle;}public virtual async Task<KnowledgebaseArticle> UpdateKnowledgebaseArticleModel(- KnowledgebaseArticle knowledgebaseArticle, KnowledgebaseArticleModel model)- {- knowledgebaseArticle = model.ToEntity(knowledgebaseArticle);- knowledgebaseArticle.Locales = await model.Locales.ToTranslationProperty(knowledgebaseArticle, x => x.Name,- _seoSettings, _slugService, _languageService);- model.SeName = await _seNameService.ValidateSeName(knowledgebaseArticle, model.SeName, knowledgebaseArticle.Name, true);- knowledgebaseArticle.SeName = model.SeName;- knowledgebaseArticle.AllowComments = model.AllowComments;- await _knowledgebaseService.UpdateKnowledgebaseArticle(knowledgebaseArticle);- await _slugService.SaveSlug(knowledgebaseArticle, model.SeName, "");-- return knowledgebaseArticle;+ KnowledgebaseArticle knowledgeBaseArticle, KnowledgebaseArticleModel model)+ {+ knowledgeBaseArticle = model.ToEntity(knowledgeBaseArticle);+ knowledgeBaseArticle.Locales = await _seNameService.TranslationSeNameProperties(model.Locales, knowledgeBaseArticle, x => x.Name);+ knowledgeBaseArticle.SeName = await _seNameService.ValidateSeName(knowledgeBaseArticle, model.SeName, knowledgeBaseArticle.Name, true);++ knowledgeBaseArticle.AllowComments = model.AllowComments;++ await _knowledgebaseService.UpdateKnowledgebaseArticle(knowledgeBaseArticle);+ await _seNameService.SaveSeName(knowledgeBaseArticle);++ return knowledgeBaseArticle;}public virtual async Task DeleteKnowledgebaseArticle(KnowledgebaseArticle knowledgebaseArticle)diff --git a/src/Web/Grand.Web.Admin/Services/NewsViewModelService.cs b/src/Web/Grand.Web.Admin/Services/NewsViewModelService.csindex aea1e96df..2f5a1e33e 100644--- a/src/Web/Grand.Web.Admin/Services/NewsViewModelService.cs+++ b/src/Web/Grand.Web.Admin/Services/NewsViewModelService.cs@@ -1,12 +1,10 @@-using Grand.Business.Core.Extensions;-using Grand.Business.Core.Interfaces.Cms;+using Grand.Business.Core.Interfaces.Cms;using Grand.Business.Core.Interfaces.Common.Directory;using Grand.Business.Core.Interfaces.Common.Localization;using Grand.Business.Core.Interfaces.Common.Seo;using Grand.Business.Core.Interfaces.Customers;using Grand.Business.Core.Interfaces.Storage;using Grand.Domain.News;-using Grand.Domain.Seo;using Grand.SharedKernel.Extensions;using Grand.Web.Admin.Extensions;using Grand.Web.Admin.Extensions.Mapping;@@ -23,11 +21,8 @@ public class NewsViewModelService : INewsViewModelServiceprivate readonly INewsService _newsService;private readonly IDateTimeService _dateTimeService;private readonly ITranslationService _translationService;- private readonly ISlugService _slugService;private readonly IPictureService _pictureService;- private readonly ILanguageService _languageService;private readonly ICustomerService _customerService;- private readonly SeoSettings _seoSettings;private readonly ISeNameService _seNameService;#endregion@@ -37,21 +32,15 @@ public class NewsViewModelService : INewsViewModelServicepublic NewsViewModelService(INewsService newsService,IDateTimeService dateTimeService,ITranslationService translationService,- ISlugService slugService,IPictureService pictureService,- ILanguageService languageService,ICustomerService customerService,- SeoSettings seoSettings,ISeNameService seNameService){_newsService = newsService;_dateTimeService = dateTimeService;_translationService = translationService;- _slugService = slugService;_pictureService = pictureService;- _languageService = languageService;_customerService = customerService;- _seoSettings = seoSettings;_seNameService = seNameService;}@@ -74,16 +63,13 @@ public class NewsViewModelService : INewsViewModelServicepublic virtual async Task<NewsItem> InsertNewsItemModel(NewsItemModel model){var newsItem = model.ToEntity(_dateTimeService);- await _newsService.InsertNews(newsItem);- var seName = await _seNameService.ValidateSeName(newsItem, model.SeName, model.Title, true);- newsItem.SeName = seName;- newsItem.Locales =- await model.Locales.ToTranslationProperty(newsItem, x => x.Title, _seoSettings, _slugService,- _languageService);- await _newsService.UpdateNews(newsItem);+ newsItem.Locales = await _seNameService.TranslationSeNameProperties(model.Locales, newsItem, x => x.Title);+ newsItem.SeName = await _seNameService.ValidateSeName(newsItem, model.SeName, newsItem.Title, true);++ await _newsService.InsertNews(newsItem);//search engine name- await _slugService.SaveSlug(newsItem, seName, "");+ await _seNameService.SaveSeName(newsItem);//update picture seo file nameawait _pictureService.UpdatePictureSeoNames(newsItem.PictureId, newsItem.Title);@@ -94,15 +80,13 @@ public class NewsViewModelService : INewsViewModelService{var prevPictureId = newsItem.PictureId;newsItem = model.ToEntity(newsItem, _dateTimeService);- var seName = await _seNameService.ValidateSeName(newsItem, model.SeName, model.Title, true);- newsItem.SeName = seName;- newsItem.Locales =- await model.Locales.ToTranslationProperty(newsItem, x => x.Title, _seoSettings, _slugService,- _languageService);- await _newsService.UpdateNews(newsItem);++ newsItem.Locales = await _seNameService.TranslationSeNameProperties(model.Locales, newsItem, x => x.Title);+ newsItem.SeName = await _seNameService.ValidateSeName(newsItem, model.SeName, newsItem.Title, true);+ await _newsService.UpdateNews(newsItem);//search engine name- await _slugService.SaveSlug(newsItem, seName, "");+ await _seNameService.SaveSeName(newsItem);//delete an old picture (if deleted or updated)if (!string.IsNullOrEmpty(prevPictureId) && prevPictureId != newsItem.PictureId)diff --git a/src/Web/Grand.Web.Admin/Services/PageViewModelService.cs b/src/Web/Grand.Web.Admin/Services/PageViewModelService.csindex b94baaeb3..a9389b90b 100644--- a/src/Web/Grand.Web.Admin/Services/PageViewModelService.cs+++ b/src/Web/Grand.Web.Admin/Services/PageViewModelService.cs@@ -4,11 +4,9 @@ using Grand.Business.Core.Interfaces.Common.Localization;using Grand.Business.Core.Interfaces.Common.Seo;using Grand.Business.Core.Interfaces.Common.Stores;using Grand.Domain.Pages;-using Grand.Domain.Seo;using Grand.Web.Admin.Extensions.Mapping;using Grand.Web.Admin.Interfaces;using Grand.Web.Admin.Models.Pages;-using Grand.Web.Common.Extensions;using Microsoft.AspNetCore.Mvc.Rendering;namespace Grand.Web.Admin.Services;@@ -16,11 +14,8 @@ namespace Grand.Web.Admin.Services;public class PageViewModelService : IPageViewModelService{private readonly IDateTimeService _dateTimeService;- private readonly ILanguageService _languageService;private readonly IPageLayoutService _pageLayoutService;private readonly IPageService _pageService;- private readonly SeoSettings _seoSettings;- private readonly ISlugService _slugService;private readonly IStoreService _storeService;private readonly ITranslationService _translationService;private readonly ISeNameService _seNameService;@@ -28,22 +23,16 @@ public class PageViewModelService : IPageViewModelServicepublic PageViewModelService(IPageLayoutService pageLayoutService,IPageService pageService,- ISlugService slugService,ITranslationService translationService,IStoreService storeService,- ILanguageService languageService,IDateTimeService dateTimeService,- SeoSettings seoSettings,ISeNameService seNameService){_pageLayoutService = pageLayoutService;_pageService = pageService;- _slugService = slugService;_translationService = translationService;_storeService = storeService;- _languageService = languageService;_dateTimeService = dateTimeService;- _seoSettings = seoSettings;_seNameService = seNameService;}@@ -75,14 +64,13 @@ public class PageViewModelService : IPageViewModelServiceif (!model.IsPasswordProtected) model.Password = null;var page = model.ToEntity(_dateTimeService);- await _pageService.InsertPage(page);//search engine name- model.SeName = await _seNameService.ValidateSeName(page, model.SeName, page.Title ?? page.SystemName, true);- page.Locales =- await model.Locales.ToTranslationProperty(page, x => x.Title, _seoSettings, _slugService, _languageService);- page.SeName = model.SeName;- await _pageService.UpdatePage(page);- await _slugService.SaveSlug(page, model.SeName, "");+ page.Locales = await _seNameService.TranslationSeNameProperties(model.Locales, page, x => x.Title);+ page.SeName = await _seNameService.ValidateSeName(page, model.SeName, page.Title ?? page.SystemName, true);++ await _pageService.InsertPage(page);+ await _seNameService.SaveSeName(page);+return page;}@@ -90,14 +78,13 @@ public class PageViewModelService : IPageViewModelService{if (!model.IsPasswordProtected) model.Password = null;page = model.ToEntity(page, _dateTimeService);- page.Locales =- await model.Locales.ToTranslationProperty(page, x => x.Title, _seoSettings, _slugService, _languageService);- model.SeName = await _seNameService.ValidateSeName(page, model.SeName, page.Title ?? page.SystemName, true);- page.SeName = model.SeName;+ page.Locales = await _seNameService.TranslationSeNameProperties(model.Locales, page, x => x.Title);+ page.SeName = await _seNameService.ValidateSeName(page, model.SeName, page.Title ?? page.SystemName, true);+await _pageService.UpdatePage(page);-//search engine name- await _slugService.SaveSlug(page, model.SeName, "");+ await _seNameService.SaveSeName(page);+return page;}diff --git a/src/Web/Grand.Web.Admin/Services/ProductViewModelService.cs b/src/Web/Grand.Web.Admin/Services/ProductViewModelService.csindex e95d15615..7b2ac76c4 100644--- a/src/Web/Grand.Web.Admin/Services/ProductViewModelService.cs+++ b/src/Web/Grand.Web.Admin/Services/ProductViewModelService.cs@@ -59,7 +59,6 @@ public class ProductViewModelService(IDiscountService discountService,ICustomerService customerService,IStoreService storeService,- ISlugService slugService,IOutOfStockSubscriptionService outOfStockSubscriptionService,IDownloadService downloadService,ILanguageService languageService,@@ -697,19 +696,7 @@ public class ProductViewModelService(//productvar product = model.ToEntity(dateTimeService);- await productService.InsertProduct(product);-- model.SeName = await seNameService.ValidateSeName(product, model.SeName, product.Name, true);- product.SeName = model.SeName;- product.Locales =- await model.Locales.ToTranslationProperty(product, x => x.Name, seoSettings, slugService, languageService);-- //search engine name- await slugService.SaveSlug(product, model.SeName, "");- //tags- await SaveProductTags(product, ParseProductTags(model.ProductTags));- //warehouses- await SaveProductWarehouseInventory(product, model.ProductWarehouseInventoryModels);+//discountsvar allDiscounts =await discountService.GetDiscountsQuery(DiscountType.AssignedToSkus,@@ -718,11 +705,26 @@ public class ProductViewModelService(if (model.SelectedDiscountIds != null && model.SelectedDiscountIds.Contains(discount.Id)){product.AppliedDiscounts.Add(discount.Id);- await productService.InsertDiscount(discount.Id, product.Id);}++ product.Locales = await seNameService.TranslationSeNameProperties(model.Locales, product, x => x.Name);+ product.SeName = await seNameService.ValidateSeName(product, model.SeName, product.Name, true);++ await productService.InsertProduct(product);+ //search engine name+ await seNameService.SaveSeName(product);++ //tags+ await SaveProductTags(product, ParseProductTags(model.ProductTags));++ //warehouses+ await SaveProductWarehouseInventory(product, model.ProductWarehouseInventoryModels);+++await productService.UpdateProduct(product);-+return product;}@@ -743,19 +745,8 @@ public class ProductViewModelService(//productproduct = model.ToEntity(product, dateTimeService);product.AutoAddRequiredProducts = model.AutoAddRequiredProducts;- model.SeName = await seNameService.ValidateSeName(product, model.SeName, product.Name, true);- product.SeName = model.SeName;- product.Locales =- await model.Locales.ToTranslationProperty(product, x => x.Name, seoSettings, slugService, languageService);-- //search engine name- await slugService.SaveSlug(product, model.SeName, "");- //tags- await SaveProductTags(product, ParseProductTags(model.ProductTags));- //warehouses- await SaveProductWarehouseInventory(product, model.ProductWarehouseInventoryModels);- //picture seo names- await UpdatePictureSeoNames(product);+ product.Locales = await seNameService.TranslationSeNameProperties(model.Locales, product, x => x.Name);+ product.SeName = await seNameService.ValidateSeName(product, model.SeName, product.Name, true);//discountsvar allDiscounts =await discountService.GetDiscountsQuery(DiscountType.AssignedToSkus,@@ -767,7 +758,6 @@ public class ProductViewModelService(if (product.AppliedDiscounts.Count(d => d == discount.Id) == 0){product.AppliedDiscounts.Add(discount.Id);- await productService.InsertDiscount(discount.Id, product.Id);}}else@@ -776,12 +766,20 @@ public class ProductViewModelService(if (product.AppliedDiscounts.Count(d => d == discount.Id) > 0){product.AppliedDiscounts.Remove(discount.Id);- await productService.DeleteDiscount(discount.Id, product.Id);}}-+await productService.UpdateProduct(product);+ //search engine name+ await seNameService.SaveSeName(product);+ //tags+ await SaveProductTags(product, ParseProductTags(model.ProductTags));+ //warehouses+ await SaveProductWarehouseInventory(product, model.ProductWarehouseInventoryModels);+ //picture seo names+ await UpdatePictureSeoNames(product);+//out of stock notificationsawait OutOfStockNotifications(product, model, prevStockQuantity, prevMultiWarehouseStock);diff --git a/src/Web/Grand.Web.Admin/Services/VendorViewModelService.cs b/src/Web/Grand.Web.Admin/Services/VendorViewModelService.csindex 585156a0e..4438c2369 100644--- a/src/Web/Grand.Web.Admin/Services/VendorViewModelService.cs+++ b/src/Web/Grand.Web.Admin/Services/VendorViewModelService.cs@@ -1,5 +1,4 @@using Grand.Business.Core.Events.Customers;-using Grand.Business.Core.Extensions;using Grand.Business.Core.Interfaces.Catalog.Discounts;using Grand.Business.Core.Interfaces.Common.Directory;using Grand.Business.Core.Interfaces.Common.Localization;@@ -9,7 +8,6 @@ using Grand.Business.Core.Interfaces.Customers;using Grand.Business.Core.Interfaces.Storage;using Grand.Domain.Directory;using Grand.Domain.Discounts;-using Grand.Domain.Seo;using Grand.Domain.Vendors;using Grand.SharedKernel.Extensions;using Grand.Web.Admin.Extensions;@@ -17,7 +15,6 @@ using Grand.Web.Admin.Extensions.Mapping;using Grand.Web.Admin.Interfaces;using Grand.Web.Admin.Models.Common;using Grand.Web.Admin.Models.Vendors;-using Grand.Web.Common.Extensions;using MediatR;using Microsoft.AspNetCore.Mvc.Rendering;@@ -31,12 +28,9 @@ public class VendorViewModelService(IDateTimeService dateTimeService,ICountryService countryService,IStoreService storeService,- ISlugService slugService,IPictureService pictureService,IMediator mediator,VendorSettings vendorSettings,- ILanguageService languageService,- SeoSettings seoSettings,ISeNameService seNameService): IVendorViewModelService{@@ -177,24 +171,20 @@ public class VendorViewModelService({var vendor = model.ToEntity();vendor.Address = model.Address.ToEntity();- await vendorService.InsertVendor(vendor);-//discountsvar allDiscounts = await discountService.GetDiscountsQuery(DiscountType.AssignedToVendors);foreach (var discount in allDiscounts)if (model.SelectedDiscountIds != null && model.SelectedDiscountIds.Contains(discount.Id))vendor.AppliedDiscounts.Add(discount.Id);-- //search engine name- model.SeName = await seNameService.ValidateSeName(vendor, model.SeName, vendor.Name, true);- vendor.Locales =- await model.Locales.ToTranslationProperty(vendor, x => x.Name, seoSettings, slugService, languageService);- vendor.SeName = model.SeName;- await vendorService.UpdateVendor(vendor);++ vendor.Locales = await seNameService.TranslationSeNameProperties(model.Locales, vendor, x => x.Name);+ vendor.SeName = await seNameService.ValidateSeName(vendor, model.SeName, vendor.Name, true);++ await vendorService.InsertVendor(vendor);+ await seNameService.SaveSeName(vendor);//update picture seo file nameawait pictureService.UpdatePictureSeoNames(vendor.PictureId, vendor.Name);- await slugService.SaveSlug(vendor, model.SeName, "");return vendor;}@@ -203,9 +193,8 @@ public class VendorViewModelService({var prevPictureId = vendor.PictureId;vendor = model.ToEntity(vendor);- vendor.Locales =- await model.Locales.ToTranslationProperty(vendor, x => x.Name, seoSettings, slugService, languageService);- model.SeName = await seNameService.ValidateSeName(vendor, model.SeName, vendor.Name, true);+ vendor.Locales = await seNameService.TranslationSeNameProperties(model.Locales, vendor, x => x.Name);+ vendor.SeName = await seNameService.ValidateSeName(vendor, model.SeName, vendor.Name, true);vendor.Address = model.Address.ToEntity(vendor.Address);//discounts@@ -224,12 +213,10 @@ public class VendorViewModelService(vendor.AppliedDiscounts.Remove(discount.Id);}- vendor.SeName = model.SeName;-await vendorService.UpdateVendor(vendor);//search engine name- await slugService.SaveSlug(vendor, model.SeName, "");-+ await seNameService.SaveSeName(vendor);+//delete an old picture (if deleted or updated)if (!string.IsNullOrEmpty(prevPictureId) && prevPictureId != vendor.PictureId){diff --git a/src/Web/Grand.Web.Common/Controllers/BaseController.cs b/src/Web/Grand.Web.Common/Controllers/BaseController.csindex 075f3b01b..62cae0a9b 100644--- a/src/Web/Grand.Web.Common/Controllers/BaseController.cs+++ b/src/Web/Grand.Web.Common/Controllers/BaseController.cs@@ -1,4 +1,5 @@using Grand.Business.Core.Interfaces.Common.Localization;+using Grand.Infrastructure.Models;using Grand.Web.Common.DataSource;using Grand.Web.Common.Events;using Grand.Web.Common.Extensions;diff --git a/src/Web/Grand.Web.Common/Extensions/TranslationExtension.cs b/src/Web/Grand.Web.Common/Extensions/TranslationExtension.csindex 5093b5769..02daa591e 100644--- a/src/Web/Grand.Web.Common/Extensions/TranslationExtension.cs+++ b/src/Web/Grand.Web.Common/Extensions/TranslationExtension.cs@@ -1,11 +1,5 @@-using Grand.Business.Core.Extensions;-using Grand.Business.Core.Interfaces.Common.Localization;-using Grand.Business.Core.Interfaces.Common.Seo;-using Grand.Domain;-using Grand.Domain.Localization;-using Grand.Domain.Seo;-using Grand.Web.Common.Models;-using System.Linq.Expressions;+using Grand.Domain.Localization;+using Grand.Infrastructure.Models;using System.Reflection;namespace Grand.Web.Common.Extensions;@@ -39,78 +33,6 @@ public static class TranslationExtensionreturn local;}-- public static async Task<List<TranslationEntity>> ToTranslationProperty<T, E>(this IList<T> list, E entity,- Expression<Func<T, string>> keySelector,- SeoSettings seoSettings, ISlugService slugService, ILanguageService languageService)- where T : ILocalizedModelLocal where E : BaseEntity, ISlugEntity- {- var local = new List<TranslationEntity>();- foreach (var item in list)- {- var interfaces = item.GetType().GetInterfaces();- var props = item.GetType()- .GetProperties(BindingFlags.Public | BindingFlags.Instance | BindingFlags.FlattenHierarchy);- foreach (var prop in props)- {- var insert = true;-- foreach (var i in interfaces)- {- if (i.HasProperty(prop.Name) && typeof(ILocalizedModelLocal).IsAssignableFrom(i)) insert = false;- if (i.HasProperty(prop.Name) && typeof(ISlugModelLocal).IsAssignableFrom(i))- {- var member = keySelector.Body as MemberExpression;- if (member == null)- throw new ArgumentException(- $"Expression '{keySelector}' refers to a method, not a property.");-- var propInfo = member.Member as PropertyInfo;- if (propInfo == null)- throw new ArgumentException(- $"Expression '{keySelector}' refers to a field, not a property.");-- var value = item.GetType().GetProperty(propInfo.Name)?.GetValue(item, null);- if (value != null)- {- var name = value.ToString();- var itemvalue = prop.GetValue(item) ?? "";- var seName = await entity.ValidateSeName(itemvalue.ToString(), name, false, seoSettings,- slugService, languageService);- prop.SetValue(item, seName);- await slugService.SaveSlug(entity, seName, item.LanguageId);- }- else- {- var itemvalue = prop.GetValue(item) ?? "";- if (!string.IsNullOrEmpty(itemvalue.ToString()))- {- var seName = await entity.ValidateSeName(itemvalue.ToString(), "", false, seoSettings,- slugService, languageService);- prop.SetValue(item, seName);- await slugService.SaveSlug(entity, seName, item.LanguageId);- }- else- {- insert = false;- }- }- }- }-- if (insert && prop.GetValue(item) != null)- local.Add(new TranslationEntity {- LanguageId = item.LanguageId,- LocaleKey = prop.Name,- LocaleValue = prop.GetValue(item)?.ToString()- });- }- }-- return local;- }--private static bool HasProperty(this Type obj, string propertyName){return obj.GetProperty(propertyName) != null;diff --git a/src/Web/Grand.Web.Common/Models/ILocalizedModelLocal.cs b/src/Web/Grand.Web.Common/Models/ILocalizedModelLocal.csdeleted file mode 100644index 9edf0f273..000000000--- a/src/Web/Grand.Web.Common/Models/ILocalizedModelLocal.cs+++ /dev/null@@ -1,8 +0,0 @@-//Contribution https://github.com/smartstore/SmartStoreNET/blob/2.0.x/src/Presentation/SmartStore.Web.Framework/Localization/ILocalizedModelLocal.cs--namespace Grand.Web.Common.Models;--public interface ILocalizedModelLocal-{- string LanguageId { get; set; }-}\ No newline at end of filediff --git a/src/Web/Grand.Web.Common/Routing/SlugRouteTransformer.cs b/src/Web/Grand.Web.Common/Routing/SlugRouteTransformer.csindex 217af0ea7..941587548 100644--- a/src/Web/Grand.Web.Common/Routing/SlugRouteTransformer.cs+++ b/src/Web/Grand.Web.Common/Routing/SlugRouteTransformer.cs@@ -72,7 +72,7 @@ public class SlugRouteTransformer : DynamicRouteValueTransformerif (urlLanguage != null && !string.IsNullOrEmpty(urlLanguage.ToString())){var language = (await _languageService.GetAllLanguages()).FirstOrDefault(x =>- x.UniqueSeoCode.ToLowerInvariant() == urlLanguage.ToString()?.ToLowerInvariant()) ??+ x.UniqueSeoCode.Equals(urlLanguage.ToString(), StringComparison.InvariantCultureIgnoreCase)) ??(await _languageService.GetAllLanguages()).FirstOrDefault();var slugForCurrentLanguage = await GetSeName(entityUrl.EntityId, entityUrl.EntityName, language?.Id);diff --git a/src/Web/Grand.Web.Vendor/Controllers/VendorInfoController.cs b/src/Web/Grand.Web.Vendor/Controllers/VendorInfoController.csindex 8d57bcd3f..bb01fa187 100644--- a/src/Web/Grand.Web.Vendor/Controllers/VendorInfoController.cs+++ b/src/Web/Grand.Web.Vendor/Controllers/VendorInfoController.cs@@ -4,10 +4,8 @@ using Grand.Business.Core.Interfaces.Common.Localization;using Grand.Business.Core.Interfaces.Common.Seo;using Grand.Business.Core.Interfaces.Customers;using Grand.Domain.Directory;-using Grand.Domain.Seo;using Grand.Domain.Vendors;using Grand.Infrastructure;-using Grand.Web.Common.Extensions;using Grand.Web.Vendor.Extensions;using Grand.Web.Vendor.Models.Common;using Grand.Web.Vendor.Models.Vendor;@@ -26,8 +24,6 @@ public class VendorInfoController : BaseVendorControllerILanguageService languageService,IWorkContext workContext,ICountryService countryService,- ISlugService slugService,- SeoSettings seoSettings,VendorSettings vendorSettings,ISeNameService seNameService){@@ -36,8 +32,6 @@ public class VendorInfoController : BaseVendorController_languageService = languageService;_workContext = workContext;_countryService = countryService;- _slugService = slugService;- _seoSettings = seoSettings;_vendorSettings = vendorSettings;_seNameService = seNameService;}@@ -51,9 +45,7 @@ public class VendorInfoController : BaseVendorControllerprivate readonly IVendorService _vendorService;private readonly ILanguageService _languageService;private readonly ICountryService _countryService;- private readonly ISlugService _slugService;private readonly ISeNameService _seNameService;- private readonly SeoSettings _seoSettings;private readonly VendorSettings _vendorSettings;#endregion@@ -107,17 +99,16 @@ public class VendorInfoController : BaseVendorControllerprivate async Task UpdateVendorModel(Domain.Vendors.Vendor vendor, VendorModel model){vendor = model.ToEntity(vendor);- vendor.Locales =- await model.Locales.ToTranslationProperty(vendor, x => x.Name, _seoSettings, _slugService,- _languageService);- model.SeName = await _seNameService.ValidateSeName(vendor, model.SeName, vendor.Name, true);+ vendor.Locales = await _seNameService.TranslationSeNameProperties(model.Locales, vendor, x => x.Name);+ vendor.SeName = await _seNameService.ValidateSeName(vendor, model.SeName, vendor.Name, true);+vendor.Address = model.Address.ToEntity();vendor.SeName = model.SeName;await _vendorService.UpdateVendor(vendor);//search engine name- await _slugService.SaveSlug(vendor, model.SeName, "");+ await _seNameService.SaveSeName(vendor);}#endregiondiff --git a/src/Web/Grand.Web.Vendor/Services/ProductViewModelService.cs b/src/Web/Grand.Web.Vendor/Services/ProductViewModelService.csindex 3c88368e3..ef2bd753b 100644--- a/src/Web/Grand.Web.Vendor/Services/ProductViewModelService.cs+++ b/src/Web/Grand.Web.Vendor/Services/ProductViewModelService.cs@@ -17,7 +17,6 @@ using Grand.Domain.Common;using Grand.Domain.Directory;using Grand.Domain.Localization;using Grand.Domain.Media;-using Grand.Domain.Seo;using Grand.Domain.Tax;using Grand.Infrastructure;using Grand.SharedKernel.Extensions;@@ -54,8 +53,6 @@ public class ProductViewModelService : IProductViewModelServiceprivate readonly IProductCollectionService _productCollectionService;private readonly IProductLayoutService _productLayoutService;private readonly IProductService _productService;- private readonly SeoSettings _seoSettings;- private readonly ISlugService _slugService;private readonly ISpecificationAttributeService _specificationAttributeService;private readonly IStockQuantityService _stockQuantityService;private readonly IStoreService _storeService;@@ -86,7 +83,6 @@ public class ProductViewModelService : IProductViewModelServiceITaxCategoryService taxCategoryService,ICustomerService customerService,IStoreService storeService,- ISlugService slugService,IOutOfStockSubscriptionService outOfStockSubscriptionService,ILanguageService languageService,IProductAttributeFormatter productAttributeFormatter,@@ -95,7 +91,7 @@ public class ProductViewModelService : IProductViewModelServiceIPriceFormatter priceFormatter,CurrencySettings currencySettings,MeasureSettings measureSettings,- TaxSettings taxSettings, SeoSettings seoSettings,+ TaxSettings taxSettings,ISeNameService seNameService){_productService = productService;@@ -118,7 +114,6 @@ public class ProductViewModelService : IProductViewModelService_taxCategoryService = taxCategoryService;_customerService = customerService;_storeService = storeService;- _slugService = slugService;_outOfStockSubscriptionService = outOfStockSubscriptionService;_stockQuantityService = stockQuantityService;_languageService = languageService;@@ -128,7 +123,6 @@ public class ProductViewModelService : IProductViewModelService_currencySettings = currencySettings;_measureSettings = measureSettings;_taxSettings = taxSettings;- _seoSettings = seoSettings;_seNameService = seNameService;}@@ -689,21 +683,19 @@ public class ProductViewModelService : IProductViewModelService{//productvar product = model.ToEntity(_dateTimeService);- product.VendorId = _workContext.CurrentVendor!.Id;- await _productService.InsertProduct(product);+ product.VendorId = _workContext.CurrentVendor?.Id;++ product.Locales = await _seNameService.TranslationSeNameProperties(model.Locales, product, x => x.Name);+ product.SeName = await _seNameService.ValidateSeName(product, model.SeName, product.Name, true);- model.SeName = await _seNameService.ValidateSeName(product, model.SeName, product.Name, true);- product.SeName = model.SeName;- product.Locales = await model.Locales.ToTranslationProperty(product, x => x.Name,- _seoSettings, _slugService, _languageService);+ await _productService.InsertProduct(product);//search engine name- await _slugService.SaveSlug(product, model.SeName, "");+ await _seNameService.SaveSeName(product);+//warehousesawait SaveProductWarehouseInventory(product, model.ProductWarehouseInventoryModels);- await _productService.UpdateProduct(product);-return product;}@@ -718,20 +710,21 @@ public class ProductViewModelService : IProductViewModelService//productproduct = model.ToEntity(product, _dateTimeService);product.AutoAddRequiredProducts = model.AutoAddRequiredProducts;- model.SeName = await _seNameService.ValidateSeName(product, model.SeName, product.Name, true);- product.SeName = model.SeName;- product.Locales = await model.Locales.ToTranslationProperty(product, x => x.Name, _seoSettings,- _slugService, _languageService);++ product.Locales = await _seNameService.TranslationSeNameProperties(model.Locales, product, x => x.Name);+ product.SeName = await _seNameService.ValidateSeName(product, model.SeName, product.Name, true);+ await _productService.UpdateProduct(product);+//search engine name- await _slugService.SaveSlug(product, model.SeName, "");+ await _seNameService.SaveSeName(product);+//warehousesawait SaveProductWarehouseInventory(product, model.ProductWarehouseInventoryModels);+//picture seo namesawait UpdatePictureSeoNames(product);- await _productService.UpdateProduct(product);-//out of stock notificationsawait OutOfStockNotifications(product, prevStockQuantity, prevMultiWarehouseStock);