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
Minor changes in CopyProductService
support6d18fda79254
diff --git a/src/Business/Grand.Business.Catalog/Services/Products/CopyProductService.cs b/src/Business/Grand.Business.Catalog/Services/Products/CopyProductService.csindex a7a325d00..90e227d3a 100644--- a/src/Business/Grand.Business.Catalog/Services/Products/CopyProductService.cs+++ b/src/Business/Grand.Business.Catalog/Services/Products/CopyProductService.cs@@ -1,10 +1,8 @@-using Grand.Business.Core.Interfaces.Catalog.Products;using Grand.Business.Core.Extensions;+using Grand.Business.Core.Interfaces.Catalog.Products;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.Media;using Grand.Domain.Seo;namespace Grand.Business.Catalog.Services.Products@@ -18,8 +16,6 @@ namespace Grand.Business.Catalog.Services.Productsprivate readonly IProductService _productService;private readonly ILanguageService _languageService;- private readonly IPictureService _pictureService;- private readonly IDownloadService _downloadService;private readonly ISlugService _slugService;private readonly SeoSettings _seoSettings;#endregion@@ -28,15 +24,11 @@ namespace Grand.Business.Catalog.Services.Productspublic CopyProductService(IProductService productService,ILanguageService languageService,- IPictureService pictureService,- IDownloadService downloadService,ISlugService slugService,SeoSettings seoSettings){_productService = productService;_languageService = languageService;- _pictureService = pictureService;- _downloadService = downloadService;_slugService = slugService;_seoSettings = seoSettings;}@@ -51,66 +43,19 @@ namespace Grand.Business.Catalog.Services.Products/// <param name="product">The product to copy</param>/// <param name="newName">The name of product duplicate</param>/// <param name="isPublished">A value indicating whether the product duplicate should be published</param>- /// <param name="copyImages">A value indicating whether the product images should be copied</param>/// <param name="copyAssociatedProducts">A value indicating whether the copy associated products</param>/// <returns>Product copy</returns>public virtual async Task<Product> CopyProduct(Product product, string newName,- bool isPublished = true, bool copyImages = true, bool copyAssociatedProducts = true)+ bool isPublished = true, bool copyAssociatedProducts = true){if (product == null)throw new ArgumentNullException(nameof(product));- if (String.IsNullOrEmpty(newName))+ if (string.IsNullOrEmpty(newName))newName = $"{product.Name} - CopyProduct";- //product download & sample download- string downloadId = product.DownloadId;- string sampleDownloadId = product.SampleDownloadId;- if (product.IsDownload)- {- var download = await _downloadService.GetDownloadById(product.DownloadId);- if (download != null)- {- var downloadCopy = new Download- {- DownloadGuid = Guid.NewGuid(),- UseDownloadUrl = download.UseDownloadUrl,- DownloadUrl = download.DownloadUrl,- DownloadBinary = download.DownloadBinary,- ContentType = download.ContentType,- Filename = download.Filename,- Extension = download.Extension,- IsNew = download.IsNew,- };- await _downloadService.InsertDownload(downloadCopy);- downloadId = downloadCopy.Id;- }-- if (product.HasSampleDownload)- {- var sampleDownload = await _downloadService.GetDownloadById(product.SampleDownloadId);- if (sampleDownload != null)- {- var sampleDownloadCopy = new Download- {- DownloadGuid = Guid.NewGuid(),- UseDownloadUrl = sampleDownload.UseDownloadUrl,- DownloadUrl = sampleDownload.DownloadUrl,- DownloadBinary = sampleDownload.DownloadBinary,- ContentType = sampleDownload.ContentType,- Filename = sampleDownload.Filename,- Extension = sampleDownload.Extension,- IsNew = sampleDownload.IsNew- };- await _downloadService.InsertDownload(sampleDownloadCopy);- sampleDownloadId = sampleDownloadCopy.Id;- }- }- }-// product- var productCopy = new Product- {+ var productCopy = new Product {ProductTypeId = product.ProductTypeId,ParentGroupedProductId = product.ParentGroupedProductId,VisibleIndividually = product.VisibleIndividually,@@ -139,13 +84,11 @@ namespace Grand.Business.Catalog.Services.ProductsRequiredProductIds = product.RequiredProductIds,AutoAddRequiredProducts = product.AutoAddRequiredProducts,IsDownload = product.IsDownload,- DownloadId = downloadId,UnlimitedDownloads = product.UnlimitedDownloads,MaxNumberOfDownloads = product.MaxNumberOfDownloads,DownloadExpirationDays = product.DownloadExpirationDays,DownloadActivationTypeId = product.DownloadActivationTypeId,HasSampleDownload = product.HasSampleDownload,- SampleDownloadId = sampleDownloadId,HasUserAgreement = product.HasUserAgreement,UserAgreementText = product.UserAgreementText,IsRecurring = product.IsRecurring,@@ -290,38 +233,6 @@ namespace Grand.Business.Catalog.Services.Productsawait _productService.UpdateProduct(productCopy);await _slugService.SaveSlug(productCopy, seName, "");- var languages = await _languageService.GetAllLanguages(true);-- //product pictures- //variable to store original and new picture identifiers- int id = 1;- var originalNewPictureIdentifiers = new Dictionary<string, string>();- if (copyImages)- {- foreach (var productPicture in product.ProductPictures)- {- var picture = await _pictureService.GetPictureById(productPicture.PictureId);- var pictureCopy = await _pictureService.InsertPicture(- await _pictureService.LoadPictureBinary(picture),- picture.MimeType,- _pictureService.GetPictureSeName(newName),- picture.AltAttribute,- picture.TitleAttribute,- false,- Domain.Common.Reference.Product,- productCopy.Id);-- await _productService.InsertProductPicture(new ProductPicture- {- PictureId = pictureCopy.Id,- DisplayOrder = productPicture.DisplayOrder- }, productCopy.Id);- id++;- originalNewPictureIdentifiers.Add(picture.Id, pictureCopy.Id);- }- }--return productCopy;}diff --git a/src/Business/Grand.Business.Core/Interfaces/Catalog/Products/ICopyProductService.cs b/src/Business/Grand.Business.Core/Interfaces/Catalog/Products/ICopyProductService.csindex 043afbe3f..50ee61abc 100644--- a/src/Business/Grand.Business.Core/Interfaces/Catalog/Products/ICopyProductService.cs+++ b/src/Business/Grand.Business.Core/Interfaces/Catalog/Products/ICopyProductService.cs@@ -13,10 +13,9 @@ namespace Grand.Business.Core.Interfaces.Catalog.Products/// <param name="product">The product to copy</param>/// <param name="newName">The name of product duplicate</param>/// <param name="isPublished">A value indicating whether the product duplicate should be published</param>- /// <param name="copyImages">A value indicating whether the product images should be copied</param>/// <param name="copyAssociatedProducts">A value indicating whether the copy associated products</param>/// <returns>Product copy</returns>Task<Product> CopyProduct(Product product, string newName,- bool isPublished = true, bool copyImages = true, bool copyAssociatedProducts = true);+ bool isPublished = true, bool copyAssociatedProducts = true);}}diff --git a/src/Tests/Grand.Business.Catalog.Tests/Service/Products/CopyProductServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Service/Products/CopyProductServiceTests.csindex 812eff786..a2709e9c2 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Service/Products/CopyProductServiceTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Service/Products/CopyProductServiceTests.cs@@ -1,8 +1,7 @@-using Grand.Business.Core.Interfaces.Catalog.Products;-using Grand.Business.Catalog.Services.Products;+using Grand.Business.Catalog.Services.Products;+using Grand.Business.Core.Interfaces.Catalog.Products;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.Localization;using Grand.Domain.Seo;@@ -16,8 +15,6 @@ namespace Grand.Business.Catalog.Tests.Service.Products{private Mock<IProductService> _productServiceMock;private Mock<ILanguageService> _langServiceMock;- private Mock<IPictureService> _pictureServiceMock;- private Mock<IDownloadService> _downloadServiceMock;private Mock<ISlugService> _slugServiceMock;private SeoSettings _settings;private CopyProductService _copyProductService;@@ -27,12 +24,9 @@ namespace Grand.Business.Catalog.Tests.Service.Products{_productServiceMock = new Mock<IProductService>();_langServiceMock = new Mock<ILanguageService>();- _pictureServiceMock = new Mock<IPictureService>();- _downloadServiceMock = new Mock<IDownloadService>();_slugServiceMock = new Mock<ISlugService>();_settings = new SeoSettings();- _copyProductService = new CopyProductService(_productServiceMock.Object, _langServiceMock.Object, _pictureServiceMock.Object,- _downloadServiceMock.Object, _slugServiceMock.Object, _settings);+ _copyProductService = new CopyProductService(_productServiceMock.Object, _langServiceMock.Object, _slugServiceMock.Object, _settings);}diff --git a/src/Web/Grand.Web.Admin/Controllers/ProductController.cs b/src/Web/Grand.Web.Admin/Controllers/ProductController.csindex 4cb677459..970d20948 100644--- a/src/Web/Grand.Web.Admin/Controllers/ProductController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/ProductController.cs@@ -321,7 +321,7 @@ namespace Grand.Web.Admin.Controllers[PermissionAuthorizeAction(PermissionActionName.Create)][HttpPost]- public async Task<IActionResult> CopyProduct(ProductModel model, [FromServices] ICopyProductService copyProductService)+ public async Task<IActionResult> CopyProduct(ProductModel model, [FromServices] ICopyProductService copyProductService, [FromServices] IPictureService pictureService){var copyModel = model.CopyProductModel;try@@ -340,7 +340,10 @@ namespace Grand.Web.Admin.Controllers}var newProduct = await copyProductService.CopyProduct(originalProduct,- copyModel.Name, copyModel.Published, copyModel.CopyImages);+ copyModel.Name, copyModel.Published);++ if (copyModel.CopyImages) await CopyImages(originalProduct, newProduct, pictureService);+Success("The product has been copied successfully");return RedirectToAction("Edit", new { id = newProduct.Id });}@@ -351,6 +354,28 @@ namespace Grand.Web.Admin.Controllers}}+ private async Task CopyImages(Product originalProduct, Product newProduct, IPictureService pictureService)+ {+ foreach (var productPicture in originalProduct.ProductPictures)+ {+ var picture = await pictureService.GetPictureById(productPicture.PictureId);+ var pictureCopy = await pictureService.InsertPicture(+ await pictureService.LoadPictureBinary(picture),+ picture.MimeType,+ pictureService.GetPictureSeName(newProduct.Name),+ picture.AltAttribute,+ picture.TitleAttribute,+ false,+ Domain.Common.Reference.Product,+ newProduct.Id);++ await _productService.InsertProductPicture(new ProductPicture {+ PictureId = pictureCopy.Id,+ DisplayOrder = productPicture.DisplayOrder+ }, newProduct.Id);+ }+ }+#endregion#region Required products