fix bug #186

abuzuhri · abuzuhri · commit 2678cd07d50d · 2022-05-14T16:46:07.000+02:00
diff --git a/Source/FikaAmazonAPI.SampleCode/Program.cs b/Source/FikaAmazonAPI.SampleCode/Program.cs
@@ -34,6 +34,12 @@ static async Task Main(string[] args)
                 MarketPlace = MarketPlace.GetMarketPlaceByID(config.GetSection("FikaAmazonAPI:MarketPlaceID").Value),
             });
 
+            DateTime startDate = new DateTime(2021, 10, 03);
+            var data = amazonConnection.Reports.CreateReportAndDownloadFile(ReportTypes.GET_FBA_REIMBURSEMENTS_DATA, startDate, null, null);
+
+
+            //DateTime startDate = new DateTime(2021, 10, 03);
+            var data2 = amazonConnection.Reports.CreateReportAndDownloadFile(ReportTypes.GET_EASYSHIP_DOCUMENTS, startDate, null, null);
 
 
 
@@ -189,15 +195,7 @@ static async Task Main(string[] args)
             var reimbursementsOrder = reportManager.GetReimbursementsOrder(180); //GET_FBA_REIMBURSEMENTS_DATA
             var feedbacks = reportManager.GetFeedbackFromDays(180); //GET_SELLER_FEEDBACK_DATA
 
-            while (true)
-            {
-                var data = amazonConnection.ProductPricing.GetItemOffers(new FikaAmazonAPI.Parameter.ProductPricing.ParameterGetItemOffers()
-                {
-                    ItemCondition = ItemCondition.New,
-                    MarketplaceId = MarketPlace.UnitedArabEmirates.ID,
-                    Asin = "B0010WW4XS"
-                });
-            }
+
 
 
 
diff --git a/Source/FikaAmazonAPI.SampleCode/ReportsSample.cs b/Source/FikaAmazonAPI.SampleCode/ReportsSample.cs
@@ -1,12 +1,6 @@
 ﻿using FikaAmazonAPI.AmazonSpApiSDK.Models.Reports;
 using FikaAmazonAPI.Parameter.Report;
 using FikaAmazonAPI.Utils;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
 using static FikaAmazonAPI.Utils.Constants;
 
 namespace FikaAmazonAPI.SampleCode
@@ -20,7 +14,7 @@ public ReportsSample(AmazonConnection amazonConnection)
         }
 
 
-        
+
         public void GetReports()
         {
             var parameters = new ParameterReportList();
@@ -40,7 +34,7 @@ public void GetReportGET_FLAT_FILE_RETURNS_DATA_BY_RETURN_DATEs()
             parameters.reportTypes.Add(ReportTypes.GET_FLAT_FILE_RETURNS_DATA_BY_RETURN_DATE);
             parameters.marketplaceIds = new List<string>();
             parameters.marketplaceIds.Add(MarketPlace.UnitedArabEmirates.ID);
-            var reports=amazonConnection.Reports.GetReports(parameters);
+            var reports = amazonConnection.Reports.GetReports(parameters);
         }
 
         public void CreateReport()
@@ -59,21 +53,21 @@ public void CreateReport()
             var reportId = amazonConnection.Reports.CreateReport(parameters);
         }
 
-        
+
         public void GetReport()
         {
 
             amazonConnection.Reports.GetReport("192841018867");
         }
 
-        
+
         public void CancelReport()
         {
 
             amazonConnection.Reports.CancelReport("192841018867");
         }
 
-        
+
         public void GetReportSchedules()
         {
 
@@ -182,7 +176,7 @@ public string CreateReport_GET_FLAT_FILE_RETURNS_DATA_BY_RETURN_DATE()
                     filePath = amazonConnection.Reports.GetReportFile(reportData.ReportDocumentId);
                     break;
                 }
-                if(reportData.ProcessingStatus== AmazonSpApiSDK.Models.Reports.Report.ProcessingStatusEnum.FATAL)
+                if (reportData.ProcessingStatus == AmazonSpApiSDK.Models.Reports.Report.ProcessingStatusEnum.FATAL)
                 {
                     throw new Exception("Error with Generate report");
                 }
@@ -193,9 +187,9 @@ public string CreateReport_GET_FLAT_FILE_RETURNS_DATA_BY_RETURN_DATE()
         }
 
 
-        public string CreateReportAndDawnload(ReportTypes reportTypes,DateTime? dataStartTime=null,DateTime? dataEndTime=null, ReportOptions reportOptions=null)
+        public string CreateReportAndDawnload(ReportTypes reportTypes, DateTime? dataStartTime = null, DateTime? dataEndTime = null, ReportOptions reportOptions = null)
         {
-          return  amazonConnection.Reports.CreateReportAndDownloadFile(reportTypes, dataStartTime, dataEndTime, reportOptions);
+            return amazonConnection.Reports.CreateReportAndDownloadFile(reportTypes, dataStartTime, dataEndTime, reportOptions);
         }
 
         public void DownloadExistingReportAndDownloadFile()
@@ -220,6 +214,14 @@ public void GetReportGET_FBA_REIMBURSEMENTS_DATA()
             DateTime startDate = new DateTime(2021, 10, 03);
             var data = amazonConnection.Reports.CreateReportAndDownloadFile(ReportTypes.GET_FBA_REIMBURSEMENTS_DATA, startDate, null, null);
         }
+
+        public void GetReportGET_AMAZON_FULFILLED_SHIPMENTS_DATA_INVOICING()
+        {
+            DateTime startDate = new DateTime(2021, 10, 03);
+            var data = amazonConnection.Reports.CreateReportAndDownloadFile(ReportTypes.GET_AMAZON_FULFILLED_SHIPMENTS_DATA_INVOICING, startDate, null, null, true);
+        }
+
+
         public void GetReportFile()
         {
 
diff --git a/Source/FikaAmazonAPI/Services/ApiUrls.cs b/Source/FikaAmazonAPI/Services/ApiUrls.cs
@@ -282,7 +282,7 @@ public static string SearchDefinitionsProductTypes
             public static string GetDefinitionsProductType(string productType) => $"{_resourceBaseUrl}/productTypes/{productType}";
         }
 
-        public class ReportApiUrls
+        protected class ReportApiUrls
         {
             private readonly static string _resourceBaseUrl = "/reports/2021-06-30";
             public static string CreateReport
diff --git a/Source/FikaAmazonAPI/Services/ReportService.cs b/Source/FikaAmazonAPI/Services/ReportService.cs
@@ -1,7 +1,8 @@
 ﻿using FikaAmazonAPI.AmazonSpApiSDK.Models.Exceptions;
 using FikaAmazonAPI.AmazonSpApiSDK.Models.Reports;
+using FikaAmazonAPI.AmazonSpApiSDK.Models.Token;
+using FikaAmazonAPI.Parameter;
 using FikaAmazonAPI.Parameter.Report;
-using FikaAmazonAPI.Search;
 using FikaAmazonAPI.Utils;
 using System;
 using System.Collections.Generic;
@@ -134,21 +135,42 @@ public async Task<ReportSchedule> GetReportScheduleAsync(string reportScheduleId
             return null;
         }
 
-        public ReportDocument GetReportDocument(string reportDocumentId, IParameterBasedPII parameterBasedPII = null) =>
-            Task.Run(() => GetReportDocumentAsync(reportDocumentId, parameterBasedPII)).ConfigureAwait(false).GetAwaiter().GetResult();
-        public async Task<ReportDocument> GetReportDocumentAsync(string reportDocumentId, IParameterBasedPII parameterBasedPII = null)
+        public ReportDocument GetReportDocument(string reportDocumentId, bool isRestrictedReport = false) =>
+            Task.Run(() => GetReportDocumentAsync(reportDocumentId, isRestrictedReport)).ConfigureAwait(false).GetAwaiter().GetResult();
+        public async Task<ReportDocument> GetReportDocumentAsync(string reportDocumentId, bool isRestrictedReport = false)
         {
+            ParameterBasedPII parameterBasedPII = null;
+
+            if (isRestrictedReport)
+            {
+                parameterBasedPII = new ParameterBasedPII()
+                {
+                    IsNeedRestrictedDataToken = true,
+                    RestrictedDataTokenRequest = new CreateRestrictedDataTokenRequest
+                    {
+                        restrictedResources = new List<RestrictedResource>
+                        {
+                            new RestrictedResource
+                            {
+                                method = Method.GET.ToString(),
+                                path = ReportApiUrls.GetReportDocument(reportDocumentId)
+                            }
+                        }
+                    }
+                };
+            }
+
             await CreateAuthorizedRequestAsync(ReportApiUrls.GetReportDocument(reportDocumentId), RestSharp.Method.GET, parameter: parameterBasedPII);
             var response = await ExecuteRequestAsync<ReportDocument>(RateLimitType.Report_GetReportDocument);
             if (response != null)
                 return response;
             return null;
         }
-        public string GetReportFile(string reportDocumentId) =>
-            Task.Run(() => GetReportFileAsync(reportDocumentId)).ConfigureAwait(false).GetAwaiter().GetResult();
-        public async Task<string> GetReportFileAsync(string reportDocumentId)
+        public string GetReportFile(string reportDocumentId, bool isRestrictedReport = false) =>
+            Task.Run(() => GetReportFileAsync(reportDocumentId, isRestrictedReport)).ConfigureAwait(false).GetAwaiter().GetResult();
+        public async Task<string> GetReportFileAsync(string reportDocumentId, bool isRestrictedReport = false)
         {
-            var reportDocument = await GetReportDocumentAsync(reportDocumentId);
+            var reportDocument = await GetReportDocumentAsync(reportDocumentId, isRestrictedReport);
             return GetFile(reportDocument);
         }
 
@@ -223,12 +245,17 @@ public async Task<bool> CancelReportScheduleAsync(string reportScheduleId)
         #endregion
 
 
-        public string CreateReportAndDownloadFile(ReportTypes reportTypes, DateTime? dataStartTime = null, DateTime? dataEndTime = null, ReportOptions reportOptions = null) =>
-            Task.Run(() => CreateReportAndDownloadFileAsync(reportTypes, dataStartTime, dataEndTime, reportOptions)).ConfigureAwait(false).GetAwaiter().GetResult();
-        public async Task<string> CreateReportAndDownloadFileAsync(ReportTypes reportTypes, DateTime? dataStartTime = null, DateTime? dataEndTime = null, ReportOptions reportOptions = null)
+        public string CreateReportAndDownloadFile(ReportTypes reportType, DateTime? dataStartTime = null, DateTime? dataEndTime = null, ReportOptions reportOptions = null, bool isRestrictedReport = false) =>
+            Task.Run(() => CreateReportAndDownloadFileAsync(reportType, dataStartTime, dataEndTime, reportOptions, isRestrictedReport)).ConfigureAwait(false).GetAwaiter().GetResult();
+        public async Task<string> CreateReportAndDownloadFileAsync(ReportTypes reportType, DateTime? dataStartTime = null, DateTime? dataEndTime = null, ReportOptions reportOptions = null, bool isRestrictedReport = false)
         {
+            if (!isRestrictedReport && Enum.TryParse<RestrictedReportTypes>(reportType.ToString(), out _))
+            {
+                isRestrictedReport = true;
+            }
+
             var parameters = new ParameterCreateReportSpecification();
-            parameters.reportType = reportTypes;
+            parameters.reportType = reportType;
 
             parameters.marketplaceIds = new MarketplaceIds();
 
@@ -251,7 +278,7 @@ public async Task<string> CreateReportAndDownloadFileAsync(ReportTypes reportTyp
                 var reportData = await GetReportAsync(reportId);
                 if (!string.IsNullOrEmpty(reportData.ReportDocumentId))
                 {
-                    filePath = await GetReportFileAsync(reportData.ReportDocumentId);
+                    filePath = await GetReportFileAsync(reportData.ReportDocumentId, isRestrictedReport);
                     break;
                 }
                 if (reportData.ProcessingStatus == Report.ProcessingStatusEnum.FATAL)
diff --git a/Source/FikaAmazonAPI/Utils/Constants.cs b/Source/FikaAmazonAPI/Utils/Constants.cs
@@ -361,6 +361,26 @@ public enum BuyerType
             B2C,
             B2B
         }
+        [JsonConverter(typeof(StringEnumConverter))]
+        public enum RestrictedReportTypes
+        {
+            GET_AMAZON_FULFILLED_SHIPMENTS_DATA_INVOICING,
+            GET_AMAZON_FULFILLED_SHIPMENTS_DATA_TAX,
+            GET_FLAT_FILE_ACTIONABLE_ORDER_DATA_SHIPPING,
+            GET_FLAT_FILE_ORDER_REPORT_DATA_SHIPPING,
+            GET_FLAT_FILE_ORDER_REPORT_DATA_INVOICING,
+            GET_FLAT_FILE_ORDER_REPORT_DATA_TAX,
+            GET_FLAT_FILE_ORDERS_RECONCILIATION_DATA_TAX,
+            GET_FLAT_FILE_ORDERS_RECONCILIATION_DATA_INVOICING,
+            GET_FLAT_FILE_ORDERS_RECONCILIATION_DATA_SHIPPING,
+            GET_ORDER_REPORT_DATA_INVOICING,
+            GET_ORDER_REPORT_DATA_TAX,
+            GET_ORDER_REPORT_DATA_SHIPPING,
+            GET_EASYSHIP_DOCUMENTS,
+            GET_GST_MTR_B2B_CUSTOM,
+            GET_VAT_TRANSACTION_DATA,
+            SC_VAT_TAX_REPORT
+        }
 
         [JsonConverter(typeof(StringEnumConverter))]
         public enum ReportTypes

Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,6 @@`
`1`	`1`	`using FikaAmazonAPI.AmazonSpApiSDK.Models.Reports;`
`2`	`2`	`using FikaAmazonAPI.Parameter.Report;`
`3`	`3`	`using FikaAmazonAPI.Utils;`
`4`		`-using System;`
`5`		`-using System.Collections.Generic;`
`6`		`-using System.Linq;`
`7`		`-using System.Text;`
`8`		`-using System.Threading;`
`9`		`-using System.Threading.Tasks;`
`10`	`4`	`using static FikaAmazonAPI.Utils.Constants;`
`11`	`5`
`12`	`6`	`namespace FikaAmazonAPI.SampleCode`
`@@ -20,7 +14,7 @@ public ReportsSample(AmazonConnection amazonConnection)`
`20`	`14`	`}`
`21`	`15`
`22`	`16`
`23`		`-`
	`17`	`+`
`24`	`18`	`public void GetReports()`
`25`	`19`	`{`
`26`	`20`	`var parameters = new ParameterReportList();`
`@@ -40,7 +34,7 @@ public void GetReportGET_FLAT_FILE_RETURNS_DATA_BY_RETURN_DATEs()`
`40`	`34`	`parameters.reportTypes.Add(ReportTypes.GET_FLAT_FILE_RETURNS_DATA_BY_RETURN_DATE);`
`41`	`35`	`parameters.marketplaceIds = new List<string>();`
`42`	`36`	`parameters.marketplaceIds.Add(MarketPlace.UnitedArabEmirates.ID);`
`43`		`- var reports=amazonConnection.Reports.GetReports(parameters);`
	`37`	`+ var reports = amazonConnection.Reports.GetReports(parameters);`
`44`	`38`	`}`
`45`	`39`
`46`	`40`	`public void CreateReport()`
`@@ -59,21 +53,21 @@ public void CreateReport()`
`59`	`53`	`var reportId = amazonConnection.Reports.CreateReport(parameters);`
`60`	`54`	`}`
`61`	`55`
`62`		`-`
	`56`	`+`
`63`	`57`	`public void GetReport()`
`64`	`58`	`{`
`65`	`59`
`66`	`60`	`amazonConnection.Reports.GetReport("192841018867");`
`67`	`61`	`}`
`68`	`62`
`69`		`-`
	`63`	`+`
`70`	`64`	`public void CancelReport()`
`71`	`65`	`{`
`72`	`66`
`73`	`67`	`amazonConnection.Reports.CancelReport("192841018867");`
`74`	`68`	`}`
`75`	`69`
`76`		`-`
	`70`	`+`
`77`	`71`	`public void GetReportSchedules()`
`78`	`72`	`{`
`79`	`73`
`@@ -182,7 +176,7 @@ public string CreateReport_GET_FLAT_FILE_RETURNS_DATA_BY_RETURN_DATE()`
`182`	`176`	`filePath = amazonConnection.Reports.GetReportFile(reportData.ReportDocumentId);`
`183`	`177`	`break;`
`184`	`178`	`}`
`185`		`- if(reportData.ProcessingStatus== AmazonSpApiSDK.Models.Reports.Report.ProcessingStatusEnum.FATAL)`
	`179`	`+ if (reportData.ProcessingStatus == AmazonSpApiSDK.Models.Reports.Report.ProcessingStatusEnum.FATAL)`
`186`	`180`	`{`
`187`	`181`	`throw new Exception("Error with Generate report");`
`188`	`182`	`}`
`@@ -193,9 +187,9 @@ public string CreateReport_GET_FLAT_FILE_RETURNS_DATA_BY_RETURN_DATE()`
`193`	`187`	`}`
`194`	`188`
`195`	`189`
`196`		`- public string CreateReportAndDawnload(ReportTypes reportTypes,DateTime? dataStartTime=null,DateTime? dataEndTime=null, ReportOptions reportOptions=null)`
	`190`	`+ public string CreateReportAndDawnload(ReportTypes reportTypes, DateTime? dataStartTime = null, DateTime? dataEndTime = null, ReportOptions reportOptions = null)`
`197`	`191`	`{`
`198`		`- return amazonConnection.Reports.CreateReportAndDownloadFile(reportTypes, dataStartTime, dataEndTime, reportOptions);`
	`192`	`+ return amazonConnection.Reports.CreateReportAndDownloadFile(reportTypes, dataStartTime, dataEndTime, reportOptions);`
`199`	`193`	`}`
`200`	`194`
`201`	`195`	`public void DownloadExistingReportAndDownloadFile()`
`@@ -220,6 +214,14 @@ public void GetReportGET_FBA_REIMBURSEMENTS_DATA()`
`220`	`214`	`DateTime startDate = new DateTime(2021, 10, 03);`
`221`	`215`	`var data = amazonConnection.Reports.CreateReportAndDownloadFile(ReportTypes.GET_FBA_REIMBURSEMENTS_DATA, startDate, null, null);`
`222`	`216`	`}`
	`217`	`+`
	`218`	`+ public void GetReportGET_AMAZON_FULFILLED_SHIPMENTS_DATA_INVOICING()`
	`219`	`+ {`
	`220`	`+ DateTime startDate = new DateTime(2021, 10, 03);`
	`221`	`+ var data = amazonConnection.Reports.CreateReportAndDownloadFile(ReportTypes.GET_AMAZON_FULFILLED_SHIPMENTS_DATA_INVOICING, startDate, null, null, true);`
	`222`	`+ }`
	`223`	`+`
	`224`	`+`
`223`	`225`	`public void GetReportFile()`
`224`	`226`	`{`
`225`	`227`
Original file line number	Diff line number	Diff line change
`@@ -282,7 +282,7 @@ public static string SearchDefinitionsProductTypes`
`282`	`282`	`public static string GetDefinitionsProductType(string productType) => $"{_resourceBaseUrl}/productTypes/{productType}";`
`283`	`283`	`}`
`284`	`284`
`285`		`- public class ReportApiUrls`
	`285`	`+ protected class ReportApiUrls`
`286`	`286`	`{`
`287`	`287`	`private readonly static string _resourceBaseUrl = "/reports/2021-06-30";`
`288`	`288`	`public static string CreateReport`