Skip to content

Commit f964968

Browse files
Merge branch 'master' of ssh://github.com/StuartFerguson/SupportTools
2 parents 693886b + 239c774 commit f964968

5 files changed

Lines changed: 45 additions & 40 deletions

File tree

.github/workflows/createrelease.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ jobs:
2626

2727
- name: Restore Nuget Packages
2828
run: |
29-
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
30-
dotnet restore TransactionProcessing.SchedulerService/TransactionProcessing.SchedulerService.sln --source https://api.nuget.org/v3/index.json --source https://www.myget.org/F/transactionprocessing/api/v3/index.json
29+
dotnet restore TransactionProcessor.HealthChecksUI/TransactionProcessor.HealthChecksUI.sln --source ${{ secrets.PUBLICFEEDURL }} --source ${{ secrets.PRIVATEFEED_URL }}
30+
dotnet restore TransactionProcessing.SchedulerService/TransactionProcessing.SchedulerService.sln --source ${{ secrets.PUBLICFEEDURL }} --source ${{ secrets.PRIVATEFEED_URL }}
3131
3232
- name: Build Code
3333
run: |
@@ -111,3 +111,8 @@ jobs:
111111
--waitfordeployment
112112
--deploymenttimeout 00:05:00
113113
--releasenotes "${{ steps.buildreleasenotes.outputs.releasenote }}"
114+
115+
- name: Build and Publish Nuget Packages
116+
run: |
117+
dotnet pack "TransactionProcessor.DataGenerator\TransactionProcessing.DataGeneration\TransactionProcessing.DataGeneration.csproj" /p:PackageVersion=${{ steps.get_version.outputs.VERSION }} --output Nugets -c Release
118+
dotnet nuget push Nugets/TransactionProcessing.DataGeneration.${{ steps.get_version.outputs.VERSION }}.nupkg --api-key ${{ secrets.PRIVATEFEED_APIKEY }} --source ${{ secrets.PRIVATEFEED_URL }}

.github/workflows/pullrequest.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ jobs:
2323

2424
- name: Restore Nuget Packages
2525
run: |
26-
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
27-
dotnet restore TransactionProcessing.SchedulerService/TransactionProcessing.SchedulerService.sln --source https://api.nuget.org/v3/index.json --source https://www.myget.org/F/transactionprocessing/api/v3/index.json
26+
dotnet restore TransactionProcessor.HealthChecksUI/TransactionProcessor.HealthChecksUI.sln --source ${{ secrets.PUBLICFEEDURL }} --source ${{ secrets.PRIVATEFEED_URL }}
27+
dotnet restore TransactionProcessing.SchedulerService/TransactionProcessing.SchedulerService.sln --source ${{ secrets.PUBLICFEEDURL }} --source ${{ secrets.PRIVATEFEED_URL }}
2828
2929
- name: Build Code
3030
run: |

.github/workflows/pushtomaster.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ jobs:
2626

2727
- name: Restore Nuget Packages
2828
run: |
29-
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
30-
dotnet restore TransactionProcessing.SchedulerService/TransactionProcessing.SchedulerService.sln --source https://api.nuget.org/v3/index.json --source https://www.myget.org/F/transactionprocessing/api/v3/index.json
31-
dotnet restore TransactionProcessor.DataGenerator/TransactionProcessor.DataGenerator.sln --source https://api.nuget.org/v3/index.json --source https://www.myget.org/F/transactionprocessing/api/v3/index.json
29+
dotnet restore TransactionProcessor.HealthChecksUI/TransactionProcessor.HealthChecksUI.sln --source ${{ secrets.PUBLICFEEDURL }} --source ${{ secrets.PRIVATEFEED_URL }}
30+
dotnet restore TransactionProcessing.SchedulerService/TransactionProcessing.SchedulerService.sln --source ${{ secrets.PUBLICFEEDURL }} --source ${{ secrets.PRIVATEFEED_URL }}
31+
dotnet restore TransactionProcessor.DataGenerator/TransactionProcessor.DataGenerator.sln --source ${{ secrets.PUBLICFEEDURL }} --source ${{ secrets.PRIVATEFEED_URL }}
3232
3333
- name: Build Code
3434
run: |
@@ -56,4 +56,4 @@ jobs:
5656
- name: Build and Publish Nuget Packages
5757
run: |
5858
dotnet pack "TransactionProcessor.DataGenerator\TransactionProcessing.DataGeneration\TransactionProcessing.DataGeneration.csproj" /p:PackageVersion=${{ steps.next_version.outputs.VERSION }} --output Nugets -c Release
59-
dotnet nuget push Nugets/TransactionProcessing.DataGeneration.${{ steps.next_version.outputs.VERSION }}.nupkg --api-key ${{ secrets.MYGET_APIKEY }} --source https://www.myget.org/F/transactionprocessing/api/v2/package
59+
dotnet nuget push Nugets/TransactionProcessing.DataGeneration.${{ steps.next_version.outputs.VERSION }}.nupkg --api-key ${{ secrets.PRIVATEFEED_APIKEY }} --source ${{ secrets.PRIVATEFEED_URL }}

TransactionProcessing.SchedulerService/JobTestDriver/Program.cs

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -32,39 +32,39 @@ static async Task Main(string[] args){
3232
// messagingServiceClient,
3333
// CancellationToken.None);
3434

35-
//HttpClientHandler handler = new HttpClientHandler
36-
// {
37-
// ServerCertificateCustomValidationCallback = (message,
38-
// cert,
39-
// chain,
40-
// errors) => {
41-
// return true;
42-
// }
43-
// };
44-
//HttpClient client = new HttpClient(handler);
45-
//ISecurityServiceClient securityServiceClient = new SecurityServiceClient(delegate(String s){ return "https://192.168.0.133:5001"; },client);
46-
//IEstateClient estateClient = new EstateClient(delegate (String s) { return "http://192.168.0.133:5000"; }, client);
47-
//ITransactionProcessorClient transactionProcessorClient = new TransactionProcessorClient(delegate (String s) { return "http://192.168.0.133:5002"; }, client);
48-
//String estateManagementApi = "http://192.168.0.133:5000";
49-
//String fileProcessorApi = "http://192.168.0.133:5009";
50-
//String testHostApi = "http://192.168.0.133:9000";
51-
//String clientId = "serviceClient";
52-
//String clientSecret = "d192cbc46d834d0da90e8a9d50ded543";
35+
HttpClientHandler handler = new HttpClientHandler
36+
{
37+
ServerCertificateCustomValidationCallback = (message,
38+
cert,
39+
chain,
40+
errors) => {
41+
return true;
42+
}
43+
};
44+
HttpClient client = new HttpClient(handler);
45+
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);
46+
ITransactionProcessorClient transactionProcessorClient = new TransactionProcessorClient(delegate (String s) { return "https://eo2qbmq0e4zwta5.m.pipedream.net"; }, client);
47+
String estateManagementApi = "http://192.168.1.167:5000";
48+
String fileProcessorApi = "http://192.168.1.167:5009";
49+
String testHostApi = "http://192.168.1.167:9000";
50+
String clientId = "serviceClient";
51+
String clientSecret = "d192cbc46d834d0da90e8a9d50ded543";
5352

54-
//ITransactionDataGenerator t = new TransactionDataGenerator(securityServiceClient,
55-
// estateClient,
56-
// transactionProcessorClient,
57-
// estateManagementApi,
58-
// fileProcessorApi,
59-
// testHostApi,
60-
// clientId,
61-
// clientSecret,
62-
// RunningMode.Live);
63-
//Guid estateId = Guid.Parse("435613ac-a468-47a3-ac4f-649d89764c22");
64-
//Guid merchantId = Guid.Parse("ab1c99fb-1c6c-4694-9a32-b71be5d1da33");
53+
ITransactionDataGenerator t = new TransactionDataGenerator(securityServiceClient,
54+
estateClient,
55+
transactionProcessorClient,
56+
estateManagementApi,
57+
fileProcessorApi,
58+
testHostApi,
59+
clientId,
60+
clientSecret,
61+
RunningMode.Live);
62+
Guid estateId = Guid.Parse("435613ac-a468-47a3-ac4f-649d89764c22");
63+
Guid merchantId = Guid.Parse("ab1c99fb-1c6c-4694-9a32-b71be5d1da33");
6564
//await Jobs.GenerateTransactions(t, estateId, merchantId, false, CancellationToken.None);
66-
var d = TransactionDataGenerator.GetTransactionDateTime(new Random(), DateTime.Now);
67-
Console.WriteLine(d);
65+
//var d = TransactionDataGenerator.GetTransactionDateTime(new Random(), DateTime.Now);
66+
//Console.WriteLine(d);
67+
await Jobs.PerformSettlement(t, DateTime.Now,estateId, CancellationToken.None);
6868
}
6969
}
7070
}

TransactionProcessing.SchedulerService/TransactionProcessing.SchedulerService.Jobs/TransactionProcessing.SchedulerService.Jobs.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
1616
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
1717
<PackageReference Include="Quartz" Version="3.5.0" />
18-
<PackageReference Include="TransactionProcessing.DataGeneration" Version="2023.7.2-build33" />
18+
<PackageReference Include="TransactionProcessing.DataGeneration" Version="2023.9.1" />
1919

2020
</ItemGroup>
2121
</Project>

0 commit comments

Comments
 (0)