Skip to content

Add to file job as well #37

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
merged 2 commits into from
Sep 20, 2022
Merged

Add to file job as well #37

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
66cce35
Add to file job as well
StuartFerguson Sep 20, 2022
0374006
Merge branch 'master' into task/supportskippingcontracts
StuartFerguson Sep 20, 2022
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
10 changes: 9 additions & 1 deletion ...TransactionProcessing.SchedulerService.Jobs/GenerateFileUploads/GenerateFileUploadsJob.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,12 +80,13 @@ public async Task Execute(IJobExecutionContext context)

Guid estateId = context.MergedJobDataMap.GetGuidValueFromString("EstateId");
Guid merchantId = context.MergedJobDataMap.GetGuidValueFromString("MerchantId");
String contractsToSkip = context.MergedJobDataMap.GetString("contractsToSkip");

this.SecurityServiceClient = this.Bootstrapper.GetService<ISecurityServiceClient>();
this.EstateClient = this.Bootstrapper.GetService<IEstateClient>();
this.baseAddressFunc = this.Bootstrapper.GetService<Func<String, String>>();

await this.GenerateFileUploads(estateId, merchantId, context.CancellationToken);
await this.GenerateFileUploads(estateId, merchantId,contractsToSkip, context.CancellationToken);
}

/// <summary>
Expand All @@ -96,6 +97,7 @@ public async Task Execute(IJobExecutionContext context)
/// <param name="cancellationToken">The cancellation token.</param>
private async Task GenerateFileUploads(Guid estateId,
Guid merchantId,
String contractsToSkip,
CancellationToken cancellationToken)
{
DateTime fileDate = DateTime.Now;
Expand All @@ -112,6 +114,12 @@ private async Task GenerateFileUploads(Guid estateId,

List<ContractResponse> contracts = await this.EstateClient.GetMerchantContracts(accessToken, merchant.EstateId, merchant.MerchantId, cancellationToken);

if (String.IsNullOrEmpty(contractsToSkip) == false)
{
String[] skipContracts = contractsToSkip.Split('|');
contracts = contracts.Where(c => skipContracts.Contains(c.Description) == false).ToList();
}

EstateResponse estate = await this.EstateClient.GetEstate(accessToken, merchant.EstateId, cancellationToken);

SecurityUserResponse estateUser = estate.SecurityUsers.FirstOrDefault();
Expand Down