Allow user id to be passed when uploading files

TransactionProcessor.DataGenerator/DataGenerator/Program.cs

@@ -146,7 +146,7 @@ private static async Task GenerateTransactions(ITransactionDataGenerator g, Guid
 
                         foreach (ContractResponse contract in contracts){
                             // Generate a file and upload
-                            await g.SendUploadFile(dateTime, contract, merchant, cancellationToken);
+                            await g.SendUploadFile(dateTime, contract, merchant, Guid.Empty, cancellationToken);
 
                             await Task.Delay(TimeSpan.FromSeconds(10), cancellationToken);
                         }

TransactionProcessor.DataGenerator/TransactionProcessing.DataGeneration/ITransactionDataGenerator.cs

@@ -11,7 +11,7 @@ public interface ITransactionDataGenerator{
     Task<Boolean> PerformMerchantLogon(DateTime dateTime, MerchantResponse merchant, CancellationToken cancellationToken);
     Task<Boolean> PerformSettlement(DateTime dateTime, Guid estateId, CancellationToken cancellationToken);
     Task<Boolean> SendSales(DateTime dateTime, MerchantResponse merchant, ContractResponse contract, Int32 numberOfSales, CancellationToken cancellationToken);
-    Task<Boolean> SendUploadFile(DateTime dateTime, ContractResponse contract, MerchantResponse merchant, CancellationToken cancellationToken);
+    Task<Boolean> SendUploadFile(DateTime dateTime, ContractResponse contract, MerchantResponse merchant, Guid userId, CancellationToken cancellationToken);
     Task<MerchantResponse> GetMerchant(Guid estateId, Guid merchantId, CancellationToken cancellationToken);
     Task<Boolean> GenerateMerchantStatement(Guid estateId, Guid merchantId, DateTime statementDateTime, CancellationToken cancellationToken);
 

TransactionProcessor.DataGenerator/TransactionProcessing.DataGeneration/TransactionDataGenerator.cs

@@ -315,7 +315,7 @@ public async Task<Boolean> SendSales(DateTime dateTime, MerchantResponse merchan
         return true;
     }
 
-    public async Task<Boolean> SendUploadFile(DateTime dateTime, ContractResponse contract, MerchantResponse merchant, CancellationToken cancellationToken){
+    public async Task<Boolean> SendUploadFile(DateTime dateTime, ContractResponse contract, MerchantResponse merchant, Guid userId, CancellationToken cancellationToken){
         Int32 numberOfSales = r.Next(5, 15);
         (Decimal, UploadFile) uploadFile = await this.BuildUploadFile(dateTime, merchant, contract, numberOfSales, cancellationToken);
 
@@ -329,15 +329,15 @@ public async Task<Boolean> SendUploadFile(DateTime dateTime, ContractResponse co
 
         // Build up a deposit (minus the last sale amount)
         MakeMerchantDepositRequest depositRequest = this.CreateMerchantDepositRequest(uploadFile.Item1, dateTime);
-
+        
         // Send the deposit
         Boolean depositSent = await this.SendMerchantDepositRequest(merchant, depositRequest, cancellationToken);
 
         if (depositSent == false){
             return false;
         }
 
-        Boolean fileSent = await this.UploadFile(uploadFile.Item2, Guid.Empty, dateTime, cancellationToken);
+        Boolean fileSent = await this.UploadFile(uploadFile.Item2, userId, dateTime, cancellationToken);
 
         if (fileSent == false){
             return false;
@@ -354,6 +354,7 @@ public async Task<MerchantResponse> GetMerchant(Guid estateId, Guid merchantId,
         {
             this.WriteTrace($"About to get Merchant [{merchant.MerchantId}] Estate Id [{merchant.EstateId}]");
             merchant = await this.EstateClient.GetMerchant(token, estateId, merchantId, cancellationToken);
+
             this.WriteTrace($"Merchant retrieved successfully");
         }
         catch (Exception ex)