Merge pull request #84 from anion0278/dev

Attempt to fix date parsing

Mapp.BusinessLogic.Invoices/Transactions/MarketPlaceTransactionsConfig.cs

@@ -42,14 +42,14 @@ public CultureInfo DateCultureInfo
             {
                 if (_dataCultureInfo == null)
                 {
-                    _dataCultureInfo = new CultureInfo(DateCultureInfoName);
+                    _dataCultureInfo = new CultureInfo(DateCultureInfoName, false);
                     if (_timeSeparatorOverride != null)
                     {
                         _dataCultureInfo.DateTimeFormat.TimeSeparator = _timeSeparatorOverride;
                     }
                     if (NumericFormatSourceCultureName != null)
                     {
-                        var numbericCultureInfo = new CultureInfo(NumericFormatSourceCultureName);
+                        var numbericCultureInfo = new CultureInfo(NumericFormatSourceCultureName, false);
                         _dataCultureInfo.NumberFormat = numbericCultureInfo.NumberFormat; 
                     }
                 }

Mapp.BusinessLogic.Invoices/Transactions/TransactionsReader.cs

@@ -83,6 +83,7 @@ private IReadOnlyList<string[]> GetFileLines(string fileName, string encodingCod
 
         private DateTime ParseDate(string dateString, MarketPlaceTransactionsConfig config)
         {
+            // TODO use CultureDependentValueParser
             var match = Regex.Match(dateString, config.DateSubstring);
             return DateTime.Parse(match.Groups[1].Value, config.DateCultureInfo);
         }

Mapp.BusinessLogic.Transactions.Tests/IntegrationTests.ConvertTransactions_ParsesAndConvertsTransactions_AmazonBE.verified.txt

@@ -1,5 +1,5 @@
 0740000002001353907Czech Goods s.r.o.  01111900000013280900+00000016514842+000000461730770000000494070190011300424FIO           
-0750000002001353908000000000000000000000000000000000000026992951669712700000000000000000000000000408-0091951-6697127000124050224
-07500000020013539080000000000000000000000000000000000001062710000000000000000000000000000000000000000000000000000000000124170224
-0750000002001353908000000000000000000000000000000000000026992290539393600000000000000000000000000408-2472290-5393936000124230224
-0750000002001353908000000000000000000000000000000000000062002070906676300000000000000000000000000405-7042070-9066763000124260224
+0750000002001353915000000000000000000000000000000000000026992951669712700000000000000000000000000408-0091951-6697127000124050224
+07500000020013539150000000000000000000000000000000000001062710000000000000000000000000000000000000000000000000000000000124170224
+0750000002001353915000000000000000000000000000000000000026992290539393600000000000000000000000000408-2472290-5393936000124230224
+0750000002001353915000000000000000000000000000000000000062002070906676300000000000000000000000000405-7042070-9066763000124260224

Mapp.BusinessLogic.Transactions.Tests/IntegrationTests.cs

@@ -73,6 +73,12 @@ public async Task ConvertTransactions_ParsesAndConvertsTransactions_AmazonFR()
             await IntegrationTestBase("AmazonFR");
         }
 
+        [Fact]
+        public async Task ConvertTransactions_ParsesAndConvertsTransactions_AmazonGB()
+        {
+            await IntegrationTestBase("AmazonGB");
+        }
+
         [Fact]
         public async Task ConvertTransactions_ParsesAndConvertsTransactions_AmazonIT()
         {
@@ -115,20 +121,12 @@ public async Task ConvertTransactions_ParsesAndConvertsTransactions_AmazonSG()
             await IntegrationTestBase("AmazonSG");
         }
 
-        [Fact]
-        public async Task ConvertTransactions_ParsesAndConvertsTransactions_AmazonUK()
-        {
-            await IntegrationTestBase("AmazonUK");
-        }
-
         [Fact]
         public async Task ConvertTransactions_ParsesAndConvertsTransactions_AmazonUS()
         {
             await IntegrationTestBase("AmazonUS");
         }
 
-
-
         [Fact]
         [Bug]
         public async Task ConvertTransactions_ParsesAndConvertsTransactions_ZerosBug()

Mapp.BusinessLogic.Transactions.Tests/TransactionsReaderTest.cs

@@ -1,4 +1,8 @@
-using Xunit;
+using System;
+using System.Diagnostics;
+using System.Globalization;
+using System.Threading;
+using Xunit;
 
 namespace Mapp.Business
 {
@@ -70,13 +74,16 @@ public void Read_Given_Returns()
         //}
 
         //[Fact]
-        //public void ParseFrDate()
+        //public void ParseMxDate()
         //{
-        //    var reader = new TransactionsReader(new JsonManager());
-
-        //    var result = reader.ParseDate("2 déc. 2019 08:04:58 UTC+00:00", @"(.*) UTC", new CultureInfo("fr-FR"));
-
-        //    Assert.Equal(new DateTime(2019, 12, 2, 8, 4, 58), result);
+        //    Thread.CurrentThread.CurrentCulture = CultureInfo.GetCultureInfo("");
+        //    //var result = DateTime.Parse("2 déc. 2019 08:04:58", new CultureInfo(""));
+        //    //var result2 = DateTime.Parse("12 févr. 2024 07:52:56", new CultureInfo("es-MX"));
+        //    //var result = DateTime.Parse("8 feb 2024 23:25:40 GMT-8", new CultureInfo(""));
+        //    var result2 = DateTime.Parse("8 feb 2024 23:25:40", new CultureInfo("es-MX"));
+
+        //    Debugger.Break();
+        //    //Assert.Equal(new DateTime(2019, 12, 2, 8, 4, 58), result);
         //}
 
         //[Fact]

Mapp.DataAccess/ICultureDependentValueParser.cs

@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Mapp.DataAccess
+{
+    public interface IValueParser
+    {
+        decimal ParseDecimal(string value);
+        DateTime ParseDateTime(string value);
+    }
+
+    public class CultureDependentValueParser : IValueParser
+    {
+        public CultureInfo CultureInfo { get; }
+
+        public CultureDependentValueParser(CultureInfo cultureInfo)
+        {
+            CultureInfo = cultureInfo;
+        }
+
+        public DateTime ParseDateTime(string value)
+        {
+            return DateTime.Parse(value, CultureInfo);
+        }
+
+        public decimal ParseDecimal(string value)
+        {
+            return decimal.Parse(value, CultureInfo);
+        }
+    }
+}

Mapp.UI/Mapp.UI.csproj

@@ -7,7 +7,7 @@
     <ApplicationIcon>Assets\icon.ico</ApplicationIcon>
     <Deterministic>false</Deterministic>
     <PackageId>Mapp</PackageId>
-    <AssemblyName>Mapp.UI</AssemblyName>
+    <AssemblyName>Mapp</AssemblyName>
     <NeutralLanguage>en</NeutralLanguage>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <ProduceReferenceAssembly>false</ProduceReferenceAssembly>

Mapp.UI/Transactions Configs/TransactionsConfigAmazonBE.json

@@ -1,6 +1,6 @@
 {
   "LinesToSkipBeforeColumnNames": 7,
-  "MarketPlaceId": 8,
+  "MarketPlaceId": 15,
   "DistinctionPhrases": [ "Tous les montants sont en EUR, sauf indication contraire" ],
   "DateSubstring": "(.*) (UTC|GMT).*",
   "TimeSeparatorOverride": null,

Mapp.UI/Views/MainWindow.xaml

@@ -15,7 +15,7 @@
 
                     lex:LocalizeDictionary.DesignCulture="en"
                     lex:LocalizeDictionary.OutputMissingKeys="True"
-                    lex:ResxLocalizationProvider.DefaultAssembly="Mapp.UI"
+                    lex:ResxLocalizationProvider.DefaultAssembly="Mapp"
                     lex:ResxLocalizationProvider.DefaultDictionary="LocalizationStrings">
 
     <b:Interaction.Behaviors>

Mapp.UI/Views/TransactionsConverterView.xaml

@@ -6,8 +6,6 @@
              xmlns:local="clr-namespace:Mapp.UI.Views"
              xmlns:lex="http://wpflocalizeextension.codeplex.com"
              mc:Ignorable="d" 
-             lex:ResxLocalizationProvider.DefaultAssembly="Mapp.UI"
-             lex:ResxLocalizationProvider.DefaultDictionary="LocalizationStrings"
              d:DesignHeight="450" d:DesignWidth="800">
     <Grid>
         <Grid.RowDefinitions>