Merge pull request #1315 from TechnologyEnhancedLearning/Develop/Feature-Revised-My-Learning-implementation

Develop/feature revised my learning implementation

Author: swapnamol-abraham

AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj

@@ -89,7 +89,7 @@
 		<PackageReference Include="HtmlSanitizer" Version="6.0.453" />
 		<PackageReference Include="IdentityModel" Version="4.6.0" />
 		<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.2" />
-		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.48" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.52" />
 		<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.19.0" />
 		<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.36" />
 		<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.36" />

LearningHub.Nhs.WebUI.AutomatedUiTests/LearningHub.Nhs.WebUI.AutomatedUiTests.csproj

@@ -12,6 +12,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="FluentAssertions" Version="6.12.0" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.52" />
 		<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.13" />
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
 		<PackageReference Include="Selenium.Axe" Version="4.0.19" />

LearningHub.Nhs.WebUI/Configuration/MoodleApiConfig.cs

@@ -0,0 +1,33 @@
+namespace LearningHub.Nhs.WebUI.Configuration
+{
+    /// <summary>
+    /// The Moodle Settings.
+    /// </summary>
+    public class MoodleApiConfig
+    {
+        /// <summary>
+        /// Gets or sets the base url for the Moodle service.
+        /// </summary>
+        public string BaseUrl { get; set; } = null!;
+
+        /// <summary>
+        /// Gets or sets the Web service Rest Format.
+        /// </summary>
+        public string MoodleWSRestFormat { get; set; } = null!;
+
+        /// <summary>
+        /// Gets or sets the token.
+        /// </summary>
+        public string WSToken { get; set; } = null!;
+
+        /// <summary>
+        /// Gets or sets the token.
+        /// </summary>
+        public string ApiPath { get; set; } = "webservice/rest/server.php";
+
+        /// <summary>
+        /// Gets or sets the token.
+        /// </summary>
+        public string CoursePath { get; set; } = "course/view.php";
+    }
+}

LearningHub.Nhs.WebUI/Controllers/Api/MyLearningController.cs

@@ -44,6 +44,34 @@ public async Task<ActionResult> GetActivityDetailed([FromBody] MyLearningRequest
             return this.Ok(activity);
         }
 
+        /// <summary>
+        /// Gets the detailed activity data.
+        /// </summary>
+        /// <param name="requestModel">The request model - filter settings.</param>
+        /// <returns>The <see cref="Task"/>.</returns>
+        [HttpPost]
+        [Route("GetUserRecentMyLearningActivities")]
+        public async Task<ActionResult> GetUserRecentMyLearningActivities([FromBody] MyLearningRequestModel requestModel)
+        {
+            var activity = await this.myLearningService.GetUserRecentMyLearningActivities(requestModel);
+
+            return this.Ok(activity);
+        }
+
+        /// <summary>
+        /// Gets the detailed activity data.
+        /// </summary>
+        /// <param name="requestModel">The request model - filter settings.</param>
+        /// <returns>The <see cref="Task"/>.</returns>
+        [HttpPost]
+        [Route("GetUserLearningHistory")]
+        public async Task<ActionResult> GetUserLearningHistory([FromBody] MyLearningRequestModel requestModel)
+        {
+            var activity = await this.myLearningService.GetUserLearningHistory(requestModel);
+
+            return this.Ok(activity);
+        }
+
         /// <summary>
         /// Gets the played segment data for the progress modal in My Learning screen.
         /// </summary>

LearningHub.Nhs.WebUI/Controllers/ContributeController.cs

@@ -28,6 +28,7 @@ public class ContributeController : BaseController
         private readonly IFileService fileService;
         private readonly IResourceService resourceService;
         private readonly IUserService userService;
+        private readonly IUserGroupService userGroupService;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ContributeController"/> class.
@@ -37,6 +38,7 @@ public class ContributeController : BaseController
         /// <param name="logger">Logger.</param>
         /// <param name="settings">Settings.</param>
         /// <param name="userService">User service.</param>
+        /// <param name="userGroupService"> userGroupService.</param>
         /// <param name="fileService">File service.</param>
         /// <param name="resourceService">Resource service.</param>
         /// <param name="azureMediaService">Azure media service.</param>
@@ -48,6 +50,7 @@ public ContributeController(
             ILogger<ContributeController> logger,
             IOptions<Settings> settings,
             IUserService userService,
+            IUserGroupService userGroupService,
             IFileService fileService,
             IResourceService resourceService,
             IAzureMediaService azureMediaService,
@@ -58,6 +61,7 @@ public ContributeController(
             this.authConfig = authConfig;
 
             this.userService = userService;
+            this.userGroupService = userGroupService;
             this.fileService = fileService;
             this.resourceService = resourceService;
             this.azureMediaService = azureMediaService;
@@ -167,7 +171,8 @@ public async Task<IActionResult> CreateVersion(int resourceId)
         [Route("my-contributions/{selectedTab}/{catalogueId}/{nodeId}")]
         public async Task<IActionResult> MyContributions()
         {
-            if ((this.User.IsInRole("ReadOnly") || this.User.IsInRole("BasicUser")) && !await this.resourceService.UserHasPublishedResourcesAsync())
+            bool catalogueContributionPermission = await this.userGroupService.UserHasCatalogueContributionPermission();
+            if ((this.User.IsInRole("ReadOnly") || this.User.IsInRole("BasicUser")) || (!catalogueContributionPermission && (!await this.resourceService.UserHasPublishedResourcesAsync())))
             {
                 return this.RedirectToAction("AccessDenied", "Home");
             }

LearningHub.Nhs.WebUI/Controllers/HomeController.cs

@@ -11,6 +11,7 @@ namespace LearningHub.Nhs.WebUI.Controllers
     using LearningHub.Nhs.Models.Content;
     using LearningHub.Nhs.Models.Enums.Content;
     using LearningHub.Nhs.Models.Extensions;
+    using LearningHub.Nhs.Models.Moodle.API;
     using LearningHub.Nhs.WebUI.Configuration;
     using LearningHub.Nhs.WebUI.Filters;
     using LearningHub.Nhs.WebUI.Helpers;
@@ -218,13 +219,12 @@ public async Task<IActionResult> Index(string myLearningDashboard = "my-in-progr
                     var cataloguesTask = this.dashboardService.GetCataloguesAsync(catalogueDashboard, 1);
                     var userGroupsTask = this.userGroupService.UserHasCatalogueContributionPermission();
 
-                    var enrolledCoursesTask = Task.FromResult(new List<MoodleCourseResponseViewModel>());
-                    var enableMoodle = Task.Run(() => this.featureManager.IsEnabledAsync(FeatureFlags.EnableMoodle)).Result;
-                    this.ViewBag.EnableMoodle = enableMoodle;
-                    this.ViewBag.ValidMoodleUser = this.CurrentMoodleUserId > 0;
+                    var enrolledCoursesTask = Task.FromResult(new List<MoodleCourseResponseModel>());
+                    (bool enableMoodle, int currentMoodleUserId) = await this.GetMoodleFeatureStateAsync();
+
                     if (enableMoodle && myLearningDashboard == "my-enrolled-courses")
                     {
-                        enrolledCoursesTask = this.dashboardService.GetEnrolledCoursesFromMoodleAsync(this.CurrentMoodleUserId, 1);
+                        enrolledCoursesTask = this.dashboardService.GetEnrolledCoursesFromMoodleAsync(currentMoodleUserId, 1);
                     }
 
                     await Task.WhenAll(learningTask, resourcesTask, cataloguesTask, userGroupsTask);
@@ -280,9 +280,7 @@ public async Task<IActionResult> LoadPage(string dashBoardTray = "my-learning",
                     Catalogues = new Nhs.Models.Dashboard.DashboardCatalogueResponseViewModel { Type = catalogueDashBoard },
                 };
 
-                var enableMoodle = Task.Run(() => this.featureManager.IsEnabledAsync(FeatureFlags.EnableMoodle)).Result;
-                this.ViewBag.EnableMoodle = enableMoodle;
-                this.ViewBag.ValidMoodleUser = this.CurrentMoodleUserId > 0;
+                (bool enableMoodle, int currentMoodleUserId) = await this.GetMoodleFeatureStateAsync();
 
                 bool isAjax = this.HttpContext.Request.Headers["X-Requested-With"] == "XMLHttpRequest";
 
@@ -449,5 +447,28 @@ private async Task<LandingPageViewModel> GetLandingPageContent(bool preview = fa
                 return new LandingPageViewModel { PageSectionDetailViewModels = new List<PageSectionDetailViewModel>(), PageViewModel = new PageViewModel { PageSections = new List<PageSectionViewModel> { } } };
             }
         }
+
+        /// <summary>
+        /// Asynchronously retrieves the state of the Moodle feature and the current Moodle user ID.
+        /// </summary>
+        /// <remarks>The method checks if the Moodle feature is enabled and retrieves the current Moodle
+        /// user ID. If the user ID is not already set, it attempts to obtain it asynchronously from the dashboard
+        /// service.</remarks>
+        /// <returns>A tuple containing a boolean indicating whether the Moodle feature is enabled and an integer representing
+        /// the current Moodle user ID.</returns>
+        private async Task<(bool enableMoodle, int currentMoodleUserId)> GetMoodleFeatureStateAsync()
+        {
+            var enableMoodle = Task.Run(() => this.featureManager.IsEnabledAsync(FeatureFlags.EnableMoodle)).Result;
+            this.ViewBag.EnableMoodle = enableMoodle;
+            int currentMoodleUserId = this.CurrentMoodleUserId;
+
+            if (currentMoodleUserId == 0)
+            {
+                currentMoodleUserId = await this.dashboardService.GetMoodleUserIdAsync(this.CurrentUserId);
+            }
+
+            this.ViewBag.ValidMoodleUser = currentMoodleUserId > 0;
+            return (enableMoodle, currentMoodleUserId);
+        }
     }
 }