Jobs/ZUGFeRD: Remove Firebird Database

Jobs/ZUGFeRD/EmailFunctions.vb

@@ -9,61 +9,60 @@ Public Class EmailFunctions
     Private ReadOnly _logConfig As LogConfig
     Private ReadOnly _logger As Logger
     Private ReadOnly _mssql As MSSQLServer
-    Private ReadOnly _firebird As Firebird
 
-    Public Sub New(LogConfig As LogConfig, MSSQL As MSSQLServer, Firebird As Firebird)
+    Public Sub New(LogConfig As LogConfig, MSSQL As MSSQLServer)
         _logConfig = LogConfig
         _logger = _logConfig.GetLogger()
         _mssql = MSSQL
-        _firebird = Firebird
     End Sub
 
-    Public Sub AddToEmailQueueFB(MessageId As String, BodyText As String, EmailData As EmailData, NamePortal As String)
-        If EmailData Is Nothing Then
-            _logger.Warn("EmailData is empty. Email will not be sent!")
-            Exit Sub
-        End If
+    'Public Sub AddToEmailQueueFB(MessageId As String, BodyText As String, EmailData As EmailData, NamePortal As String)
+    '    If EmailData Is Nothing Then
+    '        _logger.Warn("EmailData is empty. Email will not be sent!")
+    '        Exit Sub
+    '    End If
 
-        Try
-            Dim oJobId = RandomValue(1, 10000)
-            Dim oReference = MessageId
-            Dim oEmailTo = ""
-            Dim oSubject = EmailStrings.EMAIL_SUBJECT_REJECTED.Replace(EmailStrings.constNAME_ZUGFERD_PORTAL, NamePortal)
-            Dim oAccountId = 1
-            Dim oCreatedWho = "ZUGFeRD Service"
-            Dim oFinalBodyText = String.Format(EmailStrings.EMAIL_WRAPPING_TEXT.Replace(EmailStrings.constNAME_ZUGFERD_PORTAL, NamePortal), BodyText)
+    '    Try
+    '        Dim oJobId = RandomValue(1, 10000)
+    '        Dim oReference = MessageId
+    '        Dim oEmailTo = ""
+    '        Dim oSubject = EmailStrings.EMAIL_SUBJECT_REJECTED.Replace(EmailStrings.constNAME_ZUGFERD_PORTAL, NamePortal)
+    '        Dim oAccountId = 1
+    '        Dim oCreatedWho = "ZUGFeRD Service"
+    '        Dim oFinalBodyText = String.Format(EmailStrings.EMAIL_WRAPPING_TEXT.Replace(EmailStrings.constNAME_ZUGFERD_PORTAL, NamePortal), BodyText)
 
-            Dim oEmailAddress = EmailData.From
-            Dim oAttachment = EmailData.Attachment
+    '        Dim oEmailAddress = EmailData.From
+    '        Dim oAttachment = EmailData.Attachment
 
-            If IsNothing(oEmailAddress) OrElse String.IsNullOrWhiteSpace(oEmailAddress) Then
-                _logger.Warn("Could not find email-address for MessageId {0}", MessageId)
-                oEmailTo = String.Empty
-            Else
-                oEmailTo = oEmailAddress
-            End If
+    '        If IsNothing(oEmailAddress) OrElse String.IsNullOrWhiteSpace(oEmailAddress) Then
+    '            _logger.Warn("Could not find email-address for MessageId {0}", MessageId)
+    '            oEmailTo = String.Empty
+    '        Else
+    '            oEmailTo = oEmailAddress
+    '        End If
 
-            _logger.Debug("Generated Email:")
-            _logger.Debug("To: {0}", oEmailTo)
-            _logger.Debug("Subject: {0}", oSubject)
-            _logger.Debug("Body {0}", oFinalBodyText)
-            Dim osql = $"select * from TBEDM_EMAIL_QUEUE where REFERENCE1 = '{oReference} and EMAIL_TO = ''{oEmailTo}' and EMAIL_SUBJ = '{oSubject}'"
+    '        _logger.Debug("Generated Email:")
+    '        _logger.Debug("To: {0}", oEmailTo)
+    '        _logger.Debug("Subject: {0}", oSubject)
+    '        _logger.Debug("Body {0}", oFinalBodyText)
+    '        Dim osql = $"select * from TBEDM_EMAIL_QUEUE where REFERENCE1 = '{oReference} and EMAIL_TO = ''{oEmailTo}' and EMAIL_SUBJ = '{oSubject}'"
 
-            Dim oDTResult As DataTable = _firebird.GetDatatable(osql)
+    '        Dim oDTResult As DataTable = _firebird.GetDatatable(osql)
+
+    '        If oDTResult.Rows.Count = 0 Then
+    '            Dim oSQLInsert = $"INSERT INTO TBEDM_EMAIL_QUEUE "
+    '            oSQLInsert &= "(JOB_ID, REFERENCE1, EMAIL_ACCOUNT_ID, EMAIL_TO, EMAIL_SUBJ, EMAIL_BODY, CREATEDWHO, EMAIL_ATTMT1) VALUES "
+    '            oSQLInsert &= $"({oJobId}, '{oReference}', {oAccountId}, '{oEmailTo}', '{oSubject}', '{oFinalBodyText.Replace("'", "''")}', '{oCreatedWho}', '{oAttachment}')"
+    '            _firebird.ExecuteNonQuery(oSQLInsert)
+    '            _logger.Debug("Email Queue updated for MessageId {0}.", MessageId, oEmailTo)
+    '        Else
+    '            _logger.Debug("Email has already been sent!!")
+    '        End If
+    '    Catch ex As Exception
+    '        _logger.Error(ex)
+    '    End Try
+    'End Sub
 
-            If oDTResult.Rows.Count = 0 Then
-                Dim oSQLInsert = $"INSERT INTO TBEDM_EMAIL_QUEUE "
-                oSQLInsert &= "(JOB_ID, REFERENCE1, EMAIL_ACCOUNT_ID, EMAIL_TO, EMAIL_SUBJ, EMAIL_BODY, CREATEDWHO, EMAIL_ATTMT1) VALUES "
-                oSQLInsert &= $"({oJobId}, '{oReference}', {oAccountId}, '{oEmailTo}', '{oSubject}', '{oFinalBodyText.Replace("'", "''")}', '{oCreatedWho}', '{oAttachment}')"
-                _firebird.ExecuteNonQuery(oSQLInsert)
-                _logger.Debug("Email Queue updated for MessageId {0}.", MessageId, oEmailTo)
-            Else
-                _logger.Debug("Email has already been sent!!")
-            End If
-        Catch ex As Exception
-            _logger.Error(ex)
-        End Try
-    End Sub
     Public Sub AddToEmailQueueMSSQL(MessageId As String, BodyText As String, pEmailData As EmailData, SourceProcedure As String, pEmailAccountId As Integer, NamePortal As String)
         If pEmailData Is Nothing Then
             _logger.Warn("EmailData is empty. Email will not be sent!")
@@ -107,13 +106,9 @@ Public Class EmailFunctions
             Dim osql = $"Select MAX(GUID) FROM TBEMLP_HISTORY WHERE EMAIL_MSGID = '{MessageId}'"
             Dim oHistoryID = _mssql.GetScalarValue(osql)
 
-            'osql = $"select * from TBEMLP_EMAIL_OUT where REFERENCE_ID = {oHistoryID} and EMAIL_ADRESS = '{oEmailTo}' and EMAIL_SUBJ = '{oSubject}'"
-
-            'Dim oDTResult As DataTable = _mssql.GetDatatable(osql)
-
             If IsNumeric(oHistoryID) Then
-                Dim oInsert = $"INSERT INTO [dbo].[TBEMLP_EMAIL_OUT] (
-                        [REMINDER_TYPE_ID]
+                Dim oInsert = $"INSERT INTO [dbo].[TBEMLP_EMAIL_OUT] 
+                       ([REMINDER_TYPE_ID]
                        ,[SENDING_PROFILE]
                        ,[REFERENCE_ID]
                        ,[REFERENCE_STRING]
@@ -138,11 +133,7 @@ Public Class EmailFunctions
                        ,'{oAttachmentPathEscaped}')"
                 _mssql.ExecuteNonQuery(oInsert)
             Else
-                'If oDTResult.Rows.Count = 0 Then
-                '    _logger.Debug("Email has already been sent!!")
-                'Else
                 _logger.Warn("Could not get oHistoryID in AddToEmailQueueMSSQL!!")
-                ' End If
             End If
         Catch ex As Exception
             _logger.Error(ex)
@@ -150,9 +141,9 @@ Public Class EmailFunctions
     End Sub
 
     Public Function GetEmailDataForMessageId(MessageId As String) As EmailData
-        Dim oSQL = $"SELECT EMAIL_FROM, EMAIL_SUBJECT, EMAIL_ATTMT1 FROM TBEDM_EMAIL_PROFILER_HISTORY WHERE EMAIL_MSGID = '{MessageId}'"
+        Dim oSQL = $"SELECT EMAIL_FROM, EMAIL_SUBJECT, EMAIL_ATTMT1 FROM TBEMLP_HISTORY WHERE EMAIL_MSGID = '{MessageId}'"
         Try
-            Dim oDatatable = _firebird.GetDatatable(oSQL)
+            Dim oDatatable = _mssql.GetDatatable(oSQL)
             Dim oRow As DataRow
 
             If oDatatable.Rows.Count = 0 Then
@@ -186,9 +177,8 @@ Public Class EmailFunctions
     End Function
 
     Public Function GetOriginalEmailPath(OriginalEmailDirectory As String, MessageId As String) As String
-        Dim oAttachmentDirectory = OriginalEmailDirectory
         Dim oAttachmentFile = MessageId & ".eml"
-        Dim oAttachmentPath = Path.Combine(oAttachmentDirectory, oAttachmentFile)
+        Dim oAttachmentPath = Path.Combine(OriginalEmailDirectory, oAttachmentFile)
 
         If File.Exists(oAttachmentPath) Then
             Return oAttachmentPath