Merge pull request #427 from ProNotion/main

abuzuhri · web-flow · commit 650280a92fa2 · 2022-12-01T08:28:18.000+01:00
diff --git a/Source/FikaAmazonAPI/ReportGeneration/DataConverter.cs b/Source/FikaAmazonAPI/ReportGeneration/DataConverter.cs
@@ -6,7 +6,7 @@ namespace FikaAmazonAPI.ReportGeneration
     public class DataConverter
     {
 
-        public static class DateTimeFormate
+        public static class DateTimeFormat
         {
             public const string DATE_FORMAT_DOT = "dd.MM.yyyy";
             public const string DATETIME_FORMAT_UTC_DOT = "dd.MM.yyyy HH:mm:ss UTC";
@@ -15,9 +15,9 @@ public static class DateTimeFormate
             public const string DATE_MMM_FORMAT = "dd-MMM-yyyy";
             public const string DATE_AGING_FORMAT = "yyyy-MM-dd";
         }
-        public static DateTime? GetDate(string str, string FORMATE)
+        public static DateTime? GetDate(string str, string format)
         {
-            if (DateTime.TryParseExact(str, FORMATE,
+            if (DateTime.TryParseExact(str, format,
                            System.Globalization.CultureInfo.InvariantCulture,
                            System.Globalization.DateTimeStyles.None,
                            out DateTime value))
@@ -43,4 +43,4 @@ public static class DateTimeFormate
             return null;
         }
     }
-}
+}
diff --git a/Source/FikaAmazonAPI/ReportGeneration/FeedbackOrderReport.cs b/Source/FikaAmazonAPI/ReportGeneration/FeedbackOrderReport.cs
@@ -35,7 +35,7 @@ public static FeedbackOrderRow FromCsv(string csvLine, string refNumber)
         {
             string[] values = csvLine.Split('\t');
             FeedbackOrderRow row = new FeedbackOrderRow();
-            row.Date = DataConverter.GetDate(values[0], DataConverter.DateTimeFormate.DATE_BACKSLASH_FORMAT);
+            row.Date = DataConverter.GetDate(values[0], DataConverter.DateTimeFormat.DATE_BACKSLASH_FORMAT);
             row.Rating = Convert.ToInt32(values[1]);
             row.Comments = values[2];
             row.Response = values[3];
diff --git a/Source/FikaAmazonAPI/ReportGeneration/InventoryAgingReport.cs b/Source/FikaAmazonAPI/ReportGeneration/InventoryAgingReport.cs
@@ -55,7 +55,7 @@ public class InventoryAgingRow
         public static InventoryAgingRow FromRow(TableRow rowData, string refNumber)
         {
             var row = new InventoryAgingRow();
-            row.SnapshotDate = DataConverter.GetDate(rowData.GetString("snapshot-date"), DataConverter.DateTimeFormate.DATE_AGING_FORMAT);
+            row.SnapshotDate = DataConverter.GetDate(rowData.GetString("snapshot-date"), DataConverter.DateTimeFormat.DATE_AGING_FORMAT);
             row.SKU = rowData.GetString("sku");
             row.FNSKU = rowData.GetString("fnsku");
             row.ASIN = rowData.GetString("asin");
diff --git a/Source/FikaAmazonAPI/ReportGeneration/OrderInvoicingReport.cs b/Source/FikaAmazonAPI/ReportGeneration/OrderInvoicingReport.cs
@@ -78,8 +78,8 @@ public static OrderInvoicingReportRow FromRow(TableRow rowData, string refNumber
             var row = new OrderInvoicingReportRow();
             row.AmazonOrderId = rowData.GetString("order-id");
             row.OrderItemId = rowData.GetString("order-item-id");
-            row.PurchaseDate = DataConverter.GetDate(rowData.GetString("purchase-date"), DataConverter.DateTimeFormate.DATETIME_K_FORMAT);
-            row.PaymentDate = DataConverter.GetDate(rowData.GetString("payments-date"), DataConverter.DateTimeFormate.DATETIME_K_FORMAT);
+            row.PurchaseDate = DataConverter.GetDate(rowData.GetString("purchase-date"), DataConverter.DateTimeFormat.DATETIME_K_FORMAT);
+            row.PaymentDate = DataConverter.GetDate(rowData.GetString("payments-date"), DataConverter.DateTimeFormat.DATETIME_K_FORMAT);
             row.BuyerEmail = rowData.GetString("buyer-email");
             row.BuyerName = rowData.GetString("buyer-name");
             row.PaymentMethodeDetails = rowData.GetString("payment-method-details");
diff --git a/Source/FikaAmazonAPI/ReportGeneration/OrdersReport.cs b/Source/FikaAmazonAPI/ReportGeneration/OrdersReport.cs
@@ -59,8 +59,8 @@ public static OrdersRow FromCsv(string csvLine, string refNumber)
             var row = new OrdersRow();
             row.AmazonOrderId = values[0];
             row.MerchantOrderId = values[1];
-            row.PurchaseDate = DataConverter.GetDate(values[2], DataConverter.DateTimeFormate.DATETIME_K_FORMAT);
-            row.LastUpdatedDate = DataConverter.GetDate(values[3], DataConverter.DateTimeFormate.DATETIME_K_FORMAT);
+            row.PurchaseDate = DataConverter.GetDate(values[2], DataConverter.DateTimeFormat.DATETIME_K_FORMAT);
+            row.LastUpdatedDate = DataConverter.GetDate(values[3], DataConverter.DateTimeFormat.DATETIME_K_FORMAT);
             row.OrderStatus = values[4];
             row.FulfillmentChannel = values[5];
             row.SalesChannel = values[6];
diff --git a/Source/FikaAmazonAPI/ReportGeneration/ReimbursementsOrderReport.cs b/Source/FikaAmazonAPI/ReportGeneration/ReimbursementsOrderReport.cs
@@ -48,7 +48,7 @@ public static ReimbursementsOrderRow FromCsv(string csvLine, string refNumber)
         {
             string[] values = csvLine.Split('\t');
             var row = new ReimbursementsOrderRow();
-            row.ApprovalDate = DataConverter.GetDate(values[0], DataConverter.DateTimeFormate.DATETIME_K_FORMAT);
+            row.ApprovalDate = DataConverter.GetDate(values[0], DataConverter.DateTimeFormat.DATETIME_K_FORMAT);
             row.ReimbursementId = values[1];
             row.CaseId = values[2];
             row.AmazonOrderId = values[3];
diff --git a/Source/FikaAmazonAPI/ReportGeneration/ReportManager.cs b/Source/FikaAmazonAPI/ReportGeneration/ReportManager.cs
@@ -198,7 +198,7 @@ private async Task<string> GetProductsAsync(AmazonConnection amazonConnection)
             return await amazonConnection.Reports.CreateReportAndDownloadFileAsync(ReportTypes.GET_MERCHANT_LISTINGS_ALL_DATA);
         }
         #endregion
-
+    
         #region Categories
 
         public List<CategoriesRow> GetCategories()
diff --git a/Source/FikaAmazonAPI/ReportGeneration/ReturnFBAOrderReport.cs b/Source/FikaAmazonAPI/ReportGeneration/ReturnFBAOrderReport.cs
@@ -43,7 +43,7 @@ public class ReturnFBAOrderRow
         public static ReturnFBAOrderRow FromRow(TableRow rowData, string refNumber)
         {
             var row = new ReturnFBAOrderRow();
-            row.ReturnDate = DataConverter.GetDate(rowData.GetString("return-date"), DataConverter.DateTimeFormate.DATETIME_K_FORMAT);
+            row.ReturnDate = DataConverter.GetDate(rowData.GetString("return-date"), DataConverter.DateTimeFormat.DATETIME_K_FORMAT);
             row.OrderId = rowData.GetString("order-id");
             row.SKU = rowData.GetString("sku");
             row.ASIN = rowData.GetString("asin");
diff --git a/Source/FikaAmazonAPI/ReportGeneration/ReturnFBMOrderReport.cs b/Source/FikaAmazonAPI/ReportGeneration/ReturnFBMOrderReport.cs
@@ -64,8 +64,8 @@ public static ReturnFBMOrderRow FromCsv(string csvLine, string refNumber)
             string[] values = csvLine.Split('\t');
             ReturnFBMOrderRow row = new ReturnFBMOrderRow();
             row.OrderID = values[0];
-            row.OrderDate = DataConverter.GetDate(values[1], DataConverter.DateTimeFormate.DATE_MMM_FORMAT);
-            row.ReturnRequestDate = DataConverter.GetDate(values[2], DataConverter.DateTimeFormate.DATE_MMM_FORMAT);
+            row.OrderDate = DataConverter.GetDate(values[1], DataConverter.DateTimeFormat.DATE_MMM_FORMAT);
+            row.ReturnRequestDate = DataConverter.GetDate(values[2], DataConverter.DateTimeFormat.DATE_MMM_FORMAT);
             row.ReturnRequestStatus = values[3];
             row.AmazonRMAID = values[4];
             row.MerchantRMAID = values[5];
@@ -86,7 +86,7 @@ public static ReturnFBMOrderRow FromCsv(string csvLine, string refNumber)
             row.ReturnType = values[20];
             row.Resolution = values[21];
             row.InvoiceNumber = values[22];
-            row.ReturnDeliveryDate = DataConverter.GetDate(values[23], DataConverter.DateTimeFormate.DATE_MMM_FORMAT);
+            row.ReturnDeliveryDate = DataConverter.GetDate(values[23], DataConverter.DateTimeFormat.DATE_MMM_FORMAT);
             row.OrderAmount = DataConverter.GetDecimal(values[24]);
             row.OrderQuantity = DataConverter.GetInt(values[25]);
             row.SafeTActionReason = values[26];
diff --git a/Source/FikaAmazonAPI/ReportGeneration/SettlementOrderReport.cs b/Source/FikaAmazonAPI/ReportGeneration/SettlementOrderReport.cs
@@ -54,9 +54,9 @@ public static SettlementOrderRow FromCsv(string csvLine, string refNumber)
             string[] values = csvLine.Split('\t');
             var row = new SettlementOrderRow();
             row.SettlementId = values[0];
-            row.SettlementStartDate = DataConverter.GetDate(values[1], DataConverter.DateTimeFormate.DATETIME_FORMAT_UTC_DOT);
-            row.SettlementEndDate = DataConverter.GetDate(values[2], DataConverter.DateTimeFormate.DATETIME_FORMAT_UTC_DOT);
-            row.DepositDate = DataConverter.GetDate(values[3], DataConverter.DateTimeFormate.DATETIME_FORMAT_UTC_DOT);
+            row.SettlementStartDate = DataConverter.GetDate(values[1], DataConverter.DateTimeFormat.DATETIME_FORMAT_UTC_DOT);
+            row.SettlementEndDate = DataConverter.GetDate(values[2], DataConverter.DateTimeFormat.DATETIME_FORMAT_UTC_DOT);
+            row.DepositDate = DataConverter.GetDate(values[3], DataConverter.DateTimeFormat.DATETIME_FORMAT_UTC_DOT);
             row.TotalAmount = DataConverter.GetDecimal(values[4]);
             row.Currency = values[5];
             row.TransactionType = values[6];
@@ -69,8 +69,8 @@ public static SettlementOrderRow FromCsv(string csvLine, string refNumber)
             row.AmountDescription = values[13];
             row.Amount = DataConverter.GetDecimal(values[14]);
             row.FulfillmentId = values[15];
-            row.PostedDate = DataConverter.GetDate(values[16], DataConverter.DateTimeFormate.DATE_FORMAT_DOT);
-            row.PostedDateTime = DataConverter.GetDate(values[17], DataConverter.DateTimeFormate.DATETIME_FORMAT_UTC_DOT);
+            row.PostedDate = DataConverter.GetDate(values[16], DataConverter.DateTimeFormat.DATE_FORMAT_DOT);
+            row.PostedDateTime = DataConverter.GetDate(values[17], DataConverter.DateTimeFormat.DATETIME_FORMAT_UTC_DOT);
             row.OrderItemCode = values[18];
             row.MerchantOrderItemId = values[19];
             row.MerchantAdjustmentItemId = values[20];

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ namespace FikaAmazonAPI.ReportGeneration`
`6`	`6`	`public class DataConverter`
`7`	`7`	`{`
`8`	`8`
`9`		`- public static class DateTimeFormate`
	`9`	`+ public static class DateTimeFormat`
`10`	`10`	`{`
`11`	`11`	`public const string DATE_FORMAT_DOT = "dd.MM.yyyy";`
`12`	`12`	`public const string DATETIME_FORMAT_UTC_DOT = "dd.MM.yyyy HH:mm:ss UTC";`
`@@ -15,9 +15,9 @@ public static class DateTimeFormate`
`15`	`15`	`public const string DATE_MMM_FORMAT = "dd-MMM-yyyy";`
`16`	`16`	`public const string DATE_AGING_FORMAT = "yyyy-MM-dd";`
`17`	`17`	`}`
`18`		`- public static DateTime? GetDate(string str, string FORMATE)`
	`18`	`+ public static DateTime? GetDate(string str, string format)`
`19`	`19`	`{`
`20`		`- if (DateTime.TryParseExact(str, FORMATE,`
	`20`	`+ if (DateTime.TryParseExact(str, format,`
`21`	`21`	`System.Globalization.CultureInfo.InvariantCulture,`
`22`	`22`	`System.Globalization.DateTimeStyles.None,`
`23`	`23`	`out DateTime value))`
`@@ -43,4 +43,4 @@ public static class DateTimeFormate`
`43`	`43`	`return null;`
`44`	`44`	`}`
`45`	`45`	`}`
`46`		`-}`
	`46`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public static FeedbackOrderRow FromCsv(string csvLine, string refNumber)`
`35`	`35`	`{`
`36`	`36`	`string[] values = csvLine.Split('\t');`
`37`	`37`	`FeedbackOrderRow row = new FeedbackOrderRow();`
`38`		`- row.Date = DataConverter.GetDate(values[0], DataConverter.DateTimeFormate.DATE_BACKSLASH_FORMAT);`
	`38`	`+ row.Date = DataConverter.GetDate(values[0], DataConverter.DateTimeFormat.DATE_BACKSLASH_FORMAT);`
`39`	`39`	`row.Rating = Convert.ToInt32(values[1]);`
`40`	`40`	`row.Comments = values[2];`
`41`	`41`	`row.Response = values[3];`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public class InventoryAgingRow`
`55`	`55`	`public static InventoryAgingRow FromRow(TableRow rowData, string refNumber)`
`56`	`56`	`{`
`57`	`57`	`var row = new InventoryAgingRow();`
`58`		`- row.SnapshotDate = DataConverter.GetDate(rowData.GetString("snapshot-date"), DataConverter.DateTimeFormate.DATE_AGING_FORMAT);`
	`58`	`+ row.SnapshotDate = DataConverter.GetDate(rowData.GetString("snapshot-date"), DataConverter.DateTimeFormat.DATE_AGING_FORMAT);`
`59`	`59`	`row.SKU = rowData.GetString("sku");`
`60`	`60`	`row.FNSKU = rowData.GetString("fnsku");`
`61`	`61`	`row.ASIN = rowData.GetString("asin");`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public static ReimbursementsOrderRow FromCsv(string csvLine, string refNumber)`
`48`	`48`	`{`
`49`	`49`	`string[] values = csvLine.Split('\t');`
`50`	`50`	`var row = new ReimbursementsOrderRow();`
`51`		`- row.ApprovalDate = DataConverter.GetDate(values[0], DataConverter.DateTimeFormate.DATETIME_K_FORMAT);`
	`51`	`+ row.ApprovalDate = DataConverter.GetDate(values[0], DataConverter.DateTimeFormat.DATETIME_K_FORMAT);`
`52`	`52`	`row.ReimbursementId = values[1];`
`53`	`53`	`row.CaseId = values[2];`
`54`	`54`	`row.AmazonOrderId = values[3];`
Original file line number	Diff line number	Diff line change
`@@ -198,7 +198,7 @@ private async Task<string> GetProductsAsync(AmazonConnection amazonConnection)`
`198`	`198`	`return await amazonConnection.Reports.CreateReportAndDownloadFileAsync(ReportTypes.GET_MERCHANT_LISTINGS_ALL_DATA);`
`199`	`199`	`}`
`200`	`200`	`#endregion`
`201`		`-`
	`201`	`+`
`202`	`202`	`#region Categories`
`203`	`203`
`204`	`204`	`public List<CategoriesRow> GetCategories()`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public class ReturnFBAOrderRow`
`43`	`43`	`public static ReturnFBAOrderRow FromRow(TableRow rowData, string refNumber)`
`44`	`44`	`{`
`45`	`45`	`var row = new ReturnFBAOrderRow();`
`46`		`- row.ReturnDate = DataConverter.GetDate(rowData.GetString("return-date"), DataConverter.DateTimeFormate.DATETIME_K_FORMAT);`
	`46`	`+ row.ReturnDate = DataConverter.GetDate(rowData.GetString("return-date"), DataConverter.DateTimeFormat.DATETIME_K_FORMAT);`
`47`	`47`	`row.OrderId = rowData.GetString("order-id");`
`48`	`48`	`row.SKU = rowData.GetString("sku");`
`49`	`49`	`row.ASIN = rowData.GetString("asin");`