Merge pull request #274 from DFE-Digital/132060-opening-date-removal-…

…of-field

removal of opening date field

Dfe.Academies.Academisation.Data/Migrations/20230622142127_Remove_OpeningDate_Field.cs

@@ -0,0 +1,31 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Dfe.Academies.Academisation.Data.Migrations
+{
+    /// <inheritdoc />
+    public partial class Remove_OpeningDate_Field : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "OpeningDate",
+                schema: "academisation",
+                table: "Project");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<DateTime>(
+                name: "OpeningDate",
+                schema: "academisation",
+                table: "Project",
+                type: "datetime2",
+                nullable: true);
+        }
+    }
+}

Dfe.Academies.Academisation.Data/Migrations/AcademisationContextModelSnapshot.cs

@@ -316,9 +316,6 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<string>("NameOfTrust")
                         .HasColumnType("nvarchar(max)");
 
-                    b.Property<DateTime?>("OpeningDate")
-                        .HasColumnType("datetime2");
-
                     b.Property<string>("PartOfPfiScheme")
                         .HasColumnType("nvarchar(max)");
 

Dfe.Academies.Academisation.Data/ProjectAggregate/ProjectState.cs

@@ -18,7 +18,6 @@ public class ProjectState : BaseEntity
 	public DateTime? ApplicationReceivedDate { get; set; }
 	public DateTime? AssignedDate { get; set; }
 	public DateTime? HeadTeacherBoardDate { get; set; }
-	public DateTime? OpeningDate { get; set; }
 	public DateTime? BaselineDate { get; set; }
 
 	//la summary page
@@ -138,8 +137,7 @@ public Project MapToDomain()
 			ProjectStatus = ProjectStatus,
 			ApplicationReceivedDate = ApplicationReceivedDate,
 			AssignedDate = AssignedDate,
-			HeadTeacherBoardDate = HeadTeacherBoardDate,
-			OpeningDate = OpeningDate,
+			HeadTeacherBoardDate = HeadTeacherBoardDate,			
 			BaselineDate = BaselineDate,
 
 			// la summary page
@@ -266,7 +264,6 @@ public static ProjectState MapFromDomain(IProject project)
 			ApplicationReceivedDate = project.Details.ApplicationReceivedDate,
 			AssignedDate = project.Details.AssignedDate,
 			HeadTeacherBoardDate = project.Details.HeadTeacherBoardDate,
-			OpeningDate = project.Details.OpeningDate,
 			BaselineDate = project.Details.BaselineDate,
 
 			// la summary page

Dfe.Academies.Academisation.Domain.Core/ProjectAggregate/ProjectDetails.cs

@@ -17,7 +17,6 @@ public sealed class ProjectDetails : IEquatable<ProjectDetails>
 	public DateTime? ApplicationReceivedDate { get; init; }
 	public DateTime? AssignedDate { get; init; }
 	public DateTime? HeadTeacherBoardDate { get; init; }
-	public DateTime? OpeningDate { get; init; }
 	public DateTime? BaselineDate { get; init; }
 	public DateTime? LocalAuthorityInformationTemplateSentDate { get; init; }
 	public DateTime? LocalAuthorityInformationTemplateReturnedDate { get; init; }
@@ -119,7 +118,7 @@ public bool Equals(ProjectDetails? other)
 			   Nullable.Equals(ApplicationReceivedDate, other.ApplicationReceivedDate) &&
 			   Nullable.Equals(AssignedDate, other.AssignedDate) &&
 			   Nullable.Equals(HeadTeacherBoardDate, other.HeadTeacherBoardDate) &&
-			   Nullable.Equals(OpeningDate, other.OpeningDate) && Nullable.Equals(BaselineDate, other.BaselineDate) &&
+			   Nullable.Equals(ProposedAcademyOpeningDate, other.ProposedAcademyOpeningDate) && Nullable.Equals(BaselineDate, other.BaselineDate) &&
 			   Nullable.Equals(LocalAuthorityInformationTemplateSentDate,
 				   other.LocalAuthorityInformationTemplateSentDate) &&
 			   Nullable.Equals(LocalAuthorityInformationTemplateReturnedDate,
@@ -249,7 +248,7 @@ public override int GetHashCode()
 		hashCode.Add(ApplicationReceivedDate);
 		hashCode.Add(AssignedDate);
 		hashCode.Add(HeadTeacherBoardDate);
-		hashCode.Add(OpeningDate);
+		hashCode.Add(ProposedAcademyOpeningDate);
 		hashCode.Add(BaselineDate);
 		hashCode.Add(LocalAuthorityInformationTemplateSentDate);
 		hashCode.Add(Form7Received, StringComparer.InvariantCultureIgnoreCase);

Dfe.Academies.Academisation.Domain.Core/ProjectAggregate/SponsoredProject.cs

@@ -2,5 +2,5 @@
 {
 	public record SponsoredProject(SponsoredProjectSchool? School, SponsoredProjectTrust? Trust);
 	public record SponsoredProjectTrust(string Name, string ReferenceNumber);
-	public record SponsoredProjectSchool(string Name, int Urn, DateTime? OpeningDate, bool? PartOfPfiScheme, string? LocalAuthorityName, string? Region);
+	public record SponsoredProjectSchool(string Name, int Urn, DateTime? ProposedAcademyOpeningDate, bool? PartOfPfiScheme, string? LocalAuthorityName, string? Region);
 }

Dfe.Academies.Academisation.Domain.UnitTest/ProjectAggregate/ProjectCreateTests.cs

@@ -139,7 +139,6 @@ public void Create_JoinAMatApplicationType___ReturnsCreateSuccessResult()
 			() => Assert.Equal($"A2B_{application.ApplicationId}", project.Details.ApplicationReferenceNumber),
 			() => Assert.Equal("Converter Pre-AO (C)", project.Details.ProjectStatus),
 			() => Assert.Equal(application.ApplicationSubmittedDate, project.Details.ApplicationReceivedDate),
-			() => Assert.Equal(DateTime.Today.AddMonths(6), project.Details.OpeningDate),
 			() => Assert.Equal(application.JoinTrust?.TrustReference, project.Details.TrustReferenceNumber),
 			() => Assert.Equal(application.JoinTrust?.TrustName, project.Details.NameOfTrust),
 			() => Assert.Equal("Converter", project.Details.AcademyTypeAndRoute),

Dfe.Academies.Academisation.Domain/ProjectAggregate/Project.cs

@@ -46,8 +46,7 @@ public static CreateResult Create(IApplication application)
 			SchoolName = school.SchoolName,
 			ApplicationReferenceNumber = $"A2B_{application.ApplicationId}",
 			ProjectStatus = "Converter Pre-AO (C)",
-			ApplicationReceivedDate = application.ApplicationSubmittedDate,
-			OpeningDate = DateTime.Today.AddMonths(6),
+			ApplicationReceivedDate = application.ApplicationSubmittedDate,			
 			TrustReferenceNumber = application.JoinTrust?.TrustReference,
 			NameOfTrust = application.JoinTrust?.TrustName,
 			AcademyTypeAndRoute = "Converter",
@@ -88,8 +87,7 @@ public static CreateResult CreateFormAMat(IApplication application)
 				SchoolName = school.Details.SchoolName,
 				ApplicationReferenceNumber = $"A2B_{application.ApplicationId}",
 				ProjectStatus = "Converter Pre-AO (C)",
-				ApplicationReceivedDate = application.ApplicationSubmittedDate,
-				OpeningDate = DateTime.Today.AddMonths(6),
+				ApplicationReceivedDate = application.ApplicationSubmittedDate,				
 				NameOfTrust = application.FormTrust?.TrustDetails.FormTrustProposedNameOfTrust,
 				AcademyTypeAndRoute = "Form a Mat",
 				ProposedAcademyOpeningDate = school.Details.ConversionTargetDate,
@@ -138,7 +136,6 @@ public static CreateResult CreateSponsoredProject(SponsoredProject project)
 			Urn = project.School.Urn,
 			SchoolName = project.School?.Name,
 			ProjectStatus = "Converter Pre-AO (C)",
-			OpeningDate = DateTime.Today.AddMonths(6),
 			TrustReferenceNumber = project.Trust?.ReferenceNumber,
 			NameOfTrust = project.Trust?.Name,
 			AcademyTypeAndRoute = "Sponsored",
@@ -171,8 +168,7 @@ public CommandResult Update(ProjectDetails detailsToUpdate)
 			ProjectStatus = detailsToUpdate.ProjectStatus,
 			ApplicationReceivedDate = detailsToUpdate.ApplicationReceivedDate,
 			AssignedDate = detailsToUpdate.AssignedDate,
-			HeadTeacherBoardDate = detailsToUpdate.HeadTeacherBoardDate,
-			OpeningDate = detailsToUpdate.OpeningDate,
+			HeadTeacherBoardDate = detailsToUpdate.HeadTeacherBoardDate,			
 			BaselineDate = detailsToUpdate.BaselineDate,
 
 			// la summary page

Dfe.Academies.Academisation.IService/ServiceModels/Legacy/ProjectAggregate/LegacyProjectServiceModel.cs

@@ -21,7 +21,6 @@ public LegacyProjectServiceModel(int id, int urn)
 		public DateTime? ApplicationReceivedDate { get; init; }
 		public DateTime? AssignedDate { get; init; }
 		public DateTime? HeadTeacherBoardDate { get; init; }
-		public DateTime? OpeningDate { get; init; }
 		public DateTime? BaselineDate { get; init; }
 		public DateTime? LocalAuthorityInformationTemplateSentDate { get; init; }
 		public DateTime? LocalAuthorityInformationTemplateReturnedDate { get; init; }
@@ -123,7 +122,6 @@ public bool Equals(LegacyProjectServiceModel? other)
 				   Nullable.Equals(ApplicationReceivedDate, other.ApplicationReceivedDate) &&
 				   Nullable.Equals(AssignedDate, other.AssignedDate) &&
 				   Nullable.Equals(HeadTeacherBoardDate, other.HeadTeacherBoardDate) &&
-				   Nullable.Equals(OpeningDate, other.OpeningDate) &&
 				   Nullable.Equals(BaselineDate, other.BaselineDate) &&
 				   Nullable.Equals(LocalAuthorityInformationTemplateSentDate,
 					   other.LocalAuthorityInformationTemplateSentDate) &&
@@ -259,7 +257,6 @@ public override int GetHashCode()
 			hashCode.Add(ApplicationReceivedDate);
 			hashCode.Add(AssignedDate);
 			hashCode.Add(HeadTeacherBoardDate);
-			hashCode.Add(OpeningDate);
 			hashCode.Add(BaselineDate);
 			hashCode.Add(LocalAuthorityInformationTemplateSentDate);
 			hashCode.Add(LocalAuthorityInformationTemplateReturnedDate);

Dfe.Academies.Academisation.IService/ServiceModels/Legacy/ProjectAggregate/SponsoredProjectServiceModel.cs

@@ -16,7 +16,7 @@ public class SponsoredProjectSchoolServiceModel
 	{
 		public string? Name { get; init; }
 		public int Urn { get; init; }
-		public DateTime OpeningDate { get; init; }
+		public DateTime ProposedAcademyOpeningDate { get; init; }
 		public bool PartOfPfiScheme { get; init; }
 		public string? LocalAuthorityName { get; init; }
 		public string? Region{ get; init; }

Dfe.Academies.Academisation.Service/Mappers/Legacy/ProjectAggregate/LegacyProjectDetailsMapper.cs

@@ -25,7 +25,6 @@ internal static ProjectDetails MapNonEmptyFields(this LegacyProjectServiceModel
 			ApplicationReceivedDate = detailsToUpdate.ApplicationReceivedDate ?? existingProject.Details.ApplicationReceivedDate,
 			AssignedDate = detailsToUpdate.AssignedDate ?? existingProject.Details.AssignedDate,
 			HeadTeacherBoardDate = detailsToUpdate.HeadTeacherBoardDate.Equals(default(DateTime)) ? null : detailsToUpdate.HeadTeacherBoardDate ?? existingProject.Details.HeadTeacherBoardDate,
-			OpeningDate = detailsToUpdate.OpeningDate ?? existingProject.Details.OpeningDate,
 			BaselineDate = detailsToUpdate.BaselineDate ?? existingProject.Details.BaselineDate,
 
 			// la summary page

Dfe.Academies.Academisation.Service/Mappers/Legacy/ProjectAggregate/LegacyProjectServiceModelMapper.cs

@@ -20,7 +20,6 @@ internal static LegacyProjectServiceModel MapToServiceModel(this IProject projec
 			ApplicationReceivedDate = project.Details.ApplicationReceivedDate,
 			AssignedDate = project.Details.AssignedDate,
 			HeadTeacherBoardDate = project.Details.HeadTeacherBoardDate,
-			OpeningDate = project.Details.OpeningDate,
 			BaselineDate = project.Details.BaselineDate,
 
 			// la summary page

Dfe.Academies.Academisation.SubcutaneousTest/ApplicationAggregate/ApplicationSubmitTests.cs

@@ -218,7 +218,6 @@ private static void AssertProject(ApplicationSchoolServiceModel school, LegacyPr
 	{
 		Assert.Multiple(
 		() => Assert.Equal("Converter Pre-AO (C)", project.ProjectStatus),
-		() => Assert.Equal(DateTime.Today.AddMonths(6), project.OpeningDate),
 		() => Assert.Equal(type, project.AcademyTypeAndRoute),
 		() => Assert.Equal(school.SchoolConversionTargetDate, project.ProposedAcademyOpeningDate),
 		() => Assert.Equal(25000.0m, project.ConversionSupportGrantAmount),

Dfe.Academies.Academisation.WebApi.UnitTest/AutoMapper/AutoMapperSetupTests.cs

@@ -57,6 +57,7 @@ public void CanMap_JoinTrust_MapFromDomainToServiceModel()
 
 			// Assert
 			Assert.NotNull(result);
+
 			result.Should().BeEquivalentTo(joinTrustDomainObj);
 		}
 

release-notes.md

@@ -1,4 +1,5 @@
 ## 9.0.1
+* Fixed Bug 132060 : Added Migration to remove the 'Opening Date' field from projects. The 'ProposedAcademyOpeningDate' field will now be used throughout the api.
 * Added migration to change projects with status of "APPROVED WITH CONDITIONS" to "Approved with conditions"
 
 ---