SQL-Abfragen in Models verschoben

User Model neu
2023-08-08 15:09:33 +02:00
parent 462bf4a61f
commit 73149e2101
15 changed files with 245 additions and 153 deletions
--- a/EnvelopeGenerator.Form/Controllers/EnvelopeEditorController.vb
+++ b/EnvelopeGenerator.Form/Controllers/EnvelopeEditorController.vb
@@ -1,12 +1,10 @@
-Imports System.Data.Common
-Imports System.Data.SqlClient
+Imports System.Data.SqlClient
 Imports System.IO
-Imports System.Runtime.Remoting.Messaging
 Imports DigitalData.Modules.Base
 Imports DigitalData.Modules.Database
 Imports DigitalData.Modules.Logging
 Imports EnvelopeGenerator.Common
-Imports EnvelopeGenerator.Form.My.Resources
+Imports EnvelopeGenerator.Common.Constants

 Public Class EnvelopeEditorController
    Inherits BaseClass
@@ -18,6 +16,8 @@ Public Class EnvelopeEditorController
    Private DocumentModel As DocumentModel
    Private ReceiverModel As ReceiverModel
    Private ElementModel As ElementModel
+    Private HistoryModel As HistoryModel
+    Private UserModel As UserModel

    Public ReadOnly Envelope As Envelope = Nothing

@@ -50,12 +50,26 @@ Public Class EnvelopeEditorController
        DocumentModel = New DocumentModel(pState)
        ReceiverModel = New ReceiverModel(pState)
        ElementModel = New ElementModel(pState)
+        HistoryModel = New HistoryModel(pState)
+        UserModel = New UserModel(pState)
    End Sub

 #Region "Public"
    Public Function CreateEnvelope() As Envelope
-        Dim oEnvelope As New Envelope() With {.UserId = State.UserId}
+        Dim oEnvelope As New Envelope() With {
+            .UserId = State.UserId,
+            .User = UserModel.SelectUser()
+        }
        If EnvelopeModel.Insert(oEnvelope) Then
+
+            Dim newHistoryEntry As New EnvelopeHistoryEntry With {
+                .EnvelopeId = oEnvelope.Id,
+                .Status = HistoryStatus.Created,
+                .ActionTitle = "Envelope erzeugt",
+                .ActionDescription = "Envelope wurde erzeugt",
+                }
+            'TODO .UserEmailAddress = oEnvelope.User.Email ' TODO - fehlt noch
+
            Return oEnvelope
        Else
            Return Nothing
@@ -182,7 +196,7 @@ Public Class EnvelopeEditorController
        Try
            Return pEnvelope.Documents.
                Where(Function(d) d.Id = 0).
-                Select(Function(d) InsertDocument(pEnvelope, d, pTransaction)).
+                Select(Function(d) DocumentModel.Insert(pEnvelope, d, pTransaction)).
                All(Function(pResult) pResult = True)

        Catch ex As Exception
@@ -191,30 +205,6 @@ Public Class EnvelopeEditorController
        End Try
    End Function

-    Private Function InsertDocument(pEnvelope As Envelope, pDocument As EnvelopeDocument, pTransaction As SqlTransaction) As Boolean
-        Dim oSql = "INSERT INTO [dbo].[TBSIG_ENVELOPE_DOCUMENT]
-           ([FILENAME]
-           ,[FILEPATH]
-           ,[ENVELOPE_ID])
-        VALUES
-           (@FILENAME
-           ,@FILEPATH
-           ,@ENVELOPE_ID)"
-
-        Dim oCommand As New SqlCommand(oSql)
-        oCommand.Parameters.Add("FILENAME", SqlDbType.NVarChar).Value = pDocument.Filename
-        oCommand.Parameters.Add("FILEPATH", SqlDbType.NVarChar).Value = pDocument.Filepath
-        oCommand.Parameters.Add("ENVELOPE_ID", SqlDbType.Int).Value = pEnvelope.Id
-
-        If Database.ExecuteNonQuery(oCommand, pTransaction) Then
-            pDocument.EnvelopeId = pEnvelope.Id
-            pDocument.Id = GetDocumentId(pDocument.Filename, pEnvelope, pTransaction)
-            Return True
-        Else
-            Return False
-        End If
-    End Function
-
    Private Function SaveEnvelopeReceivers(pEnvelope As Envelope, pTransaction As SqlTransaction) As Boolean
        Try
            If pEnvelope.Id = Nothing Then
@@ -283,23 +273,4 @@ Public Class EnvelopeEditorController
        End If
    End Function

-    Private Function GetReceiverId(pEmailAddress As String, pTransaction As SqlTransaction) As Integer
-        Try
-            Return Database.GetScalarValue($"SELECT GUID FROM TBSIG_RECEIVER WHERE EMAIL_ADDRESS = '{pEmailAddress}'", pTransaction)
-
-        Catch ex As Exception
-            Logger.Error(ex)
-            Return Nothing
-        End Try
-    End Function
-
-    Private Function GetDocumentId(pFilename As String, pEnvelope As Envelope, pTransaction As SqlTransaction) As Integer
-        Try
-            Return Database.GetScalarValue($"SELECT MAX(GUID) FROM TBSIG_ENVELOPE_DOCUMENT WHERE FILENAME = '{pFilename}' AND ENVELOPE_ID = {pEnvelope.Id}", pTransaction)
-
-        Catch ex As Exception
-            Logger.Error(ex)
-            Return Nothing
-        End Try
-    End Function
 End Class
--- a/EnvelopeGenerator.Form/Controllers/FieldEditorController.vb
+++ b/EnvelopeGenerator.Form/Controllers/FieldEditorController.vb
@@ -1,7 +1,4 @@
-Imports System.Data.SqlClient
-Imports DevExpress.Utils.CommonDialogs
-Imports DevExpress.XtraBars.Docking2010.Views.NativeMdi
-Imports DigitalData.Modules.Base
+Imports DigitalData.Modules.Base
 Imports DigitalData.Modules.Database
 Imports EnvelopeGenerator.Common
 Imports GdPicture14.Annotations
@@ -68,70 +65,10 @@ Public Class FieldEditorController
    Public Function SaveElement(pElement As EnvelopeDocumentElement) As Boolean
        Try
            If pElement.Id > 0 Then
-                Dim oSql = "UPDATE [dbo].[TBSIG_DOCUMENT_RECEIVER_ELEMENT]
-                   SET [POSITION_X] = @POSITION_X
-                      ,[POSITION_Y] = @POSITION_Y
-                      ,[WIDTH] = @WIDTH
-                      ,[HEIGHT] = @HEIGHT
-                 WHERE GUID = @GUID"
-
-                Dim oCommand As New SqlCommand(oSql)
-                oCommand.Parameters.Add("GUID", SqlDbType.NVarChar).Value = pElement.Id
-                oCommand.Parameters.Add("POSITION_X", SqlDbType.Float).Value = pElement.X
-                oCommand.Parameters.Add("POSITION_Y", SqlDbType.Float).Value = pElement.Y
-                oCommand.Parameters.Add("WIDTH", SqlDbType.Float).Value = pElement.Width
-                oCommand.Parameters.Add("HEIGHT", SqlDbType.Float).Value = pElement.Height
-
-                Return Database.ExecuteNonQuery(oCommand)
+                Return ElementModel.Update(pElement)

            Else
-                Dim oSql = "INSERT INTO [dbo].[TBSIG_DOCUMENT_RECEIVER_ELEMENT]
-                   ([DOCUMENT_ID]
-                   ,[RECEIVER_ID]
-                   ,[ELEMENT_TYPE]
-                   ,[POSITION_X]
-                   ,[POSITION_Y]
-                   ,[WIDTH]
-                   ,[HEIGHT]
-                   ,[REQUIRED]
-                   ,[READ_ONLY]
-                   ,[STATUS]
-                   ,[PAGE]
-                   ,[ANNOTATION_INDEX])
-                VALUES
-                   (@DOCUMENT_ID
-                   ,@RECEIVER_ID
-                   ,@ELEMENT_TYPE
-                   ,@POSITION_X
-                   ,@POSITION_Y
-                   ,@WIDTH
-                   ,@HEIGHT
-                   ,@REQUIRED
-                   ,@READ_ONLY
-                   ,@STATUS
-                   ,@PAGE
-                   ,@INDEX)"
-
-                Dim oCommand As New SqlCommand(oSql)
-                oCommand.Parameters.Add("DOCUMENT_ID", SqlDbType.NVarChar).Value = pElement.DocumentId
-                oCommand.Parameters.Add("RECEIVER_ID", SqlDbType.NVarChar).Value = pElement.ReceiverId
-                oCommand.Parameters.Add("ELEMENT_TYPE", SqlDbType.NVarChar).Value = pElement.ElementType
-                oCommand.Parameters.Add("POSITION_X", SqlDbType.Float).Value = pElement.X
-                oCommand.Parameters.Add("POSITION_Y", SqlDbType.Float).Value = pElement.Y
-                oCommand.Parameters.Add("WIDTH", SqlDbType.Float).Value = pElement.Width
-                oCommand.Parameters.Add("HEIGHT", SqlDbType.Float).Value = pElement.Height
-                oCommand.Parameters.Add("REQUIRED", SqlDbType.Bit).Value = pElement.Required
-                oCommand.Parameters.Add("READ_ONLY", SqlDbType.Bit).Value = pElement.ReadOnly
-                oCommand.Parameters.Add("STATUS", SqlDbType.NVarChar).Value = pElement.Status.ToString
-                oCommand.Parameters.Add("PAGE", SqlDbType.Int).Value = pElement.Page
-                oCommand.Parameters.Add("INDEX", SqlDbType.Int).Value = pElement.AnnotationIndex
-
-                If Database.ExecuteNonQuery(oCommand) Then
-                    pElement.Id = GetElementId(pElement)
-                    Return True
-                Else
-                    Return False
-                End If
+                Return ElementModel.Insert(pElement)
            End If
        Catch ex As Exception
            Logger.Error(ex)
@@ -139,24 +76,4 @@ Public Class FieldEditorController
        End Try
    End Function

-    Public Function DeleteElement(pElement As EnvelopeDocumentElement) As Boolean
-        Try
-            Dim oSql = $"DELETE FROM TBSIG_DOCUMENT_RECEIVER_ELEMENT WHERE GUID = {pElement.Id}"
-            Return Database.ExecuteNonQuery(oSql)
-        Catch ex As Exception
-            Logger.Error(ex)
-            Return False
-        End Try
-    End Function
-
-    Private Function GetElementId(pElement As EnvelopeDocumentElement) As Integer
-        Try
-            Return Database.GetScalarValue($"SELECT MAX(GUID) FROM TBSIG_DOCUMENT_RECEIVER_ELEMENT 
-                WHERE DOCUMENT_ID = {pElement.DocumentId} AND RECEIVER_ID = {pElement.ReceiverId}")
-
-        Catch ex As Exception
-            Logger.Error(ex)
-            Return Nothing
-        End Try
-    End Function
 End Class