Skip to content

Minor fix after estate management change #80

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 11, 2020
Merged

Minor fix after estate management change #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d8d256
Minor fix after estate management change
StuartFerguson Jun 11, 2020
a747c17
Merge branch 'master' into task/#76_validatebalanceonsales
StuartFerguson Jun 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions TransactionProcessor.BusinessLogic/Services/TransactionDomainService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,6 +529,8 @@ private async Task<TokenResponse> GetToken(CancellationToken cancellationToken)
CancellationToken cancellationToken)
{
EstateResponse estate = null;
MerchantResponse merchant = null;

// Validate the Estate Record is a valid estate
try
{
Expand All @@ -540,11 +542,11 @@ private async Task<TokenResponse> GetToken(CancellationToken cancellationToken)
}

// get the merchant record and validate the device
// TODO: Token
MerchantResponse merchant = await this.GetMerchant(estateId, merchantId, cancellationToken);

// TODO: Remove this once GetMerchant returns correct response when merchant not found
if (merchant.MerchantName == null)
try
{
merchant = await this.GetMerchant(estateId, merchantId, cancellationToken);
}
catch (Exception ex) when (ex.InnerException != null && ex.InnerException.GetType() == typeof(KeyNotFoundException))
{
throw new TransactionValidationException($"Merchant Id [{merchantId}] is not a valid merchant for estate [{estate.EstateName}]",
TransactionResponseCode.InvalidMerchantId);
Expand Down
3 changes: 2 additions & 1 deletion TransactionProcessor.IntegrationTests/Common/DockerHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,8 @@ public override async Task StartContainersForScenarioRun(String scenarioName)
(Setup.SqlServerContainerName,
"sa",
"thisisalongpassword123!"),
("serviceClient", "Secret1"));
("serviceClient", "Secret1"),
true);

IContainerService securityServiceContainer = DockerHelper.SetupSecurityServiceContainer(this.SecurityServiceContainerName,
this.Logger,
Expand Down