Merge pull request #722 from SkillsFundingAgency/MF-513-Remove_Readon…

…ly_DbContext Mf 513 remove readonly db context
SkillsFundingAgency · May 1, 2020 · 133eb2f · 133eb2f
2 parents 514fb42 + c9b13eb
commit 133eb2f
Show file tree

Hide file tree

Showing 17 changed files with 55 additions and 212 deletions.
diff --git a/src/CommitmentsV2/SFA.DAS.CommitmentsV2.Api/DependencyResolution/IoC.cs b/src/CommitmentsV2/SFA.DAS.CommitmentsV2.Api/DependencyResolution/IoC.cs
@@ -25,7 +25,6 @@ public static void Initialize(Registry registry)
             registry.IncludeRegistry<ConfigurationRegistry>();
             registry.IncludeRegistry<CurrentDateTimeRegistry>();
             registry.IncludeRegistry<DataRegistry>();
-            registry.IncludeRegistry<ReadOnlyDataRegistry>();
             registry.IncludeRegistry<DomainServiceRegistry>();
             registry.IncludeRegistry<EntityFrameworkCoreUnitOfWorkRegistry<ProviderCommitmentsDbContext>>();
             registry.IncludeRegistry<EmployerAccountsRegistry>();

diff --git a/...sV2.UnitTests/Application/Queries/GetApprenticeships/GetApprenticeshipPerformanceTests.cs b/...sV2.UnitTests/Application/Queries/GetApprenticeships/GetApprenticeshipPerformanceTests.cs
@@ -19,7 +19,7 @@ public class GetApprenticeshipPerformanceTests : SearchParameterServiceTestBase
         [Test, RecursiveMoqAutoData]
         public async Task Then_Will_Not_Search_For_Apprenticeships_That_Will_Not_Be_Used_On_Current_Page(
             ApprenticeshipSearchParameters searchParameters,
-            [Frozen] Mock<ICommitmentsReadOnlyDbContext> mockContext,
+            [Frozen] Mock<IProviderCommitmentsDbContext> mockContext,
             [Frozen] Mock<IMapper<Apprenticeship, GetApprenticeshipsQueryResult.ApprenticeshipDetails>> mockMapper,
             ApprenticeshipSearchService service)
         {
@@ -46,7 +46,7 @@ public async Task Then_Will_Not_Search_For_Apprenticeships_That_Will_Not_Be_Used
         [Test, RecursiveMoqAutoData]
         public async Task Then_Will_Not_Search_For_Apprenticeships_That_Will_Be_Skipped(
             ApprenticeshipSearchParameters searchParameters,
-            [Frozen] Mock<ICommitmentsReadOnlyDbContext> mockContext,
+            [Frozen] Mock<IProviderCommitmentsDbContext> mockContext,
             [Frozen] Mock<IMapper<Apprenticeship, GetApprenticeshipsQueryResult.ApprenticeshipDetails>> mockMapper,
             ApprenticeshipSearchService service)
         {

diff --git a/...s/GetApprenticeships/GetApprenticeshipsHandlerTests/WhenGettingEmployerApprenticeships.cs b/...s/GetApprenticeships/GetApprenticeshipsHandlerTests/WhenGettingEmployerApprenticeships.cs
@@ -21,7 +21,7 @@ public async Task ThenQueriesApprenticeshipsWithEmployerIdWhenNotOrdering(
             List<Apprenticeship> apprenticeships,
             [Frozen]GetApprenticeshipsQuery query,
             [Frozen] Mock<IApprenticeshipSearch> mockSearch,
-            [Frozen] Mock<ICommitmentsReadOnlyDbContext> mockContext,
+            [Frozen] Mock<IProviderCommitmentsDbContext> mockContext,
             [Frozen] Mock<IMapper<Apprenticeship, GetApprenticeshipsQueryResult.ApprenticeshipDetails>> mockMapper,
             GetApprenticeshipsQueryHandler handler)
         {
@@ -53,7 +53,7 @@ public async Task ThenQueriesApprenticeshipsWithEmployerIdWhenOrdering(
             [Frozen]GetApprenticeshipsQuery query,
             List<Apprenticeship> apprenticeships,
             GetApprenticeshipsQueryResult.ApprenticeshipDetails apprenticeshipDetails,
-            [Frozen] Mock<ICommitmentsReadOnlyDbContext> mockContext,
+            [Frozen] Mock<IProviderCommitmentsDbContext> mockContext,
             [Frozen] Mock<IApprenticeshipSearch> mockSearch,
             [Frozen] Mock<IMapper<Apprenticeship, GetApprenticeshipsQueryResult.ApprenticeshipDetails>> mockMapper,
             GetApprenticeshipsQueryHandler handler)
@@ -88,7 +88,7 @@ public async Task ThenQueriesApprenticeshipsWithEmployerIdWhenOrderingInReverse(
             [Frozen]GetApprenticeshipsQuery query,
             List<Apprenticeship> apprenticeships,
             GetApprenticeshipsQueryResult.ApprenticeshipDetails apprenticeshipDetails,
-            [Frozen] Mock<ICommitmentsReadOnlyDbContext> mockContext,
+            [Frozen] Mock<IProviderCommitmentsDbContext> mockContext,
             [Frozen] Mock<IApprenticeshipSearch> mockSearch,
             [Frozen] Mock<IMapper<Apprenticeship, GetApprenticeshipsQueryResult.ApprenticeshipDetails>> mockMapper,
             GetApprenticeshipsQueryHandler handler)
@@ -121,7 +121,7 @@ public async Task ThenWillReturnCurrentSelectedPage(
             [Frozen]GetApprenticeshipsQuery query,
             List<Apprenticeship> apprenticeships,
             ApprenticeshipSearchResult searchResult,
-            [Frozen] Mock<ICommitmentsReadOnlyDbContext> mockContext,
+            [Frozen] Mock<IProviderCommitmentsDbContext> mockContext,
             [Frozen] Mock<IApprenticeshipSearch> mockSearch,
             [Frozen] Mock<IMapper<Apprenticeship, GetApprenticeshipsQueryResult.ApprenticeshipDetails>> mockMapper,
             GetApprenticeshipsQueryHandler handler)

diff --git a/...s/GetApprenticeships/GetApprenticeshipsHandlerTests/WhenGettingProviderApprenticeships.cs b/...s/GetApprenticeships/GetApprenticeshipsHandlerTests/WhenGettingProviderApprenticeships.cs
@@ -23,7 +23,7 @@ public async Task ThenReturnUnsortedApprenticeshipsWhenNotOrdering(
             List<Apprenticeship> apprenticeships,
             [Frozen]GetApprenticeshipsQuery query,
             [Frozen] Mock<IApprenticeshipSearch> mockSearch,
-            [Frozen] Mock<ICommitmentsReadOnlyDbContext> mockContext,
+            [Frozen] Mock<IProviderCommitmentsDbContext> mockContext,
             [Frozen] Mock<IMapper<Apprenticeship, GetApprenticeshipsQueryResult.ApprenticeshipDetails>> mockMapper,
             GetApprenticeshipsQueryHandler handler)
         {
@@ -58,7 +58,7 @@ public async Task ThenReturnsOrderedApprenticeshipsWhenOrdering(
 
             [Frozen]GetApprenticeshipsQuery query,
             List<Apprenticeship> apprenticeships,
-            [Frozen] Mock<ICommitmentsReadOnlyDbContext> mockContext,
+            [Frozen] Mock<IProviderCommitmentsDbContext> mockContext,
             [Frozen] Mock<IApprenticeshipSearch> mockSearch,
             [Frozen] Mock<IMapper<Apprenticeship, GetApprenticeshipsQueryResult.ApprenticeshipDetails>> mockMapper,
             GetApprenticeshipsQueryHandler handler)
@@ -95,7 +95,7 @@ public async Task ThenReturnReverseOrderedApprenticeshipsWhenOrderingInReverse(
 
             [Frozen]GetApprenticeshipsQuery query,
             List<Apprenticeship> apprenticeships,
-            [Frozen] Mock<ICommitmentsReadOnlyDbContext> mockContext,
+            [Frozen] Mock<IProviderCommitmentsDbContext> mockContext,
             [Frozen] Mock<IApprenticeshipSearch> mockSearch,
             [Frozen] Mock<IMapper<Apprenticeship, GetApprenticeshipsQueryResult.ApprenticeshipDetails>> mockMapper,
             GetApprenticeshipsQueryHandler handler)
@@ -132,7 +132,7 @@ public async Task ThenReturnsMappedApprenticeships(
             [Frozen]GetApprenticeshipsQuery query,
             List<Apprenticeship> apprenticeships,
             [Frozen]GetApprenticeshipsQueryResult.ApprenticeshipDetails apprenticeshipDetails,
-            [Frozen] Mock<ICommitmentsReadOnlyDbContext> mockContext,
+            [Frozen] Mock<IProviderCommitmentsDbContext> mockContext,
             [Frozen] Mock<IApprenticeshipSearch> search,
             [Frozen] Mock<IMapper<Apprenticeship, GetApprenticeshipsQueryResult.ApprenticeshipDetails>> mockMapper,
             GetApprenticeshipsQueryHandler handler)
@@ -171,7 +171,7 @@ public async Task ThenReturnsApprenticeshipsData(
             GetApprenticeshipsQueryResult.ApprenticeshipDetails apprenticeshipDetails,
             [Frozen]GetApprenticeshipsQuery query,
             [Frozen] Mock<IApprenticeshipSearch> search,
-            [Frozen] Mock<ICommitmentsReadOnlyDbContext> mockContext,
+            [Frozen] Mock<IProviderCommitmentsDbContext> mockContext,
             [Frozen] Mock<IMapper<Apprenticeship, GetApprenticeshipsQueryResult.ApprenticeshipDetails>> mockMapper,
             GetApprenticeshipsQueryHandler handler) 
         {
@@ -210,7 +210,7 @@ public async Task ThenReturnsPageNumber(
             [Frozen]GetApprenticeshipsQuery query,
             List<Apprenticeship> apprenticeships,
             ApprenticeshipSearchResult searchResult,
-            [Frozen] Mock<ICommitmentsReadOnlyDbContext> mockContext,
+            [Frozen] Mock<IProviderCommitmentsDbContext> mockContext,
             [Frozen] Mock<IApprenticeshipSearch> search,
             GetApprenticeshipsQueryHandler handler)
         {
@@ -239,7 +239,7 @@ public async Task ThenIsSetToBeFromProvider(
             GetApprenticeshipsQueryResult.ApprenticeshipDetails apprenticeshipDetails,
             [Frozen]GetApprenticeshipsQuery query,
             [Frozen] Mock<IApprenticeshipSearch> search,
-            [Frozen] Mock<ICommitmentsReadOnlyDbContext> mockContext,
+            [Frozen] Mock<IProviderCommitmentsDbContext> mockContext,
             [Frozen] Mock<IMapper<Apprenticeship, GetApprenticeshipsQueryResult.ApprenticeshipDetails>> mockMapper,
             GetApprenticeshipsQueryHandler handler)
         {

diff --git a/...nitTests/Application/Queries/GetApprenticeships/SearchTests/WhenDownloadingApprentices.cs b/...nitTests/Application/Queries/GetApprenticeships/SearchTests/WhenDownloadingApprentices.cs
@@ -18,7 +18,7 @@ public class WhenDownloadingApprentices : SearchParameterServiceTestBase
         [Test, MoqAutoData]
         public async Task Then_Downloads_Are_Restricted_To_Twelve_Months_for_Default_Search(
             ApprenticeshipSearchParameters searchParameters,
-            [Frozen] Mock<ICommitmentsReadOnlyDbContext> mockContext)
+            [Frozen] Mock<IProviderCommitmentsDbContext> mockContext)
         {
             //Arrange
             searchParameters.PageNumber = 0;
@@ -49,7 +49,7 @@ public async Task Then_Downloads_Are_Restricted_To_Twelve_Months_for_Default_Sea
         [Test, MoqAutoData]
         public async Task Then_Downloads_Are_Restricted_To_Twelve_Months_Normal_Sort(
             OrderedApprenticeshipSearchParameters searchParameters,
-            [Frozen] Mock<ICommitmentsReadOnlyDbContext> mockContext)
+            [Frozen] Mock<IProviderCommitmentsDbContext> mockContext)
         {
             //Arrange
             searchParameters.FieldName = nameof(Apprenticeship.FirstName);
@@ -81,7 +81,7 @@ public async Task Then_Downloads_Are_Restricted_To_Twelve_Months_Normal_Sort(
         [Test, MoqAutoData]
         public async Task Then_Downloads_Are_Restricted_To_Twelve_Months_For_Reverse_Sort(
             ReverseOrderedApprenticeshipSearchParameters searchParameters,
-            [Frozen] Mock<ICommitmentsReadOnlyDbContext> mockContext)
+            [Frozen] Mock<IProviderCommitmentsDbContext> mockContext)
         {
             //Arrange
             searchParameters.FieldName = nameof(Apprenticeship.FirstName);

diff --git a/...ts/Application/Queries/GetApprenticeships/SearchTests/WhenGettingSortedApprenticeships.cs b/...ts/Application/Queries/GetApprenticeships/SearchTests/WhenGettingSortedApprenticeships.cs
@@ -20,7 +20,7 @@ public class WhenGettingSortedApprenticeships : SearchParameterServiceTestBase
         [Test, MoqAutoData]
         public async Task Then_Sorted_Apprentices_For_Provider_Are_Return(
             OrderedApprenticeshipSearchParameters searchParameters,
-            [Frozen] Mock<ICommitmentsReadOnlyDbContext> mockContext)
+            [Frozen] Mock<IProviderCommitmentsDbContext> mockContext)
         {
             //Arrange
             searchParameters.FieldName = nameof(Apprenticeship.FirstName);
@@ -54,7 +54,7 @@ public async Task Then_Sorted_Apprentices_For_Provider_Are_Return(
         [Test, MoqAutoData]
         public async Task Then_Sorted_Apprentices_For_Employer_Are_Return(
             OrderedApprenticeshipSearchParameters searchParameters,
-            [Frozen] Mock<ICommitmentsReadOnlyDbContext> mockContext)
+            [Frozen] Mock<IProviderCommitmentsDbContext> mockContext)
         {
             //Arrange
             searchParameters.FieldName = nameof(Apprenticeship.FirstName);
@@ -88,7 +88,7 @@ public async Task Then_Sorted_Apprentices_For_Employer_Are_Return(
         [Test, MoqAutoData]
         public async Task Then_Sorted_Apprentices_Are_Return_Per_Page(
             OrderedApprenticeshipSearchParameters searchParameters,
-            [Frozen] Mock<ICommitmentsReadOnlyDbContext> mockContext)
+            [Frozen] Mock<IProviderCommitmentsDbContext> mockContext)
         {
             //Arrange
             searchParameters.FieldName = nameof(Apprenticeship.FirstName);
@@ -117,7 +117,7 @@ public async Task Then_Sorted_Apprentices_Are_Return_Per_Page(
         [Test, MoqAutoData]
         public async Task Then_Sorted_With_Alerts_Total_Found_Are_Return_With_Page_Data(
             OrderedApprenticeshipSearchParameters searchParams,
-            [Frozen] Mock<ICommitmentsReadOnlyDbContext> mockContext)
+            [Frozen] Mock<IProviderCommitmentsDbContext> mockContext)
         {
             //Arrange
             searchParams.FieldName = nameof(Apprenticeship.FirstName);
@@ -144,7 +144,7 @@ public async Task Then_Sorted_With_Alerts_Total_Found_Are_Return_With_Page_Data(
         [Test, MoqAutoData]
         public async Task Then_Apprentices_Are_Sorted_Name(
             OrderedApprenticeshipSearchParameters searchParameters,
-            [Frozen] Mock<ICommitmentsReadOnlyDbContext> mockContext)
+            [Frozen] Mock<IProviderCommitmentsDbContext> mockContext)
         {
             //Arrange
             searchParameters.PageNumber = 0;
@@ -226,7 +226,7 @@ public async Task Then_Apprentices_Are_Sorted_Name(
         [Test, MoqAutoData]
         public async Task Then_Apprentices_Are_Sorted_By_Uln(
             OrderedApprenticeshipSearchParameters searchParameters,
-            [Frozen] Mock<ICommitmentsReadOnlyDbContext> mockContext)
+            [Frozen] Mock<IProviderCommitmentsDbContext> mockContext)
         {
             //Arrange
             searchParameters.PageNumber = 0;
@@ -290,7 +290,7 @@ public async Task Then_Apprentices_Are_Sorted_By_Uln(
         [Test, MoqAutoData]
         public async Task Then_Apprentices_Are_Sorted_By_Employer_Name(
             OrderedApprenticeshipSearchParameters searchParameters,
-            [Frozen] Mock<ICommitmentsReadOnlyDbContext> mockContext)
+            [Frozen] Mock<IProviderCommitmentsDbContext> mockContext)
         {
             //Arrange
             searchParameters.PageNumber = 0;
@@ -354,7 +354,7 @@ public async Task Then_Apprentices_Are_Sorted_By_Employer_Name(
         [Test, MoqAutoData]
         public async Task Then_Apprentices_Are_Sorted_By_Course_Name(
             OrderedApprenticeshipSearchParameters searchParameters,
-            [Frozen] Mock<ICommitmentsReadOnlyDbContext> mockContext)
+            [Frozen] Mock<IProviderCommitmentsDbContext> mockContext)
         {
             //Arrange
             searchParameters.PageNumber = 0;
@@ -418,7 +418,7 @@ public async Task Then_Apprentices_Are_Sorted_By_Course_Name(
         [Test, MoqAutoData]
         public async Task Then_Apprentices_Are_Sorted_By_Planned_Start_Date(
             OrderedApprenticeshipSearchParameters searchParameters,
-            [Frozen] Mock<ICommitmentsReadOnlyDbContext> mockContext)
+            [Frozen] Mock<IProviderCommitmentsDbContext> mockContext)
         {
             //Arrange
             searchParameters.PageNumber = 0;
@@ -485,7 +485,7 @@ public async Task Then_Apprentices_Are_Sorted_By_Planned_Start_Date(
         [Test, MoqAutoData]
         public async Task Then_Apprentices_Are_Sorted_By_Planned_End_Date(
             OrderedApprenticeshipSearchParameters searchParameters,
-            [Frozen] Mock<ICommitmentsReadOnlyDbContext> mockContext)
+            [Frozen] Mock<IProviderCommitmentsDbContext> mockContext)
         {
             //Arrange
             searchParameters.PageNumber = 0;
@@ -552,7 +552,7 @@ public async Task Then_Apprentices_Are_Sorted_By_Planned_End_Date(
         [Test, MoqAutoData]
         public async Task Then_Apprentices_Are_Sorted_By_Apprenticeship_Status(
             OrderedApprenticeshipSearchParameters searchParameters,
-            [Frozen] Mock<ICommitmentsReadOnlyDbContext> mockContext)
+            [Frozen] Mock<IProviderCommitmentsDbContext> mockContext)
         {
             //Arrange
             searchParameters.PageNumber = 0;
@@ -622,7 +622,7 @@ public async Task Then_Apprentices_Are_Sorted_By_Apprenticeship_Status(
         [Test, MoqAutoData]
         public async Task Then_Apprentices_Are_Sorted_By_Provider_Name(
             OrderedApprenticeshipSearchParameters searchParameters,
-            [Frozen] Mock<ICommitmentsReadOnlyDbContext> mockContext)
+            [Frozen] Mock<IProviderCommitmentsDbContext> mockContext)
         {
             //Arrange
             searchParameters.PageNumber = 0;
@@ -692,7 +692,7 @@ public async Task Then_Apprentices_Are_Sorted_By_Provider_Name(
         [Test, MoqAutoData]
         public async Task Then_Apprentices_Are_First_Sorted_By_Alerts(
             OrderedApprenticeshipSearchParameters searchParameters,
-            [Frozen] Mock<ICommitmentsReadOnlyDbContext> mockContext)
+            [Frozen] Mock<IProviderCommitmentsDbContext> mockContext)
         {
             //Arrange
             searchParameters.PageNumber = 0;
@@ -761,7 +761,7 @@ public async Task Then_Apprentices_Are_First_Sorted_By_Alerts(
         [Test, MoqAutoData]
         public async Task Then_Will_Return_Total_Apprenticeships_For_Provider(
             OrderedApprenticeshipSearchParameters searchParameters,
-            [Frozen] Mock<ICommitmentsReadOnlyDbContext> mockContext)
+            [Frozen] Mock<IProviderCommitmentsDbContext> mockContext)
         {
             searchParameters.ReverseSort = false;
             searchParameters.Filters = new ApprenticeshipSearchFilters();
@@ -788,7 +788,7 @@ public async Task Then_Will_Return_Total_Apprenticeships_For_Provider(
         [Test, MoqAutoData]
         public async Task Then_Will_Return_Total_Apprenticeships_For_Employer(
             OrderedApprenticeshipSearchParameters searchParameters,
-            [Frozen] Mock<ICommitmentsReadOnlyDbContext> mockContext)
+            [Frozen] Mock<IProviderCommitmentsDbContext> mockContext)
         {
             //Arrange
             searchParameters.FieldName = nameof(Apprenticeship.FirstName);
@@ -819,7 +819,7 @@ public async Task Then_Will_Return_Total_Apprenticeships_For_Employer(
         [Test, MoqAutoData]
         public async Task Then_Will_Return_Page_Number_Of_One_If_Only_Page(
             OrderedApprenticeshipSearchParameters searchParameters,
-            [Frozen] Mock<ICommitmentsReadOnlyDbContext> mockContext)
+            [Frozen] Mock<IProviderCommitmentsDbContext> mockContext)
         {
             //Arrange
             searchParameters.FieldName = nameof(Apprenticeship.FirstName);