Merge pull request #85 from J-W-Chan/main

abuzuhri · web-flow · commit 34c57a1e8bf6 · 2022-01-27T10:36:02.000+01:00
fix some bug.
diff --git a/Source/FikaAmazonAPI/AmazonSpApiSDK/Models/ListingsItems/ListingsItemSubmissionResponse.cs b/Source/FikaAmazonAPI/AmazonSpApiSDK/Models/ListingsItems/ListingsItemSubmissionResponse.cs
@@ -60,7 +60,7 @@ public enum StatusEnum
         /// Initializes a new instance of the <see cref="ListingsItemSubmissionResponse" /> class.
         /// </summary>
         [JsonConstructorAttribute]
-        protected ListingsItemSubmissionResponse() { }
+        public ListingsItemSubmissionResponse() { }
         /// <summary>
         /// Initializes a new instance of the <see cref="ListingsItemSubmissionResponse" /> class.
         /// </summary>
diff --git a/Source/FikaAmazonAPI/AmazonSpApiSDK/Models/Token/CreateRestrictedDataTokenRequest.cs b/Source/FikaAmazonAPI/AmazonSpApiSDK/Models/Token/CreateRestrictedDataTokenRequest.cs
@@ -8,5 +8,7 @@ public class CreateRestrictedDataTokenRequest
     {
         public IList<RestrictedResource> restrictedResources { get; set; }
 
+        public string targetApplication { get; set; }
+
     }
 }
diff --git a/Source/FikaAmazonAPI/AmazonSpApiSDK/Runtime/AWSSignerHelper.cs b/Source/FikaAmazonAPI/AmazonSpApiSDK/Runtime/AWSSignerHelper.cs
@@ -58,7 +58,8 @@ public virtual string ExtractCanonicalURIParameters(string resource)
                 IEnumerable<string> encodedSegments = resource.Split(new char[] { '/' }, StringSplitOptions.None);
 
                 // Encode twice
-                encodedSegments = encodedSegments.Select(segment => Utils.UrlEncode(segment));
+                //use Utils.UrlDecode before Encode twice
+                encodedSegments = encodedSegments.Select(segment => Utils.UrlEncode(Utils.UrlDecode(segment)));
                 encodedSegments = encodedSegments.Select(segment => Utils.UrlEncode(segment));
 
                 canonicalUri += string.Join(Slash, encodedSegments.ToArray());
diff --git a/Source/FikaAmazonAPI/AmazonSpApiSDK/Runtime/Utils.cs b/Source/FikaAmazonAPI/AmazonSpApiSDK/Runtime/Utils.cs
@@ -1,4 +1,5 @@
 ﻿using System.Globalization;
+using System.Net;
 using System.Security.Cryptography;
 using System.Text;
 
@@ -30,6 +31,16 @@ public static string UrlEncode(string data)
             return encoded.ToString();
         }
 
+        /// <summary>
+        ///  Decode
+        /// </summary>
+        /// <param name="data"></param>
+        /// <returns></returns>
+        public static string UrlDecode(string data)
+        {
+            return WebUtility.UrlDecode(data);
+        }
+
         /// <summary>
         /// Returns hashed value of input data using SHA256
         /// </summary>
diff --git a/Source/FikaAmazonAPI/Parameter/ListingsItems/ParameterDeleteListingItem.cs b/Source/FikaAmazonAPI/Parameter/ListingsItems/ParameterDeleteListingItem.cs
@@ -0,0 +1,38 @@
+﻿using FikaAmazonAPI.Search;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+
+namespace FikaAmazonAPI.Parameter.ListingItem
+{
+    public class ParameterDeleteListingItem: ParameterBased
+    {
+
+        public bool Check()
+        {
+            if (string.IsNullOrWhiteSpace(this.sellerId))
+            {
+                throw new InvalidDataException("SellerId is a required property for ParameterDeleteListingItem and cannot be null");
+            }
+            if (string.IsNullOrWhiteSpace(this.sku))
+            {
+                throw new InvalidDataException("Sku is a required property for ParameterDeleteListingItem and cannot be null");
+            }
+            if (this.marketplaceIds == null || !marketplaceIds.Any())
+            {
+                throw new InvalidDataException("MarketplaceIds is a required property for ParameterDeleteListingItem and cannot be null");
+            }
+            return true;
+        }
+
+        public string sellerId { get; set; }
+
+        public string sku { get; set; }
+
+        public IList<string> marketplaceIds { get; set; }
+
+        public string issueLocale { get; set; }
+    }
+}
diff --git a/Source/FikaAmazonAPI/Parameter/ListingsItems/ParameterListingItemCommon.cs b/Source/FikaAmazonAPI/Parameter/ListingsItems/ParameterListingItemCommon.cs
@@ -0,0 +1,16 @@
+﻿using FikaAmazonAPI.Search;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace FikaAmazonAPI.Parameter.ListingItem
+{
+    public class ParameterListingItemCommon
+    {
+        public string SellerId { get; set; }
+
+        public string Sku { get; set; }
+
+        public IList<string> MarketplaceIds { get; set; }
+    }
+}
diff --git a/Source/FikaAmazonAPI/Parameter/ListingsItems/ParameterPatchListingItem.cs b/Source/FikaAmazonAPI/Parameter/ListingsItems/ParameterPatchListingItem.cs
@@ -0,0 +1,75 @@
+﻿using FikaAmazonAPI.AmazonSpApiSDK.Models.Token;
+using FikaAmazonAPI.Search;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+
+namespace FikaAmazonAPI.Parameter.ListingItem
+{
+    public class ParameterPatchListingItem : ParameterBased
+    {
+        public bool Check()
+        {
+            if (string.IsNullOrWhiteSpace(this.sellerId))
+            {
+                throw new InvalidDataException("SellerId is a required property for ParameterPatchListingItem and cannot be null");
+            }
+            if (string.IsNullOrWhiteSpace(this.sku))
+            {
+                throw new InvalidDataException("Sku is a required property for ParameterPatchListingItem and cannot be null");
+            }
+            if (this.marketplaceIds == null || !this.marketplaceIds.Any())
+            {
+                throw new InvalidDataException("MarketplaceIds is a required property for ParameterPatchListingItem and cannot be null");
+            }
+            if (this.listingsItemPatchRequest == null)
+            {
+                throw new InvalidDataException("ListingsItemPutRequest is a required property for ParameterPatchListingItem and cannot be null");
+            }
+            if (string.IsNullOrWhiteSpace(this.listingsItemPatchRequest.productType)) 
+            {
+                throw new InvalidDataException("ListingsItemPutRequest is a required property for ParameterPatchListingItem and cannot be null");
+            }
+            if (this.listingsItemPatchRequest.patches==null|| !this.listingsItemPatchRequest.patches.Any())
+            {
+                throw new InvalidDataException("Patches is a required property for ParameterPatchListingItem and cannot be null");
+            }
+            return true;    
+        }
+
+        public string sellerId { get; set; }
+
+        public string sku { get; set; }
+
+        public IList<string> marketplaceIds { get; set; }
+
+        public string issueLocale { get; set; }
+
+        public ListingsItemPatchRequest  listingsItemPatchRequest { get; set; }
+
+    }
+
+    public class ListingsItemPatchRequest
+    {
+        public string productType { get; set; }
+
+        public IList<PatchOperation> patches { get; set; }
+    }
+
+    public class PatchOperation
+    {
+        public Op op { get; set; }
+       public string path { get; set; }
+
+        public IList<object> value { get; set; }
+    }
+
+    public enum Op
+    {
+        add,
+        replace,
+        delete
+    }
+}
diff --git a/Source/FikaAmazonAPI/Parameter/ListingsItems/ParameterPutListingItem.cs b/Source/FikaAmazonAPI/Parameter/ListingsItems/ParameterPutListingItem.cs
@@ -0,0 +1,68 @@
+﻿using FikaAmazonAPI.AmazonSpApiSDK.Models.Token;
+using FikaAmazonAPI.Search;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+
+namespace FikaAmazonAPI.Parameter.ListingItem
+{
+    public class ParameterPutListingItem : ParameterBased
+    {
+        public bool Check() 
+        {
+            if (string.IsNullOrWhiteSpace(this.sellerId))
+            {
+                throw new InvalidDataException("SellerId is a required property for ParameterPutListingItem and cannot be null");
+            }
+            if (string.IsNullOrWhiteSpace(this.sku))
+            {
+                throw new InvalidDataException("Sku is a required property for ParameterPutListingItem and cannot be null");
+            }
+            if (this.marketplaceIds == null || !marketplaceIds.Any())
+            {
+                throw new InvalidDataException("MarketplaceIds is a required property for ParameterPutListingItem and cannot be null");
+            }
+            if (listingsItemPutRequest == null) 
+            {
+                throw new InvalidDataException("ListingsItemPutRequest is a required property for ParameterPutListingItem and cannot be null");
+            }
+            if (string.IsNullOrWhiteSpace(this.listingsItemPutRequest.ProductType)) 
+            {
+                throw new InvalidDataException("ProductType is a required property for ListingsItemPutRequest and cannot be null");
+            }
+            if (this.listingsItemPutRequest.Attributes==null)
+            {
+                throw new InvalidDataException("Attributes is a required property for ListingsItemPutRequest and cannot be null");
+            }
+            return true;
+        }
+        public string sellerId { get; set; }
+
+        public string sku { get; set; }
+
+        public IList<string> marketplaceIds { get; set; }
+
+        public string issueLocale { get; set; }
+
+        public ListingsItemPutRequest listingsItemPutRequest { get; set; }
+
+    }
+
+    public class ListingsItemPutRequest
+    {
+        public string ProductType { get; set; }
+
+        public Requirements Requirements { get; set; }
+
+        public Object Attributes { get; set; }
+    }
+
+    public enum Requirements
+    {
+        LISTING,
+        LISTING_PRODUCT_ONLY,
+        LISTING_OFFER_ONLY
+    }
+}
diff --git a/Source/FikaAmazonAPI/Parameter/Report/ParameterReportList.cs b/Source/FikaAmazonAPI/Parameter/Report/ParameterReportList.cs
@@ -20,7 +20,7 @@ public ParameterReportList()
         /// <summary>
         /// A list of processing statuses used to filter reports.
         /// </summary>
-        public IList<ReportTypes> processingStatuses { get; set; }
+        public IList<ProcessingStatuses> processingStatuses { get; set; }
         /// <summary>
         /// A list of marketplace identifiers used to filter reports. The reports returned will match at least one of the marketplaces that you specify. Minimum : 1 Maximum : 10
         /// </summary>
diff --git a/Source/FikaAmazonAPI/ReportGeneration/ReportManager.cs b/Source/FikaAmazonAPI/ReportGeneration/ReportManager.cs
@@ -34,6 +34,27 @@ private string GetFeedbackFromDate(AmazonConnection amazonConnection, DateTime f
         {
             return amazonConnection.Reports.CreateReportAndDownloadFile(ReportTypes.GET_SELLER_FEEDBACK_DATA, fromDate);
         }
+
+        #endregion
+
+        #region Performance
+        public SellerFeedBackDataResult GetSellerFeedBackDataFromDays(int days)
+        {
+            DateTime fromDate = DateTime.UtcNow.AddDays(-1 * days);
+            DateTime toDate = DateTime.UtcNow;
+            return GetSellerPerformance(fromDate, toDate);
+        }
+        public SellerFeedBackDataResult GetSellerPerformance(DateTime fromDate, DateTime toDate)
+        {
+            var path = GetSellerPerformance(_amazonConnection, fromDate, toDate);
+            SellerFeedBackData sellerPerformanceReport = new SellerFeedBackData(path);
+            return sellerPerformanceReport.Data;
+        }
+
+        private string GetSellerPerformance(AmazonConnection amazonConnection, DateTime fromDate, DateTime toDate)
+        {
+            return amazonConnection.Reports.CreateReportAndDownloadFile(ReportTypes.GET_SELLER_FEEDBACK_DATA, fromDate);
+        }
         #endregion
 
         #region Reimbursement
diff --git a/Source/FikaAmazonAPI/ReportGeneration/SellerPerformanceReport.cs b/Source/FikaAmazonAPI/ReportGeneration/SellerPerformanceReport.cs
diff --git a/Source/FikaAmazonAPI/Services/ApiUrls.cs b/Source/FikaAmazonAPI/Services/ApiUrls.cs
diff --git a/Source/FikaAmazonAPI/Services/ListingsItemService.cs b/Source/FikaAmazonAPI/Services/ListingsItemService.cs
diff --git a/Source/FikaAmazonAPI/Services/MessagingService.cs b/Source/FikaAmazonAPI/Services/MessagingService.cs

Original file line number	Diff line number	Diff line change
`@@ -8,5 +8,7 @@ public class CreateRestrictedDataTokenRequest`
`8`	`8`	`{`
`9`	`9`	`public IList<RestrictedResource> restrictedResources { get; set; }`
`10`	`10`
	`11`	`+ public string targetApplication { get; set; }`
	`12`	`+`
`11`	`13`	`}`
`12`	`14`	`}`