refactor(EnvelopeGenerator.Common): umbenennen in EnvelopeGenerator.CommonService

EnvelopeGenerator.Application/Contracts/Repositories/IEmailTemplateRepository.cs

@@ -1,6 +1,6 @@
 using DigitalData.Core.Application.Interfaces.Repository;
 using EnvelopeGenerator.Domain.Entities;
-using static EnvelopeGenerator.Common.Constants;
+using static EnvelopeGenerator.CommonServices.Constants;
 
 namespace EnvelopeGenerator.Application.Contracts.Repositories;
 

EnvelopeGenerator.Application/Contracts/Services/IEmailTemplateService.cs

@@ -2,7 +2,7 @@
 using DigitalData.Core.DTO;
 using EnvelopeGenerator.Application.DTOs;
 using EnvelopeGenerator.Domain.Entities;
-using static EnvelopeGenerator.Common.Constants;
+using static EnvelopeGenerator.Domain.Constants;
 
 namespace EnvelopeGenerator.Application.Contracts.Services;
 

EnvelopeGenerator.Application/Contracts/Services/IEnvelopeHistoryService.cs

@@ -3,7 +3,7 @@ using DigitalData.Core.DTO;
 using EnvelopeGenerator.Application.DTOs.EnvelopeHistory;
 using EnvelopeGenerator.Application.DTOs.Receiver;
 using EnvelopeGenerator.Domain.Entities;
-using static EnvelopeGenerator.Common.Constants;
+using static EnvelopeGenerator.CommonServices.Constants;
 
 namespace EnvelopeGenerator.Application.Contracts.Services;
 

EnvelopeGenerator.Application/Contracts/Services/IEnvelopeMailService.cs

@@ -2,7 +2,7 @@
 using DigitalData.EmailProfilerDispatcher.Abstraction.Contracts;
 using EnvelopeGenerator.Application.DTOs.EnvelopeReceiver;
 using EnvelopeGenerator.Application.DTOs.EnvelopeReceiverReadOnly;
-using EnvelopeGenerator.Common;
+using EnvelopeGenerator.CommonServices;
 
 namespace EnvelopeGenerator.Application.Contracts.Services;
 

EnvelopeGenerator.Application/DTOs/EnvelopeHistory/EnvelopeHistoryDto.cs

@@ -1,7 +1,7 @@
 using DigitalData.Core.Abstractions;
 using DigitalData.UserManager.Application.DTOs.User;
 using EnvelopeGenerator.Application.DTOs.Receiver;
-using static EnvelopeGenerator.Common.Constants;
+using static EnvelopeGenerator.CommonServices.Constants;
 
 namespace EnvelopeGenerator.Application.DTOs.EnvelopeHistory;
 

EnvelopeGenerator.Application/EmailTemplates/Commands/Reset/ResetEmailTemplateCommand.cs

@@ -1,4 +1,4 @@
-using EnvelopeGenerator.Common;
+using EnvelopeGenerator.CommonServices;
 using MediatR;
 
 namespace EnvelopeGenerator.Application.EmailTemplates.Commands.Reset;

EnvelopeGenerator.Application/EmailTemplates/EmailTemplateQuery.cs

@@ -1,4 +1,4 @@
-using EnvelopeGenerator.Common;
+using EnvelopeGenerator.CommonServices;
 
 namespace EnvelopeGenerator.Application.EmailTemplates;
 

EnvelopeGenerator.Application/EmailTemplates/Queries/Read/ReadEmailTemplateQueryHandler.cs

@@ -1,7 +1,7 @@
 using AutoMapper;
 using EnvelopeGenerator.Application.Contracts.Repositories;
 using EnvelopeGenerator.Application.DTOs;
-using EnvelopeGenerator.Common;
+using EnvelopeGenerator.CommonServices;
 using MediatR;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Logging;

EnvelopeGenerator.Application/EnvelopeGenerator.Application.csproj

@@ -28,7 +28,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<ProjectReference Include="..\EnvelopeGenerator.Common\EnvelopeGenerator.Common.vbproj" />
+		<ProjectReference Include="..\EnvelopeGenerator.CommonServices\EnvelopeGenerator.CommonServices.vbproj" />
 		<ProjectReference Include="..\EnvelopeGenerator.Domain\EnvelopeGenerator.Domain.csproj" />
 		<ProjectReference Include="..\EnvelopeGenerator.Extensions\EnvelopeGenerator.Extensions.csproj" />
 	</ItemGroup>

EnvelopeGenerator.Application/Envelopes/Queries/Read/ReadEnvelopeResponse.cs

@@ -1,4 +1,4 @@
-using EnvelopeGenerator.Common;
+using EnvelopeGenerator.CommonServices;
 
 namespace EnvelopeGenerator.Application.Envelopes.Queries.Read;
 

EnvelopeGenerator.Application/Histories/Queries/Read/ReadHistoryQuery.cs

@@ -1,4 +1,4 @@
-using EnvelopeGenerator.Common;
+using EnvelopeGenerator.CommonServices;
 using MediatR;
 using System.ComponentModel.DataAnnotations;
 

EnvelopeGenerator.Application/Histories/Queries/Read/ReadHistoryResponse.cs

@@ -1,4 +1,4 @@
-using EnvelopeGenerator.Common;
+using EnvelopeGenerator.CommonServices;
 
 namespace EnvelopeGenerator.Application.Histories.Queries.Read;
 

EnvelopeGenerator.Application/Services/EmailTemplateService.cs

@@ -3,7 +3,7 @@ using DigitalData.Core.Application;
 using EnvelopeGenerator.Application.DTOs;
 using EnvelopeGenerator.Domain.Entities;
 using EnvelopeGenerator.Application.Contracts.Repositories;
-using static EnvelopeGenerator.Common.Constants;
+using static EnvelopeGenerator.CommonServices.Constants;
 using DigitalData.Core.DTO;
 using Microsoft.Extensions.Logging;
 using EnvelopeGenerator.Application.Contracts.Services;

EnvelopeGenerator.Application/Services/EnvelopeHistoryService.cs

@@ -2,7 +2,7 @@
 using DigitalData.Core.Application;
 using EnvelopeGenerator.Domain.Entities;
 using EnvelopeGenerator.Application.Contracts.Repositories;
-using static EnvelopeGenerator.Common.Constants;
+using static EnvelopeGenerator.CommonServices.Constants;
 using DigitalData.Core.DTO;
 using EnvelopeGenerator.Application.DTOs.EnvelopeHistory;
 using EnvelopeGenerator.Application.DTOs.Receiver;

EnvelopeGenerator.Application/Services/EnvelopeMailService.cs

@@ -4,10 +4,10 @@ using DigitalData.EmailProfilerDispatcher.Abstraction.Contracts;
 using DigitalData.EmailProfilerDispatcher.Abstraction.DTOs.EmailOut;
 using DigitalData.EmailProfilerDispatcher.Abstraction.Services;
 using EnvelopeGenerator.Application.DTOs.EnvelopeReceiver;
-using EnvelopeGenerator.Common;
+using EnvelopeGenerator.CommonServices;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
-using static EnvelopeGenerator.Common.Constants;
+using static EnvelopeGenerator.CommonServices.Constants;
 using EnvelopeGenerator.Extensions;
 using EnvelopeGenerator.Application.DTOs.EnvelopeReceiverReadOnly;
 using EnvelopeGenerator.Application.Configurations;

EnvelopeGenerator.BBTests/EnvelopeGenerator.BBTests.vbproj

@@ -100,8 +100,8 @@
     <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
       <HintPath>..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
     </Reference>
-    <Reference Include="EnvelopeGenerator.Common">
-      <HintPath>..\EnvelopeGenerator.Common\bin\Debug\EnvelopeGenerator.Common.dll</HintPath>
+    <Reference Include="EnvelopeGenerator.CommonServices">
+      <HintPath>..\EnvelopeGenerator.CommonServices\bin\Debug\EnvelopeGenerator.CommonServices.dll</HintPath>
     </Reference>
     <Reference Include="FirebirdSql.Data.FirebirdClient, Version=7.5.0.0, Culture=neutral, PublicKeyToken=3750abcc3150b00c, processorArchitecture=MSIL">
       <HintPath>..\packages\FirebirdSql.Data.FirebirdClient.7.5.0\lib\net452\FirebirdSql.Data.FirebirdClient.dll</HintPath>
@@ -350,9 +350,9 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\EnvelopeGenerator.Common\EnvelopeGenerator.Common.vbproj">
+    <ProjectReference Include="..\EnvelopeGenerator.CommonServices\EnvelopeGenerator.CommonServices.vbproj">
       <Project>{6EA0C51F-C2B1-4462-8198-3DE0B32B74F8}</Project>
-      <Name>EnvelopeGenerator.Common</Name>
+      <Name>EnvelopeGenerator.CommonServices</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>

EnvelopeGenerator.BBTests/frmFinalizePDF.vb

@@ -2,9 +2,9 @@
 Imports DigitalData.Modules.Logging
 Imports GdPicture14
 Imports Newtonsoft.Json.Linq
-Imports EnvelopeGenerator.Common.Jobs
+Imports EnvelopeGenerator.CommonServices.Jobs
 Imports System.IO
-Imports EnvelopeGenerator.Common.Jobs.FinalizeDocument
+Imports EnvelopeGenerator.CommonServices.Jobs.FinalizeDocument
 
 Public Class frmFinalizePDF
     Private Const CONNECTIONSTRING = "Server=sDD-VMP04-SQL17\DD_DEVELOP01;Database=DD_ECM;User Id=sa;Password=+bk8oAbbQP1AzoHtvZUbd+Mbok2f8Fl4miEx1qssJ5yEaEWoQJ9prg4L14fURpPnqi1WMNs9fE4=;"

EnvelopeGenerator.BBTests/frmReportViewer.vb

@@ -2,7 +2,7 @@
 Imports DigitalData.Modules.Database
 Imports DigitalData.Modules.Config
 Imports DigitalData.Modules.Base
-Imports EnvelopeGenerator.Common
+Imports EnvelopeGenerator.CommonServices
 
 Public Class frmReportViewer
     Private LogConfig As LogConfig

EnvelopeGenerator.Common/Entities/EnvelopeDocument.vb

@@ -1,23 +0,0 @@
-Imports System.Drawing
-Imports System.IO
-
-Public Class EnvelopeDocument
-    Public Property Id As Integer
-
-    Public Property FileNameOriginal As String
-
-    Public Property IsTempFile As Boolean = True
-
-    Public Property EnvelopeId As Integer = 0
-
-    Public Property Thumbnail As Bitmap
-
-    Public Property Elements As New List(Of EnvelopeDocumentElement)
-
-    Public Property Filename As String
-
-    Public Property Filepath As String
-
-    Public Property PageCount As Integer
-    Public Property Byte_Data As Byte()
-End Class

EnvelopeGenerator.Common/Entities/EnvelopeDocumentElement.vb

@@ -1,29 +0,0 @@
-Imports EnvelopeGenerator.Domain
-
-Public Class EnvelopeDocumentElement
-    Public Property Id As Integer = -1
-    Public Property X As Double
-    Public Property Y As Double
-    Public Property Width As Double
-    Public Property Height As Double
-    Public Property ElementType As Constants.ElementType
-    Public Property DocumentId As Integer
-    Public Property ReceiverId As Integer
-    Public Property Required As Boolean = False
-    Public Property [ReadOnly] As Boolean = False
-    Public Property Page As Integer = 1
-    Public Property Index As Integer = 0
-
-    Public ReadOnly Property Top As Single
-        Get
-            Return Math.Round(Y, 5)
-        End Get
-    End Property
-
-    Public ReadOnly Property Left As Single
-        Get
-            Return Math.Round(X, 5)
-        End Get
-    End Property
-
-End Class

EnvelopeGenerator.Common/Entities/EnvelopeHistoryEntry.vb

@@ -1,14 +0,0 @@
-Imports EnvelopeGenerator.Domain
-
-Public Class EnvelopeHistoryEntry
-    Public Property EnvelopeId As Integer
-    Public Property UserReference As String
-    Public Property Status As Constants.EnvelopeStatus
-    Public ReadOnly Property StatusTranslated As String
-        Get
-            Dim oStatus = Status.ToString()
-            Return My.Resources.Model.ResourceManager.GetString(oStatus)
-        End Get
-    End Property
-    Public Property ActionDate As Date = Now()
-End Class

EnvelopeGenerator.Common/Entities/EnvelopeReceiver.vb

@@ -1,6 +0,0 @@
-Imports EnvelopeGenerator.Domain.Entities
-
-Public Class EnvelopeReceiver
-    Public Property Envelope As Envelope
-    Public Property Receiver As Receiver
-End Class

EnvelopeGenerator.CommonServices/EnvelopeGenerator.CommonServices.vbproj

@@ -7,8 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{6EA0C51F-C2B1-4462-8198-3DE0B32B74F8}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <RootNamespace>EnvelopeGenerator.Common</RootNamespace>
-    <AssemblyName>EnvelopeGenerator.Common</AssemblyName>
+    <RootNamespace>EnvelopeGenerator.CommonServices</RootNamespace>
+    <AssemblyName>EnvelopeGenerator.CommonServices</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <MyType>Windows</MyType>
     <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
@@ -23,7 +23,7 @@
     <DefineDebug>true</DefineDebug>
     <DefineTrace>true</DefineTrace>
     <OutputPath>bin\Debug\</OutputPath>
-    <DocumentationFile>EnvelopeGenerator.Common.xml</DocumentationFile>
+    <DocumentationFile>EnvelopeGenerator.CommonServices.xml</DocumentationFile>
     <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -32,7 +32,7 @@
     <DefineTrace>true</DefineTrace>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DocumentationFile>EnvelopeGenerator.Common.xml</DocumentationFile>
+    <DocumentationFile>EnvelopeGenerator.CommonServices.xml</DocumentationFile>
     <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
   </PropertyGroup>
   <PropertyGroup>
@@ -274,17 +274,13 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Config.vb" />
-    <Compile Include="Entities\DbConfig.vb" />
-    <Compile Include="Entities\ElementStatus.vb" />
-    <Compile Include="Entities\EmailData.vb" />
+    <Compile Include="Models\DbConfig.vb" />
+    <Compile Include="Models\ElementStatus.vb" />
+    <Compile Include="Models\EmailData.vb" />
     <Compile Include="Jobs\APIBackendJobs\APIEnvelopeJob.vb" />
     <Compile Include="Jobs\FinalizeDocument\PDFBurnerParams.vb" />
     <Compile Include="Services\TemplateService.vb" />
-    <Compile Include="Entities\EnvelopeDocument.vb" />
-    <Compile Include="Entities\EnvelopeDocumentElement.vb" />
-    <Compile Include="Entities\EnvelopeHistoryEntry.vb" />
-    <Compile Include="Entities\EnvelopeReceiver.vb" />
-    <Compile Include="Entities\State.vb" />
+    <Compile Include="Models\State.vb" />
     <Compile Include="Helpers.vb" />
     <Compile Include="Jobs\FinalizeDocument\FinalizeDocumentExceptions.vb" />
     <Compile Include="Jobs\FinalizeDocument\FinalizeDocumentJob.vb" />

EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/FinalizeDocumentJob.vb

@@ -5,8 +5,8 @@ Imports GdPicture14
 Imports Quartz
 Imports System.Security.Cryptography
 Imports System.IO
-Imports EnvelopeGenerator.Common.Jobs.FinalizeDocument.FinalizeDocumentExceptions
-Imports EnvelopeGenerator.Common.Jobs.FinalizeDocument
+Imports EnvelopeGenerator.CommonServices.Jobs.FinalizeDocument.FinalizeDocumentExceptions
+Imports EnvelopeGenerator.CommonServices.Jobs.FinalizeDocument
 Imports EnvelopeGenerator.Domain.Constants
 Imports DevExpress.DataProcessing
 Imports System.Data.SqlClient

EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/PDFBurner.vb

@@ -4,7 +4,7 @@ Imports DigitalData.Modules.Base
 Imports DigitalData.Modules.Logging
 Imports GdPicture14
 Imports Newtonsoft.Json
-Imports EnvelopeGenerator.Common.Jobs.FinalizeDocument.FinalizeDocumentExceptions
+Imports EnvelopeGenerator.CommonServices.Jobs.FinalizeDocument.FinalizeDocumentExceptions
 
 Namespace Jobs.FinalizeDocument
     Public Class PDFBurner

EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/PDFMerger.vb

@@ -1,6 +1,6 @@
 Imports DigitalData.Modules.Base
 Imports DigitalData.Modules.Logging
-Imports EnvelopeGenerator.Common.Jobs.FinalizeDocument.FinalizeDocumentExceptions
+Imports EnvelopeGenerator.CommonServices.Jobs.FinalizeDocument.FinalizeDocumentExceptions
 Imports GdPicture14
 Imports System.IO
 

EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/ReportCreator.vb

@@ -1,7 +1,7 @@
 Imports System.IO
 Imports DigitalData.Modules.Logging
 Imports DigitalData.Modules.Base
-Imports EnvelopeGenerator.Common.Jobs.FinalizeDocument.FinalizeDocumentExceptions
+Imports EnvelopeGenerator.CommonServices.Jobs.FinalizeDocument.FinalizeDocumentExceptions
 Imports EnvelopeGenerator.Domain.Entities
 
 Public Class ReportCreator

EnvelopeGenerator.CommonServices/Models/DocumentModel.vb

@@ -18,6 +18,7 @@ Public Class DocumentModel
 
     Private Function ToDocument(pRow As DataRow, pReceiverId As Integer) As EnvelopeDocument
         Dim oDocumentId = pRow.ItemEx("GUID", 0)
+        Dim byteDataObj = pRow.Item("BYTE_DATA")
         Return New EnvelopeDocument() With {
             .Id = oDocumentId,
             .EnvelopeId = pRow.ItemEx("ENVELOPE_ID", 0),
@@ -26,7 +27,7 @@ Public Class DocumentModel
             .FileNameOriginal = pRow.ItemEx("FILENAME_ORIGINAL", ""),
             .IsTempFile = False,
             .Elements = ElementModel.List(oDocumentId, pReceiverId),
-            .Byte_Data = DirectCast(pRow.Item("BYTE_DATA"), Byte())
+            .ByteData = If(byteDataObj Is DBNull.Value, Nothing, DirectCast(byteDataObj, Byte()))
         }
     End Function
 
@@ -95,7 +96,7 @@ Public Class DocumentModel
             oCommand.Parameters.Add("FILENAME_ORIGINAL", SqlDbType.NVarChar).Value = pDocument.FileNameOriginal
             oCommand.Parameters.Add("FILEPATH", SqlDbType.NVarChar).Value = pDocument.Filepath
             oCommand.Parameters.Add("ENVELOPE_ID", SqlDbType.Int).Value = pEnvelope.Id
-            oCommand.Parameters.Add(New SqlParameter("@BYTE_DATA", DirectCast(pDocument.Byte_Data, Object)))
+            oCommand.Parameters.Add(New SqlParameter("@BYTE_DATA", DirectCast(pDocument.ByteData, Object)))
 
             If Database.ExecuteNonQuery(oCommand, pTransaction) Then
                 pDocument.EnvelopeId = pEnvelope.Id

EnvelopeGenerator.CommonServices/Models/ElementModel.vb

@@ -1,6 +1,7 @@
 Imports System.Data.SqlClient
 Imports DigitalData.Modules.Base
 Imports EnvelopeGenerator.Domain
+Imports EnvelopeGenerator.Domain.Entities
 
 Public Class ElementModel
     Inherits BaseModel
@@ -9,8 +10,8 @@ Public Class ElementModel
         MyBase.New(pState)
     End Sub
 
-    Private Function ToElement(pRow As DataRow) As EnvelopeDocumentElement
-        Return New EnvelopeDocumentElement() With {
+    Private Function ToElement(pRow As DataRow) As DocumentReceiverElement
+        Return New DocumentReceiverElement() With {
             .Id = pRow.ItemEx("GUID", 0),
             .DocumentId = pRow.ItemEx("DOCUMENT_ID", 0),
             .ReceiverId = pRow.ItemEx("RECEIVER_ID", 0),
@@ -23,7 +24,7 @@ Public Class ElementModel
         }
     End Function
 
-    Private Function ToElements(pTable As DataTable) As List(Of EnvelopeDocumentElement)
+    Private Function ToElements(pTable As DataTable) As List(Of DocumentReceiverElement)
         Return pTable?.Rows.Cast(Of DataRow).
                 Select(AddressOf ToElement).
                 ToList()
@@ -79,7 +80,7 @@ Public Class ElementModel
         End Try
     End Function
 
-    Public Function List(pDocumentId As Integer) As List(Of EnvelopeDocumentElement)
+    Public Function List(pDocumentId As Integer) As List(Of DocumentReceiverElement)
         Try
             Dim oSql = $"SELECT * FROM [dbo].[TBSIG_DOCUMENT_RECEIVER_ELEMENT] WHERE DOCUMENT_ID = {pDocumentId} ORDER BY PAGE ASC"
             Dim oTable = Database.GetDatatable(oSql)
@@ -92,7 +93,7 @@ Public Class ElementModel
         End Try
     End Function
 
-    Public Function List(pDocumentId As Integer, pReceiverId As Integer) As List(Of EnvelopeDocumentElement)
+    Public Function List(pDocumentId As Integer, pReceiverId As Integer) As List(Of DocumentReceiverElement)
         Try
             Dim oReceiverConstraint = ""
             If pReceiverId > 0 Then
@@ -110,7 +111,7 @@ Public Class ElementModel
         End Try
     End Function
 
-    Public Function Insert(pElement As EnvelopeDocumentElement) As Boolean
+    Public Function Insert(pElement As DocumentReceiverElement) As Boolean
         Try
             Dim oSql = "INSERT INTO [dbo].[TBSIG_DOCUMENT_RECEIVER_ELEMENT]
                    ([DOCUMENT_ID]
@@ -160,7 +161,7 @@ Public Class ElementModel
         End Try
     End Function
 
-    Public Function Update(pElement As EnvelopeDocumentElement) As Boolean
+    Public Function Update(pElement As DocumentReceiverElement) As Boolean
         Try
             Dim oSql = "UPDATE [dbo].[TBSIG_DOCUMENT_RECEIVER_ELEMENT]
                    SET [POSITION_X] = @POSITION_X
@@ -184,7 +185,7 @@ Public Class ElementModel
         End Try
     End Function
 
-    Private Function GetElementId(pElement As EnvelopeDocumentElement) As Integer
+    Private Function GetElementId(pElement As DocumentReceiverElement) As Integer
         Try
             Return Database.GetScalarValue($"SELECT MAX(GUID) FROM TBSIG_DOCUMENT_RECEIVER_ELEMENT 
                 WHERE DOCUMENT_ID = {pElement.DocumentId} AND RECEIVER_ID = {pElement.ReceiverId}")
@@ -195,7 +196,7 @@ Public Class ElementModel
         End Try
     End Function
 
-    Public Function DeleteElement(pElement As EnvelopeDocumentElement) As Boolean
+    Public Function DeleteElement(pElement As DocumentReceiverElement) As Boolean
         Try
             Dim oSql = $"DELETE FROM TBSIG_DOCUMENT_RECEIVER_ELEMENT WHERE GUID = {pElement.Id}"
             Return Database.ExecuteNonQuery(oSql)

EnvelopeGenerator.CommonServices/Models/HistoryModel.vb

@@ -1,5 +1,6 @@
 Imports System.Data.SqlClient
 Imports DigitalData.Modules.Base
+Imports EnvelopeGenerator.Domain.Entities
 
 Public Class HistoryModel
     Inherits BaseModel
@@ -8,8 +9,8 @@ Public Class HistoryModel
         MyBase.New(pState)
     End Sub
 
-    Private Function ToEnvelopeHistoryEntry(pRow As DataRow) As EnvelopeHistoryEntry
-        Return New EnvelopeHistoryEntry() With {
+    Private Function ToEnvelopeHistoryEntry(pRow As DataRow) As EnvelopeHistory
+        Return New EnvelopeHistory() With {
             .ActionDate = pRow.ItemEx(Of Date)("ACTION_DATE", Nothing),
             .EnvelopeId = pRow.Item("ENVELOPE_ID"),
             .Status = pRow.Item("STATUS"),
@@ -17,7 +18,7 @@ Public Class HistoryModel
         }
     End Function
 
-    Public Function List(pEnvelopeId As Integer) As List(Of EnvelopeHistoryEntry)
+    Public Function List(pEnvelopeId As Integer) As List(Of EnvelopeHistory)
         Dim oSql = $"SELECT * FROM TBSIG_ENVELOPE_HISTORY WHERE ENVELOPE_ID = {pEnvelopeId} AND ACTION_DATE IS NOT NULL ORDER BY GUID DESC"
         Dim oTable = Database.GetDatatable(oSql)
         Return oTable?.Rows.
@@ -39,7 +40,7 @@ Public Class HistoryModel
         Return oRowCount > 0
     End Function
 
-    Public Function Insert(pHistory As EnvelopeHistoryEntry) As Boolean
+    Public Function Insert(pHistory As EnvelopeHistory) As Boolean
         Try
             Dim oSql = "INSERT INTO [dbo].[TBSIG_ENVELOPE_HISTORY] "
             oSql += "   ([ENVELOPE_ID] "

EnvelopeGenerator.CommonServices/My Project/AssemblyInfo.vb

@@ -8,10 +8,10 @@ Imports System.Runtime.InteropServices
 
 ' Werte der Assemblyattribute überprüfen
 
-<Assembly: AssemblyTitle("EnvelopeGenerator.Common")>
+<Assembly: AssemblyTitle("EnvelopeGenerator.CommonServices")>
 <Assembly: AssemblyDescription("Stellt Funktionen und Methoden rund um DD DigitalSignatures bereit")>
 <Assembly: AssemblyCompany("Digital Data GmbH, Heuchelheim")>
-<Assembly: AssemblyProduct("EnvelopeGenerator.Common")>
+<Assembly: AssemblyProduct("EnvelopeGenerator.CommonServices")>
 <Assembly: AssemblyCopyright("Copyright © 2025")>
 <Assembly: AssemblyTrademark("signFLOW")>
 

EnvelopeGenerator.CommonServices/My Project/Resources.Designer.vb

@@ -39,7 +39,7 @@ Namespace My.Resources
         Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager
             Get
                 If Object.ReferenceEquals(resourceMan, Nothing) Then
-                    Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("EnvelopeGenerator.Common.Resources", GetType(Resources).Assembly)
+                    Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("EnvelopeGenerator.CommonServices.Resources", GetType(Resources).Assembly)
                     resourceMan = temp
                 End If
                 Return resourceMan

EnvelopeGenerator.CommonServices/My Project/Settings.Designer.vb

@@ -64,9 +64,9 @@ Namespace My
     Friend Module MySettingsProperty
         
         <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")>  _
-        Friend ReadOnly Property Settings() As Global.EnvelopeGenerator.Common.My.MySettings
+        Friend ReadOnly Property Settings() As Global.EnvelopeGenerator.CommonServices.My.MySettings
             Get
-                Return Global.EnvelopeGenerator.Common.My.MySettings.Default
+                Return Global.EnvelopeGenerator.CommonServices.My.MySettings.Default
             End Get
         End Property
     End Module

EnvelopeGenerator.CommonServices/Reports/rptEnvelopeHistory.Designer.vb

@@ -653,7 +653,7 @@ Partial Public Class rptEnvelopeHistory
         'ObjectDataSource1
         '
         Me.ObjectDataSource1.DataMember = "Items"
-        Me.ObjectDataSource1.DataSource = GetType(EnvelopeGenerator.Common.ReportSource)
+        Me.ObjectDataSource1.DataSource = GetType(EnvelopeGenerator.CommonServices.ReportSource)
         Me.ObjectDataSource1.Name = "ObjectDataSource1"
         '
         'rptEnvelopeHistory

EnvelopeGenerator.CommonServices/Services/ActionService.vb

@@ -1,6 +1,6 @@
 Imports EnvelopeGenerator.Domain.Entities
 Imports EnvelopeGenerator.Domain.Constants
-Imports EnvelopeGenerator.Common.My.Resources
+Imports EnvelopeGenerator.CommonServices.My.Resources
 Imports DigitalData.Modules.Database
 
 Public Class ActionService

EnvelopeGenerator.CommonServices/Services/HistoryService.vb

@@ -18,7 +18,7 @@ Public Class HistoryService
     End Sub
 
     Public Function SetEnvelopeStatus(pEnvelope As Envelope, pStatus As EnvelopeStatus, pUserReference As String) As Boolean
-        Dim oResult = HistoryModel.Insert(New EnvelopeHistoryEntry() With {
+        Dim oResult = HistoryModel.Insert(New EnvelopeHistory() With {
             .EnvelopeId = pEnvelope.Id,
             .ActionDate = Now(),
             .Status = pStatus,

EnvelopeGenerator.CommonServices/Strings/Email.Designer.vb

@@ -43,7 +43,7 @@ Namespace My.Resources
         Public Shared ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager
             Get
                 If Object.ReferenceEquals(resourceMan, Nothing) Then
-                    Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("EnvelopeGenerator.Common.EmailAddress", GetType(Email).Assembly)
+                    Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("EnvelopeGenerator.CommonServices.EmailAddress", GetType(Email).Assembly)
                     resourceMan = temp
                 End If
                 Return resourceMan

EnvelopeGenerator.CommonServices/Strings/Envelope1.Designer.vb

@@ -43,7 +43,7 @@ Namespace My.Resources
         Public Shared ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager
             Get
                 If Object.ReferenceEquals(resourceMan, Nothing) Then
-                    Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("EnvelopeGenerator.Common.Envelope", GetType(Envelope).Assembly)
+                    Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("EnvelopeGenerator.CommonServices.Envelope", GetType(Envelope).Assembly)
                     resourceMan = temp
                 End If
                 Return resourceMan

EnvelopeGenerator.CommonServices/Strings/Model.Designer.vb

@@ -43,7 +43,7 @@ Namespace My.Resources
         Public Shared ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager
             Get
                 If Object.ReferenceEquals(resourceMan, Nothing) Then
-                    Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("EnvelopeGenerator.Common.Model", GetType(Model).Assembly)
+                    Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("EnvelopeGenerator.CommonServices.Model", GetType(Model).Assembly)
                     resourceMan = temp
                 End If
                 Return resourceMan

EnvelopeGenerator.Domain/Entities/DocumentReceiverElement.cs

@@ -10,10 +10,11 @@ namespace EnvelopeGenerator.Domain.Entities
     [Table("TBSIG_DOCUMENT_RECEIVER_ELEMENT", Schema = "dbo")]
     public class DocumentReceiverElement
     {
+        // TODO: * Check the Form App and remove the default value
         [Key]
         [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
         [Column("GUID")]
-        public int Id { get; set; }
+        public int Id { get; set; } = -1;
 
         [Required]
         [Column("DOCUMENT_ID")]
@@ -53,23 +54,26 @@ namespace EnvelopeGenerator.Domain.Entities
         [DefaultValue(1)]
         public int Page { get; set; }
 
+        // TODO: * Check the Form App and remove the default value
         [Required]
         [Column("REQUIRED")]
         [DefaultValue(false)]
-        public bool Required { get; set; }
+        public bool Required { get; set; } = false;
 
         [Column("TOOLTIP")]
         public string Tooltip { get; set; }
 
+        // TODO: * Check the Form App and remove the default value
         [Required]
         [Column("READ_ONLY")]
         [DefaultValue(false)]
-        public bool ReadOnly { get; set; }
+        public bool ReadOnly { get; set; } = false;
 
+        // TODO: * Check the Form App and remove the default value
         [Required]
         [Column("ANNOTATION_INDEX")]
         [DefaultValue(0)]
-        public int AnnotationIndex { get; set; }
+        public int AnnotationIndex { get; set; } = 0;
 
         [Required]
         [Column("ADDED_WHEN", TypeName = "datetime")]

EnvelopeGenerator.Domain/Entities/Envelope.cs

@@ -134,13 +134,13 @@ namespace EnvelopeGenerator.Domain.Entities
         public byte[] DOC_RESULT { get; set; }
 
         // TODO: * Check the Form App and remove the default value
-        public IEnumerable<EnvelopeDocument> Documents { get; set; } = new List<EnvelopeDocument>();
+        public List<EnvelopeDocument> Documents { get; set; } = new List<EnvelopeDocument>();
 
         // TODO: * Check the Form App and remove the default value
-        public IEnumerable<EnvelopeHistory> History { get; set; } = new List<EnvelopeHistory>();
+        public List<EnvelopeHistory> History { get; set; } = new List<EnvelopeHistory>();
 
         // TODO: * Check the Form App and remove the default value
-        public IEnumerable<Receiver> Receivers { get; set; } = new List<Receiver>();
+        public List<Receiver> Receivers { get; set; } = new List<Receiver>();
 
         /// <summary>
         /// Validates whether the receiver and document data are complete.

EnvelopeGenerator.Domain/Entities/EnvelopeDocument.cs

@@ -1,5 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
+using System.Drawing;
 #if NETFRAMEWORK
 using System;
 using System.Collections.Generic;
@@ -17,7 +18,7 @@ namespace EnvelopeGenerator.Domain.Entities
 
         [Required]
         [Column("ENVELOPE_ID")]
-        public int EnvelopeId { get; set; }
+        public int EnvelopeId { get; set; } = 0;
 
         [Required]
         [Column("ADDED_WHEN", TypeName = "datetime")]
@@ -26,6 +27,25 @@ namespace EnvelopeGenerator.Domain.Entities
         [Column("BYTE_DATA", TypeName = "varbinary(max)")]
         public byte[] ByteData { get; set; }
 
-        public IEnumerable<DocumentReceiverElement> Elements { get; set; }
+        // TODO: * Check the Form App and remove the default value
+        public List<DocumentReceiverElement> Elements { get; set; } = new List<DocumentReceiverElement>();
+
+        [NotMapped]
+        public string FileNameOriginal { get; set; }
+
+        [NotMapped]
+        public bool IsTempFile { get; set; }
+
+        [NotMapped]
+        public string Filename { get; set; }
+
+        [NotMapped]
+        public string Filepath { get; set; }
+
+        [NotMapped]
+        public Bitmap Thumbnail { get; set; }
+
+        [NotMapped]
+        public int PageCount { get; set; }
     }
 }

EnvelopeGenerator.Domain/Entities/EnvelopeHistory.cs

@@ -24,7 +24,7 @@ namespace EnvelopeGenerator.Domain.Entities
 
         [Required]
         [Column("STATUS")]
-        public int Status { get; set; }
+        public Constants.EnvelopeStatus  Status { get; set; }
 
         [Required]
         [Column("ADDED_WHEN", TypeName = "datetime")]
@@ -32,7 +32,7 @@ namespace EnvelopeGenerator.Domain.Entities
         public DateTime AddedWhen { get; set; }
 
         [Column("ACTION_DATE", TypeName = "datetime")]
-        public DateTime ActionDate { get; set; }
+        public DateTime ActionDate { get; set; } = DateTime.Now;
 
         [Column("COMMENT", TypeName = "nvarchar(max)")]
         public string Comment { get; set; }
@@ -42,5 +42,8 @@ namespace EnvelopeGenerator.Domain.Entities
 
         [ForeignKey("UserReference")]
         public virtual Receiver Receiver { get; set; }
+
+        [NotMapped]
+        public string StatusTranslated => My.Resources.Model.ResourceManager.GetString(Status.ToString());
     }
 }

EnvelopeGenerator.Domain/Entities/Receiver.cs

@@ -34,7 +34,7 @@ namespace EnvelopeGenerator.Domain.Entities
         [Column("TFA_REG_DEADLINE", TypeName = "datetime")]
         public DateTime TfaRegDeadline { get; set; }
 
-        public IEnumerable<EnvelopeReceiver> EnvelopeReceivers { get; set; }
+        public List<EnvelopeReceiver> EnvelopeReceivers { get; set; }
 
         [NotMapped]
         public string Name { get; set; }

EnvelopeGenerator.Domain/EnvelopeGenerator.Domain.csproj

@@ -16,6 +16,19 @@
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net462'">
 	  <PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
+	  <PackageReference Include="System.Drawing.Common" Version="4.7.3" />
+  </ItemGroup>
+	
+  <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
+	  <PackageReference Include="System.Drawing.Common" Version="7.0.0" />
+  </ItemGroup>
+	
+  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
+	  <PackageReference Include="System.Drawing.Common" Version="8.0.16" />
+  </ItemGroup>
+	
+  <ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
+	  <PackageReference Include="System.Drawing.Common" Version="9.0.5" />
   </ItemGroup>
 
   <ItemGroup>

EnvelopeGenerator.Extensions/DecodingExtensions.cs

@@ -1,5 +1,5 @@
 using System.Text;
-using static EnvelopeGenerator.Common.Constants;
+using static EnvelopeGenerator.Domain.Constants;
 
 namespace EnvelopeGenerator.Extensions
 {

EnvelopeGenerator.Extensions/EnvelopeGenerator.Extensions.csproj

@@ -20,7 +20,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\EnvelopeGenerator.Common\EnvelopeGenerator.Common.vbproj" />
+    <ProjectReference Include="..\EnvelopeGenerator.CommonServices\EnvelopeGenerator.CommonServices.vbproj" />
   </ItemGroup>
 
 </Project>

EnvelopeGenerator.Form/Controllers/BaseController.vb

@@ -1,6 +1,6 @@
 Imports DigitalData.Modules.Database
 Imports DigitalData.Modules.Base
-Imports EnvelopeGenerator.Common
+Imports EnvelopeGenerator.CommonServices
 Imports System.Data.SqlClient
 Imports EnvelopeGenerator.Domain.Entities
 

EnvelopeGenerator.Form/Controllers/EnvelopeEditorController.vb

@@ -2,8 +2,8 @@
 Imports System.IO
 Imports DevExpress.XtraBars.Docking
 Imports DigitalData.Modules.Logging
-Imports EnvelopeGenerator.Common
-Imports EnvelopeGenerator.Common.My
+Imports EnvelopeGenerator.CommonServices
+Imports EnvelopeGenerator.CommonServices.My
 Imports EnvelopeGenerator.Domain.Constants
 Imports EnvelopeGenerator.Domain.Entities
 
@@ -76,7 +76,7 @@ Public Class EnvelopeEditorController
 
         If EnvelopeModel.Insert(oEnvelope) Then
 
-            Dim newHistoryEntry As New EnvelopeHistoryEntry With {
+            Dim newHistoryEntry As New EnvelopeHistory With {
                 .EnvelopeId = oEnvelope.Id,
                 .Status = EnvelopeStatus.EnvelopeCreated,
                 .UserReference = oEnvelope.User.Email
@@ -183,7 +183,7 @@ Public Class EnvelopeEditorController
                 .FileNameOriginal = oFileInfo.Name,
                 .Thumbnail = Thumbnail.GetThumbnailFromPDFFile(oTempFilePath),
                 .PageCount = Thumbnail.GetPageCount(oTempFilePath),
-                .Byte_Data = ReadFile(oFixedPath)
+                .ByteData = ReadFile(oFixedPath)
             }
 
             Return oDocument