diff --git a/TransactionProcessor.DataGenerator/DataGenerator/TransactionDataGenerator.csproj b/TransactionProcessor.DataGenerator/DataGenerator/TransactionDataGenerator.csproj index 968a283..8e18f49 100644 --- a/TransactionProcessor.DataGenerator/DataGenerator/TransactionDataGenerator.csproj +++ b/TransactionProcessor.DataGenerator/DataGenerator/TransactionDataGenerator.csproj @@ -9,7 +9,7 @@ - + diff --git a/TransactionProcessor.DataGenerator/TransactionProcessing.DataGeneration/TransactionDataGenerator.cs b/TransactionProcessor.DataGenerator/TransactionProcessing.DataGeneration/TransactionDataGenerator.cs index 7bab8d3..815a84f 100644 --- a/TransactionProcessor.DataGenerator/TransactionProcessing.DataGeneration/TransactionDataGenerator.cs +++ b/TransactionProcessor.DataGenerator/TransactionProcessing.DataGeneration/TransactionDataGenerator.cs @@ -228,11 +228,17 @@ public async Task PerformMerchantLogon(DateTime dateTime, MerchantRespo public async Task PerformSettlement(DateTime dateTime, Guid estateId, CancellationToken cancellationToken){ try { - this.WriteTrace($"About to send Process Settlement Request for Date [{dateTime:dd-MM-yyyy}] and Estate [{estateId}]"); + List merchants = await this.GetMerchants(estateId, cancellationToken); - await this.SendProcessSettlementRequest(dateTime, estateId, cancellationToken); - this.WriteTrace($"Process Settlement Request sent for Date [{dateTime:dd-MM-yyyy}] and Estate [{estateId}]"); + foreach (MerchantResponse merchantResponse in merchants){ + this.WriteTrace($"About to send Process Settlement Request for Date [{dateTime:dd-MM-yyyy}] and Estate [{estateId}] and Merchant [{merchantResponse.MerchantId}]"); + await this.SendProcessSettlementRequest(dateTime, estateId,merchantResponse.MerchantId, cancellationToken); + this.WriteTrace($"Process Settlement Request sent for Date [{dateTime:dd-MM-yyyy}] and Estate [{estateId}] and Merchant [{merchantResponse.MerchantId}]"); + } + + + return true; } @@ -825,7 +831,7 @@ private async Task UploadFile(UploadFile uploadFile, Guid userId, DateT } } - private async Task SendProcessSettlementRequest(DateTime dateTime, Guid estateId, CancellationToken cancellationToken) + private async Task SendProcessSettlementRequest(DateTime dateTime, Guid estateId,Guid merchantId, CancellationToken cancellationToken) { if (this.RunningMode == RunningMode.WhatIf) { @@ -834,7 +840,7 @@ private async Task SendProcessSettlementRequest(DateTime dateTime, Guid estateId } String token = await this.GetAuthToken(cancellationToken); - await this.TransactionProcessorClient.ProcessSettlement(token, dateTime, estateId, cancellationToken); + await this.TransactionProcessorClient.ProcessSettlement(token, dateTime, estateId,merchantId, cancellationToken); } #endregion diff --git a/TransactionProcessor.DataGenerator/TransactionProcessing.DataGeneration/TransactionProcessing.DataGeneration.csproj b/TransactionProcessor.DataGenerator/TransactionProcessing.DataGeneration/TransactionProcessing.DataGeneration.csproj index 1e8d95d..f9c00ac 100644 --- a/TransactionProcessor.DataGenerator/TransactionProcessing.DataGeneration/TransactionProcessing.DataGeneration.csproj +++ b/TransactionProcessor.DataGenerator/TransactionProcessing.DataGeneration/TransactionProcessing.DataGeneration.csproj @@ -10,6 +10,6 @@ - +