Merge branch 'master' of github.com:microting/eform-sdk-dotnet

Author: renemadsen

eFormCore/Core.cs

@@ -2888,9 +2888,7 @@ await db.Sites.FirstOrDefaultAsync(x => x.MicrotingUid == siteResult.Item1.SiteI
                 await unit.Create(db).ConfigureAwait(false);
             }
 
-            string legacyEmail = siteId + "." + customerNo + "@invalid.invalid";
-
-            WorkerDto workerDto = await Advanced_WorkerCreate(userFirstName, userLastName, userEmail, legacyEmail)
+            WorkerDto workerDto = await Advanced_WorkerCreate(userFirstName, userLastName, userEmail)
                 .ConfigureAwait(false);
             await Advanced_SiteWorkerCreate(siteDto, workerDto).ConfigureAwait(false);
 
@@ -2981,8 +2979,7 @@ public async Task<bool> SiteUpdate(int siteMicrotingUid, string siteName, string
                 //if (String.IsNullOrEmpty)
             }
 
-            await Advanced_WorkerUpdate((int)siteDto.WorkerUid, userFirstName, userLastName, userEmail,
-                siteDto.Email).ConfigureAwait(false);
+            await Advanced_WorkerUpdate((int)siteDto.WorkerUid, userFirstName, userLastName, userEmail).ConfigureAwait(false);
             return true;
         }
         catch (Exception ex)
@@ -4701,8 +4698,7 @@ public async Task<bool> Advanced_SiteItemDelete(int microtingUid)
     //
 
     // workers
-    public async Task<WorkerDto> Advanced_WorkerCreate(string firstName, string lastName, string email,
-        string legacyEmail)
+    public async Task<WorkerDto> Advanced_WorkerCreate(string firstName, string lastName, string email)
     {
         string methodName = "Core.Advanced_WorkerCreate";
         try
@@ -4713,7 +4709,7 @@ public async Task<WorkerDto> Advanced_WorkerCreate(string firstName, string last
             Log.LogVariable(methodName, nameof(lastName), lastName);
             Log.LogVariable(methodName, nameof(email), email);
 
-            WorkerDto workerDto = await _communicator.WorkerCreate(firstName, lastName, legacyEmail)
+            WorkerDto workerDto = await _communicator.WorkerCreate(firstName, lastName, email)
                 .ConfigureAwait(false);
             int workerUId = workerDto.WorkerUId;
 
@@ -4788,8 +4784,7 @@ public async Task<List<WorkerDto>> Advanced_WorkerReadAll(string workflowState,
         }
     }
 
-    public async Task<bool> Advanced_WorkerUpdate(int workerId, string firstName, string lastName, string email,
-        string legacyEmail)
+    public async Task<bool> Advanced_WorkerUpdate(int workerId, string firstName, string lastName, string email)
     {
         string methodName = "Core.Advanced_WorkerUpdate";
         try
@@ -4804,7 +4799,7 @@ public async Task<bool> Advanced_WorkerUpdate(int workerId, string firstName, st
             if (await _sqlController.WorkerRead(workerId).ConfigureAwait(false) == null)
                 return false;
 
-            bool success = await _communicator.WorkerUpdate(workerId, firstName, lastName, legacyEmail)
+            bool success = await _communicator.WorkerUpdate(workerId, firstName, lastName, email)
                 .ConfigureAwait(false);
             if (!success)
                 return false;

eFormCore/Microting.eForm.csproj

@@ -283,13 +283,13 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="AWSSDK.Core" Version="4.0.1.2" />
-        <PackageReference Include="AWSSDK.S3" Version="4.0.7.14" />
-        <PackageReference Include="AWSSDK.SQS" Version="4.0.1.12" />
+        <PackageReference Include="AWSSDK.Core" Version="4.0.1.3" />
+        <PackageReference Include="AWSSDK.S3" Version="4.0.8" />
+        <PackageReference Include="AWSSDK.SQS" Version="4.0.1.13" />
         <PackageReference Include="Castle.Core" Version="5.2.1" />
         <PackageReference Include="DocumentFormat.OpenXml" Version="3.3.0" />
         <PackageReference Include="Google.Protobuf" Version="3.33.0" />
-        <PackageReference Include="Grpc.Tools" Version="2.72.0">
+        <PackageReference Include="Grpc.Tools" Version="2.76.0">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
@@ -304,8 +304,8 @@
         <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.10" />
         <PackageReference Include="Microting.Castle.Windsor" Version="6.0.1" />
         <PackageReference Include="Microting.Rebus" Version="9.0.5" />
-        <PackageReference Include="Microting.Rebus.Castle.Windsor" Version="9.0.5" />
-        <PackageReference Include="Microting.Rebus.RabbitMq" Version="9.0.10" />
+        <PackageReference Include="Microting.Rebus.Castle.Windsor" Version="9.0.6" />
+        <PackageReference Include="Microting.Rebus.RabbitMq" Version="9.0.11" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
         <PackageReference Include="Microting.EntityFrameworkCore.MySql" Version="9.0.8" />
         <PackageReference Include="Polly" Version="8.6.4" />

eFormSDK.CheckLists.Tests/eFormSDK.CheckLists.Tests.csproj

@@ -15,8 +15,8 @@
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
         <PackageReference Include="NUnit3TestAdapter" Version="5.2.0" />
-        <PackageReference Include="Testcontainers" Version="4.7.0" />
-        <PackageReference Include="Testcontainers.MariaDb" Version="4.7.0" />
+        <PackageReference Include="Testcontainers" Version="4.8.1" />
+        <PackageReference Include="Testcontainers.MariaDb" Version="4.8.1" />
     </ItemGroup>
 
     <ItemGroup>