From 0ec5829275c42be3c0fc749b2155c68b8d8c8e6d Mon Sep 17 00:00:00 2001
From: Jonathan Jenne <j.jenne@didalog.de>
Date: Wed, 18 Sep 2019 15:40:18 +0200
Subject: [PATCH] ZUGFeRD Job: add versioning of moved files

---
 DDZUGFeRDService/App.config              | 11 +++++--
 DDZUGFeRDService/DDZUGFeRDService.vbproj |  3 ++
 DDZUGFeRDService/packages.config         |  1 +
 Filesystem/File.vb                       |  5 +++
 GUIs.Test.ZUGFeRDTest/App.config         |  7 +++-
 GUIs.Test.ZUGFeRDTest/ZUGFeRDTest.vbproj |  3 ++
 GUIs.Test.ZUGFeRDTest/packages.config    |  1 +
 Jobs/EDMI/ZUGFeRD/ImportZUGFeRDFiles.vb  | 41 ++++++++++++++++++------
 8 files changed, 59 insertions(+), 13 deletions(-)

diff --git a/DDZUGFeRDService/App.config b/DDZUGFeRDService/App.config
index c60c3482..e496d645 100644
--- a/DDZUGFeRDService/App.config
+++ b/DDZUGFeRDService/App.config
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <configSections>
-        <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
+        <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
             <section name="DDZUGFeRDService.My.MySettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
         </sectionGroup>
     </configSections>
@@ -39,4 +39,9 @@
             </setting>
         </DDZUGFeRDService.My.MySettings>
     </applicationSettings>
-</configuration>
\ No newline at end of file
+<system.data>
+		<DbProviderFactories>
+			<remove invariant="FirebirdSql.Data.FirebirdClient" />
+			<add name="FirebirdClient Data Provider" invariant="FirebirdSql.Data.FirebirdClient" description=".NET Framework Data Provider for Firebird" type="FirebirdSql.Data.FirebirdClient.FirebirdClientFactory, FirebirdSql.Data.FirebirdClient" />
+		</DbProviderFactories>
+	</system.data></configuration>
\ No newline at end of file
diff --git a/DDZUGFeRDService/DDZUGFeRDService.vbproj b/DDZUGFeRDService/DDZUGFeRDService.vbproj
index 7f98a253..7aea1100 100644
--- a/DDZUGFeRDService/DDZUGFeRDService.vbproj
+++ b/DDZUGFeRDService/DDZUGFeRDService.vbproj
@@ -47,6 +47,9 @@
     <OptionInfer>On</OptionInfer>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="FirebirdSql.Data.FirebirdClient, Version=6.4.0.0, Culture=neutral, PublicKeyToken=3750abcc3150b00c, processorArchitecture=MSIL">
+      <HintPath>..\packages\FirebirdSql.Data.FirebirdClient.6.4.0\lib\net452\FirebirdSql.Data.FirebirdClient.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
       <HintPath>..\packages\NLog.4.6.7\lib\net45\NLog.dll</HintPath>
diff --git a/DDZUGFeRDService/packages.config b/DDZUGFeRDService/packages.config
index 99e34262..7a05eafe 100644
--- a/DDZUGFeRDService/packages.config
+++ b/DDZUGFeRDService/packages.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="FirebirdSql.Data.FirebirdClient" version="6.4.0" targetFramework="net461" />
   <package id="NLog" version="4.6.7" targetFramework="net461" />
 </packages>
\ No newline at end of file
diff --git a/Filesystem/File.vb b/Filesystem/File.vb
index 94a446a1..2f4365a6 100644
--- a/Filesystem/File.vb
+++ b/Filesystem/File.vb
@@ -96,6 +96,11 @@ Public Class File
         IO.File.Move(FilePath, Path.Combine(Directory, oFileInfo.Name))
     End Sub
 
+    Public Sub MoveTo(FilePath As String, NewFileName As String, Directory As String)
+        Dim oFileInfo As New FileInfo(FilePath)
+        IO.File.Move(FilePath, Path.Combine(Directory, NewFileName))
+    End Sub
+
     ''' <summary>
     ''' Tries to create a directory and returns its path.
     ''' Returns a temp path if `DirectoryPath` can not be created or written to.
diff --git a/GUIs.Test.ZUGFeRDTest/App.config b/GUIs.Test.ZUGFeRDTest/App.config
index 8e3a399c..ee850a55 100644
--- a/GUIs.Test.ZUGFeRDTest/App.config
+++ b/GUIs.Test.ZUGFeRDTest/App.config
@@ -102,4 +102,9 @@
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
\ No newline at end of file
+<system.data>
+		<DbProviderFactories>
+			<remove invariant="FirebirdSql.Data.FirebirdClient" />
+			<add name="FirebirdClient Data Provider" invariant="FirebirdSql.Data.FirebirdClient" description=".NET Framework Data Provider for Firebird" type="FirebirdSql.Data.FirebirdClient.FirebirdClientFactory, FirebirdSql.Data.FirebirdClient" />
+		</DbProviderFactories>
+	</system.data></configuration>
\ No newline at end of file
diff --git a/GUIs.Test.ZUGFeRDTest/ZUGFeRDTest.vbproj b/GUIs.Test.ZUGFeRDTest/ZUGFeRDTest.vbproj
index c1d84664..4fe0733a 100644
--- a/GUIs.Test.ZUGFeRDTest/ZUGFeRDTest.vbproj
+++ b/GUIs.Test.ZUGFeRDTest/ZUGFeRDTest.vbproj
@@ -47,6 +47,9 @@
     <OptionInfer>On</OptionInfer>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="FirebirdSql.Data.FirebirdClient, Version=6.4.0.0, Culture=neutral, PublicKeyToken=3750abcc3150b00c, processorArchitecture=MSIL">
+      <HintPath>..\packages\FirebirdSql.Data.FirebirdClient.6.4.0\lib\net452\FirebirdSql.Data.FirebirdClient.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
       <HintPath>..\packages\NLog.4.5.11\lib\net45\NLog.dll</HintPath>
diff --git a/GUIs.Test.ZUGFeRDTest/packages.config b/GUIs.Test.ZUGFeRDTest/packages.config
index f89fa324..9204b8da 100644
--- a/GUIs.Test.ZUGFeRDTest/packages.config
+++ b/GUIs.Test.ZUGFeRDTest/packages.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="FirebirdSql.Data.FirebirdClient" version="6.4.0" targetFramework="net461" />
   <package id="NLog" version="4.5.11" targetFramework="net461" />
 </packages>
\ No newline at end of file
diff --git a/Jobs/EDMI/ZUGFeRD/ImportZUGFeRDFiles.vb b/Jobs/EDMI/ZUGFeRD/ImportZUGFeRDFiles.vb
index 07a9af46..15daad38 100644
--- a/Jobs/EDMI/ZUGFeRD/ImportZUGFeRDFiles.vb
+++ b/Jobs/EDMI/ZUGFeRD/ImportZUGFeRDFiles.vb
@@ -567,19 +567,42 @@ Public Class ImportZUGFeRDFiles
 
     Private Sub MoveFiles(Args As WorkerArgs, Files As List(Of FileInfo), AttachmentFiles As List(Of FileInfo), MoveDirectory As String)
         For Each oFile In Files
-            Dim oFinalMoveDirectory As String = MoveDirectory
+            Try
+                Dim oFinalMoveDirectory As String = MoveDirectory
 
-            If AttachmentFiles.Contains(oFile) Then
-                oFinalMoveDirectory = Path.Combine(MoveDirectory, Args.AttachmentsSubDirectory)
+                If AttachmentFiles.Contains(oFile) Then
+                    oFinalMoveDirectory = Path.Combine(MoveDirectory, Args.AttachmentsSubDirectory)
 
-                If Not Directory.Exists(oFinalMoveDirectory) Then
-                    Directory.CreateDirectory(oFinalMoveDirectory)
+                    If Not Directory.Exists(oFinalMoveDirectory) Then
+                        Directory.CreateDirectory(oFinalMoveDirectory)
+                    End If
                 End If
-            End If
 
-            _filesystem.MoveTo(oFile.FullName, oFinalMoveDirectory)
-            _logger.Info("Finished processing file {0}", oFile.Name)
-            _logger.Info("File moved to {0}", oFinalMoveDirectory)
+                Dim oVersion As Integer = 0
+                Dim oFileName As String = Path.Combine(oFinalMoveDirectory, oFile.Name)
+
+                Do While File.Exists(oFileName)
+                    If oVersion > 29 Then
+                        Throw New ApplicationException("Max. Move-Retries of 30 exceeded! Move will be aborted!")
+                    End If
+
+                    oVersion += 1
+
+                    Dim oExtension = Path.GetExtension(oFileName)
+                    Dim oRootName = Path.GetFileNameWithoutExtension(oFile.Name)
+                    Dim oNewName As String = oRootName & "~" & oVersion & oExtension
+                    oFileName = Path.Combine(oFinalMoveDirectory, oNewName)
+                Loop
+
+                _filesystem.MoveTo(oFile.FullName, oFileName, oFinalMoveDirectory)
+
+                _logger.Info("Finished processing file {0}", oFile.Name)
+                _logger.Info("File moved to {0}", oFileName)
+
+            Catch ex As Exception
+                _logger.Warn("Could not move file {0}", oFile.FullName)
+                _logger.Error(ex)
+            End Try
         Next
     End Sub