Merge pull request #1311 from DFE-Digital/bug/decision-title

include decision types
DFE-Digital · Jul 18, 2024 · 0ebdff2 · 0ebdff2
2 parents 73e7c0c + 5fc436e
commit 0ebdff2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/ConcernsCaseWork/ConcernsCaseWork.Data/Gateways/CaseSummaryGateway.cs b/ConcernsCaseWork/ConcernsCaseWork.Data/Gateways/CaseSummaryGateway.cs
@@ -162,10 +162,7 @@ private IQueryable<ActiveCaseSummaryVm> SelectOpenCaseSummary(IQueryable<Concern
 				in cases.ConcernsRecords
 							 where concerns.StatusId == 1
 							 select new CaseSummaryVm.Concern(concerns.ConcernsType.ToString(), concerns.ConcernsRating, concerns.CreatedAt),
-			Decisions = from decisions
-				in cases.Decisions
-						where !decisions.ClosedAt.HasValue
-						select decisions,
+			Decisions = _concernsDbContext.Decisions.Where(d => d.ConcernsCaseId == cases.Id && !d.ClosedAt.HasValue).Include(d => d.DecisionTypes).ToArray(),
 			FinancialPlanCases = _concernsDbContext.FinancialPlanCases
 				.Where(x => x.CaseUrn == cases.Urn && !x.ClosedAt.HasValue)
 				.Select(action => new CaseSummaryVm.Action(action.CreatedAt, null, CaseSummaryConstants.FinancialPlan))
@@ -220,7 +217,7 @@ private IQueryable<ClosedCaseSummaryVm> SelectClosedCaseSummary(IQueryable<Conce
 							from concerns in cases.ConcernsRecords
 							where concerns.StatusId == 3
 							select new CaseSummaryVm.Concern(concerns.ConcernsType.ToString(), concerns.ConcernsRating, concerns.CreatedAt),
-			Decisions = from decisions in cases.Decisions select decisions,
+			Decisions = _concernsDbContext.Decisions.Where(d => d.ConcernsCaseId == cases.Id && d.ClosedAt.HasValue).Include(d => d.DecisionTypes).ToArray(),
 			FinancialPlanCases = _concernsDbContext.FinancialPlanCases
 							.Where(x => x.CaseUrn == cases.Urn)
 							.Select(action => new CaseSummaryVm.Action(action.CreatedAt, action.ClosedAt, CaseSummaryConstants.FinancialPlan))

diff --git a/ConcernsCaseWork/ConcernsCaseWork/ConcernsCaseWork.csproj b/ConcernsCaseWork/ConcernsCaseWork/ConcernsCaseWork.csproj
@@ -5,7 +5,7 @@
 		<CopyRefAssembliesToPublishDirectory>false</CopyRefAssembliesToPublishDirectory>
 		<UserSecretsId>ac20b61d-9280-4be5-bbad-ad27aaff2f24</UserSecretsId>
 		<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-		<Version>38.0.0</Version>
+		<Version>38.0.1</Version>
 	</PropertyGroup>
 
 	<PropertyGroup Label="custom">

diff --git a/ConcernsCaseWork/release-notes.md b/ConcernsCaseWork/release-notes.md
@@ -1,3 +1,7 @@
+## 38.0.1
+
+* bug fix to show decision type/title on trust cases overview
+
 ## 38.0.0
 
 * updated the description of the SFSO territories and removed North and UTC - UTC and National Operations as options