Skip to content

Added concurrent merchant processing #10

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 1 commit into from
Apr 20, 2021
Merged

Added concurrent merchant processing #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
144 changes: 104 additions & 40 deletions ...rator/TransactionDataGenerator/Program.cs → ...or.DataGenerator/DataGenerator/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,13 @@
namespace TransactionDataGenerator
{
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Net.Http;
using System.Runtime.CompilerServices;
using System.Threading;
using System.Threading.Tasks;
using System.Threading.Tasks.Dataflow;
using EstateManagement.Client;
using EstateManagement.DataTransferObjects.Requests;
using EstateManagement.DataTransferObjects.Responses;
Expand All @@ -17,6 +19,17 @@ namespace TransactionDataGenerator
using TransactionProcessor.Client;
using TransactionProcessor.DataTransferObjects;

public class Gimp
{
public class V1
{
public class GimpAddedEvent
{

}
}
}

/// <summary>
///
/// </summary>
Expand Down Expand Up @@ -81,27 +94,28 @@ static async Task Main(string[] args)
Program.TransactionProcessorClient = new TransactionProcessorClient(baseAddressFunc, httpClient);

// Set an estate
Guid estateId = Guid.Parse("3bf2dab2-86d6-44e3-bcf8-51bec65cf8bc");
Guid estateId = Guid.Parse("5b07ec2d-3856-4d05-ab31-e2dedb95ea27");

// Get a token
await Program.GetToken(CancellationToken.None);

// Get the the merchant list for the estate
List<MerchantResponse> merchants = await Program.EstateClient.GetMerchants(Program.TokenResponse.AccessToken, estateId, CancellationToken.None);

//merchants = merchants.Where(m => m.MerchantName == "S7 Merchant").ToList();


// Set the date range
DateTime startDate = new DateTime(2020,12,01);
DateTime endDate = new DateTime(2020, 12, 11);
DateTime startDate = new DateTime(2021,4,1);
DateTime endDate = new DateTime(2021, 4, 19); // This is the date of te last generated transaction
List<DateTime> dateRange = Program.GenerateDateRange(startDate, endDate);

// Only use merchants that have a device
merchants = merchants.Where(m => m.Devices != null && m.Devices.Any()).ToList();

await Program.GenerateTransactions(merchants, dateRange);

Console.WriteLine($"Process Complete - {Program.TransactionCount} transactions generated");
foreach (DateTime dateTime in dateRange)
{
await Program.GenerateTransactions(merchants, dateTime, CancellationToken.None);
}

Console.WriteLine($"Process Complete");
}

/// <summary>
Expand Down Expand Up @@ -133,36 +147,86 @@ private static async Task GetToken(CancellationToken cancellationToken)
/// <param name="merchants">The merchants.</param>
/// <param name="dateRange">The date range.</param>
private static async Task GenerateTransactions(List<MerchantResponse> merchants,
List<DateTime> dateRange)
DateTime dateTime,
CancellationToken cancellationToken)
{
foreach (DateTime dateTime in dateRange)
Int32 maxDegreeOfParallelism = 5;
Int32 boundedCapacityForActionBlock = merchants.Count;

ActionBlock<(MerchantResponse merchant, CancellationToken cancellationToken)> workerBlock =
new ActionBlock<(MerchantResponse merchant, CancellationToken cancellationToken)>(async (message) =>
{
try
{
Int32 transactionCount = 0;

// Do a logon transaction for each merchant
await Program.DoLogonTransaction(message.merchant, dateTime);
Console
.WriteLine($"Logon sent for Merchant [{message.merchant.MerchantName}]");

// Now generate some sales
List<SaleTransactionRequest> saleRequests =
await Program.CreateSaleRequests(message.merchant,
dateTime);

// Work out how much of a deposit the merchant needs (minus 1 sale)
IEnumerable<Dictionary<String, String>> metadata =
saleRequests.Select(s => s.AdditionalTransactionMetadata);
List<String> amounts = metadata.Select(m => m["Amount"])
.ToList();

Decimal depositAmount = amounts.TakeLast(amounts.Count - 1)
.Sum(a => Decimal.Parse(a));

await Program.MakeMerchantDeposit(message.merchant,
depositAmount,
dateTime);

// Now send the sales
saleRequests = saleRequests.OrderBy(s => s.TransactionDateTime)
.ToList();
foreach (SaleTransactionRequest saleTransactionRequest in
saleRequests)
{
await Program.DoSaleTransaction(saleTransactionRequest);
Console
.WriteLine($"Sale sent for Merchant [{message.merchant.MerchantName}]");
transactionCount++;
}

Console.ForegroundColor = ConsoleColor.Green;
Console
.WriteLine($"{transactionCount} transactions generated for {message.merchant.MerchantName} on date {dateTime.ToLongDateString()}");
}
catch(Exception ex)
{
Console.ForegroundColor = ConsoleColor.Red;
Console.WriteLine("Failed");
Console.WriteLine(ex);
}
},
new ExecutionDataflowBlockOptions
{
MaxDegreeOfParallelism = maxDegreeOfParallelism,
BoundedCapacity = boundedCapacityForActionBlock
});


try
{
foreach (MerchantResponse merchant in merchants)
foreach (var merchant in merchants)
{
// Do a logon transaction for each merchant
await Program.DoLogonTransaction(merchant, dateTime);
Console.WriteLine($"Logon sent for Merchant [{merchant.MerchantName}]");

// Now generate some sales
List<SaleTransactionRequest> saleRequests = await Program.CreateSaleRequests(merchant, dateTime);

// Work out how much of a deposit the merchant needs (minus 1 sale)
IEnumerable<Dictionary<String, String>> metadata = saleRequests.Select(s => s.AdditionalTransactionMetadata);
List<String> amounts = metadata.Select(m => m["Amount"]).ToList();

Decimal depositAmount = amounts.TakeLast(amounts.Count - 1).Sum(a => Decimal.Parse(a));

await Program.MakeMerchantDeposit(merchant, depositAmount, dateTime);

// Now send the sales
saleRequests = saleRequests.OrderBy(s => s.TransactionDateTime).ToList();
foreach (SaleTransactionRequest saleTransactionRequest in saleRequests)
{
await Program.DoSaleTransaction(saleTransactionRequest);
Console.WriteLine($"Sale sent for Merchant [{merchant.MerchantName}]");
TransactionCount++;
}
await workerBlock.SendAsync((merchant, cancellationToken), cancellationToken);
}

workerBlock.Complete();

await workerBlock.Completion;
}
catch (Exception e)
{
Console.WriteLine(e);
}
}

Expand All @@ -184,7 +248,7 @@ await Program.EstateClient.MakeMerchantDeposit(Program.TokenResponse.AccessToken
new MakeMerchantDepositRequest
{
Amount = depositAmount,
DepositDateTime = dateTime,
DepositDateTime = dateTime.AddSeconds(55),
Reference = "Test Data Gen Deposit",
Source = MerchantDepositSource.Manual
},
Expand All @@ -203,8 +267,8 @@ private static async Task DoSaleTransaction(SaleTransactionRequest saleTransacti
await Program.GetToken(CancellationToken.None);

SerialisedMessage requestSerialisedMessage = new SerialisedMessage();
requestSerialisedMessage.Metadata.Add("EstateId", saleTransactionRequest.EstateId.ToString());
requestSerialisedMessage.Metadata.Add("MerchantId", saleTransactionRequest.MerchantId.ToString());
requestSerialisedMessage.Metadata.Add("estate_id", saleTransactionRequest.EstateId.ToString());
requestSerialisedMessage.Metadata.Add("merchant_id", saleTransactionRequest.MerchantId.ToString());
requestSerialisedMessage.SerialisedData = JsonConvert.SerializeObject(saleTransactionRequest,
new JsonSerializerSettings
{
Expand Down Expand Up @@ -327,8 +391,8 @@ private static async Task DoLogonTransaction(MerchantResponse merchant,
};

SerialisedMessage requestSerialisedMessage = new SerialisedMessage();
requestSerialisedMessage.Metadata.Add("EstateId", merchant.EstateId.ToString());
requestSerialisedMessage.Metadata.Add("MerchantId", merchant.MerchantId.ToString());
requestSerialisedMessage.Metadata.Add("estate_id", merchant.EstateId.ToString());
requestSerialisedMessage.Metadata.Add("merchant_id", merchant.MerchantId.ToString());
requestSerialisedMessage.SerialisedData = JsonConvert.SerializeObject(logonTransactionRequest,
new JsonSerializerSettings
{
Expand Down
8 changes: 4 additions & 4 deletions ...Generator/TransactionDataGenerator.csproj → ...Generator/TransactionDataGenerator.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="EstateManagement.Client" Version="1.0.6" />
<PackageReference Include="EstateManagement.Client" Version="1.0.10" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="SecurityService.Client" Version="1.0.4" />
<PackageReference Include="TransactionProcessor.Client" Version="1.0.7.2" />
<PackageReference Include="SecurityService.Client" Version="1.0.6" />
<PackageReference Include="TransactionProcessor.Client" Version="1.0.12" />
</ItemGroup>

</Project>
0 ...ataGenerator/TransactionDataGenerator.sln → ...ataGenerator/TransactionDataGenerator.sln
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion TransactionProcessor.DataGenerator/TransactionProcessor.DataGenerator.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ VisualStudioVersion = 16.0.30523.141
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TransactionGeneratorWorker", "TransactionGeneratorWorker\TransactionGeneratorWorker.csproj", "{DF5050CF-91D8-4248-BEF6-25FAF1A05677}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TransactionDataGenerator", "TransactionDataGenerator\TransactionDataGenerator.csproj", "{BC85594F-6F0B-425D-868F-560B9A3AC104}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TransactionDataGenerator", "DataGenerator\TransactionDataGenerator.csproj", "{BC85594F-6F0B-425D-868F-560B9A3AC104}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down