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

abuzuhri · abuzuhri · commit 49f90d5f903f · 2022-02-09T17:59:49.000+01:00
diff --git a/README.md b/README.md
@@ -158,12 +158,12 @@ AmazonConnection amazonConnection = new AmazonConnection(new AmazonCredential()
 });
 
 var orders = amazonConnection.Orders.GetOrders
-        (
-         new FikaAmazonAPI.Parameter.Order.ParameterOrderList()
-             {
-              TestCase = Constants.TestCase200
-             }
-        );
+(
+     new FikaAmazonAPI.Parameter.Order.ParameterOrderList
+     {
+         TestCase = Constants.TestCase200
+     }
+);
 ```
 
 ### Report List, For more report sample please check [Here](https://github.com/abuzuhri/Amazon-SP-API-CSharp/blob/main/Source/FikaAmazonAPI.Test/Orders.cs).
diff --git a/Source/FikaAmazonAPI.SampleCode/SandboxOrderSample.cs b/Source/FikaAmazonAPI.SampleCode/SandboxOrderSample.cs
@@ -19,7 +19,10 @@ public void GetOrderTestCase200()
         {
             var orders = amazonConnection.Orders.GetOrders
             (
-                 new FikaAmazonAPI.Parameter.Order.ParameterOrderList(Constants.TestCase200)
+                 new FikaAmazonAPI.Parameter.Order.ParameterOrderList
+                 {
+                     TestCase = Constants.TestCase200
+                 }
             );
         }
     }
diff --git a/Source/FikaAmazonAPI/Parameter/IHasParameterizedTestCase.cs b/Source/FikaAmazonAPI/Parameter/IHasParameterizedTestCase.cs
diff --git a/Source/FikaAmazonAPI/Parameter/ListingsItems/ParameterDeleteListingItem.cs b/Source/FikaAmazonAPI/Parameter/ListingsItems/ParameterDeleteListingItem.cs
@@ -1,4 +1,5 @@
 ﻿using FikaAmazonAPI.Search;
+using FikaAmazonAPI.Utils;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -9,9 +10,10 @@ namespace FikaAmazonAPI.Parameter.ListingItem
 {
     public class ParameterDeleteListingItem: ParameterBased
     {
-
         public bool Check()
         {
+            if (TestCase == Constants.TestCase400)
+                sku = "BadSKU";
             if (string.IsNullOrWhiteSpace(this.sellerId))
             {
                 throw new InvalidDataException("SellerId is a required property for ParameterDeleteListingItem and cannot be null");
diff --git a/Source/FikaAmazonAPI/Parameter/ListingsItems/ParameterGetListingsItem.cs b/Source/FikaAmazonAPI/Parameter/ListingsItems/ParameterGetListingsItem.cs
@@ -4,21 +4,49 @@
 using Newtonsoft.Json.Converters;
 using System;
 using System.Collections.Generic;
+using System.IO;
+using System.Linq;
 using System.Text;
+using static FikaAmazonAPI.Utils.Constants;
 
-namespace FikaAmazonAPI.Parameter.ListingsItems
+namespace FikaAmazonAPI.Parameter.ListingItem
 {
-    public class ParameterGetListingsItem : ParameterBased, IHasParameterizedTestCase
+    public class ParameterGetListingsItem : ParameterBased
     {
-        public ParameterGetListingsItem(string testCase = "")
+        public ParameterGetListingsItem()
         {
-            if (!string.IsNullOrEmpty(testCase))
+        }
+
+        public bool Check()
+        {
+            if (TestCase == TestCase400)
+                sku = "BadSKU";
+            if (string.IsNullOrWhiteSpace(sellerId))
+            {
+                throw new InvalidDataException("SellerId is a required property for ParameterPutListingItem and cannot be null");
+            }
+            if (string.IsNullOrWhiteSpace(sku))
+            {
+                throw new InvalidDataException("Sku is a required property for ParameterPutListingItem and cannot be null");
+            }
+            if (marketplaceIds == null || !marketplaceIds.Any())
             {
-                TestCase = testCase;
-                SandboxQueryParameters = Sandbox.SandboxQueryParameters<ParameterGetListingsItem>(TestCase);
+                throw new InvalidDataException("MarketplaceIds is a required property for ParameterPutListingItem and cannot be null");
             }
+            if (includedData is null)
+            {
+                includedData = new List<ListingsIncludedData>();
+                includedData.Add(ListingsIncludedData.Summaries);
+            }
+            if (includedData.Count == 0)
+                includedData.Add(ListingsIncludedData.Summaries);
+            return true;
         }
 
+        public string sellerId { get; set; }
+
+        public string sku { get; set; }
+
         /// <summary>
         /// A list of MarketplaceId values. Used to select orders that were placed in the specified marketplaces. Max count : 50
         /// </summary>
@@ -34,10 +62,5 @@ public ParameterGetListingsItem(string testCase = "")
         /// A comma-delimited list of data sets to include in the response. Default: summaries.
         /// </summary>
         public IList<Constants.ListingsIncludedData> includedData { get; set; }
-
-        [IgnoreToAddParameter]
-        public string TestCase { get; set; }
-
-        public Dictionary<string, List<KeyValuePair<string, string>>> SandboxQueryParameters { get; }
     }
 }
diff --git a/Source/FikaAmazonAPI/Parameter/ListingsItems/ParameterPatchListingItem.cs b/Source/FikaAmazonAPI/Parameter/ListingsItems/ParameterPatchListingItem.cs
@@ -1,5 +1,6 @@
 ﻿using FikaAmazonAPI.AmazonSpApiSDK.Models.Token;
 using FikaAmazonAPI.Search;
+using FikaAmazonAPI.Utils;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -12,6 +13,8 @@ public class ParameterPatchListingItem : ParameterBased
     {
         public bool Check()
         {
+            if (TestCase == Constants.TestCase400)
+                sku = "BadSKU";
             if (string.IsNullOrWhiteSpace(this.sellerId))
             {
                 throw new InvalidDataException("SellerId is a required property for ParameterPatchListingItem and cannot be null");
diff --git a/Source/FikaAmazonAPI/Parameter/ListingsItems/ParameterPutListingItem.cs b/Source/FikaAmazonAPI/Parameter/ListingsItems/ParameterPutListingItem.cs
@@ -1,5 +1,6 @@
 ﻿using FikaAmazonAPI.AmazonSpApiSDK.Models.Token;
 using FikaAmazonAPI.Search;
+using FikaAmazonAPI.Utils;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -12,6 +13,8 @@ public class ParameterPutListingItem : ParameterBased
     {
         public bool Check() 
         {
+            if (TestCase == Constants.TestCase400)
+                sku = "BadSKU";
             if (string.IsNullOrWhiteSpace(this.sellerId))
             {
                 throw new InvalidDataException("SellerId is a required property for ParameterPutListingItem and cannot be null");
diff --git a/Source/FikaAmazonAPI/Parameter/Order/ParameterOrderList.cs b/Source/FikaAmazonAPI/Parameter/Order/ParameterOrderList.cs
@@ -9,15 +9,10 @@
 
 namespace FikaAmazonAPI.Parameter.Order
 {
-    public class ParameterOrderList :  ParameterBased, IParameterBasedPII, IHasParameterizedTestCase
+    public class ParameterOrderList :  ParameterBased, IParameterBasedPII
     {
-        public ParameterOrderList(string testCase = "")
+        public ParameterOrderList()
         {
-            if (!string.IsNullOrEmpty(testCase))
-            {
-                TestCase = testCase;
-                SandboxQueryParameters = Sandbox.SandboxQueryParameters<ParameterOrderList>(TestCase);
-            }
         }
 
         /// <summary>
@@ -93,8 +88,5 @@ public ParameterOrderList(string testCase = "")
         public string StoreChainStoreId { get; set; }
         public bool IsNeedRestrictedDataToken { get; set; }
         public CreateRestrictedDataTokenRequest RestrictedDataTokenRequest { get; set; }
-        public string TestCase { get; set; }
-
-        public Dictionary<string, List<KeyValuePair<string, string>>> SandboxQueryParameters { get; }
     }
 }
diff --git a/Source/FikaAmazonAPI/Parameter/ParameterBased.cs b/Source/FikaAmazonAPI/Parameter/ParameterBased.cs
@@ -12,29 +12,21 @@ namespace FikaAmazonAPI.Search
 {
     public class ParameterBased
     {
-        public virtual List<KeyValuePair<string, string>> getParameters(bool isSandbox = false)
+        [IgnoreToAddParameter]
+        public string TestCase { get; set; }
+
+        [IgnoreToAddParameter]
+        internal Dictionary<string, List<KeyValuePair<string, string>>> SandboxQueryParameters { get; private set; }
+
+        public virtual List<KeyValuePair<string, string>> getParameters()
         {
             List<KeyValuePair<string, string>> queryParameters = new List<KeyValuePair<string, string>>();
-            Type t = this.GetType(); // Where obj is object whose properties you need.
-            if (isSandbox)
+            if (!string.IsNullOrEmpty(TestCase))
             {
-                if (typeof(IHasParameterizedTestCase).IsAssignableFrom(t))
-                {
-                    var queryParametersProperties = t.GetInterfaces().FirstOrDefault(x => x == typeof(IHasParameterizedTestCase)).GetProperties();
-                    var testCasePropertyValue = queryParametersProperties.FirstOrDefault(x => x.Name == nameof(IHasParameterizedTestCase.TestCase))?.GetValue(this);
-                    if (testCasePropertyValue != null && testCasePropertyValue is string testCase)
-                    {
-                        var sandboxQueryParametersPropertyValue = queryParametersProperties.FirstOrDefault(x => x.Name == nameof(IHasParameterizedTestCase.SandboxQueryParameters))?.GetValue(this);
-                        if (sandboxQueryParametersPropertyValue != null && sandboxQueryParametersPropertyValue is Dictionary<string, List<KeyValuePair<string, string>>> sandboxQueryParameters)
-                        {
-                            if (sandboxQueryParameters.ContainsKey(testCase))
-                                return sandboxQueryParameters[testCase];
-                        }
-
-                    }
-                }
+                SandboxQueryParameters = Sandbox.SandboxQueryParameters(this, TestCase);
+                return SandboxQueryParameters[TestCase];
             }
-            PropertyInfo[] pi = t.GetProperties();
+            PropertyInfo[] pi = this.GetType().GetProperties();
             foreach (PropertyInfo p in pi)
             {
                 if (p.CustomAttributes.Any(x => x.AttributeType == typeof(IgnoreToAddParameterAttribute))) continue;
diff --git a/Source/FikaAmazonAPI/Services/ApiUrls.cs b/Source/FikaAmazonAPI/Services/ApiUrls.cs
@@ -470,7 +470,6 @@ protected class ListingsItemsApiUrls
             //https://stackoverflow.com/questions/575440/url-encoding-using-c-sharp/21771206#21771206
             public static string GetListingItem(string seller, string sku) => $"{_resourceBaseUrl}/items/{seller}/{WebUtility.UrlEncode(sku)}";
 
-
             public static string PutListingItem(string seller, string sku) => $"{_resourceBaseUrl}/items/{seller}/{WebUtility.UrlEncode(sku)}";
 
             public static string DeleteListingItem(string seller, string sku) => $"{_resourceBaseUrl}/items/{seller}/{WebUtility.UrlEncode(sku)}";
diff --git a/Source/FikaAmazonAPI/Services/ListingsItemService.cs b/Source/FikaAmazonAPI/Services/ListingsItemService.cs
@@ -3,7 +3,6 @@
 using System.Text;
 using FikaAmazonAPI.AmazonSpApiSDK.Models.ListingsItems;
 using FikaAmazonAPI.Parameter.ListingItem;
-using FikaAmazonAPI.Parameter.ListingsItems;
 using FikaAmazonAPI.Utils;
 using static FikaAmazonAPI.Utils.Constants;
 
@@ -15,26 +14,12 @@ public ListingsItemService(AmazonCredential amazonCredential) : base(amazonCrede
         {
         }
 
-        public Item GetListingsItem(string sellerId, string sku, ParameterGetListingsItem listingsItemParameters)
+        public Item GetListingsItem(ParameterGetListingsItem listingsItemParameters)
         {
-            if (string.IsNullOrEmpty(sellerId))
-                throw new ArgumentException($"'{nameof(sellerId)}' cannot be null or empty.", nameof(sellerId));
-
-            if (string.IsNullOrEmpty(sku))
-                throw new ArgumentException($"'{nameof(sku)}' cannot be null or empty.", nameof(sku));
-
-            if (listingsItemParameters.includedData is null)
-            {
-                listingsItemParameters.includedData = new List<ListingsIncludedData>();
-                listingsItemParameters.includedData.Add(ListingsIncludedData.Summaries);
-            }
-            if (listingsItemParameters.includedData.Count == 0)
-                listingsItemParameters.includedData.Add(ListingsIncludedData.Summaries);
-            var queryParameters = listingsItemParameters.getParameters(AmazonCredential.Environment == Environments.Sandbox);
-            CreateAuthorizedRequest(ListingsItemsApiUrls.GetListingItem(sellerId, sku), RestSharp.Method.GET, queryParameters, parameter: listingsItemParameters);
-            var response = ExecuteRequest<Item>();
-
-            return response;
+            listingsItemParameters.Check();
+            var queryParameters = listingsItemParameters.getParameters();
+            CreateAuthorizedRequest(ListingsItemsApiUrls.GetListingItem(listingsItemParameters.sellerId, listingsItemParameters.sku), RestSharp.Method.GET, queryParameters, parameter: listingsItemParameters);
+            return ExecuteRequest<Item>();
         }
 
         public ListingsItemSubmissionResponse PutListingsItem(ParameterPutListingItem parameterPutListingItem)
diff --git a/Source/FikaAmazonAPI/Services/OrderService.cs b/Source/FikaAmazonAPI/Services/OrderService.cs
@@ -30,7 +30,7 @@ public OrderList GetOrders(ParameterOrderList searchOrderList)
                 searchOrderList.MarketplaceIds=new List<string>();
                 searchOrderList.MarketplaceIds.Add(AmazonCredential.MarketPlace.ID);
             }
-            var queryParameters = searchOrderList.getParameters(this.AmazonCredential.Environment == Constants.Environments.Sandbox);
+            var queryParameters = searchOrderList.getParameters();
 
             CreateAuthorizedRequest(OrdersApiUrls.Orders, RestSharp.Method.GET, queryParameters,parameter: searchOrderList);
             var response = ExecuteRequest<GetOrdersResponse>();
diff --git a/Source/FikaAmazonAPI/Utils/Constants.cs b/Source/FikaAmazonAPI/Utils/Constants.cs
@@ -12,6 +12,7 @@ public class Constants
         public readonly static string AmazonToeknEndPoint = "https://api.amazon.com/auth/o2/token";
         public readonly static string DateISO8601Format = "yyyy-MM-ddTHH:mm:ss.fffZ";
         public readonly static string TestCase200 = "TEST_CASE_200";
+        public readonly static string TestCase400 = "TEST_CASE_400";
         
         [JsonConverter(typeof(StringEnumConverter))]
         public enum Environments
diff --git a/Source/FikaAmazonAPI/Utils/Sandbox.cs b/Source/FikaAmazonAPI/Utils/Sandbox.cs
@@ -1,6 +1,7 @@
 ﻿using FikaAmazonAPI.Parameter;
-using FikaAmazonAPI.Parameter.ListingsItems;
+using FikaAmazonAPI.Parameter.ListingItem;
 using FikaAmazonAPI.Parameter.Order;
+using FikaAmazonAPI.Search;
 using System;
 using System.Collections.Generic;
 using System.Text;
@@ -9,10 +10,10 @@ namespace FikaAmazonAPI.Utils
 {
     internal static class Sandbox
     {
-        public static Dictionary<string, List<KeyValuePair<string, string>>> SandboxQueryParameters<T>(string testCase) where T : IHasParameterizedTestCase
+        public static Dictionary<string, List<KeyValuePair<string, string>>> SandboxQueryParameters<T>(T instance, string testCase) where T : ParameterBased
         {
             var queryParameters = new Dictionary<string, List<KeyValuePair<string, string>>>();
-            if (typeof(T) == typeof(ParameterOrderList))
+            if (instance is ParameterOrderList parameterOrderList)
             {
                 if (testCase.Equals(Constants.TestCase200))
                 {
@@ -23,11 +24,72 @@ public static Dictionary<string, List<KeyValuePair<string, string>>> SandboxQuer
                     });
                 }
             }
-            else if (typeof(T) == typeof(ParameterGetListingsItem))
+            else if (instance is ParameterGetListingsItem parameterGetListingsItem)
             {
                 if (testCase.Equals(Constants.TestCase200))
                 {
-
+                    queryParameters.Add(Constants.TestCase200, new List<KeyValuePair<string, string>>()
+                    {
+                        new KeyValuePair<string, string>("marketplaceIds", string.Join(",", parameterGetListingsItem.marketplaceIds)),
+                    });
+                }
+                else if (testCase.Equals(Constants.TestCase400))
+                {
+                    queryParameters.Add(Constants.TestCase400, new List<KeyValuePair<string, string>>()
+                    {
+                        new KeyValuePair<string, string>("marketplaceIds", string.Join(",", parameterGetListingsItem.marketplaceIds))
+                    });
+                }
+            }
+            else if (instance is ParameterPutListingItem parameterPutListingsItem)
+            {
+                if (testCase.Equals(Constants.TestCase200))
+                {
+                    queryParameters.Add(Constants.TestCase200, new List<KeyValuePair<string, string>>()
+                    {
+                        new KeyValuePair<string, string>("marketplaceIds", string.Join(",", parameterPutListingsItem.marketplaceIds)),
+                    });
+                }
+                else if (testCase.Equals(Constants.TestCase400))
+                {
+                    queryParameters.Add(Constants.TestCase400, new List<KeyValuePair<string, string>>()
+                    {
+                        new KeyValuePair<string, string>("marketplaceIds", string.Join(",", parameterPutListingsItem.marketplaceIds))
+                    });
+                }
+            }
+            else if (instance is ParameterDeleteListingItem parameterDeleteListingsItem)
+            {
+                if (testCase.Equals(Constants.TestCase200))
+                {
+                    queryParameters.Add(Constants.TestCase200, new List<KeyValuePair<string, string>>()
+                    {
+                        new KeyValuePair<string, string>("marketplaceIds", string.Join(",", parameterDeleteListingsItem.marketplaceIds)),
+                    });
+                }
+                else if (testCase.Equals(Constants.TestCase400))
+                {
+                    queryParameters.Add(Constants.TestCase400, new List<KeyValuePair<string, string>>()
+                    {
+                        new KeyValuePair<string, string>("marketplaceIds", string.Join(",", parameterDeleteListingsItem.marketplaceIds))
+                    });
+                }
+            }
+            else if (instance is ParameterPatchListingItem parameterPatchListingItem)
+            {
+                if (testCase.Equals(Constants.TestCase200))
+                {
+                    queryParameters.Add(Constants.TestCase200, new List<KeyValuePair<string, string>>()
+                    {
+                        new KeyValuePair<string, string>("marketplaceIds", string.Join(",", parameterPatchListingItem.marketplaceIds)),
+                    });
+                }
+                else if (testCase.Equals(Constants.TestCase400))
+                {
+                    queryParameters.Add(Constants.TestCase400, new List<KeyValuePair<string, string>>()
+                    {
+                        new KeyValuePair<string, string>("marketplaceIds", string.Join(",", parameterPatchListingItem.marketplaceIds))
+                    });
                 }
             }
 

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,10 @@ public void GetOrderTestCase200()`
`19`	`19`	`{`
`20`	`20`	`var orders = amazonConnection.Orders.GetOrders`
`21`	`21`	`(`
`22`		`- new FikaAmazonAPI.Parameter.Order.ParameterOrderList(Constants.TestCase200)`
	`22`	`+ new FikaAmazonAPI.Parameter.Order.ParameterOrderList`
	`23`	`+ {`
	`24`	`+ TestCase = Constants.TestCase200`
	`25`	`+ }`
`23`	`26`	`);`
`24`	`27`	`}`
`25`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using FikaAmazonAPI.Search;`
	`2`	`+using FikaAmazonAPI.Utils;`
`2`	`3`	`using System;`
`3`	`4`	`using System.Collections.Generic;`
`4`	`5`	`using System.IO;`
`@@ -9,9 +10,10 @@ namespace FikaAmazonAPI.Parameter.ListingItem`
`9`	`10`	`{`
`10`	`11`	`public class ParameterDeleteListingItem: ParameterBased`
`11`	`12`	`{`
`12`		`-`
`13`	`13`	`public bool Check()`
`14`	`14`	`{`
	`15`	`+ if (TestCase == Constants.TestCase400)`
	`16`	`+ sku = "BadSKU";`
`15`	`17`	`if (string.IsNullOrWhiteSpace(this.sellerId))`
`16`	`18`	`{`
`17`	`19`	`throw new InvalidDataException("SellerId is a required property for ParameterDeleteListingItem and cannot be null");`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`using FikaAmazonAPI.AmazonSpApiSDK.Models.Token;`
`2`	`2`	`using FikaAmazonAPI.Search;`
	`3`	`+using FikaAmazonAPI.Utils;`
`3`	`4`	`using System;`
`4`	`5`	`using System.Collections.Generic;`
`5`	`6`	`using System.IO;`
`@@ -12,6 +13,8 @@ public class ParameterPatchListingItem : ParameterBased`
`12`	`13`	`{`
`13`	`14`	`public bool Check()`
`14`	`15`	`{`
	`16`	`+ if (TestCase == Constants.TestCase400)`
	`17`	`+ sku = "BadSKU";`
`15`	`18`	`if (string.IsNullOrWhiteSpace(this.sellerId))`
`16`	`19`	`{`
`17`	`20`	`throw new InvalidDataException("SellerId is a required property for ParameterPatchListingItem and cannot be null");`
Original file line number	Diff line number	Diff line change
`@@ -9,15 +9,10 @@`
`9`	`9`
`10`	`10`	`namespace FikaAmazonAPI.Parameter.Order`
`11`	`11`	`{`
`12`		`- public class ParameterOrderList : ParameterBased, IParameterBasedPII, IHasParameterizedTestCase`
	`12`	`+ public class ParameterOrderList : ParameterBased, IParameterBasedPII`
`13`	`13`	`{`
`14`		`- public ParameterOrderList(string testCase = "")`
	`14`	`+ public ParameterOrderList()`
`15`	`15`	`{`
`16`		`- if (!string.IsNullOrEmpty(testCase))`
`17`		`- {`
`18`		`- TestCase = testCase;`
`19`		`- SandboxQueryParameters = Sandbox.SandboxQueryParameters<ParameterOrderList>(TestCase);`
`20`		`- }`
`21`	`16`	`}`
`22`	`17`
`23`	`18`	`/// <summary>`
`@@ -93,8 +88,5 @@ public ParameterOrderList(string testCase = "")`
`93`	`88`	`public string StoreChainStoreId { get; set; }`
`94`	`89`	`public bool IsNeedRestrictedDataToken { get; set; }`
`95`	`90`	`public CreateRestrictedDataTokenRequest RestrictedDataTokenRequest { get; set; }`
`96`		`- public string TestCase { get; set; }`
`97`		`-`
`98`		`- public Dictionary<string, List<KeyValuePair<string, string>>> SandboxQueryParameters { get; }`
`99`	`91`	`}`
`100`	`92`	`}`