diff --git a/.github/workflows/createrelease.yml b/.github/workflows/createrelease.yml index efc8c4e..661efec 100644 --- a/.github/workflows/createrelease.yml +++ b/.github/workflows/createrelease.yml @@ -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: | diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml index a8350ae..b16ec54 100644 --- a/.github/workflows/pullrequest.yml +++ b/.github/workflows/pullrequest.yml @@ -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: | diff --git a/.github/workflows/pushtomaster.yml b/.github/workflows/pushtomaster.yml index 72497c3..7920397 100644 --- a/.github/workflows/pushtomaster.yml +++ b/.github/workflows/pushtomaster.yml @@ -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: | @@ -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 \ No newline at end of file + dotnet nuget push Nugets/TransactionProcessing.DataGeneration.${{ steps.next_version.outputs.VERSION }}.nupkg --api-key ${{ secrets.PRIVATEFEED_APIKEY }} --source ${{ secrets.PRIVATEFEED_URL }} \ No newline at end of file diff --git a/TransactionProcessing.SchedulerService/JobTestDriver/Program.cs b/TransactionProcessing.SchedulerService/JobTestDriver/Program.cs index 2d9f202..496bb29 100644 --- a/TransactionProcessing.SchedulerService/JobTestDriver/Program.cs +++ b/TransactionProcessing.SchedulerService/JobTestDriver/Program.cs @@ -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); } } } \ No newline at end of file diff --git a/TransactionProcessing.SchedulerService/TransactionProcessing.SchedulerService.Jobs/TransactionProcessing.SchedulerService.Jobs.csproj b/TransactionProcessing.SchedulerService/TransactionProcessing.SchedulerService.Jobs/TransactionProcessing.SchedulerService.Jobs.csproj index 45d4627..69a06a8 100644 --- a/TransactionProcessing.SchedulerService/TransactionProcessing.SchedulerService.Jobs/TransactionProcessing.SchedulerService.Jobs.csproj +++ b/TransactionProcessing.SchedulerService/TransactionProcessing.SchedulerService.Jobs/TransactionProcessing.SchedulerService.Jobs.csproj @@ -15,7 +15,7 @@ - +