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.

API - refactoring with save picture on the product / add new method - update picture

KrzysztofPajakc5b649a408eb
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductPictureCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductPictureCommandHandler.cs
index 62073db26..f5763bebe 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductPictureCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductPictureCommandHandler.cs
@@ -22,22 +22,18 @@ namespace Grand.Api.Commands.Models.Catalog
public async Task<bool> Handle(AddProductPictureCommand request, CancellationToken cancellationToken)
{
+ var product = await _productService.GetProductById(request.Product.Id);
+ if (product == null)
+ return false;
+
var picture = await _pictureService.GetPictureById(request.Model.PictureId);
- if (picture != null)
- {
- await _pictureService.UpdatePicture(picture.Id, await _pictureService.LoadPictureBinary(picture),
- picture.MimeType,
- picture.SeoFilename,
- request.Model.AltAttribute,
- request.Model.TitleAttribute);
+ if (picture == null)
+ return false;
- await _productService.InsertProductPicture(new ProductPicture
- {
- PictureId = request.Model.PictureId,
- DisplayOrder = request.Model.DisplayOrder,
- }, request.Product.Id);
- await _pictureService.SetSeoFilename(picture, _pictureService.GetPictureSeName(request.Product.Name));
- }
+ await _productService.InsertProductPicture(new ProductPicture {
+ PictureId = picture.Id,
+ DisplayOrder = request.Model.DisplayOrder,
+ }, product.Id);
return true;
}
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductPictureCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductPictureCommandHandler.cs
index 5c8bb7619..ed12efbe6 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductPictureCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductPictureCommandHandler.cs
@@ -11,38 +11,22 @@ namespace Grand.Api.Commands.Models.Catalog
public class UpdateProductPictureCommandHandler : IRequestHandler<UpdateProductPictureCommand, bool>
{
private readonly IProductService _productService;
- private readonly IPictureService _pictureService;
public UpdateProductPictureCommandHandler(
- IProductService productService,
- IPictureService pictureService)
+ IProductService productService)
{
_productService = productService;
- _pictureService = pictureService;
}
public async Task<bool> Handle(UpdateProductPictureCommand request, CancellationToken cancellationToken)
{
- var product = await _productService.GetProductById(request.Product.Id, true);
-
- var productPicture = product.ProductPictures.Where(x => x.PictureId == request.Model.PictureId).FirstOrDefault();
- if (productPicture == null)
- throw new ArgumentException("No product picture found with the specified id");
-
- var picture = await _pictureService.GetPictureById(productPicture.PictureId);
- if (picture == null)
- throw new ArgumentException("No picture found with the specified id");
-
- productPicture.DisplayOrder = request.Model.DisplayOrder;
- await _productService.UpdateProductPicture(productPicture, product.Id);
-
- await _pictureService.UpdatePicture(picture.Id,
- await _pictureService.LoadPictureBinary(picture),
- picture.MimeType,
- request.Model.SeoFilename,
- request.Model.AltAttribute,
- request.Model.TitleAttribute);
-
+ var product = await _productService.GetProductById(request.Product.Id);
+ var pp = product.ProductPictures.FirstOrDefault(x => x.PictureId == request.Model.PictureId);
+ if (pp != null)
+ {
+ pp.DisplayOrder = request.Model.DisplayOrder;
+ await _productService.UpdateProductPicture(pp, request.Product.Id);
+ }
return true;
}
}
diff --git a/src/API/Grand.Api/Commands/Handlers/Common/UpdatePictureCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Common/UpdatePictureCommandHandler.cs
new file mode 100644
index 000000000..41a02af16
--- /dev/null
+++ b/src/API/Grand.Api/Commands/Handlers/Common/UpdatePictureCommandHandler.cs
@@ -0,0 +1,30 @@
+using Grand.Business.Storage.Interfaces;
+using MediatR;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Grand.Api.Commands.Models.Catalog
+{
+ public class UpdatePictureCommandHandler : IRequestHandler<UpdatePictureCommand, bool>
+ {
+ private readonly IPictureService _pictureService;
+
+ public UpdatePictureCommandHandler(
+ IPictureService pictureService)
+ {
+ _pictureService = pictureService;
+ }
+
+ public async Task<bool> Handle(UpdatePictureCommand request, CancellationToken cancellationToken)
+ {
+ var picture = await _pictureService.GetPictureById(request.Model.Id);
+ if (picture == null)
+ return false;
+
+ await _pictureService.UpdatePicture(picture.Id, request.Model.PictureBinary,
+ request.Model.MimeType, request.Model.SeoFilename, request.Model.AltAttribute, request.Model.TitleAttribute);
+
+ return true;
+ }
+ }
+}
diff --git a/src/API/Grand.Api/Commands/Models/Common/UpdatePictureCommand.cs b/src/API/Grand.Api/Commands/Models/Common/UpdatePictureCommand.cs
new file mode 100644
index 000000000..5699c9e97
--- /dev/null
+++ b/src/API/Grand.Api/Commands/Models/Common/UpdatePictureCommand.cs
@@ -0,0 +1,10 @@
+using Grand.Api.DTOs.Common;
+using MediatR;
+
+namespace Grand.Api.Commands.Models.Catalog
+{
+ public class UpdatePictureCommand : IRequest<bool>
+ {
+ public PictureDto Model { get; set; }
+ }
+}
diff --git a/src/API/Grand.Api/Controllers/OData/PictureController.cs b/src/API/Grand.Api/Controllers/OData/PictureController.cs
index 3d5a4f6a5..dbc2307ac 100644
--- a/src/API/Grand.Api/Controllers/OData/PictureController.cs
+++ b/src/API/Grand.Api/Controllers/OData/PictureController.cs
@@ -1,4 +1,5 @@
-using Grand.Api.Commands.Models.Common;
+using Grand.Api.Commands.Models.Catalog;
+using Grand.Api.Commands.Models.Common;
using Grand.Api.DTOs.Common;
using Grand.Api.Queries.Models.Common;
using Grand.Business.Common.Interfaces.Security;
@@ -6,6 +7,7 @@ using Grand.Business.Common.Services.Security;
using MediatR;
using Microsoft.AspNetCore.Mvc;
using Swashbuckle.AspNetCore.Annotations;
+using System.Linq;
using System.Threading.Tasks;
namespace Grand.Api.Controllers.OData
@@ -50,6 +52,27 @@ namespace Grand.Api.Controllers.OData
return BadRequest(ModelState);
}
+ [SwaggerOperation(summary: "Update entity in Picture", OperationId = "UpdatePicture")]
+ [HttpPut]
+ public async Task<IActionResult> Put([FromBody] PictureDto model)
+ {
+ if (!await _permissionService.Authorize(PermissionSystemName.Categories))
+ return Forbid();
+
+ if (ModelState.IsValid)
+ {
+ var picture = await _mediator.Send(new GetPictureByIdQuery() { Id = model.Id });
+ if (picture == null)
+ {
+ return NotFound();
+ }
+
+ var result = await _mediator.Send(new UpdatePictureCommand() { Model = model });
+ return Ok(result);
+ }
+ return BadRequest(ModelState);
+ }
+
[SwaggerOperation(summary: "Delete entity in Picture", OperationId = "DeletePicture")]
[HttpDelete]
public async Task<IActionResult> Delete(string key)
diff --git a/src/API/Grand.Api/DTOs/Catalog/ProductPictureDto.cs b/src/API/Grand.Api/DTOs/Catalog/ProductPictureDto.cs
index 5460daca3..6f7765f74 100644
--- a/src/API/Grand.Api/DTOs/Catalog/ProductPictureDto.cs
+++ b/src/API/Grand.Api/DTOs/Catalog/ProductPictureDto.cs
@@ -7,9 +7,5 @@ namespace Grand.Api.DTOs.Catalog
[Key]
public string PictureId { get; set; }
public int DisplayOrder { get; set; }
- public string MimeType { get; set; }
- public string SeoFilename { get; set; }
- public string AltAttribute { get; set; }
- public string TitleAttribute { get; set; }
}
}
diff --git a/src/API/Grand.Api/Extensions/MappingExtensions.cs b/src/API/Grand.Api/Extensions/MappingExtensions.cs
index 0f1019a1b..e199f3167 100644
--- a/src/API/Grand.Api/Extensions/MappingExtensions.cs
+++ b/src/API/Grand.Api/Extensions/MappingExtensions.cs
@@ -222,7 +222,7 @@ namespace Grand.Api.Extensions
{
return entity.MapTo<Picture, PictureDto>();
}
-
+
#endregion
}
}
diff --git a/src/API/Grand.Api/Infrastructure/DependencyEdmModel.cs b/src/API/Grand.Api/Infrastructure/DependencyEdmModel.cs
index 5ac3ce71a..8a10e75f5 100644
--- a/src/API/Grand.Api/Infrastructure/DependencyEdmModel.cs
+++ b/src/API/Grand.Api/Infrastructure/DependencyEdmModel.cs
@@ -118,20 +118,12 @@ namespace Grand.Api.Infrastructure
#region Product picture
ActionConfiguration createPicture = product.Action("CreateProductPicture");
createPicture.Parameter<string>(nameof(ProductPictureDto.PictureId)).Required();
- createPicture.Parameter<string>(nameof(ProductPictureDto.MimeType)).Required();
- createPicture.Parameter<string>(nameof(ProductPictureDto.SeoFilename)).Required();
- createPicture.Parameter<string>(nameof(ProductPictureDto.AltAttribute)).Required();
createPicture.Parameter<int>(nameof(ProductPictureDto.DisplayOrder)).Required();
- createPicture.Parameter<string>(nameof(ProductPictureDto.TitleAttribute)).Required();
createPicture.Returns<bool>();
ActionConfiguration updatePicture = product.Action("UpdateProductPicture");
updatePicture.Parameter<string>(nameof(ProductPictureDto.PictureId)).Required();
- updatePicture.Parameter<string>(nameof(ProductPictureDto.MimeType)).Required();
- updatePicture.Parameter<string>(nameof(ProductPictureDto.SeoFilename)).Required();
- updatePicture.Parameter<string>(nameof(ProductPictureDto.AltAttribute)).Required();
updatePicture.Parameter<int>(nameof(ProductPictureDto.DisplayOrder)).Required();
- updatePicture.Parameter<string>(nameof(ProductPictureDto.TitleAttribute)).Required();
updatePicture.Returns<bool>();
ActionConfiguration deletePicture = product.Action("DeleteProductPicture");
diff --git a/src/API/Grand.Api/Infrastructure/Mapper/Profiles/PictureProfile.cs b/src/API/Grand.Api/Infrastructure/Mapper/Profiles/PictureProfile.cs
index 03b2930f0..a673c6aaa 100644
--- a/src/API/Grand.Api/Infrastructure/Mapper/Profiles/PictureProfile.cs
+++ b/src/API/Grand.Api/Infrastructure/Mapper/Profiles/PictureProfile.cs
@@ -14,6 +14,7 @@ namespace Grand.Api.Infrastructure.Mapper
CreateMap<Picture, PictureDto>()
.ForMember(dest => dest.PictureBinary, mo => mo.Ignore());
+
}
public int Order => 1;
diff --git a/src/API/Grand.Api/Validators/Common/PictureValidator.cs b/src/API/Grand.Api/Validators/Common/PictureValidator.cs
index c7e6e3b01..78dc408a5 100644
--- a/src/API/Grand.Api/Validators/Common/PictureValidator.cs
+++ b/src/API/Grand.Api/Validators/Common/PictureValidator.cs
@@ -13,9 +13,19 @@ namespace Grand.Api.Validators.Common
ITranslationService translationService)
: base(validators)
{
- RuleFor(x => x.PictureBinary).NotEmpty().WithMessage(translationService.GetResource("Api.Common.Picture.Fields.PictureBinary.Required"));
RuleFor(x => x.MimeType).NotEmpty().WithMessage(translationService.GetResource("Api.Common.Picture.Fields.MimeType.Required"));
- RuleFor(x => x.Id).Empty().WithMessage(translationService.GetResource("Api.Common.Picture.Fields.Id.NotRequired"));
+ RuleFor(x => x.PictureBinary).Must((x, context) =>
+ {
+ if (!string.IsNullOrEmpty(x.Id) && (x.PictureBinary==null || x.PictureBinary.Length == 0))
+ {
+ return true;
+ }
+ if (string.IsNullOrEmpty(x.Id) && (x.PictureBinary == null || x.PictureBinary.Length == 0))
+ {
+ return false;
+ }
+ return true;
+ }).WithMessage(translationService.GetResource("Api.Common.Picture.Fields.PictureBinary.Required"));
}
}
}