Merge pull request #673 from kevinvenclovas/main

abuzuhri · web-flow · commit 375ab86f9e7b · 2023-10-13T08:34:17.000+03:00
diff --git a/Source/FikaAmazonAPI/AmazonConnection.cs b/Source/FikaAmazonAPI/AmazonConnection.cs
@@ -2,6 +2,8 @@
 using FikaAmazonAPI.Services;
 using FikaAmazonAPI.Utils;
 using System;
+using System.Globalization;
+using System.Threading;
 
 namespace FikaAmazonAPI
 {
@@ -84,10 +86,11 @@ public class AmazonConnection
         private UnauthorizedAccessException _NoCredentials = new UnauthorizedAccessException($"Error, you cannot make calls to Amazon without credentials!");
 
         public string RefNumber { get; set; }
-        public AmazonConnection(AmazonCredential Credentials, string RefNumber = null)
+        public AmazonConnection(AmazonCredential Credentials, string RefNumber = null, CultureInfo? cultureInfo = null)
         {
             this.Authenticate(Credentials);
             this.RefNumber = RefNumber;
+            Thread.CurrentThread.CurrentCulture = cultureInfo ?? CultureInfo.InvariantCulture;
         }
 
         private void Authenticate(AmazonCredential Credentials)
diff --git a/Source/FikaAmazonAPI/ReportGeneration/DataConverter.cs b/Source/FikaAmazonAPI/ReportGeneration/DataConverter.cs
@@ -16,10 +16,13 @@ public static class DateTimeFormat
             public const string DATE_AGING_FORMAT = "yyyy-MM-dd";
             public const string DATE_LEDGER_FORMAT = "MM/dd/yyyy";
         }
+
+        public static CultureInfo DataConverterCultureInfo = CultureInfo.CurrentCulture;
+
         public static DateTime? GetDate(string str, string format)
         {
             if (DateTime.TryParseExact(str, format,
-                           System.Globalization.CultureInfo.InvariantCulture,
+                           DataConverterCultureInfo,
                            System.Globalization.DateTimeStyles.None,
                            out DateTime value))
             {
@@ -29,23 +32,23 @@ public static class DateTimeFormat
         }
         public static decimal? GetDecimal(string str)
         {
-            if (decimal.TryParse(str, NumberStyles.Any, CultureInfo.InvariantCulture, out decimal value))
+            if (decimal.TryParse(str, NumberStyles.Any, DataConverterCultureInfo, out decimal value))
             {
                 return value;
             }
             return null;
         }
         public static int? GetInt(string str)
         {
-            if (int.TryParse(str, NumberStyles.Integer, CultureInfo.InvariantCulture, out int value))
+            if (int.TryParse(str, NumberStyles.Integer, DataConverterCultureInfo, out int value))
             {
                 return value;
             }
             return null;
         }
         public static double? GetDouble(string str)
         {
-            if (double.TryParse(str, NumberStyles.Any, CultureInfo.InvariantCulture, out double value))
+            if (double.TryParse(str, NumberStyles.Any, DataConverterCultureInfo, out double value))
             {
                 return value;
             }
diff --git a/Source/FikaAmazonAPI/ReportGeneration/SettlementOrderReport.cs b/Source/FikaAmazonAPI/ReportGeneration/SettlementOrderReport.cs
@@ -1,4 +1,7 @@
-﻿using System;
+﻿using FikaAmazonAPI.AmazonSpApiSDK.Models.Finances;
+using FikaAmazonAPI.Utils;
+using Newtonsoft.Json.Linq;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -53,34 +56,33 @@ 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.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];
-            row.OrderId = values[7];
-            row.MerchantOrderId = values[8];
-            row.AdjustmentId = values[9];
-            row.ShipmentId = values[10];
-            row.MarketplaceName = values[11];
-            row.AmountType = values[12];
-            row.AmountDescription = values[13];
-            row.Amount = DataConverter.GetDecimal(values[14]);
-            row.FulfillmentId = values[15];
-            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];
-            row.SKU = values[21];
+            row.SettlementId = values.GetElementAtIndexOrDefault(0);
+            row.SettlementStartDate = DataConverter.GetDate(values.GetElementAtIndexOrDefault(1), DataConverter.DateTimeFormat.DATETIME_FORMAT_UTC_DOT);
+            row.SettlementEndDate = DataConverter.GetDate(values.GetElementAtIndexOrDefault(2), DataConverter.DateTimeFormat.DATETIME_FORMAT_UTC_DOT);
+            row.DepositDate = DataConverter.GetDate(values.GetElementAtIndexOrDefault(3), DataConverter.DateTimeFormat.DATETIME_FORMAT_UTC_DOT);
+            row.TotalAmount = DataConverter.GetDecimal(values.GetElementAtIndexOrDefault(4));
+            row.Currency = values.GetElementAtIndexOrDefault(5);
+            row.TransactionType = values.GetElementAtIndexOrDefault(6);
+            row.OrderId = values.GetElementAtIndexOrDefault(7);
+            row.MerchantOrderId = values.GetElementAtIndexOrDefault(8);
+            row.AdjustmentId = values.GetElementAtIndexOrDefault(9);
+            row.ShipmentId = values.GetElementAtIndexOrDefault(10);
+            row.MarketplaceName = values.GetElementAtIndexOrDefault(11);
+            row.AmountType = values.GetElementAtIndexOrDefault(12);
+            row.AmountDescription = values.GetElementAtIndexOrDefault(13);
+            row.Amount = DataConverter.GetDecimal(values.GetElementAtIndexOrDefault(14));
+            row.FulfillmentId = values.GetElementAtIndexOrDefault(15);
+            row.PostedDate = DataConverter.GetDate(values.GetElementAtIndexOrDefault(16), DataConverter.DateTimeFormat.DATE_FORMAT_DOT);
+            row.PostedDateTime = DataConverter.GetDate(values.GetElementAtIndexOrDefault(17), DataConverter.DateTimeFormat.DATETIME_FORMAT_UTC_DOT);
+            row.OrderItemCode = values.GetElementAtIndexOrDefault(18);
+            row.MerchantOrderItemId = values.GetElementAtIndexOrDefault(19);
+            row.MerchantAdjustmentItemId = values.GetElementAtIndexOrDefault(20);
+            row.SKU = values.GetElementAtIndexOrDefault(21);
             row.QuantityPurchased = DataConverter.GetInt(values[22]);
-            row.PromotionId = values[23];
+            row.PromotionId = values.GetElementAtIndexOrDefault(23);
 
             row.refNumber = refNumber;
 
-
             return row;
         }
     }
diff --git a/Source/FikaAmazonAPI/Utils/Listing.cs b/Source/FikaAmazonAPI/Utils/Listing.cs
@@ -1,5 +1,7 @@
-﻿using System.Collections.Generic;
+﻿using System;
+using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 
 namespace FikaAmazonAPI.Utils
 {
@@ -18,5 +20,17 @@ public static IList<IList<T>> Slice<T>(IList<T> list, int number)
             }
             return objListList;
         }
+
+        public static string GetElementAtIndexOrDefault(this object[] array, int index)
+        {
+            if (index >= 0 && index < array.Length)
+            {
+                return array[index].ToString();
+            }
+            else
+            {
+                return null;
+            }
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,8 @@`
`2`	`2`	`using FikaAmazonAPI.Services;`
`3`	`3`	`using FikaAmazonAPI.Utils;`
`4`	`4`	`using System;`
	`5`	`+using System.Globalization;`
	`6`	`+using System.Threading;`
`5`	`7`
`6`	`8`	`namespace FikaAmazonAPI`
`7`	`9`	`{`
`@@ -84,10 +86,11 @@ public class AmazonConnection`
`84`	`86`	`private UnauthorizedAccessException _NoCredentials = new UnauthorizedAccessException($"Error, you cannot make calls to Amazon without credentials!");`
`85`	`87`
`86`	`88`	`public string RefNumber { get; set; }`
`87`		`- public AmazonConnection(AmazonCredential Credentials, string RefNumber = null)`
	`89`	`+ public AmazonConnection(AmazonCredential Credentials, string RefNumber = null, CultureInfo? cultureInfo = null)`
`88`	`90`	`{`
`89`	`91`	`this.Authenticate(Credentials);`
`90`	`92`	`this.RefNumber = RefNumber;`
	`93`	`+ Thread.CurrentThread.CurrentCulture = cultureInfo ?? CultureInfo.InvariantCulture;`
`91`	`94`	`}`
`92`	`95`
`93`	`96`	`private void Authenticate(AmazonCredential Credentials)`
Original file line number	Diff line number	Diff line change
`@@ -16,10 +16,13 @@ public static class DateTimeFormat`
`16`	`16`	`public const string DATE_AGING_FORMAT = "yyyy-MM-dd";`
`17`	`17`	`public const string DATE_LEDGER_FORMAT = "MM/dd/yyyy";`
`18`	`18`	`}`
	`19`	`+`
	`20`	`+ public static CultureInfo DataConverterCultureInfo = CultureInfo.CurrentCulture;`
	`21`	`+`
`19`	`22`	`public static DateTime? GetDate(string str, string format)`
`20`	`23`	`{`
`21`	`24`	`if (DateTime.TryParseExact(str, format,`
`22`		`- System.Globalization.CultureInfo.InvariantCulture,`
	`25`	`+ DataConverterCultureInfo,`
`23`	`26`	`System.Globalization.DateTimeStyles.None,`
`24`	`27`	`out DateTime value))`
`25`	`28`	`{`
`@@ -29,23 +32,23 @@ public static class DateTimeFormat`
`29`	`32`	`}`
`30`	`33`	`public static decimal? GetDecimal(string str)`
`31`	`34`	`{`
`32`		`- if (decimal.TryParse(str, NumberStyles.Any, CultureInfo.InvariantCulture, out decimal value))`
	`35`	`+ if (decimal.TryParse(str, NumberStyles.Any, DataConverterCultureInfo, out decimal value))`
`33`	`36`	`{`
`34`	`37`	`return value;`
`35`	`38`	`}`
`36`	`39`	`return null;`
`37`	`40`	`}`
`38`	`41`	`public static int? GetInt(string str)`
`39`	`42`	`{`
`40`		`- if (int.TryParse(str, NumberStyles.Integer, CultureInfo.InvariantCulture, out int value))`
	`43`	`+ if (int.TryParse(str, NumberStyles.Integer, DataConverterCultureInfo, out int value))`
`41`	`44`	`{`
`42`	`45`	`return value;`
`43`	`46`	`}`
`44`	`47`	`return null;`
`45`	`48`	`}`
`46`	`49`	`public static double? GetDouble(string str)`
`47`	`50`	`{`
`48`		`- if (double.TryParse(str, NumberStyles.Any, CultureInfo.InvariantCulture, out double value))`
	`51`	`+ if (double.TryParse(str, NumberStyles.Any, DataConverterCultureInfo, out double value))`
`49`	`52`	`{`
`50`	`53`	`return value;`
`51`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`		`-using System.Collections.Generic;`
	`1`	`+using System;`
	`2`	`+using System.Collections.Generic;`
`2`	`3`	`using System.Linq;`
	`4`	`+using System.Reflection;`
`3`	`5`
`4`	`6`	`namespace FikaAmazonAPI.Utils`
`5`	`7`	`{`
`@@ -18,5 +20,17 @@ public static IList<IList<T>> Slice<T>(IList<T> list, int number)`
`18`	`20`	`}`
`19`	`21`	`return objListList;`
`20`	`22`	`}`
	`23`	`+`
	`24`	`+ public static string GetElementAtIndexOrDefault(this object[] array, int index)`
	`25`	`+ {`
	`26`	`+ if (index >= 0 && index < array.Length)`
	`27`	`+ {`
	`28`	`+ return array[index].ToString();`
	`29`	`+ }`
	`30`	`+ else`
	`31`	`+ {`
	`32`	`+ return null;`
	`33`	`+ }`
	`34`	`+ }`
`21`	`35`	`}`
`22`	`36`	`}`