Refactor integration tests to remove EstateManagement

TransactionProcessorACL.BusinessLogic.Tests/TransactionProcessorACL.BusinessLogic.Tests.csproj

@@ -13,6 +13,8 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageReference Include="Moq" Version="4.20.70" />
     <PackageReference Include="Shouldly" Version="4.2.1" />
+    <PackageReference Include="TransactionProcessor.Client" Version="2025.1.5-build147" />
+    <PackageReference Include="TransactionProcessor.IntegrationTesting.Helpers" Version="2025.1.5-build147" />
     <PackageReference Include="xunit" Version="2.7.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
       <PrivateAssets>all</PrivateAssets>

TransactionProcessorACL.BusinessLogic/TransactionProcessorACL.BusinessLogic.csproj

@@ -8,9 +8,7 @@
     <PackageReference Include="MediatR" Version="12.2.0" />
     <PackageReference Include="SecurityService.Client" Version="2025.1.1" />
     <PackageReference Include="Shared" Version="2025.1.2" />
-    <PackageReference Include="TransactionProcessor.Client" Version="2024.8.2-build119" />
-    <PackageReference Include="TransactionProcessor.Float.DomainEvents" Version="2024.8.2-build119" />
-    <PackageReference Include="TransactionProcessor.IntegrationTesting.Helpers" Version="2024.8.2-build119" />
+    <PackageReference Include="TransactionProcessor.Client" Version="2025.1.5-build147" />
   </ItemGroup>
 
   <ItemGroup>

TransactionProcessorACL.IntegrationTests/Common/DockerHelper.cs

@@ -12,8 +12,6 @@ namespace TransactionProcessor.IntegrationTests.Common
     using Ductus.FluentDocker.Executors;
     using Ductus.FluentDocker.Services;
     using Ductus.FluentDocker.Services.Extensions;
-    using EstateManagement.Client;
-    using EstateManagement.Database.Contexts;
     using EventStore.Client;
     using global::Shared.IntegrationTesting;
     using SecurityService.Client;
@@ -26,11 +24,6 @@ public class DockerHelper : global::Shared.IntegrationTesting.DockerHelper
     {
         #region Fields
 
-        /// <summary>
-        /// The estate client
-        /// </summary>
-        public IEstateClient EstateClient;
-
         /// <summary>
         /// The HTTP client
         /// </summary>
@@ -74,7 +67,6 @@ public DockerHelper()
         public override async Task CreateSubscriptions(){
             List<(String streamName, String groupName, Int32 maxRetries)> subscriptions = new List<(String streamName, String groupName, Int32 maxRetries)>();
             subscriptions.AddRange(MessagingService.IntegrationTesting.Helpers.SubscriptionsHelper.GetSubscriptions());
-            subscriptions.AddRange(EstateManagement.IntegrationTesting.Helpers.SubscriptionsHelper.GetSubscriptions());
             subscriptions.AddRange(TransactionProcessor.IntegrationTesting.Helpers.SubscriptionsHelper.GetSubscriptions());
 
             foreach ((String streamName, String groupName, Int32 maxRetries) subscription in subscriptions)
@@ -106,10 +98,8 @@ public override async Task StartContainersForScenarioRun(String scenarioName, Do
 
                 }
             }
-
-
+
             // Setup the base address resolvers
-            String EstateManagementBaseAddressResolver(String api) => $"http://127.0.0.1:{this.EstateManagementPort}";
             String SecurityServiceBaseAddressResolver(String api) => $"https://127.0.0.1:{this.SecurityServicePort}";
             String TransactionProcessorBaseAddressResolver(String api) => $"http://127.0.0.1:{this.TransactionProcessorPort}";
             String TransactionProcessorAclBaseAddressResolver(String api) => $"http://127.0.0.1:{this.TransactionProcessorAclPort}";
@@ -126,7 +116,6 @@ public override async Task StartContainersForScenarioRun(String scenarioName, Do
 
                                               };
             HttpClient httpClient = new HttpClient(clientHandler);
-            this.EstateClient = new EstateClient(EstateManagementBaseAddressResolver, httpClient, 2);
             this.SecurityServiceClient = new SecurityServiceClient(SecurityServiceBaseAddressResolver, httpClient);
             this.TransactionProcessorClient = new TransactionProcessorClient(TransactionProcessorBaseAddressResolver, httpClient);
             this.TestHostHttpClient = new HttpClient(clientHandler);

TransactionProcessorACL.IntegrationTests/Common/EstateDetails.cs

@@ -1,10 +1,11 @@
-namespace TransactionProcessor.IntegrationTests.Common
+using TransactionProcessor.IntegrationTesting.Helpers;
+
+namespace TransactionProcessor.IntegrationTests.Common
 {
     using System;
     using System.Collections.Generic;
     using System.Linq;
-    using EstateManagement.IntegrationTesting.Helpers;
-
+
     public class EstateDetails1{
         public readonly EstateDetails EstateDetails;
 

TransactionProcessorACL.IntegrationTests/Common/GenericSteps.cs

@@ -35,7 +35,7 @@ public async Task StartSystem()
             logger.Initialise(LogManager.GetLogger(scenarioName), scenarioName);
             LogManager.AddHiddenAssembly(typeof(NlogLogger).Assembly);
 
-            DockerServices dockerServices = DockerServices.CallbackHandler | DockerServices.EstateManagement | DockerServices.EventStore |
+            DockerServices dockerServices = DockerServices.CallbackHandler | DockerServices.EventStore |
                                             DockerServices.FileProcessor | DockerServices.MessagingService | DockerServices.SecurityService |
                                             DockerServices.SqlServer | DockerServices.TestHost | DockerServices.TransactionProcessor |
                                             DockerServices.TransactionProcessorAcl;

TransactionProcessorACL.IntegrationTests/Common/Product.cs

@@ -1,10 +1,10 @@
-namespace TransactionProcessor.IntegrationTests.Common
+using TransactionProcessor.DataTransferObjects.Responses.Contract;
+
+namespace TransactionProcessor.IntegrationTests.Common
 {
     using System;
     using System.Collections.Generic;
     using System.Linq;
-    using EstateManagement.DataTransferObjects;
-    using EstateManagement.DataTransferObjects.Responses.Contract;
 
     public class Product
     {

TransactionProcessorACL.IntegrationTests/Common/TestingContext.cs

@@ -1,12 +1,13 @@
-namespace TransactionProcessor.IntegrationTests.Common
+using TransactionProcessor.IntegrationTesting.Helpers;
+
+namespace TransactionProcessor.IntegrationTests.Common
 {
     using System;
     using System.Collections.Generic;
     using System.Linq;
     using System.Threading;
     using System.Threading.Tasks;
     using DataTransferObjects;
-    using EstateManagement.IntegrationTesting.Helpers;
     using global::Shared.Logger;
     using Newtonsoft.Json;
     using Reqnroll;

TransactionProcessorACL.IntegrationTests/Common/TransactionFee.cs

@@ -1,8 +1,8 @@
-namespace TransactionProcessor.IntegrationTests.Common
+using TransactionProcessor.DataTransferObjects.Responses.Contract;
+
+namespace TransactionProcessor.IntegrationTests.Common
 {
     using System;
-    using EstateManagement.DataTransferObjects;
-    using EstateManagement.DataTransferObjects.Responses.Contract;
 
     public class TransactionFee
     {

TransactionProcessorACL.IntegrationTests/Shared/ACLSteps.cs

@@ -1,4 +1,6 @@
-namespace TransactionProcessorACL.IntegrationTests.Shared;
+using TransactionProcessor.IntegrationTesting.Helpers;
+
+namespace TransactionProcessorACL.IntegrationTests.Shared;
 
 using System;
 using System.Collections.Generic;
@@ -10,7 +12,6 @@
 using System.Threading.Tasks;
 using DataTransferObjects;
 using DataTransferObjects.Responses;
-using EstateManagement.IntegrationTesting.Helpers;
 using Newtonsoft.Json;
 using Shouldly;
 using TransactionProcessor.Client;

TransactionProcessorACL.IntegrationTests/Shared/ReqnrollExtensions.cs

@@ -1,10 +1,11 @@
-namespace TransactionProcessorACL.IntegrationTests.Shared;
+using TransactionProcessor.IntegrationTesting.Helpers;
+
+namespace TransactionProcessorACL.IntegrationTests.Shared;
 
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using DataTransferObjects;
-using EstateManagement.IntegrationTesting.Helpers;
 using global::Shared.IntegrationTesting;
 using Newtonsoft.Json;
 using Reqnroll;