Skip to content

Fixed the SIT issues #1390

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
merged 2 commits into from
Sep 9, 2025
Merged

Fixed the SIT issues #1390

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
f6e5da1
Fixed the SIT issues
swapnamol-abraham Sep 8, 2025
d0cb76f
Removed the hardcoded value
swapnamol-abraham Sep 8, 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
12 changes: 6 additions & 6 deletions OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/MoodleApiService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ public async Task<List<MoodleEnrolledCourseResponseModel>> GetRecentEnrolledCour
{
try
{
var moodleUser = this.GetMoodleUserIdByUsernameAsync(userId);
int moodleUserId = await this.GetMoodleUserIdByUsernameAsync(userId);
string statusFilter = string.Empty; ;

if ((requestModel.Incomplete && requestModel.Complete) || (!requestModel.Incomplete && !requestModel.Complete))
Expand All @@ -133,7 +133,7 @@ public async Task<List<MoodleEnrolledCourseResponseModel>> GetRecentEnrolledCour

var parameters = new Dictionary<string, string>
{
{ "userid", moodleUser.Id.ToString() },
{ "userid", moodleUserId.ToString() },
{ "months", months.ToString() },
{ "statusfilter", statusFilter },
{ "search", requestModel.SearchText ?? string.Empty }
Expand Down Expand Up @@ -166,7 +166,7 @@ public async Task<List<MoodleEnrolledCourseResponseModel>> GetEnrolledCoursesHis
{
try
{
var moodleUser = this.GetMoodleUserIdByUsernameAsync(userId);
int moodleUserId = await this.GetMoodleUserIdByUsernameAsync(userId);
string statusFilter = string.Empty;

if ((requestModel.Incomplete && requestModel.Complete) || (!requestModel.Incomplete && !requestModel.Complete))
Expand All @@ -184,7 +184,7 @@ public async Task<List<MoodleEnrolledCourseResponseModel>> GetEnrolledCoursesHis

var parameters = new Dictionary<string, string>
{
{ "userid", moodleUser.Id.ToString() },
{ "userid", moodleUserId.ToString() },
{ "statusfilter", statusFilter },
{ "search", requestModel.SearchText ?? string.Empty }
};
Expand Down Expand Up @@ -216,10 +216,10 @@ public async Task<List<MoodleUserCertificateResponseModel>> GetUserCertificateAs
{
try
{
var moodleUser = this.GetMoodleUserIdByUsernameAsync(userId);
int moodleUserId = await this.GetMoodleUserIdByUsernameAsync(userId);
var parameters = new Dictionary<string, string>
{
{ "userid", moodleUser.Id.ToString() },
{ "userid", moodleUserId.ToString() },
{ "searchterm", filterText }
};

Expand Down
104 changes: 52 additions & 52 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 @@ -157,61 +157,61 @@ public async Task<MyLearningDetailedViewModel> GetActivityDetailed(int userId, M
/// <returns>The <see cref="Task"/>.</returns>
public async Task<MyLearningActivitiesDetailedViewModel> GetUserRecentMyLearningActivitiesAsync(int userId, MyLearningRequestModel requestModel)
{
var result = await resourceActivityRepository.GetUserRecentMyLearningActivities(userId, requestModel);
var result = await resourceActivityRepository.GetUserRecentMyLearningActivities(userId, requestModel);

var entrolledCourses = await this.moodleApiService.GetRecentEnrolledCoursesAsync(userId, requestModel, 6);
var entrolledCourses = await this.moodleApiService.GetRecentEnrolledCoursesAsync(userId, requestModel, 6);

var mappedMyLearningActivities = result.Select(Activity => new MyLearningCombinedActivitiesViewModel
{
UserId = userId,
ResourceId = Activity.ResourceId,
ResourceVersionId = Activity.ResourceVersionId,
ResourceReferenceId = Activity.ResourceReferenceId,
IsCurrentResourceVersion = Activity.IsCurrentResourceVersion,
MajorVersion = Activity.MajorVersion,
MinorVersion = Activity.MinorVersion,
ResourceType = Activity.ResourceType,
Title = Activity.Title,
CertificateEnabled = Activity.CertificateEnabled,
ActivityStatus = Activity.ActivityStatus,
ActivityDate = Activity.ActivityDate,
ScorePercentage = Activity.ScorePercentage,
TotalActivities = 0,
CompletedActivities = 0,
}).ToList();

var mappedEnrolledCourses = entrolledCourses.Select(course => new MyLearningCombinedActivitiesViewModel
{
UserId = userId,
ResourceId = (int)course.Id,
ResourceVersionId = (int)course.Id,
IsCurrentResourceVersion = true,
ResourceReferenceId = (int)course.Id,
MajorVersion = 1,
MinorVersion = 0,
ResourceType = ResourceTypeEnum.Moodle,
Title = course.DisplayName,
CertificateEnabled = course.CertificateEnabled,
ActivityStatus = (course.Completed == true || course.ProgressPercentage.TrimEnd('%') == "100") ? ActivityStatusEnum.Completed : ActivityStatusEnum.Incomplete,
ActivityDate = DateTimeOffset.FromUnixTimeMilliseconds((long)course.LastAccess),
ScorePercentage = Convert.ToInt32(course.ProgressPercentage.TrimEnd('%')),
TotalActivities = course.TotalActivities,
CompletedActivities = course.CompletedActivities,
}).ToList();

// Combine both result sets
var combainedUserActivities = mappedMyLearningActivities.Concat(mappedEnrolledCourses).ToList();

var pagedResults = combainedUserActivities.OrderByDescending(activity => activity.ActivityDate).Skip(requestModel.Skip).Take(requestModel.Take).ToList();
var mappedMyLearningActivities = result.Select(Activity => new MyLearningCombinedActivitiesViewModel
{
UserId = userId,
ResourceId = Activity.ResourceId,
ResourceVersionId = Activity.ResourceVersionId,
ResourceReferenceId = Activity.ResourceReferenceId,
IsCurrentResourceVersion = Activity.IsCurrentResourceVersion,
MajorVersion = Activity.MajorVersion,
MinorVersion = Activity.MinorVersion,
ResourceType = Activity.ResourceType,
Title = Activity.Title,
CertificateEnabled = Activity.CertificateEnabled,
ActivityStatus = Activity.ActivityStatus,
ActivityDate = Activity.ActivityDate,
ScorePercentage = Activity.ScorePercentage,
TotalActivities = 0,
CompletedActivities = 0,
}).ToList();

var mappedEnrolledCourses = entrolledCourses.Select(course => new MyLearningCombinedActivitiesViewModel
{
UserId = userId,
ResourceId = (int)course.Id,
ResourceVersionId = (int)course.Id,
IsCurrentResourceVersion = true,
ResourceReferenceId = (int)course.Id,
MajorVersion = 1,
MinorVersion = 0,
ResourceType = ResourceTypeEnum.Moodle,
Title = course.DisplayName,
CertificateEnabled = course.CertificateEnabled,
ActivityStatus = (course.Completed == true || course.ProgressPercentage.TrimEnd('%') == "100") ? ActivityStatusEnum.Completed : ActivityStatusEnum.Incomplete,
ActivityDate = DateTimeOffset.FromUnixTimeMilliseconds(course.LastAccess ?? 0),
ScorePercentage = Convert.ToInt32(course.ProgressPercentage.TrimEnd('%')),
TotalActivities = course.TotalActivities,
CompletedActivities = course.CompletedActivities,
}).ToList();

// Count total records.
MyLearningActivitiesDetailedViewModel viewModel = new MyLearningActivitiesDetailedViewModel()
{
TotalCount = combainedUserActivities.Count(),
Activities = pagedResults,
};
// Combine both result sets
var combainedUserActivities = mappedMyLearningActivities.Concat(mappedEnrolledCourses).ToList();

return viewModel;
var pagedResults = combainedUserActivities.OrderByDescending(activity => activity.ActivityDate).Skip(requestModel.Skip).Take(requestModel.Take).ToList();

// Count total records.
MyLearningActivitiesDetailedViewModel viewModel = new MyLearningActivitiesDetailedViewModel()
{
TotalCount = combainedUserActivities.Count(),
Activities = pagedResults,
};

return viewModel;
}

/// <summary>
Expand Down Expand Up @@ -298,7 +298,7 @@ public async Task<MyLearningActivitiesDetailedViewModel> GetUserLearningHistoryA
Title = course.DisplayName,
CertificateEnabled = course.CertificateEnabled,
ActivityStatus = (course.Completed == true || course.ProgressPercentage.TrimEnd('%') == "100") ? ActivityStatusEnum.Completed : ActivityStatusEnum.Incomplete,
ActivityDate = DateTimeOffset.FromUnixTimeMilliseconds((long)course.LastAccess),
ActivityDate = DateTimeOffset.FromUnixTimeMilliseconds(course.LastAccess ?? 0),
ScorePercentage = int.TryParse(course.ProgressPercentage.TrimEnd('%'), out var score) ? score : 0,
TotalActivities = course.TotalActivities,
CompletedActivities = course.CompletedActivities,
Expand Down
Loading