Merge pull request #161 from ApertureLabsInc/nopCommerce_4.10

ProductDto/CustomerDto Enhancements

Author: poyker

Nop.Plugin.Api/ApiMapperConfiguration.cs

@@ -194,7 +194,6 @@ private void CreateProductMap()
         {
             AutoMapperApiConfiguration.MapperConfigurationExpression.CreateMap<Product, ProductDto>()
                 .IgnoreAllNonExisting()
-                .ForMember(x => x.ProductAttributeMappings, y => y.Ignore())
                 .ForMember(x => x.FullDescription, y => y.MapFrom(src => WebUtility.HtmlEncode(src.FullDescription)))
                 .ForMember(x => x.Tags,
                     y => y.MapFrom(src => src.ProductProductTagMappings.Select(x => x.ProductTag.Name)));

Nop.Plugin.Api/DTOs/Customers/BaseCustomerDto.cs

@@ -9,6 +9,9 @@ public class BaseCustomerDto : BaseDto
     {
         private List<int> _roleIds;
 
+        [JsonProperty("customer_guid")]
+        public Guid CustomerGuid { get; set; }
+
         [JsonProperty("username")]
         public string Username { get; set; }
         /// <summary>

Nop.Plugin.Api/DTOs/Images/ImageMappingDto.cs

@@ -9,6 +9,9 @@ public class ImageMappingDto : ImageDto
         [JsonProperty("id")]
         public int Id { get; set; }
 
+        [JsonProperty("picture_id")]
+        public int PictureId { get; set; }
+
         [JsonProperty("position")]
         public int Position { get; set; }
     }

Nop.Plugin.Api/DTOs/Products/ProductAttributeCombinationDto.cs

@@ -0,0 +1,60 @@
+using FluentValidation.Attributes;
+using Newtonsoft.Json;
+using Nop.Plugin.Api.DTOs.Base;
+using Nop.Plugin.Api.Validators;
+
+namespace Nop.Plugin.Api.DTOs.Products
+{
+    [JsonObject(Title = "product_attribute_combination")]
+    [Validator(typeof(ProductAttributeCombinationDtoValidator))]
+    public class ProductAttributeCombinationDto : BaseDto
+    {
+        /// <summary>
+        /// Gets or sets the product identifier
+        /// </summary>
+        [JsonProperty("product_id")]
+        public int ProductId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the attributes
+        /// </summary>
+        [JsonProperty("attributes_xml")]
+        public string AttributesXml { get; set; }
+
+        /// <summary>
+        /// Gets or sets the stock quantity
+        /// </summary>
+        [JsonProperty("stock_quantity")]
+        public int StockQuantity { get; set; }
+
+        /// <summary>
+        /// Gets or sets the SKU
+        /// </summary>
+        [JsonProperty("sku")]
+        public string Sku { get; set; }
+
+        /// <summary>
+        /// Gets or sets the manufacturer part number
+        /// </summary>
+        [JsonProperty("manufacturer_part_number")]
+        public string ManufacturerPartNumber { get; set; }
+
+        /// <summary>
+        /// Gets or sets the Global Trade Item Number (GTIN). These identifiers include UPC (in North America), EAN (in Europe), JAN (in Japan), and ISBN (for books).
+        /// </summary>
+        [JsonProperty("gtin")]
+        public string Gtin { get; set; }
+
+        /// <summary>
+        /// Gets or sets the attribute combination price. This way a store owner can override the default product price when this attribute combination is added to the cart. For example, you can give a discount this way.
+        /// </summary>
+        [JsonProperty("overridden_price")]
+        public decimal? OverriddenPrice { get; set; }
+
+        /// <summary>
+        /// Gets or sets the identifier of picture associated with this combination
+        /// </summary>
+        [JsonProperty("picture_id")]
+        public int PictureId { get; set; }
+    }
+}

Nop.Plugin.Api/DTOs/Products/ProductDto.cs

@@ -24,6 +24,7 @@ public class ProductDto : BaseDto
         private List<LocalizedNameDto> _localizedNames;
         private List<ImageMappingDto> _images;
         private List<ProductAttributeMappingDto> _productAttributeMappings;
+        private List<ProductAttributeCombinationDto> _productAttributeCombinations;
         private List<ProductSpecificationAttributeDto> _productSpecificationAttributes;
         private List<int> _associatedProductIds;
         private List<string> _tags;
@@ -590,6 +591,20 @@ public List<ProductAttributeMappingDto> ProductAttributeMappings
             }
         }
 
+        [JsonProperty("product_attribute_combinations")]
+        public List<ProductAttributeCombinationDto> ProductAttributeCombinations
+        {
+            get
+            {
+                return _productAttributeCombinations;
+            }
+            set
+            {
+                _productAttributeCombinations = value;
+            }
+        }
+
+
         [JsonProperty("product_specification_attributes")]
         public List<ProductSpecificationAttributeDto> ProductSpecificationAttributes
         {

Nop.Plugin.Api/Helpers/DTOHelper.cs

@@ -85,8 +85,6 @@ public ProductDto PrepareProductDTO(Product product)
             var productDto = product.ToDto();
 
             PrepareProductImages(product.ProductPictures, productDto);
-            PrepareProductAttributes(product.ProductAttributeMappings, productDto);
-            PrepareProductSpecificationAttributes(product.ProductSpecificationAttributes, productDto);
 
             productDto.SeName = _urlRecordService.GetSeName(product);
             productDto.DiscountIds = product.AppliedDiscounts.Select(discount => discount.Id).ToList();
@@ -242,6 +240,7 @@ private void PrepareProductImages(IEnumerable<ProductPicture> productPictures, P
                     var productImageDto = new ImageMappingDto
                     {
                         Id = productPicture.Id,
+                        PictureId = productPicture.PictureId,
                         Position = productPicture.DisplayOrder,
                         Src = imageDto.Src,
                         Attachment = imageDto.Attachment
@@ -349,6 +348,26 @@ private ProductAttributeValueDto PrepareProductAttributeValueDto(ProductAttribut
             return productAttributeValueDto;
         }
 
+        private void PrepareProductAttributeCombinations(IEnumerable<ProductAttributeCombination> productAttributeCombinations,
+            ProductDto productDto)
+        {
+            productDto.ProductAttributeCombinations = productDto.ProductAttributeCombinations ?? new List<ProductAttributeCombinationDto>();
+
+            foreach (var productAttributeCombination in productAttributeCombinations)
+            {
+                var productAttributeCombinationDto = PrepareProductAttributeCombinationDto(productAttributeCombination);
+                if (productAttributeCombinationDto != null)
+                {
+                    productDto.ProductAttributeCombinations.Add(productAttributeCombinationDto);
+                }
+            }
+        }
+
+        private ProductAttributeCombinationDto PrepareProductAttributeCombinationDto(ProductAttributeCombination productAttributeCombination)
+        {
+            return productAttributeCombination.ToDto();
+        }
+
         public void PrepareProductSpecificationAttributes(IEnumerable<ProductSpecificationAttribute> productSpecificationAttributes, ProductDto productDto)
         {
             if (productDto.ProductSpecificationAttributes == null)

Nop.Plugin.Api/MappingExtensions/ProductAttributeCombinationDtoMappings.cs

@@ -0,0 +1,14 @@
+using Nop.Core.Domain.Catalog;
+using Nop.Plugin.Api.AutoMapper;
+using Nop.Plugin.Api.DTOs.Products;
+
+namespace Nop.Plugin.Api.MappingExtensions
+{
+    public static class ProductAttributeCombinationDtoMappings
+    {
+        public static ProductAttributeCombinationDto ToDto(this ProductAttributeCombination productAttributeCombination)
+        {
+            return productAttributeCombination.MapTo<ProductAttributeCombination, ProductAttributeCombinationDto>();
+        }
+    }
+}

Nop.Plugin.Api/Validators/BaseDtoValidator.cs

@@ -2,7 +2,6 @@
 using FluentValidation.Results;
 using FluentValidation.Validators;
 using Microsoft.AspNetCore.Http;
-using Nop.Core.Infrastructure;
 using Nop.Plugin.Api.DTOs.Base;
 using Nop.Plugin.Api.Helpers;
 using System;

Nop.Plugin.Api/Validators/ProductAttributeCombinationDtoValidator.cs

@@ -0,0 +1,36 @@
+using Microsoft.AspNetCore.Http;
+using Nop.Plugin.Api.DTOs.Products;
+using Nop.Plugin.Api.Helpers;
+using System.Collections.Generic;
+
+namespace Nop.Plugin.Api.Validators
+{
+    public class ProductAttributeCombinationDtoValidator : BaseDtoValidator<ProductAttributeCombinationDto>
+    {
+
+        #region Constructors
+
+        public ProductAttributeCombinationDtoValidator(IHttpContextAccessor httpContextAccessor, IJsonHelper jsonHelper, Dictionary<string, object> requestJsonDictionary) : base(httpContextAccessor, jsonHelper, requestJsonDictionary)
+        {
+            SetAttributesXmlRule();
+            SetProductIdRule();
+        }
+
+        #endregion
+
+        #region Private Methods
+
+        private void SetAttributesXmlRule()
+        {
+            SetNotNullOrEmptyCreateOrUpdateRule(p => p.AttributesXml, "invalid attributes xml", "attributes_xml");
+        }
+
+        private void SetProductIdRule()
+        {
+            SetGreaterThanZeroCreateOrUpdateRule(p => p.ProductId, "invalid product id", "product_id");
+        }
+
+        #endregion
+
+    }
+}