Merge branch 'refs/heads/main' into feature/178419-ofsted-preregistra…

…tion-actualdate
DFE-Digital · Oct 3, 2024 · 5a48fc5 · 5a48fc5
2 parents 336f408 + 2594e6d
commit 5a48fc5
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 12 deletions.
diff --git a/...Dfe.ManageFreeSchoolProjects.API.Contracts/RequestModels/Projects/CreateProjectRequest.cs b/...Dfe.ManageFreeSchoolProjects.API.Contracts/RequestModels/Projects/CreateProjectRequest.cs
@@ -12,7 +12,6 @@ public class CreateProjectRequest
     public class ProjectDetails
     {
         public string ProjectId { get; set; }
-        public ProjectType ProjectType { get; set; }
         public string SchoolName { get; set; }
         public string Region { get; set; }
         public string LocalAuthority { get; set; }

diff --git a/...eSchoolProjects/Dfe.ManageFreeSchoolProjects.API/UseCases/Project/CreateProjectService.cs b/...eSchoolProjects/Dfe.ManageFreeSchoolProjects.API/UseCases/Project/CreateProjectService.cs
@@ -86,9 +86,7 @@ private static Kpi MapToKpi(ProjectDetails proj, string rid, Trust trust)
             return new Kpi
             {
                 Rid = rid,
-                ProjectStatusProjectStatus = proj.ProjectType == ProjectType.CentralRoute
-                    ? Contracts.Project.ProjectStatus.ApplicationStage.ToDescription()
-                    : Contracts.Project.ProjectStatus.Preopening.ToDescription(),
+                ProjectStatusProjectStatus = ProjectMapper.FromProjectStatusType(Contracts.Project.ProjectStatus.Preopening),
                 ProjectStatusProjectId = proj.ProjectId,
                 ProjectStatusCurrentFreeSchoolName = proj.SchoolName,
                 ProjectStatusFreeSchoolApplicationWave = proj.ApplicationWave ?? string.Empty,

diff --git a/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects.CypressTests/cypress/api/domain.ts b/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects.CypressTests/cypress/api/domain.ts
@@ -29,8 +29,7 @@ export type CreateProjectRequest = {
 export type ProjectDetailsRequest = {
     projectId: string;
     schoolName: string;
-    projectType: string;
-    applicationNumber: string;
+    applicationNumber?: string;
     applicationWave: string;
     region?: string;
     localAuthority?: string;

diff --git a/...reeSchoolProjects/Dfe.ManageFreeSchoolProjects.CypressTests/cypress/api/requestBuilder.ts b/...reeSchoolProjects/Dfe.ManageFreeSchoolProjects.CypressTests/cypress/api/requestBuilder.ts
@@ -1,4 +1,3 @@
-import { v4 } from "uuid";
 import { CreateProjectRiskRequest, ProjectDetailsRequest } from "./domain";
 import { EnvUsername } from "cypress/constants/cypressConstants";
 import dataGenerator from "cypress/fixtures/dataGenerator";
@@ -8,10 +7,8 @@ export class RequestBuilder {
     public static createNewProjectDetails(): ProjectDetailsRequest {
         const result: ProjectDetailsRequest =  {
             projectId: dataGenerator.generateTemporaryId(25),
-            applicationNumber: v4().substring(0, 9),
             createdBy: Cypress.env(EnvUsername),
             schoolName: dataGenerator.generateSchoolName(),
-            projectType: "Presumption",
             TRN: 'TR00111',
             applicationWave: "FS - Presumption",
             projectAssignedToName: "Test Person",
@@ -29,7 +26,7 @@ export class RequestBuilder {
     }
 
     public static createProjectDetailsCentralRoute(): ProjectDetailsRequest {
-        return {...this.createNewProjectDetails(), applicationWave: "Other Wave", projectType: "Central Route"};
+        return {...this.createNewProjectDetails(), applicationWave: "Other Wave", applicationNumber: dataGenerator.generateTemporaryId(5), projectType: "Central Route"};
     }
 
     public static CreateProjectRiskRequest(): CreateProjectRiskRequest {

diff --git a/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Dashboard/_Dashboard.cshtml b/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Dashboard/_Dashboard.cshtml
@@ -30,7 +30,7 @@
         <div class="dfe-card">
             <div class="dfe-card-container">
                 <h3 class="govuk-heading-m">
-                    <a href="@createNewProjectLink" class="govuk-link govuk-link--no-visited-state dfe-card-link--header">Create a project</a>
+                    <a href="@createNewProjectLink" id="create-project" class="govuk-link govuk-link--no-visited-state dfe-card-link--header">Create a project</a>
                 </h3>
                 <p>Add a presumption or central route project.</p>
             </div>

diff --git a/...s/Dfe.ManageFreeSchoolProjects/Pages/Project/Create/Individual/CheckYourAnswers.cshtml.cs b/...s/Dfe.ManageFreeSchoolProjects/Pages/Project/Create/Individual/CheckYourAnswers.cshtml.cs
@@ -43,7 +43,6 @@ public async Task<IActionResult> OnPostAsync()
             var projReq = new ProjectDetails
             {
                 ProjectId = project.ProjectId,
-                ProjectType = project.ProjectType,
                 SchoolName = project.SchoolName,
                 SchoolType = project.SchoolType,
                 SchoolPhase = project.SchoolPhase,

diff --git a/release-notes.md b/release-notes.md
@@ -1,11 +1,16 @@
+## 0.14.0
+* 177717 - Build: Create central route projects
+
 ## 0.13.0
 * 147110 - Build: Readiness to open meeting (ROM)
 * 179195 - Build: Show only statuses relevant to Presumption route
 * 147094 - Build: Pre-funding agreement checkpoint meeting (Central route)
 * 178584 - Build: Principal designate (both routes)
+* 178422 - Build: Principal designate forecast dates
 * 177522 - Build: Display the ‘Realistic Year of Opening’ field in the Dates section under Setting up section
 * 181651 - Build: update kick-off meeting task
 * 181679 - Build: add 'if applicable' to governance plan fields
+* 181647 - Build: Changes to task list including re-ordering
 
 ## 0.12.0
 * 175400 - Build: Update 'You do not have access to the service' page with access form link