Merge pull request #1373 from TechnologyEnhancedLearning/Develop/Fixes/To-check-Recent-learning-issue

Removed the commented code

Author: AnjuJose011

OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/MyLearningService.cs

@@ -157,11 +157,9 @@ public async Task<MyLearningDetailedViewModel> GetActivityDetailed(int userId, M
         /// <returns>The <see cref="Task"/>.</returns>
         public async Task<MyLearningActivitiesDetailedViewModel> GetUserRecentMyLearningActivitiesAsync(int userId, MyLearningRequestModel requestModel)
         {
-            try
-            {
                 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
                 {
@@ -182,28 +180,27 @@ public async Task<MyLearningActivitiesDetailedViewModel> GetUserRecentMyLearning
                     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();
+                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 combainedUserActivities = mappedMyLearningActivities.ToList();
+                var combainedUserActivities = mappedMyLearningActivities.Concat(mappedEnrolledCourses).ToList();
 
                 var pagedResults = combainedUserActivities.OrderByDescending(activity => activity.ActivityDate).Skip(requestModel.Skip).Take(requestModel.Take).ToList();
 
@@ -215,11 +212,6 @@ public async Task<MyLearningActivitiesDetailedViewModel> GetUserRecentMyLearning
                 };
 
                 return viewModel;
-            }
-            catch (Exception ex)
-            {
-                return null;
-            }
         }
 
         /// <summary>