Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mac 18 call tasks api using mi #2351

Merged
merged 6 commits into from
Aug 2, 2022
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/SFA.DAS.EAS.Api/App_Start/WebApiConfig.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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>();
Expand Down
1 change: 0 additions & 1 deletion src/SFA.DAS.EAS.Web/DependencyResolution/IoC.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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>();
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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; }
}
}
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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();
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>();
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.160-prerelease-9" />
<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" />
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down