From 39492f617adee564e46d7a0c152aca8de3f797d7 Mon Sep 17 00:00:00 2001
From: pitzm <m.pitz@digitaldata.works>
Date: Wed, 24 Jul 2024 14:03:03 +0200
Subject: [PATCH] EMailService: Fehlerhandling

---
 Services.EmailService/EmailService.vb          | 18 ++++++++----------
 .../My Project/AssemblyInfo.vb                 |  4 ++--
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/Services.EmailService/EmailService.vb b/Services.EmailService/EmailService.vb
index b90d0d17..d839b7df 100644
--- a/Services.EmailService/EmailService.vb
+++ b/Services.EmailService/EmailService.vb
@@ -26,8 +26,6 @@ Public Class EmailService
     Private _MailSender As Mail.MailSender
     Private _AttachmentByteData As Byte()
     Private _RecentAttachmentByteData As Byte()
-    Private ReadOnly _messageSend As Boolean = False
-
 
     Private Enum DatabaseType
         Firebird
@@ -453,7 +451,7 @@ Public Class EmailService
                         Dim oMessageSent = _MailSender.SendMail(oAddresses, oAccount.Sender, oSubject, oBody, oAddedWhen, oAttachments, False)
 
 
-                        If oMessageSent Then
+                        If oMessageSent = True Then
                             oTotalSent.Add(oEmailTo)
                             oSuccessfulSent.Add(oEmailTo)
 
@@ -473,14 +471,14 @@ Public Class EmailService
 
                             Select Case Database
                                 Case DatabaseType.MSSQL
-                                    oSQL = $"UPDATE TBEMLP_EMAIL_OUT SET ERROR_TIMESTAMP = GETDATE(),ERROR_MSG = '{_limilab.ErrorMessage}' WHERE GUID = {oGuid} "
-                                    MSSQLInstance.ExecuteNonQuery(oSQL)
-
-                                    If _messageSend = True Then
-                                        oSQL = GetSQLUpdateString(oComment, oGuid)
-                                        MSSQLInstance.ExecuteNonQuery(oSQL)
-                                        _Logger.Info($"EmailID [{oGuid.ToString}] has been send to: {oEmailTo} - although there was an error in connection close!")
+                                    Dim oErrorMessage As String
+                                    If String.IsNullOrEmpty(_limilab.ErrorMessage) = False Then
+                                        oErrorMessage = _limilab.ErrorMessage
+                                    Else
+                                        oErrorMessage = $"Could not sent email to email adress. Check log!"
                                     End If
+                                    oSQL = $"UPDATE TBEMLP_EMAIL_OUT SET EMAIL_SENT = GETDATE(), ERROR_TIMESTAMP = GETDATE(), ERROR_MSG = '{oErrorMessage}' WHERE GUID = {oGuid} "
+                                    MSSQLInstance.ExecuteNonQuery(oSQL)
 
                             End Select
                         End If
diff --git a/Services.EmailService/My Project/AssemblyInfo.vb b/Services.EmailService/My Project/AssemblyInfo.vb
index 3bc58929..09977d54 100644
--- a/Services.EmailService/My Project/AssemblyInfo.vb	
+++ b/Services.EmailService/My Project/AssemblyInfo.vb	
@@ -13,7 +13,7 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyCompany("")>
 <Assembly: AssemblyProduct("DDEmailService")>
 <Assembly: AssemblyCopyright("Copyright © 2024")>
-<Assembly: AssemblyTrademark("1.7.2.0")>
+<Assembly: AssemblyTrademark("1.7.3.0")>
 
 <Assembly: ComVisible(False)>
 
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("1.7.2.0")>
+<Assembly: AssemblyVersion("1.7.3.0")>
 <Assembly: AssemblyFileVersion("1.0.0.0")>