Skip to content

Commit 75a0a4b

Browse files
StuartFergusonStuartFerguson
authored
Merge pull request #16 from TransactionProcessing/task/#15_ipaddressupdates
Updated urls and moved to net5
2 parents 0dd4643 + 29be2dd commit 75a0a4b

File tree

11 files changed

+158
-32
lines changed

11 files changed

+158
-32
lines changed

‎.github/workflows/createrelease.yml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,6 @@ jobs:
1919
id: get_version
2020
run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
2121

22-
- name: Setup .NET Core
23-
uses: actions/setup-dotnet@v1
24-
with:
25-
dotnet-version: 3.1.100
26-
2722
- name: Restore Nuget Packages
2823
run: dotnet restore TransactionProcessor.HealthChecksUI/TransactionProcessor.HealthChecksUI.sln --source https://api.nuget.org/v3/index.json --source https://www.myget.org/F/transactionprocessing/api/v3/index.json
2924

‎.github/workflows/pullrequest.yml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,6 @@ jobs:
1616
steps:
1717
- uses: actions/checkout@v1
1818

19-
- name: Setup .NET Core
20-
uses: actions/setup-dotnet@v1
21-
with:
22-
dotnet-version: 3.1.100
23-
2419
- name: Restore Nuget Packages
2520
run: dotnet restore TransactionProcessor.HealthChecksUI/TransactionProcessor.HealthChecksUI.sln --source https://api.nuget.org/v3/index.json --source https://www.myget.org/F/transactionprocessing/api/v3/index.json
2621

‎TransactionProcessing.SettlementProcessor/TransactionProcessing.SettlementProcessor/Program.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ static async Task Main(string[] args)
1919
endDate = DateTime.ParseExact(args[2], "yyyy-MM-dd", null);
2020
}
2121

22+
startDate = new DateTime(2021,10,29);
23+
endDate = new DateTime(2021,11,24);
24+
2225
SettlementProcessor processor = new SettlementProcessor();
2326
processor.LoadConfiguration();
2427
await processor.ProcessSettlement(estateId, startDate, endDate);

‎TransactionProcessor.DataGenerator/DataGenerator/Program.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,8 @@ static async Task Main(string[] args)
108108
List<MerchantResponse> merchants = await Program.EstateClient.GetMerchants(Program.TokenResponse.AccessToken, estateId, CancellationToken.None);
109109

110110
// Set the date range
111-
DateTime startDate = new DateTime(2021,10,6); //27/7
112-
DateTime endDate = new DateTime(2021,10,27); // This is the date of te last generated transaction
111+
DateTime startDate = new DateTime(2021,11,06); //27/7
112+
DateTime endDate = new DateTime(2021,11,23); // This is the date of te last generated transaction
113113
List<DateTime> dateRange = Program.GenerateDateRange(startDate, endDate);
114114

115115
// Only use merchants that have a device
@@ -118,8 +118,8 @@ static async Task Main(string[] args)
118118

119119
foreach (DateTime dateTime in dateRange)
120120
{
121-
await Program.GenerateTransactions(merchants, dateTime, CancellationToken.None);
122-
//await Program.GenerateFileUploads(merchants, dateTime, CancellationToken.None);
121+
//await Program.GenerateTransactions(merchants, dateTime, CancellationToken.None);
122+
await Program.GenerateFileUploads(merchants, dateTime, CancellationToken.None);
123123
}
124124

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

‎TransactionProcessor.DataGenerator/DataGenerator/TransactionDataGenerator.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
<ItemGroup>
99
<PackageReference Include="EstateManagement.Client" Version="1.0.10" />
10-
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
10+
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
1111
<PackageReference Include="SecurityService.Client" Version="1.0.6" />
1212
<PackageReference Include="TransactionProcessor.Client" Version="1.0.12" />
1313
</ItemGroup>

‎TransactionProcessor.DataGenerator/TransactionGeneratorWorker/TransactionGeneratorWorker.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Worker">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.1</TargetFramework>
4+
<TargetFramework>net5.0</TargetFramework>
55
<UserSecretsId>dotnet-TransactionGeneratorWorker-80A862A1-E375-48F6-8D64-7F8135EF7DD7</UserSecretsId>
66
</PropertyGroup>
77

@@ -10,7 +10,7 @@
1010
<PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.9" />
1111
<PackageReference Include="SecurityService.Client" Version="1.0.4" />
1212
<PackageReference Include="Shared" Version="1.0.1" />
13-
<PackageReference Include="NLog" Version="4.7.2" />
13+
<PackageReference Include="NLog" Version="4.7.6" />
1414
<PackageReference Include="NLog.Web.AspNetCore" Version="4.5.0-beta04" />
1515
<PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="3.1.9" />
1616
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="3.1.9" />

‎TransactionProcessor.HealthChecksUI/TransactionProcessor.HealthChecksUI/TransactionProcessor.HealthChecksUI.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.1</TargetFramework>
4+
<TargetFramework>net5.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="AspNetCore.HealthChecks.UI" Version="3.1.3" />
9-
<PackageReference Include="AspNetCore.HealthChecks.UI.InMemory.Storage" Version="3.1.2" />
8+
<PackageReference Include="AspNetCore.HealthChecks.UI" Version="5.0.1" />
9+
<PackageReference Include="AspNetCore.HealthChecks.UI.InMemory.Storage" Version="5.0.1" />
1010
</ItemGroup>
1111

1212
</Project>

‎TransactionProcessor.HealthChecksUI/TransactionProcessor.HealthChecksUI/appsettings.json‎

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,34 +9,46 @@
99
"AllowedHosts": "*",
1010
"HealthChecksUI": {
1111
"HealthChecks": [
12+
{
13+
"Name": "Estate Management Service",
14+
"Uri": "http://192.168.0.133:5000/health"
15+
},
1216
{
1317
"Name": "Security Service",
14-
"Uri": "http://192.168.1.133:5001/health"
18+
"Uri": "https://192.168.0.133:5001/health"
1519
},
1620
{
17-
"Name": "Messaging Service",
18-
"Uri": "http://192.168.1.133:5006/health"
21+
"Name": "Transaction Processor Service",
22+
"Uri": "http://192.168.0.133:5002/health"
1923
},
2024
{
21-
"Name": "Estate Management Service",
22-
"Uri": "http://192.168.1.133:5000/health"
25+
"Name": "Transaction Processor ACL Service",
26+
"Uri": "http://192.168.0.133:5003/health"
2327
},
2428
{
2529
"Name": "Estate Management UI",
26-
"Uri": "http://192.168.1.133:5004/health"
30+
"Uri": "http://192.168.0.133:5004/health"
2731
},
2832
{
2933
"Name": "Estate Reporting Service",
30-
"Uri": "http://192.168.1.133:5005/health"
34+
"Uri": "http://192.168.0.133:5005/health"
3135
},
3236
{
33-
"Name": "Transaction Processor Service",
34-
"Uri": "http://192.168.1.133:5002/health"
37+
"Name": "Messaging Service",
38+
"Uri": "http://192.168.0.133:5006/health"
3539
},
3640
{
37-
"Name": "Transaction Processor ACL Service",
38-
"Uri": "http://192.168.1.133:5003/health"
39-
}
41+
"Name": "Voucher Management Service",
42+
"Uri": "http://192.168.0.133:5007/health"
43+
},
44+
{
45+
"Name": "Voucher Management ACL Service",
46+
"Uri": "http://192.168.0.133:5008/health"
47+
}//,
48+
//{
49+
// "Name": "File Processor Service",
50+
// "Uri": "http://192.168.0.133:5009/health"
51+
//}
4052
],
4153
"EvaluationTimeInSeconds": 10,
4254
"MinimumSecondsBetweenFailureNotifications": 60

‎TransactionProcessor.HealthChecksUI/TransactionProcessor.HealthChecksUI/appsettings.preproduction.development.json‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"Logging": {
3+
"LogLevel": {
4+
"Default": "Information",
5+
"Microsoft": "Warning",
6+
"Microsoft.Hosting.Lifetime": "Information"
7+
}
8+
}
9+
}

‎TransactionProcessor.HealthChecksUI/TransactionProcessor.HealthChecksUI/appsettings.preproduction.json‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
{
2+
"Logging": {
3+
"LogLevel": {
4+
"Default": "Information",
5+
"Microsoft": "Warning",
6+
"Microsoft.Hosting.Lifetime": "Information"
7+
}
8+
},
9+
"AllowedHosts": "*",
10+
"HealthChecksUI": {
11+
"HealthChecks": [
12+
{
13+
"Name": "Estate Management Service",
14+
"Uri": "http://192.168.0.134:5000/health"
15+
},
16+
{
17+
"Name": "Security Service",
18+
"Uri": "http://192.168.0.134:5001/health"
19+
},
20+
{
21+
"Name": "Transaction Processor Service",
22+
"Uri": "http://192.168.0.134:5002/health"
23+
},
24+
{
25+
"Name": "Transaction Processor ACL Service",
26+
"Uri": "http://192.168.0.134:5003/health"
27+
},
28+
{
29+
"Name": "Estate Management UI",
30+
"Uri": "http://192.168.0.134:5004/health"
31+
},
32+
{
33+
"Name": "Estate Reporting Service",
34+
"Uri": "http://192.168.0.133:5005/health"
35+
},
36+
{
37+
"Name": "Messaging Service",
38+
"Uri": "http://192.168.0.133:5006/health"
39+
},
40+
{
41+
"Name": "Voucher Management Service",
42+
"Uri": "http://192.168.0.134:5007/health"
43+
},
44+
{
45+
"Name": "Voucher Management ACL Service",
46+
"Uri": "http://192.168.0.134:5008/health"
47+
},
48+
{
49+
"Name": "File Processor Service",
50+
"Uri": "http://192.168.0.134:5009/health"
51+
}
52+
],
53+
"EvaluationTimeInSeconds": 300,
54+
"MinimumSecondsBetweenFailureNotifications": 60
55+
}
56+
}

0 commit comments

Comments
 (0)