diff --git a/TransactionProcessorACL.BusinessLogic/Requests/ProcessLogonTransactionRequest.cs b/TransactionProcessorACL.BusinessLogic/Requests/ProcessLogonTransactionRequest.cs
index 7abe279..eda9b12 100644
--- a/TransactionProcessorACL.BusinessLogic/Requests/ProcessLogonTransactionRequest.cs
+++ b/TransactionProcessorACL.BusinessLogic/Requests/ProcessLogonTransactionRequest.cs
@@ -54,10 +54,10 @@ public ProcessLogonTransactionRequest()
public Guid EstateId { get; }
///
- /// Gets the imei number.
+ /// Gets the device identifier.
///
///
- /// The imei number.
+ /// The device identifier.
///
public String DeviceIdentifier { get; }
diff --git a/TransactionProcessorACL.BusinessLogic/Services/ITransactionProcessorACLApplicationService.cs b/TransactionProcessorACL.BusinessLogic/Services/ITransactionProcessorACLApplicationService.cs
index 0ca534f..5e9a337 100644
--- a/TransactionProcessorACL.BusinessLogic/Services/ITransactionProcessorACLApplicationService.cs
+++ b/TransactionProcessorACL.BusinessLogic/Services/ITransactionProcessorACLApplicationService.cs
@@ -21,6 +21,11 @@ public interface ITransactionProcessorACLApplicationService
/// The device identifier.
/// The cancellation token.
///
- Task ProcessLogonTransaction(Guid estateId, Guid merchantId, DateTime transactionDateTime, String transactionNumber, String deviceIdentifier, CancellationToken cancellationToken);
+ Task ProcessLogonTransaction(Guid estateId,
+ Guid merchantId,
+ DateTime transactionDateTime,
+ String transactionNumber,
+ String deviceIdentifier,
+ CancellationToken cancellationToken);
}
}
diff --git a/TransactionProcessorACL.BusinessLogic/Services/TransactionProcessorACLApplicationService.cs b/TransactionProcessorACL.BusinessLogic/Services/TransactionProcessorACLApplicationService.cs
index 0496aec..9a0e607 100644
--- a/TransactionProcessorACL.BusinessLogic/Services/TransactionProcessorACLApplicationService.cs
+++ b/TransactionProcessorACL.BusinessLogic/Services/TransactionProcessorACLApplicationService.cs
@@ -86,7 +86,8 @@ public async Task ProcessLogonTransaction(Guid
{
TypeNameHandling = TypeNameHandling.All
});
- ProcessLogonTransactionResponse response = new ProcessLogonTransactionResponse();
+
+ ProcessLogonTransactionResponse response = null;
try
{
@@ -106,8 +107,11 @@ public async Task ProcessLogonTransaction(Guid
if (ex.InnerException is InvalidOperationException)
{
// This means there is an error in the request
- response.ResponseCode = "0001"; // Request Message error
- response.ResponseMessage = ex.InnerException.Message;
+ response = new ProcessLogonTransactionResponse
+ {
+ ResponseCode = "0001", // Request Message error
+ ResponseMessage = ex.InnerException.Message
+ };
}
}
diff --git a/TransactionProcessorACL.BusinessLogic/TransactionProcessorACL.BusinessLogic.csproj b/TransactionProcessorACL.BusinessLogic/TransactionProcessorACL.BusinessLogic.csproj
index 985f787..c3df940 100644
--- a/TransactionProcessorACL.BusinessLogic/TransactionProcessorACL.BusinessLogic.csproj
+++ b/TransactionProcessorACL.BusinessLogic/TransactionProcessorACL.BusinessLogic.csproj
@@ -7,8 +7,8 @@
-
-
+
+
diff --git a/TransactionProcessorACL.IntegrationTests/Common/DockerHelper.cs b/TransactionProcessorACL.IntegrationTests/Common/DockerHelper.cs
index 04f3e3c..d7e038b 100644
--- a/TransactionProcessorACL.IntegrationTests/Common/DockerHelper.cs
+++ b/TransactionProcessorACL.IntegrationTests/Common/DockerHelper.cs
@@ -145,7 +145,7 @@ public override async Task StartContainersForScenarioRun(String scenarioName)
dockerCredentials,
securityServiceContainerName,
eventStoreContainerName,
- (null,null));
+ ("serviceClient", "Secret1"));
IContainerService securityServiceContainer = DockerHelper.SetupSecurityServiceContainer(securityServiceContainerName,
this.Logger,
@@ -164,8 +164,9 @@ public override async Task StartContainersForScenarioRun(String scenarioName)
traceFolder,
dockerCredentials,
securityServiceContainerName,
+ estateManagementApiContainerName,
eventStoreContainerName,
- (null, null));
+ ("serviceClient", "Secret1"));
IContainerService transactionProcessorACLContainer = DockerHelper.SetupTransactionProcessorACLContainer(transactionProcessorACLContainerName,
this.Logger,
diff --git a/TransactionProcessorACL.IntegrationTests/LogonTransaction/LogonTransaction.feature b/TransactionProcessorACL.IntegrationTests/LogonTransaction/LogonTransaction.feature
index a6bc1ae..48ce6d7 100644
--- a/TransactionProcessorACL.IntegrationTests/LogonTransaction/LogonTransaction.feature
+++ b/TransactionProcessorACL.IntegrationTests/LogonTransaction/LogonTransaction.feature
@@ -54,18 +54,18 @@ Background:
Scenario: Logon Transaction
Given I am logged in as "merchantuser@testmerchant1.co.uk" with password "123456" for Merchant "Test Merchant 1" for Estate "Test Estate 1" with client "merchantClient"
When I perform the following transactions
- | DateTime | TransactionNumber | TransactionType | MerchantName | IMEINumber | EstateName |
+ | DateTime | TransactionNumber | TransactionType | MerchantName | DeviceIdentifier | EstateName |
| Today | 1 | Logon | Test Merchant 1 | 123456789 | Test Estate 1 |
Given I am logged in as "merchantuser@testmerchant2.co.uk" with password "123456" for Merchant "Test Merchant 2" for Estate "Test Estate 1" with client "merchantClient"
When I perform the following transactions
- | DateTime | TransactionNumber | TransactionType | MerchantName | IMEINumber | EstateName |
+ | DateTime | TransactionNumber | TransactionType | MerchantName | DeviceIdentifier | EstateName |
| Today | 2 | Logon | Test Merchant 2 | 123456789 | Test Estate 1 |
Given I am logged in as "merchantuser@testmerchant3.co.uk" with password "123456" for Merchant "Test Merchant 3" for Estate "Test Estate 2" with client "merchantClient"
When I perform the following transactions
- | DateTime | TransactionNumber | TransactionType | MerchantName | IMEINumber | EstateName |
- | Today | 3 | Logon | Test Merchant 3 | 123456789 | Test Estate 2 |
+ | DateTime | TransactionNumber | TransactionType | MerchantName | DeviceIdentifier | EstateName |
+ | Today | 3 | Logon | Test Merchant 3 | 123456789 | Test Estate 2 |
Then transaction response should contain the following information
| EstateName | MerchantName | TransactionNumber | TransactionType | ResponseCode | ResponseMessage |
diff --git a/TransactionProcessorACL.IntegrationTests/LogonTransaction/LogonTransaction.feature.cs b/TransactionProcessorACL.IntegrationTests/LogonTransaction/LogonTransaction.feature.cs
index 1768ea1..058ec79 100644
--- a/TransactionProcessorACL.IntegrationTests/LogonTransaction/LogonTransaction.feature.cs
+++ b/TransactionProcessorACL.IntegrationTests/LogonTransaction/LogonTransaction.feature.cs
@@ -322,7 +322,7 @@ public virtual void LogonTransaction()
"TransactionNumber",
"TransactionType",
"MerchantName",
- "IMEINumber",
+ "DeviceIdentifier",
"EstateName"});
table10.AddRow(new string[] {
"Today",
@@ -344,7 +344,7 @@ public virtual void LogonTransaction()
"TransactionNumber",
"TransactionType",
"MerchantName",
- "IMEINumber",
+ "DeviceIdentifier",
"EstateName"});
table11.AddRow(new string[] {
"Today",
@@ -366,7 +366,7 @@ public virtual void LogonTransaction()
"TransactionNumber",
"TransactionType",
"MerchantName",
- "IMEINumber",
+ "DeviceIdentifier",
"EstateName"});
table12.AddRow(new string[] {
"Today",
diff --git a/TransactionProcessorACL.IntegrationTests/Shared/SharedSteps.cs b/TransactionProcessorACL.IntegrationTests/Shared/SharedSteps.cs
index 0a748a4..d79b3e5 100644
--- a/TransactionProcessorACL.IntegrationTests/Shared/SharedSteps.cs
+++ b/TransactionProcessorACL.IntegrationTests/Shared/SharedSteps.cs
@@ -303,7 +303,7 @@ public async Task WhenIPerformTheFollowingTransactions(Table table)
DateTime transactionDateTime = SpecflowTableHelper.GetDateForDateString(dateString, DateTime.Today);
String transactionNumber = SpecflowTableHelper.GetStringRowValue(tableRow, "TransactionNumber");
String transactionType = SpecflowTableHelper.GetStringRowValue(tableRow, "TransactionType");
- String imeiNumber = SpecflowTableHelper.GetStringRowValue(tableRow, "IMEINumber");
+ String deviceIdentifier = SpecflowTableHelper.GetStringRowValue(tableRow, "DeviceIdentifier");
switch (transactionType)
{
@@ -312,7 +312,7 @@ public async Task WhenIPerformTheFollowingTransactions(Table table)
transactionDateTime,
transactionType,
transactionNumber,
- imeiNumber,
+ deviceIdentifier,
CancellationToken.None);
estateDetails.AddTransactionResponse(merchantId, transactionNumber, transactionType, responseMessage);
diff --git a/TransactionProcessorACL.IntegrationTests/TransactionProcessorACL.IntegrationTests.csproj b/TransactionProcessorACL.IntegrationTests/TransactionProcessorACL.IntegrationTests.csproj
index a139964..06ef1e9 100644
--- a/TransactionProcessorACL.IntegrationTests/TransactionProcessorACL.IntegrationTests.csproj
+++ b/TransactionProcessorACL.IntegrationTests/TransactionProcessorACL.IntegrationTests.csproj
@@ -7,18 +7,18 @@
-
+
-
+
-
+
-
+
all
diff --git a/TransactionProcessorACL.Testing/TestData.cs b/TransactionProcessorACL.Testing/TestData.cs
index 35f3d5f..5ef267b 100644
--- a/TransactionProcessorACL.Testing/TestData.cs
+++ b/TransactionProcessorACL.Testing/TestData.cs
@@ -2,12 +2,12 @@
{
using System;
using System.Collections.Generic;
- using BusinessLogic.Requests;
- using DataTransferObjects;
using Models;
using Newtonsoft.Json;
using SecurityService.DataTransferObjects.Responses;
using TransactionProcessor.DataTransferObjects;
+ using TransactionProcessorACL.BusinessLogic.Requests;
+ using TransactionProcessorACL.DataTransferObjects;
///
///
diff --git a/TransactionProcessorACL/TransactionProcessorACL.csproj b/TransactionProcessorACL/TransactionProcessorACL.csproj
index f1243f5..cfd3ac4 100644
--- a/TransactionProcessorACL/TransactionProcessorACL.csproj
+++ b/TransactionProcessorACL/TransactionProcessorACL.csproj
@@ -16,7 +16,7 @@
-
+