Skip to content

make settlement calls per merchant #84

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
StuartFerguson merged 3 commits into from
Sep 21, 2023
Merged

make settlement calls per merchant #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e31ddee
make settlement calls per merchant
StuartFerguson Sep 21, 2023
1d44fa8
Merge branch 'master' into task/#_updatesettlementprocess
StuartFerguson Sep 21, 2023
e98d092
:| oops
StuartFerguson Sep 21, 2023
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
4 changes: 2 additions & 2 deletions .github/workflows/createrelease.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ jobs:

- 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
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
dotnet restore TransactionProcessor.HealthChecksUI/TransactionProcessor.HealthChecksUI.sln --source ${{ secrets.PUBLICFEEDURL }} --source ${{ secrets.PRIVATEFEED_URL }}
dotnet restore TransactionProcessing.SchedulerService/TransactionProcessing.SchedulerService.sln --source ${{ secrets.PUBLICFEEDURL }} --source ${{ secrets.PRIVATEFEED_URL }}

- name: Build Code
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pullrequest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ jobs:

- 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
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
dotnet restore TransactionProcessor.HealthChecksUI/TransactionProcessor.HealthChecksUI.sln --source ${{ secrets.PUBLICFEEDURL }} --source ${{ secrets.PRIVATEFEED_URL }}
dotnet restore TransactionProcessing.SchedulerService/TransactionProcessing.SchedulerService.sln --source ${{ secrets.PUBLICFEEDURL }} --source ${{ secrets.PRIVATEFEED_URL }}

- name: Build Code
run: |
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/pushtomaster.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ jobs:

- 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
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
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
dotnet restore TransactionProcessor.HealthChecksUI/TransactionProcessor.HealthChecksUI.sln --source ${{ secrets.PUBLICFEEDURL }} --source ${{ secrets.PRIVATEFEED_URL }}
dotnet restore TransactionProcessing.SchedulerService/TransactionProcessing.SchedulerService.sln --source ${{ secrets.PUBLICFEEDURL }} --source ${{ secrets.PRIVATEFEED_URL }}
dotnet restore TransactionProcessor.DataGenerator/TransactionProcessor.DataGenerator.sln --source ${{ secrets.PUBLICFEEDURL }} --source ${{ secrets.PRIVATEFEED_URL }}

- name: Build Code
run: |
Expand Down Expand Up @@ -56,4 +56,4 @@ jobs:
- name: Build and Publish Nuget Packages
run: |
dotnet pack "TransactionProcessor.DataGenerator\TransactionProcessing.DataGeneration\TransactionProcessing.DataGeneration.csproj" /p:PackageVersion=${{ steps.next_version.outputs.VERSION }} --output Nugets -c Release
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
dotnet nuget push Nugets/TransactionProcessing.DataGeneration.${{ steps.next_version.outputs.VERSION }}.nupkg --api-key ${{ secrets.PRIVATEFEED_APIKEY }} --source ${{ secrets.PRIVATEFEED_URL }}
62 changes: 31 additions & 31 deletions TransactionProcessing.SchedulerService/JobTestDriver/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,39 +32,39 @@ static async Task Main(string[] args){
// messagingServiceClient,
// CancellationToken.None);

//HttpClientHandler handler = new HttpClientHandler
// {
// ServerCertificateCustomValidationCallback = (message,
// cert,
// chain,
// errors) => {
// return true;
// }
// };
//HttpClient client = new HttpClient(handler);
//ISecurityServiceClient securityServiceClient = new SecurityServiceClient(delegate(String s){ return "https://192.168.0.133:5001"; },client);
//IEstateClient estateClient = new EstateClient(delegate (String s) { return "http://192.168.0.133:5000"; }, client);
//ITransactionProcessorClient transactionProcessorClient = new TransactionProcessorClient(delegate (String s) { return "http://192.168.0.133:5002"; }, client);
//String estateManagementApi = "http://192.168.0.133:5000";
//String fileProcessorApi = "http://192.168.0.133:5009";
//String testHostApi = "http://192.168.0.133:9000";
//String clientId = "serviceClient";
//String clientSecret = "d192cbc46d834d0da90e8a9d50ded543";
HttpClientHandler handler = new HttpClientHandler
{
ServerCertificateCustomValidationCallback = (message,
cert,
chain,
errors) => {
return true;
}
};
HttpClient client = new HttpClient(handler);
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);
ITransactionProcessorClient transactionProcessorClient = new TransactionProcessorClient(delegate (String s) { return "https://eo2qbmq0e4zwta5.m.pipedream.net"; }, client);
String estateManagementApi = "http://192.168.1.167:5000";
String fileProcessorApi = "http://192.168.1.167:5009";
String testHostApi = "http://192.168.1.167:9000";
String clientId = "serviceClient";
String clientSecret = "d192cbc46d834d0da90e8a9d50ded543";

//ITransactionDataGenerator t = new TransactionDataGenerator(securityServiceClient,
// estateClient,
// transactionProcessorClient,
// estateManagementApi,
// fileProcessorApi,
// testHostApi,
// clientId,
// clientSecret,
// RunningMode.Live);
//Guid estateId = Guid.Parse("435613ac-a468-47a3-ac4f-649d89764c22");
//Guid merchantId = Guid.Parse("ab1c99fb-1c6c-4694-9a32-b71be5d1da33");
ITransactionDataGenerator t = new TransactionDataGenerator(securityServiceClient,
estateClient,
transactionProcessorClient,
estateManagementApi,
fileProcessorApi,
testHostApi,
clientId,
clientSecret,
RunningMode.Live);
Guid estateId = Guid.Parse("435613ac-a468-47a3-ac4f-649d89764c22");
Guid merchantId = Guid.Parse("ab1c99fb-1c6c-4694-9a32-b71be5d1da33");
//await Jobs.GenerateTransactions(t, estateId, merchantId, false, CancellationToken.None);
var d = TransactionDataGenerator.GetTransactionDateTime(new Random(), DateTime.Now);
Console.WriteLine(d);
//var d = TransactionDataGenerator.GetTransactionDateTime(new Random(), DateTime.Now);
//Console.WriteLine(d);
await Jobs.PerformSettlement(t, DateTime.Now,estateId, CancellationToken.None);
}
}
}
2 changes: 1 addition & 1 deletion ...actionProcessing.SchedulerService.Jobs/TransactionProcessing.SchedulerService.Jobs.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Quartz" Version="3.5.0" />
<PackageReference Include="TransactionProcessing.DataGeneration" Version="2023.7.2-build33" />
<PackageReference Include="TransactionProcessing.DataGeneration" Version="2023.9.1" />

</ItemGroup>
</Project>