Merge pull request #2351 from SkillsFundingAgency/MAC-18-Call-Tasks-A…

…PI-Using-MI Mac 18 call tasks api using mi
SkillsFundingAgency · Aug 2, 2022 · 94d7abc · 94d7abc
2 parents 55a1eda + 757c117
commit 94d7abc
Show file tree

Hide file tree

Showing 11 changed files with 7 additions and 31 deletions.
diff --git a/src/SFA.DAS.EAS.Api/App_Start/WebApiConfig.cs b/src/SFA.DAS.EAS.Api/App_Start/WebApiConfig.cs
@@ -38,7 +38,6 @@ public static void Register(HttpConfiguration config)
                 c.AddRegistry<NotificationsRegistry>();
                 c.AddRegistry<ReferenceDataRegistry>();
                 c.AddRegistry<RepositoriesRegistry>();
-                c.AddRegistry<TasksRegistry>();
                 c.AddRegistry<ValidationRegistry>();
                 c.AddRegistry<EmployerAccountsApiServiceRegistry>();
                 c.AddRegistry<DefaultRegistry>();

diff --git a/src/SFA.DAS.EAS.Web/DependencyResolution/IoC.cs b/src/SFA.DAS.EAS.Web/DependencyResolution/IoC.cs
@@ -27,7 +27,6 @@ public static IContainer Initialize()
                 c.AddRegistry<NotificationsRegistry>();
                 c.AddRegistry<ReferenceDataRegistry>();
                 c.AddRegistry<RepositoriesRegistry>();
-                c.AddRegistry<TasksRegistry>();
                 c.AddRegistry<ValidationRegistry>();
                 c.AddRegistry<DefaultRegistry>();
             });

diff --git a/src/SFA.DAS.EmployerAccounts/Configuration/ConfigurationKeys.cs b/src/SFA.DAS.EmployerAccounts/Configuration/ConfigurationKeys.cs
@@ -4,7 +4,6 @@ public static class ConfigurationKeys
     {
         public const string EmployerAccounts = "SFA.DAS.EmployerAccounts";
         public const string Features = "SFA.DAS.EmployerApprenticeshipsService.FeaturesV2";
-        public const string TasksApi = "SFA.DAS.Tasks.Api";
         public const string ReferenceDataApiClient = "SFA.DAS.ReferenceDataApiClient";
         public const string NotificationsApiClient = "SFA.DAS.EmployerAccounts.Notifications";
         public const string CommitmentsApiClient = "SFA.DAS.CommitmentsAPI";

diff --git a/src/SFA.DAS.EmployerAccounts/Configuration/EmployerAccountsConfiguration.cs b/src/SFA.DAS.EmployerAccounts/Configuration/EmployerAccountsConfiguration.cs
@@ -2,6 +2,7 @@
 using SFA.DAS.EAS.Account.Api.Client;
 using SFA.DAS.Hmrc.Configuration;
 using SFA.DAS.Messaging.AzureServiceBus.StructureMap;
+using SFA.DAS.Tasks.API.Client;
 using SFA.DAS.TokenService.Api.Client;
 using System;
 
@@ -59,5 +60,6 @@ public class EmployerAccountsConfiguration : ITopicMessagePublisherConfiguration
         public int DefaultCacheExpirationInMinutes { get; set; }
         public string SupportConsoleUsers { get; set; }
         public DateTime? LastTermsAndConditionsUpdate { get; set; }
+        public TaskApiConfiguration TasksApi { get; set; }
     }
 }
diff --git a/src/SFA.DAS.EmployerAccounts/DependencyResolution/ReferenceDataRegistry.cs b/src/SFA.DAS.EmployerAccounts/DependencyResolution/ReferenceDataRegistry.cs
@@ -1,10 +1,7 @@
-using SFA.DAS.AutoConfiguration;
-using SFA.DAS.Configuration;
-using SFA.DAS.EmployerAccounts.Configuration;
+using SFA.DAS.EmployerAccounts.Configuration;
 using SFA.DAS.EmployerAccounts.Interfaces;
 using SFA.DAS.EmployerAccounts.Services;
 using SFA.DAS.ReferenceData.Api.Client;
-using SFA.DAS.Tasks.API.Client;
 using StructureMap;
 
 namespace SFA.DAS.EmployerAccounts.DependencyResolution
@@ -14,8 +11,6 @@ public class ReferenceDataRegistry : Registry
         public ReferenceDataRegistry()
         {
             For<IReferenceDataApiConfiguration>().Use(c => c.GetInstance<ReferenceDataApiClientConfiguration>());
-            For<ITaskApiConfiguration>().Use(c => c.GetInstance<IAutoConfigurationService>().Get<ITaskApiConfiguration>(ConfigurationKeys.ReferenceDataApiClient)).Singleton();
-
             For<IReferenceDataService>().Use<ReferenceDataService>().Singleton();
         }
     }

diff --git a/src/SFA.DAS.EmployerAccounts/DependencyResolution/TasksRegistry.cs b/src/SFA.DAS.EmployerAccounts/DependencyResolution/TasksRegistry.cs
@@ -11,8 +11,7 @@ public class TasksRegistry : Registry
     {
         public TasksRegistry()
         {
-            For<ITaskApiConfiguration>().Use(c => c.GetInstance<IAutoConfigurationService>().Get<TaskApiConfiguration>(ConfigurationKeys.TasksApi)).Singleton();
-
+            For<ITaskApiConfiguration>().Use(c => c.GetInstance<EmployerAccountsConfiguration>().TasksApi);
             For<ITaskService>().Use<TaskService>();
         }
     }

diff --git a/src/SFA.DAS.EmployerAccounts/SFA.DAS.EmployerAccounts.csproj b/src/SFA.DAS.EmployerAccounts/SFA.DAS.EmployerAccounts.csproj
@@ -62,7 +62,7 @@
     <PackageReference Include="SFA.DAS.NServiceBus" Version="15.0.25" />
     <PackageReference Include="SFA.DAS.NServiceBus.SqlServer" Version="15.0.25" />
     <PackageReference Include="SFA.DAS.Sql.Client" Version="1.0.0.32930" />
-    <PackageReference Include="SFA.DAS.Tasks.Api.Client" Version="1.8.44" />
+    <PackageReference Include="SFA.DAS.Tasks.Api.Client" Version="1.8.163" />
     <PackageReference Include="SFA.DAS.Tasks.API.Types" Version="1.8.44" />
     <PackageReference Include="SFA.DAS.TokenService.Api.Client" Version="2.3.0" />    
     <PackageReference Include="SFA.DAS.UnitOfWork" Version="9.0.13" />

diff --git a/src/SFA.DAS.EmployerApprenticeshipsService.Application/DependencyResolution/TasksRegistry.cs b/src/SFA.DAS.EmployerApprenticeshipsService.Application/DependencyResolution/TasksRegistry.cs
diff --git a/src/SFA.DAS.EmployerApprenticeshipsService.Application/SFA.DAS.EAS.Application.csproj b/src/SFA.DAS.EmployerApprenticeshipsService.Application/SFA.DAS.EAS.Application.csproj
@@ -80,7 +80,6 @@
     <Compile Include="DependencyResolution\PaymentsRegistry.cs" />
     <Compile Include="DependencyResolution\ReferenceDataRegistry.cs" />
     <Compile Include="DependencyResolution\RepositoriesRegistry.cs" />
-    <Compile Include="DependencyResolution\TasksRegistry.cs" />
     <Compile Include="DependencyResolution\ValidationRegistry.cs" />
     <Compile Include="Queries\GetFinancialStatistics\GetFinancialStatisticsQueryHandler.cs" />
     <Compile Include="Queries\GetFinancialStatistics\GetFinancialStatisticsQuery.cs" />
@@ -264,7 +263,7 @@
       <Version>1.1.90</Version>
     </PackageReference>
     <PackageReference Include="SFA.DAS.Tasks.Api.Client">
-      <Version>1.8.44</Version>
+      <Version>1.8.163</Version>
     </PackageReference>
     <PackageReference Include="SFA.DAS.Tasks.Api.Types">
       <Version>1.8.44</Version>

diff --git a/src/SFA.DAS.EmployerApprenticeshipsService.Domain/Configuration/ConfigurationKeys.cs b/src/SFA.DAS.EmployerApprenticeshipsService.Domain/Configuration/ConfigurationKeys.cs
@@ -5,7 +5,6 @@ public static class ConfigurationKeys
         public const string LevyDeclarationProvider = "SFA.DAS.LevyAggregationProvider";
         public const string PaymentProvider = "SFA.DAS.PaymentProvider";
         public const string EmployerApprenticeshipsService = "SFA.DAS.EmployerApprenticeshipsService";
-        public const string TaskApi = "SFA.DAS.Tasks.Api";
         public const string ReferenceDataApi = "SFA.DAS.ReferenceDataApiClient";
         public const string PaymentsApiClient = "SFA.DAS.PaymentsAPI";
         public const string NotificationsApiClient = "SFA.DAS.EmployerApprenticeshipsService.Notifications";

diff --git a/src/SFA.DAS.EmployerApprenticeshipsService.Infrastructure/SFA.DAS.EAS.Infrastructure.csproj b/src/SFA.DAS.EmployerApprenticeshipsService.Infrastructure/SFA.DAS.EAS.Infrastructure.csproj
@@ -189,7 +189,7 @@
       <Version>1.1.90</Version>
     </PackageReference>
     <PackageReference Include="SFA.DAS.Tasks.Api.Client">
-      <Version>1.8.44</Version>
+      <Version>1.8.163</Version>
     </PackageReference>
     <PackageReference Include="SFA.DAS.Tasks.Api.Types">
       <Version>1.8.44</Version>