make incomingTrustName nullable

Dfe.Academies.Academisation.Data/Migrations/20240412110945_nullableIncomingTrustName.cs

@@ -0,0 +1,38 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Dfe.Academies.Academisation.Data.Migrations
+{
+    /// <inheritdoc />
+    public partial class nullableIncomingTrustName : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<string>(
+                name: "IncomingTrustName",
+                schema: "academisation",
+                table: "TransferringAcademy",
+                type: "nvarchar(max)",
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "nvarchar(max)");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<string>(
+                name: "IncomingTrustName",
+                schema: "academisation",
+                table: "TransferringAcademy",
+                type: "nvarchar(max)",
+                nullable: false,
+                defaultValue: "",
+                oldClrType: typeof(string),
+                oldType: "nvarchar(max)",
+                oldNullable: true);
+        }
+    }
+}

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

@@ -825,7 +825,6 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
 
                     b.Property<string>("IncomingTrustName")
-                        .IsRequired()
                         .HasColumnType("nvarchar(max)");
 
                     b.Property<string>("IncomingTrustUkprn")

Dfe.Academies.Academisation.Domain.UnitTest/TransferProjectAggregate/TransferProjectTests.cs

@@ -257,7 +257,7 @@ private static TransferProject CreateValidTransferProject()
 
 		[Theory]
 		[ClassData(typeof(CreationArgumentExceptionTestData))]
-		public void CreateTransferProject_WithTestData_ThrowsArgumentExceptions(string outgoingTrustUkprn, string outgoingTrustName, string incomingTrustUkprn, string incomingTrustName, List<string> academyUkprns, DateTime createdOn, Type exType)
+		public void CreateTransferProject_WithTestData_ThrowsArgumentExceptions(string outgoingTrustUkprn, string outgoingTrustName, string? incomingTrustUkprn, string? incomingTrustName, List<string> academyUkprns, DateTime createdOn, Type exType)
 		{
 			// Arrange      
 			dynamic exception;

Dfe.Academies.Academisation.Domain/TransferProjectAggregate/TransferProject.cs

@@ -8,7 +8,7 @@ namespace Dfe.Academies.Academisation.Domain.TransferProjectAggregate
 {
 	public class TransferProject : ITransferProject, IAggregateRoot
 	{
-		private TransferProject(string outgoingTrustUkprn, string outgoingTrustName, string? incomingTrustUkprn, string incomingTrustName, List<string> academyUkprns)
+		private TransferProject(string outgoingTrustUkprn, string outgoingTrustName, string? incomingTrustUkprn, string? incomingTrustName, List<string> academyUkprns)
 		{
 			_intendedTransferBenefits =
 				new List<IntendedTransferBenefit>();
@@ -196,11 +196,11 @@ public void SetStatus(string status)
 			Status = status;
 		}
 
-		public static TransferProject Create(string outgoingTrustUkprn, string outgoingTrustName, string? incomingTrustUkprn, string incomingTrustName, List<string> academyUkprns, DateTime createdOn)
+		public static TransferProject Create(string outgoingTrustUkprn, string outgoingTrustName, string? incomingTrustUkprn, string? incomingTrustName, List<string> academyUkprns, DateTime createdOn)
 		{
 			Guard.Against.NullOrEmpty(outgoingTrustUkprn);
 			Guard.Against.NullOrEmpty(outgoingTrustName);
-			Guard.Against.NullOrEmpty(incomingTrustName);
+			//Guard.Against.NullOrEmpty(incomingTrustName);
 			Guard.Against.NullOrEmpty(academyUkprns);
 			Guard.Against.OutOfSQLDateRange(createdOn);
 

Dfe.Academies.Academisation.Domain/TransferProjectAggregate/TransferringAcademy.cs

@@ -10,7 +10,7 @@ namespace Dfe.Academies.Academisation.Domain.TransferProjectAggregate
 {
 	public class TransferringAcademy : ITransferringAcademy
 	{
-		public TransferringAcademy(string? incomingTrustUkprn, string incomingTrustName, string outgoingAcademyUkprn)
+		public TransferringAcademy(string? incomingTrustUkprn, string? incomingTrustName, string outgoingAcademyUkprn)
 		{
 			IncomingTrustUkprn = incomingTrustUkprn;
 			IncomingTrustName = incomingTrustName;	
@@ -21,7 +21,7 @@ public TransferringAcademy(string? incomingTrustUkprn, string incomingTrustName,
 		public int TransferProjectId { get; private set; }
 		public string OutgoingAcademyUkprn { get; private set; }
 		public string? IncomingTrustUkprn { get; private set; }
-		public string IncomingTrustName { get; private set; }
+		public string? IncomingTrustName { get; private set; }
 
 		public string? PupilNumbersAdditionalInformation { get; private set; }
 		public string? LatestOfstedReportAdditionalInformation { get; private set; }

Dfe.Academies.Academisation.Service/Commands/TransferProject/CreateTransferProjectCommand.cs

@@ -6,7 +6,7 @@ namespace Dfe.Academies.Academisation.Service.Commands.TransferProject;
 public class CreateTransferProjectCommand : IRequest<CreateResult>
 {
 
-	public CreateTransferProjectCommand(string outgoingTrustUkprn, string outgoingTrustName, string? incomingTrustUkprn, string incomingTrustName, List<string> transferringAcademyUkprns)
+	public CreateTransferProjectCommand(string outgoingTrustUkprn, string outgoingTrustName, string? incomingTrustUkprn, string? incomingTrustName, List<string> transferringAcademyUkprns)
 	{
 		OutgoingTrustUkprn = outgoingTrustUkprn;
 		OutgoingTrustName = outgoingTrustName;
@@ -19,5 +19,5 @@ public CreateTransferProjectCommand(string outgoingTrustUkprn, string outgoingTr
 	public string OutgoingTrustUkprn { get; set; }
 	public string? IncomingTrustUkprn { get; set; }
 	public string OutgoingTrustName { get; set; }
-	public string IncomingTrustName { get; set; }
+	public string? IncomingTrustName { get; set; }
 }

Dfe.Academies.Academisation.Service/Queries/TransferProjectQueryService.cs

@@ -48,12 +48,11 @@ public async Task<PagedResultResponse<AcademyTransferProjectSummaryResponse>> Ge
 			IEnumerable<AcademyTransferProjectSummaryResponse> projects =
 				FilterByIncomingTrust(title, AcademyTransferProjectSummaryResponse(transferProjects));
 
-			// remove any projects without an incoming or outgoing trust.
+			// remove any projects without an outgoing trust.
 			projects = projects
 			.Where(p =>
-				!string.IsNullOrEmpty(p.OutgoingTrustUkprn) && !string.IsNullOrEmpty(p.OutgoingTrustName) &&
-				// just filtered out by incoming trust name now to allow for form a mat
-				!p.TransferringAcademies.Any(ta => string.IsNullOrEmpty(ta.IncomingTrustName))).ToList();
+				!string.IsNullOrEmpty(p.OutgoingTrustUkprn) && !string.IsNullOrEmpty(p.OutgoingTrustName) 
+				).ToList();
 
 			var recordTotal = projects.Count();
 
@@ -70,12 +69,10 @@ public async Task<PagedResultResponse<ExportedTransferProjectModel>> GetExported
 			transferProjects =
 				FilterExportedTransferProjectsByIncomingTrust(title, transferProjects);
 
-			// remove any projects without an incoming or outgoing trust.
+			// remove any projects without an outgoing trust.
 			transferProjects = transferProjects
 			.Where(p =>
-				!string.IsNullOrEmpty(p.OutgoingTrustUkprn) && !string.IsNullOrEmpty(p.OutgoingTrustName) &&
-				// just filtered out by incoming trust name now to allow for form a mat
-				!p.TransferringAcademies.Any(ta => string.IsNullOrEmpty(ta.IncomingTrustName))).ToList();
+				!string.IsNullOrEmpty(p.OutgoingTrustUkprn) && !string.IsNullOrEmpty(p.OutgoingTrustName)).ToList(); 
 
 			var projects = await MapExportedTransferProjectModel(transferProjects);