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.

Further changes - picture service (Seo file name)

KrzysztofPajak3524c8102a12
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductPictureCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductPictureCommandHandler.cs
index dbf93afea..62073db26 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductPictureCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductPictureCommandHandler.cs
@@ -36,7 +36,7 @@ namespace Grand.Api.Commands.Models.Catalog
PictureId = request.Model.PictureId,
DisplayOrder = request.Model.DisplayOrder,
}, request.Product.Id);
- await _pictureService.SetSeoFilename(request.Model.PictureId, _pictureService.GetPictureSeName(request.Product.Name));
+ await _pictureService.SetSeoFilename(picture, _pictureService.GetPictureSeName(request.Product.Name));
}
return true;
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateBrandCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateBrandCommandHandler.cs
index 0515c413f..967df3939 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateBrandCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateBrandCommandHandler.cs
@@ -66,7 +66,7 @@ namespace Grand.Api.Commands.Models.Catalog
{
var picture = await _pictureService.GetPictureById(brand.PictureId);
if (picture != null)
- await _pictureService.SetSeoFilename(picture.Id, _pictureService.GetPictureSeName(brand.Name));
+ await _pictureService.SetSeoFilename(picture, _pictureService.GetPictureSeName(brand.Name));
}
//activity log
await _customerActivityService.InsertActivity("EditBrand", brand.Id, _translationService.GetResource("ActivityLog.EditBrand"), brand.Name);
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateCategoryCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateCategoryCommandHandler.cs
index 7cc0083c0..88e48a067 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateCategoryCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateCategoryCommandHandler.cs
@@ -66,7 +66,7 @@ namespace Grand.Api.Commands.Models.Catalog
{
var picture = await _pictureService.GetPictureById(category.PictureId);
if (picture != null)
- await _pictureService.SetSeoFilename(picture.Id, _pictureService.GetPictureSeName(category.Name));
+ await _pictureService.SetSeoFilename(picture, _pictureService.GetPictureSeName(category.Name));
}
//activity log
await _customerActivityService.InsertActivity("EditCategory", category.Id, _translationService.GetResource("ActivityLog.EditCategory"), category.Name);
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateCollectionCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateCollectionCommandHandler.cs
index 71cc474ff..b47cda75d 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateCollectionCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateCollectionCommandHandler.cs
@@ -66,7 +66,7 @@ namespace Grand.Api.Commands.Models.Catalog
{
var picture = await _pictureService.GetPictureById(collection.PictureId);
if (picture != null)
- await _pictureService.SetSeoFilename(picture.Id, _pictureService.GetPictureSeName(collection.Name));
+ await _pictureService.SetSeoFilename(picture, _pictureService.GetPictureSeName(collection.Name));
}
//activity log
await _customerActivityService.InsertActivity("EditCollection", collection.Id, _translationService.GetResource("ActivityLog.EditCollection"), collection.Name);
diff --git a/src/Business/Grand.Business.Storage/Interfaces/IPictureService.cs b/src/Business/Grand.Business.Storage/Interfaces/IPictureService.cs
index 17efc94a8..128154732 100644
--- a/src/Business/Grand.Business.Storage/Interfaces/IPictureService.cs
+++ b/src/Business/Grand.Business.Storage/Interfaces/IPictureService.cs
@@ -167,10 +167,10 @@ namespace Grand.Business.Storage.Interfaces
/// <summary>
/// Updates a SEO filename of a picture
/// </summary>
- /// <param name="pictureId">The picture identifier</param>
+ /// <param name="picture">The picture</param>
/// <param name="seoFilename">The SEO filename</param>
/// <returns>Picture</returns>
- Task<Picture> SetSeoFilename(string pictureId, string seoFilename);
+ Task<Picture> SetSeoFilename(Picture picture, string seoFilename);
/// <summary>
/// Validates input picture dimensions
diff --git a/src/Business/Grand.Business.Storage/Services/PictureService.cs b/src/Business/Grand.Business.Storage/Services/PictureService.cs
index 83d5952b3..2bb94d179 100644
--- a/src/Business/Grand.Business.Storage/Services/PictureService.cs
+++ b/src/Business/Grand.Business.Storage/Services/PictureService.cs
@@ -737,12 +737,11 @@ namespace Grand.Business.Storage.Services
/// <summary>
/// Updates a SEO filename of a picture
/// </summary>
- /// <param name="pictureId">The picture identifier</param>
+ /// <param name="picture">The picture</param>
/// <param name="seoFilename">The SEO filename</param>
/// <returns>Picture</returns>
- public virtual async Task<Picture> SetSeoFilename(string pictureId, string seoFilename)
+ public virtual async Task<Picture> SetSeoFilename(Picture picture, string seoFilename)
{
- var picture = await GetPictureById(pictureId);
if (picture == null)
throw new ArgumentException("No picture found with the specified id");
diff --git a/src/Web/Grand.Web.Admin/Controllers/ProductController.cs b/src/Web/Grand.Web.Admin/Controllers/ProductController.cs
index 107eae56b..0d0fe4bea 100644
--- a/src/Web/Grand.Web.Admin/Controllers/ProductController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/ProductController.cs
@@ -1261,7 +1261,7 @@ namespace Grand.Web.Admin.Controllers
values.Add((pictureUrl, picture.Id));
//assign picture to the product
- await _productViewModelService.InsertProductPicture(product, picture, 0, "", "");
+ await _productViewModelService.InsertProductPicture(product, picture, 0);
}
}
diff --git a/src/Web/Grand.Web.Admin/Extensions/UpdatePicture.cs b/src/Web/Grand.Web.Admin/Extensions/UpdatePicture.cs
index c6fffda87..463891cb3 100644
--- a/src/Web/Grand.Web.Admin/Extensions/UpdatePicture.cs
+++ b/src/Web/Grand.Web.Admin/Extensions/UpdatePicture.cs
@@ -11,7 +11,7 @@ namespace Grand.Web.Admin.Extensions
{
var picture = await pictureService.GetPictureById(pictureId);
if (picture != null)
- await pictureService.SetSeoFilename(picture.Id, pictureService.GetPictureSeName(name));
+ await pictureService.SetSeoFilename(picture, pictureService.GetPictureSeName(name));
}
}
}
diff --git a/src/Web/Grand.Web.Admin/Interfaces/IProductViewModelService.cs b/src/Web/Grand.Web.Admin/Interfaces/IProductViewModelService.cs
index 2aa4b9f2f..d74b3886f 100644
--- a/src/Web/Grand.Web.Admin/Interfaces/IProductViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Interfaces/IProductViewModelService.cs
@@ -101,7 +101,7 @@ namespace Grand.Web.Admin.Interfaces
//Pictures
Task<IList<ProductModel.ProductPictureModel>> PrepareProductPicturesModel(Product product);
Task<(ProductModel.ProductPictureModel model, Picture Picture)> PrepareProductPictureModel(Product product, ProductPicture productPicture);
- Task InsertProductPicture(Product product, Picture picture, int displayOrder, string overrideAltAttribute, string overrideTitleAttribute);
+ Task InsertProductPicture(Product product, Picture picture, int displayOrder);
Task UpdateProductPicture(ProductModel.ProductPictureModel model);
Task DeleteProductPicture(ProductModel.ProductPictureModel model);
diff --git a/src/Web/Grand.Web.Admin/Services/ProductViewModelService.cs b/src/Web/Grand.Web.Admin/Services/ProductViewModelService.cs
index 8d8b24743..aa00d67d1 100644
--- a/src/Web/Grand.Web.Admin/Services/ProductViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/ProductViewModelService.cs
@@ -155,8 +155,13 @@ namespace Grand.Web.Admin.Services
}
protected virtual async Task UpdatePictureSeoNames(Product product)
{
+ var picturesename = _pictureService.GetPictureSeName(product.Name);
foreach (var pp in product.ProductPictures)
- await _pictureService.SetSeoFilename(pp.PictureId, _pictureService.GetPictureSeName(product.Name));
+ {
+ var picture = await _pictureService.GetPictureById(pp.PictureId);
+ if (picture != null)
+ await _pictureService.SetSeoFilename(picture, picturesename);
+ }
}
protected virtual async Task<List<string>> GetChildCategoryIds(string parentCategoryId)
{
@@ -2928,7 +2933,7 @@ namespace Grand.Web.Admin.Services
return (model, picture);
}
- public virtual async Task InsertProductPicture(Product product, Picture picture, int displayOrder, string overrideAltAttribute, string overrideTitleAttribute)
+ public virtual async Task InsertProductPicture(Product product, Picture picture, int displayOrder)
{
if (picture == null)
throw new ArgumentException("No picture found with the specified id");
@@ -2936,19 +2941,12 @@ namespace Grand.Web.Admin.Services
if (product.ProductPictures.Where(x => x.PictureId == picture.Id).Count() > 0)
return;
- await _pictureService.UpdatePicture(picture.Id,
- await _pictureService.LoadPictureBinary(picture),
- picture.MimeType,
- picture.SeoFilename,
- overrideAltAttribute,
- overrideTitleAttribute);
-
await _productService.InsertProductPicture(new ProductPicture {
PictureId = picture.Id,
DisplayOrder = displayOrder,
}, product.Id);
- await _pictureService.SetSeoFilename(picture.Id, _pictureService.GetPictureSeName(product.Name));
+ await _pictureService.SetSeoFilename(picture, _pictureService.GetPictureSeName(product.Name));
}
public virtual async Task UpdateProductPicture(ProductModel.ProductPictureModel model)
{
diff --git a/src/Web/Grand.Web/Controllers/VendorController.cs b/src/Web/Grand.Web/Controllers/VendorController.cs
index c394db996..b20880a18 100644
--- a/src/Web/Grand.Web/Controllers/VendorController.cs
+++ b/src/Web/Grand.Web/Controllers/VendorController.cs
@@ -93,7 +93,7 @@ namespace Grand.Web.Controllers
{
var picture = await _pictureService.GetPictureById(vendor.PictureId);
if (picture != null)
- await _pictureService.SetSeoFilename(picture.Id, _pictureService.GetPictureSeName(vendor.Name));
+ await _pictureService.SetSeoFilename(picture, _pictureService.GetPictureSeName(vendor.Name));
}
#endregion