From 66cce35a1e7475089c31bfea1e9464ed0c655fa4 Mon Sep 17 00:00:00 2001
From: Stuart Ferguson <stuart_ferguson1@btinternet.com>
Date: Tue, 20 Sep 2022 21:24:46 +0100
Subject: [PATCH] Add to file job as well

---
 .../GenerateFileUploads/GenerateFileUploadsJob.cs      | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/TransactionProcessing.SchedulerService/TransactionProcessing.SchedulerService.Jobs/GenerateFileUploads/GenerateFileUploadsJob.cs b/TransactionProcessing.SchedulerService/TransactionProcessing.SchedulerService.Jobs/GenerateFileUploads/GenerateFileUploadsJob.cs
index 0368c08..1402566 100644
--- a/TransactionProcessing.SchedulerService/TransactionProcessing.SchedulerService.Jobs/GenerateFileUploads/GenerateFileUploadsJob.cs
+++ b/TransactionProcessing.SchedulerService/TransactionProcessing.SchedulerService.Jobs/GenerateFileUploads/GenerateFileUploadsJob.cs
@@ -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>
@@ -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;
@@ -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();