07-12-23

EnvelopeGenerator.Form/Controllers/BaseController.vb

@@ -2,6 +2,8 @@
 Imports DigitalData.Modules.Base
 Imports EnvelopeGenerator.Common
 Imports System.Data.SqlClient
+Imports DevExpress.DocumentView
+Imports System.Transactions
 
 Public MustInherit Class BaseController
     Inherits BaseClass
@@ -45,6 +47,10 @@ Public MustInherit Class BaseController
         End If
 
         If pEnvelope.IsAlreadySent Then
+            If DeleteDocumentsFromDisk(pEnvelope) = False Then
+                Return False
+            End If
+
             Return ActionService.DeleteEnvelope(pEnvelope)
         Else
             Return DeleteEnvelopeFromDisk(pEnvelope)
@@ -114,13 +120,26 @@ Public MustInherit Class BaseController
             Return False
         End Try
 
+        If DeleteDocumentFromDisk(pDocument) = False Then
+            Return False
+        End If
+
+        Return True
+    End Function
+
+    Public Function DeleteDocumentsFromDisk(pEnvelope As Envelope) As Boolean
+        Return pEnvelope.Documents.
+            Select(Function(d) DeleteDocumentFromDisk(d)).
+            All(Function(r) r = True)
+    End Function
+
+    Public Function DeleteDocumentFromDisk(pDocument As EnvelopeDocument) As Boolean
         Try
             IO.File.Delete(pDocument.Filepath)
+            Return True
         Catch ex As Exception
             Logger.Error(ex)
             Return False
         End Try
-
-        Return True
     End Function
 End Class