diff --git a/TransactionProcessorACL.BusinessLogic.Tests/TransactionProcessorACL.BusinessLogic.Tests.csproj b/TransactionProcessorACL.BusinessLogic.Tests/TransactionProcessorACL.BusinessLogic.Tests.csproj
index d0660e2..149caca 100644
--- a/TransactionProcessorACL.BusinessLogic.Tests/TransactionProcessorACL.BusinessLogic.Tests.csproj
+++ b/TransactionProcessorACL.BusinessLogic.Tests/TransactionProcessorACL.BusinessLogic.Tests.csproj
@@ -13,6 +13,8 @@
+
+
all
diff --git a/TransactionProcessorACL.BusinessLogic/TransactionProcessorACL.BusinessLogic.csproj b/TransactionProcessorACL.BusinessLogic/TransactionProcessorACL.BusinessLogic.csproj
index f6dad3a..5b60dd7 100644
--- a/TransactionProcessorACL.BusinessLogic/TransactionProcessorACL.BusinessLogic.csproj
+++ b/TransactionProcessorACL.BusinessLogic/TransactionProcessorACL.BusinessLogic.csproj
@@ -8,9 +8,7 @@
-
-
-
+
diff --git a/TransactionProcessorACL.IntegrationTests/Common/DockerHelper.cs b/TransactionProcessorACL.IntegrationTests/Common/DockerHelper.cs
index 84f6f3d..a16f3b9 100644
--- a/TransactionProcessorACL.IntegrationTests/Common/DockerHelper.cs
+++ b/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
- ///
- /// The estate client
- ///
- public IEstateClient EstateClient;
-
///
/// The HTTP client
///
@@ -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);
diff --git a/TransactionProcessorACL.IntegrationTests/Common/EstateDetails.cs b/TransactionProcessorACL.IntegrationTests/Common/EstateDetails.cs
index 02c3fde..a152b2d 100644
--- a/TransactionProcessorACL.IntegrationTests/Common/EstateDetails.cs
+++ b/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;
diff --git a/TransactionProcessorACL.IntegrationTests/Common/GenericSteps.cs b/TransactionProcessorACL.IntegrationTests/Common/GenericSteps.cs
index b2a5370..eda3feb 100644
--- a/TransactionProcessorACL.IntegrationTests/Common/GenericSteps.cs
+++ b/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;
diff --git a/TransactionProcessorACL.IntegrationTests/Common/Product.cs b/TransactionProcessorACL.IntegrationTests/Common/Product.cs
index cf60633..7b79ea5 100644
--- a/TransactionProcessorACL.IntegrationTests/Common/Product.cs
+++ b/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
{
diff --git a/TransactionProcessorACL.IntegrationTests/Common/TestingContext.cs b/TransactionProcessorACL.IntegrationTests/Common/TestingContext.cs
index dc65470..941261f 100644
--- a/TransactionProcessorACL.IntegrationTests/Common/TestingContext.cs
+++ b/TransactionProcessorACL.IntegrationTests/Common/TestingContext.cs
@@ -1,4 +1,6 @@
-namespace TransactionProcessor.IntegrationTests.Common
+using TransactionProcessor.IntegrationTesting.Helpers;
+
+namespace TransactionProcessor.IntegrationTests.Common
{
using System;
using System.Collections.Generic;
@@ -6,7 +8,6 @@
using System.Threading;
using System.Threading.Tasks;
using DataTransferObjects;
- using EstateManagement.IntegrationTesting.Helpers;
using global::Shared.Logger;
using Newtonsoft.Json;
using Reqnroll;
diff --git a/TransactionProcessorACL.IntegrationTests/Common/TransactionFee.cs b/TransactionProcessorACL.IntegrationTests/Common/TransactionFee.cs
index 6dc6f7e..80303cc 100644
--- a/TransactionProcessorACL.IntegrationTests/Common/TransactionFee.cs
+++ b/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
{
diff --git a/TransactionProcessorACL.IntegrationTests/Shared/ACLSteps.cs b/TransactionProcessorACL.IntegrationTests/Shared/ACLSteps.cs
index 1f32a90..5f01b12 100644
--- a/TransactionProcessorACL.IntegrationTests/Shared/ACLSteps.cs
+++ b/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;
diff --git a/TransactionProcessorACL.IntegrationTests/Shared/ReqnrollExtensions.cs b/TransactionProcessorACL.IntegrationTests/Shared/ReqnrollExtensions.cs
index 78af10f..b68142d 100644
--- a/TransactionProcessorACL.IntegrationTests/Shared/ReqnrollExtensions.cs
+++ b/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;
diff --git a/TransactionProcessorACL.IntegrationTests/Shared/SharedSteps.cs b/TransactionProcessorACL.IntegrationTests/Shared/SharedSteps.cs
index 907527d..f0ffaf5 100644
--- a/TransactionProcessorACL.IntegrationTests/Shared/SharedSteps.cs
+++ b/TransactionProcessorACL.IntegrationTests/Shared/SharedSteps.cs
@@ -1,4 +1,13 @@
-namespace TransactionProcessorACL.IntegrationTests.Shared{
+using TransactionProcessor.DataTransferObjects.Requests.Contract;
+using TransactionProcessor.DataTransferObjects.Requests.Estate;
+using TransactionProcessor.DataTransferObjects.Requests.Merchant;
+using TransactionProcessor.DataTransferObjects.Requests.Operator;
+using TransactionProcessor.DataTransferObjects.Responses.Contract;
+using TransactionProcessor.DataTransferObjects.Responses.Estate;
+using TransactionProcessor.DataTransferObjects.Responses.Merchant;
+using AssignOperatorRequest = TransactionProcessor.DataTransferObjects.Requests.Merchant.AssignOperatorRequest;
+
+namespace TransactionProcessorACL.IntegrationTests.Shared{
using System;
using System.Collections.Generic;
using System.Linq;
@@ -7,15 +16,6 @@
using System.Threading.Tasks;
using DataTransferObjects;
using DataTransferObjects.Responses;
- using EstateManagement.DataTransferObjects.Requests;
- using EstateManagement.DataTransferObjects.Requests.Contract;
- using EstateManagement.DataTransferObjects.Requests.Estate;
- using EstateManagement.DataTransferObjects.Requests.Merchant;
- using EstateManagement.DataTransferObjects.Requests.Operator;
- using EstateManagement.DataTransferObjects.Responses;
- using EstateManagement.DataTransferObjects.Responses.Contract;
- using EstateManagement.DataTransferObjects.Responses.Estate;
- using EstateManagement.IntegrationTesting.Helpers;
using Newtonsoft.Json.Linq;
using Reqnroll;
using SecurityService.DataTransferObjects;
@@ -26,13 +26,8 @@
using TransactionProcessor.DataTransferObjects;
using TransactionProcessor.IntegrationTesting.Helpers;
using TransactionProcessor.IntegrationTests.Common;
- using AssignOperatorRequest = EstateManagement.DataTransferObjects.Requests.Merchant.AssignOperatorRequest;
using ClientDetails = TransactionProcessor.IntegrationTests.Common.ClientDetails;
- using Contract = EstateManagement.IntegrationTesting.Helpers.Contract;
- using MerchantOperatorResponse = EstateManagement.DataTransferObjects.Responses.Merchant.MerchantOperatorResponse;
- using MerchantResponse = EstateManagement.DataTransferObjects.Responses.Merchant.MerchantResponse;
- using Product = EstateManagement.IntegrationTesting.Helpers.Product;
-
+
///
///
///
@@ -43,7 +38,7 @@ public class SharedSteps{
private readonly ACLSteps AclSteps;
- private readonly EstateManagementSteps EstateManagementSteps;
+ private readonly TransactionProcessorSteps TransactionProcessorSteps;
///
/// The scenario context
@@ -71,7 +66,7 @@ public SharedSteps(ScenarioContext scenarioContext,
this.ScenarioContext = scenarioContext;
this.TestingContext = testingContext;
this.SecurityServiceSteps = new SecurityServiceSteps(testingContext.DockerHelper.SecurityServiceClient);
- this.EstateManagementSteps = new EstateManagementSteps(testingContext.DockerHelper.EstateClient, testingContext.DockerHelper.TestHostHttpClient);
+ this.TransactionProcessorSteps = new TransactionProcessorSteps(testingContext.DockerHelper.TransactionProcessorClient, testingContext.DockerHelper.TestHostHttpClient, testingContext.DockerHelper.ProjectionManagementClient);
this.AclSteps = new ACLSteps(testingContext.DockerHelper.HttpClient, this.TestingContext.DockerHelper.TransactionProcessorClient);
}
@@ -137,7 +132,7 @@ public async Task GivenIAmLoggedInAsWithPasswordForMerchantForEstateWithClient(S
public async Task GivenICreateAContractWithTheFollowingValues(DataTable table){
var estates = this.TestingContext.Estates.Select(e => e.EstateDetails).ToList();
List<(EstateDetails, CreateContractRequest)> requests = table.Rows.ToCreateContractRequests(estates);
- List responses = await this.EstateManagementSteps.GivenICreateAContractWithTheFollowingValues(this.TestingContext.AccessToken, requests);
+ List responses = await this.TransactionProcessorSteps.GivenICreateAContractWithTheFollowingValues(this.TestingContext.AccessToken, requests);
foreach (ContractResponse contractResponse in responses)
{
var estate = this.TestingContext.Estates.Single(e => e.EstateDetails.EstateId == contractResponse.EstateId);
@@ -160,8 +155,8 @@ public async Task GivenIHaveAssignedTheFollowingDevicesToTheMerchants(DataTable
List estates = this.TestingContext.Estates.Select(e => e.EstateDetails).ToList();
List<(EstateDetails, Guid, AddMerchantDeviceRequest)> requests = table.Rows.ToAddMerchantDeviceRequests(estates);
- List<(EstateDetails, EstateManagement.DataTransferObjects.Responses.Merchant.MerchantResponse, String)> results = await this.EstateManagementSteps.GivenIHaveAssignedTheFollowingDevicesToTheMerchants(this.TestingContext.AccessToken, requests);
- foreach ((EstateDetails, EstateManagement.DataTransferObjects.Responses.Merchant.MerchantResponse, String) result in results){
+ List<(EstateDetails, MerchantResponse, String)> results = await this.TransactionProcessorSteps.GivenIHaveAssignedTheFollowingDevicesToTheMerchants(this.TestingContext.AccessToken, requests);
+ foreach ((EstateDetails, MerchantResponse, String) result in results){
this.TestingContext.Logger.LogInformation($"Device {result.Item3} assigned to Merchant {result.Item2.MerchantName} Estate {result.Item1.EstateName}");
}
}
@@ -170,7 +165,7 @@ public async Task GivenIHaveAssignedTheFollowingDevicesToTheMerchants(DataTable
public async Task WhenIAddTheFollowingContractsToTheFollowingMerchants(DataTable table){
List estates = this.TestingContext.Estates.Select(e => e.EstateDetails).ToList();
List<(EstateDetails, Guid, Guid)> requests = table.Rows.ToAddContractToMerchantRequests(estates);
- await this.EstateManagementSteps.WhenIAddTheFollowingContractsToTheFollowingMerchants(this.TestingContext.AccessToken, requests);
+ await this.TransactionProcessorSteps.WhenIAddTheFollowingContractsToTheFollowingMerchants(this.TestingContext.AccessToken, requests);
}
@@ -207,7 +202,7 @@ public async Task GivenIMakeTheFollowingManualMerchantDeposits(DataTable table){
foreach ((EstateDetails, Guid, MakeMerchantDepositRequest) request in requests){
Decimal previousMerchantBalance = await this.GetMerchantBalance(request.Item2);
- await this.EstateManagementSteps.GivenIMakeTheFollowingManualMerchantDeposits(this.TestingContext.AccessToken, request);
+ await this.TransactionProcessorSteps.GivenIMakeTheFollowingManualMerchantDeposits(this.TestingContext.AccessToken, request);
await Retry.For(async () => {
Decimal currentMerchantBalance = await this.GetMerchantBalance(request.Item2);
@@ -282,8 +277,8 @@ public void ThenTheSaleTransactionResponseShouldContainTheFollowingInformation(D
[When(@"I add the following Transaction Fees")]
public async Task WhenIAddTheFollowingTransactionFees(DataTable table){
var estates = this.TestingContext.Estates.Select(e => e.EstateDetails).ToList();
- List<(EstateDetails, Contract, Product, AddTransactionFeeForProductToContractRequest)> requests = table.Rows.ToAddTransactionFeeForProductToContractRequests(estates);
- await this.EstateManagementSteps.WhenIAddTheFollowingTransactionFees(this.TestingContext.AccessToken, requests);
+ List<(EstateDetails, TransactionProcessor.IntegrationTesting.Helpers.Contract, TransactionProcessor.IntegrationTesting.Helpers.Product, AddTransactionFeeForProductToContractRequest)> requests = table.Rows.ToAddTransactionFeeForProductToContractRequests(estates);
+ await this.TransactionProcessorSteps.WhenIAddTheFollowingTransactionFees(this.TestingContext.AccessToken, requests);
}
///
@@ -296,7 +291,7 @@ public async Task WhenIAssignTheFollowingOperatorToTheMerchants(DataTable table)
List estates = this.TestingContext.Estates.Select(e => e.EstateDetails).ToList();
List<(EstateDetails, Guid, AssignOperatorRequest)> requests = table.Rows.ToAssignOperatorRequests(estates);
- List<(EstateDetails, EstateManagement.DataTransferObjects.Responses.Merchant.MerchantOperatorResponse)> results = await this.EstateManagementSteps.WhenIAssignTheFollowingOperatorToTheMerchants(this.TestingContext.AccessToken, requests);
+ List<(EstateDetails, MerchantOperatorResponse)> results = await this.TransactionProcessorSteps.WhenIAssignTheFollowingOperatorToTheMerchants(this.TestingContext.AccessToken, requests);
foreach ((EstateDetails, MerchantOperatorResponse) result in results){
this.TestingContext.Logger.LogInformation($"Operator {result.Item2.Name} assigned to Estate {result.Item1.EstateName}");
@@ -312,7 +307,7 @@ public async Task WhenIAssignTheFollowingOperatorToTheMerchants(DataTable table)
public async Task WhenICreateTheFollowingEstates(DataTable table){
List requests = table.Rows.ToCreateEstateRequests();
- List verifiedEstates = await this.EstateManagementSteps.WhenICreateTheFollowingEstates(this.TestingContext.AccessToken, requests);
+ List verifiedEstates = await this.TransactionProcessorSteps.WhenICreateTheFollowingEstatesX(this.TestingContext.AccessToken, requests);
foreach (EstateResponse verifiedEstate in verifiedEstates){
this.TestingContext.AddEstateDetails(verifiedEstate.EstateId, verifiedEstate.EstateName, verifiedEstate.EstateReference);
@@ -330,7 +325,7 @@ public async Task WhenICreateTheFollowingMerchants(DataTable table){
var estates = this.TestingContext.Estates.Select(e => e.EstateDetails).ToList();
List<(EstateDetails estate, CreateMerchantRequest)> requests = table.Rows.ToCreateMerchantRequests(estates);
- List verifiedMerchants = await this.EstateManagementSteps.WhenICreateTheFollowingMerchants(this.TestingContext.AccessToken, requests);
+ List verifiedMerchants = await this.TransactionProcessorSteps.WhenICreateTheFollowingMerchants(this.TestingContext.AccessToken, requests);
foreach (MerchantResponse verifiedMerchant in verifiedMerchants){
EstateDetails1 estateDetails = this.TestingContext.GetEstateDetails(verifiedMerchant.EstateId);
@@ -349,7 +344,7 @@ public async Task WhenICreateTheFollowingOperators(DataTable table){
var estates = this.TestingContext.Estates.Select(e => e.EstateDetails).ToList();
List<(EstateDetails estate, CreateOperatorRequest request)> requests = table.Rows.ToCreateOperatorRequests(estates);
- List<(Guid, EstateOperatorResponse)> results = await this.EstateManagementSteps.WhenICreateTheFollowingOperators(this.TestingContext.AccessToken, requests);
+ List<(Guid, EstateOperatorResponse)> results = await this.TransactionProcessorSteps.WhenICreateTheFollowingOperators(this.TestingContext.AccessToken, requests);
foreach ((Guid, EstateOperatorResponse) result in results){
this.TestingContext.Logger.LogInformation($"Operator {result.Item2.Name} created with Id {result.Item2.OperatorId} for Estate {result.Item1}");
@@ -359,9 +354,9 @@ public async Task WhenICreateTheFollowingOperators(DataTable table){
[Given("I have assigned the following operators to the estates")]
public async Task GivenIHaveAssignedTheFollowingOperatorsToTheEstates(DataTable dataTable)
{
- List<(EstateDetails estate, EstateManagement.DataTransferObjects.Requests.Estate.AssignOperatorRequest request)> requests = dataTable.Rows.ToAssignOperatorToEstateRequests(this.TestingContext.Estates.Select(e => e.EstateDetails).ToList());
+ List<(EstateDetails estate, TransactionProcessor.DataTransferObjects.Requests.Estate.AssignOperatorRequest request)> requests = dataTable.Rows.ToAssignOperatorToEstateRequests(this.TestingContext.Estates.Select(e => e.EstateDetails).ToList());
- await this.EstateManagementSteps.GivenIHaveAssignedTheFollowingOperatorsToTheEstates(this.TestingContext.AccessToken, requests);
+ await this.TransactionProcessorSteps.GivenIHaveAssignedTheFollowingOperatorsToTheEstates(this.TestingContext.AccessToken, requests);
// TODO Verify
}
@@ -373,8 +368,8 @@ public async Task GivenIHaveAssignedTheFollowingOperatorsToTheEstates(DataTable
[When(@"I create the following Products")]
public async Task WhenICreateTheFollowingProducts(DataTable table){
var estates = this.TestingContext.Estates.Select(e => e.EstateDetails).ToList();
- List<(EstateDetails, Contract, AddProductToContractRequest)> requests = table.Rows.ToAddProductToContractRequest(estates);
- await this.EstateManagementSteps.WhenICreateTheFollowingProducts(this.TestingContext.AccessToken, requests);
+ List<(EstateDetails, TransactionProcessor.IntegrationTesting.Helpers.Contract, AddProductToContractRequest)> requests = table.Rows.ToAddProductToContractRequest(estates);
+ await this.TransactionProcessorSteps.WhenICreateTheFollowingProducts(this.TestingContext.AccessToken, requests);
}
///
@@ -386,7 +381,7 @@ public async Task WhenICreateTheFollowingProducts(DataTable table){
public async Task WhenICreateTheFollowingSecurityUsers(DataTable table){
var estates = this.TestingContext.Estates.Select(e => e.EstateDetails).ToList();
List createUserRequests = table.Rows.ToCreateNewUserRequests(estates);
- await this.EstateManagementSteps.WhenICreateTheFollowingSecurityUsers(this.TestingContext.AccessToken, createUserRequests, estates);
+ await this.TransactionProcessorSteps.WhenICreateTheFollowingSecurityUsers(this.TestingContext.AccessToken, createUserRequests, estates);
}
[Given(@"I have created the following security users for voucher redemption")]
diff --git a/TransactionProcessorACL.IntegrationTests/TransactionProcessorACL - Backup.IntegrationTests.csproj b/TransactionProcessorACL.IntegrationTests/TransactionProcessorACL - Backup.IntegrationTests.csproj
deleted file mode 100644
index 23e1d43..0000000
--- a/TransactionProcessorACL.IntegrationTests/TransactionProcessorACL - Backup.IntegrationTests.csproj
+++ /dev/null
@@ -1,52 +0,0 @@
-
-
-
- net5.0
- Full
- false
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- all
- runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
- all
- runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
-
-
-
-
-
-
-
- True
-
-
-
-
-
- SpecFlowSingleFileGenerator
- Reconciliation.feature.cs
-
-
-
-
diff --git a/TransactionProcessorACL.IntegrationTests/TransactionProcessorACL.IntegrationTests.csproj b/TransactionProcessorACL.IntegrationTests/TransactionProcessorACL.IntegrationTests.csproj
index ce6fafb..b23a2fb 100644
--- a/TransactionProcessorACL.IntegrationTests/TransactionProcessorACL.IntegrationTests.csproj
+++ b/TransactionProcessorACL.IntegrationTests/TransactionProcessorACL.IntegrationTests.csproj
@@ -9,9 +9,6 @@
-
-
-
@@ -26,8 +23,8 @@
-
-
+
+
all
diff --git a/TransactionProcessorACL.Testing/TransactionProcessorACL.Testing.csproj b/TransactionProcessorACL.Testing/TransactionProcessorACL.Testing.csproj
index ca61e7f..da8603c 100644
--- a/TransactionProcessorACL.Testing/TransactionProcessorACL.Testing.csproj
+++ b/TransactionProcessorACL.Testing/TransactionProcessorACL.Testing.csproj
@@ -6,9 +6,8 @@
-
-
-
+
+
diff --git a/TransactionProcessorACL.Tests/TransactionProcessorACL.Tests.csproj b/TransactionProcessorACL.Tests/TransactionProcessorACL.Tests.csproj
index 01131e1..d140a41 100644
--- a/TransactionProcessorACL.Tests/TransactionProcessorACL.Tests.csproj
+++ b/TransactionProcessorACL.Tests/TransactionProcessorACL.Tests.csproj
@@ -12,6 +12,8 @@
+
+
all
diff --git a/TransactionProcessorACL/Controllers/VoucherController.cs b/TransactionProcessorACL/Controllers/VoucherController.cs
index 87acc77..0d24211 100644
--- a/TransactionProcessorACL/Controllers/VoucherController.cs
+++ b/TransactionProcessorACL/Controllers/VoucherController.cs
@@ -6,7 +6,6 @@
using System.Threading.Tasks;
using System.Threading;
using System;
-using EstateManagement.Client;
using JasperFx.Core;
using Shared.Results;
using SimpleResults;