From f1920e16fa690bdbec4675d101d7064b3cdf8f00 Mon Sep 17 00:00:00 2001 From: Developer01 Date: Tue, 27 May 2025 14:04:45 +0200 Subject: [PATCH 1/3] MS Job --- .../FinalizeDocument/FinalizeDocumentJob.vb | 3 ++ EnvelopeGenerator.Form/frmMain.vb | 53 +++++++++++-------- .../Scheduler_FinishEnvelope.vb | 2 +- EnvelopeGenerator.Service/Service.vb | 2 +- 4 files changed, 36 insertions(+), 24 deletions(-) diff --git a/EnvelopeGenerator.Common/Jobs/FinalizeDocument/FinalizeDocumentJob.vb b/EnvelopeGenerator.Common/Jobs/FinalizeDocument/FinalizeDocumentJob.vb index 5ad56183..7f936016 100644 --- a/EnvelopeGenerator.Common/Jobs/FinalizeDocument/FinalizeDocumentJob.vb +++ b/EnvelopeGenerator.Common/Jobs/FinalizeDocument/FinalizeDocumentJob.vb @@ -142,7 +142,9 @@ Namespace Jobs Logger.Debug("Documents merged!") Dim oOutputDirectoryPath = Path.Combine(Config.ExportPath, ParentFolderUID) + Logger.Debug($"oOutputDirectoryPath is {oOutputDirectoryPath}") If Not Directory.Exists(oOutputDirectoryPath) Then + Logger.Debug($"Directory not existing. Creating ... ") Directory.CreateDirectory(oOutputDirectoryPath) End If Dim oOutputFilePath = Path.Combine(oOutputDirectoryPath, $"{oEnvelope.Uuid}.pdf") @@ -171,6 +173,7 @@ Namespace Jobs Throw New ApplicationException("Envelope could not be finalized") End If Catch ex As Exception + Logger.Error(ex) Logger.Warn(ex, $"Unhandled exception while working envelope [{oId}]") End Try diff --git a/EnvelopeGenerator.Form/frmMain.vb b/EnvelopeGenerator.Form/frmMain.vb index cb6e755b..0ba66887 100644 --- a/EnvelopeGenerator.Form/frmMain.vb +++ b/EnvelopeGenerator.Form/frmMain.vb @@ -597,31 +597,40 @@ Public Class frmMain End Sub Private Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles bbtnitm_ResendInvitation.ItemClick - Dim oView As GridView = GridEnvelopes.FocusedView - Dim selReceiver As EnvelopeReceiver - If oView.Name = ViewReceivers.Name Then - selReceiver = oView.GetRow(oView.FocusedRowHandle) - Else - MsgBox(Resources.Envelope.Please_select_a_recipient_from_the_Recipients_tab, MsgBoxStyle.Information, Text) - End If - If ViewEnvelopes.FocusedRowHandle < 0 Or IsNothing(selReceiver) Then - Exit Sub - End If - Dim oEnvelope As Envelope = ViewEnvelopes.GetRow(ViewEnvelopes.FocusedRowHandle) + Dim oHandle = SplashScreenManager.ShowOverlayForm(Me) + Try + Dim oView As GridView = GridEnvelopes.FocusedView + Dim selReceiver As EnvelopeReceiver + If oView.Name = ViewReceivers.Name Then + selReceiver = oView.GetRow(oView.FocusedRowHandle) + Else + MsgBox(Resources.Envelope.Please_select_a_recipient_from_the_Recipients_tab, MsgBoxStyle.Information, Text) + End If + If ViewEnvelopes.FocusedRowHandle < 0 Or IsNothing(selReceiver) Then + Exit Sub + End If + Dim oEnvelope As Envelope = ViewEnvelopes.GetRow(ViewEnvelopes.FocusedRowHandle) - Dim oController = New EnvelopeEditorController(State, oEnvelope) - Dim Documents As New BindingList(Of EnvelopeDocument) - Dim Receivers As New BindingList(Of EnvelopeReceiver) - Receivers = New BindingList(Of EnvelopeReceiver)(oController.Envelope.Receivers) - For Each oReceiver As EnvelopeReceiver In Receivers - If oReceiver.Email = selReceiver.Email Then - If oController.ActionService.ResendReceiver(oEnvelope, oReceiver) = True Then - Dim oMsg = Resources.Envelope.Invitation_successfully_resend.Replace("@Mail", oReceiver.Email) - MsgBox(oMsg, MsgBoxStyle.Information, Text) + Dim oController = New EnvelopeEditorController(State, oEnvelope) + Dim Documents As New BindingList(Of EnvelopeDocument) + Dim Receivers As New BindingList(Of EnvelopeReceiver) + Receivers = New BindingList(Of EnvelopeReceiver)(oController.Envelope.Receivers) + For Each oReceiver As EnvelopeReceiver In Receivers + If oReceiver.Email = selReceiver.Email Then + If oController.ActionService.ResendReceiver(oEnvelope, oReceiver) = True Then + Dim oMsg = Resources.Envelope.Invitation_successfully_resend.Replace("@Mail", oReceiver.Email) + MsgBox(oMsg, MsgBoxStyle.Information, Text) + End If End If - End If - Next + Next + Catch ex As Exception + Logger.Error(ex) + Finally + + + End Try + SplashScreenManager.CloseOverlayForm(oHandle) End Sub diff --git a/EnvelopeGenerator.Service/Scheduler_FinishEnvelope.vb b/EnvelopeGenerator.Service/Scheduler_FinishEnvelope.vb index 9bd10a06..83723a9b 100644 --- a/EnvelopeGenerator.Service/Scheduler_FinishEnvelope.vb +++ b/EnvelopeGenerator.Service/Scheduler_FinishEnvelope.vb @@ -68,7 +68,7 @@ Public Class Scheduler_FinishEnvelope Await Scheduler.Start() - Logger.Info("Scheduler started!") + Logger.Debug("Scheduler started!") Catch ex As Exception Logger.Error(ex) End Try diff --git a/EnvelopeGenerator.Service/Service.vb b/EnvelopeGenerator.Service/Service.vb index d54aae47..5cfb9242 100644 --- a/EnvelopeGenerator.Service/Service.vb +++ b/EnvelopeGenerator.Service/Service.vb @@ -34,7 +34,7 @@ Public Class Service TempFiles.Create() ' === Initialize Databases === - Logger.Info("Inititalize Database ...") + Logger.Debug("Inititalize Database ...") If Config.ConnectionString = String.Empty Then Throw New ApplicationException("Connection String is empty!") From a1688608abba9496e7cce07ec3abfc9d3037876a Mon Sep 17 00:00:00 2001 From: Developer01 Date: Wed, 25 Jun 2025 13:49:55 +0200 Subject: [PATCH 2/3] Exception TFA Null Verweis --- EnvelopeGenerator.Form/frmMain.vb | 10 ++++++++-- EnvelopeGenerator.sln | 5 ++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/EnvelopeGenerator.Form/frmMain.vb b/EnvelopeGenerator.Form/frmMain.vb index 0ba66887..26c73c1d 100644 --- a/EnvelopeGenerator.Form/frmMain.vb +++ b/EnvelopeGenerator.Form/frmMain.vb @@ -798,8 +798,14 @@ Public Class frmMain If oDT.Rows.Count = 1 Then Dim oTFA_REG_DL = oDT.Rows(0).Item("TFA_REG_DEADLINE") Dim oTOTP = oDT.Rows(0).Item("TOTP_SECRET_KEY") - Dim oForm As New frm2Factor_Properties(oReceiver.Email, oTOTP, oTFA_REG_DL, DB_DD_ECM) - oForm.ShowDialog() + If IsDBNull(oTFA_REG_DL) Then + bsitmInfo.Caption = "So far, no TFA for this user defined!" + bsitmInfo.Visibility = DevExpress.XtraBars.BarItemVisibility.Always + Else + Dim oForm As New frm2Factor_Properties(oReceiver.Email, oTOTP, oTFA_REG_DL, DB_DD_ECM) + oForm.ShowDialog() + End If + End If End If diff --git a/EnvelopeGenerator.sln b/EnvelopeGenerator.sln index 4c8aa8c9..3327b031 100644 --- a/EnvelopeGenerator.sln +++ b/EnvelopeGenerator.sln @@ -53,8 +53,8 @@ Global {6D56C01F-D6CB-4D8A-BD3D-4FD34326998C}.Release|Any CPU.Build.0 = Debug|Any CPU {6EA0C51F-C2B1-4462-8198-3DE0B32B74F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {6EA0C51F-C2B1-4462-8198-3DE0B32B74F8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6EA0C51F-C2B1-4462-8198-3DE0B32B74F8}.Release|Any CPU.ActiveCfg = Debug|Any CPU - {6EA0C51F-C2B1-4462-8198-3DE0B32B74F8}.Release|Any CPU.Build.0 = Debug|Any CPU + {6EA0C51F-C2B1-4462-8198-3DE0B32B74F8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6EA0C51F-C2B1-4462-8198-3DE0B32B74F8}.Release|Any CPU.Build.0 = Release|Any CPU {5E0E17C0-FF5A-4246-BF87-1ADD85376A27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {5E0E17C0-FF5A-4246-BF87-1ADD85376A27}.Debug|Any CPU.Build.0 = Debug|Any CPU {5E0E17C0-FF5A-4246-BF87-1ADD85376A27}.Release|Any CPU.ActiveCfg = Debug|Any CPU @@ -98,7 +98,6 @@ Global GlobalSection(NestedProjects) = preSolution {089D5634-FB6B-42D0-B912-7AA7457044E7} = {0CBC2432-A561-4440-89BC-671B66A24146} {6D56C01F-D6CB-4D8A-BD3D-4FD34326998C} = {E3C758DC-914D-4B7E-8457-0813F1FDB0CB} - {6EA0C51F-C2B1-4462-8198-3DE0B32B74F8} = {9943209E-1744-4944-B1BA-4F87FC1A0EEB} {5E0E17C0-FF5A-4246-BF87-1ADD85376A27} = {E3C758DC-914D-4B7E-8457-0813F1FDB0CB} {83ED2617-B398-4859-8F59-B38F8807E83E} = {9943209E-1744-4944-B1BA-4F87FC1A0EEB} {4F32A98D-E6F0-4A09-BD97-1CF26107E837} = {9943209E-1744-4944-B1BA-4F87FC1A0EEB} From 452077e86a999d2f76f3de4ac77022a95cefe42e Mon Sep 17 00:00:00 2001 From: TekH Date: Thu, 26 Jun 2025 11:56:49 +0200 Subject: [PATCH 3/3] Enhance error reporting for envelope creation failure Added detailed parameter information to the error message in `InvalidOperationException` for better debugging context when envelope creation fails. --- EnvelopeGenerator.Infrastructure/Executor/EnvelopeExecutor.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EnvelopeGenerator.Infrastructure/Executor/EnvelopeExecutor.cs b/EnvelopeGenerator.Infrastructure/Executor/EnvelopeExecutor.cs index 945f1ac7..c5147778 100644 --- a/EnvelopeGenerator.Infrastructure/Executor/EnvelopeExecutor.cs +++ b/EnvelopeGenerator.Infrastructure/Executor/EnvelopeExecutor.cs @@ -28,7 +28,7 @@ public class EnvelopeExecutor : SQLExecutor, IEnvelopeExecutor var envelopes = await connection.QueryAsync(formattedSql); var envelope = envelopes.FirstOrDefault() ?? throw new InvalidOperationException($"Envelope creation failed. Parameters:" + - $"userId={userId}, title='{title}', message='{message}', tfaEnabled={tfaEnabled}."); ; + $"userId={userId}, title='{title}', message='{message}', tfaEnabled={tfaEnabled}."); envelope.User = await _userRepository.ReadByIdAsync(envelope.UserId);