Skip to content

TD-7126: My courses and learning - elearning resources doesn't appea… #1780

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
AnjuJose011 merged 2 commits into from
Apr 16, 2026
+9 −10
Merged

TD-7126: My courses and learning - elearning resources doesn't appea… #1780

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
ef29bbe
TD-7126: My courses and learning - elearning resources doesn't appea…
swapnamol-abraham Apr 16, 2026
5a3148a
Removed unwanted lines
swapnamol-abraham Apr 16, 2026
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
13 changes: 6 additions & 7 deletions OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/DashboardService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,15 @@
using AutoMapper;
using LearningHub.Nhs.Models.Dashboard;
using LearningHub.Nhs.Models.Enums;
using LearningHub.Nhs.Models.Moodle;
using LearningHub.Nhs.Models.Moodle.API;
using LearningHub.Nhs.Models.MyLearning;
using LearningHub.Nhs.Models.Provider;
using LearningHub.Nhs.OpenApi.Repositories.Interface.Repositories;
using LearningHub.Nhs.OpenApi.Repositories.Interface.Repositories.Activity;
using LearningHub.Nhs.Models.Provider;
using LearningHub.Nhs.OpenApi.Repositories.Interface.Repositories.Hierarchy;
using LearningHub.Nhs.OpenApi.Repositories.Interface.Repositories.Resources;
using LearningHub.Nhs.OpenApi.Repositories.Repositories.Activity;
using LearningHub.Nhs.OpenApi.Services.Interface.Services;
using LearningHub.Nhs.Models.Entities.Resource;
using System.Diagnostics;

/// <summary>
/// The DashboardService.
Expand Down Expand Up @@ -277,7 +275,8 @@ public async Task<MyLearningActivitiesDetailedViewModel> GetMyInprogressLearning

if (entrolledCourses != null)
{
mappedEnrolledCourses = entrolledCourses?.Results?
var courses = entrolledCourses?.Results ?? Enumerable.Empty<CompletionResult>();
mappedEnrolledCourses = courses
.Where(r => r.Data?.Courses != null)
.SelectMany(r => r.Data.Courses)
.Select(course => new MyLearningCombinedActivitiesViewModel
Expand Down Expand Up @@ -357,7 +356,7 @@ public async Task<MyLearningCertificatesDetailedViewModel> GetUserCertificateDet
}

// Await all active tasks in parallel
if (courseCertificatesTask != null & dashboardTrayLearningResourceType == "all")
if (courseCertificatesTask != null && dashboardTrayLearningResourceType == "all")
await Task.WhenAll(courseCertificatesTask, resourceCertificatesTask);
else if (dashboardTrayLearningResourceType == "elearning")
await resourceCertificatesTask;
Expand Down Expand Up @@ -390,7 +389,7 @@ public async Task<MyLearningCertificatesDetailedViewModel> GetUserCertificateDet
CertificateDownloadUrl = c.DownloadLink,
ResourceVersionId = 0,
ProvidersJson = null
});
}) ?? Enumerable.Empty<UserCertificateViewModel>();
}

var allCertificates = resourceCertificates.Concat(mappedCourseCertificates);
Expand Down
6 changes: 3 additions & 3 deletions OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/MyLearningService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ public async Task<MyLearningActivitiesDetailedViewModel> GetUserRecentMyLearning
CertificateAwardedDate = course.EndDate.HasValue
? DateTimeOffset.FromUnixTimeSeconds(course.EndDate.Value)
: DateTimeOffset.MinValue,
}).ToList();
}).ToList()?? new List<MyLearningCombinedActivitiesViewModel>(); ;
}

// Combine both result sets
Expand Down Expand Up @@ -397,7 +397,7 @@ public async Task<MyLearningActivitiesDetailedViewModel> GetUserLearningHistoryA
CertificateAwardedDate = course.EndDate.HasValue
? DateTimeOffset.FromUnixTimeSeconds(course.EndDate.Value)
: DateTimeOffset.MinValue,
}).ToList();
}).ToList()?? new List<MyLearningCombinedActivitiesViewModel>();
}
}

Expand Down Expand Up @@ -763,7 +763,7 @@ public async Task<MyLearningCertificatesDetailedViewModel> GetUserCertificateDet
CertificateDownloadUrl = c.DownloadLink,
ResourceVersionId = 0,
ProvidersJson = null,
});
}) ?? Enumerable.Empty<UserCertificateViewModel>();
}

var allCertificates = resourceCertificates.Concat(mappedCourseCertificates);
Expand Down
Loading