Merge from upstream main

Author: IamGanesh19

Source/FikaAmazonAPI.SampleCode/FeedsSample.cs

@@ -101,35 +101,54 @@ public void SubmitFeedInventory()
         //    var feedID = amazonConnection.Feed.SubmitFeed(xml, FeedType.POST_PRODUCT_DATA);
 
         //}
-        public void SubmitFeedPRICING()
+        public async void SubmitFeedPRICING(double PRICE, string SKU)
         {
 
             ConstructFeedService createDocument = new ConstructFeedService("A3J37AJU4O9RHK", "1.02");
 
             var list = new List<PriceMessage>();
             list.Add(new PriceMessage()
             {
-                SKU = "8201031206122...",
+                SKU = SKU,
                 StandardPrice = new StandardPrice()
                 {
                     currency = BaseCurrencyCode.AED.ToString(),
-                    Value = (201.0522M).ToString("0.00")
+                    Value = (PRICE).ToString("0.00")
                 }
             });
             createDocument.AddPriceMessage(list);
 
             var xml = createDocument.GetXML();
 
-            var feedID = amazonConnection.Feed.SubmitFeed(xml, FeedType.POST_PRODUCT_PRICING_DATA);
+            var feedID = await amazonConnection.Feed.SubmitFeedAsync(xml, FeedType.POST_PRODUCT_PRICING_DATA);
 
-            var feedOutput = amazonConnection.Feed.GetFeed(feedID);
+            string ResultFeedDocumentId = string.Empty;
+            while (string.IsNullOrEmpty(ResultFeedDocumentId))
+            {
+                var feedOutput = await amazonConnection.Feed.GetFeedAsync(feedID);
+                if (feedOutput.ProcessingStatus == AmazonSpApiSDK.Models.Feeds.Feed.ProcessingStatusEnum.DONE)
+                {
+                    var outPut = await amazonConnection.Feed.GetFeedDocumentAsync(feedOutput.ResultFeedDocumentId);
 
-            var outPut = amazonConnection.Feed.GetFeedDocument(feedOutput.ResultFeedDocumentId);
+                    var reportOutput = outPut.Url;
+
+                    var processingReport = await amazonConnection.Feed.GetFeedDocumentProcessingReportAsync(reportOutput);
+
+                    Console.WriteLine("MessagesProcessed=" + processingReport.ProcessingSummary.MessagesProcessed);
+                    Console.WriteLine("MessagesSuccessful= " + processingReport.ProcessingSummary.MessagesSuccessful);
+                    Console.WriteLine("MessagesWithError=" + processingReport.ProcessingSummary.MessagesWithError);
+                    Console.WriteLine("MessagesWithWarning=" + processingReport.ProcessingSummary.MessagesWithWarning);
+                    Console.WriteLine("ResultDescription=" + processingReport.Result.FirstOrDefault()?.ResultDescription);
+                }
+
+                if (!(feedOutput.ProcessingStatus == AmazonSpApiSDK.Models.Feeds.Feed.ProcessingStatusEnum.INPROGRESS ||
+                    feedOutput.ProcessingStatus == AmazonSpApiSDK.Models.Feeds.Feed.ProcessingStatusEnum.INQUEUE))
+                    break;
+                else Thread.Sleep(10000);
+            }
 
-            var reportOutput = outPut.Url;
 
 
-            var processingReport = amazonConnection.Feed.GetFeedDocumentProcessingReport(reportOutput);
         }
 
         public void FeebPostOrderFullfillment()

Source/FikaAmazonAPI.SampleCode/ProductPricingSample.cs

@@ -1,10 +1,5 @@
 using FikaAmazonAPI.Parameter.ProductPricing;
 using FikaAmazonAPI.Utils;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using static FikaAmazonAPI.Utils.Constants;
 
 namespace FikaAmazonAPI.SampleCode
@@ -88,7 +83,7 @@ public async Task GetItemOffersBatch()
             });
 
             ;
-            
+
         }
 
 

Source/FikaAmazonAPI.SampleCode/Program.cs

@@ -3,7 +3,6 @@
 using FikaAmazonAPI.Parameter.Finance;
 using FikaAmazonAPI.Parameter.ListingItem;
 using FikaAmazonAPI.Parameter.ListingsItems;
-using FikaAmazonAPI.Parameter.Order;
 using FikaAmazonAPI.ReportGeneration;
 using FikaAmazonAPI.Utils;
 using Microsoft.Extensions.Configuration;
@@ -39,29 +38,29 @@ static async Task Main(string[] args)
                 MarketPlace = MarketPlace.GetMarketPlaceByID(config.GetSection("FikaAmazonAPI:MarketPlaceID").Value),
             });
 
+            ReportManager reportManageree = new ReportManager(amazonConnection);
+            var productsttt = reportManageree.GetProducts(); //GET_MERCHANT_LISTINGS_ALL_DATA
 
+            Thread.Sleep(1000 * 60 * 15);
 
-
-            var listSlot = amazonConnection.EasyShip20220323.ListHandoverSlots(new AmazonSpApiSDK.Models.EasyShip20220323.ListHandoverSlotsRequest
+            FeedsSample feedsSample = new FeedsSample(amazonConnection);
+            double priceNow = 62;
+            double minPrice = 0.12;
+            while (true)
             {
-                AmazonOrderId = "171-2704093-8575999",
-                PackageDimensions = new AmazonSpApiSDK.Models.EasyShip20220323.Dimensions
-                {
-                    Height = 20.0M,
-                    Width = 10.0M,
-                    Length = 12.0M,
-                    Unit = "Cm"
-                },
-                PackageWeight = new AmazonSpApiSDK.Models.EasyShip20220323.Weight
-                {
-                    Unit = "G",
-                    Value = 100.0M
-                }
-            });
 
+                //Thread MapBarcodeToASIN = new Thread(() => feedsSample.SubmitFeedPRICING(priceNow, "843076000518"));
+                //MapBarcodeToASIN.Start();
 
-            FeedsSample feedsSample = new FeedsSample(amazonConnection);
-            //feedsSample.SubmitFeedOrderAcknowledgement();
+                Thread MapBarcodeToASIN2 = new Thread(() => feedsSample.SubmitFeedPRICING(priceNow, "074312026102..."));
+                MapBarcodeToASIN2.Start();
+
+                priceNow = priceNow - minPrice;
+                Thread.Sleep(1000 * 60 * 3);
+
+                if (priceNow < 54)
+                    priceNow = 62;
+            }
 
             var alllll = amazonConnection.ProductPricing.GetItemOffers(new Parameter.ProductPricing.ParameterGetItemOffers
             {
@@ -218,14 +217,6 @@ static async Task Main(string[] args)
             var products2 = await reportManager2.GetReturnFBAOrderAsync(3); //GET_MERCHANT_LISTINGS_ALL_DATA
 
 
-            ParameterOrderList serachOrderList = new ParameterOrderList();
-            serachOrderList.CreatedAfter = DateTime.UtcNow.AddDays(-100);
-
-            serachOrderList.OrderStatuses = new List<OrderStatuses>();
-            serachOrderList.OrderStatuses.Add(OrderStatuses.Shipped);
-
-
-            var orders = await amazonConnection.Orders.GetOrdersAsync(serachOrderList);
 
 
             //var parameterOrderList = new ParameterOrderList

Source/FikaAmazonAPI/AmazonSpApiSDK/Models/FulfillmentInbound/BoxContentsSource.cs

@@ -8,6 +8,8 @@
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
 
+using System.Runtime.Serialization;
+
 namespace FikaAmazonAPI.AmazonSpApiSDK.Models.FulfillmentInbound
 {
     /// <summary>
@@ -33,7 +35,7 @@ public enum BoxContentsSource
         /// <summary>
         /// Enum _2DBARCODE for value: 2D_BARCODE
         /// </summary>
-
+        [EnumMember(Value = "2D_BARCODE")]
         _2DBARCODE,
 
         /// <summary>

Source/FikaAmazonAPI/AmazonSpApiSDK/Models/FulfillmentInbound/PackageStatus.cs

@@ -8,13 +8,17 @@
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
 
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System.Runtime.Serialization;
+
 namespace FikaAmazonAPI.AmazonSpApiSDK.Models.FulfillmentInbound
 {
     /// <summary>
     /// The shipment status of the package.
     /// </summary>
     /// <value>The shipment status of the package.</value>
-
+    [JsonConverter(typeof(StringEnumConverter))]
     public enum PackageStatus
     {
 
@@ -25,10 +29,11 @@ public enum PackageStatus
         SHIPPED,
 
         /// <summary>
-        /// Enum INTRANSIT for value: IN_TRANSIT
+        /// Enum INTRANSIT for value: INTRANSIT
         /// </summary>
 
-        INTRANSIT,
+        [EnumMember(Value = "IN_TRANSIT")]
+        IN_TRANSIT,
 
         /// <summary>
         /// Enum DELIVERED for value: DELIVERED
@@ -39,8 +44,8 @@ public enum PackageStatus
         /// <summary>
         /// Enum CHECKEDIN for value: CHECKED_IN
         /// </summary>
-
-        CHECKEDIN,
+        [EnumMember(Value = "CHECKED_IN")]
+        CHECKED_IN,
 
         /// <summary>
         /// Enum RECEIVING for value: RECEIVING

Source/FikaAmazonAPI/AmazonSpApiSDK/Models/FulfillmentInbound/ShipmentStatus.cs

@@ -70,7 +70,7 @@ public enum ShipmentStatus
         /// Enum INTRANSIT for value: IN_TRANSIT
         /// </summary>
         [EnumMember(Value = "IN_TRANSIT")]
-        INTRANSIT = 8,
+        IN_TRANSIT = 8,
 
         /// <summary>
         /// Enum DELIVERED for value: DELIVERED
@@ -82,7 +82,7 @@ public enum ShipmentStatus
         /// Enum CHECKEDIN for value: CHECKED_IN
         /// </summary>
         [EnumMember(Value = "CHECKED_IN")]
-        CHECKEDIN = 10
+        CHECKED_IN = 10
     }
 
 }

Source/FikaAmazonAPI/AmazonSpApiSDK/Models/FulfillmentOutbound/CurrentStatus.cs

@@ -22,7 +22,7 @@ public enum CurrentStatus
         /// Enum INTRANSIT for value: IN_TRANSIT
         /// </summary>
 
-        INTRANSIT,
+        IN_TRANSIT,
 
         /// <summary>
         /// Enum DELIVERED for value: DELIVERED

Source/FikaAmazonAPI/AmazonSpApiSDK/Runtime/AWSSignerHelper.cs

@@ -177,17 +177,20 @@ public virtual string BuildStringToSign(DateTime signingDate, string hashedCanon
         /// <returns>Date and time used for x-amz-date, in UTC</returns>
         public virtual DateTime InitializeHeaders(IRestRequest restRequest, string host)
         {
-            restRequest.Parameters.RemoveAll(parameter => ParameterType.HttpHeader.Equals(parameter.Type)
-                                                          && parameter.Name == XAmzDateHeaderName);
-            restRequest.Parameters.RemoveAll(parameter => ParameterType.HttpHeader.Equals(parameter.Type)
-                                                          && parameter.Name == HostHeaderName);
+            lock (restRequest)
+            {
+                restRequest.Parameters.RemoveAll(parameter => ParameterType.HttpHeader.Equals(parameter.Type)
+                                                                          && parameter.Name == XAmzDateHeaderName);
+                restRequest.Parameters.RemoveAll(parameter => ParameterType.HttpHeader.Equals(parameter.Type)
+                                                              && parameter.Name == HostHeaderName);
 
-            DateTime signingDate = DateHelper.GetUtcNow();
+                DateTime signingDate = DateHelper.GetUtcNow();
 
-            restRequest.AddOrUpdateHeader(XAmzDateHeaderName, signingDate.ToString(ISO8601BasicDateTimeFormat, CultureInfo.InvariantCulture));
-            restRequest.AddOrUpdateHeader(HostHeaderName, host);
+                restRequest.AddOrUpdateHeader(XAmzDateHeaderName, signingDate.ToString(ISO8601BasicDateTimeFormat, CultureInfo.InvariantCulture));
+                restRequest.AddOrUpdateHeader(HostHeaderName, host);
 
-            return signingDate;
+                return signingDate;
+            }
         }
 
         /// <summary>
@@ -230,14 +233,18 @@ public virtual void AddSignature(IRestRequest restRequest,
                                          string region,
                                          DateTime signingDate)
         {
-            string scope = BuildScope(signingDate, region);
-            StringBuilder authorizationHeaderValueBuilder = new StringBuilder();
-            authorizationHeaderValueBuilder.AppendFormat("{0}-{1}", Scheme, Algorithm);
-            authorizationHeaderValueBuilder.AppendFormat(" {0}={1}/{2},", CredentialSubHeaderName, accessKeyId, scope);
-            authorizationHeaderValueBuilder.AppendFormat(" {0}={1},", SignedHeadersSubHeaderName, signedHeaders);
-            authorizationHeaderValueBuilder.AppendFormat(" {0}={1}", SignatureSubHeaderName, signature);
+            lock (restRequest)
+            {
+                string scope = BuildScope(signingDate, region);
+                StringBuilder authorizationHeaderValueBuilder = new StringBuilder();
+                authorizationHeaderValueBuilder.AppendFormat("{0}-{1}", Scheme, Algorithm);
+                authorizationHeaderValueBuilder.AppendFormat(" {0}={1}/{2},", CredentialSubHeaderName, accessKeyId, scope);
+                authorizationHeaderValueBuilder.AppendFormat(" {0}={1},", SignedHeadersSubHeaderName, signedHeaders);
+                authorizationHeaderValueBuilder.AppendFormat(" {0}={1}", SignatureSubHeaderName, signature);
+
+                restRequest.AddOrUpdateHeader(AuthorizationHeaderName, authorizationHeaderValueBuilder.ToString());
+            }
 
-            restRequest.AddOrUpdateHeader(AuthorizationHeaderName, authorizationHeaderValueBuilder.ToString());
         }
 
         private static string BuildScope(DateTime signingDate, string region)

Source/FikaAmazonAPI/FikaAmazonAPI.csproj

@@ -7,9 +7,9 @@
     <Product>CSharp Amazon Sp API</Product>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <LangVersion>8.0</LangVersion>
-    <Version>1.4.20</Version>
-    <AssemblyVersion>1.4.20</AssemblyVersion>
-    <FileVersion>1.4.20</FileVersion>
+    <Version>1.4.23</Version>
+    <AssemblyVersion>1.4.23</AssemblyVersion>
+    <FileVersion>1.4.23</FileVersion>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <PackageProjectUrl>https://github.com/abuzuhri/Amazon-SP-API-CSharp</PackageProjectUrl>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>