From e477303fcc829405a59f1ee88fb48d7b47cb9fdf Mon Sep 17 00:00:00 2001 From: Stuart Ferguson Date: Fri, 17 Dec 2021 16:58:16 +0000 Subject: [PATCH 1/2] Updated urls and moved to net5 --- .../Program.cs | 3 + .../DataGenerator/Program.cs | 8 +-- .../TransactionDataGenerator.csproj | 2 +- .../TransactionGeneratorWorker.csproj | 4 +- ...TransactionProcessor.HealthChecksUI.csproj | 6 +- .../appsettings.json | 36 ++++++++---- ...appsettings.preproduction.development.json | 9 +++ .../appsettings.preproduction.json | 56 +++++++++++++++++++ .../appsettings.staging.json | 56 +++++++++++++++++++ 9 files changed, 158 insertions(+), 22 deletions(-) create mode 100644 TransactionProcessor.HealthChecksUI/TransactionProcessor.HealthChecksUI/appsettings.preproduction.development.json create mode 100644 TransactionProcessor.HealthChecksUI/TransactionProcessor.HealthChecksUI/appsettings.preproduction.json create mode 100644 TransactionProcessor.HealthChecksUI/TransactionProcessor.HealthChecksUI/appsettings.staging.json diff --git a/TransactionProcessing.SettlementProcessor/TransactionProcessing.SettlementProcessor/Program.cs b/TransactionProcessing.SettlementProcessor/TransactionProcessing.SettlementProcessor/Program.cs index 034c375..fcc90c1 100644 --- a/TransactionProcessing.SettlementProcessor/TransactionProcessing.SettlementProcessor/Program.cs +++ b/TransactionProcessing.SettlementProcessor/TransactionProcessing.SettlementProcessor/Program.cs @@ -19,6 +19,9 @@ static async Task Main(string[] args) endDate = DateTime.ParseExact(args[2], "yyyy-MM-dd", null); } + startDate = new DateTime(2021,10,29); + endDate = new DateTime(2021,11,24); + SettlementProcessor processor = new SettlementProcessor(); processor.LoadConfiguration(); await processor.ProcessSettlement(estateId, startDate, endDate); diff --git a/TransactionProcessor.DataGenerator/DataGenerator/Program.cs b/TransactionProcessor.DataGenerator/DataGenerator/Program.cs index bc35f6b..de547b6 100644 --- a/TransactionProcessor.DataGenerator/DataGenerator/Program.cs +++ b/TransactionProcessor.DataGenerator/DataGenerator/Program.cs @@ -108,8 +108,8 @@ static async Task Main(string[] args) List merchants = await Program.EstateClient.GetMerchants(Program.TokenResponse.AccessToken, estateId, CancellationToken.None); // Set the date range - DateTime startDate = new DateTime(2021,10,6); //27/7 - DateTime endDate = new DateTime(2021,10,27); // This is the date of te last generated transaction + DateTime startDate = new DateTime(2021,11,06); //27/7 + DateTime endDate = new DateTime(2021,11,23); // This is the date of te last generated transaction List dateRange = Program.GenerateDateRange(startDate, endDate); // Only use merchants that have a device @@ -118,8 +118,8 @@ static async Task Main(string[] args) foreach (DateTime dateTime in dateRange) { - await Program.GenerateTransactions(merchants, dateTime, CancellationToken.None); - //await Program.GenerateFileUploads(merchants, dateTime, CancellationToken.None); + //await Program.GenerateTransactions(merchants, dateTime, CancellationToken.None); + await Program.GenerateFileUploads(merchants, dateTime, CancellationToken.None); } Console.WriteLine($"Process Complete"); diff --git a/TransactionProcessor.DataGenerator/DataGenerator/TransactionDataGenerator.csproj b/TransactionProcessor.DataGenerator/DataGenerator/TransactionDataGenerator.csproj index ee2b6d5..d09679c 100644 --- a/TransactionProcessor.DataGenerator/DataGenerator/TransactionDataGenerator.csproj +++ b/TransactionProcessor.DataGenerator/DataGenerator/TransactionDataGenerator.csproj @@ -7,7 +7,7 @@ - + diff --git a/TransactionProcessor.DataGenerator/TransactionGeneratorWorker/TransactionGeneratorWorker.csproj b/TransactionProcessor.DataGenerator/TransactionGeneratorWorker/TransactionGeneratorWorker.csproj index df51316..f2c8a95 100644 --- a/TransactionProcessor.DataGenerator/TransactionGeneratorWorker/TransactionGeneratorWorker.csproj +++ b/TransactionProcessor.DataGenerator/TransactionGeneratorWorker/TransactionGeneratorWorker.csproj @@ -1,7 +1,7 @@ - netcoreapp3.1 + net5.0 dotnet-TransactionGeneratorWorker-80A862A1-E375-48F6-8D64-7F8135EF7DD7 @@ -10,7 +10,7 @@ - + diff --git a/TransactionProcessor.HealthChecksUI/TransactionProcessor.HealthChecksUI/TransactionProcessor.HealthChecksUI.csproj b/TransactionProcessor.HealthChecksUI/TransactionProcessor.HealthChecksUI/TransactionProcessor.HealthChecksUI.csproj index ecc9f36..b807ed5 100644 --- a/TransactionProcessor.HealthChecksUI/TransactionProcessor.HealthChecksUI/TransactionProcessor.HealthChecksUI.csproj +++ b/TransactionProcessor.HealthChecksUI/TransactionProcessor.HealthChecksUI/TransactionProcessor.HealthChecksUI.csproj @@ -1,12 +1,12 @@ - netcoreapp3.1 + net5.0 - - + + diff --git a/TransactionProcessor.HealthChecksUI/TransactionProcessor.HealthChecksUI/appsettings.json b/TransactionProcessor.HealthChecksUI/TransactionProcessor.HealthChecksUI/appsettings.json index 65bf8a9..a9940a6 100644 --- a/TransactionProcessor.HealthChecksUI/TransactionProcessor.HealthChecksUI/appsettings.json +++ b/TransactionProcessor.HealthChecksUI/TransactionProcessor.HealthChecksUI/appsettings.json @@ -9,34 +9,46 @@ "AllowedHosts": "*", "HealthChecksUI": { "HealthChecks": [ + { + "Name": "Estate Management Service", + "Uri": "http://192.168.0.133:5000/health" + }, { "Name": "Security Service", - "Uri": "http://192.168.1.133:5001/health" + "Uri": "https://192.168.0.133:5001/health" }, { - "Name": "Messaging Service", - "Uri": "http://192.168.1.133:5006/health" + "Name": "Transaction Processor Service", + "Uri": "http://192.168.0.133:5002/health" }, { - "Name": "Estate Management Service", - "Uri": "http://192.168.1.133:5000/health" + "Name": "Transaction Processor ACL Service", + "Uri": "http://192.168.0.133:5003/health" }, { "Name": "Estate Management UI", - "Uri": "http://192.168.1.133:5004/health" + "Uri": "http://192.168.0.133:5004/health" }, { "Name": "Estate Reporting Service", - "Uri": "http://192.168.1.133:5005/health" + "Uri": "http://192.168.0.133:5005/health" }, { - "Name": "Transaction Processor Service", - "Uri": "http://192.168.1.133:5002/health" + "Name": "Messaging Service", + "Uri": "http://192.168.0.133:5006/health" }, { - "Name": "Transaction Processor ACL Service", - "Uri": "http://192.168.1.133:5003/health" - } + "Name": "Voucher Management Service", + "Uri": "http://192.168.0.133:5007/health" + }, + { + "Name": "Voucher Management ACL Service", + "Uri": "http://192.168.0.133:5008/health" + }//, + //{ + // "Name": "File Processor Service", + // "Uri": "http://192.168.0.133:5009/health" + //} ], "EvaluationTimeInSeconds": 10, "MinimumSecondsBetweenFailureNotifications": 60 diff --git a/TransactionProcessor.HealthChecksUI/TransactionProcessor.HealthChecksUI/appsettings.preproduction.development.json b/TransactionProcessor.HealthChecksUI/TransactionProcessor.HealthChecksUI/appsettings.preproduction.development.json new file mode 100644 index 0000000..8983e0f --- /dev/null +++ b/TransactionProcessor.HealthChecksUI/TransactionProcessor.HealthChecksUI/appsettings.preproduction.development.json @@ -0,0 +1,9 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft": "Warning", + "Microsoft.Hosting.Lifetime": "Information" + } + } +} diff --git a/TransactionProcessor.HealthChecksUI/TransactionProcessor.HealthChecksUI/appsettings.preproduction.json b/TransactionProcessor.HealthChecksUI/TransactionProcessor.HealthChecksUI/appsettings.preproduction.json new file mode 100644 index 0000000..cfa1f2b --- /dev/null +++ b/TransactionProcessor.HealthChecksUI/TransactionProcessor.HealthChecksUI/appsettings.preproduction.json @@ -0,0 +1,56 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft": "Warning", + "Microsoft.Hosting.Lifetime": "Information" + } + }, + "AllowedHosts": "*", + "HealthChecksUI": { + "HealthChecks": [ + { + "Name": "Estate Management Service", + "Uri": "http://192.168.0.134:5000/health" + }, + { + "Name": "Security Service", + "Uri": "http://192.168.0.134:5001/health" + }, + { + "Name": "Transaction Processor Service", + "Uri": "http://192.168.0.134:5002/health" + }, + { + "Name": "Transaction Processor ACL Service", + "Uri": "http://192.168.0.134:5003/health" + }, + { + "Name": "Estate Management UI", + "Uri": "http://192.168.0.134:5004/health" + }, + { + "Name": "Estate Reporting Service", + "Uri": "http://192.168.0.133:5005/health" + }, + { + "Name": "Messaging Service", + "Uri": "http://192.168.0.133:5006/health" + }, + { + "Name": "Voucher Management Service", + "Uri": "http://192.168.0.134:5007/health" + }, + { + "Name": "Voucher Management ACL Service", + "Uri": "http://192.168.0.134:5008/health" + }, + { + "Name": "File Processor Service", + "Uri": "http://192.168.0.134:5009/health" + } + ], + "EvaluationTimeInSeconds": 300, + "MinimumSecondsBetweenFailureNotifications": 60 + } +} diff --git a/TransactionProcessor.HealthChecksUI/TransactionProcessor.HealthChecksUI/appsettings.staging.json b/TransactionProcessor.HealthChecksUI/TransactionProcessor.HealthChecksUI/appsettings.staging.json new file mode 100644 index 0000000..7a2d683 --- /dev/null +++ b/TransactionProcessor.HealthChecksUI/TransactionProcessor.HealthChecksUI/appsettings.staging.json @@ -0,0 +1,56 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft": "Warning", + "Microsoft.Hosting.Lifetime": "Information" + } + }, + "AllowedHosts": "*", + "HealthChecksUI": { + "HealthChecks": [ + { + "Name": "Estate Management Service", + "Uri": "http://192.168.0.133:5000/health" + }, + { + "Name": "Security Service", + "Uri": "http://192.168.0.133:5001/health" + }, + { + "Name": "Transaction Processor Service", + "Uri": "http://192.168.0.133:5002/health" + }, + { + "Name": "Transaction Processor ACL Service", + "Uri": "http://192.168.0.133:5003/health" + }, + { + "Name": "Estate Management UI", + "Uri": "http://192.168.0.133:5004/health" + }, + { + "Name": "Estate Reporting Service", + "Uri": "http://192.168.0.133:5005/health" + }, + { + "Name": "Messaging Service", + "Uri": "http://192.168.0.133:5006/health" + }, + { + "Name": "Voucher Management Service", + "Uri": "http://192.168.0.133:5007/health" + }, + { + "Name": "Voucher Management ACL Service", + "Uri": "http://192.168.0.133:5008/health" + }, + { + "Name": "File Processor Service", + "Uri": "http://192.168.0.133:5009/health" + } + ], + "EvaluationTimeInSeconds": 300, + "MinimumSecondsBetweenFailureNotifications": 60 + } +} From 29be2ddd799a2f848b37530df966701f87dc3c9d Mon Sep 17 00:00:00 2001 From: Stuart Ferguson Date: Fri, 17 Dec 2021 17:02:17 +0000 Subject: [PATCH 2/2] Workflow updates --- .github/workflows/createrelease.yml | 5 ----- .github/workflows/pullrequest.yml | 5 ----- 2 files changed, 10 deletions(-) diff --git a/.github/workflows/createrelease.yml b/.github/workflows/createrelease.yml index 1639a89..734d849 100644 --- a/.github/workflows/createrelease.yml +++ b/.github/workflows/createrelease.yml @@ -19,11 +19,6 @@ jobs: id: get_version run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//} - - name: Setup .NET Core - uses: actions/setup-dotnet@v1 - with: - dotnet-version: 3.1.100 - - name: Restore Nuget Packages 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 diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml index 679fba9..0a6232d 100644 --- a/.github/workflows/pullrequest.yml +++ b/.github/workflows/pullrequest.yml @@ -16,11 +16,6 @@ jobs: steps: - uses: actions/checkout@v1 - - name: Setup .NET Core - uses: actions/setup-dotnet@v1 - with: - dotnet-version: 3.1.100 - - name: Restore Nuget Packages 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