Skip to content

Changes to settlement processing #83

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 2 commits into from
Jul 19, 2023
+13 −7
Merged

Changes to settlement processing #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
88d9aab
Changes to settlement processing
StuartFerguson Jul 19, 2023
737eeca
Merge branch 'master' into task/#79_settlementjobupdates
StuartFerguson Jul 19, 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
2 changes: 1 addition & 1 deletion TransactionProcessor.DataGenerator/DataGenerator/TransactionDataGenerator.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<PackageReference Include="EstateManagement.Client" Version="2023.3.2" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
<PackageReference Include="SecurityService.Client" Version="2023.3.1" />
<PackageReference Include="TransactionProcessor.Client" Version="2023.3.1" />
<PackageReference Include="TransactionProcessor.Client" Version="2023.6.4-build59" />
</ItemGroup>

<ItemGroup>
Expand Down
16 changes: 11 additions & 5 deletions ...nProcessor.DataGenerator/TransactionProcessing.DataGeneration/TransactionDataGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,11 +228,17 @@ public async Task<Boolean> PerformMerchantLogon(DateTime dateTime, MerchantRespo
public async Task<Boolean> PerformSettlement(DateTime dateTime, Guid estateId, CancellationToken cancellationToken){
try
{
this.WriteTrace($"About to send Process Settlement Request for Date [{dateTime:dd-MM-yyyy}] and Estate [{estateId}]");
List<MerchantResponse> merchants = await this.GetMerchants(estateId, cancellationToken);

await this.SendProcessSettlementRequest(dateTime, estateId, cancellationToken);

this.WriteTrace($"Process Settlement Request sent for Date [{dateTime:dd-MM-yyyy}] and Estate [{estateId}]");
foreach (MerchantResponse merchantResponse in merchants){
this.WriteTrace($"About to send Process Settlement Request for Date [{dateTime:dd-MM-yyyy}] and Estate [{estateId}] and Merchant [{merchantResponse.MerchantId}]");
await this.SendProcessSettlementRequest(dateTime, estateId,merchantResponse.MerchantId, cancellationToken);
this.WriteTrace($"Process Settlement Request sent for Date [{dateTime:dd-MM-yyyy}] and Estate [{estateId}] and Merchant [{merchantResponse.MerchantId}]");
}



return true;

}
Expand Down Expand Up @@ -825,7 +831,7 @@ private async Task<Boolean> UploadFile(UploadFile uploadFile, Guid userId, DateT
}
}

private async Task SendProcessSettlementRequest(DateTime dateTime, Guid estateId, CancellationToken cancellationToken)
private async Task SendProcessSettlementRequest(DateTime dateTime, Guid estateId,Guid merchantId, CancellationToken cancellationToken)
{
if (this.RunningMode == RunningMode.WhatIf)
{
Expand All @@ -834,7 +840,7 @@ private async Task SendProcessSettlementRequest(DateTime dateTime, Guid estateId
}

String token = await this.GetAuthToken(cancellationToken);
await this.TransactionProcessorClient.ProcessSettlement(token, dateTime, estateId, cancellationToken);
await this.TransactionProcessorClient.ProcessSettlement(token, dateTime, estateId,merchantId, cancellationToken);
}

#endregion
Expand Down
2 changes: 1 addition & 1 deletion ...enerator/TransactionProcessing.DataGeneration/TransactionProcessing.DataGeneration.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@
<PackageReference Include="EstateManagement.Client" Version="2023.3.2" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
<PackageReference Include="SecurityService.Client" Version="2023.3.1" />
<PackageReference Include="TransactionProcessor.Client" Version="2023.3.1" />
<PackageReference Include="TransactionProcessor.Client" Version="2023.6.4-build59" />
</ItemGroup>
</Project>