From 0a7f85c3ba6d3a0bff6ec95d5bb374315ba92379 Mon Sep 17 00:00:00 2001
From: Corey <corey.faulconbridge@digital.education.gov.uk>
Date: Wed, 27 Jan 2021 11:41:09 +0000
Subject: [PATCH 1/3] [CON-3020] Re-adding the transaction removed as part of
 CON-3034. Now conditionally checking for the existence of a current
 transaction.

Also changed the name of app insghts instrumentation key config value for consistency
---
 src/SFA.DAS.EmployerFinance.Jobs/App.config                   | 2 +-
 src/SFA.DAS.EmployerFinance.MessageHandlers/App.config        | 2 +-
 src/SFA.DAS.EmployerFinance/Data/EmployerAccountRepository.cs | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/SFA.DAS.EmployerFinance.Jobs/App.config b/src/SFA.DAS.EmployerFinance.Jobs/App.config
index b1d5a98056..43f311e1c8 100644
--- a/src/SFA.DAS.EmployerFinance.Jobs/App.config
+++ b/src/SFA.DAS.EmployerFinance.Jobs/App.config
@@ -7,7 +7,7 @@
   <appSettings>
     <add key="ConfigurationStorageConnectionString" value="UseDevelopmentStorage=true" />
     <add key="EnvironmentName" value="LOCAL" />
-    <add key="InstrumentationKey" value="" />
+    <add key="APPINSIGHTS_INSTRUMENTATIONKEY" value="" />
     <add key="StorageConnectionString" value="UseDevelopmentStorage=true" />
   </appSettings>
   <connectionStrings>
diff --git a/src/SFA.DAS.EmployerFinance.MessageHandlers/App.config b/src/SFA.DAS.EmployerFinance.MessageHandlers/App.config
index 13d9be65bb..96be10c442 100644
--- a/src/SFA.DAS.EmployerFinance.MessageHandlers/App.config
+++ b/src/SFA.DAS.EmployerFinance.MessageHandlers/App.config
@@ -8,7 +8,7 @@
     <add key="ConfigurationStorageConnectionString" value="UseDevelopmentStorage=true" />
     <add key="DeclarationsEnabled" value="both" />
     <add key="EnvironmentName" value="LOCAL" />
-    <add key="InstrumentationKey" value="" />
+    <add key="APPINSIGHTS_INSTRUMENTATIONKEY" value="" />
     <add key="StorageConnectionString" value="UseDevelopmentStorage=true" />
   </appSettings>
   <connectionStrings>
diff --git a/src/SFA.DAS.EmployerFinance/Data/EmployerAccountRepository.cs b/src/SFA.DAS.EmployerFinance/Data/EmployerAccountRepository.cs
index 9a27926869..05f94831b1 100644
--- a/src/SFA.DAS.EmployerFinance/Data/EmployerAccountRepository.cs
+++ b/src/SFA.DAS.EmployerFinance/Data/EmployerAccountRepository.cs
@@ -31,6 +31,7 @@ public async Task<List<Account>> GetAllAccounts()
         {
             var result = await _db.Value.Database.Connection.QueryAsync<Account>(
                 sql: "select * from [employer_financial].[Account]",
+                transaction: _db.Value.Database.CurrentTransaction?.UnderlyingTransaction,
                 commandType: CommandType.Text);
 
             return result.AsList();

From b4f6e81ed3d74a2f24199e187b79b74ac19b4ce8 Mon Sep 17 00:00:00 2001
From: Corey <corey.faulconbridge@digital.education.gov.uk>
Date: Wed, 27 Jan 2021 16:28:32 +0000
Subject: [PATCH 2/3] [CON-3020] Change schedule of expiry to allow missing
 payments to be pulled

---
 .../ScheduledJobs/ExpireFundsJob.cs                             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/SFA.DAS.EmployerFinance.Jobs/ScheduledJobs/ExpireFundsJob.cs b/src/SFA.DAS.EmployerFinance.Jobs/ScheduledJobs/ExpireFundsJob.cs
index 0c40e2b43f..ef2d23c5b1 100644
--- a/src/SFA.DAS.EmployerFinance.Jobs/ScheduledJobs/ExpireFundsJob.cs
+++ b/src/SFA.DAS.EmployerFinance.Jobs/ScheduledJobs/ExpireFundsJob.cs
@@ -26,7 +26,7 @@ public ExpireFundsJob(
         }
 
         public async Task Run(
-            [TimerTrigger("0 0 0 28 * *")] TimerInfo timer, 
+            [TimerTrigger("0 0 0 29 * *")] TimerInfo timer, 
             ILogger logger)
         {
             logger.LogInformation($"Starting {nameof(ExpireFundsJob)}");

From b871542f018ddcae3e98f04ac017b91f614bc151 Mon Sep 17 00:00:00 2001
From: Corey <corey.faulconbridge@digital.education.gov.uk>
Date: Thu, 28 Jan 2021 17:01:35 +0000
Subject: [PATCH 3/3] [CON-3020] Change CRON schedule another day to
 investigate 1 rogue payment

---
 .../ScheduledJobs/ExpireFundsJob.cs                             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/SFA.DAS.EmployerFinance.Jobs/ScheduledJobs/ExpireFundsJob.cs b/src/SFA.DAS.EmployerFinance.Jobs/ScheduledJobs/ExpireFundsJob.cs
index ef2d23c5b1..91fde61244 100644
--- a/src/SFA.DAS.EmployerFinance.Jobs/ScheduledJobs/ExpireFundsJob.cs
+++ b/src/SFA.DAS.EmployerFinance.Jobs/ScheduledJobs/ExpireFundsJob.cs
@@ -26,7 +26,7 @@ public ExpireFundsJob(
         }
 
         public async Task Run(
-            [TimerTrigger("0 0 0 29 * *")] TimerInfo timer, 
+            [TimerTrigger("0 0 0 30 * *")] TimerInfo timer, 
             ILogger logger)
         {
             logger.LogInformation($"Starting {nameof(ExpireFundsJob)}");