diff --git a/TransactionProcessor.IntegrationTesting.Helpers/TransactionProcessorSteps.cs b/TransactionProcessor.IntegrationTesting.Helpers/TransactionProcessorSteps.cs index aaf27977..8585bd81 100644 --- a/TransactionProcessor.IntegrationTesting.Helpers/TransactionProcessorSteps.cs +++ b/TransactionProcessor.IntegrationTesting.Helpers/TransactionProcessorSteps.cs @@ -132,7 +132,7 @@ await Retry.For(async () => { Result>? getMerchantsResult = await this.TransactionProcessorClient .GetMerchants(token, estateDetails.EstateId, CancellationToken.None) .ConfigureAwait(false); - getMerchantsResult.IsSuccess.ShouldBeTrue(); + getMerchantsResult.IsSuccess.ShouldBeTrue(getMerchantsResult.Message); List merchantList = getMerchantsResult.Data; merchantList.ShouldNotBeNull(); merchantList.ShouldNotBeEmpty(); @@ -169,17 +169,17 @@ public async Task WhenIPerformTheFollowingTransactions(String accessToken, List< foreach ((EstateDetails, Guid, String, TransactionRequest) serialisedMessage in serialisedMessages) { if (serialisedMessage.Item4 is LogonTransactionRequest ltr) { Result? logonResult = await this.TransactionProcessorClient.PerformTransaction(accessToken, ltr, CancellationToken.None); - logonResult.IsSuccess.ShouldBeTrue(); + logonResult.IsSuccess.ShouldBeTrue(logonResult.Message); serialisedMessage.Item1.AddTransactionResponse(serialisedMessage.Item2, serialisedMessage.Item3, logonResult.Data); } if (serialisedMessage.Item4 is SaleTransactionRequest str) { Result? saleResult = await this.TransactionProcessorClient.PerformTransaction(accessToken, str, CancellationToken.None); - saleResult.IsSuccess.ShouldBeTrue(); + saleResult.IsSuccess.ShouldBeTrue(saleResult.Message); serialisedMessage.Item1.AddTransactionResponse(serialisedMessage.Item2, serialisedMessage.Item3, saleResult.Data); } if (serialisedMessage.Item4 is ReconciliationRequest rr) { Result? reconciliationResult = await this.TransactionProcessorClient.PerformTransaction(accessToken, rr, CancellationToken.None); - reconciliationResult.IsSuccess.ShouldBeTrue(); + reconciliationResult.IsSuccess.ShouldBeTrue(reconciliationResult.Message); serialisedMessage.Item1.AddTransactionResponse(serialisedMessage.Item2, serialisedMessage.Item3, reconciliationResult.Data); } } @@ -211,7 +211,7 @@ public async Task WhenICreateTheFollowingMerchantSchedules(String accessToken, scheduleRequest.request, CancellationToken.None); - result.IsSuccess.ShouldBeTrue(); + result.IsSuccess.ShouldBeTrue(result.Message); await Retry.For(async () => { Result getMerchantScheduleResult = await this.TransactionProcessorClient.GetMerchantScheduleFromReadModel(accessToken, @@ -220,7 +220,7 @@ await Retry.For(async () => { scheduleRequest.request.Year, CancellationToken.None); - getMerchantScheduleResult.IsSuccess.ShouldBeTrue(); + getMerchantScheduleResult.IsSuccess.ShouldBeTrue(getMerchantScheduleResult.Message); MerchantScheduleResponse merchantSchedule = getMerchantScheduleResult.Data; merchantSchedule.ShouldNotBeNull(); @@ -254,7 +254,7 @@ await Retry.For(async () => { Result? getMerchantResult = await this.TransactionProcessorClient .GetMerchant(accessToken, request.Item1.EstateId, request.Item2, CancellationToken.None) .ConfigureAwait(false); - getMerchantResult.IsSuccess.ShouldBeTrue(); + getMerchantResult.IsSuccess.ShouldBeTrue(getMerchantResult.Message); MerchantResponse? merchantResponse = getMerchantResult.Data; merchantResponse.Devices.ContainsValue(request.Item4.NewDeviceIdentifier); }); @@ -297,7 +297,7 @@ public async Task WhenIMakeTheFollowingMerchantWithdrawals(String accessToken, L makeMerchantWithdrawalRequest.Item3, CancellationToken.None).ConfigureAwait(false); - result.IsSuccess.ShouldBeTrue(); + result.IsSuccess.ShouldBeTrue(result.Message); } } @@ -314,7 +314,7 @@ public async Task> WhenICreateTheFollowingMerchants(strin .CreateMerchant(accessToken, request.estate.EstateId, request.request, CancellationToken.None) .ConfigureAwait(false); - result.IsSuccess.ShouldBeTrue(); + result.IsSuccess.ShouldBeTrue(result.Message); if (request.enableAgencyBanking) { @@ -328,18 +328,18 @@ public async Task> WhenICreateTheFollowingMerchants(strin PhoneNumber = request.request.Contact.PhoneNumber }; Result? enableAgencyBankingResult = await this.AgencyBankingClient.CreateRetailAgent(createAgentRequest, CancellationToken.None); - enableAgencyBankingResult.IsSuccess.ShouldBeTrue(); + enableAgencyBankingResult.IsSuccess.ShouldBeTrue(enableAgencyBankingResult.Message); // Activate the agent ActivateAgentRequest activateAgentRequest = new ActivateAgentRequest { ActivatedBy = "INTEGRATIONTEST" }; var activateAgentResult = await this.AgencyBankingClient.ActivateAgent(createAgentRequest.AgentId, activateAgentRequest, CancellationToken.None); - activateAgentResult.IsSuccess.ShouldBeTrue(); + activateAgentResult.IsSuccess.ShouldBeTrue(activateAgentResult.Message); ConfigureFloatRequest configureFloatRequest = new ConfigureFloatRequest { AgentId = createAgentRequest.AgentId, DailyFloatLimit = 100000, MaximumFloat = 100000, MinimumFloat = 10000, }; var configureFloatResult = await this.AgencyBankingClient.ConfigureFloat(configureFloatRequest, CancellationToken.None); - configureFloatResult.IsSuccess.ShouldBeTrue(); + configureFloatResult.IsSuccess.ShouldBeTrue(configureFloatResult.Message); FloatCreditRequest floatCreditRequest = new FloatCreditRequest() { AgentId = createAgentRequest.AgentId, @@ -349,7 +349,7 @@ public async Task> WhenICreateTheFollowingMerchants(strin TransactionId = Guid.NewGuid().ToString() }; var floatCreditResult = await this.AgencyBankingClient.CreditFloat(floatCreditRequest, CancellationToken.None); - floatCreditResult.IsSuccess.ShouldBeTrue(); + floatCreditResult.IsSuccess.ShouldBeTrue(floatCreditResult.Message); } @@ -362,7 +362,7 @@ await Retry.For(async () => { Result? getMerchantResult = await this.TransactionProcessorClient .GetMerchant(accessToken, m.Item1, m.Item2, CancellationToken.None) .ConfigureAwait(false); - getMerchantResult.IsSuccess.ShouldBeTrue(); + getMerchantResult.IsSuccess.ShouldBeTrue(getMerchantResult.Message); MerchantResponse merchant = getMerchantResult.Data; responses.Add(merchant); @@ -370,12 +370,12 @@ await Retry.For(async () => { String partitionId = $"MerchantBalance-{m.Item2:N}"; Result? getMerchantBalanceResult = await this.TransactionProcessorClient.GetMerchantBalance(accessToken, m.Item1, m.Item2, CancellationToken.None); - getMerchantBalanceResult.IsSuccess.ShouldBeTrue(); + getMerchantBalanceResult.IsSuccess.ShouldBeTrue(getMerchantBalanceResult.Message); getMerchantBalanceResult.Data.ShouldNotBeNull(); // Force a read model database hit Result? getMerchantBalanceResult2 = await this.TransactionProcessorClient.GetMerchantBalance(accessToken, m.Item1, m.Item2, CancellationToken.None, liveBalance: false); - getMerchantBalanceResult2.IsSuccess.ShouldBeTrue(); + getMerchantBalanceResult2.IsSuccess.ShouldBeTrue(getMerchantBalanceResult2.Message); getMerchantBalanceResult2.Data.ShouldNotBeNull(); }); } @@ -460,7 +460,7 @@ await this.TransactionProcessorClient.GetMerchantBalanceHistory(accessToken, endDate, CancellationToken.None); - balanceHistoryResult.IsSuccess.ShouldBeTrue(); + balanceHistoryResult.IsSuccess.ShouldBeTrue(balanceHistoryResult.Message); balanceHistory = balanceHistoryResult.Data; balanceHistory.ShouldNotBeNull(); balanceHistory.ShouldNotBeEmpty(); @@ -515,7 +515,7 @@ await Retry.For(async () => { estate.EstateId, transactionResponse.TransactionId, CancellationToken.None); - getVoucherResult.IsSuccess.ShouldBeTrue(); + getVoucherResult.IsSuccess.ShouldBeTrue(getVoucherResult.Message); voucher = getVoucherResult.Data; voucher.ShouldNotBeNull(); }); @@ -536,13 +536,13 @@ await Retry.For(async () => Result? redeemVoucherResult = await this.TransactionProcessorClient .RedeemVoucher(accessToken, redeemVoucherRequest, CancellationToken.None) .ConfigureAwait(false); - redeemVoucherResult.IsSuccess.ShouldBeTrue(); + redeemVoucherResult.IsSuccess.ShouldBeTrue(redeemVoucherResult.Message); //RedeemVoucherResponse response = redeemVoucherResult.Data; //response.ShouldNotBeNull(); //response.RemainingBalance.ShouldBe(expectedBalance); var x = await this.TransactionProcessorClient.GetVoucherByCode(accessToken, estate.EstateId, voucher.VoucherCode, CancellationToken.None); - x.IsSuccess.ShouldBeTrue(); + x.IsSuccess.ShouldBeTrue(x.Message); x.Data.Balance.ShouldBe(expectedBalance); }); } @@ -555,7 +555,7 @@ public async Task WhenIProcessTheSettlementForOnEstateThenFeesAreMarkedAsSettled request.MerchantId, CancellationToken.None); - result.IsSuccess.ShouldBeTrue(); + result.IsSuccess.ShouldBeTrue(result.Message); await Retry.For(async () => { Result? getSettlementByDateResult = @@ -564,7 +564,7 @@ await this.TransactionProcessorClient.GetSettlementByDate(accessToken, request.EstateDetails.EstateId, request.MerchantId, CancellationToken.None); - getSettlementByDateResult.IsSuccess.ShouldBeTrue(); + getSettlementByDateResult.IsSuccess.ShouldBeTrue(getSettlementByDateResult.Message); SettlementResponse settlement = getSettlementByDateResult.Data; settlement.NumberOfFeesPendingSettlement.ShouldBe(0); @@ -585,7 +585,7 @@ await this.TransactionProcessorClient.GetSettlementByDate(accessToken, request.Item1.EstateId, request.Item2, CancellationToken.None); - getSettlementByDateResult.IsSuccess.ShouldBeTrue(); + getSettlementByDateResult.IsSuccess.ShouldBeTrue(getSettlementByDateResult.Message); SettlementResponse settlement = getSettlementByDateResult.Data; settlement.NumberOfFeesSettled.ShouldBe(request.Item4, $"Settlement date {request.Item3}"); }, @@ -605,7 +605,7 @@ await this.TransactionProcessorClient.GetSettlementByDate(accessToken, request.Item2, CancellationToken.None); - getSettlementByDateResult.IsSuccess.ShouldBeTrue(); + getSettlementByDateResult.IsSuccess.ShouldBeTrue(getSettlementByDateResult.Message); SettlementResponse settlement = getSettlementByDateResult.Data; settlement.ShouldNotBeNull(); settlement.NumberOfFeesPendingSettlement.ShouldBe(request.Item4, $"Settlement date {request.Item3}"); @@ -622,7 +622,7 @@ public async Task> WhenICreateTheFollowingEstatesX(String a .CreateEstate(accessToken, createEstateRequest, CancellationToken.None) .ConfigureAwait(false); - result.IsSuccess.ShouldBeTrue(); + result.IsSuccess.ShouldBeTrue(result.Message); } List results = new List(); @@ -636,7 +636,7 @@ await Retry.For(async () => { List? estates = getEstatesResult.Data; try { - getEstatesResult.IsSuccess.ShouldBeTrue(); + getEstatesResult.IsSuccess.ShouldBeTrue(getEstatesResult.Message); estates.ShouldNotBeNull(); estates.Count.ShouldBe(1); estate = estates.Single(); @@ -686,7 +686,7 @@ await Retry.For(async () => { Result? getMerchantResult = await this.TransactionProcessorClient .GetMerchant(accessToken, request.estate.EstateId, request.merchantId, CancellationToken.None) .ConfigureAwait(false); - getMerchantResult.IsSuccess.ShouldBeTrue(); + getMerchantResult.IsSuccess.ShouldBeTrue(getMerchantResult.Message); MerchantResponse merchant = getMerchantResult.Data; merchant.MerchantName.ShouldBe(request.request.Name); merchant.SettlementSchedule.ShouldBe(request.request.SettlementSchedule); @@ -712,7 +712,7 @@ await Retry.For(async () => { Result? getMerchantResult = await this.TransactionProcessorClient .GetMerchant(accessToken, request.estate.EstateId, request.merchantId, CancellationToken.None) .ConfigureAwait(false); - getMerchantResult.IsSuccess.ShouldBeTrue(); + getMerchantResult.IsSuccess.ShouldBeTrue(getMerchantResult.Message); MerchantResponse merchant = getMerchantResult.Data; merchant.OpeningHours.ShouldNotBeNull(); merchant.OpeningHours[DayOfWeek.Sunday].Opening.ShouldBe(request.request.Sunday.Opening); @@ -751,7 +751,7 @@ await Retry.For(async () => { request.merchantId, request.request, CancellationToken.None).ConfigureAwait(false); - assignOperatorToMerchantResult.IsSuccess.ShouldBeTrue(); + assignOperatorToMerchantResult.IsSuccess.ShouldBeTrue(assignOperatorToMerchantResult.Message); merchantOperators.Add((request.estate, request.merchantId, request.request.OperatorId)); } @@ -761,7 +761,7 @@ await Retry.For(async () => { Result? getMerchantResult = await this.TransactionProcessorClient .GetMerchant(accessToken, m.estate.EstateId, m.merchantId, CancellationToken.None) .ConfigureAwait(false); - getMerchantResult.IsSuccess.ShouldBeTrue(); + getMerchantResult.IsSuccess.ShouldBeTrue(getMerchantResult.Message); MerchantResponse merchant = getMerchantResult.Data; if (merchant.Operators == null) { @@ -792,7 +792,7 @@ await Retry.For(async () => { request.request, CancellationToken.None).ConfigureAwait(false); - result.IsSuccess.ShouldBeTrue(); + result.IsSuccess.ShouldBeTrue(result.Message); } foreach ((EstateDetails estate, CreateOperatorRequest request) request in requests) @@ -800,7 +800,7 @@ await Retry.For(async () => { await Retry.For(async () => { Result>? operators = await this.TransactionProcessorClient .GetOperators(accessToken, request.estate.EstateId, CancellationToken.None).ConfigureAwait(false); - operators.IsSuccess.ShouldBeTrue(); + operators.IsSuccess.ShouldBeTrue(operators.Message); OperatorResponse? @operator = operators.Data.SingleOrDefault(o => o.Name == request.request.Name); @operator.ShouldNotBeNull(); //@operator.OperatorId.ShouldNotBe(); @@ -841,7 +841,7 @@ await Retry.For(async () => { Result? getEstateResult = await this.TransactionProcessorClient.GetEstate(accessToken, request.estate.EstateId, CancellationToken.None); - getEstateResult.IsSuccess.ShouldBeTrue(); + getEstateResult.IsSuccess.ShouldBeTrue(getEstateResult.Message); EstateResponse e = getEstateResult.Data; EstateOperatorResponse operatorResponse = e.Operators.SingleOrDefault(o => o.OperatorId == request.request.OperatorId); operatorResponse.ShouldNotBeNull(); @@ -861,7 +861,7 @@ public async Task> GivenICreateAContractWithTheFollowingV { Result? result = await this.TransactionProcessorClient.CreateContract(accessToken, request.Item1.EstateId, request.Item2, CancellationToken.None); - result.IsSuccess.ShouldBeTrue(); + result.IsSuccess.ShouldBeTrue(result.Message); } foreach ((EstateDetails, CreateContractRequest) request in requests) @@ -888,7 +888,7 @@ public async Task WhenICreateTheFollowingProducts(String accessToken, List<(Esta request.Item2.ContractId, request.Item3, CancellationToken.None); - result.IsSuccess.ShouldBeTrue(); + result.IsSuccess.ShouldBeTrue(result.Message); estateContractProducts.Add((request.Item1, request.Item2, request.Item3)); } @@ -897,7 +897,7 @@ public async Task WhenICreateTheFollowingProducts(String accessToken, List<(Esta await Retry.For(async () => { Result? getContractResult = await this.TransactionProcessorClient.GetContract(accessToken, estateContractProduct.Item1.EstateId, estateContractProduct.Item2.ContractId, CancellationToken.None).ConfigureAwait(false); - getContractResult.IsSuccess.ShouldBeTrue(); + getContractResult.IsSuccess.ShouldBeTrue(getContractResult.Message); ContractResponse contract = getContractResult.Data; contract.ShouldNotBeNull(); @@ -923,7 +923,7 @@ public async Task WhenIAddTheFollowingTransactionFees(String accessToken, List<( request.Item3.ProductId, request.Item4, CancellationToken.None); - result.IsSuccess.ShouldBeTrue(); + result.IsSuccess.ShouldBeTrue(result.Message); } foreach ((EstateDetails, Contract, Product, AddTransactionFeeForProductToContractRequest) estateContractProductsFee in estateContractProductsFees) @@ -951,7 +951,7 @@ await Retry.For(async () => { contract.ContractId, product.ProductId, CancellationToken.None); - feesResult.IsSuccess.ShouldBeTrue(); + feesResult.IsSuccess.ShouldBeTrue(feesResult.Message); List? fees = feesResult.Data; ContractProductTransactionFee? fee = fees.SingleOrDefault(f => f.TransactionFeeId == transactionFee.TransactionFeeId); @@ -975,7 +975,7 @@ await Retry.For(async () => { Result? getMerchantResult = await this.TransactionProcessorClient .GetMerchant(accessToken, m.estate.EstateId, m.merchantId, CancellationToken.None) .ConfigureAwait(false); - getMerchantResult.IsSuccess.ShouldBeTrue(); + getMerchantResult.IsSuccess.ShouldBeTrue(getMerchantResult.Message); MerchantResponse merchant = getMerchantResult.Data; KeyValuePair device = merchant.Devices.SingleOrDefault(o => o.Key == m.deviceId); device.Value.ShouldNotBeNull(); @@ -1001,7 +1001,7 @@ public async Task WhenIAddTheFollowingContractsToTheFollowingMerchants(String ac public async Task GivenIMakeTheFollowingManualMerchantDeposits(String accessToken, (EstateDetails, Guid, MakeMerchantDepositRequest) request) { Result? result = await this.TransactionProcessorClient.MakeMerchantDeposit(accessToken, request.Item1.EstateId, request.Item2, request.Item3, CancellationToken.None).ConfigureAwait(false); - result.IsSuccess.ShouldBeTrue(); + result.IsSuccess.ShouldBeTrue(result.Message); } public async Task WhenICreateTheFollowingSecurityUsers(String accessToken, List requests, List estateDetailsList) @@ -1022,11 +1022,11 @@ public async Task WhenICreateTheFollowingSecurityUsers(String accessToken, List< MiddleName = createNewUserRequest.MiddleName, Password = createNewUserRequest.Password }; - await this.TransactionProcessorClient.CreateEstateUser(accessToken, + Result estateResult = await this.TransactionProcessorClient.CreateEstateUser(accessToken, estateDetails.EstateId, request, CancellationToken.None); - + estateResult.IsSuccess.ShouldBeTrue(estateResult.Message); estateDetails.SetEstateUser(request.EmailAddress, request.Password); } else @@ -1047,11 +1047,12 @@ await this.TransactionProcessorClient.CreateEstateUser(accessToken, Password = createNewUserRequest.Password }; - await this.TransactionProcessorClient.CreateMerchantUser(token, + Result merchantResult = await this.TransactionProcessorClient.CreateMerchantUser(token, estateDetails.EstateId, createNewUserRequest.MerchantId.Value, createMerchantUserRequest, CancellationToken.None); + merchantResult.IsSuccess.ShouldBeTrue(merchantResult.Message); estateDetails.AddMerchantUser(createNewUserRequest.MerchantName, createMerchantUserRequest.EmailAddress, createMerchantUserRequest.Password); } @@ -1075,7 +1076,7 @@ public async Task WhenIGetTheEstateTheEstateDetailsAreReturnedAsFollows(String a } Result? getEstateResult = await this.TransactionProcessorClient.GetEstate(token, estateId, CancellationToken.None).ConfigureAwait(false); - getEstateResult.IsSuccess.ShouldBeTrue(); + getEstateResult.IsSuccess.ShouldBeTrue(getEstateResult.Message); EstateResponse estate = getEstateResult.Data; estate.EstateName.ShouldBe(expectedEstateDetails.Single()); } @@ -1088,7 +1089,7 @@ public async Task WhenIGetAllTheOperatorsTheFollowingDetailsAreReturned(String a { await Retry.For(async () => { Result>? getOperatorsResult = await this.TransactionProcessorClient.GetOperators(accessToken, estateId, CancellationToken.None); - getOperatorsResult.IsSuccess.ShouldBeTrue(); + getOperatorsResult.IsSuccess.ShouldBeTrue(getOperatorsResult.Message); List? operatorList = getOperatorsResult.Data; foreach (OperatorResponse operatorResponse in operatorList) { @@ -1118,7 +1119,7 @@ public async Task WhenIGetTheEstateTheEstateOperatorDetailsAreReturnedAsFollows( } Result>? getEstatesResult = await this.TransactionProcessorClient.GetEstates(token, estateId, CancellationToken.None).ConfigureAwait(false); - getEstatesResult.IsSuccess.ShouldBeTrue(); + getEstatesResult.IsSuccess.ShouldBeTrue(getEstatesResult.Message); getEstatesResult.Data.ShouldNotBeEmpty(); EstateResponse estate = getEstatesResult.Data.Single(); foreach (String expectedOperator in expectedOperators) @@ -1145,7 +1146,7 @@ public async Task WhenIGetTheEstateTheEstateSecurityUserDetailsAreReturnedAsFoll } Result? getEstateResult = await this.TransactionProcessorClient.GetEstate(token, estateId, CancellationToken.None).ConfigureAwait(false); - getEstateResult.IsSuccess.ShouldBeTrue(); + getEstateResult.IsSuccess.ShouldBeTrue(getEstateResult.Message); EstateResponse? estate = getEstateResult.Data; estate.ShouldNotBeNull(); foreach (String expectedSecurityUser in expectedSecurityUsers) @@ -1159,7 +1160,7 @@ public async Task WhenIGetTheEstateAnErrorIsReturned(String accessToken, String { Guid estateId = Guid.NewGuid(); Result? result = await this.TransactionProcessorClient.GetEstate(accessToken, estateId, CancellationToken.None).ConfigureAwait(false); - result.IsSuccess.ShouldBeFalse(); + result.IsSuccess.ShouldBeFalse(result.Message); ResultStatus status = Enum.Parse(errorStatus); result.Status.ShouldBe(status); } @@ -1174,7 +1175,7 @@ public async Task WhenIRemoveTheOperatorFromEstateTheOperatorIsRemoved(String ac await Retry.For(async () => { Result? getEstateResult = await this.TransactionProcessorClient.GetEstate(accessToken, estateDetails.EstateId, CancellationToken.None); - getEstateResult.IsSuccess.ShouldBeTrue(); + getEstateResult.IsSuccess.ShouldBeTrue(getEstateResult.Message); EstateResponse? estateResponse = getEstateResult.Data; estateResponse.ShouldNotBeNull(); @@ -1199,7 +1200,7 @@ await Retry.For(async () => { Result? getOperatorResult = await this.TransactionProcessorClient .GetOperator(accessToken, request.estate.EstateId, request.operatorId, CancellationToken.None) .ConfigureAwait(false); - getOperatorResult.IsSuccess.ShouldBeTrue(); + getOperatorResult.IsSuccess.ShouldBeTrue(getOperatorResult.Message); OperatorResponse? operatorResponse = getOperatorResult.Data; operatorResponse.Name.ShouldBe(request.request.Name); @@ -1233,7 +1234,7 @@ public async Task ThenIGetTheContractsForTheFollowingContractDetailsAreReturned( await Retry.For(async () => { Result>? getContractsResult = await this.TransactionProcessorClient.GetContracts(token, estateDetails.EstateId, CancellationToken.None); - getContractsResult.IsSuccess.ShouldBeTrue(); + getContractsResult.IsSuccess.ShouldBeTrue(getContractsResult.Message); List? contracts = getContractsResult.Data; contracts.ShouldNotBeNull(); contracts.ShouldHaveSingleItem(); @@ -1268,7 +1269,7 @@ public async Task ThenIGetTheMerchantContractsForForTheFollowingContractDetailsA await Retry.For(async () => { Result>? getContractsResult = await this.TransactionProcessorClient.GetMerchantContracts(token, estateDetails.EstateId, merchantId, CancellationToken.None); - getContractsResult.IsSuccess.ShouldBeTrue(); + getContractsResult.IsSuccess.ShouldBeTrue(getContractsResult.Message); List contracts = getContractsResult.Data; contracts.ShouldNotBeNull(); @@ -1312,7 +1313,7 @@ await this.TransactionProcessorClient.GetTransactionFeesForProduct(token, product.ProductId, CancellationToken.None); - transactionFeesResult.IsSuccess.ShouldBeTrue(); + transactionFeesResult.IsSuccess.ShouldBeTrue(transactionFeesResult.Message); List transactionFeesList = transactionFeesResult.Data; foreach ((CalculationType, String, Decimal?, FeeType) transactionFee in transactionFees) @@ -1375,7 +1376,7 @@ public async Task WhenIUpdateTheMerchantsContactWithTheFollowingDetails(String a { await Retry.For(async () => { var getMerchantResult = await this.TransactionProcessorClient.GetMerchant(accessToken, contactVerify.Item1.EstateId, contactVerify.Item2.MerchantId, CancellationToken.None); - getMerchantResult.IsSuccess.ShouldBeTrue(); + getMerchantResult.IsSuccess.ShouldBeTrue(getMerchantResult.Message); MerchantResponse? merchant = getMerchantResult.Data; merchant.ShouldNotBeNull(); @@ -1402,7 +1403,7 @@ public async Task WhenIRemoveTheContractFromMerchantOnTheContractIsRemoved(Strin await Retry.For(async () => { Result? getMerchantResult = await this.TransactionProcessorClient.GetMerchant(accessToken, estateDetails.EstateId, merchant.MerchantId, CancellationToken.None); - getMerchantResult.IsSuccess.ShouldBeTrue(); + getMerchantResult.IsSuccess.ShouldBeTrue(getMerchantResult.Message); MerchantResponse? merchantResponse = getMerchantResult.Data; merchantResponse.ShouldNotBeNull(); @@ -1423,7 +1424,7 @@ public async Task WhenIRemoveTheOperatorFromMerchantOnTheOperatorIsRemoved(Strin await Retry.For(async () => { var getMerchantResult = await this.TransactionProcessorClient.GetMerchant(accessToken, estateDetails.EstateId, merchant.MerchantId, CancellationToken.None); - getMerchantResult.IsSuccess.ShouldBeTrue(); + getMerchantResult.IsSuccess.ShouldBeTrue(getMerchantResult.Message); MerchantResponse? merchantResponse = getMerchantResult.Data; merchantResponse.ShouldNotBeNull(); diff --git a/TransactionProcessor.IntegrationTests/Common/TestingContext.cs b/TransactionProcessor.IntegrationTests/Common/TestingContext.cs index 7227eb04..9f21bef4 100644 --- a/TransactionProcessor.IntegrationTests/Common/TestingContext.cs +++ b/TransactionProcessor.IntegrationTests/Common/TestingContext.cs @@ -203,7 +203,7 @@ await Retry.For(async () => { estate.EstateId, transactionResponse.TransactionId, CancellationToken.None); - getVoucherByTransactionIdResult.IsSuccess.ShouldBeTrue(); + getVoucherByTransactionIdResult.IsSuccess.ShouldBeTrue(getVoucherByTransactionIdResult.Message); voucher = getVoucherByTransactionIdResult.Data; }); diff --git a/TransactionProcessor.IntegrationTests/Shared/SharedSteps.cs b/TransactionProcessor.IntegrationTests/Shared/SharedSteps.cs index 24563626..d712e176 100644 --- a/TransactionProcessor.IntegrationTests/Shared/SharedSteps.cs +++ b/TransactionProcessor.IntegrationTests/Shared/SharedSteps.cs @@ -452,7 +452,7 @@ public async Task GivenIHaveATokenToAccessTheEstateManagementResource(DataTable //this.TestingContext.AccessToken = await this.SecurityServiceSteps.GetClientToken(clientDetails.ClientId, clientDetails.ClientSecret, CancellationToken.None); var token = await this.TestingContext.DockerHelper.SecurityServiceClient.GetToken(clientDetails.ClientId, clientDetails.ClientSecret, CancellationToken.None); - token.IsSuccess.ShouldBeTrue(); + token.IsSuccess.ShouldBeTrue(token.Message); this.TestingContext.AccessToken = token.Data.AccessToken; } @@ -517,7 +517,7 @@ public async Task GivenIAmLoggedInAsWithPasswordForEstate(String username, // .GetPasswordToken(clientId, clientDetails.ClientSecret, username, password, CancellationToken.None).ConfigureAwait(false); Result token = await this.TestingContext.DockerHelper.SecurityServiceClient.GetToken(username, password, clientId, clientDetails.ClientSecret, CancellationToken.None); - token.IsSuccess.ShouldBeTrue(); + token.IsSuccess.ShouldBeTrue(token.Message); this.TestingContext.AccessToken = token.Data.AccessToken; estateDetails.SetEstateUserToken(token.Data.AccessToken); }