Merge branch 'main' of https://github.com/abuzuhri/Amazon-SP-API-CSharp

Author: abuzuhri

Source/FikaAmazonAPI/AmazonSpApiSDK/Models/CatalogItems/V20220401/ItemSummaryByMarketplace.cs

@@ -82,10 +82,14 @@ protected ItemSummaryByMarketplace() { }
         /// <param name="modelNumber">Model number associated with an Amazon catalog item..</param>
         /// <param name="packageQuantity">Quantity of an Amazon catalog item in one package..</param>
         /// <param name="partNumber">Part number associated with an Amazon catalog item..</param>
+        /// <param name="releaseDate">First date on which an Amazon catalog item is shippable to customers..</param>
         /// <param name="size">Name of the size associated with an Amazon catalog item..</param>
         /// <param name="style">Name of the style associated with an Amazon catalog item..</param>
         /// <param name="websiteDisplayGroup">Name of the website display group associated with an Amazon catalog item..</param>
-        public ItemSummaryByMarketplace(string marketplaceId = default(string), string brand = default(string), ItemBrowseClassification browseClassification = default(ItemBrowseClassification), string color = default(string), ItemClassificationEnum? itemClassification = default(ItemClassificationEnum?), string itemName = default(string), string manufacturer = default(string), string modelNumber = default(string), int? packageQuantity = default(int?), string partNumber = default(string), string size = default(string), string style = default(string), string websiteDisplayGroup = default(string), string websiteDisplayGroupName = default(string))
+        public ItemSummaryByMarketplace(string marketplaceId = default, string brand = default, ItemBrowseClassification browseClassification = default,
+            string color = default, ItemClassificationEnum? itemClassification = default, string itemName = default, string manufacturer = default,
+            string modelNumber = default, int? packageQuantity = default, string partNumber = default, DateTime? releaseDate = default,
+            string size = default, string style = default, string websiteDisplayGroup = default, string websiteDisplayGroupName = default)
         {
             // to ensure "marketplaceId" is required (not null)
             if (marketplaceId == null)
@@ -105,6 +109,7 @@ protected ItemSummaryByMarketplace() { }
             this.ModelNumber = modelNumber;
             this.PackageQuantity = packageQuantity;
             this.PartNumber = partNumber;
+            this.ReleaseDate = releaseDate;
             this.Size = size;
             this.Style = style;
             this.WebsiteDisplayGroup = websiteDisplayGroup;
@@ -175,6 +180,13 @@ protected ItemSummaryByMarketplace() { }
         [DataMember(Name = "partNumber", EmitDefaultValue = false)]
         public string PartNumber { get; set; }
 
+        /// <summary>
+        /// First date on which an Amazon catalog item is shippable to customers.
+        /// </summary>
+        /// <value>First date on which an Amazon catalog item is shippable to customers.</value>
+        [DataMember(Name = "releaseDate", EmitDefaultValue = false)]
+        public DateTime? ReleaseDate { get; set; }
+
         /// <summary>
         /// Name of the size associated with an Amazon catalog item.
         /// </summary>

Source/FikaAmazonAPI/AmazonSpApiSDK/Models/Exceptions/AmazonException.cs

@@ -38,11 +38,15 @@ public AmazonUnauthorizedException(string msg, RestResponse response = null) : b
 
     public class AmazonInvalidInputException : AmazonException
     {
-        public AmazonInvalidInputException(string msg, RestResponse response = null) : base(msg, response)
-        {
+        public string Details { get; set; }
 
+        public AmazonInvalidInputException(string msg, string details = null, RestResponse response = null) : base(msg, response)
+        {
+            this.Details = details;
+            //this.Data["Details"] = details;
         }
     }
+
     public class AmazonQuotaExceededException : AmazonException
     {
         public AmazonQuotaExceededException(string msg, RestResponse response = null) : base(msg, response)

Source/FikaAmazonAPI/AmazonSpApiSDK/Models/Notifications/EventFilter.cs

@@ -26,6 +26,13 @@ public class EventFilter : AggregationFilter
         [JsonProperty(PropertyName = "eventFilterType")]
         public string EventFilterType { get; set; }
 
+        /// <summary>
+        /// Gets or Sets OrderChangeTypes
+        /// </summary>
+        [DataMember(Name = "orderChangeTypes", EmitDefaultValue = false)]
+        [JsonProperty(PropertyName = "orderChangeTypes")]
+        public IList<string> OrderChangeTypes { get; set; }
+
 
         /// <summary>
         /// Get the string presentation of the object
@@ -37,6 +44,7 @@ public override string ToString()
             sb.Append("class EventFilter {\n");
             sb.Append("  MarketplaceIds: ").Append(MarketplaceIds).Append("\n");
             sb.Append("  EventFilterType: ").Append(EventFilterType).Append("\n");
+            sb.Append("  OrderChangeTypes: ").Append(OrderChangeTypes).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }

Source/FikaAmazonAPI/ReportGeneration/ProductsReport.cs

@@ -7,7 +7,7 @@ namespace FikaAmazonAPI.ReportGeneration
     public class ProductsReport
     {
         public List<ProductsRow> Data { get; set; } = new List<ProductsRow>();
-        public ProductsReport(string path, string refNumber, Encoding encoding = default)
+        public ProductsReport(string path, Encoding encoding = default)
         {
             if (string.IsNullOrEmpty(path))
                 return;
@@ -17,7 +17,7 @@ public ProductsReport(string path, string refNumber, Encoding encoding = default
             List<ProductsRow> values = new List<ProductsRow>();
             foreach (var row in table.Rows)
             {
-                values.Add(ProductsRow.FromRow(row, refNumber));
+                values.Add(ProductsRow.FromRow(row));
             }
             Data = values;
         }
@@ -144,7 +144,7 @@ public class ProductsRow
         public string refNumber { get; set; }
         public string MerchantShippingGroup { get; set; }
 
-        public static ProductsRow FromRow(TableRow rowData, string refNumber)
+        public static ProductsRow FromRow(TableRow rowData)
         {
             var row = new ProductsRow();
             row.ItemName = rowData.GetString("item-name");

Source/FikaAmazonAPI/ReportGeneration/ReportManager.cs

@@ -186,20 +186,20 @@ private async Task<string> GetInventoryAgingAsync(AmazonConnection amazonConnect
         #endregion
 
         #region Products
-        public List<ProductsRow> GetProducts() =>
-            Task.Run(() => GetProductsAsync()).ConfigureAwait(false).GetAwaiter().GetResult();
-        public async Task<List<ProductsRow>> GetProductsAsync()
+        public List<ProductsRow> GetProducts(List<MarketPlace> marketplaces = null) =>
+            Task.Run(() => GetProductsAsync(marketplaces)).ConfigureAwait(false).GetAwaiter().GetResult();
+        public async Task<List<ProductsRow>> GetProductsAsync(List<MarketPlace> marketplaces = null, CancellationToken cancellationToken = default)
         {
-            var path = await GetProductsAsync(_amazonConnection);
-            ProductsReport report = new ProductsReport(path, _amazonConnection.RefNumber);
+            var path = await GetProductsAsync(_amazonConnection, marketplaces, cancellationToken);
+            ProductsReport report = new ProductsReport(path);
             return report.Data;
         }
-        private async Task<string> GetProductsAsync(AmazonConnection amazonConnection)
+        private async Task<string> GetProductsAsync(AmazonConnection amazonConnection, List<MarketPlace> marketplaces = null, CancellationToken cancellationToken = default)
         {
-            return await amazonConnection.Reports.CreateReportAndDownloadFileAsync(ReportTypes.GET_MERCHANT_LISTINGS_ALL_DATA);
+            return await amazonConnection.Reports.CreateReportAndDownloadFileAsync(ReportTypes.GET_MERCHANT_LISTINGS_ALL_DATA, marketplaces: marketplaces, cancellationToken: cancellationToken);
         }
         #endregion
-    
+
         #region Categories
 
         public List<CategoriesRow> GetCategories()

Source/FikaAmazonAPI/Services/ReportService.cs

@@ -285,7 +285,7 @@ public async Task<string> CreateReportAndDownloadFileAsync(ReportTypes reportTyp
 
             parameters.marketplaceIds = new MarketplaceIds();
 
-            if (marketplaces == null)
+            if (marketplaces == null || marketplaces.Count() == 0)
             {
                 parameters.marketplaceIds.Add(AmazonCredential.MarketPlace.ID);
             }

Source/FikaAmazonAPI/Services/RequestService.cs

@@ -285,7 +285,7 @@ protected void ParseResponse(RestResponse response)
                         case "InvalidSignature":
                             throw new AmazonInvalidSignatureException(error.Message, response);
                         case "InvalidInput":
-                            throw new AmazonInvalidInputException(error.Message, response);
+                            throw new AmazonInvalidInputException(error.Message, error.Details, response);
                         case "QuotaExceeded":
                             throw new AmazonQuotaExceededException(error.Message, response);
                         case "InternalFailure":

Source/FikaAmazonAPI/Utils/RateLimitsDefinitions.cs

@@ -172,7 +172,7 @@ internal static Dictionary<RateLimitType, RateLimits> RateLimitsTime()
               { RateLimitType.ProductPricing_GetListingOffers,                new RateLimits(1M, 2) },
               { RateLimitType.ProductPricing_GetItemOffers,                   new RateLimits(0.5M, 1) },
 
-              { RateLimitType.ProductPricing_GetItemOffersBatch,                   new RateLimits(0.5M, 1) },
+              { RateLimitType.ProductPricing_GetItemOffersBatch,                   new RateLimits(0.1M, 1) },
               { RateLimitType.ProductPricing_GetListingOffersBatch,                   new RateLimits(0.5M, 1) },
 
               { RateLimitType.Sales_GetOrderMetrics,                          new RateLimits(0.5M, 15) },