Merge pull request #252 from DFE-Digital/123779-telephone-numbers-rem…

…oval-from-contact-page telephone fields removed
DFE-Digital · May 11, 2023 · a9704b1 · a9704b1
2 parents 31de8aa + 7f281a4
commit a9704b1
Show file tree

Hide file tree

Showing 10 changed files with 1,530 additions and 52 deletions.
diff --git a/...ies.Academisation.Data.UnitTest/ApplicationAggregate/ApplicationUpdateDataCommandTests.cs b/...ies.Academisation.Data.UnitTest/ApplicationAggregate/ApplicationUpdateDataCommandTests.cs
@@ -206,10 +206,10 @@ public async Task RecordAlreadyExists_SchoolAdded___AddedSchoolPersisted()
 			ms.FoundationConsentFolderIdentifier, ms.ExemptionEndDate, ms.MainFeederSchools, ms.ResolutionConsentFolderIdentifier, ms.ProtectedCharacteristics, ms.FurtherInformation,
 			new SchoolDetails(ms.Details.Urn, ms.Details.ProposedNewSchoolName!, ms.Details.LandAndBuildings,
 				ms.Details.PreviousFinancialYear, ms.Details.CurrentFinancialYear, ms.Details.NextFinancialYear,
-				ms.Details.ContactHeadName, $"{ms.Details.ContactHeadEmail}@test.com", ms.Details.ContactHeadTel,
-				ms.Details.ContactChairName, $"{ms.Details.ContactChairEmail}@test.com", ms.Details.ContactChairTel,
+				ms.Details.ContactHeadName, $"{ms.Details.ContactHeadEmail}@test.com",
+				ms.Details.ContactChairName, $"{ms.Details.ContactChairEmail}@test.com",
 				ms.Details.ContactRole, ms.Details.MainContactOtherName, $"{ms.Details.MainContactOtherEmail}@test.com",
-				ms.Details.MainContactOtherTelephone, ms.Details.MainContactOtherRole,
+		        ms.Details.MainContactOtherRole,
 				ms.Details.ApproverContactName, $"{ms.Details.ApproverContactEmail}@test.com",
 				ms.Details.ConversionTargetDateSpecified, ms.Details.ConversionTargetDate,
 				ms.Details.ConversionTargetDateExplained, ms.Details.ConversionChangeNamePlanned,

diff --git a/Dfe.Academies.Academisation.Data.UnitTest/Contexts/TestApplicationContext.cs b/Dfe.Academies.Academisation.Data.UnitTest/Contexts/TestApplicationContext.cs
@@ -50,10 +50,10 @@ private Application BuildApplication(ApplicationStatus applicationStatus, int nu
 				ms.FoundationConsentFolderIdentifier, ms.ExemptionEndDate, ms.MainFeederSchools, ms.ResolutionConsentFolderIdentifier, ms.ProtectedCharacteristics, ms.FurtherInformation, 
 				new SchoolDetails(ms.Details.Urn, ms.Details.ProposedNewSchoolName!, ms.Details.LandAndBuildings,
 					ms.Details.PreviousFinancialYear, ms.Details.CurrentFinancialYear, ms.Details.NextFinancialYear,
-					ms.Details.ContactHeadName, $"{ms.Details.ContactHeadEmail}@test.com", ms.Details.ContactHeadTel,
-					ms.Details.ContactChairName, $"{ms.Details.ContactChairEmail}@test.com", ms.Details.ContactChairTel,
+					ms.Details.ContactHeadName, $"{ms.Details.ContactHeadEmail}@test.com", 
+					ms.Details.ContactChairName, $"{ms.Details.ContactChairEmail}@test.com",
 					ms.Details.ContactRole, ms.Details.MainContactOtherName, $"{ms.Details.MainContactOtherEmail}@test.com",
-					ms.Details.MainContactOtherTelephone, ms.Details.MainContactOtherRole,
+					ms.Details.MainContactOtherRole,
 					ms.Details.ApproverContactName, $"{ms.Details.ApproverContactEmail}@test.com",
 					ms.Details.ConversionTargetDateSpecified, ms.Details.ConversionTargetDate,
 					ms.Details.ConversionTargetDateExplained, ms.Details.ConversionChangeNamePlanned,

diff --git a/Dfe.Academies.Academisation.Data/AcademisationContext.cs b/Dfe.Academies.Academisation.Data/AcademisationContext.cs
@@ -262,10 +262,8 @@ void ConfigureSchool(EntityTypeBuilder<School> schoolConfiguration)
 			sd.Property(d => d.ConfirmPaySupportGrantToSchool).HasColumnName("ConfirmPaySupportGrantToSchool");
 			sd.Property(d => d.ContactChairEmail).HasColumnName("ContactChairEmail");
 			sd.Property(d => d.ContactChairName).HasColumnName("ContactChairName");
-			sd.Property(d => d.ContactChairTel).HasColumnName("ContactChairTel");
 			sd.Property(d => d.ContactHeadEmail).HasColumnName("ContactHeadEmail");
 			sd.Property(d => d.ContactHeadName).HasColumnName("ContactHeadName");
-			sd.Property(d => d.ContactHeadTel).HasColumnName("ContactHeadTel");
 			sd.Property(d => d.ContactRole).HasColumnName("ContactRole");
 			sd.Property(d => d.ConversionChangeNamePlanned).HasColumnName("ConversionChangeNamePlanned");
 			sd.Property(d => d.ConversionTargetDate).HasColumnName("ConversionTargetDate");
@@ -287,7 +285,6 @@ void ConfigureSchool(EntityTypeBuilder<School> schoolConfiguration)
 			sd.Property(d => d.MainContactOtherEmail).HasColumnName("MainContactOtherEmail");
 			sd.Property(d => d.MainContactOtherName).HasColumnName("MainContactOtherName");
 			sd.Property(d => d.MainContactOtherRole).HasColumnName("MainContactOtherRole");
-			sd.Property(d => d.MainContactOtherTelephone).HasColumnName("MainContactOtherTelephone");
 
 			sd.Property(d => d.ProjectedPupilNumbersYear1).HasColumnName("ProjectedPupilNumbersYear1");
 			sd.Property(d => d.ProjectedPupilNumbersYear2).HasColumnName("ProjectedPupilNumbersYear2");