Skip to content

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.

Rename SlugNameValidator to SeNameService

KrzysztofPajak975b66342ff4
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/AddBrandCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/AddBrandCommandHandler.cs
index f70d4e176..f69fc2616 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/AddBrandCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/AddBrandCommandHandler.cs
@@ -12,22 +12,22 @@ public class AddBrandCommandHandler : IRequestHandler<AddBrandCommand, BrandDto>
{
private readonly IBrandService _brandService;
private readonly ISlugService _slugService;
- private readonly ISlugNameValidator _slugNameValidator;
+ private readonly ISeNameService _seNameService;
public AddBrandCommandHandler(
IBrandService brandService,
ISlugService slugService,
- ISlugNameValidator slugNameValidator)
+ ISeNameService seNameService)
{
_brandService = brandService;
_slugService = slugService;
- _slugNameValidator = slugNameValidator;
+ _seNameService = seNameService;
}
public async Task<BrandDto> Handle(AddBrandCommand request, CancellationToken cancellationToken)
{
var brand = request.Model.ToEntity();
await _brandService.InsertBrand(brand);
- request.Model.SeName = await _slugNameValidator.ValidateSeName(brand, request.Model.SeName, brand.Name, true);
+ request.Model.SeName = await _seNameService.ValidateSeName(brand, request.Model.SeName, brand.Name, true);
brand.SeName = request.Model.SeName;
await _brandService.UpdateBrand(brand);
await _slugService.SaveSlug(brand, request.Model.SeName, "");
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/AddCategoryCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/AddCategoryCommandHandler.cs
index 2bbd8f355..c731d22bf 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/AddCategoryCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/AddCategoryCommandHandler.cs
@@ -12,23 +12,23 @@ public class AddCategoryCommandHandler : IRequestHandler<AddCategoryCommand, Cat
{
private readonly ICategoryService _categoryService;
private readonly ISlugService _slugService;
- private readonly ISlugNameValidator _slugNameValidator;
+ private readonly ISeNameService _seNameService;
public AddCategoryCommandHandler(
ICategoryService categoryService,
ISlugService slugService,
- ISlugNameValidator slugNameValidator)
+ ISeNameService seNameService)
{
_categoryService = categoryService;
_slugService = slugService;
- _slugNameValidator = slugNameValidator;
+ _seNameService = seNameService;
}
public async Task<CategoryDto> Handle(AddCategoryCommand request, CancellationToken cancellationToken)
{
var category = request.Model.ToEntity();
await _categoryService.InsertCategory(category);
- request.Model.SeName = await _slugNameValidator.ValidateSeName(category, request.Model.SeName, category.Name, true);
+ request.Model.SeName = await _seNameService.ValidateSeName(category, request.Model.SeName, category.Name, true);
category.SeName = request.Model.SeName;
await _categoryService.UpdateCategory(category);
await _slugService.SaveSlug(category, request.Model.SeName, "");
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/AddCollectionCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/AddCollectionCommandHandler.cs
index 39b4304d2..a7e9d06d4 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/AddCollectionCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/AddCollectionCommandHandler.cs
@@ -12,22 +12,22 @@ public class AddCollectionCommandHandler : IRequestHandler<AddCollectionCommand,
{
private readonly ICollectionService _collectionService;
private readonly ISlugService _slugService;
- private readonly ISlugNameValidator _slugNameValidator;
+ private readonly ISeNameService _seNameService;
public AddCollectionCommandHandler(
ICollectionService collectionService,
ISlugService slugService,
- ISlugNameValidator slugNameValidator)
+ ISeNameService seNameService)
{
_collectionService = collectionService;
_slugService = slugService;
- _slugNameValidator = slugNameValidator;
+ _seNameService = seNameService;
}
public async Task<CollectionDto> Handle(AddCollectionCommand request, CancellationToken cancellationToken)
{
var collection = request.Model.ToEntity();
await _collectionService.InsertCollection(collection);
- request.Model.SeName = await _slugNameValidator.ValidateSeName(collection, request.Model.SeName, collection.Name, true);
+ request.Model.SeName = await _seNameService.ValidateSeName(collection, request.Model.SeName, collection.Name, true);
collection.SeName = request.Model.SeName;
await _collectionService.UpdateCollection(collection);
await _slugService.SaveSlug(collection, request.Model.SeName, "");
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductCommandHandler.cs
index f6d8024f1..228977de5 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductCommandHandler.cs
@@ -16,15 +16,15 @@ public class AddProductCommandHandler : IRequestHandler<AddProductCommand, Produ
{
private readonly IProductService _productService;
private readonly ISlugService _slugService;
- private readonly ISlugNameValidator _slugNameValidator;
+ private readonly ISeNameService _seNameService;
public AddProductCommandHandler(
IProductService productService,
ISlugService slugService,
- ISlugNameValidator slugNameValidator)
+ ISeNameService seNameService)
{
_productService = productService;
_slugService = slugService;
- _slugNameValidator = slugNameValidator;
+ _seNameService = seNameService;
}
public async Task<ProductDto> Handle(AddProductCommand request, CancellationToken cancellationToken)
@@ -32,7 +32,7 @@ public class AddProductCommandHandler : IRequestHandler<AddProductCommand, Produ
var product = request.Model.ToEntity();
await _productService.InsertProduct(product);
- request.Model.SeName = await _slugNameValidator.ValidateSeName(product, request.Model.SeName, product.Name, true);
+ request.Model.SeName = await _seNameService.ValidateSeName(product, request.Model.SeName, product.Name, true);
product.SeName = request.Model.SeName;
//search engine name
await _slugService.SaveSlug(product, request.Model.SeName, "");
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateBrandCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateBrandCommandHandler.cs
index b6c6f590d..8f12f761a 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateBrandCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateBrandCommandHandler.cs
@@ -13,17 +13,17 @@ public class UpdateBrandCommandHandler : IRequestHandler<UpdateBrandCommand, Bra
private readonly IBrandService _brandService;
private readonly IPictureService _pictureService;
private readonly ISlugService _slugService;
- private readonly ISlugNameValidator _slugNameValidator;
+ private readonly ISeNameService _seNameService;
public UpdateBrandCommandHandler(
IBrandService brandService,
ISlugService slugService,
IPictureService pictureService,
- ISlugNameValidator slugNameValidator)
+ ISeNameService seNameService)
{
_brandService = brandService;
_slugService = slugService;
_pictureService = pictureService;
- _slugNameValidator = slugNameValidator;
+ _seNameService = seNameService;
}
public async Task<BrandDto> Handle(UpdateBrandCommand request, CancellationToken cancellationToken)
@@ -31,7 +31,7 @@ public class UpdateBrandCommandHandler : IRequestHandler<UpdateBrandCommand, Bra
var brand = await _brandService.GetBrandById(request.Model.Id);
var prevPictureId = brand.PictureId;
brand = request.Model.ToEntity(brand);
- request.Model.SeName = await _slugNameValidator.ValidateSeName(brand, request.Model.SeName, brand.Name, true);
+ request.Model.SeName = await _seNameService.ValidateSeName(brand, request.Model.SeName, brand.Name, true);
brand.SeName = request.Model.SeName;
await _brandService.UpdateBrand(brand);
//search engine name
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateCategoryCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateCategoryCommandHandler.cs
index 5294c9aed..9dddab562 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateCategoryCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateCategoryCommandHandler.cs
@@ -13,17 +13,17 @@ public class UpdateCategoryCommandHandler : IRequestHandler<UpdateCategoryComman
private readonly ICategoryService _categoryService;
private readonly IPictureService _pictureService;
private readonly ISlugService _slugService;
- private readonly ISlugNameValidator _slugNameValidator;
+ private readonly ISeNameService _seNameService;
public UpdateCategoryCommandHandler(
ICategoryService categoryService,
ISlugService slugService,
IPictureService pictureService,
- ISlugNameValidator slugNameValidator)
+ ISeNameService seNameService)
{
_categoryService = categoryService;
_slugService = slugService;
_pictureService = pictureService;
- _slugNameValidator = slugNameValidator;
+ _seNameService = seNameService;
}
public async Task<CategoryDto> Handle(UpdateCategoryCommand request, CancellationToken cancellationToken)
@@ -31,7 +31,7 @@ public class UpdateCategoryCommandHandler : IRequestHandler<UpdateCategoryComman
var category = await _categoryService.GetCategoryById(request.Model.Id);
var prevPictureId = category.PictureId;
category = request.Model.ToEntity(category);
- request.Model.SeName = await _slugNameValidator.ValidateSeName(category, request.Model.SeName, category.Name, true);
+ request.Model.SeName = await _seNameService.ValidateSeName(category, request.Model.SeName, category.Name, true);
category.SeName = request.Model.SeName;
await _categoryService.UpdateCategory(category);
//search engine name
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateCollectionCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateCollectionCommandHandler.cs
index fb5a620d1..c39e52ec8 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateCollectionCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateCollectionCommandHandler.cs
@@ -13,17 +13,17 @@ public class UpdateCollectionCommandHandler : IRequestHandler<UpdateCollectionCo
private readonly ICollectionService _collectionService;
private readonly IPictureService _pictureService;
private readonly ISlugService _slugService;
- private readonly ISlugNameValidator _slugNameValidator;
+ private readonly ISeNameService _seNameService;
public UpdateCollectionCommandHandler(
ICollectionService collectionService,
ISlugService slugService,
IPictureService pictureService,
- ISlugNameValidator slugNameValidator)
+ ISeNameService seNameService)
{
_collectionService = collectionService;
_slugService = slugService;
_pictureService = pictureService;
- _slugNameValidator = slugNameValidator;
+ _seNameService = seNameService;
}
public async Task<CollectionDto> Handle(UpdateCollectionCommand request, CancellationToken cancellationToken)
@@ -31,7 +31,7 @@ public class UpdateCollectionCommandHandler : IRequestHandler<UpdateCollectionCo
var collection = await _collectionService.GetCollectionById(request.Model.Id);
var prevPictureId = collection.PictureId;
collection = request.Model.ToEntity(collection);
- request.Model.SeName = await _slugNameValidator.ValidateSeName(collection, request.Model.SeName, collection.Name, true);
+ request.Model.SeName = await _seNameService.ValidateSeName(collection, request.Model.SeName, collection.Name, true);
collection.SeName = request.Model.SeName;
await _collectionService.UpdateCollection(collection);
//search engine name
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductCommandHandler.cs
index 8f22215ff..b10528d80 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductCommandHandler.cs
@@ -16,21 +16,21 @@ public class UpdateProductCommandHandler : IRequestHandler<UpdateProductCommand,
private readonly IProductService _productService;
private readonly ISlugService _slugService;
private readonly IStockQuantityService _stockQuantityService;
- private readonly ISlugNameValidator _slugNameValidator;
+ private readonly ISeNameService _seNameService;
public UpdateProductCommandHandler(
IProductService productService,
ISlugService slugService,
IOutOfStockSubscriptionService outOfStockSubscriptionService,
IStockQuantityService stockQuantityService,
IMediator mediator,
- ISlugNameValidator slugNameValidator)
+ ISeNameService seNameService)
{
_productService = productService;
_slugService = slugService;
_outOfStockSubscriptionService = outOfStockSubscriptionService;
_stockQuantityService = stockQuantityService;
_mediator = mediator;
- _slugNameValidator = slugNameValidator;
+ _seNameService = seNameService;
}
public async Task<ProductDto> Handle(UpdateProductCommand request, CancellationToken cancellationToken)
@@ -41,7 +41,7 @@ public class UpdateProductCommandHandler : IRequestHandler<UpdateProductCommand,
var prevPublished = product.Published;
product = request.Model.ToEntity(product);
- request.Model.SeName = await _slugNameValidator.ValidateSeName(product, request.Model.SeName, product.Name, true);
+ request.Model.SeName = await _seNameService.ValidateSeName(product, request.Model.SeName, product.Name, true);
product.SeName = request.Model.SeName;
//search engine name
await _slugService.SaveSlug(product, request.Model.SeName, "");
diff --git a/src/Business/Grand.Business.Catalog/Services/ExportImport/BrandImportDataObject.cs b/src/Business/Grand.Business.Catalog/Services/ExportImport/BrandImportDataObject.cs
index 77c13963b..3c754ad48 100644
--- a/src/Business/Grand.Business.Catalog/Services/ExportImport/BrandImportDataObject.cs
+++ b/src/Business/Grand.Business.Catalog/Services/ExportImport/BrandImportDataObject.cs
@@ -16,20 +16,20 @@ public class BrandImportDataObject : IImportDataObject<BrandDto>
private readonly IBrandService _brandService;
private readonly IPictureService _pictureService;
private readonly ISlugService _slugService;
- private readonly ISlugNameValidator _slugNameValidator;
+ private readonly ISeNameService _seNameService;
public BrandImportDataObject(
IBrandService brandService,
IPictureService pictureService,
IBrandLayoutService brandLayoutService,
ISlugService slugService,
- ISlugNameValidator slugNameValidator)
+ ISeNameService seNameService)
{
_brandService = brandService;
_pictureService = pictureService;
_brandLayoutService = brandLayoutService;
_slugService = slugService;
- _slugNameValidator = slugNameValidator;
+ _seNameService = seNameService;
}
public async Task Execute(IEnumerable<BrandDto> data)
@@ -74,7 +74,7 @@ public class BrandImportDataObject : IImportDataObject<BrandDto>
}
var seName = brand.SeName ?? brand.Name;
- seName = await _slugNameValidator.ValidateSeName(brand, seName, brand.Name, true);
+ seName = await _seNameService.ValidateSeName(brand, seName, brand.Name, true);
brand.SeName = seName;
await _brandService.UpdateBrand(brand);
diff --git a/src/Business/Grand.Business.Catalog/Services/ExportImport/CategoryImportDataObject.cs b/src/Business/Grand.Business.Catalog/Services/ExportImport/CategoryImportDataObject.cs
index d546cebb3..8eae92e1e 100644
--- a/src/Business/Grand.Business.Catalog/Services/ExportImport/CategoryImportDataObject.cs
+++ b/src/Business/Grand.Business.Catalog/Services/ExportImport/CategoryImportDataObject.cs
@@ -16,20 +16,20 @@ public class CategoryImportDataObject : IImportDataObject<CategoryDto>
private readonly ICategoryService _categoryService;
private readonly IPictureService _pictureService;
private readonly ISlugService _slugService;
- private readonly ISlugNameValidator _slugNameValidator;
+ private readonly ISeNameService _seNameService;
public CategoryImportDataObject(
ICategoryService categoryService,
IPictureService pictureService,
ICategoryLayoutService categoryLayoutService,
ISlugService slugService,
- ISlugNameValidator slugNameValidator)
+ ISeNameService seNameService)
{
_categoryService = categoryService;
_pictureService = pictureService;
_categoryLayoutService = categoryLayoutService;
_slugService = slugService;
- _slugNameValidator = slugNameValidator;
+ _seNameService = seNameService;
}
public async Task Execute(IEnumerable<CategoryDto> data)
@@ -80,7 +80,7 @@ public class CategoryImportDataObject : IImportDataObject<CategoryDto>
}
var seName = category.SeName ?? category.Name;
- seName = await _slugNameValidator.ValidateSeName(category, seName, category.Name, true);
+ seName = await _seNameService.ValidateSeName(category, seName, category.Name, true);
category.SeName = seName;
await _categoryService.UpdateCategory(category);
await _slugService.SaveSlug(category, seName, "");
diff --git a/src/Business/Grand.Business.Catalog/Services/ExportImport/CollectionImportDataObject.cs b/src/Business/Grand.Business.Catalog/Services/ExportImport/CollectionImportDataObject.cs
index 1426e28c3..8591b4124 100644
--- a/src/Business/Grand.Business.Catalog/Services/ExportImport/CollectionImportDataObject.cs
+++ b/src/Business/Grand.Business.Catalog/Services/ExportImport/CollectionImportDataObject.cs
@@ -16,20 +16,20 @@ public class CollectionImportDataObject : IImportDataObject<CollectionDto>
private readonly ICollectionService _collectionService;
private readonly IPictureService _pictureService;
private readonly ISlugService _slugService;
- private readonly ISlugNameValidator _slugNameValidator;
+ private readonly ISeNameService _seNameService;
public CollectionImportDataObject(
ICollectionService collectionService,
IPictureService pictureService,
ICollectionLayoutService collectionLayoutService,
ISlugService slugService,
- ISlugNameValidator slugNameValidator)
+ ISeNameService seNameService)
{
_collectionService = collectionService;
_pictureService = pictureService;
_collectionLayoutService = collectionLayoutService;
_slugService = slugService;
- _slugNameValidator = slugNameValidator;
+ _seNameService = seNameService;
}
public async Task Execute(IEnumerable<CollectionDto> data)
@@ -76,7 +76,7 @@ public class CollectionImportDataObject : IImportDataObject<CollectionDto>
}
var sename = collection.SeName ?? collection.Name;
- sename = await _slugNameValidator.ValidateSeName(collection, sename, collection.Name, true);
+ sename = await _seNameService.ValidateSeName(collection, sename, collection.Name, true);
collection.SeName = sename;
await _collectionService.UpdateCollection(collection);
diff --git a/src/Business/Grand.Business.Catalog/Services/ExportImport/ProductImportDataObject.cs b/src/Business/Grand.Business.Catalog/Services/ExportImport/ProductImportDataObject.cs
index b4d419bba..5b29725c8 100644
--- a/src/Business/Grand.Business.Catalog/Services/ExportImport/ProductImportDataObject.cs
+++ b/src/Business/Grand.Business.Catalog/Services/ExportImport/ProductImportDataObject.cs
@@ -32,7 +32,7 @@ public class ProductImportDataObject : IImportDataObject<ProductDto>
private readonly ISlugService _slugService;
private readonly ITaxCategoryService _taxService;
private readonly IWarehouseService _warehouseService;
- private readonly ISlugNameValidator _slugNameValidator;
+ private readonly ISeNameService _seNameService;
public ProductImportDataObject(
IProductService productService,
IPictureService pictureService,
@@ -47,7 +47,7 @@ public class ProductImportDataObject : IImportDataObject<ProductDto>
IBrandService brandService,
ICollectionService collectionService,
IProductCollectionService productCollectionService,
- ISlugNameValidator slugNameValidator)
+ ISeNameService seNameService)
{
_productService = productService;
_pictureService = pictureService;
@@ -62,7 +62,7 @@ public class ProductImportDataObject : IImportDataObject<ProductDto>
_brandService = brandService;
_collectionService = collectionService;
_productCollectionService = productCollectionService;
- _slugNameValidator = slugNameValidator;
+ _seNameService = seNameService;
}
public async Task Execute(IEnumerable<ProductDto> data)
@@ -99,7 +99,7 @@ public class ProductImportDataObject : IImportDataObject<ProductDto>
//search engine name
var seName = product.SeName ?? product.Name;
- seName = await _slugNameValidator.ValidateSeName(product, seName, product.Name, true);
+ seName = await _seNameService.ValidateSeName(product, seName, product.Name, true);
await _slugService.SaveSlug(product, seName, "");
product.SeName = seName;
await _productService.UpdateProduct(product);
diff --git a/src/Business/Grand.Business.Catalog/Services/Products/CopyProductService.cs b/src/Business/Grand.Business.Catalog/Services/Products/CopyProductService.cs
index b983c2cbd..39258ad3d 100644
--- a/src/Business/Grand.Business.Catalog/Services/Products/CopyProductService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Products/CopyProductService.cs
@@ -14,18 +14,18 @@ public class CopyProductService : ICopyProductService
private readonly IProductService _productService;
private readonly ISlugService _slugService;
- private readonly ISlugNameValidator _slugNameValidator;
+ private readonly ISeNameService _seNameService;
#endregion
#region Ctor
public CopyProductService(IProductService productService,
ISlugService slugService,
- ISlugNameValidator slugNameValidator)
+ ISeNameService seNameService)
{
_productService = productService;
_slugService = slugService;
- _slugNameValidator = slugNameValidator;
+ _seNameService = seNameService;
}
#endregion
@@ -187,7 +187,7 @@ public class CopyProductService : ICopyProductService
await _productService.InsertProduct(productCopy);
//search engine name
- var seName = await _slugNameValidator.ValidateSeName(productCopy, "", productCopy.Name, true);
+ var seName = await _seNameService.ValidateSeName(productCopy, "", productCopy.Name, true);
productCopy.SeName = seName;
await _productService.UpdateProduct(productCopy);
await _slugService.SaveSlug(productCopy, seName, "");
diff --git a/src/Business/Grand.Business.Common/Services/Seo/SlugNameValidator.cs b/src/Business/Grand.Business.Common/Services/Seo/SlugNameValidator.cs
index 9b1d5d11c..f8dbf5b61 100644
--- a/src/Business/Grand.Business.Common/Services/Seo/SlugNameValidator.cs
+++ b/src/Business/Grand.Business.Common/Services/Seo/SlugNameValidator.cs
@@ -7,7 +7,7 @@ using Grand.SharedKernel.Extensions;
namespace Grand.Business.Common.Services.Seo;
-public class SlugNameValidator(ISlugService slugService, ILanguageService languageService, SeoSettings seoSettings) : ISlugNameValidator
+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
{
diff --git a/src/Business/Grand.Business.Common/Startup/StartupApplication.cs b/src/Business/Grand.Business.Common/Startup/StartupApplication.cs
index 1a03790d2..04c03c0f3 100644
--- a/src/Business/Grand.Business.Common/Startup/StartupApplication.cs
+++ b/src/Business/Grand.Business.Common/Startup/StartupApplication.cs
@@ -86,7 +86,7 @@ public class StartupApplication : IStartupApplication
private void RegisterSeoService(IServiceCollection serviceCollection)
{
serviceCollection.AddScoped<ISlugService, SlugService>();
- serviceCollection.AddScoped<ISlugNameValidator, SlugNameValidator>();
+ serviceCollection.AddScoped<ISeNameService, SeNameService>();
}
diff --git a/src/Business/Grand.Business.Core/Interfaces/Common/Seo/ISlugNameValidator.cs b/src/Business/Grand.Business.Core/Interfaces/Common/Seo/ISeNameService.cs
similarity index 85%
rename from src/Business/Grand.Business.Core/Interfaces/Common/Seo/ISlugNameValidator.cs
rename to src/Business/Grand.Business.Core/Interfaces/Common/Seo/ISeNameService.cs
index 2412aff72..1b7f51ef0 100644
--- a/src/Business/Grand.Business.Core/Interfaces/Common/Seo/ISlugNameValidator.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Common/Seo/ISeNameService.cs
@@ -3,7 +3,7 @@ using Grand.Domain.Seo;
namespace Grand.Business.Core.Interfaces.Common.Seo;
-public interface ISlugNameValidator
+public interface ISeNameService
{
Task<string> ValidateSeName<T>(T entity, string seName, string name, bool ensureNotEmpty) where T : BaseEntity, ISlugEntity;
}
\ No newline at end of file
diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/ExportImport/BrandImportDataObjectTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/ExportImport/BrandImportDataObjectTests.cs
index d7566dd92..19864a2f2 100644
--- a/src/Tests/Grand.Business.Catalog.Tests/Services/ExportImport/BrandImportDataObjectTests.cs
+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/ExportImport/BrandImportDataObjectTests.cs
@@ -41,7 +41,7 @@ public class BrandImportDataObjectTests
private IRepository<Brand> _repository;
private Mock<ISlugService> _slugServiceMock;
private Mock<IWorkContext> _workContextMock;
- private ISlugNameValidator _slugNameValidator;
+ private ISeNameService _seNameService;
[TestInitialize]
public void Init()
{
@@ -62,9 +62,9 @@ public class BrandImportDataObjectTests
new CacheConfig { DefaultCacheTimeMinutes = 1 });
_brandService = new BrandService(_cacheBase, _repository, _workContextMock.Object, _mediatorMock.Object,
new AccessControlConfig());
- _slugNameValidator = new SlugNameValidator(_slugServiceMock.Object, _languageServiceMock.Object, new SeoSettings());
+ _seNameService = new SeNameService(_slugServiceMock.Object, _languageServiceMock.Object, new SeoSettings());
_brandImportDataObject = new BrandImportDataObject(_brandService, _pictureServiceMock.Object,
- _brandLayoutServiceMock.Object, _slugServiceMock.Object, _slugNameValidator);
+ _brandLayoutServiceMock.Object, _slugServiceMock.Object, _seNameService);
}
[TestMethod]
diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/ExportImport/CategoryImportDataObjectTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/ExportImport/CategoryImportDataObjectTests.cs
index f95842583..2596be03b 100644
--- a/src/Tests/Grand.Business.Catalog.Tests/Services/ExportImport/CategoryImportDataObjectTests.cs
+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/ExportImport/CategoryImportDataObjectTests.cs
@@ -42,7 +42,7 @@ public class CategoryImportDataObjectTests
private IRepository<Category> _repository;
private Mock<ISlugService> _slugServiceMock;
private Mock<IWorkContext> _workContextMock;
- private ISlugNameValidator _slugNameValidator;
+ private ISeNameService _seNameService;
[TestInitialize]
public void Init()
{
@@ -63,9 +63,9 @@ public class CategoryImportDataObjectTests
new CacheConfig { DefaultCacheTimeMinutes = 1 });
_categoryService = new CategoryService(_cacheBase, _repository, _workContextMock.Object, _mediatorMock.Object,
new AclService(new AccessControlConfig()), new AccessControlConfig());
- _slugNameValidator = new SlugNameValidator(_slugServiceMock.Object, _languageServiceMock.Object, new SeoSettings());
+ _seNameService = new SeNameService(_slugServiceMock.Object, _languageServiceMock.Object, new SeoSettings());
_categoryImportDataObject = new CategoryImportDataObject(_categoryService, _pictureServiceMock.Object,
- _categoryLayoutServiceMock.Object, _slugServiceMock.Object, _slugNameValidator);
+ _categoryLayoutServiceMock.Object, _slugServiceMock.Object, _seNameService);
}
[TestMethod]
diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/ExportImport/CollectionImportDataObjectTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/ExportImport/CollectionImportDataObjectTests.cs
index 402be5135..48783e68e 100644
--- a/src/Tests/Grand.Business.Catalog.Tests/Services/ExportImport/CollectionImportDataObjectTests.cs
+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/ExportImport/CollectionImportDataObjectTests.cs
@@ -42,7 +42,7 @@ public class CollectionImportDataObjectTests
private IRepository<Collection> _repository;
private Mock<ISlugService> _slugServiceMock;
private Mock<IWorkContext> _workContextMock;
- private ISlugNameValidator _slugNameValidator;
+ private ISeNameService _seNameService;
[TestInitialize]
public void Init()
{
@@ -63,9 +63,9 @@ public class CollectionImportDataObjectTests
new CacheConfig { DefaultCacheTimeMinutes = 1 });
_collectionService = new CollectionService(_cacheBase, _repository, _workContextMock.Object,
_mediatorMock.Object, new AclService(new AccessControlConfig()), new AccessControlConfig());
- _slugNameValidator = new SlugNameValidator(_slugServiceMock.Object, _languageServiceMock.Object, new SeoSettings());
+ _seNameService = new SeNameService(_slugServiceMock.Object, _languageServiceMock.Object, new SeoSettings());
_collectionImportDataObject = new CollectionImportDataObject(_collectionService, _pictureServiceMock.Object,
- _collectionLayoutServiceMock.Object, _slugServiceMock.Object, _slugNameValidator);
+ _collectionLayoutServiceMock.Object, _slugServiceMock.Object, _seNameService);
}
[TestMethod]
diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/ExportImport/ProductImportDataObjectTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/ExportImport/ProductImportDataObjectTests.cs
index 06f660020..84a215c35 100644
--- a/src/Tests/Grand.Business.Catalog.Tests/Services/ExportImport/ProductImportDataObjectTests.cs
+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/ExportImport/ProductImportDataObjectTests.cs
@@ -60,7 +60,7 @@ public class ProductImportDataObjectTests
private Mock<ITaxCategoryService> _taxServiceMock;
private Mock<IWarehouseService> _warehouseServiceMock;
private Mock<IWorkContext> _workContextMock;
- private ISlugNameValidator _slugNameValidator;
+ private ISeNameService _seNameService;
[TestInitialize]
public void Init()
{
@@ -91,14 +91,14 @@ public class ProductImportDataObjectTests
new CacheConfig { DefaultCacheTimeMinutes = 1 });
_productService = new ProductService(_cacheBase, _repository, _workContextMock.Object, _mediatorMock.Object,
new AclService(new AccessControlConfig()));
- _slugNameValidator = new SlugNameValidator(_slugServiceMock.Object, _languageServiceMock.Object, new SeoSettings());
+ _seNameService = new SeNameService(_slugServiceMock.Object, _languageServiceMock.Object, new SeoSettings());
_productImportDataObject = new ProductImportDataObject
(_productService, _pictureServiceMock.Object, _productLayoutServiceMock.Object, _deliveryDateServiceMock.Object,
_taxServiceMock.Object, _warehouseServiceMock.Object, _measureServiceMock.Object, _slugServiceMock.Object,
_categoryServiceMock.Object, _productCategoryServiceMock.Object, _brandServiceMock.Object,
_collectionServiceMock.Object,
_productCollectionServiceMock.Object,
- _slugNameValidator);
+ _seNameService);
}
[TestMethod]
diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/CopyProductServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/CopyProductServiceTests.cs
index 46c17597e..420cf7872 100644
--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/CopyProductServiceTests.cs
+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/CopyProductServiceTests.cs
@@ -19,7 +19,7 @@ public class CopyProductServiceTests
private Mock<IProductService> _productServiceMock;
private SeoSettings _settings;
private Mock<ISlugService> _slugServiceMock;
- private ISlugNameValidator _slugNameValidator;
+ private ISeNameService _seNameService;
[TestInitialize]
public void Init()
@@ -28,8 +28,8 @@ public class CopyProductServiceTests
_langServiceMock = new Mock<ILanguageService>();
_slugServiceMock = new Mock<ISlugService>();
_settings = new SeoSettings();
- _slugNameValidator = new SlugNameValidator(_slugServiceMock.Object, _langServiceMock.Object, new SeoSettings());
- _copyProductService = new CopyProductService(_productServiceMock.Object, _slugServiceMock.Object, _slugNameValidator);
+ _seNameService = new SeNameService(_slugServiceMock.Object, _langServiceMock.Object, new SeoSettings());
+ _copyProductService = new CopyProductService(_productServiceMock.Object, _slugServiceMock.Object, _seNameService);
}
diff --git a/src/Tests/Grand.Business.Common.Tests/Services/Seo/SlugNameValidatorTests.cs b/src/Tests/Grand.Business.Common.Tests/Services/Seo/SeNameServiceTests.cs
similarity index 86%
rename from src/Tests/Grand.Business.Common.Tests/Services/Seo/SlugNameValidatorTests.cs
rename to src/Tests/Grand.Business.Common.Tests/Services/Seo/SeNameServiceTests.cs
index a66262059..729e67f8a 100644
--- a/src/Tests/Grand.Business.Common.Tests/Services/Seo/SlugNameValidatorTests.cs
+++ b/src/Tests/Grand.Business.Common.Tests/Services/Seo/SeNameServiceTests.cs
@@ -10,12 +10,12 @@ using NUnit.Framework.Legacy;
namespace Grand.Business.Common.Tests.Services.Seo
{
- public class SlugNameValidatorTests
+ public class SeNameServiceTests
{
private Mock<ISlugService> _mockSlugService;
private Mock<ILanguageService> _mockLanguageService;
private SeoSettings _seoSettings;
- private SlugNameValidator _slugNameValidator;
+ private SeNameService _seNameService;
[SetUp]
public void Setup()
@@ -30,7 +30,7 @@ namespace Grand.Business.Common.Tests.Services.Seo
AllowSlashChar = false,
SeoCharConversion = null
};
- _slugNameValidator = new SlugNameValidator(_mockSlugService.Object, _mockLanguageService.Object, _seoSettings);
+ _seNameService = new SeNameService(_mockSlugService.Object, _mockLanguageService.Object, _seoSettings);
}
[Test]
@@ -43,7 +43,7 @@ namespace Grand.Business.Common.Tests.Services.Seo
bool ensureNotEmpty = false;
// Act
- var result = await _slugNameValidator.ValidateSeName(entity, seName, name, ensureNotEmpty);
+ var result = await _seNameService.ValidateSeName(entity, seName, name, ensureNotEmpty);
// Assert
ClassicAssert.AreEqual("test-name", result);
@@ -59,7 +59,7 @@ namespace Grand.Business.Common.Tests.Services.Seo
bool ensureNotEmpty = true;
// Act
- var result = await _slugNameValidator.ValidateSeName(entity, seName, name, ensureNotEmpty);
+ var result = await _seNameService.ValidateSeName(entity, seName, name, ensureNotEmpty);
// Assert
ClassicAssert.AreEqual("123", result);
@@ -78,7 +78,7 @@ namespace Grand.Business.Common.Tests.Services.Seo
_mockLanguageService.Setup(l => l.GetAllLanguages(true, "")).ReturnsAsync(new List<Language>());
// Act
- var result = await _slugNameValidator.ValidateSeName(entity, seName, name, ensureNotEmpty);
+ var result = await _seNameService.ValidateSeName(entity, seName, name, ensureNotEmpty);
// Assert
ClassicAssert.AreEqual("reserved-slug-1", result);
@@ -97,7 +97,7 @@ namespace Grand.Business.Common.Tests.Services.Seo
.ReturnsAsync(new[] { new Language { UniqueSeoCode = "en" } });
// Act
- var result = await _slugNameValidator.ValidateSeName(entity, seName, name, true);
+ var result = await _seNameService.ValidateSeName(entity, seName, name, true);
// Assert
ClassicAssert.IsTrue(result.StartsWith("en-"));
@@ -117,7 +117,7 @@ namespace Grand.Business.Common.Tests.Services.Seo
.ReturnsAsync(new[] { new Language { UniqueSeoCode = "en" } });
// Act
- var result = await _slugNameValidator.ValidateSeName(entity, seName, name, true);
+ var result = await _seNameService.ValidateSeName(entity, seName, name, true);
// Assert
ClassicAssert.AreEqual(seName.Substring(0, 200), result);
@@ -136,7 +136,7 @@ namespace Grand.Business.Common.Tests.Services.Seo
.ReturnsAsync(new[] { new Language { UniqueSeoCode = "en" } });
// Act
- var result = await _slugNameValidator.ValidateSeName(entity, seName, name, true);
+ var result = await _seNameService.ValidateSeName(entity, seName, name, true);
// Assert
ClassicAssert.AreEqual("unique-slug", result);
@@ -157,7 +157,7 @@ namespace Grand.Business.Common.Tests.Services.Seo
.ReturnsAsync(new EntityUrl { EntityId = "2", EntityName = "OtherEntity" });
// Act
- var result = await _slugNameValidator.ValidateSeName(entity, seName, name, true);
+ var result = await _seNameService.ValidateSeName(entity, seName, name, true);
// Assert
ClassicAssert.IsTrue(result.StartsWith("reserved-slug-") && result.Length > "reserved-slug-4".Length);
diff --git a/src/Web/Grand.Web.Admin/Services/BlogViewModelService.cs b/src/Web/Grand.Web.Admin/Services/BlogViewModelService.cs
index bae1701c0..f71eb3d48 100644
--- a/src/Web/Grand.Web.Admin/Services/BlogViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/BlogViewModelService.cs
@@ -35,14 +35,14 @@ public class BlogViewModelService : IBlogViewModelService
private readonly ITranslationService _translationService;
private readonly IVendorService _vendorService;
private readonly IWorkContext _workContext;
- private readonly ISlugNameValidator _slugNameValidator;
+ private readonly ISeNameService _seNameService;
public BlogViewModelService(IBlogService blogService, IDateTimeService dateTimeService, IStoreService storeService,
ISlugService slugService,
IPictureService pictureService, ICustomerService customerService, ITranslationService translationService,
IProductService productService,
IVendorService vendorService, ILanguageService languageService, IWorkContext workContext,
- SeoSettings seoSettings, ISlugNameValidator slugNameValidator)
+ SeoSettings seoSettings, ISeNameService seNameService)
{
_blogService = blogService;
_dateTimeService = dateTimeService;
@@ -56,7 +56,7 @@ public class BlogViewModelService : IBlogViewModelService
_languageService = languageService;
_workContext = workContext;
_seoSettings = seoSettings;
- _slugNameValidator = slugNameValidator;
+ _seNameService = seNameService;
}
public virtual async Task<(IEnumerable<BlogPostModel> blogPosts, int totalCount)> PrepareBlogPostsModel(
@@ -84,7 +84,7 @@ public class BlogViewModelService : IBlogViewModelService
await _blogService.InsertBlogPost(blogPost);
//search engine name
- var seName = await _slugNameValidator.ValidateSeName(blogPost, model.SeName, model.Title, true);
+ 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,
@@ -105,7 +105,7 @@ public class BlogViewModelService : IBlogViewModelService
await _blogService.UpdateBlogPost(blogPost);
//search engine name
- var seName = await _slugNameValidator.ValidateSeName(blogPost, model.SeName, model.Title, true);
+ 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,
diff --git a/src/Web/Grand.Web.Admin/Services/BrandViewModelService.cs b/src/Web/Grand.Web.Admin/Services/BrandViewModelService.cs
index 1354ec19b..ac4dd9605 100644
--- a/src/Web/Grand.Web.Admin/Services/BrandViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/BrandViewModelService.cs
@@ -31,7 +31,7 @@ public class BrandViewModelService : IBrandViewModelService
private readonly ILanguageService _languageService;
private readonly IWorkContext _workContext;
private readonly SeoSettings _seoSettings;
- private readonly ISlugNameValidator _slugNameValidator;
+ private readonly ISeNameService _seNameService;
#endregion
@@ -47,7 +47,7 @@ public class BrandViewModelService : IBrandViewModelService
ILanguageService languageService,
IWorkContext workContext,
SeoSettings seoSettings,
- ISlugNameValidator slugNameValidator)
+ ISeNameService seNameService)
{
_brandLayoutService = brandLayoutService;
_brandService = brandService;
@@ -58,7 +58,7 @@ public class BrandViewModelService : IBrandViewModelService
_languageService = languageService;
_workContext = workContext;
_seoSettings = seoSettings;
- _slugNameValidator = slugNameValidator;
+ _seNameService = seNameService;
}
#endregion
@@ -109,7 +109,7 @@ public class BrandViewModelService : IBrandViewModelService
//search engine name
brand.Locales =
await model.Locales.ToTranslationProperty(brand, x => x.Name, _seoSettings, _slugService, _languageService);
- model.SeName = await _slugNameValidator.ValidateSeName(brand, model.SeName, brand.Name, true);
+ model.SeName = await _seNameService.ValidateSeName(brand, model.SeName, brand.Name, true);
brand.SeName = model.SeName;
await _brandService.UpdateBrand(brand);
@@ -143,7 +143,7 @@ public class BrandViewModelService : IBrandViewModelService
brand.AppliedDiscounts.Remove(discount.Id);
}
- model.SeName = await _slugNameValidator.ValidateSeName(brand, model.SeName, brand.Name, true);
+ model.SeName = await _seNameService.ValidateSeName(brand, model.SeName, brand.Name, true);
brand.SeName = model.SeName;
await _brandService.UpdateBrand(brand);
diff --git a/src/Web/Grand.Web.Admin/Services/CategoryViewModelService.cs b/src/Web/Grand.Web.Admin/Services/CategoryViewModelService.cs
index a21d5ef4e..5458ed72e 100644
--- a/src/Web/Grand.Web.Admin/Services/CategoryViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/CategoryViewModelService.cs
@@ -33,7 +33,7 @@ public class CategoryViewModelService : ICategoryViewModelService
private readonly IStoreService _storeService;
private readonly ITranslationService _translationService;
private readonly IVendorService _vendorService;
- private readonly ISlugNameValidator _slugNameValidator;
+ private readonly ISeNameService _seNameService;
public CategoryViewModelService(
ICategoryService categoryService,
@@ -49,7 +49,7 @@ public class CategoryViewModelService : ICategoryViewModelService
ILanguageService languageService,
CatalogSettings catalogSettings,
SeoSettings seoSettings,
- ISlugNameValidator slugNameValidator)
+ ISeNameService seNameService)
{
_categoryService = categoryService;
_productCategoryService = productCategoryService;
@@ -64,7 +64,7 @@ public class CategoryViewModelService : ICategoryViewModelService
_languageService = languageService;
_catalogSettings = catalogSettings;
_seoSettings = seoSettings;
- _slugNameValidator = slugNameValidator;
+ _seNameService = seNameService;
}
public virtual async Task<CategoryListModel> PrepareCategoryListModel(string storeId)
@@ -143,7 +143,7 @@ public class CategoryViewModelService : ICategoryViewModelService
category.Locales =
await model.Locales.ToTranslationProperty(category, x => x.Name, _seoSettings, _slugService,
_languageService);
- model.SeName = await _slugNameValidator.ValidateSeName(category, model.SeName, category.Name, true);
+ model.SeName = await _seNameService.ValidateSeName(category, model.SeName, category.Name, true);
category.SeName = model.SeName;
await _categoryService.UpdateCategory(category);
@@ -159,7 +159,7 @@ public class CategoryViewModelService : ICategoryViewModelService
{
var prevPictureId = category.PictureId;
category = model.ToEntity(category);
- model.SeName = await _slugNameValidator.ValidateSeName(category, model.SeName, category.Name, true);
+ model.SeName = await _seNameService.ValidateSeName(category, model.SeName, category.Name, true);
category.SeName = model.SeName;
//locales
category.Locales =
diff --git a/src/Web/Grand.Web.Admin/Services/CollectionViewModelService.cs b/src/Web/Grand.Web.Admin/Services/CollectionViewModelService.cs
index c00f94676..87ba98f4f 100644
--- a/src/Web/Grand.Web.Admin/Services/CollectionViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/CollectionViewModelService.cs
@@ -37,7 +37,7 @@ public class CollectionViewModelService : ICollectionViewModelService
private readonly ILanguageService _languageService;
private readonly IWorkContext _workContext;
private readonly SeoSettings _seoSettings;
- private readonly ISlugNameValidator _slugNameValidator;
+ private readonly ISeNameService _seNameService;
#endregion
@@ -57,7 +57,7 @@ public class CollectionViewModelService : ICollectionViewModelService
ILanguageService languageService,
IWorkContext workContext,
SeoSettings seoSettings,
- ISlugNameValidator slugNameValidator)
+ ISeNameService seNameService)
{
_collectionLayoutService = collectionLayoutService;
_collectionService = collectionService;
@@ -72,7 +72,7 @@ public class CollectionViewModelService : ICollectionViewModelService
_languageService = languageService;
_workContext = workContext;
_seoSettings = seoSettings;
- _slugNameValidator = slugNameValidator;
+ _seNameService = seNameService;
}
#endregion
@@ -124,7 +124,7 @@ public class CollectionViewModelService : ICollectionViewModelService
collection.Locales =
await model.Locales.ToTranslationProperty(collection, x => x.Name, _seoSettings, _slugService,
_languageService);
- model.SeName = await _slugNameValidator.ValidateSeName(collection, model.SeName, collection.Name, true);
+ model.SeName = await _seNameService.ValidateSeName(collection, model.SeName, collection.Name, true);
collection.SeName = model.SeName;
await _collectionService.UpdateCollection(collection);
@@ -159,7 +159,7 @@ public class CollectionViewModelService : ICollectionViewModelService
collection.AppliedDiscounts.Remove(discount.Id);
}
- model.SeName = await _slugNameValidator.ValidateSeName(collection, model.SeName, collection.Name, true);
+ model.SeName = await _seNameService.ValidateSeName(collection, model.SeName, collection.Name, true);
collection.SeName = model.SeName;
await _collectionService.UpdateCollection(collection);
diff --git a/src/Web/Grand.Web.Admin/Services/CourseViewModelService.cs b/src/Web/Grand.Web.Admin/Services/CourseViewModelService.cs
index aca7e0f19..136e18bc8 100644
--- a/src/Web/Grand.Web.Admin/Services/CourseViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/CourseViewModelService.cs
@@ -33,7 +33,7 @@ public class CourseViewModelService(
IStoreService storeService,
IVendorService vendorService,
SeoSettings seoSettings,
- ISlugNameValidator slugNameValidator)
+ ISeNameService seNameService)
: ICourseViewModelService
{
public virtual async Task<CourseModel> PrepareCourseModel(CourseModel model = null)
@@ -58,7 +58,7 @@ public class CourseViewModelService(
await courseService.Insert(course);
//locales
- model.SeName = await slugNameValidator.ValidateSeName(course, model.SeName, course.Name, true);
+ model.SeName = await seNameService.ValidateSeName(course, model.SeName, course.Name, true);
course.SeName = model.SeName;
await courseService.Update(course);
@@ -80,7 +80,7 @@ public class CourseViewModelService(
var prevProductId = course.ProductId;
course = model.ToEntity(course);
- model.SeName = await slugNameValidator.ValidateSeName(course, model.SeName, course.Name, true);
+ model.SeName = await seNameService.ValidateSeName(course, model.SeName, course.Name, true);
course.SeName = model.SeName;
//locales
course.Locales =
diff --git a/src/Web/Grand.Web.Admin/Services/KnowledgebaseViewModelService.cs b/src/Web/Grand.Web.Admin/Services/KnowledgebaseViewModelService.cs
index e4708c290..a25e956b3 100644
--- a/src/Web/Grand.Web.Admin/Services/KnowledgebaseViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/KnowledgebaseViewModelService.cs
@@ -16,7 +16,7 @@ public class KnowledgebaseViewModelService : IKnowledgebaseViewModelService
{
private readonly IKnowledgebaseService _knowledgebaseService;
private readonly ILanguageService _languageService;
- private readonly ISlugNameValidator _slugNameValidator;
+ private readonly ISeNameService _seNameService;
private readonly SeoSettings _seoSettings;
private readonly ISlugService _slugService;
@@ -25,13 +25,13 @@ public class KnowledgebaseViewModelService : IKnowledgebaseViewModelService
ISlugService slugService,
ILanguageService languageService,
SeoSettings seoSettings,
- ISlugNameValidator slugNameValidator)
+ ISeNameService seNameService)
{
_knowledgebaseService = knowledgebaseService;
_slugService = slugService;
_languageService = languageService;
_seoSettings = seoSettings;
- _slugNameValidator = slugNameValidator;
+ _seNameService = seNameService;
}
public virtual async Task PrepareCategory(KnowledgebaseCategoryModel model)
@@ -113,7 +113,7 @@ public class KnowledgebaseViewModelService : IKnowledgebaseViewModelService
var knowledgebaseCategory = model.ToEntity();
knowledgebaseCategory.Locales = await model.Locales.ToTranslationProperty(knowledgebaseCategory, x => x.Name,
_seoSettings, _slugService, _languageService);
- model.SeName = await _slugNameValidator.ValidateSeName(knowledgebaseCategory, model.SeName, knowledgebaseCategory.Name, true);
+ 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, "");
@@ -127,7 +127,7 @@ public class KnowledgebaseViewModelService : IKnowledgebaseViewModelService
knowledgebaseCategory = model.ToEntity(knowledgebaseCategory);
knowledgebaseCategory.Locales = await model.Locales.ToTranslationProperty(knowledgebaseCategory, x => x.Name,
_seoSettings, _slugService, _languageService);
- model.SeName = await _slugNameValidator.ValidateSeName(knowledgebaseCategory, model.SeName, knowledgebaseCategory.Name, true);
+ model.SeName = await _seNameService.ValidateSeName(knowledgebaseCategory, model.SeName, knowledgebaseCategory.Name, true);
knowledgebaseCategory.SeName = model.SeName;
await _knowledgebaseService.UpdateKnowledgebaseCategory(knowledgebaseCategory);
await _slugService.SaveSlug(knowledgebaseCategory, model.SeName, "");
@@ -155,7 +155,7 @@ public class KnowledgebaseViewModelService : IKnowledgebaseViewModelService
var knowledgebaseArticle = model.ToEntity();
knowledgebaseArticle.Locales = await model.Locales.ToTranslationProperty(knowledgebaseArticle, x => x.Name,
_seoSettings, _slugService, _languageService);
- model.SeName = await _slugNameValidator.ValidateSeName(knowledgebaseArticle, model.SeName, knowledgebaseArticle.Name, true);
+ model.SeName = await _seNameService.ValidateSeName(knowledgebaseArticle, model.SeName, knowledgebaseArticle.Name, true);
knowledgebaseArticle.SeName = model.SeName;
knowledgebaseArticle.AllowComments = model.AllowComments;
await _knowledgebaseService.InsertKnowledgebaseArticle(knowledgebaseArticle);
@@ -170,7 +170,7 @@ public class KnowledgebaseViewModelService : IKnowledgebaseViewModelService
knowledgebaseArticle = model.ToEntity(knowledgebaseArticle);
knowledgebaseArticle.Locales = await model.Locales.ToTranslationProperty(knowledgebaseArticle, x => x.Name,
_seoSettings, _slugService, _languageService);
- model.SeName = await _slugNameValidator.ValidateSeName(knowledgebaseArticle, model.SeName, knowledgebaseArticle.Name, true);
+ model.SeName = await _seNameService.ValidateSeName(knowledgebaseArticle, model.SeName, knowledgebaseArticle.Name, true);
knowledgebaseArticle.SeName = model.SeName;
knowledgebaseArticle.AllowComments = model.AllowComments;
await _knowledgebaseService.UpdateKnowledgebaseArticle(knowledgebaseArticle);
diff --git a/src/Web/Grand.Web.Admin/Services/NewsViewModelService.cs b/src/Web/Grand.Web.Admin/Services/NewsViewModelService.cs
index 651c7365b..aea1e96df 100644
--- a/src/Web/Grand.Web.Admin/Services/NewsViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/NewsViewModelService.cs
@@ -28,7 +28,7 @@ public class NewsViewModelService : INewsViewModelService
private readonly ILanguageService _languageService;
private readonly ICustomerService _customerService;
private readonly SeoSettings _seoSettings;
- private readonly ISlugNameValidator _slugNameValidator;
+ private readonly ISeNameService _seNameService;
#endregion
@@ -42,7 +42,7 @@ public class NewsViewModelService : INewsViewModelService
ILanguageService languageService,
ICustomerService customerService,
SeoSettings seoSettings,
- ISlugNameValidator slugNameValidator)
+ ISeNameService seNameService)
{
_newsService = newsService;
_dateTimeService = dateTimeService;
@@ -52,7 +52,7 @@ public class NewsViewModelService : INewsViewModelService
_languageService = languageService;
_customerService = customerService;
_seoSettings = seoSettings;
- _slugNameValidator = slugNameValidator;
+ _seNameService = seNameService;
}
#endregion
@@ -76,7 +76,7 @@ public class NewsViewModelService : INewsViewModelService
var newsItem = model.ToEntity(_dateTimeService);
await _newsService.InsertNews(newsItem);
- var seName = await _slugNameValidator.ValidateSeName(newsItem, model.SeName, model.Title, true);
+ 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,
@@ -94,7 +94,7 @@ public class NewsViewModelService : INewsViewModelService
{
var prevPictureId = newsItem.PictureId;
newsItem = model.ToEntity(newsItem, _dateTimeService);
- var seName = await _slugNameValidator.ValidateSeName(newsItem, model.SeName, model.Title, true);
+ 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,
diff --git a/src/Web/Grand.Web.Admin/Services/PageViewModelService.cs b/src/Web/Grand.Web.Admin/Services/PageViewModelService.cs
index b058a44d6..b94baaeb3 100644
--- a/src/Web/Grand.Web.Admin/Services/PageViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/PageViewModelService.cs
@@ -23,7 +23,7 @@ public class PageViewModelService : IPageViewModelService
private readonly ISlugService _slugService;
private readonly IStoreService _storeService;
private readonly ITranslationService _translationService;
- private readonly ISlugNameValidator _slugNameValidator;
+ private readonly ISeNameService _seNameService;
public PageViewModelService(
IPageLayoutService pageLayoutService,
@@ -34,7 +34,7 @@ public class PageViewModelService : IPageViewModelService
ILanguageService languageService,
IDateTimeService dateTimeService,
SeoSettings seoSettings,
- ISlugNameValidator slugNameValidator)
+ ISeNameService seNameService)
{
_pageLayoutService = pageLayoutService;
_pageService = pageService;
@@ -44,7 +44,7 @@ public class PageViewModelService : IPageViewModelService
_languageService = languageService;
_dateTimeService = dateTimeService;
_seoSettings = seoSettings;
- _slugNameValidator = slugNameValidator;
+ _seNameService = seNameService;
}
public virtual async Task<PageListModel> PreparePageListModel()
@@ -77,7 +77,7 @@ public class PageViewModelService : IPageViewModelService
var page = model.ToEntity(_dateTimeService);
await _pageService.InsertPage(page);
//search engine name
- model.SeName = await _slugNameValidator.ValidateSeName(page, model.SeName, page.Title ?? page.SystemName, true);
+ 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;
@@ -92,7 +92,7 @@ public class PageViewModelService : IPageViewModelService
page = model.ToEntity(page, _dateTimeService);
page.Locales =
await model.Locales.ToTranslationProperty(page, x => x.Title, _seoSettings, _slugService, _languageService);
- model.SeName = await _slugNameValidator.ValidateSeName(page, model.SeName, page.Title ?? page.SystemName, true);
+ model.SeName = await _seNameService.ValidateSeName(page, model.SeName, page.Title ?? page.SystemName, true);
page.SeName = model.SeName;
await _pageService.UpdatePage(page);
diff --git a/src/Web/Grand.Web.Admin/Services/ProductViewModelService.cs b/src/Web/Grand.Web.Admin/Services/ProductViewModelService.cs
index 9e219feb3..e95d15615 100644
--- a/src/Web/Grand.Web.Admin/Services/ProductViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/ProductViewModelService.cs
@@ -71,7 +71,7 @@ public class ProductViewModelService(
SeoSettings seoSettings,
IAuctionService auctionService,
IPriceFormatter priceFormatter,
- ISlugNameValidator slugNameValidator)
+ ISeNameService seNameService)
: IProductViewModelService
{
public virtual async Task PrepareAddProductAttributeCombinationModel(ProductAttributeCombinationModel model,
@@ -699,7 +699,7 @@ public class ProductViewModelService(
var product = model.ToEntity(dateTimeService);
await productService.InsertProduct(product);
- model.SeName = await slugNameValidator.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);
@@ -743,7 +743,7 @@ public class ProductViewModelService(
//product
product = model.ToEntity(product, dateTimeService);
product.AutoAddRequiredProducts = model.AutoAddRequiredProducts;
- model.SeName = await slugNameValidator.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);
diff --git a/src/Web/Grand.Web.Admin/Services/VendorViewModelService.cs b/src/Web/Grand.Web.Admin/Services/VendorViewModelService.cs
index 04cdb2d41..585156a0e 100644
--- a/src/Web/Grand.Web.Admin/Services/VendorViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/VendorViewModelService.cs
@@ -37,7 +37,7 @@ public class VendorViewModelService(
VendorSettings vendorSettings,
ILanguageService languageService,
SeoSettings seoSettings,
- ISlugNameValidator slugNameValidator)
+ ISeNameService seNameService)
: IVendorViewModelService
{
public virtual async Task PrepareDiscountModel(VendorModel model, Vendor vendor, bool excludeProperties)
@@ -186,7 +186,7 @@ public class VendorViewModelService(
vendor.AppliedDiscounts.Add(discount.Id);
//search engine name
- model.SeName = await slugNameValidator.ValidateSeName(vendor, model.SeName, vendor.Name, true);
+ 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;
@@ -205,7 +205,7 @@ public class VendorViewModelService(
vendor = model.ToEntity(vendor);
vendor.Locales =
await model.Locales.ToTranslationProperty(vendor, x => x.Name, seoSettings, slugService, languageService);
- model.SeName = await slugNameValidator.ValidateSeName(vendor, model.SeName, vendor.Name, true);
+ model.SeName = await seNameService.ValidateSeName(vendor, model.SeName, vendor.Name, true);
vendor.Address = model.Address.ToEntity(vendor.Address);
//discounts
diff --git a/src/Web/Grand.Web.Vendor/Controllers/VendorInfoController.cs b/src/Web/Grand.Web.Vendor/Controllers/VendorInfoController.cs
index afaf68205..8d57bcd3f 100644
--- a/src/Web/Grand.Web.Vendor/Controllers/VendorInfoController.cs
+++ b/src/Web/Grand.Web.Vendor/Controllers/VendorInfoController.cs
@@ -29,7 +29,7 @@ public class VendorInfoController : BaseVendorController
ISlugService slugService,
SeoSettings seoSettings,
VendorSettings vendorSettings,
- ISlugNameValidator slugNameValidator)
+ ISeNameService seNameService)
{
_translationService = translationService;
_vendorService = vendorService;
@@ -39,7 +39,7 @@ public class VendorInfoController : BaseVendorController
_slugService = slugService;
_seoSettings = seoSettings;
_vendorSettings = vendorSettings;
- _slugNameValidator = slugNameValidator;
+ _seNameService = seNameService;
}
#endregion
@@ -52,7 +52,7 @@ public class VendorInfoController : BaseVendorController
private readonly ILanguageService _languageService;
private readonly ICountryService _countryService;
private readonly ISlugService _slugService;
- private readonly ISlugNameValidator _slugNameValidator;
+ private readonly ISeNameService _seNameService;
private readonly SeoSettings _seoSettings;
private readonly VendorSettings _vendorSettings;
@@ -110,7 +110,7 @@ public class VendorInfoController : BaseVendorController
vendor.Locales =
await model.Locales.ToTranslationProperty(vendor, x => x.Name, _seoSettings, _slugService,
_languageService);
- model.SeName = await _slugNameValidator.ValidateSeName(vendor, model.SeName, vendor.Name, true);
+ model.SeName = await _seNameService.ValidateSeName(vendor, model.SeName, vendor.Name, true);
vendor.Address = model.Address.ToEntity();
vendor.SeName = model.SeName;
diff --git a/src/Web/Grand.Web.Vendor/Services/ProductViewModelService.cs b/src/Web/Grand.Web.Vendor/Services/ProductViewModelService.cs
index ada7bfc40..3c88368e3 100644
--- a/src/Web/Grand.Web.Vendor/Services/ProductViewModelService.cs
+++ b/src/Web/Grand.Web.Vendor/Services/ProductViewModelService.cs
@@ -64,7 +64,7 @@ public class ProductViewModelService : IProductViewModelService
private readonly ITranslationService _translationService;
private readonly IWarehouseService _warehouseService;
private readonly IWorkContext _workContext;
- private readonly ISlugNameValidator _slugNameValidator;
+ private readonly ISeNameService _seNameService;
public ProductViewModelService(
IProductService productService,
IInventoryManageService inventoryManageService,
@@ -96,7 +96,7 @@ public class ProductViewModelService : IProductViewModelService
CurrencySettings currencySettings,
MeasureSettings measureSettings,
TaxSettings taxSettings, SeoSettings seoSettings,
- ISlugNameValidator slugNameValidator)
+ ISeNameService seNameService)
{
_productService = productService;
_inventoryManageService = inventoryManageService;
@@ -129,7 +129,7 @@ public class ProductViewModelService : IProductViewModelService
_measureSettings = measureSettings;
_taxSettings = taxSettings;
_seoSettings = seoSettings;
- _slugNameValidator = slugNameValidator;
+ _seNameService = seNameService;
}
public virtual async Task PrepareAddProductAttributeCombinationModel(ProductAttributeCombinationModel model,
@@ -692,7 +692,7 @@ public class ProductViewModelService : IProductViewModelService
product.VendorId = _workContext.CurrentVendor!.Id;
await _productService.InsertProduct(product);
- model.SeName = await _slugNameValidator.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);
@@ -718,7 +718,7 @@ public class ProductViewModelService : IProductViewModelService
//product
product = model.ToEntity(product, _dateTimeService);
product.AutoAddRequiredProducts = model.AutoAddRequiredProducts;
- model.SeName = await _slugNameValidator.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);
diff --git a/src/Web/Grand.Web/Controllers/VendorController.cs b/src/Web/Grand.Web/Controllers/VendorController.cs
index a5b4deb32..43d72dcb1 100644
--- a/src/Web/Grand.Web/Controllers/VendorController.cs
+++ b/src/Web/Grand.Web/Controllers/VendorController.cs
@@ -132,7 +132,7 @@ public class VendorController : BasePublicController
[AutoValidateAntiforgeryToken]
[DenySystemAccount]
[CustomerGroupAuthorize(SystemCustomerGroupNames.Registered)]
- public virtual async Task<IActionResult> ApplyVendorSubmit(ApplyVendorModel model, [FromServices] ISlugNameValidator slugNameValidator)
+ public virtual async Task<IActionResult> ApplyVendorSubmit(ApplyVendorModel model, [FromServices] ISeNameService seNameService)
{
if (!_vendorSettings.AllowCustomersToApplyForVendorAccount)
return RedirectToRoute("HomePage");
@@ -155,7 +155,7 @@ public class VendorController : BasePublicController
await _vendorService.InsertVendor(vendor);
//search engine name (the same as vendor name)
- var seName = await slugNameValidator.ValidateSeName(vendor, vendor.Name, vendor.Name, true);
+ var seName = await seNameService.ValidateSeName(vendor, vendor.Name, vendor.Name, true);
await _slugService.SaveSlug(vendor, seName, "");
vendor.SeName = seName;