Update package versions and clean up code

- Bump `UserManager` package to version `1.1.1` in
  `EnvelopeGenerator.Application.csproj` and
  `EnvelopeGenerator.Infrastructure.csproj`.
- Add reference to `DigitalData.UserManager.Domain` version
  `3.2.1.0` and `System.ComponentModel.Annotations` version
  `4.7.0` in `EnvelopeGenerator.CommonServices.vbproj`.
- Add reference to `System.Drawing.Common` version `4.7.3`
  in `EnvelopeGenerator.CommonServices.vbproj`.
- Update `UserManager.Domain` package to version `3.2.1`
  in `EnvelopeGenerator.Domain.csproj`.
- Remove unused properties from `EGUser` class in
  `EGUser.cs`.
- Mark `EnvelopeReceiverRepository` as obsolete, suggesting
  to use `Repository` instead.
- Update `packages.config` to include new package versions.

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

@@ -1,11 +1,7 @@
 using AutoMapper;
 using EnvelopeGenerator.Application.Contracts.Repositories;
-using EnvelopeGenerator.Application.DTOs;
-using EnvelopeGenerator.CommonServices;
 using EnvelopeGenerator.Domain;
 using MediatR;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Logging;
 
 namespace EnvelopeGenerator.Application.EmailTemplates.Queries.Read;
 

EnvelopeGenerator.Application/EnvelopeGenerator.Application.csproj

@@ -24,11 +24,10 @@
 		<PackageReference Include="Otp.NET" Version="1.4.0" />
 		<PackageReference Include="QRCoder" Version="1.6.0" />
 		<PackageReference Include="QRCoder-ImageSharp" Version="0.10.0" />
-		<PackageReference Include="UserManager" Version="1.0.0" />
+		<PackageReference Include="UserManager" Version="1.1.1" />
 	</ItemGroup>
 
 	<ItemGroup>
-		<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,5 +1,4 @@
-using EnvelopeGenerator.CommonServices;
+using EnvelopeGenerator.Domain;
-using EnvelopeGenerator.Domain;
 
 namespace EnvelopeGenerator.Application.Envelopes.Queries.Read;
 

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

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

EnvelopeGenerator.CommonServices/EnvelopeGenerator.CommonServices.vbproj

@@ -84,6 +84,9 @@
     <Reference Include="DigitalData.Modules.Logging, Version=2.6.5.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\DigitalData.Modules.Logging.2.6.5\lib\net462\DigitalData.Modules.Logging.dll</HintPath>
     </Reference>
+    <Reference Include="DigitalData.UserManager.Domain, Version=3.2.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\UserManager.Domain.3.2.1\lib\net462\DigitalData.UserManager.Domain.dll</HintPath>
+    </Reference>
     <Reference Include="DocumentFormat.OpenXml, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8fb06cb64d019a17, processorArchitecture=MSIL">
       <HintPath>..\packages\DocumentFormat.OpenXml.3.2.0\lib\net46\DocumentFormat.OpenXml.dll</HintPath>
     </Reference>
@@ -207,6 +210,9 @@
     <Reference Include="System.Collections.Immutable, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Collections.Immutable.8.0.0\lib\net462\System.Collections.Immutable.dll</HintPath>
     </Reference>
+    <Reference Include="System.ComponentModel.Annotations, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.ComponentModel.Annotations.4.7.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
+    </Reference>
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Data" />
@@ -214,6 +220,9 @@
       <HintPath>..\packages\System.Data.Odbc.6.0.1\lib\net461\System.Data.Odbc.dll</HintPath>
     </Reference>
     <Reference Include="System.Drawing" />
+    <Reference Include="System.Drawing.Common, Version=4.0.0.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Drawing.Common.4.7.3\lib\net461\System.Drawing.Common.dll</HintPath>
+    </Reference>
     <Reference Include="System.IO.Compression" />
     <Reference Include="System.IO.Packaging, Version=8.0.0.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.IO.Packaging.8.0.1\lib\net462\System.IO.Packaging.dll</HintPath>

EnvelopeGenerator.CommonServices/Models/EnvelopeModel.vb

@@ -37,7 +37,7 @@ Public Class EnvelopeModel
             .AddedWhen = pRow.Item("ADDED_WHEN"),
             .ChangedWhen = pRow.ItemEx(Of Date)("CHANGED_WHEN", Nothing),
             .CertificationType = ObjectEx.ToEnum(Of CertificationType)(pRow.ItemEx("CERTIFICATION_TYPE", CertificationType.AdvancedElectronicSignature.ToString())),
-            .User = New User(),
+            .User = New EGUser(),
             .ExpiresWhen = pRow.ItemEx(Of Date)("EXPIRES_WHEN", Nothing),
             .ExpiresWarningWhen = pRow.ItemEx(Of Date)("EXPIRES_WARNING_WHEN", Nothing),
             .ExpiresWhenDays = pRow.ItemEx("EXPIRES_WHEN_DAYS", 0),

EnvelopeGenerator.CommonServices/Models/State.vb

@@ -4,7 +4,7 @@ Imports EnvelopeGenerator.Domain.Entities
 
 Public Class State
     Public Property UserId As Integer
-    Public Property User As User
+    Public Property User As EGUser
     Public Property Config As Config
     Public Property DbConfig As DbConfig
     Public Property LogConfig As LogConfig

EnvelopeGenerator.CommonServices/Models/UserModel.vb

@@ -9,8 +9,8 @@ Public Class UserModel
         MyBase.New(pState)
     End Sub
 
-    Private Function ToUser(pRow As DataRow) As User
+    Private Function ToUser(pRow As DataRow) As EGUser
-        Dim oUser = New User() With {
+        Dim oUser = New EGUser() With {
             .Id = pRow.ItemEx("GUID", 0),
             .Prename = pRow.ItemEx("PRENAME", ""),
             .Name = pRow.ItemEx("NAME", ""),
@@ -22,7 +22,7 @@ Public Class UserModel
         Return oUser
     End Function
 
-    Public Function CheckUserLogin(pUser As User) As User
+    Public Function CheckUserLogin(pUser As EGUser) As EGUser
         Try
             Dim oSql = $"SELECT * FROM [dbo].[FNDD_LOGIN_USER_MODULE] ('{pUser.Username}', 'SIG_ENV_CR', 1)"
             Dim oTable As DataTable = Database.GetDatatable(oSql)
@@ -45,7 +45,7 @@ Public Class UserModel
         End Try
     End Function
 
-    Public Function SelectUser() As User
+    Public Function SelectUser() As EGUser
         Try
             Dim oSql = $"SELECT * FROM [dbo].[TBDD_USER] WHERE GUID = {State.UserId}"
             Dim oTable = Database.GetDatatable(oSql)
@@ -58,7 +58,7 @@ Public Class UserModel
         End Try
     End Function
 
-    Public Function SelectUser(pUserID As Integer) As User
+    Public Function SelectUser(pUserID As Integer) As EGUser
         Try
             Dim oSql = $"SELECT * FROM [dbo].[TBDD_USER] WHERE GUID = {pUserID}"
             Dim oTable = Database.GetDatatable(oSql)

EnvelopeGenerator.CommonServices/packages.config

@@ -30,7 +30,9 @@
   <package id="System.Buffers" version="4.6.0" targetFramework="net462" />
   <package id="System.CodeDom" version="8.0.0" targetFramework="net462" />
   <package id="System.Collections.Immutable" version="8.0.0" targetFramework="net462" />
+  <package id="System.ComponentModel.Annotations" version="4.7.0" targetFramework="net462" />
   <package id="System.Data.Odbc" version="6.0.1" targetFramework="net462" />
+  <package id="System.Drawing.Common" version="4.7.3" targetFramework="net462" />
   <package id="System.IO.Packaging" version="8.0.1" targetFramework="net462" />
   <package id="System.Management" version="8.0.0" targetFramework="net462" />
   <package id="System.Memory" version="4.6.0" targetFramework="net462" />
@@ -41,4 +43,5 @@
   <package id="System.Text.Json" version="8.0.5" targetFramework="net462" />
   <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net462" />
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net462" />
+  <package id="UserManager.Domain" version="3.2.1" targetFramework="net462" />
 </packages>

EnvelopeGenerator.Domain/Entities/EGUser.cs

@@ -0,0 +1,29 @@
+using System.ComponentModel.DataAnnotations.Schema;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel;
+using DigitalData.UserManager.Domain.Entities;
+
+#if NETFRAMEWORK
+using System;
+#endif
+
+namespace EnvelopeGenerator.Domain.Entities
+{
+    [Table("TBDD_USER", Schema = "dbo")]
+    public class EGUser : User
+    {
+        #region FORM_APP
+        [NotMapped]
+        public bool HasAccess { get; set; }
+
+        [NotMapped]
+        public bool IsAdmin { get; set; }
+
+        [NotMapped]
+        public bool GhostModeActive { get; set; }
+
+        [NotMapped]
+        public string FullName => $"{Prename} {Name}";
+        #endregion
+    }
+}

EnvelopeGenerator.Domain/Entities/Envelope.cs

@@ -113,7 +113,7 @@ namespace EnvelopeGenerator.Domain.Entities
 
         // TODO: * Check the Form App and remove the default value
         [ForeignKey("UserId")]
-        public User User { get; set; } = new User();
+        public EGUser User { get; set; } = new EGUser();
 
         [ForeignKey("EnvelopeTypeId")]
         public EnvelopeType EnvelopeType { get; set; }

EnvelopeGenerator.Domain/Entities/EnvelopeHistory.cs

@@ -38,7 +38,7 @@ namespace EnvelopeGenerator.Domain.Entities
         public string Comment { get; set; }
 
         [ForeignKey("UserReference")]
-        public virtual User Sender { get; set; }
+        public virtual EGUser Sender { get; set; }
 
         [ForeignKey("UserReference")]
         public virtual Receiver Receiver { get; set; }

EnvelopeGenerator.Domain/Entities/User.cs

@@ -1,113 +0,0 @@
-using System.ComponentModel.DataAnnotations.Schema;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel;
-#if NETFRAMEWORK
-using System;
-#endif
-
-namespace EnvelopeGenerator.Domain.Entities
-{
-    [Table("TBDD_USER", Schema = "dbo")]
-    public class User
-    {
-        [Column("GUID")]
-        [Key]
-        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
-        public int Id { get; set; } = 0;
-
-        [StringLength(50)]
-        [Column("ADDED_WHO")]
-        public string AddedWho { get; set; }
-
-        [StringLength(50)]
-        [Column("CHANGED_WHO")]
-        public string ChangedWho { get; set; }
-
-        //TODO: assign it to default value in create dto, not here!
-        [Column("ADDED_WHEN", TypeName = "datetime")]
-        [DefaultValue("GETDATE()")]
-        public DateTime AddedWhen { get; set; } = DateTime.Now;
-
-        [Column("CHANGED_WHEN", TypeName = "datetime")]
-        public DateTime ChangedWhen { get; set; }
-
-        [Column("PRENAME")]
-        [StringLength(50)]
-        public string Prename { get; set; }
-
-        [Column("NAME")]
-        [StringLength(50)]
-        public string Name { get; set; }
-
-        [Required]
-        [Column("USERNAME")]
-        [StringLength(50)]
-        public string Username { get; set; }
-
-        [Column("SHORTNAME")]
-        [StringLength(30)]
-        public string Shortname { get; set; }
-
-        [Column("EMAIL")]
-        [StringLength(100)]
-        public string Email { get; set; }
-
-        [Required]
-        [Column("LANGUAGE")]
-        [StringLength(5)]
-        [DefaultValue("de-DE")]
-        public string Language { get; set; }
-
-        [Column("COMMENT")]
-        [StringLength(500)]
-        public string Comment { get; set; }
-
-        [Column("DELETED")]
-        public bool Deleted { get; set; }
-
-        [Required]
-        [Column("DATE_FORMAT")]
-        [StringLength(10)]
-        [DefaultValue("dd.MM.yyyy")]
-        public string DateFormat { get; set; }
-
-        [Required]
-        [Column("ACTIVE")]
-        public bool Active { get; set; }
-
-        [Required]
-        [Column("GENERAL_VIEWER")]
-        [StringLength(30)]
-        [DefaultValue("NONE")]
-        public string GeneralViewer { get; set; }
-
-        [Required]
-        [Column("WAN_ENVIRONMENT")]
-        public bool WanEnvironment { get; set; }
-
-        [Required]
-        [Column("USERID_FK_INT_ECM")]
-        public int UseridFkIntEcm { get; set; }
-
-        [Column("DELETED_WHEN")]
-        public DateTime DeletedWhen { get; set; }
-
-        [Column("DELETED_WHO")]
-        [StringLength(50)]
-        public string DeletedWho { get; set; }
-
-        #region FORM_APP
-        [NotMapped]
-        public bool HasAccess { get; set; }
-
-        [NotMapped]
-        public bool IsAdmin { get; set; }
-
-        [NotMapped]
-        public bool GhostModeActive { get; set; }
-
-        [NotMapped]
-        public string FullName => $"{Prename} {Name}";
-        #endregion
-    }
-}

EnvelopeGenerator.Domain/EnvelopeGenerator.Domain.csproj

@@ -33,6 +33,7 @@
 
   <ItemGroup>
     <PackageReference Include="DigitalData.EmailProfilerDispatcher.Abstraction.Attributes" Version="1.0.0" />
+    <PackageReference Include="UserManager.Domain" Version="3.2.1" />
   </ItemGroup>
 
   <ItemGroup>

EnvelopeGenerator.Extensions/EnvelopeGenerator.Extensions.csproj

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

EnvelopeGenerator.Form/ModuleSettings.vb

@@ -11,7 +11,7 @@ Module ModuleSettings
     Public DB_DD_ECM As MSSQLServer = Nothing
     Public DEF_TF_ENABLED As Boolean = False
     Public DEF_TF_ENABLED_WITH_PHONE As Boolean = False
-    Public MYUSER As User
+    Public MYUSER As EGUser
     Public MyTempFiles As TempFiles
     Public SQL_REP_ENV_USER_LM As String = ""
     Public SQL_REP_ENV_USER_TM As String = ""

EnvelopeGenerator.GeneratorAPI/EnvelopeGenerator.GeneratorAPI.csproj

@@ -20,7 +20,7 @@
   <ItemGroup>
     <PackageReference Include="AspNetCore.Scalar" Version="1.1.8" />
     <PackageReference Include="DigitalData.Auth.Client" Version="1.3.7" />
-    <PackageReference Include="DigitalData.Core.API" Version="2.2.0" />
+    <PackageReference Include="DigitalData.Core.API" Version="2.2.1" />
     <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.4" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.4" />
     <PackageReference Include="NLog" Version="5.2.5" />

EnvelopeGenerator.Infrastructure/EnvelopeGenerator.Infrastructure.csproj

@@ -12,7 +12,7 @@
     <PackageReference Include="DigitalData.Core.Infrastructure" Version="2.1.1" />
     <PackageReference Include="DigitalData.Core.Infrastructure.AutoMapper" Version="1.0.3" />
     <PackageReference Include="DigitalData.EmailProfilerDispatcher" Version="3.1.1" />
-	<PackageReference Include="UserManager" Version="1.0.0" />
+	<PackageReference Include="UserManager" Version="1.1.1" />
   </ItemGroup>
 
   <ItemGroup>

EnvelopeGenerator.Infrastructure/Repositories/EnvlopeReceiverRepository.cs

@@ -2,12 +2,11 @@
 using EnvelopeGenerator.Domain.Entities;
 using EnvelopeGenerator.Application.Contracts.Repositories;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.AspNetCore.Http.HttpResults;
 using EnvelopeGenerator.Application.Exceptions;
-using EnvelopeGenerator.CommonServices.My.Resources;
 
 namespace EnvelopeGenerator.Infrastructure.Repositories;
 
+[Obsolete("Use Repository")]
 public class EnvelopeReceiverRepository : CRUDRepository<EnvelopeReceiver, (int Envelope, int Receiver), EGDbContext>, IEnvelopeReceiverRepository
 {
     public EnvelopeReceiverRepository(EGDbContext dbContext) : base(dbContext, dbContext.EnvelopeReceivers)

EnvelopeGenerator.Tests.Application/EnvelopeGenerator.Tests.Application.csproj

@@ -25,7 +25,7 @@
     <PackageReference Include="coverlet.collector" Version="6.0.0" />
     <PackageReference Include="DigitalData.Core.Abstraction.Application" Version="1.0.0" />
     <PackageReference Include="DigitalData.Core.Abstractions" Version="4.0.0" />
-    <PackageReference Include="DigitalData.Core.API" Version="2.2.0" />
+    <PackageReference Include="DigitalData.Core.API" Version="2.2.1" />
     <PackageReference Include="DigitalData.Core.Application" Version="3.3.4" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.20" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.20" />

EnvelopeGenerator.Web/EnvelopeGenerator.Web.csproj

@@ -2101,7 +2101,7 @@
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="13.0.1" />
     <PackageReference Include="BuildBundlerMinifier2022" Version="2.9.9" />
-    <PackageReference Include="DigitalData.Core.API" Version="2.2.0" />
+    <PackageReference Include="DigitalData.Core.API" Version="2.2.1" />
     <PackageReference Include="DigitalData.EmailProfilerDispatcher" Version="3.1.1" />
     <PackageReference Include="DigitalData.Modules.Base" Version="1.3.8" />
     <PackageReference Include="DigitalData.Modules.Config" Version="1.3.0" />