diff --git a/src/Dfe.CaseAggregationService.Application/Services/Builders/GetCaseInfoFromCompleteSummary.cs b/src/Dfe.CaseAggregationService.Application/Services/Builders/GetCaseInfoFromCompleteSummary.cs index d469f59..f5347c6 100644 --- a/src/Dfe.CaseAggregationService.Application/Services/Builders/GetCaseInfoFromCompleteSummary.cs +++ b/src/Dfe.CaseAggregationService.Application/Services/Builders/GetCaseInfoFromCompleteSummary.cs @@ -49,7 +49,7 @@ private static IEnumerable GetCaseInfoItems(CompleteSummary summar { 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); @@ -59,7 +59,7 @@ private static IEnumerable GetCaseInfoItems(CompleteSummary summar 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); diff --git a/src/Dfe.CaseAggregationService.Infrastructure/Gateways/CompleteApiClient.cs b/src/Dfe.CaseAggregationService.Infrastructure/Gateways/CompleteApiClient.cs index 92d2318..c36e64f 100644 --- a/src/Dfe.CaseAggregationService.Infrastructure/Gateways/CompleteApiClient.cs +++ b/src/Dfe.CaseAggregationService.Infrastructure/Gateways/CompleteApiClient.cs @@ -35,7 +35,7 @@ public async Task> GetCompleteSummaryForUser(string GetProjectType(x.ProjectType, x.IsFormAMat), x.SchoolOrAcademyName ?? "", x.Urn?.ToString() ?? "", - x.CompletionDate, + x.ConversionOrTransferDate, x.IncomingTrustName ?? "", x.OutgoingTrustName ?? "", x.LocalAuthority ?? "", diff --git a/src/Tests/Dfe.CaseAggregationService.Application.Tests/Services/GetCaseInfoFromCompleteSummaryTests.cs b/src/Tests/Dfe.CaseAggregationService.Application.Tests/Services/GetCaseInfoFromCompleteSummaryTests.cs index 7980e26..d66668c 100644 --- a/src/Tests/Dfe.CaseAggregationService.Application.Tests/Services/GetCaseInfoFromCompleteSummaryTests.cs +++ b/src/Tests/Dfe.CaseAggregationService.Application.Tests/Services/GetCaseInfoFromCompleteSummaryTests.cs @@ -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"); @@ -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"); }