AppStd/EnvelopeGenerator
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Entfernen unnötige try-catch-Anweisungen.

Browse Source
This commit is contained in:
tekh 2025-08-21 10:47:16 +02:00
parent 419f421d52
commit dbb745338c
2 changed files with 24 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
EnvelopeGenerator.CommonServices/Models/ReceiverModel.vb
View File

@ -39,53 +39,31 @@ Public Class ReceiverModel
} }
End Function End Function
Private Function ToReceiver(pTable As DataTable) As Receiver
Return pTable?.Rows.Cast(Of DataRow).
Select(AddressOf ToReceiver).
Single()
End Function
Public Function TestReceiverExists(pReceiver As Receiver) As Boolean
Try
Dim oGuid = Database.GetScalarValue($"SELECT COALESCE(GUID, 0) FROM TBSIG_RECEIVER WHERE EMAIL_ADDRESS = '{pReceiver.EmailAddress}'")
pReceiver.Id = oGuid
Return oGuid > 0
Catch ex As Exception
Logger.Error(ex)
Return False
End Try
End Function
Public Function Insert(pReceiver As Receiver, pTransaction As SqlTransaction) As Boolean Public Function Insert(pReceiver As Receiver, pTransaction As SqlTransaction) As Boolean
Try Dim oSignature As String = pReceiver.GetSignature()
Dim oSignature As String = pReceiver.GetSignature() Dim oCheck = $"SELECT COUNT(GUID) FROM [dbo].[TBSIG_RECEIVER] WHERE SIGNATURE = '{oSignature}'"
Dim oCheck = $"SELECT COUNT(GUID) FROM [dbo].[TBSIG_RECEIVER] WHERE SIGNATURE = '{oSignature}'" Dim oExists = Database.GetScalarValue(oCheck)
Dim oExists = Database.GetScalarValue(oCheck)
If oExists = 0 Then If oExists = 0 Then
Dim oSql As String = $"INSERT INTO [dbo].[TBSIG_RECEIVER] Dim oSql As String = $"INSERT INTO [dbo].[TBSIG_RECEIVER]
([EMAIL_ADDRESS] ([EMAIL_ADDRESS]
,[SIGNATURE]) ,[SIGNATURE])
VALUES VALUES
('{pReceiver.EmailAddress}' ('{pReceiver.EmailAddress}'
,'{pReceiver.GetSignature()}')" ,'{pReceiver.GetSignature()}')"
Dim oCommand = New SqlCommand(oSql) Dim oCommand = New SqlCommand(oSql)
Dim oResult = Database.ExecuteNonQuery(oCommand) Dim oResult = Database.ExecuteNonQuery(oCommand)
If oResult = True Then If oResult = True Then
pReceiver.Id = GetReceiverIdByEmail(pReceiver.EmailAddress, pTransaction) pReceiver.Id = GetReceiverIdByEmail(pReceiver.EmailAddress, pTransaction)
Return True
Else
Return False
End If
Else
Logger.Warn($"Receiver [{pReceiver.EmailAddress}] already existing! SignatureID: {oSignature} Check SQL {oCheck}")
Return True Return True
Else
Return False
End If End If
Catch ex As Exception Else
Logger.Error(ex) Logger.Warn($"Receiver [{pReceiver.EmailAddress}] already existing! SignatureID: {oSignature} Check SQL {oCheck}")
Return False Return True
End Try End If
End Function End Function
Public Function Update(pReceiver As Receiver, pTransaction As SqlTransaction) As Boolean Public Function Update(pReceiver As Receiver, pTransaction As SqlTransaction) As Boolean

22
EnvelopeGenerator.Form/Controllers/EnvelopeEditorController.vb
View File

@ -286,9 +286,7 @@ Public Class EnvelopeEditorController
Dim oTransaction = oConnection.BeginTransaction() Dim oTransaction = oConnection.BeginTransaction()
Try Try
If InsertReceivers(pNewReceivers, oTransaction) = False Then InsertReceivers(pNewReceivers, oTransaction)
Throw New ApplicationException("Could not insert receivers!")
End If
oTransaction.Commit() oTransaction.Commit()
@ -382,17 +380,15 @@ Public Class EnvelopeEditorController
Return ElementModel.ElementsExist(Envelope.Id, pReceiverId) Return ElementModel.ElementsExist(Envelope.Id, pReceiverId)
End Function End Function
Private Function InsertReceivers(pReceivers As List(Of Receiver), pTransaction As SqlTransaction) As Boolean Private Sub InsertReceivers(pReceivers As List(Of Receiver), pTransaction As SqlTransaction)
Try Dim status = pReceivers.
Return pReceivers. Select(Function(r) InsertReceiver(r, pTransaction)).
Select(Function(r) InsertReceiver(r, pTransaction)). All(Function(pResult) pResult = True)
All(Function(pResult) pResult = True)
Catch ex As Exception If Not status Then
Logger.Error(ex) Throw New ApplicationException("Could not insert receivers!")
Return False End If
End Try End Sub
End Function
Private Function AssignReceivers(pEnvelope As Envelope, pTransaction As SqlTransaction) As Boolean Private Function AssignReceivers(pEnvelope As Envelope, pTransaction As SqlTransaction) As Boolean
If ReceiverModel.Unassign(pEnvelope, pTransaction) = False Then If ReceiverModel.Unassign(pEnvelope, pTransaction) = False Then