EHD-1432: Reduce use of interfaces: IScopeBusinessLogic

cabinetoffice · Nov 20, 2024 · 928b952 · 928b952
1 parent f4b56c4
commit 928b952
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 28 deletions.
diff --git a/...yGap.WebUI.Tests/BusinessLogicTests/Services/ScopeBusinessLogic/FillMissingScopesTests.cs b/...yGap.WebUI.Tests/BusinessLogicTests/Services/ScopeBusinessLogic/FillMissingScopesTests.cs
@@ -31,7 +31,7 @@ public void BeforeEach()
         private Mock<IDataRepository> mockDataRepository;
 
         // sut
-        private IScopeBusinessLogic scopeBusinessLogic;
+        private WebUI.BusinessLogic.Services.ScopeBusinessLogic scopeBusinessLogic;
 
         [TestCase(SectorTypes.Private)]
         [TestCase(SectorTypes.Public)]

diff --git a/...bUI.Tests/BusinessLogicTests/Services/ScopeBusinessLogic/FindOrgsWhereScopeNotSetTests.cs b/...bUI.Tests/BusinessLogicTests/Services/ScopeBusinessLogic/FindOrgsWhereScopeNotSetTests.cs
@@ -49,7 +49,7 @@ public void BeforeEach()
         private List<Organisation> testOrgs;
 
         // sut
-        private IScopeBusinessLogic scopeBusinessLogic;
+        private WebUI.BusinessLogic.Services.ScopeBusinessLogic scopeBusinessLogic;
 
         [TestCase(1)]
         [TestCase(2)]

diff --git a/GenderPayGap.UnitTests/GenderPayGap.WebUI.Tests/Services/ScopeBusinessLogicTests.cs b/GenderPayGap.UnitTests/GenderPayGap.WebUI.Tests/Services/ScopeBusinessLogicTests.cs
@@ -24,7 +24,7 @@ public class ScopeBusinessLogicTests : AssertionHelper
 
         private IList<Organisation> testOrgData;
         private IList<OrganisationScope> testOrgScopeData;
-        public IScopeBusinessLogic testScopeBL;
+        public ScopeBusinessLogic testScopeBL;
 
         #region Test Data
 

diff --git a/GenderPayGap.UnitTests/GenderPayGap.WebUI.Tests/TestHelpers/UiTestHelpers.cs b/GenderPayGap.UnitTests/GenderPayGap.WebUI.Tests/TestHelpers/UiTestHelpers.cs
@@ -200,13 +200,7 @@ public static IContainer BuildContainerIoC(params object[] dbObjects)
             builder.RegisterInstance(Config.Configuration);
             builder.RegisterType<UpdateFromCompaniesHouseService>().As<UpdateFromCompaniesHouseService>().InstancePerLifetimeScope();
 
-            builder.Register(
-                    c => c.ResolveAsMock<ScopeBusinessLogic>(
-                            false,
-                            typeof(IDataRepository))
-                        .Object)
-                .As<IScopeBusinessLogic>()
-                .InstancePerLifetimeScope();
+            builder.RegisterType<ScopeBusinessLogic>().As<ScopeBusinessLogic>().SingleInstance();
 
             builder.Register(g => new MockGovNotify()).As<IGovNotifyAPI>().SingleInstance();
 

diff --git a/GenderPayGap.WebUI/BackgroundJobs/ScheduledJobs/SetPresumedScopesJob.cs b/GenderPayGap.WebUI/BackgroundJobs/ScheduledJobs/SetPresumedScopesJob.cs
@@ -5,10 +5,10 @@ namespace GenderPayGap.WebUI.BackgroundJobs.ScheduledJobs
 
     public class SetPresumedScopesJob
     {
-        private readonly IScopeBusinessLogic scopeBusinessLogic;
+        private readonly ScopeBusinessLogic scopeBusinessLogic;
 
         public SetPresumedScopesJob(
-            IScopeBusinessLogic scopeBusinessLogic)
+            ScopeBusinessLogic scopeBusinessLogic)
         {
             this.scopeBusinessLogic = scopeBusinessLogic;
         }

diff --git a/GenderPayGap.WebUI/BusinessLogic/Services/ScopeBusinessLogic.cs b/GenderPayGap.WebUI/BusinessLogic/Services/ScopeBusinessLogic.cs
@@ -10,21 +10,7 @@
 namespace GenderPayGap.WebUI.BusinessLogic.Services
 {
 
-    public interface IScopeBusinessLogic
-    {
-
-        OrganisationScope GetLatestScopeBySnapshotYear(long organisationId, int snapshotYear = 0);
-
-        void SetPresumedScopes();
-
-        HashSet<OrganisationMissingScope> FindOrgsWhereScopeNotSet();
-        bool FillMissingScopes(Organisation org);
-
-        void SetScopeStatuses();
-
-    }
-
-    public class ScopeBusinessLogic : IScopeBusinessLogic
+    public class ScopeBusinessLogic
     {
 
         public ScopeBusinessLogic(IDataRepository dataRepo)

diff --git a/GenderPayGap.WebUI/Startup.cs b/GenderPayGap.WebUI/Startup.cs
@@ -197,7 +197,7 @@ public IContainer BuildContainerIoC(IServiceCollection services)
             builder.RegisterType<ReturnService>().As<ReturnService>().InstancePerLifetimeScope();
             builder.RegisterType<DraftReturnService>().As<DraftReturnService>().InstancePerLifetimeScope();
 
-            builder.RegisterType<ScopeBusinessLogic>().As<IScopeBusinessLogic>().InstancePerLifetimeScope();
+            builder.RegisterType<ScopeBusinessLogic>().As<ScopeBusinessLogic>().InstancePerLifetimeScope();
 
             builder.RegisterType<UpdateFromCompaniesHouseService>().As<UpdateFromCompaniesHouseService>().InstancePerLifetimeScope();