APR-1152 added in async

SkillsFundingAgency · Aug 27, 2020 · b488c17 · b488c17
1 parent bef548a
commit b488c17
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/src/SFA.DAS.ApplyService.Web/Services/INotRequiredOverridesService.cs b/src/SFA.DAS.ApplyService.Web/Services/INotRequiredOverridesService.cs
@@ -1,12 +1,13 @@
 using SFA.DAS.ApplyService.Web.Configuration;
 using System;
 using System.Collections.Generic;
+using System.Threading.Tasks;
 
 namespace SFA.DAS.ApplyService.Web.Services
 {
     public interface INotRequiredOverridesService
     {
-        void RefreshNotRequiredOverrides(Guid applicationId);
+        Task RefreshNotRequiredOverrides(Guid applicationId);
         List<NotRequiredOverrideConfiguration> GetNotRequiredOverrides(Guid applicationId);
     }
 }
diff --git a/src/SFA.DAS.ApplyService.Web/Services/NotRequiredOverridesService.cs b/src/SFA.DAS.ApplyService.Web/Services/NotRequiredOverridesService.cs
@@ -5,6 +5,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 using AutoMapper;
 using SFA.DAS.ApplyService.Application.Apply.Roatp;
 using NotRequiredOverrideConfiguration = SFA.DAS.ApplyService.Web.Configuration.NotRequiredOverrideConfiguration;
@@ -30,15 +31,15 @@ public NotRequiredOverridesService(IOptions<List<NotRequiredOverrideConfiguratio
             _sessionService = sessionService;
         }
 
-        public void RefreshNotRequiredOverrides(Guid applicationId)
+        public async Task RefreshNotRequiredOverrides(Guid applicationId)
         {
             RemoveConfigurationFromCache(applicationId);
-            var configuration = CalculateNotRequiredOverrides(applicationId);
+            var configuration = await CalculateNotRequiredOverrides(applicationId);
             var applicationNotRequiredOverrides = new Application.Apply.Roatp.NotRequiredOverrideConfiguration
             {
                 NotRequiredOverrides = Mapper.Map<List<NotRequiredOverride>>(configuration)
             };
-            _applicationApiClient.UpdateNotRequiredOverrides(applicationId, applicationNotRequiredOverrides);
+            _applicationApiClient.UpdateNotRequiredOverrides(applicationId, applicationNotRequiredOverrides).GetAwaiter().GetResult();
             SaveConfigurationToCache(applicationId, configuration);
         }
 
@@ -55,16 +56,16 @@ public List<NotRequiredOverrideConfiguration> GetNotRequiredOverrides(Guid appli
             return configuration;
         }
 
-        private List<NotRequiredOverrideConfiguration> CalculateNotRequiredOverrides(Guid applicationId)
+        private async Task<List<NotRequiredOverrideConfiguration>> CalculateNotRequiredOverrides(Guid applicationId)
         {
             List<NotRequiredOverrideConfiguration> configuration = null;
 
             var applicationData = _qnaApiClient.GetApplicationData(applicationId).GetAwaiter().GetResult() as JObject;
 
             if (applicationData != null)
             {
-                var applicationNotRequiredOverrides =
-                    _applicationApiClient.GetNotRequiredOverrides(applicationId).Result;
+                var applicationNotRequiredOverrides =await _applicationApiClient.GetNotRequiredOverrides(applicationId);
+
 
                 if (applicationNotRequiredOverrides == null)
                 {