CON-1214 Removed Levy and EOI check +semver: major

SkillsFundingAgency · Jan 10, 2020 · 23b8bfc · 23b8bfc
1 parent 834a137
commit 23b8bfc
Show file tree

Hide file tree

Showing 37 changed files with 0 additions and 1,203 deletions.
diff --git a/azure/template.json b/azure/template.json
@@ -92,7 +92,6 @@
     "Features": {
       "type": "object",
       "defaultValue": {
-        "AllowLevyPayingEmployersOnly": true,
         "SetNotificationPreferences": false
       }
     },
@@ -577,10 +576,6 @@
                 "name": "ExternalLinks:EmployerFavouritesUrl",
                 "value": "[parameters('ExternalLinks').EmployerFavouritesUrl]"
               },
-              {
-                "name": "Features:AllowLevyPayingEmployersOnly",
-                "value": "[parameters('Features').AllowLevyPayingEmployersOnly]"
-              },
               {
                 "name": "Features:SetNotificationPreferences",
                 "value": "[parameters('Features').SetNotificationPreferences]"

diff --git a/src/Employer/Employer.Web/Configuration/ConfigurationExtensions.cs b/src/Employer/Employer.Web/Configuration/ConfigurationExtensions.cs
@@ -79,8 +79,6 @@ public static void AddMvcService(this IServiceCollection services, IHostingEnvir
 
                 opts.Filters.Add(new AutoValidateAntiforgeryTokenAttribute());
 
-                opts.Filters.Add(typeof(EmployerAccessCheckFilter), 0);
-                
                 opts.Filters.AddService<PlannedOutageResultFilter>();
 
                 opts.AddTrimModelBinderProvider(loggerFactory);

diff --git a/src/Employer/Employer.Web/Configuration/CookieNames.cs b/src/Employer/Employer.Web/Configuration/CookieNames.cs
@@ -9,11 +9,8 @@ public static class CookieNames
         public const string SetupEmployer = "setup-employer-{0}";
         public const string VacancyProposedClosingDate = "vacancy-closingDate-{0}";
         public const string VacancyProposedStartDate = "vacancy-startDate-{0}";
-        public const string LevyEmployerIndicator = "recruit-levy";
-        public const string EmployerEoi = "recruit-eoi";
         public const string VacancyEmployerInfo = "vacancy-employer-info";
         public const string DashboardFilter = "dashboard-filter";
-        public const string EmployerAccountType = "employer-account-type";
         public const string HasSeenCloningMethodIsChangingMessage = "has-seen-cloning-method-is-changing-message";
     }
 }
diff --git a/src/Employer/Employer.Web/Configuration/DataProtectionPurposes.cs b/src/Employer/Employer.Web/Configuration/DataProtectionPurposes.cs
diff --git a/src/Employer/Employer.Web/Configuration/IoC.cs b/src/Employer/Employer.Web/Configuration/IoC.cs
@@ -63,9 +63,6 @@ private static void RegisterServiceDeps(IServiceCollection services, IConfigurat
             services.AddTransient<IGeocodeImageService>(_ => new GoogleMapsGeocodeImageService(configuration.GetValue<string>("GoogleMapsPrivateKey")));
             services.AddTransient<IReviewSummaryService, ReviewSummaryService>();
             services.AddTransient<ILegalEntityAgreementService, LegalEntityAgreementService>();
-            services.AddTransient<ILevyDeclarationCookieWriter, LevyDeclarationCookieWriter>();
-            services.AddTransient<IEoiAgreementCookieWriter, EoiAgreementCookieWriter>();
-            services.AddTransient<IEmployerAccountTypeCookieWriter, EmployerAccountTypeCookieWriter>();
             services.AddTransient<AlertViewModelService>();
             services.AddTransient<IEmployerAlertsViewModelFactory, EmployerAlertsViewModelFactory>();
         }
@@ -108,7 +105,6 @@ private static void RegisterOrchestratorDeps(IServiceCollection services)
             services.AddTransient<ApplicationReviewOrchestrator>();
             services.AddTransient<CreateVacancyOptionsOrchestrator>();
             services.AddTransient<EditVacancyDatesOrchestrator>();
-            services.AddTransient<LevyDeclarationOrchestrator>();
             services.AddTransient<ManageNotificationsOrchestrator>();
             services.AddTransient<DatesOrchestrator>();
             services.AddTransient<VacanciesSearchSuggestionsOrchestrator>();

diff --git a/src/Employer/Employer.Web/Configuration/Routing/RouteNames.cs b/src/Employer/Employer.Web/Configuration/Routing/RouteNames.cs
@@ -136,10 +136,6 @@ public static class RouteNames
         public const string SubmitVacancyChanges_Post = "SubmitVacancyChanges_Post";
         public const string CancelVacancyChanges_Get = "CancelVacancyChanges_Get";
 
-        public const string LevyDeclaration_Get = "LevyDeclaration_Get";
-        public const string LevyDeclaration_Post = "LevyDeclaration_Post";
-        public const string NonLevyInfo_Get = "NonLevyInfo_Get";
-
         public const string BlockedEmployer_Get = "BlockedEmployer_Get";
 
         public const string ManageNotifications_Get = "ManageNotifications_Get";

diff --git a/src/Employer/Employer.Web/Configuration/ViewNames.cs b/src/Employer/Employer.Web/Configuration/ViewNames.cs
@@ -20,7 +20,6 @@ public class ViewNames
 
         public const string AccessDenied = "AccessDenied";
         public const string PageNotFound = "PageNotFound";
-        public const string BlockedEmployer = "BlockedEmployer";
         public const string ApplicationWithdrawn = "ApplicationWithdrawn";
     }
 }
diff --git a/src/Employer/Employer.Web/Controllers/ErrorController.cs b/src/Employer/Employer.Web/Controllers/ErrorController.cs
@@ -92,11 +92,6 @@ public IActionResult ErrorHandler()
                     return AccessDenied();
                 }
 
-                if (exception is BlockedEmployerException)
-                {
-                    return RedirectToRoute(RouteNames.BlockedEmployer_Get, new { EmployerAccountId = employerAccountId });
-                }
-
                 if(exception is ApplicationWithdrawnException withdrawnException)
                 {
                     return ApplicationWithdrawn(employerAccountId.ToString(), withdrawnException);
@@ -134,15 +129,6 @@ private IActionResult ApplicationWithdrawn(string employerAccountId, Application
             return View(ViewNames.ApplicationWithdrawn, returnLink);
         }
 
-        // Blocked employer url required for analytics reasons
-        [HttpGet("error/blocked-employer/{employerAccountId}", Name = RouteNames.BlockedEmployer_Get)]
-        public IActionResult BlockedEmployer(string employerAccountId)
-        {
-            _logger.LogInformation($"Handling redirection of blocked employer: {employerAccountId}.");
-            Response.StatusCode = (int)HttpStatusCode.Unauthorized;
-            return View(ViewNames.BlockedEmployer);
-        }
-
         private void AddDashboardMessage(string message)
         {
             if(TempData.ContainsKey(TempDataKeys.DashboardErrorMessage))

diff --git a/src/Employer/Employer.Web/Controllers/LevyDeclarationController.cs b/src/Employer/Employer.Web/Controllers/LevyDeclarationController.cs
diff --git a/src/Employer/Employer.Web/Controllers/LogoutController.cs b/src/Employer/Employer.Web/Controllers/LogoutController.cs
@@ -2,34 +2,15 @@
 using Microsoft.AspNetCore.Mvc;
 using System.Threading.Tasks;
 using Esfa.Recruit.Employer.Web.Extensions;
-using Esfa.Recruit.Employer.Web.Services;
 
 namespace Esfa.Recruit.Employer.Web.Controllers
 {
     [Route(RoutePaths.Services)]
     public class LogoutController : Controller
     {
-        private readonly ILevyDeclarationCookieWriter _levyDeclarationCookieWriter;
-        private readonly IEoiAgreementCookieWriter _eoiAgreementCookieWriter;
-        private readonly IEmployerAccountTypeCookieWriter _employerAccountTypeCookieWriter;
-
-        public LogoutController(
-            ILevyDeclarationCookieWriter levyDeclarationCookieWriter,
-            IEoiAgreementCookieWriter eoiAgreementCookieWriter,
-            IEmployerAccountTypeCookieWriter employerAccountTypeCookieWriter)
-        {
-            _levyDeclarationCookieWriter = levyDeclarationCookieWriter;
-            _eoiAgreementCookieWriter = eoiAgreementCookieWriter;
-            _employerAccountTypeCookieWriter = employerAccountTypeCookieWriter;
-        }
-
         [HttpGet, Route("logout", Name = RouteNames.Logout_Get)]
         public async Task Logout()
         {
-            _levyDeclarationCookieWriter.DeleteCookie(Response);
-            _eoiAgreementCookieWriter.DeleteCookie(Response);
-            _employerAccountTypeCookieWriter.DeleteCookie(Response);
-
             await HttpContext.SignOutEmployerWebAsync();
         }
     }

diff --git a/src/Employer/Employer.Web/Exceptions/BlockedEmployerException.cs b/src/Employer/Employer.Web/Exceptions/BlockedEmployerException.cs