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

Author: abuzuhri

Source/FikaAmazonAPI/ReportGeneration/ReportDateRange.cs

@@ -10,27 +10,30 @@ public class ReportDateRange
         public ReportDateRange(DateTime startDate, DateTime endDate) { StartDate = startDate; EndDate = endDate;}
 
 
-        public static IList<ReportDateRange> GetDateRange(DateTime startDate,DateTime endDate,int MaxDays)
-        {
-            List<ReportDateRange> list=new List<ReportDateRange>();
+		public static IList<ReportDateRange> GetDateRange(DateTime startDate, DateTime endDate, int MaxDays)
+		{
+			List<ReportDateRange> list = new List<ReportDateRange>();
+			DateTime tempEnd = startDate;
+			DateTime start = startDate;
 
-            double totalDays = (endDate - startDate).TotalDays;
-            int range = (int)(totalDays / MaxDays);
-            int remind = (int)(totalDays % MaxDays);
-            if (remind > 0)
-                range++;
+			while (true)
+			{
+				tempEnd = tempEnd.AddDays(MaxDays);
+				if (tempEnd > endDate)
+				{
+					tempEnd = endDate;
+					list.Add(new ReportDateRange(start, tempEnd));
+					break;
+				}
+				else
+				{
+					list.Add(new ReportDateRange(start, tempEnd));
+					start = tempEnd.AddSeconds(1);
+				}
 
-            for (int i = 0; i < range; i++)
-            {
-                var newStartDate = startDate.AddDays(i * MaxDays);
-                var newEndDate = newStartDate.AddDays(MaxDays);
-                if (i == range - 1)
-                    newEndDate = endDate;
+			}
 
-                list.Add(new ReportDateRange(newStartDate, newEndDate));
-            }
-
-            return list;
+			return list;
         }
     }
 }

Source/FikaAmazonAPI/ReportGeneration/ReportManager.cs

@@ -1,4 +1,5 @@
-using System;
+using FikaAmazonAPI.Utils;
+using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using static FikaAmazonAPI.Utils.Constants;
@@ -250,25 +251,26 @@ private async Task<string> GetOrdersByOrderDateAsync(AmazonConnection amazonConn
             return await amazonConnection.Reports.CreateReportAndDownloadFileAsync(ReportTypes.GET_FLAT_FILE_ALL_ORDERS_DATA_BY_ORDER_DATE_GENERAL, fromDate, toDate);
         }
 
-        public List<OrderInvoicingReportRow> GetOrderInvoicingData(DateTime fromDate, DateTime toDate) =>
-            Task.Run(() => GetOrderInvoicingDataAsync(fromDate, toDate)).ConfigureAwait(false).GetAwaiter().GetResult();
-        public async Task<List<OrderInvoicingReportRow>> GetOrderInvoicingDataAsync(DateTime fromDate, DateTime toDate)
+        public List<OrderInvoicingReportRow> GetOrderInvoicingData(DateTime fromDate, DateTime toDate, List<MarketPlace> marketplaces = null) =>
+            Task.Run(() => GetOrderInvoicingDataAsync(fromDate, toDate, marketplaces)).ConfigureAwait(false).GetAwaiter().GetResult();
+        public async Task<List<OrderInvoicingReportRow>> GetOrderInvoicingDataAsync(DateTime fromDate, DateTime toDate, List<MarketPlace> marketplaces = null)
         {
             List<OrderInvoicingReportRow> list = new List<OrderInvoicingReportRow>();
             var dateList = ReportDateRange.GetDateRange(fromDate, toDate, DAY_30);
             foreach (var range in dateList)
             {
-                var path = await GetOrderInvoicingDataAsync(_amazonConnection, range.StartDate, range.EndDate);
+                var path = await GetOrderInvoicingDataAsync(_amazonConnection, range.StartDate, range.EndDate, marketplaces);
                 OrderInvoicingReport report = new OrderInvoicingReport(path, _amazonConnection.RefNumber);
                 list.AddRange(report.Data);
             }
             return list;
         }
-        private async Task<string> GetOrderInvoicingDataAsync(AmazonConnection amazonConnection, DateTime fromDate, DateTime toDate)
+
+        private async Task<string> GetOrderInvoicingDataAsync(AmazonConnection amazonConnection, DateTime fromDate, DateTime toDate, List<MarketPlace> marketplaces = null)
         {
             var options = new AmazonSpApiSDK.Models.Reports.ReportOptions();
             options.Add("ShowSalesChannel", "true");
-            return await amazonConnection.Reports.CreateReportAndDownloadFileAsync(ReportTypes.GET_FLAT_FILE_ORDER_REPORT_DATA_INVOICING, fromDate, toDate, options, false);
+            return await amazonConnection.Reports.CreateReportAndDownloadFileAsync(ReportTypes.GET_FLAT_FILE_ORDER_REPORT_DATA_INVOICING, fromDate, toDate, options, false, marketplaces);
         }
         #endregion
 

Source/FikaAmazonAPI/Services/ReportService.cs

@@ -7,6 +7,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Threading.Tasks;
 using static FikaAmazonAPI.Utils.Constants;
 
@@ -247,7 +248,7 @@ public async Task<bool> CancelReportScheduleAsync(string reportScheduleId)
 
         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)
+        public async Task<string> CreateReportAndDownloadFileAsync(ReportTypes reportType, DateTime? dataStartTime = null, DateTime? dataEndTime = null, ReportOptions reportOptions = null, bool isRestrictedReport = false, List<MarketPlace> marketplaces = null)
         {
             if (!isRestrictedReport && Enum.TryParse<RestrictedReportTypes>(reportType.ToString(), out _))
             {
@@ -259,7 +260,14 @@ public async Task<string> CreateReportAndDownloadFileAsync(ReportTypes reportTyp
 
             parameters.marketplaceIds = new MarketplaceIds();
 
-            parameters.marketplaceIds.Add(AmazonCredential.MarketPlace.ID);
+            if (marketplaces == null)
+            {
+                parameters.marketplaceIds.Add(AmazonCredential.MarketPlace.ID);
+            }
+            else
+            {
+                parameters.marketplaceIds.AddRange(marketplaces.Select(x => x.ID).ToList());
+            }
 
             if (reportOptions != null)
                 parameters.reportOptions = reportOptions;