Merge pull request #171 from DFE-Digital/110289-DataConversionNewDbCols

110289 data conversion new db cols
DFE-Digital · Dec 6, 2022 · 96138fa · 96138fa
2 parents 058d73d + 5dd8476
commit 96138fa
Show file tree

Hide file tree

Showing 15 changed files with 1,305 additions and 34 deletions.
diff --git a/Dfe.Academies.Academisation.Data/ApplicationAggregate/ApplicationSchoolState.cs b/Dfe.Academies.Academisation.Data/ApplicationAggregate/ApplicationSchoolState.cs
@@ -138,6 +138,9 @@ public class ApplicationSchoolState : BaseEntity
 	// Reason for joning trust
 	public string? SchoolConversionReasonsForJoining { get; set; }
 
+	// MR:- below mods for Dynamics -> SQL server A2B external app conversion
+	public Guid? DynamicsApplyingSchoolId { get; set; }
+
 	public static ApplicationSchoolState MapFromDomain(ISchool applyingSchool)
 	{
 		return new()

diff --git a/Dfe.Academies.Academisation.Data/ApplicationAggregate/ApplicationState.cs b/Dfe.Academies.Academisation.Data/ApplicationAggregate/ApplicationState.cs
@@ -21,6 +21,15 @@ public class ApplicationState : BaseEntity
 	public FormTrustState? FormTrust { get; set; }
 	public DateTime? ApplicationSubmittedDate { get; set; }
 
+	// MR:- below mods for Dynamics -> SQL server A2B external app conversion
+	public Guid? DynamicsApplicationId { get; set; }
+
+	/// <summary>
+	/// This is in the format $"A2B_{ApplicationId}"
+	/// Currently calculated by new UI but we need somewhere to store existing data from dynamics
+	/// </summary>
+	public string? ApplicationReference { get; set; }
+
 	public static ApplicationState MapFromDomain(IApplication application, IMapper mapper)
 	{
 		return new()
@@ -38,7 +47,8 @@ public static ApplicationState MapFromDomain(IApplication application, IMapper m
 				.ToHashSet(),
 			FormTrust = mapper.Map<FormTrustState>(application.FormTrust),
 			JoinTrust = mapper.Map<JoinTrustState>(application.JoinTrust),
-			ApplicationSubmittedDate = application.ApplicationSubmittedDate
+			ApplicationSubmittedDate = application.ApplicationSubmittedDate,
+			ApplicationReference = application.ApplicationReference
 		};
 	}
 

diff --git a/Dfe.Academies.Academisation.Data/ApplicationAggregate/FormTrustState.cs b/Dfe.Academies.Academisation.Data/ApplicationAggregate/FormTrustState.cs
@@ -1,13 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations.Schema;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using AutoFixture;
-using Dfe.Academies.Academisation.Domain.ApplicationAggregate.Trusts;
-using Dfe.Academies.Academisation.Domain.Core.ApplicationAggregate;
-using Dfe.Academies.Academisation.IDomain.ApplicationAggregate;
+using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Dfe.Academies.Academisation.Data.ApplicationAggregate
 {

diff --git a/Dfe.Academies.Academisation.Data/ApplicationAggregate/JoinTrustState.cs b/Dfe.Academies.Academisation.Data/ApplicationAggregate/JoinTrustState.cs
@@ -1,13 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations.Schema;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using AutoFixture;
-using Dfe.Academies.Academisation.Domain.ApplicationAggregate.Trusts;
+using System.ComponentModel.DataAnnotations.Schema;
 using Dfe.Academies.Academisation.Domain.Core.ApplicationAggregate;
-using Dfe.Academies.Academisation.IDomain.ApplicationAggregate;
 
 namespace Dfe.Academies.Academisation.Data.ApplicationAggregate
 {

diff --git a/Dfe.Academies.Academisation.Data/ApplicationAggregate/LeaseState.cs b/Dfe.Academies.Academisation.Data/ApplicationAggregate/LeaseState.cs
@@ -14,7 +14,10 @@ public class LeaseState : BaseEntity
 		public string Purpose { get; set; }
 		public string ValueOfAssets { get; set; }
 		public string ResponsibleForAssets { get; set; }
-
+
+		// MR:- below mods for Dynamics -> SQL server A2B external app conversion
+		public Guid? DynamicsSchoolLeaseId { get; set; }
+
 		public static Lease MapFromDomain(ILease lease)
 		{
 			return new Lease(lease.Id, lease.LeaseTerm, lease.RepaymentAmount, lease.InterestRate, lease.PaymentsToDate, lease.Purpose, lease.ValueOfAssets, lease.ResponsibleForAssets);

diff --git a/Dfe.Academies.Academisation.Data/ApplicationAggregate/LoanState.cs b/Dfe.Academies.Academisation.Data/ApplicationAggregate/LoanState.cs
@@ -19,6 +19,9 @@ public class LoanState : BaseEntity
 
 		public string Schedule { get; set; }
 
+		// MR:- below mods for Dynamics -> SQL server A2B external app conversion
+		public Guid? DynamicsSchoolLoanId { get; set; }
+
 		public static Loan MapFromDomain(ILoan loan)
 		{
 			return new Loan(loan.Id, loan.Amount, loan.Purpose, loan.Provider, loan.InterestRate, loan.Schedule);

diff --git a/Dfe.Academies.Academisation.Data/ApplicationAggregate/TrustKeyPersonState.cs b/Dfe.Academies.Academisation.Data/ApplicationAggregate/TrustKeyPersonState.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations.Schema;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.ComponentModel.DataAnnotations.Schema;
 using Dfe.Academies.Academisation.Domain.Core.ApplicationAggregate;
 
 namespace Dfe.Academies.Academisation.Data.ApplicationAggregate
@@ -20,5 +15,8 @@ public class TrustKeyPersonState : BaseEntity
 		public string? ContactEmailAddress { get; set; }
 		public DateTime? DateOfBirth { get; set; }
 		public string Biography { get; set; }
+
+		// MR:- below mods for Dynamics -> SQL server A2B external app conversion
+		public Guid DynamicsKeyPersonId { get; set; }
 	}
 }