Merge pull request #642 from TransactionProcessing/task/#627_update_shared_nugets

StuartFerguson · web-flow · commit 21c300c0ea03 · 2025-11-25T15:55:58.000Z
shared nugets updated
diff --git a/.github/workflows/nightlybuild.yml b/.github/workflows/nightlybuild.yml
@@ -55,13 +55,13 @@ jobs:
       run: docker build . --file FileProcessor/Dockerfile --tag fileprocessor:latest
            
     - name: Run Integration Tests        
-      run: dotnet test "FileProcessor.IntegrationTests\FileProcessor.IntegrationTests.csproj" --filter Category=Nightly
+      run: dotnet test "FileProcessor.IntegrationTests\FileProcessor.IntegrationTests.csproj"
 
-    - name: Run Integration Tests 1       
-      run: dotnet test "FileProcessor.IntegrationTests\FileProcessor.IntegrationTests.csproj" --filter Category=Nightly1
+    #- name: Run Integration Tests 1       
+      #run: dotnet test "FileProcessor.IntegrationTests\FileProcessor.IntegrationTests.csproj" --filter Category=Nightly1
 
-    - name: Run Integration Tests 2        
-      run: dotnet test "FileProcessor.IntegrationTests\FileProcessor.IntegrationTests.csproj" --filter Category=Nightly2      
+    #- name: Run Integration Tests 2        
+      #run: dotnet test "FileProcessor.IntegrationTests\FileProcessor.IntegrationTests.csproj" --filter Category=Nightly2      
 
     - uses: actions/upload-artifact@v4.4.0
       if: ${{ failure() }}
diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml
@@ -45,11 +45,11 @@ jobs:
     - name: Run Integration Tests        
       run: dotnet test "FileProcessor.IntegrationTests\FileProcessor.IntegrationTests.csproj" --filter Category=PRTest
 
-    - name: Run Integration Tests 1       
-      run: dotnet test "FileProcessor.IntegrationTests\FileProcessor.IntegrationTests.csproj" --filter Category=PRTest1
+    #- name: Run Integration Tests 1       
+    #  run: dotnet test "FileProcessor.IntegrationTests\FileProcessor.IntegrationTests.csproj" --filter Category=PRTest1
 
-    - name: Run Integration Tests 2        
-      run: dotnet test "FileProcessor.IntegrationTests\FileProcessor.IntegrationTests.csproj" --filter Category=PRTest2
+    #- name: Run Integration Tests 2        
+    #  run: dotnet test "FileProcessor.IntegrationTests\FileProcessor.IntegrationTests.csproj" --filter Category=PRTest2
       
     - uses: actions/upload-artifact@v4.4.0
       if: ${{ failure() }}
diff --git a/FileProcessor.BusinessLogic/FileProcessor.BusinessLogic.csproj b/FileProcessor.BusinessLogic/FileProcessor.BusinessLogic.csproj
@@ -8,12 +8,12 @@
 		<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.10" />
 		<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.10" />
 		<PackageReference Include="SecurityService.Client" Version="2025.10.1" />
-		<PackageReference Include="Shared" Version="2025.11.5" />
-		<PackageReference Include="Shared.DomainDrivenDesign" Version="2025.11.5" />
+		<PackageReference Include="Shared" Version="2025.11.11" />
+		<PackageReference Include="Shared.DomainDrivenDesign" Version="2025.11.11" />
 		<PackageReference Include="MediatR" Version="13.1.0" />
-		<PackageReference Include="Shared.EventStore" Version="2025.11.5" />
+		<PackageReference Include="Shared.EventStore" Version="2025.11.11" />
 		<PackageReference Include="System.IO.Abstractions" Version="22.0.16" />
-		<PackageReference Include="TransactionProcessor.Client" Version="2025.10.1" />
+		<PackageReference Include="TransactionProcessor.Client" Version="2025.10.2-build261" />
 		<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.10" />
 		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.10" />
 		<PackageReference Include="TransactionProcessor.Database" Version="2025.10.1" />
diff --git a/FileProcessor.Client/FileProcessor.Client.csproj b/FileProcessor.Client/FileProcessor.Client.csproj
@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ClientProxyBase" Version="2025.11.5" />
-    <PackageReference Include="Shared.Results" Version="2025.11.5" />
+    <PackageReference Include="ClientProxyBase" Version="2025.11.11" />
+    <PackageReference Include="Shared.Results" Version="2025.11.11" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/FileProcessor.Client/FileProcessorClient.cs b/FileProcessor.Client/FileProcessorClient.cs
@@ -62,7 +62,7 @@ public async Task<Result<FileDetails>> GetFile(String accessToken,
             String requestUri = this.BuildRequestUrl($"/api/files/{fileId}?estateId={estateId}");
 
             try {
-                Result<FileDetails> result = await this.SendGetRequest<FileDetails> (requestUri, accessToken, cancellationToken);
+                Result<FileDetails> result = await this.SendHttpGetRequest<FileDetails> (requestUri, accessToken, cancellationToken);
 
                 if (result.IsFailed)
                     return ResultHelpers.CreateFailure(result);
@@ -98,7 +98,7 @@ public async Task<Result<FileImportLog>> GetFileImportLog(String accessToken,
             }
 
             try {
-                Result<FileImportLog> result = await this.SendGetRequest<FileImportLog>(requestUri, accessToken, cancellationToken);
+                Result<FileImportLog> result = await this.SendHttpGetRequest<FileImportLog>(requestUri, accessToken, cancellationToken);
 
                 if (result.IsFailed)
                     return ResultHelpers.CreateFailure(result);
@@ -138,7 +138,7 @@ public async Task<Result<FileImportLogList>> GetFileImportLogs(String accessToke
             }
 
             try {
-                Result<FileImportLogList> result = await this.SendGetRequest<FileImportLogList>(requestUri, accessToken, cancellationToken);
+                Result<FileImportLogList> result = await this.SendHttpGetRequest<FileImportLogList>(requestUri, accessToken, cancellationToken);
 
                 if (result.IsFailed)
                     return ResultHelpers.CreateFailure(result);
diff --git a/FileProcessor.File.DomainEvents/FileProcessor.File.DomainEvents.csproj b/FileProcessor.File.DomainEvents/FileProcessor.File.DomainEvents.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Shared.DomainDrivenDesign" Version="2025.11.5" />
+		<PackageReference Include="Shared.DomainDrivenDesign" Version="2025.11.11" />
 	</ItemGroup>
 
 </Project>
diff --git a/FileProcessor.FileAggregate/FileProcessor.FileAggregate.csproj b/FileProcessor.FileAggregate/FileProcessor.FileAggregate.csproj
@@ -7,8 +7,8 @@
 	<ItemGroup>
 		<PackageReference Include="Grpc.Net.Client" Version="2.71.0" />
 		<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.10" />
-		<PackageReference Include="Shared.DomainDrivenDesign" Version="2025.11.5" />
-		<PackageReference Include="Shared.EventStore" Version="2025.11.5" />
+		<PackageReference Include="Shared.DomainDrivenDesign" Version="2025.11.11" />
+		<PackageReference Include="Shared.EventStore" Version="2025.11.11" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/FileProcessor.FileImportLog.DomainEvents/FileProcessor.FileImportLog.DomainEvents.csproj b/FileProcessor.FileImportLog.DomainEvents/FileProcessor.FileImportLog.DomainEvents.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Shared.DomainDrivenDesign" Version="2025.11.5" />
+    <PackageReference Include="Shared.DomainDrivenDesign" Version="2025.11.11" />
   </ItemGroup>
 
 </Project>
diff --git a/FileProcessor.FileImportLogAggregate/FileProcessor.FileImportLogAggregate.csproj b/FileProcessor.FileImportLogAggregate/FileProcessor.FileImportLogAggregate.csproj
@@ -7,7 +7,7 @@
   <ItemGroup>
     <PackageReference Include="Grpc.Net.Client" Version="2.71.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.10" />
-    <PackageReference Include="Shared.EventStore" Version="2025.11.5" />
+    <PackageReference Include="Shared.EventStore" Version="2025.11.11" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/FileProcessor.IntegrationTesting.Helpers/FileProcessor.IntegrationTesting.Helpers.csproj b/FileProcessor.IntegrationTesting.Helpers/FileProcessor.IntegrationTesting.Helpers.csproj
@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-	  <PackageReference Include="Shared.IntegrationTesting" Version="2025.11.5" />
-	  <PackageReference Include="TransactionProcessor.IntegrationTesting.Helpers" Version="2025.10.1" />
+	  <PackageReference Include="Shared.IntegrationTesting" Version="2025.11.11" />
+	  <PackageReference Include="TransactionProcessor.IntegrationTesting.Helpers" Version="2025.10.2-build261" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/FileProcessor.IntegrationTests/Common/DockerHelper.cs b/FileProcessor.IntegrationTests/Common/DockerHelper.cs
@@ -11,7 +11,7 @@ namespace FileProcessor.IntegrationTests.Common
     using Shared.IntegrationTesting;
     using TransactionProcessor.Client;
 
-    public class DockerHelper : global::Shared.IntegrationTesting.DockerHelper{
+    public class DockerHelper : global::Shared.IntegrationTesting.TestContainers.DockerHelper{
         #region Fields
         
         public HttpClient TestHostHttpClient;
@@ -63,15 +63,6 @@ public override async Task CreateSubscriptions(){
             }
         }
 
-        //protected override EventStoreClientSettings ConfigureEventStoreSettings()
-        //{
-        //    string str = $"esdb://127.0.0.1:{this.EventStoreHttpPort}?tls=false&tlsVerifyCert=false&defaultDeadline=30000";
-        //    if (this.IsSecureEventStore) {
-        //        str = $"esdb://admin:changeit@127.0.0.1:{this.EventStoreHttpPort}?tls=true&tlsVerifyCert=false&defaultDeadline=30000";
-        //    }
-        //    return EventStoreClientSettings.Create(str);
-        //}
-
         public override async Task StartContainersForScenarioRun(String scenarioName, DockerServices dockerServices){
             
             await base.StartContainersForScenarioRun(scenarioName, dockerServices);
diff --git a/FileProcessor.IntegrationTests/Common/GenericSteps.cs b/FileProcessor.IntegrationTests/Common/GenericSteps.cs
@@ -48,8 +48,6 @@ public async Task StartSystem()
 
             await Setup.GlobalSetup(this.TestingContext.DockerHelper);
 
-            this.TestingContext.DockerHelper.SqlServerContainer = Setup.DatabaseServerContainer;
-            this.TestingContext.DockerHelper.SqlServerNetwork = Setup.DatabaseServerNetwork;
             this.TestingContext.DockerHelper.DockerCredentials = Setup.DockerCredentials;
             this.TestingContext.DockerHelper.SqlCredentials = Setup.SqlCredentials;
             this.TestingContext.DockerHelper.SqlServerContainerName = "sharedsqlserver";
@@ -64,7 +62,7 @@ public async Task StartSystem()
 
         [AfterScenario]
         public async Task StopSystem(){
-            DockerServices shareDockerServices = DockerServices.SqlServer;
+            DockerServices shareDockerServices = DockerServices.None;
             
             this.TestingContext.Logger.LogInformation("About to Stop Containers for Scenario Run");
             await this.TestingContext.DockerHelper.StopContainersForScenarioRun(shareDockerServices).ConfigureAwait(false);
diff --git a/FileProcessor.IntegrationTests/Common/Setup.cs b/FileProcessor.IntegrationTests/Common/Setup.cs
@@ -21,44 +21,12 @@
     [Binding]
     public class Setup
     {
-        public static IContainerService DatabaseServerContainer;
-        public static INetworkService DatabaseServerNetwork;
         public static (String usename, String password) SqlCredentials = ("sa", "thisisalongpassword123!");
         public static (String url, String username, String password) DockerCredentials = ("https://www.docker.com", "stuartferguson", "Sc0tland");
 
-        static object padLock = new object(); // Object to lock on
-
         public static async Task GlobalSetup(DockerHelper dockerHelper)
         {
-            Environment.SetEnvironmentVariable("FLUENTDOCKER_LOGLEVEL", "trace");
-            Environment.SetEnvironmentVariable("FLUENTDOCKER_NOSUDO", "true");
-            Environment.SetEnvironmentVariable("FLUENTDOCKER_PATH", "/usr/bin/docker");
-
             ShouldlyConfiguration.DefaultTaskTimeout = TimeSpan.FromMinutes(1);
-            dockerHelper.SqlCredentials = Setup.SqlCredentials;
-            dockerHelper.DockerCredentials = Setup.DockerCredentials;
-            dockerHelper.SqlServerContainerName = "sharedsqlserver";
-
-            lock (Setup.padLock)
-            {
-                Setup.DatabaseServerNetwork = dockerHelper.SetupTestNetwork("sharednetwork");
-
-                dockerHelper.Logger.LogInformation("in start SetupSqlServerContainer");
-                Setup.DatabaseServerContainer = dockerHelper.SetupSqlServerContainer(Setup.DatabaseServerNetwork).Result;
-            }
-        }
-
-        public static String GetConnectionString(String databaseName)
-        {
-            return $"server={Setup.DatabaseServerContainer.Name};database={databaseName};user id={Setup.SqlCredentials.usename};password={Setup.SqlCredentials.password}";
-        }
-
-        public static String GetLocalConnectionString(String databaseName)
-        {
-            Int32 databaseHostPort = Setup.DatabaseServerContainer.ToHostExposedEndpoint("1433/tcp").Port;
-
-            return $"server=localhost,{databaseHostPort};database={databaseName};user id={Setup.SqlCredentials.usename};password={Setup.SqlCredentials.password}";
         }
-
     }
 }
diff --git a/FileProcessor.IntegrationTests/Features/GetFileImportDetails.feature b/FileProcessor.IntegrationTests/Features/GetFileImportDetails.feature
@@ -81,7 +81,7 @@ Background:
 	| Deposit1  | 300.00 | Today    | Test Merchant 1 | Test Estate 1 |
 	| Deposit1  | 300.00 | Today    | Test Merchant 2 | Test Estate 1 |
 
-@PRTest1
+@PRTest
 @Nightly1
 Scenario: Get File Import Log Details
 	Given I have a file named 'SafarcomTopup1.txt' with the following contents
diff --git a/FileProcessor.IntegrationTests/Features/GetFileImportDetails.feature.cs b/FileProcessor.IntegrationTests/Features/GetFileImportDetails.feature.cs
diff --git a/FileProcessor.IntegrationTests/Features/ProcessTopupCSV.feature.cs b/FileProcessor.IntegrationTests/Features/ProcessTopupCSV.feature.cs
diff --git a/FileProcessor.IntegrationTests/Features/ProcessVoucherCSV.feature b/FileProcessor.IntegrationTests/Features/ProcessVoucherCSV.feature
diff --git a/FileProcessor.IntegrationTests/Features/ProcessVoucherCSV.feature.cs b/FileProcessor.IntegrationTests/Features/ProcessVoucherCSV.feature.cs
diff --git a/FileProcessor.IntegrationTests/FileProcessor.IntegrationTests.csproj b/FileProcessor.IntegrationTests/FileProcessor.IntegrationTests.csproj
diff --git a/FileProcessor/FileProcessor.csproj b/FileProcessor/FileProcessor.csproj
