Merge pull request #64 from kevinvenclovas/main

Author: abuzuhri

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

@@ -36,6 +36,14 @@ public AmazonUnauthorizedException(string msg, IRestResponse response = null) :
         }
     }
 
+    public class AmazonInvalidInputException : AmazonException
+    {
+        public AmazonInvalidInputException(string msg, IRestResponse response = null) : base(msg, response)
+        {
+
+        }
+    }
+
     public class ExceptionResponse
     {
         public string Content { get; set; }

Source/FikaAmazonAPI/Services/CatalogItemService.cs

@@ -20,6 +20,16 @@ public IList<Item> ListCatalogItems(ParameterListCatalogItems parameterListCatal
             if (string.IsNullOrEmpty(parameterListCatalogItems.MarketplaceId))
                 throw new InvalidDataException("MarketplaceId is a required property and cannot be null or empty");
 
+            if (
+                string.IsNullOrEmpty(parameterListCatalogItems.Query) &&
+                string.IsNullOrEmpty(parameterListCatalogItems.SellerSKU) &&
+                string.IsNullOrEmpty(parameterListCatalogItems.UPC) &&
+                string.IsNullOrEmpty(parameterListCatalogItems.EAN) &&
+                string.IsNullOrEmpty(parameterListCatalogItems.ISBN) &&
+                string.IsNullOrEmpty(parameterListCatalogItems.JAN)
+                )
+                throw new InvalidDataException("At least one of Query, SellerSKU, UPC, EAN, ISBN, JAN is also required and cannot be null or empty");
+
             List<Item> list = new List<Item>();
 
             var parameter = parameterListCatalogItems.getParameters();

Source/FikaAmazonAPI/Services/RequestService.cs

@@ -162,12 +162,20 @@ protected void ParseResponse(IRestResponse response)
             if (response.StatusCode == HttpStatusCode.Forbidden)
             {
                 var error = response.Content.ConvertToErrorResponse();
-                if (error != null && error.Errors.Any(x => x.Code == HttpStatusCode.Unauthorized))
+                if (error != null && error.Errors.Any(x => x.Code.Equals("Unauthorized")))
                 {
                     throw new AmazonUnauthorizedException("Access to requested resource is denied.", response);
                 }
             }
-            
+            if (response.StatusCode == HttpStatusCode.BadRequest)
+            {
+                var error = response.Content.ConvertToErrorResponse();
+                if (error != null && error.Errors.Any(x => x.Code.Equals("InvalidInput")))
+                {
+                    throw new AmazonInvalidInputException("Invalid input found", response);
+                }
+            }
+
             Console.WriteLine("Amazon Api didn't respond with Okay, see exception for more details" + response.Content);
             throw new AmazonException("Amazon Api didn't respond with Okay, see exception for more details", response);
         }

Source/FikaAmazonAPI/Utils/ErrorResponseHelper.cs

@@ -33,7 +33,7 @@ public class ErrorResponseElement
         [JsonProperty("message")]
         public string Message { get; set; }
         [JsonProperty("code")]
-        public HttpStatusCode Code { get; set; }
+        public string Code { get; set; }
         [JsonProperty("details")]
         public string Details { get; set; }
     }