From ca0bba98aa36f3c3056abe53d8a512e529a484e7 Mon Sep 17 00:00:00 2001 From: OluwatobiAwe Date: Thu, 18 Sep 2025 17:09:50 +0100 Subject: [PATCH] TD-6213 Informal assessment ef query fix --- .../Services/MyLearningService.cs | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/MyLearningService.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/MyLearningService.cs index 04807be0..ef714432 100644 --- a/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/MyLearningService.cs +++ b/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/MyLearningService.cs @@ -395,19 +395,15 @@ public async Task> GetResourceCertif if (assessmentType == AssessmentTypeEnum.Formal) { - activityEntities = activityEntities.Where(x => { - var act = x.AssessmentResourceActivity.FirstOrDefault(); - var ver = x.ResourceVersion.AssessmentResourceVersion; - return act != null && act.Score.HasValue && - Math.Round(act.Score.Value, MidpointRounding.AwayFromZero) >= ver.PassMark; - }).ToList(); + activityEntities = activityEntities.Where(x => x.AssessmentResourceActivity.FirstOrDefault() != null && + x.AssessmentResourceActivity.First().Score.HasValue && + (int)Math.Round(x.AssessmentResourceActivity.First().Score.Value, + MidpointRounding.AwayFromZero) >= x.ResourceVersion.AssessmentResourceVersion.PassMark) + .ToList(); } else if (assessmentType == AssessmentTypeEnum.Informal) { - activityEntities = activityEntities.Where(x => { - var act = x.AssessmentResourceActivity.FirstOrDefault(); - return act != null && x.ActivityStatusId == (int)ActivityStatusEnum.Completed; - }).ToList(); + activityEntities = activityEntities.Where(x =>x.ActivityStatusId == (int)ActivityStatusEnum.Completed).ToList(); } } else if (activityEntities.Any() && (activityEntities.FirstOrDefault()?.Resource.ResourceTypeEnum == ResourceTypeEnum.Video || activityEntities.FirstOrDefault()?.Resource.ResourceTypeEnum == ResourceTypeEnum.Audio))