diff --git a/TransactionProcessing.SchedulerService/TransactionProcessing.SchedulerService.Jobs/Jobs.cs b/TransactionProcessing.SchedulerService/TransactionProcessing.SchedulerService.Jobs/Jobs.cs index 5676b79..76cf719 100644 --- a/TransactionProcessing.SchedulerService/TransactionProcessing.SchedulerService.Jobs/Jobs.cs +++ b/TransactionProcessing.SchedulerService/TransactionProcessing.SchedulerService.Jobs/Jobs.cs @@ -30,7 +30,7 @@ public static async Task GenerateMerchantStatements(ITransactionDataGenerator t, List results = new List(); foreach (MerchantResponse merchantResponse in merchants) { - Boolean success = await t.GenerateMerchantStatement(merchantResponse.EstateId, merchantResponse.MerchantId, DateTime.Now.Date, cancellationToken); + Boolean success = await t.GenerateMerchantStatement(merchantResponse.EstateId, merchantResponse.MerchantId, DateTime.Now, cancellationToken); if (success == false){ results.Add(merchantResponse.MerchantName); } @@ -78,7 +78,7 @@ public static async Task GenerateTransactions(ITransactionDataGenerator t, Guid throw new JobExecutionException($"Error getting Merchant Id [{merchantId}] for Estate Id [{estateId}]"); } - DateTime transactionDate = DateTime.Now.Date; + DateTime transactionDate = DateTime.Now; // Get the merchants contracts List contracts = await t.GetMerchantContracts(merchant, cancellationToken); diff --git a/TransactionProcessor.DataGenerator/DataGenerator/Program.cs b/TransactionProcessor.DataGenerator/DataGenerator/Program.cs index 73bf4a8..7912f7e 100644 --- a/TransactionProcessor.DataGenerator/DataGenerator/Program.cs +++ b/TransactionProcessor.DataGenerator/DataGenerator/Program.cs @@ -120,7 +120,7 @@ private static async Task GenerateTransactions(ITransactionDataGenerator g, Guid foreach (ContractResponse contract in contracts) { // Generate and send some sales - await g.SendSales(dateTime, merchant, contract, cancellationToken); + await g.SendSales(dateTime, merchant, contract, 0, cancellationToken); await Task.Delay(TimeSpan.FromSeconds(10), cancellationToken); diff --git a/TransactionProcessor.DataGenerator/TransactionProcessing.DataGeneration/ITransactionDataGenerator.cs b/TransactionProcessor.DataGenerator/TransactionProcessing.DataGeneration/ITransactionDataGenerator.cs index 030afb9..5efe618 100644 --- a/TransactionProcessor.DataGenerator/TransactionProcessing.DataGeneration/ITransactionDataGenerator.cs +++ b/TransactionProcessor.DataGenerator/TransactionProcessing.DataGeneration/ITransactionDataGenerator.cs @@ -10,7 +10,7 @@ public interface ITransactionDataGenerator{ Task> GetMerchants(Guid estateId, CancellationToken cancellationToken); Task PerformMerchantLogon(DateTime dateTime, MerchantResponse merchant, CancellationToken cancellationToken); Task PerformSettlement(DateTime dateTime, Guid estateId, CancellationToken cancellationToken); - Task SendSales(DateTime dateTime, MerchantResponse merchant, ContractResponse contract, CancellationToken cancellationToken); + Task SendSales(DateTime dateTime, MerchantResponse merchant, ContractResponse contract, Int32 numberOfSales, CancellationToken cancellationToken); Task SendUploadFile(DateTime dateTime, ContractResponse contract, MerchantResponse merchant, CancellationToken cancellationToken); Task GetMerchant(Guid estateId, Guid merchantId, CancellationToken cancellationToken); Task GenerateMerchantStatement(Guid estateId, Guid merchantId, DateTime statementDateTime, CancellationToken cancellationToken); diff --git a/TransactionProcessor.DataGenerator/TransactionProcessing.DataGeneration/TransactionDataGenerator.cs b/TransactionProcessor.DataGenerator/TransactionProcessing.DataGeneration/TransactionDataGenerator.cs index 7017404..80f3978 100644 --- a/TransactionProcessor.DataGenerator/TransactionProcessing.DataGeneration/TransactionDataGenerator.cs +++ b/TransactionProcessor.DataGenerator/TransactionProcessing.DataGeneration/TransactionDataGenerator.cs @@ -244,7 +244,7 @@ public async Task PerformSettlement(DateTime dateTime, Guid estateId, C } } - public async Task SendSales(DateTime dateTime, MerchantResponse merchant, ContractResponse contract, CancellationToken cancellationToken){ + public async Task SendSales(DateTime dateTime, MerchantResponse merchant, ContractResponse contract, Int32 numberOfSales, CancellationToken cancellationToken){ List salesToSend = new List(); Decimal depositAmount = 0; @@ -254,7 +254,9 @@ public async Task SendSales(DateTime dateTime, MerchantResponse merchan List<(SaleTransactionRequest request, Decimal amount)> saleRequests = null; // Get a number of sales to be sent - Int32 numberOfSales = this.r.Next(5, 15); + if (numberOfSales == 0){ + numberOfSales = this.r.Next(5, 15); + } for (Int32 i = 1; i <= numberOfSales; i++){ ProductType productType = this.GetProductType(contract.OperatorName);