Skip to content

Commit 76474ea

Browse files
StuartFergusonStuartFerguson
authored
Merge pull request #112 from TransactionProcessing/task/#110_reduce_number_of_float_credits
Add Job to create float credits
2 parents a46dc6f + c74358a commit 76474ea

21 files changed

Lines changed: 311 additions & 201 deletions

‎TransactionProcessing.SchedulerService/JobTestDriver/Program.cs‎

Lines changed: 40 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
using Quartz;
22
using Quartz.Core;
33
using Quartz.Impl;
4+
using TransactionProcessing.SchedulerService.Jobs.Configuration;
5+
using TransactionProcessing.SchedulerService.Jobs.Jobs;
46

57
namespace JobTestDriver
68
{
@@ -14,7 +16,7 @@ namespace JobTestDriver
1416

1517
internal class Program{
1618
static async Task Main(string[] args){
17-
19+
1820
//List<(String groupName, String streamName, Int64 parkedMessageCount)>? info = await Jobs.GetParkedQueueInformation("esdb://admin:changeit@192.168.0.133:2113?tls=false&tlsVerifyCert=false", CancellationToken.None);
1921
//foreach ((String groupName, String streamName, Int64 parkedMessageCount) infoItem in info){
2022
// Console.WriteLine($"Group: {infoItem.groupName} Stream: {infoItem.streamName} Parked Count: {infoItem.parkedMessageCount}");
@@ -37,39 +39,49 @@ static async Task Main(string[] args){
3739
// messagingServiceClient,
3840
// CancellationToken.None);
3941

40-
//HttpClientHandler handler = new HttpClientHandler
41-
// {
42-
// ServerCertificateCustomValidationCallback = (message,
43-
// cert,
44-
// chain,
45-
// errors) => {
46-
// return true;
47-
// }
48-
// };
49-
//HttpClient client = new HttpClient(handler);
50-
//ISecurityServiceClient securityServiceClient = new SecurityServiceClient(delegate(String s){ return "https://192.168.1.167:5001"; },client); IEstateClient estateClient = new EstateClient(delegate (String s) { return "http://192.168.1.167:5000"; }, client);
51-
//ITransactionProcessorClient transactionProcessorClient = new TransactionProcessorClient(delegate (String s) { return "https://eojrtqfzvyheu0l.m.pipedream.net"; }, client);
52-
//String estateManagementApi = "http://192.168.1.167:5000";
53-
//String fileProcessorApi = "http://192.168.1.167:5009";
54-
//String testHostApi = "http://192.168.1.167:9000";
55-
//String clientId = "serviceClient";
56-
//String clientSecret = "d192cbc46d834d0da90e8a9d50ded543";
42+
HttpClientHandler handler = new HttpClientHandler
43+
{
44+
ServerCertificateCustomValidationCallback = (message,
45+
cert,
46+
chain,
47+
errors) =>
48+
{
49+
return true;
50+
}
51+
};
52+
HttpClient client = new HttpClient(handler);
53+
ISecurityServiceClient securityServiceClient = new SecurityServiceClient(delegate (String s) { return "https://192.168.1.167:5001"; }, client); IEstateClient estateClient = new EstateClient(delegate (String s) { return "http://192.168.1.167:5000"; }, client);
54+
ITransactionProcessorClient transactionProcessorClient = new TransactionProcessorClient(delegate (String s) { return "https://eojrtqfzvyheu0l.m.pipedream.net"; }, client);
55+
String estateManagementApi = "http://192.168.1.167:5000";
56+
String fileProcessorApi = "http://192.168.1.167:5009";
57+
String testHostApi = "http://192.168.1.167:9000";
58+
String clientId = "serviceClient";
59+
String clientSecret = "d192cbc46d834d0da90e8a9d50ded543";
60+
61+
ITransactionDataGenerator t = new TransactionDataGenerator(securityServiceClient,
62+
estateClient,
63+
transactionProcessorClient,
64+
estateManagementApi,
65+
fileProcessorApi,
66+
testHostApi,
67+
clientId,
68+
clientSecret,
69+
RunningMode.WhatIf);
70+
Guid estateId = Guid.Parse("435613ac-a468-47a3-ac4f-649d89764c22");
71+
72+
MakeFloatCreditsJobConfig c = new MakeFloatCreditsJobConfig(clientId,clientSecret, estateManagementApi, fileProcessorApi,"","", "", estateId,
73+
new List<DepositAmount> { new DepositAmount(Guid.NewGuid(), Guid.NewGuid(), 100) }
74+
);
5775

58-
//ITransactionDataGenerator t = new TransactionDataGenerator(securityServiceClient,
59-
// estateClient,
60-
// transactionProcessorClient,
61-
// estateManagementApi,
62-
// fileProcessorApi,
63-
// testHostApi,
64-
// clientId,
65-
// clientSecret,
66-
// RunningMode.Live);
67-
//Guid estateId = Guid.Parse("435613ac-a468-47a3-ac4f-649d89764c22");
76+
await Jobs.GenerateFloatCredits(t, c, CancellationToken.None);
6877
//Guid merchantId = Guid.Parse("ab1c99fb-1c6c-4694-9a32-b71be5d1da33");
6978
//await Jobs.GenerateTransactions(t, estateId, merchantId, false, CancellationToken.None);
7079
////var d = TransactionDataGenerator.GetTransactionDateTime(new Random(), DateTime.Now);
7180
////Console.WriteLine(d);
7281
//await Jobs.PerformSettlement(t, DateTime.Now,estateId, CancellationToken.None);
82+
83+
84+
7385
}
7486
}
7587
}

‎TransactionProcessing.SchedulerService/TransactionProcessing.SchedulerService.Jobs/Bootstrapper.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using Microsoft.IdentityModel.Tokens;
2+
using BaseConfiguration = TransactionProcessing.SchedulerService.Jobs.Configuration.BaseConfiguration;
23

34
namespace TransactionProcessing.SchedulerService.Jobs;
45

‎TransactionProcessing.SchedulerService/TransactionProcessing.SchedulerService.Jobs/Common/Helpers.cs‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Linq;
4+
using System.Text.Json;
5+
using Newtonsoft.Json;
6+
using Quartz;
7+
using JsonSerializer = System.Text.Json.JsonSerializer;
8+
9+
namespace TransactionProcessing.SchedulerService.Jobs.Common;
10+
11+
public static class Helpers
12+
{
13+
public static T LoadJobConfig<T>(JobDataMap jobDataMap)
14+
{
15+
String standardConfiguration = jobDataMap.GetString("Standard Configuration");
16+
String jobConfiguration = jobDataMap.GetString("Job Configuration");
17+
string fullConfig = Helpers.MergeJsonConfig(standardConfiguration, jobConfiguration);
18+
T configuration = JsonConvert.DeserializeObject<T>(fullConfig);
19+
20+
return configuration;
21+
}
22+
23+
public static String MergeJsonConfig(String jsonDocument1, String jsonDocument2)
24+
{
25+
using (JsonDocument doc1 = JsonDocument.Parse(jsonDocument1))
26+
using (JsonDocument doc2 = JsonDocument.Parse(jsonDocument2))
27+
{
28+
JsonObject mergedObject = new JsonObject();
29+
30+
foreach (var property in doc1.RootElement.EnumerateObject())
31+
{
32+
mergedObject.Add(property.Name, property.Value.Clone());
33+
}
34+
35+
foreach (var property in doc2.RootElement.EnumerateObject())
36+
{
37+
if (mergedObject.ContainsKey(property.Name) && property.Value.ValueKind == JsonValueKind.Array)
38+
{
39+
JsonElement existingArray = mergedObject[property.Name];
40+
JsonElement newArray = property.Value;
41+
42+
List<JsonElement> mergedArray = existingArray.EnumerateArray().ToList();
43+
mergedArray.AddRange(newArray.EnumerateArray());
44+
45+
mergedObject[property.Name] = JsonDocument.Parse(JsonSerializer.Serialize(mergedArray)).RootElement;
46+
}
47+
else
48+
{
49+
mergedObject.Add(property.Name, property.Value.Clone());
50+
}
51+
}
52+
53+
string mergedJson = JsonSerializer.Serialize(mergedObject);
54+
return mergedJson;
55+
}
56+
}
57+
58+
internal class JsonObject : Dictionary<string, JsonElement>
59+
{
60+
}
61+
}

‎TransactionProcessing.SchedulerService/TransactionProcessing.SchedulerService.Jobs/Configuration/BaseConfiguration.cs‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
using System;
2+
3+
namespace TransactionProcessing.SchedulerService.Jobs.Configuration;
4+
5+
public record BaseConfiguration(
6+
String ClientId,
7+
String ClientSecret,
8+
String EstateManagementApi,
9+
String FileProcessorApi,
10+
String SecurityService,
11+
String TestHostApi,
12+
String TransactionProcessorApi);

‎TransactionProcessing.SchedulerService/TransactionProcessing.SchedulerService.Jobs/Configuration/FileUploadJobConfig.cs‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
using System;
2+
using System.Collections.Generic;
3+
4+
namespace TransactionProcessing.SchedulerService.Jobs.Configuration;
5+
6+
public record FileUploadJobConfig(String ClientId,
7+
String ClientSecret,
8+
String EstateManagementApi,
9+
String FileProcessorApi,
10+
String SecurityService,
11+
String TestHostApi,
12+
String TransactionProcessorApi, Guid EstateId, Guid MerchantId, List<String> ContractNames, Guid UserId) : BaseConfiguration(ClientId, ClientSecret, EstateManagementApi, FileProcessorApi, SecurityService, TestHostApi, TransactionProcessorApi);

‎TransactionProcessing.SchedulerService/TransactionProcessing.SchedulerService.Jobs/Configuration/MakeFloatCreditsJobConfig.cs‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
using System;
2+
using System.Collections.Generic;
3+
4+
namespace TransactionProcessing.SchedulerService.Jobs.Configuration;
5+
6+
public record MakeFloatCreditsJobConfig(String ClientId,
7+
String ClientSecret,
8+
String EstateManagementApi,
9+
String FileProcessorApi,
10+
String SecurityService,
11+
String TestHostApi,
12+
String TransactionProcessorApi,
13+
Guid EstateId,
14+
List<DepositAmount> DepositAmounts) : BaseConfiguration(ClientId, ClientSecret, EstateManagementApi, FileProcessorApi, SecurityService, TestHostApi, TransactionProcessorApi);
15+
16+
17+
public record DepositAmount(Guid ContractId, Guid ProductId, Decimal Amount);

‎TransactionProcessing.SchedulerService/TransactionProcessing.SchedulerService.Jobs/Configuration/MerchantStatementJobConfig.cs‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
using System;
2+
3+
namespace TransactionProcessing.SchedulerService.Jobs.Configuration;
4+
5+
public record MerchantStatementJobConfig(String ClientId,
6+
String ClientSecret,
7+
String EstateManagementApi,
8+
String FileProcessorApi,
9+
String SecurityService,
10+
String TestHostApi,
11+
String TransactionProcessorApi,Guid EstateId) : BaseConfiguration(ClientId, ClientSecret, EstateManagementApi, FileProcessorApi, SecurityService, TestHostApi, TransactionProcessorApi);

‎TransactionProcessing.SchedulerService/TransactionProcessing.SchedulerService.Jobs/Configuration/ReplayParkedQueueJobConfig.cs‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
using System;
2+
3+
namespace TransactionProcessing.SchedulerService.Jobs.Configuration;
4+
5+
public record ReplayParkedQueueJobConfig(String ClientId,
6+
String ClientSecret,
7+
String EstateManagementApi,
8+
String FileProcessorApi,
9+
String SecurityService,
10+
String TestHostApi,
11+
String TransactionProcessorApi, String EventStoreAddress) : BaseConfiguration(ClientId, ClientSecret, EstateManagementApi, FileProcessorApi, SecurityService, TestHostApi, TransactionProcessorApi);

‎TransactionProcessing.SchedulerService/TransactionProcessing.SchedulerService.Jobs/Configuration/SettlementJobConfig.cs‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
using System;
2+
3+
namespace TransactionProcessing.SchedulerService.Jobs.Configuration;
4+
5+
public record SettlementJobConfig(String ClientId,
6+
String ClientSecret,
7+
String EstateManagementApi,
8+
String FileProcessorApi,
9+
String SecurityService,
10+
String TestHostApi,
11+
String TransactionProcessorApi, Guid EstateId) : BaseConfiguration(ClientId, ClientSecret, EstateManagementApi, FileProcessorApi, SecurityService, TestHostApi, TransactionProcessorApi);

‎TransactionProcessing.SchedulerService/TransactionProcessing.SchedulerService.Jobs/Configuration/TransactionJobConfig.cs‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
using System;
2+
using System.Collections.Generic;
3+
4+
namespace TransactionProcessing.SchedulerService.Jobs.Configuration;
5+
6+
public record TransactionJobConfig(String ClientId,
7+
String ClientSecret,
8+
String EstateManagementApi,
9+
String FileProcessorApi,
10+
String SecurityService,
11+
String TestHostApi,
12+
String TransactionProcessorApi, Guid EstateId, Guid MerchantId, Boolean IsLogon, List<String> ContractNames) : BaseConfiguration(ClientId, ClientSecret, EstateManagementApi, FileProcessorApi, SecurityService, TestHostApi, TransactionProcessorApi);

0 commit comments

Comments
 (0)