Skip to content

Changed field for Conversion date and updated text #42

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

Merged
thomasmcinnes-nimble merged 2 commits into from
Nov 17, 2025
Merged

Changed field for Conversion date and updated text #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
897d362
Changed field for Conversion date and updated text
Nov 11, 2025
f77db06
Fixed tests
Nov 12, 2025
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
4 changes: 2 additions & 2 deletions ...fe.CaseAggregationService.Application/Services/Builders/GetCaseInfoFromCompleteSummary.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
{

return new UserCaseInfo(GetTitle(summary),
getSystemLinks.GetCompleteTitleLink(summary.ProjectId.Value.ToString()),

Check warning on line 15 in src/Dfe.CaseAggregationService.Application/Services/Builders/GetCaseInfoFromCompleteSummary.cs

View workflow job for this annotation

GitHub Actions / Build, Test and Analyse 

Nullable value type may be null.
System,
summary.CaseType.ToDescription(),
summary.CreatedDate ?? DateTime.MinValue,
Expand Down Expand Up @@ -49,7 +49,7 @@
{
if (summary.CaseType is CompleteProjectType.Conversion or CompleteProjectType.FormAMatConversion)
{
yield return new CaseInfoItem("Current confirmed conversion date",
yield return new CaseInfoItem("Current conversion date",
summary.ProposedTransferDate.HasValue
? summary.ProposedTransferDate.Value.ToString("dd/MM/yyyy")
: "", null);
Expand All @@ -59,7 +59,7 @@

if (summary.CaseType is CompleteProjectType.Transfer or CompleteProjectType.FormAMatTransfer)
{
yield return new CaseInfoItem("Current confirmed transfer date",
yield return new CaseInfoItem("Current transfer date",
summary.ProposedTransferDate.HasValue
? summary.ProposedTransferDate.Value.ToString("dd/MM/yyyy")
: "", null);
Expand Down
2 changes: 1 addition & 1 deletion src/Dfe.CaseAggregationService.Infrastructure/Gateways/CompleteApiClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public async Task<IEnumerable<CompleteSummary>> GetCompleteSummaryForUser(string
GetProjectType(x.ProjectType, x.IsFormAMat),
x.SchoolOrAcademyName ?? "",
x.Urn?.ToString() ?? "",
x.CompletionDate,
x.ConversionOrTransferDate,
x.IncomingTrustName ?? "",
x.OutgoingTrustName ?? "",
x.LocalAuthority ?? "",
Expand Down
4 changes: 2 additions & 2 deletions ....CaseAggregationService.Application.Tests/Services/GetCaseInfoFromCompleteSummaryTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public void GivenTransferReturnCaseInfo()
Assert.Empty(result.Resources);
var info = result.Info.ToArray();

info[0].ShouldBe("Current confirmed transfer date", "08/09/2010");
info[0].ShouldBe("Current transfer date", "08/09/2010");
info[1].ShouldBe("Incoming trust", "Incoming Trust name");
info[2].ShouldBe("Outgoing trust", "Outgoing Trust name");
info[3].ShouldBe("LA", "Local Authority");
Expand Down Expand Up @@ -95,7 +95,7 @@ public void GivenConversionReturnCaseInfo()
Assert.Empty(result.Resources);
var info = result.Info.ToArray();

info[0].ShouldBe("Current confirmed conversion date", "08/09/2010");
info[0].ShouldBe("Current conversion date", "08/09/2010");
info[1].ShouldBe("Name", "Incoming Trust name");
info[2].ShouldBe("LA", "Local Authority");
}
Expand Down
Loading