refactoring some names

DFE-Digital · Sep 1, 2023 · 169f0d9 · 169f0d9
1 parent f582219
commit 169f0d9
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 16 deletions.
diff --git a/...egration/GetProjectTaskSummaryApiTests.cs → ...ration/GetProjectByTaskSummaryApiTests.cs b/...egration/GetProjectTaskSummaryApiTests.cs → ...ration/GetProjectByTaskSummaryApiTests.cs
@@ -24,7 +24,7 @@ public async Task GetProjectTaskList_Returns_200()
             context.Kpi.Add(project);
             await context.SaveChangesAsync();
 
-            var taskListResponse = await _client.GetAsync($"/api/v1/client/projects/{project.ProjectStatusProjectId}/tasks/list/summary");
+            var taskListResponse = await _client.GetAsync($"/api/v1/client/projects/{project.ProjectStatusProjectId}/tasks/summary");
             taskListResponse.StatusCode.Should().Be(HttpStatusCode.OK);
 
             var content = await taskListResponse.Content.ReadFromJsonAsync<ApiSingleResponseV2<ProjectByTaskSummaryResponse>>();

diff --git a/.../Integration/UpdateProjectTaskApiTests.cs → ...ntegration/UpdateProjectByTaskApiTests.cs b/.../Integration/UpdateProjectTaskApiTests.cs → ...ntegration/UpdateProjectByTaskApiTests.cs
diff --git a/...eFreeSchoolProjects/Dfe.ManageFreeSchoolProjects.API/Controllers/ProjectTaskController.cs b/...eFreeSchoolProjects/Dfe.ManageFreeSchoolProjects.API/Controllers/ProjectTaskController.cs
@@ -10,12 +10,12 @@ namespace Dfe.ManageFreeSchoolProjects.API.Controllers
     [ApiController]
     public class ProjectTaskController : ControllerBase
     {
-        public readonly IUpdateProjectTaskService _updateProjectTaskService;
+        public readonly IUpdateProjectByTaskService _updateProjectTaskService;
         public readonly IGetProjectByTaskService _getProjectByTaskService;
         public readonly ILogger<ProjectTaskController> _logger;
 
         public ProjectTaskController(
-            IUpdateProjectTaskService updateProjectTaskService,
+            IUpdateProjectByTaskService updateProjectTaskService,
             IGetProjectByTaskService getProjectByTaskService,
             ILogger<ProjectTaskController> logger)
         {
@@ -47,7 +47,7 @@ public async Task<ActionResult<ApiSingleResponseV2<GetProjectByTaskResponse>>> G
         }
 
         [HttpGet]
-        [Route("list/summary")]
+        [Route("summary")]
         public ActionResult<ApiSingleResponseV2<ProjectByTaskSummaryResponse>> GetProjectTaskListSummary(string projectId)
         {
             _logger.LogMethodEntered();

diff --git a/...fe.ManageFreeSchoolProjects.API/StartupConfiguration/DependencyConfigurationExtensions.cs b/...fe.ManageFreeSchoolProjects.API/StartupConfiguration/DependencyConfigurationExtensions.cs
@@ -68,7 +68,7 @@ public static IServiceCollection AddApiDependencies(this IServiceCollection serv
 			services.AddScoped<ICreateProjectService, CreateProject>();
             services.AddScoped<ICreateUserService, CreateUserService>();
 			services.AddScoped<IGetProjectOverviewService, GetProjectOverviewService>();
-			services.AddScoped<IUpdateProjectTaskService, UpdateProjectTaskService>();
+			services.AddScoped<IUpdateProjectByTaskService, UpdateProjectByTaskService>();
             services.AddScoped<IGetProjectByTaskService, GetProjectByTaskService>();
 
             services.AddValidatorsFromAssembly(Assembly.Load(Assembly.GetExecutingAssembly().FullName));

diff --git a/...Project/Tasks/UpdateProjectTaskService.cs → ...oject/Tasks/UpdateProjectByTaskService.cs b/...Project/Tasks/UpdateProjectTaskService.cs → ...oject/Tasks/UpdateProjectByTaskService.cs
@@ -6,16 +6,16 @@
 
 namespace Dfe.ManageFreeSchoolProjects.API.UseCases.Project.Tasks
 {
-    public interface IUpdateProjectTaskService
+    public interface IUpdateProjectByTaskService
     {
         public Task Execute(string projectId, UpdateProjectByTaskRequest request);
     }
 
-    public class UpdateProjectTaskService : IUpdateProjectTaskService
+    public class UpdateProjectByTaskService : IUpdateProjectByTaskService
     {
         public readonly MfspContext _context;
 
-        public UpdateProjectTaskService(MfspContext context)
+        public UpdateProjectByTaskService(MfspContext context)
         {
             _context = context;
         }

diff --git a/...reeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Project/Create/Bulk/Create.cshtml.cs b/...reeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Project/Create/Bulk/Create.cshtml.cs
@@ -33,7 +33,7 @@ public IActionResult OnGet()
             return Page();
         }
 
-        public async System.Threading.Tasks.Task OnPostAsync()
+        public async Task<IActionResult> OnPostAsync()
         {
             using MemoryStream stream = new MemoryStream();
 
@@ -44,6 +44,8 @@ public async System.Threading.Tasks.Task OnPostAsync()
             RowErrors = _createBulkProjectValidator.Validate(projectTable);
 
             ProjectTable = projectTable;
+
+            return Page();
         }
     }
 }
diff --git a/...ageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Project/Tasks/TaskList.cshtml.cs b/...ageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Project/Tasks/TaskList.cshtml.cs
@@ -11,7 +11,7 @@ namespace Dfe.ManageFreeSchoolProjects.Pages.Project.Tasks
 {
     public class TaskListModel : PageModel
     {
-        private readonly IGetProjectTaskListSummaryService _getProjectTaskListSummaryService;
+        private readonly IGetProjectByTaskSummaryService _getProjectTaskListSummaryService;
         private readonly ILogger<TaskListModel> _logger;
 
         [BindProperty(SupportsGet = true, Name = "projectId")]
@@ -20,7 +20,7 @@ public class TaskListModel : PageModel
         public ProjectByTaskSummaryResponse ProjectTaskListSummary { get; set; }
 
         public TaskListModel(
-            IGetProjectTaskListSummaryService getProjectTaskListSummaryService,
+            IGetProjectByTaskSummaryService getProjectTaskListSummaryService,
             ILogger<TaskListModel> logger)
         {
             _getProjectTaskListSummaryService = getProjectTaskListSummaryService;

diff --git a/...oject/GetProjectTaskListSummaryService.cs → ...Project/GetProjectByTaskSummaryService.cs b/...oject/GetProjectTaskListSummaryService.cs → ...Project/GetProjectByTaskSummaryService.cs
@@ -4,23 +4,23 @@
 
 namespace Dfe.ManageFreeSchoolProjects.Services.Project
 {
-    public interface IGetProjectTaskListSummaryService
+    public interface IGetProjectByTaskSummaryService
     {
         public Task<ProjectByTaskSummaryResponse> Execute(string projectId);
     }
 
-    public class GetProjectTaskListSummaryService : IGetProjectTaskListSummaryService
+    public class GetProjectByTaskSummaryService : IGetProjectByTaskSummaryService
     {
         private readonly MfspApiClient _apiClient;
 
-        public GetProjectTaskListSummaryService(MfspApiClient apiClient)
+        public GetProjectByTaskSummaryService(MfspApiClient apiClient)
         {
             _apiClient = apiClient;
         }
 
         public async Task<ProjectByTaskSummaryResponse> Execute(string projectId)
         {
-            var endpoint = $"/api/v1/client/projects/{projectId}/tasks/list/summary";
+            var endpoint = $"/api/v1/client/projects/{projectId}/tasks/summary";
 
             var result = await _apiClient.Get<ApiSingleResponseV2<ProjectByTaskSummaryResponse>>(endpoint);
 

diff --git a/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Startup.cs b/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Startup.cs
@@ -74,7 +74,7 @@ public void ConfigureServices(IServiceCollection services)
         services.AddScoped<ICreateBulkProjectValidator, CreateBulkProjectValidator>();
         services.AddScoped<IGetProjectByTaskService, GetProjectByTaskService>();
         services.AddScoped<IUpdateProjectByTaskService, UpdateProjectByTaskService>();
-        services.AddScoped<IGetProjectTaskListSummaryService, GetProjectTaskListSummaryService>();
+        services.AddScoped<IGetProjectByTaskSummaryService, GetProjectByTaskSummaryService>();
 
         services.AddScoped(sp => sp.GetService<IHttpContextAccessor>()?.HttpContext?.Session);
         services.AddSession(options =>