Skip to content

Commit

Permalink
Merge pull request #1008 from DFE-Digital/feature/182430
Browse files Browse the repository at this point in the history 
Finance Plan Underwritten places page
  • Loading branch information
@dangood84
dangood84 authored Feb 10, 2025
2 parents 8e9a990 + aa97480 commit 3d7abd6
Show file tree
Hide file tree
Showing 23 changed files with 14,389 additions and 55 deletions.
24 changes: 22 additions & 2 deletions ...choolProjects/Dfe.ManageFreeSchoolProjects.API.Contracts/Project/Tasks/FinancePlanTask.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,31 @@ public class FinancePlanTask
{
public YesNo? FinancePlanAgreed { get; set; }
public DateTime? DateAgreed { get; set; }
public YesNo? PlanSavedInWorksplacesFolder { get; set; }
public YesNo? PlanSavedInWorkplacesFolder { get; set; }
public YesNoNotApplicable? LocalAuthorityAgreedPupilNumbers { get; set; }
public string Comments { get; set; }
public YesNo? TrustWillOptIntoRpa { get; set; }
public DateTime? RpaStartDate { get; set; }
public string RpaCoverType { get; set; }

public int UnderwrittenPlacesPrimaryYear1 { get; set; }
public int UnderwrittenPlacesPrimaryYear2 { get; set; }
public int UnderwrittenPlacesPrimaryYear3 { get; set; }
public int UnderwrittenPlacesPrimaryYear4 { get; set; }
public int UnderwrittenPlacesPrimaryYear5 { get; set; }
public int UnderwrittenPlacesPrimaryYear6 { get; set; }
public int UnderwrittenPlacesPrimaryYear7 { get; set; }
public int UnderwrittenPlacesSecondaryYear1 { get; set; }
public int UnderwrittenPlacesSecondaryYear2 { get; set; }
public int UnderwrittenPlacesSecondaryYear3 { get; set; }
public int UnderwrittenPlacesSecondaryYear4 { get; set; }
public int UnderwrittenPlacesSecondaryYear5 { get; set; }
public int UnderwrittenPlacesSixteenToNineteenYear1 { get; set; }
public int UnderwrittenPlacesSixteenToNineteenYear2 { get; set; }
public int UnderwrittenPlacesSixteenToNineteenYear3 { get; set; }

public bool? ConfirmationFromLocalAuthoritySavedInWorkplacesFolder { get; set; }

public string CommentsAboutUnderwrittenPlaces { get; set; }

}
}
89 changes: 79 additions & 10 deletions ...lProjects/Dfe.ManageFreeSchoolProjects.API.Tests/Integration/Tasks/FinanceTaskApiTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,31 +28,66 @@ public async Task Patch_NewFinancePlanTask_Returns_200()
var dateAgreed = DateTime.Now.Date.AddDays(-5);
var rpaStartDate = DateTime.Now.Date.AddDays(10);

var comments = "Some comments";

var request = new UpdateProjectByTaskRequest()
{
FinancePlan = new FinancePlanTask()
{
FinancePlanAgreed = YesNo.Yes,
Comments = "CommentsOnDecisionToApprove",
LocalAuthorityAgreedPupilNumbers = YesNoNotApplicable.Yes,
DateAgreed = dateAgreed,
PlanSavedInWorksplacesFolder = YesNo.Yes,
PlanSavedInWorkplacesFolder = YesNo.Yes,
TrustWillOptIntoRpa = YesNo.Yes,
RpaCoverType = "RpaCoverType",
RpaStartDate = rpaStartDate
RpaStartDate = rpaStartDate,
UnderwrittenPlacesPrimaryYear1 = 1,
UnderwrittenPlacesPrimaryYear2 = 2,
UnderwrittenPlacesPrimaryYear3 = 3,
UnderwrittenPlacesPrimaryYear4 = 4,
UnderwrittenPlacesPrimaryYear5 = 5,
UnderwrittenPlacesPrimaryYear6 = 6,
UnderwrittenPlacesPrimaryYear7 = 7,
UnderwrittenPlacesSecondaryYear1 = 8,
UnderwrittenPlacesSecondaryYear2 = 9,
UnderwrittenPlacesSecondaryYear3 = 10,
UnderwrittenPlacesSecondaryYear4 = 11,
UnderwrittenPlacesSecondaryYear5 = 12,
UnderwrittenPlacesSixteenToNineteenYear1 = 13,
UnderwrittenPlacesSixteenToNineteenYear2 = 14,
UnderwrittenPlacesSixteenToNineteenYear3 = 15,
ConfirmationFromLocalAuthoritySavedInWorkplacesFolder = true,
CommentsAboutUnderwrittenPlaces = comments

}
};

var projectResponse = await _client.UpdateProjectTask(projectId, request, TaskName.FinancePlan.ToString());

projectResponse.FinancePlan.FinancePlanAgreed.Should().Be(YesNo.Yes);
projectResponse.FinancePlan.Comments.Should().Be("CommentsOnDecisionToApprove");
projectResponse.FinancePlan.LocalAuthorityAgreedPupilNumbers.Should().Be(YesNoNotApplicable.Yes);
projectResponse.FinancePlan.DateAgreed.Should().Be(dateAgreed);
projectResponse.FinancePlan.PlanSavedInWorksplacesFolder.Should().Be(YesNo.Yes);
projectResponse.FinancePlan.PlanSavedInWorkplacesFolder.Should().Be(YesNo.Yes);
projectResponse.FinancePlan.TrustWillOptIntoRpa.Should().Be(YesNo.Yes);
projectResponse.FinancePlan.RpaCoverType.Should().Be("RpaCoverType");
projectResponse.FinancePlan.RpaStartDate.Should().Be(rpaStartDate);
projectResponse.FinancePlan.UnderwrittenPlacesPrimaryYear1.Should().Be(1);
projectResponse.FinancePlan.UnderwrittenPlacesPrimaryYear2.Should().Be(2);
projectResponse.FinancePlan.UnderwrittenPlacesPrimaryYear3.Should().Be(3);
projectResponse.FinancePlan.UnderwrittenPlacesPrimaryYear4.Should().Be(4);
projectResponse.FinancePlan.UnderwrittenPlacesPrimaryYear5.Should().Be(5);
projectResponse.FinancePlan.UnderwrittenPlacesPrimaryYear6.Should().Be(6);
projectResponse.FinancePlan.UnderwrittenPlacesPrimaryYear7.Should().Be(7);
projectResponse.FinancePlan.UnderwrittenPlacesSecondaryYear1.Should().Be(8);
projectResponse.FinancePlan.UnderwrittenPlacesSecondaryYear2.Should().Be(9);
projectResponse.FinancePlan.UnderwrittenPlacesSecondaryYear3.Should().Be(10);
projectResponse.FinancePlan.UnderwrittenPlacesSecondaryYear4.Should().Be(11);
projectResponse.FinancePlan.UnderwrittenPlacesSecondaryYear5.Should().Be(12);
projectResponse.FinancePlan.UnderwrittenPlacesSixteenToNineteenYear1.Should().Be(13);
projectResponse.FinancePlan.UnderwrittenPlacesSixteenToNineteenYear2.Should().Be(14);
projectResponse.FinancePlan.UnderwrittenPlacesSixteenToNineteenYear3.Should().Be(15);
projectResponse.FinancePlan.ConfirmationFromLocalAuthoritySavedInWorkplacesFolder.Should().Be(true);
projectResponse.FinancePlan.CommentsAboutUnderwrittenPlaces.Should().Be(comments);
}

[Fact]
Expand All @@ -72,31 +107,65 @@ public async Task Patch_ExistingFinancePlanTask_Returns_200()
var dateAgreed = DateTime.Now.Date.AddDays(-5);
var rpaStartDate = DateTime.Now.Date.AddDays(10);

var comments = "Some comments";

var request = new UpdateProjectByTaskRequest()
{
FinancePlan = new FinancePlanTask()
{
FinancePlanAgreed = YesNo.No,
Comments = "ChangedDecisionToApprove",
LocalAuthorityAgreedPupilNumbers = YesNoNotApplicable.NotApplicable,
DateAgreed = dateAgreed,
PlanSavedInWorksplacesFolder = YesNo.No,
PlanSavedInWorkplacesFolder = YesNo.No,
TrustWillOptIntoRpa = YesNo.No,
RpaCoverType = "a new RpaCoverType",
RpaStartDate = rpaStartDate
RpaStartDate = rpaStartDate,
UnderwrittenPlacesPrimaryYear1 = 1,
UnderwrittenPlacesPrimaryYear2 = 2,
UnderwrittenPlacesPrimaryYear3 = 3,
UnderwrittenPlacesPrimaryYear4 = 4,
UnderwrittenPlacesPrimaryYear5 = 5,
UnderwrittenPlacesPrimaryYear6 = 6,
UnderwrittenPlacesPrimaryYear7 = 7,
UnderwrittenPlacesSecondaryYear1 = 8,
UnderwrittenPlacesSecondaryYear2 = 9,
UnderwrittenPlacesSecondaryYear3 = 10,
UnderwrittenPlacesSecondaryYear4 = 11,
UnderwrittenPlacesSecondaryYear5 = 12,
UnderwrittenPlacesSixteenToNineteenYear1 = 13,
UnderwrittenPlacesSixteenToNineteenYear2 = 14,
UnderwrittenPlacesSixteenToNineteenYear3 = 15,
ConfirmationFromLocalAuthoritySavedInWorkplacesFolder = true,
CommentsAboutUnderwrittenPlaces = comments
}
};

var projectResponse = await _client.UpdateProjectTask(projectId, request, TaskName.FinancePlan.ToString());

projectResponse.FinancePlan.FinancePlanAgreed.Should().Be(YesNo.No);
projectResponse.FinancePlan.Comments.Should().Be("ChangedDecisionToApprove");
projectResponse.FinancePlan.LocalAuthorityAgreedPupilNumbers.Should().Be(YesNoNotApplicable.NotApplicable);
projectResponse.FinancePlan.DateAgreed.Should().Be(dateAgreed);
projectResponse.FinancePlan.PlanSavedInWorksplacesFolder.Should().Be(YesNo.No);
projectResponse.FinancePlan.PlanSavedInWorkplacesFolder.Should().Be(YesNo.No);
projectResponse.FinancePlan.TrustWillOptIntoRpa.Should().Be(YesNo.No);
projectResponse.FinancePlan.RpaCoverType.Should().Be("a new RpaCoverType");
projectResponse.FinancePlan.RpaStartDate.Should().Be(rpaStartDate);
projectResponse.FinancePlan.UnderwrittenPlacesPrimaryYear1.Should().Be(1);
projectResponse.FinancePlan.UnderwrittenPlacesPrimaryYear2.Should().Be(2);
projectResponse.FinancePlan.UnderwrittenPlacesPrimaryYear3.Should().Be(3);
projectResponse.FinancePlan.UnderwrittenPlacesPrimaryYear4.Should().Be(4);
projectResponse.FinancePlan.UnderwrittenPlacesPrimaryYear5.Should().Be(5);
projectResponse.FinancePlan.UnderwrittenPlacesPrimaryYear6.Should().Be(6);
projectResponse.FinancePlan.UnderwrittenPlacesPrimaryYear7.Should().Be(7);
projectResponse.FinancePlan.UnderwrittenPlacesSecondaryYear1.Should().Be(8);
projectResponse.FinancePlan.UnderwrittenPlacesSecondaryYear2.Should().Be(9);
projectResponse.FinancePlan.UnderwrittenPlacesSecondaryYear3.Should().Be(10);
projectResponse.FinancePlan.UnderwrittenPlacesSecondaryYear4.Should().Be(11);
projectResponse.FinancePlan.UnderwrittenPlacesSecondaryYear5.Should().Be(12);
projectResponse.FinancePlan.UnderwrittenPlacesSixteenToNineteenYear1.Should().Be(13);
projectResponse.FinancePlan.UnderwrittenPlacesSixteenToNineteenYear2.Should().Be(14);
projectResponse.FinancePlan.UnderwrittenPlacesSixteenToNineteenYear3.Should().Be(15);
projectResponse.FinancePlan.ConfirmationFromLocalAuthoritySavedInWorkplacesFolder.Should().Be(true);
projectResponse.FinancePlan.CommentsAboutUnderwrittenPlaces.Should().Be(comments);
}
}
}
30 changes: 27 additions & 3 deletions ...ManageFreeSchoolProjects.API/UseCases/Project/Tasks/FinancePlan/FinancePlanTaskBuilder.cs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using Dfe.ManageFreeSchoolProjects.API.Contracts.Common;
using Dfe.ManageFreeSchoolProjects.API.Contracts.Project.Tasks;
using Dfe.ManageFreeSchoolProjects.API.Extensions;
using Dfe.ManageFreeSchoolProjects.Data.Entities.Existing;

namespace Dfe.ManageFreeSchoolProjects.API.UseCases.Project.Tasks.FinancePlan
Expand All @@ -17,12 +18,35 @@ public static FinancePlanTask Build(Milestones milestones, Po po)
{
FinancePlanAgreed = ConvertYesNo(milestones.FsgPreOpeningMilestonesBefpApplicable),
DateAgreed = milestones.FsgPreOpeningMilestonesBefpActualDateOfCompletion,
PlanSavedInWorksplacesFolder = milestones.FinancePlanSavedInWorkplacesFolder,
PlanSavedInWorkplacesFolder = milestones.FinancePlanSavedInWorkplacesFolder,
LocalAuthorityAgreedPupilNumbers = milestones.LAAgreedPupilNumbers,
Comments = milestones.FsgPreOpeningMilestonesMi72CommentsOnDecisionToApproveIfApplicable,
TrustWillOptIntoRpa = ConvertYesNo(po.FinancialPlanningOptInToRpa),
RpaStartDate = po.FinancialPlanningStartDateOfRpa,
RpaCoverType = po.FinancialPlanningTypeOfRpaCover
RpaCoverType = po.FinancialPlanningTypeOfRpaCover,

UnderwrittenPlacesPrimaryYear1 = po.UnderwrittenPlacesPrimaryYear1.ToInt(),
UnderwrittenPlacesPrimaryYear2 = po.UnderwrittenPlacesPrimaryYear2.ToInt(),
UnderwrittenPlacesPrimaryYear3 = po.UnderwrittenPlacesPrimaryYear3.ToInt(),
UnderwrittenPlacesPrimaryYear4 = po.UnderwrittenPlacesPrimaryYear4.ToInt(),
UnderwrittenPlacesPrimaryYear5 = po.UnderwrittenPlacesPrimaryYear5.ToInt(),
UnderwrittenPlacesPrimaryYear6 = po.UnderwrittenPlacesPrimaryYear6.ToInt(),
UnderwrittenPlacesPrimaryYear7 = po.UnderwrittenPlacesPrimaryYear7.ToInt(),

UnderwrittenPlacesSecondaryYear1 = po.UnderwrittenPlacesSecondaryYear1.ToInt(),
UnderwrittenPlacesSecondaryYear2 = po.UnderwrittenPlacesSecondaryYear2.ToInt(),
UnderwrittenPlacesSecondaryYear3 = po.UnderwrittenPlacesSecondaryYear3.ToInt(),
UnderwrittenPlacesSecondaryYear4 = po.UnderwrittenPlacesSecondaryYear4.ToInt(),
UnderwrittenPlacesSecondaryYear5 = po.UnderwrittenPlacesSecondaryYear5.ToInt(),

UnderwrittenPlacesSixteenToNineteenYear1 = po.UnderwrittenPlacesSixteenToNineteenYear1.ToInt(),
UnderwrittenPlacesSixteenToNineteenYear2 = po.UnderwrittenPlacesSixteenToNineteenYear2.ToInt(),
UnderwrittenPlacesSixteenToNineteenYear3 = po.UnderwrittenPlacesSixteenToNineteenYear3.ToInt(),

ConfirmationFromLocalAuthoritySavedInWorkplacesFolder = po.ConfirmationFromLocalAuthoritySavedInWorkplacesFolder,
CommentsAboutUnderwrittenPlaces = po.CommentsAboutUnderwrittenPlaces



};
}

Expand Down
24 changes: 22 additions & 2 deletions ...FreeSchoolProjects.API/UseCases/Project/Tasks/FinancePlan/UpdateFinancePlanTaskService.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,8 @@ public async Task Update(UpdateTaskServiceParameters parameters)
milestone.Rid = dbKpi.Rid;
milestone.FsgPreOpeningMilestonesBefpApplicable = task.FinancePlanAgreed?.ToString();
milestone.FsgPreOpeningMilestonesBefpActualDateOfCompletion = task.DateAgreed?.Date;
milestone.FinancePlanSavedInWorkplacesFolder = task.PlanSavedInWorksplacesFolder;
milestone.FinancePlanSavedInWorkplacesFolder = task.PlanSavedInWorkplacesFolder;
milestone.LAAgreedPupilNumbers = task.LocalAuthorityAgreedPupilNumbers;
milestone.FsgPreOpeningMilestonesMi72CommentsOnDecisionToApproveIfApplicable = task.Comments;

var po = await _context.Po.FirstOrDefaultAsync(r => r.Rid == dbKpi.Rid);

Expand All @@ -53,6 +52,27 @@ public async Task Update(UpdateTaskServiceParameters parameters)
po.FinancialPlanningStartDateOfRpa = task.RpaStartDate;
po.FinancialPlanningTypeOfRpaCover = task.RpaCoverType;

po.UnderwrittenPlacesPrimaryYear1 = task.UnderwrittenPlacesPrimaryYear1.ToString();
po.UnderwrittenPlacesPrimaryYear2 = task.UnderwrittenPlacesPrimaryYear2.ToString();
po.UnderwrittenPlacesPrimaryYear3 = task.UnderwrittenPlacesPrimaryYear3.ToString();
po.UnderwrittenPlacesPrimaryYear4 = task.UnderwrittenPlacesPrimaryYear4.ToString();
po.UnderwrittenPlacesPrimaryYear5 = task.UnderwrittenPlacesPrimaryYear5.ToString();
po.UnderwrittenPlacesPrimaryYear6 = task.UnderwrittenPlacesPrimaryYear6.ToString();
po.UnderwrittenPlacesPrimaryYear7 = task.UnderwrittenPlacesPrimaryYear7.ToString();

po.UnderwrittenPlacesSecondaryYear1 = task.UnderwrittenPlacesSecondaryYear1.ToString();
po.UnderwrittenPlacesSecondaryYear2 = task.UnderwrittenPlacesSecondaryYear2.ToString();
po.UnderwrittenPlacesSecondaryYear3 = task.UnderwrittenPlacesSecondaryYear3.ToString();
po.UnderwrittenPlacesSecondaryYear4 = task.UnderwrittenPlacesSecondaryYear4.ToString();
po.UnderwrittenPlacesSecondaryYear5 = task.UnderwrittenPlacesSecondaryYear5.ToString();

po.UnderwrittenPlacesSixteenToNineteenYear1 = task.UnderwrittenPlacesSixteenToNineteenYear1.ToString();
po.UnderwrittenPlacesSixteenToNineteenYear2 = task.UnderwrittenPlacesSixteenToNineteenYear2.ToString();
po.UnderwrittenPlacesSixteenToNineteenYear3 = task.UnderwrittenPlacesSixteenToNineteenYear3.ToString();

po.ConfirmationFromLocalAuthoritySavedInWorkplacesFolder = task.ConfirmationFromLocalAuthoritySavedInWorkplacesFolder;
po.CommentsAboutUnderwrittenPlaces = task.CommentsAboutUnderwrittenPlaces;

await _context.SaveChangesAsync();
}
}
Expand Down
Loading

0 comments on commit 3d7abd6

Please sign in to comment.