Add GetAddressByIdAsync to IAddressApiService. Add address id validat…

…ion to create order api.

Nop.Plugin.Api/Controllers/OrdersController.cs

@@ -284,11 +284,19 @@ public async Task<IActionResult> CreateOrder(
 			{
 				return Error(HttpStatusCode.BadRequest, "billingAddress", "missing billing address");
 			}
+			if (orderDelta.Dto.BillingAddress.Id == 0)
+			{
+				return Error(HttpStatusCode.BadRequest, "billingAddress", "non-existing billing address");
+			}
 
 			if (orderDelta.Dto.ShippingAddress == null)
 			{
 				return Error(HttpStatusCode.BadRequest, "shippingAddress", "missing shipping address");
 			}
+			if (orderDelta.Dto.ShippingAddress.Id == 0)
+			{
+				return Error(HttpStatusCode.BadRequest, "shippingAddress", "non-existing shipping address");
+			}
 
 			if (!await CheckPermissions(orderDelta.Dto.CustomerId))
 			{
@@ -337,12 +345,9 @@ public async Task<IActionResult> CreateOrder(
 			var newOrder = await _factory.InitializeAsync();
 			orderDelta.Merge(newOrder);
 
-			// TODO: if address is is 0, insert addresses to repo first
-
 			customer.BillingAddressId = newOrder.BillingAddressId = orderDelta.Dto.BillingAddress.Id;
 			customer.ShippingAddressId = newOrder.ShippingAddressId = orderDelta.Dto.ShippingAddress.Id;
 
-
 			// If the customer has something in the cart it will be added too. Should we clear the cart first? 
 			newOrder.CustomerId = customer.Id;
 

Nop.Plugin.Api/Helpers/DTOHelper.cs

@@ -2,12 +2,14 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Nop.Core.Domain.Catalog;
+using Nop.Core.Domain.Common;
 using Nop.Core.Domain.Directory;
 using Nop.Core.Domain.Localization;
 using Nop.Core.Domain.Media;
 using Nop.Core.Domain.Orders;
 using Nop.Core.Domain.Stores;
 using Nop.Core.Domain.Topics;
+using Nop.Plugin.Api.DTO;
 using Nop.Plugin.Api.DTO.Categories;
 using Nop.Plugin.Api.DTO.Images;
 using Nop.Plugin.Api.DTO.Languages;
@@ -298,6 +300,32 @@ public async Task<ManufacturerDto> PrepareManufacturerDtoAsync(Manufacturer manu
             return manufacturerDto;
         }
 
+        public void PrepareProductSpecificationAttributes(IEnumerable<ProductSpecificationAttribute> productSpecificationAttributes, ProductDto productDto)
+        {
+            if (productDto.ProductSpecificationAttributes == null)
+            {
+                productDto.ProductSpecificationAttributes = new List<ProductSpecificationAttributeDto>();
+            }
+
+            foreach (var productSpecificationAttribute in productSpecificationAttributes)
+            {
+                var productSpecificationAttributeDto = PrepareProductSpecificationAttributeDto(productSpecificationAttribute);
+
+                if (productSpecificationAttributeDto != null)
+                {
+                    productDto.ProductSpecificationAttributes.Add(productSpecificationAttributeDto);
+                }
+            }
+        }
+
+        public AddressDto PrepareAddressDTO(Address address)
+        {
+            var addressDto = address.ToDto();
+            return addressDto;
+        }
+
+        #region Private methods
+
         private async Task PrepareProductImagesAsync(IEnumerable<ProductPicture> productPictures, ProductDto productDto)
         {
             if (productDto.Images == null)
@@ -446,22 +474,6 @@ private ProductAttributeCombinationDto PrepareProductAttributeCombinationDto(Pro
             return productAttributeCombination.ToDto();
         }
 
-        public void PrepareProductSpecificationAttributes(IEnumerable<ProductSpecificationAttribute> productSpecificationAttributes, ProductDto productDto)
-        {
-            if (productDto.ProductSpecificationAttributes == null)
-            {
-                productDto.ProductSpecificationAttributes = new List<ProductSpecificationAttributeDto>();
-            }
-
-            foreach (var productSpecificationAttribute in productSpecificationAttributes)
-            {
-                var productSpecificationAttributeDto = PrepareProductSpecificationAttributeDto(productSpecificationAttribute);
-
-                if (productSpecificationAttributeDto != null)
-                {
-                    productDto.ProductSpecificationAttributes.Add(productSpecificationAttributeDto);
-                }
-            }
-        }
+        #endregion
     }
 }

Nop.Plugin.Api/Services/AddressApiService.cs

@@ -19,16 +19,16 @@ public class AddressApiService : IAddressApiService
 	{
         private readonly IStaticCacheManager _cacheManager;
 		private readonly ICountryService _countryService;
-		private readonly IRepository<Address> _customerAddressRepository;
+		private readonly IRepository<Address> _addressRepository;
         private readonly IRepository<CustomerAddressMapping> _customerAddressMappingRepository;
 
         public AddressApiService(
-            IRepository<Address> customerAddressRepository,
+            IRepository<Address> addressRepository,
             IRepository<CustomerAddressMapping> customerAddressMappingRepository,
             IStaticCacheManager staticCacheManager,
             ICountryService countryService)
 		{
-            _customerAddressRepository = customerAddressRepository;
+            _addressRepository = addressRepository;
             _customerAddressMappingRepository = customerAddressMappingRepository;
             _cacheManager = staticCacheManager;
 			_countryService = countryService;
@@ -44,7 +44,7 @@ public AddressApiService(
         /// </returns>
         public async Task<IList<AddressDto>> GetAddressesByCustomerIdAsync(int customerId)
         {
-            var query = from address in _customerAddressRepository.Table
+            var query = from address in _addressRepository.Table
                         join cam in _customerAddressMappingRepository.Table on address.Id equals cam.AddressId
                         where cam.CustomerId == customerId
                         select address;
@@ -66,7 +66,7 @@ join cam in _customerAddressMappingRepository.Table on address.Id equals cam.Add
 		/// </returns>
 		public async Task<AddressDto> GetCustomerAddressAsync(int customerId, int addressId)
         {
-            var query = from address in _customerAddressRepository.Table
+            var query = from address in _addressRepository.Table
                         join cam in _customerAddressMappingRepository.Table on address.Id equals cam.AddressId
                         where cam.CustomerId == customerId && address.Id == addressId
                         select address;
@@ -86,5 +86,14 @@ public async Task<IList<CountryDto>> GetAllCountriesAsync(bool mustAllowBilling
                 countries = countries.Where(c => c.AllowsShipping);
             return countries.Select(c => c.ToDto()).ToList();
         }
-    }
+
+		public async Task<AddressDto> GetAddressByIdAsync(int addressId)
+		{
+            var query = from address in _addressRepository.Table
+                        where address.Id == addressId
+                        select address;
+            var addressEntity = await query.FirstOrDefaultAsync();
+            return addressEntity?.ToDto();
+        }
+	}
 }

Nop.Plugin.Api/Services/IAddressApiService.cs

@@ -12,5 +12,6 @@ public interface IAddressApiService
 		Task<IList<AddressDto>> GetAddressesByCustomerIdAsync(int customerId);
 		Task<AddressDto> GetCustomerAddressAsync(int customerId, int addressId);
 		Task<IList<CountryDto>> GetAllCountriesAsync(bool mustAllowBilling = false, bool mustAllowShipping = false);
+		Task<AddressDto> GetAddressByIdAsync(int addressId);
 	}
 }