Merge branch 'master' into CON-3006-Update-insert-text-for-Legal-agre…

…ement-v5-on-Your-agreements-page
SkillsFundingAgency · Jan 29, 2021 · da06596 · da06596
2 parents 85dc3c8 + 50e9df1
commit da06596
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git 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.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 30 * *")] TimerInfo timer, 
             ILogger logger)
         {
             logger.LogInformation($"Starting {nameof(ExpireFundsJob)}");

diff --git 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
@@ -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();