Fixed duplicate code

Author: mshakirdfe

Dfe.Academies.Academisation.Service/Extensions/StringExtensions.cs

@@ -0,0 +1,17 @@
+namespace Dfe.Academies.Academisation.Service.Extensions;
+ 
+public static class StringExtensions
+{
+	public static (string? firstName, string? lastName) GetFirstAndLastName(this string? fullName)
+	{
+		if (string.IsNullOrWhiteSpace(fullName))
+			return (null, null);
+
+		string[] parts = fullName.Split(' ', StringSplitOptions.RemoveEmptyEntries);
+
+		string? firstName = parts.Length > 0 ? parts[0] : null;
+		string? lastName = parts.Length > 1 ? parts[1] : null;
+
+		return (firstName, lastName);
+	}
+}

Dfe.Academies.Academisation.Service/Mappers/CompleteProjects/CompleteConversionProjectServiceModelMapper.cs

@@ -1,4 +1,5 @@
 using Dfe.Academies.Academisation.IDomain.ProjectAggregate;
+using Dfe.Academies.Academisation.Service.Extensions;
 using Dfe.Complete.Client.Contracts;
 
 namespace Dfe.Academies.Academisation.Service.Mappers.CompleteProjects;
@@ -10,9 +11,7 @@ internal static CreateConversionProjectCommand FromDomain(IProject project, stri
 		var assignedUser = project.Details.AssignedUser;
 
 		string? fullName = assignedUser?.FullName;
-		string[] nameParts = fullName?
-			.Split(' ', StringSplitOptions.RemoveEmptyEntries)
-			?? [];
+		var (firstName, lastName) = fullName.GetFirstAndLastName();
 
 		return new CreateConversionProjectCommand
 		{
@@ -22,8 +21,8 @@ internal static CreateConversionProjectCommand FromDomain(IProject project, stri
 			ProvisionalConversionDate = project.Details.ProposedConversionDate,
 			DirectiveAcademyOrder = project.Details.AcademyTypeAndRoute?.Equals("Sponsored") ?? false,
 			CreatedByEmail = assignedUser?.EmailAddress,
-			CreatedByFirstName = nameParts.Length > 0 ? nameParts[0] : null,
-			CreatedByLastName = nameParts.Length > 1 ? nameParts[1] : null,
+			CreatedByFirstName = firstName,
+			CreatedByLastName = lastName,
 			PrepareId = project.Id,
 			GroupId = groupReferenceNumber,
 			IncomingTrustUkprn = project.Details.TrustUkprn
@@ -35,9 +34,7 @@ internal static CreateConversionMatProjectCommand FormAMatFromDomain(IProject pr
 		var assignedUser = project.Details.AssignedUser;
 
 		string? fullName = assignedUser?.FullName;
-		string[] nameParts = fullName?
-			.Split(' ', StringSplitOptions.RemoveEmptyEntries)
-			?? [];
+		var (firstName, lastName) = fullName.GetFirstAndLastName();
 		return new CreateConversionMatProjectCommand
 		{
 			Urn = project.Details.Urn,
@@ -46,8 +43,8 @@ internal static CreateConversionMatProjectCommand FormAMatFromDomain(IProject pr
 			ProvisionalConversionDate = project.Details.ProposedConversionDate,
 			DirectiveAcademyOrder = project.Details.AcademyTypeAndRoute?.Equals("Sponsored") ?? false,
 			CreatedByEmail = assignedUser?.EmailAddress,
-			CreatedByFirstName = nameParts.Length > 0 ? nameParts[0] : null,
-			CreatedByLastName = nameParts.Length > 1 ? nameParts[1] : null,
+			CreatedByFirstName = firstName,
+			CreatedByLastName = lastName,
 			PrepareId = project.Id,
 			NewTrustName = project.Details.NameOfTrust,
 			NewTrustReferenceNumber = project.Details.TrustReferenceNumber,

Dfe.Academies.Academisation.Service/Mappers/CompleteProjects/CompleteTransferProjectServiceModelMapper.cs

@@ -1,4 +1,5 @@
 using Dfe.Academies.Academisation.IDomain.TransferProjectAggregate;
+using Dfe.Academies.Academisation.Service.Extensions;
 using Dfe.Complete.Client.Contracts;
 
 namespace Dfe.Academies.Academisation.Service.Mappers.CompleteProjects;
@@ -22,9 +23,7 @@ internal static CreateTransferProjectCommand FromDomain(ITransferProject project
 		                                               project.SpecificReasonsForTransfer.Contains("TrustClosed");
 
 		string? fullName = project.AssignedUserFullName ?? null;
-		string[] nameParts = fullName?
-			.Split(' ', StringSplitOptions.RemoveEmptyEntries)
-			?? [];
+		var (firstName, lastName) = fullName.GetFirstAndLastName();
 
 		return new CreateTransferProjectCommand
 		{
@@ -36,8 +35,8 @@ internal static CreateTransferProjectCommand FromDomain(ITransferProject project
 			FinancialSafeguardingGovernanceIssues = financialSafeGuardingOrGovernanceIssues,
 			OutgoingTrustToClose = outGoingTrustToClose,
 			CreatedByEmail = project.AssignedUserEmailAddress,
-			CreatedByFirstName = nameParts.Length > 0 ? nameParts[0] : null,
-			CreatedByLastName = nameParts.Length > 1 ? nameParts[1] : null,
+			CreatedByFirstName = firstName,
+			CreatedByLastName = lastName,
 			IncomingTrustUkprn = int.Parse(incomingTrustUkprn),
 			OutgoingTrustUkprn = int.Parse(project.OutgoingTrustUkprn),
 			PrepareId = project.Id
@@ -59,10 +58,7 @@ internal static CreateTransferMatProjectCommand FormAMatFromDomain(ITransferProj
 													   project.SpecificReasonsForTransfer.Contains("Safeguarding") ||
 													   project.SpecificReasonsForTransfer.Contains("TrustClosed");
 
-		string? fullName = project.AssignedUserFullName ?? null;
-		string[] nameParts = fullName?
-			.Split(' ', StringSplitOptions.RemoveEmptyEntries)
-			?? []; 
+		var (firstName, lastName) = project.AssignedUserFullName.GetFirstAndLastName(); 
 
 		return new CreateTransferMatProjectCommand
 		{
@@ -74,8 +70,8 @@ internal static CreateTransferMatProjectCommand FormAMatFromDomain(ITransferProj
 			  FinancialSafeguardingGovernanceIssues = financialSafeGuardingOrGovernanceIssues,
 			  OutgoingTrustToClose = outGoingTrustToClose,
 			  CreatedByEmail = project.AssignedUserEmailAddress,
-			  CreatedByFirstName = nameParts.Length > 0 ? nameParts[0] : null,
-			  CreatedByLastName = nameParts.Length > 1 ? nameParts[1] : null,
+			  CreatedByFirstName = firstName,
+			  CreatedByLastName = lastName,
 			  OutgoingTrustUkprn = int.Parse(project.OutgoingTrustUkprn),
 			  PrepareId = project.Id,
 			  NewTrustReferenceNumber = project.IncomingTrustReferenceNumber,