From 7bc809bace3805789b09aed0dae6782b4dba3e30 Mon Sep 17 00:00:00 2001
From: Stuart Ferguson <stuart_ferguson1@btinternet.com>
Date: Wed, 19 Jul 2023 15:33:17 +0100
Subject: [PATCH] Pass user in in file scheduler job

---
 .../GenerateFileUploadsJob.cs                                 | 3 ++-
 .../TransactionProcessing.SchedulerService.Jobs/Jobs.cs       | 4 ++--
 .../TransactionProcessing.SchedulerService.Jobs.csproj        | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/TransactionProcessing.SchedulerService/TransactionProcessing.SchedulerService.Jobs/GenerateFileUploadsJob.cs b/TransactionProcessing.SchedulerService/TransactionProcessing.SchedulerService.Jobs/GenerateFileUploadsJob.cs
index 982661a..4940310 100644
--- a/TransactionProcessing.SchedulerService/TransactionProcessing.SchedulerService.Jobs/GenerateFileUploadsJob.cs
+++ b/TransactionProcessing.SchedulerService/TransactionProcessing.SchedulerService.Jobs/GenerateFileUploadsJob.cs
@@ -20,6 +20,7 @@ public async Task Execute(IJobExecutionContext context)
             String clientSecret = context.MergedJobDataMap.GetString("ClientSecret");
             Guid estateId = context.MergedJobDataMap.GetGuidValueFromString("EstateId");
             Guid merchantId = context.MergedJobDataMap.GetGuidValueFromString("MerchantId");
+            Guid userId = context.MergedJobDataMap.GetGuidValueFromString("UserId");
 
             Logger.LogInformation($"Running Job {context.JobDetail.Description}");
             Logger.LogInformation($"Client Id: [{clientId}]");
@@ -28,7 +29,7 @@ public async Task Execute(IJobExecutionContext context)
 
             ITransactionDataGenerator t = CreateTransactionDataGenerator(clientId, clientSecret, RunningMode.Live);
             t.TraceGenerated += TraceGenerated; 
-            await Jobs.GenerateFileUploads(t, estateId, merchantId, context.CancellationToken);
+            await Jobs.GenerateFileUploads(t, estateId, merchantId, userId, context.CancellationToken);
         }
         #endregion
     }
diff --git a/TransactionProcessing.SchedulerService/TransactionProcessing.SchedulerService.Jobs/Jobs.cs b/TransactionProcessing.SchedulerService/TransactionProcessing.SchedulerService.Jobs/Jobs.cs
index 606c07a..659994d 100644
--- a/TransactionProcessing.SchedulerService/TransactionProcessing.SchedulerService.Jobs/Jobs.cs
+++ b/TransactionProcessing.SchedulerService/TransactionProcessing.SchedulerService.Jobs/Jobs.cs
@@ -41,7 +41,7 @@ public static async Task GenerateMerchantStatements(ITransactionDataGenerator t,
         }
     }
 
-    public static async Task GenerateFileUploads(ITransactionDataGenerator t, Guid estateId, Guid merchantId, CancellationToken cancellationToken)
+    public static async Task GenerateFileUploads(ITransactionDataGenerator t, Guid estateId, Guid merchantId, Guid userId, CancellationToken cancellationToken)
     {
         MerchantResponse merchant = await t.GetMerchant(estateId, merchantId, cancellationToken);
 
@@ -56,7 +56,7 @@ public static async Task GenerateFileUploads(ITransactionDataGenerator t, Guid e
         foreach (ContractResponse contract in contracts)
         {
             // Generate a file and upload
-            Boolean success = await t.SendUploadFile(fileDate, contract, merchant, cancellationToken);
+            Boolean success = await t.SendUploadFile(fileDate, contract, merchant,userId, cancellationToken);
 
             if (success == false)
             {
diff --git a/TransactionProcessing.SchedulerService/TransactionProcessing.SchedulerService.Jobs/TransactionProcessing.SchedulerService.Jobs.csproj b/TransactionProcessing.SchedulerService/TransactionProcessing.SchedulerService.Jobs/TransactionProcessing.SchedulerService.Jobs.csproj
index 5fbd51e..45d4627 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 @@
     <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.6.10-build30" />
+    <PackageReference Include="TransactionProcessing.DataGeneration" Version="2023.7.2-build33" />
     
   </ItemGroup>
 </Project>