Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds a CreatedOn column to the AcademyTransfersProject table #318

Merged
10 commits merged into from
Mar 24, 2023
Merged

Adds a CreatedOn column to the AcademyTransfersProject table #318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
cd471c5
Adds a CreatedOn column to the AcademyTransfersProject table for audi…
TimWilde Mar 22, 2023
de22b7c
Fix tests that compare types with the new date field.
TimWilde Mar 22, 2023
f283375
Trying a different integration test connection string.
TimWilde Mar 22, 2023
0a1a404
Correct port spec.
TimWilde Mar 22, 2023
e2158b4
Seeing if migrations work without so many sequence specs.
TimWilde Mar 22, 2023
583a5d1
Merge branch 'main' of https://github.com/DFE-Digital/trams-data-api …
TimWilde Mar 23, 2023
362bc1e
Merge conflict resolved.
TimWilde Mar 23, 2023
ac19843
Fix connection string for tests.
TimWilde Mar 23, 2023
73a2434
Restore commented code during diagnosis.
TimWilde Mar 23, 2023
3d97dfe
Merge branch 'main' of https://github.com/DFE-Digital/trams-data-api …
TimWilde Mar 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
110 changes: 60 additions & 50 deletions TramsDataApi.Test/Factories/AcademyTransferProjectFactoryTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,9 @@ public void ReturnsUpdatedAcademyTransferProject_WhenUpdating_IfRequestHasUpdate
HasTargetDateForTransfer = academyTransferProject.HasTargetDateForTransfer,
AssignedUserEmailAddress = academyTransferProject.AssignedUserEmailAddress,
AssignedUserFullName = academyTransferProject.AssignedUserFullName,
AssignedUserId = academyTransferProject.AssignedUserId
AssignedUserId = academyTransferProject.AssignedUserId,

CreatedOn = academyTransferProject.CreatedOn
};

var result = AcademyTransferProjectFactory.Update(academyTransferProject, updateRequest);
Expand Down Expand Up @@ -364,7 +366,9 @@ public void ReturnsUpdatedAcademyTransferProject_WhenUpdating_AndUpdatesTheListO
HasTargetDateForTransfer = academyTransferProject.HasTargetDateForTransfer,
AssignedUserEmailAddress = academyTransferProject.AssignedUserEmailAddress,
AssignedUserFullName = academyTransferProject.AssignedUserFullName,
AssignedUserId = academyTransferProject.AssignedUserId
AssignedUserId = academyTransferProject.AssignedUserId,

CreatedOn = academyTransferProject.CreatedOn
};

var result = AcademyTransferProjectFactory.Update(academyTransferProject, updateRequest);
Expand Down Expand Up @@ -451,7 +455,9 @@ public void ReturnsUpdatedAcademyTransferProject_WhenUpdating_IfRequestHasUpdate
HasTargetDateForTransfer = academyTransferProject.HasTargetDateForTransfer,
AssignedUserEmailAddress = academyTransferProject.AssignedUserEmailAddress,
AssignedUserFullName = academyTransferProject.AssignedUserFullName,
AssignedUserId = academyTransferProject.AssignedUserId
AssignedUserId = academyTransferProject.AssignedUserId,

CreatedOn = academyTransferProject.CreatedOn
};

var result = AcademyTransferProjectFactory.Update(academyTransferProject, updateRequest);
Expand All @@ -478,56 +484,58 @@ public void ReturnsUpdatedAcademyTransferProject_WhenUpdating_IfRequestIsToSetDa

var expected = new AcademyTransferProjects
{
Id = academyTransferProject.Id,
Urn = academyTransferProject.Urn,
ProjectReference = academyTransferProject.ProjectReference,
OutgoingTrustUkprn = academyTransferProject.OutgoingTrustUkprn,
ProjectRationale = academyTransferProject.ProjectRationale,
TransferringAcademies = academyTransferProject.TransferringAcademies,
WhoInitiatedTheTransfer = academyTransferProject.WhoInitiatedTheTransfer,
TargetDateForTransfer = null,
RddOrEsfaIntervention = academyTransferProject.RddOrEsfaIntervention,
RddOrEsfaInterventionDetail = academyTransferProject.RddOrEsfaInterventionDetail,
TypeOfTransfer = academyTransferProject.TypeOfTransfer,
OtherTransferTypeDescription = academyTransferProject.OtherTransferTypeDescription,
TransferFirstDiscussed = null,
HtbDate = null,
TrustSponsorRationale = academyTransferProject.TrustSponsorRationale,
State = academyTransferProject.State,
Status = academyTransferProject.Status,
Author = academyTransferProject.Author,
Recommendation = academyTransferProject.Recommendation,
AnyRisks = academyTransferProject.AnyRisks,
HighProfileShouldBeConsidered = academyTransferProject.HighProfileShouldBeConsidered,
HighProfileFurtherSpecification = academyTransferProject.HighProfileFurtherSpecification,
ComplexLandAndBuildingShouldBeConsidered =
Id = academyTransferProject.Id,
Urn = academyTransferProject.Urn,
ProjectReference = academyTransferProject.ProjectReference,
OutgoingTrustUkprn = academyTransferProject.OutgoingTrustUkprn,
ProjectRationale = academyTransferProject.ProjectRationale,
TransferringAcademies = academyTransferProject.TransferringAcademies,
WhoInitiatedTheTransfer = academyTransferProject.WhoInitiatedTheTransfer,
TargetDateForTransfer = null,
RddOrEsfaIntervention = academyTransferProject.RddOrEsfaIntervention,
RddOrEsfaInterventionDetail = academyTransferProject.RddOrEsfaInterventionDetail,
TypeOfTransfer = academyTransferProject.TypeOfTransfer,
OtherTransferTypeDescription = academyTransferProject.OtherTransferTypeDescription,
TransferFirstDiscussed = null,
HtbDate = null,
TrustSponsorRationale = academyTransferProject.TrustSponsorRationale,
State = academyTransferProject.State,
Status = academyTransferProject.Status,
Author = academyTransferProject.Author,
Recommendation = academyTransferProject.Recommendation,
AnyRisks = academyTransferProject.AnyRisks,
HighProfileShouldBeConsidered = academyTransferProject.HighProfileShouldBeConsidered,
HighProfileFurtherSpecification = academyTransferProject.HighProfileFurtherSpecification,
ComplexLandAndBuildingShouldBeConsidered =
academyTransferProject.ComplexLandAndBuildingShouldBeConsidered,
ComplexLandAndBuildingFurtherSpecification =
ComplexLandAndBuildingFurtherSpecification =
academyTransferProject.ComplexLandAndBuildingFurtherSpecification,
FinanceAndDebtShouldBeConsidered = academyTransferProject.FinanceAndDebtShouldBeConsidered,
FinanceAndDebtFurtherSpecification = academyTransferProject.FinanceAndDebtFurtherSpecification,
OtherRisksShouldBeConsidered = academyTransferProject.OtherRisksShouldBeConsidered,
OtherRisksFurtherSpecification = academyTransferProject.OtherRisksFurtherSpecification,
OtherBenefitValue = academyTransferProject.OtherBenefitValue,
EqualitiesImpactAssessmentConsidered = academyTransferProject.EqualitiesImpactAssessmentConsidered,
IncomingTrustAgreement = academyTransferProject.IncomingTrustAgreement,
DiocesanConsent = academyTransferProject.DiocesanConsent,
OutgoingTrustConsent = academyTransferProject.OutgoingTrustConsent,
FeatureSectionIsCompleted = academyTransferProject.FeatureSectionIsCompleted,
BenefitsSectionIsCompleted = academyTransferProject.BenefitsSectionIsCompleted,
LegalRequirementsSectionIsCompleted = academyTransferProject.LegalRequirementsSectionIsCompleted,
RationaleSectionIsCompleted = academyTransferProject.RationaleSectionIsCompleted,
AcademyTransferProjectIntendedTransferBenefits =
FinanceAndDebtShouldBeConsidered = academyTransferProject.FinanceAndDebtShouldBeConsidered,
FinanceAndDebtFurtherSpecification = academyTransferProject.FinanceAndDebtFurtherSpecification,
OtherRisksShouldBeConsidered = academyTransferProject.OtherRisksShouldBeConsidered,
OtherRisksFurtherSpecification = academyTransferProject.OtherRisksFurtherSpecification,
OtherBenefitValue = academyTransferProject.OtherBenefitValue,
EqualitiesImpactAssessmentConsidered = academyTransferProject.EqualitiesImpactAssessmentConsidered,
IncomingTrustAgreement = academyTransferProject.IncomingTrustAgreement,
DiocesanConsent = academyTransferProject.DiocesanConsent,
OutgoingTrustConsent = academyTransferProject.OutgoingTrustConsent,
FeatureSectionIsCompleted = academyTransferProject.FeatureSectionIsCompleted,
BenefitsSectionIsCompleted = academyTransferProject.BenefitsSectionIsCompleted,
LegalRequirementsSectionIsCompleted = academyTransferProject.LegalRequirementsSectionIsCompleted,
RationaleSectionIsCompleted = academyTransferProject.RationaleSectionIsCompleted,
AcademyTransferProjectIntendedTransferBenefits =
academyTransferProject.AcademyTransferProjectIntendedTransferBenefits,
HasTransferFirstDiscussedDate = false,
HasHtbDate = false,
HasTargetDateForTransfer = false,
AssignedUserEmailAddress = academyTransferProject.AssignedUserEmailAddress,
AssignedUserFullName = academyTransferProject.AssignedUserFullName,
AssignedUserId = academyTransferProject.AssignedUserId
HasTransferFirstDiscussedDate = false,
HasHtbDate = false,
HasTargetDateForTransfer = false,
AssignedUserEmailAddress = academyTransferProject.AssignedUserEmailAddress,
AssignedUserFullName = academyTransferProject.AssignedUserFullName,
AssignedUserId = academyTransferProject.AssignedUserId,

CreatedOn = academyTransferProject.CreatedOn
};

var result = AcademyTransferProjectFactory.Update(academyTransferProject, updateRequest);
var result = AcademyTransferProjectFactory.Update(academyTransferProject, updateRequest);

result.Should().BeEquivalentTo(expected);
}
Expand Down Expand Up @@ -604,10 +612,12 @@ public void ReturnsOriginalAcademyTransferProjectWithDatesSetToNull_WhenUpdating
HasTargetDateForTransfer = false,
AssignedUserEmailAddress = academyTransferProject.AssignedUserEmailAddress,
AssignedUserFullName = academyTransferProject.AssignedUserFullName,
AssignedUserId = academyTransferProject.AssignedUserId
AssignedUserId = academyTransferProject.AssignedUserId,

CreatedOn = academyTransferProject.CreatedOn
};

var result = AcademyTransferProjectFactory.Update(academyTransferProject, updateRequest);
AcademyTransferProjects result = AcademyTransferProjectFactory.Update(academyTransferProject, updateRequest);

result.Should().BeEquivalentTo(expected);
}
Expand Down
6 changes: 3 additions & 3 deletions TramsDataApi.Test/integration_settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"AllowedHosts": "*",
"ApiKeys": ["{\"userName\": \"Test User\", \"apiKey\": \"testing-api-key\"}"],
"ConnectionStrings": {
"DefaultConnection": "Server=127.0.0.1,1433;Database=sip;User Id=sa;TrustServerCertificate=True;Password=Your_password123"
}
"ConnectionStrings": {
"DefaultConnection": "Server=127.0.0.1,1433;Database=sip;User Id=sa;TrustServerCertificate=True;Password=StrongPassword905"
}
}
4 changes: 3 additions & 1 deletion TramsDataApi/DatabaseModels/AcademyTransferProjects.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public AcademyTransferProjects()
public bool? LegalRequirementsSectionIsCompleted { get; set; }
public bool? FeatureSectionIsCompleted { get; set; }
public bool? BenefitsSectionIsCompleted { get; set; }
public bool? RationaleSectionIsCompleted { get; set; }
public bool? RationaleSectionIsCompleted { get; set; }
public string AssignedUserFullName { get; set; }
public string AssignedUserEmailAddress { get; set; }
public Guid? AssignedUserId { get; set; }
Expand All @@ -70,5 +70,7 @@ public virtual ICollection<AcademyTransferProjectIntendedTransferBenefits>
AcademyTransferProjectIntendedTransferBenefits { get; set; }

public virtual ICollection<TransferringAcademies> TransferringAcademies { get; set; }

public DateTime CreatedOn { get; set; }
}
}
Loading