Merge Unified platform changes to Test

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

@@ -83,13 +83,13 @@
 		<PackageReference Include="Azure.Storage.Blobs" Version="12.23.0" />
 		<PackageReference Include="Azure.Storage.Files.Shares" Version="12.8.0" />
 		<PackageReference Include="BuildWebCompiler" Version="1.12.405" />
-		<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.9" />
+		<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.11" />
 		<PackageReference Include="FluentValidation" Version="11.11.0" />
 		<PackageReference Include="FluentValidation.AspNetCore" Version="11.3.0" />
 		<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

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
 		<TargetFramework>net8.0</TargetFramework>
@@ -11,7 +11,9 @@
 	</PropertyGroup>
 
 	<ItemGroup>
+		<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.11" />
 		<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);
+        }
     }
 }

LearningHub.Nhs.WebUI/Controllers/LoginWizardController.cs

@@ -144,31 +144,7 @@ public async Task<IActionResult> Index(string returnUrl)
 
             if (currentStage?.Id == (int)LoginWizardStageEnum.SecurityQuestions)
             {
-                SecurityQuestionsViewModel securityQuestions = await this.loginWizardService.GetSecurityQuestionsModel(this.CurrentUserId);
-
-                while (securityQuestions.UserSecurityQuestions.Count < this.Settings.SecurityQuestionsToAsk)
-                {
-                    securityQuestions.UserSecurityQuestions.Add(new UserSecurityQuestionViewModel());
-                }
-
-                foreach (var answer in securityQuestions.UserSecurityQuestions)
-                {
-                    if (!string.IsNullOrEmpty(answer.SecurityQuestionAnswerHash))
-                    {
-                        answer.SecurityQuestionAnswerHash = "********";
-                    }
-                }
-
-                this.TempData.Clear();
-                var securityViewModel = new SecurityViewModel()
-                {
-                    SecurityQuestions = securityQuestions.SecurityQuestions,
-                    UserSecurityQuestions = securityQuestions.UserSecurityQuestions,
-                };
-
-                await this.multiPageFormService.SetMultiPageFormData(securityViewModel, MultiPageFormDataFeature.EditRegistrationPrompt, this.TempData);
-
-                return this.RedirectToAction("SelectSecurityQuestion", new RouteValueDictionary { { "questionIndex", 0 }, { "returnUrl", returnUrl } });
+                return this.RedirectToAction("SelectSecurityQuestions", new { returnUrl });
             }
 
             if (currentStage?.Id == (int)LoginWizardStageEnum.JobRole || currentStage?.Id == (int)LoginWizardStageEnum.PlaceOfWork || currentStage?.Id == (int)LoginWizardStageEnum.PersonalDetails)
@@ -213,11 +189,19 @@ await this.multiPageFormService.SetMultiPageFormData(
                     {
                         return this.RedirectToAction("AccountInformationNeeded");
                     }
+                    else if (currentStage?.Id == (int)LoginWizardStageEnum.JobRole || currentStage?.Id == (int)LoginWizardStageEnum.PlaceOfWork)
+                    {
+                        return this.RedirectToAction("MyEmploymentDetails", "MyAccount", new { returnUrl, checkDetails = true });
+                    }
                     else
                     {
                         return this.RedirectToAction("Index", "MyAccount", new { returnUrl, checkDetails = true });
                     }
                 }
+                else if (currentStage?.Id == (int)LoginWizardStageEnum.JobRole || currentStage?.Id == (int)LoginWizardStageEnum.PlaceOfWork)
+                {
+                    return this.RedirectToAction("MyEmploymentDetails", "MyAccount", new { returnUrl, checkDetails = true });
+                }
                 else
                 {
                     return this.RedirectToAction("Index", "MyAccount", new { returnUrl, checkDetails = true });
@@ -585,6 +569,106 @@ public async Task<ActionResult> AccountConfirmationPost()
             return this.RedirectToAction("Index", new RouteValueDictionary { { "returnUrl", accountModel.WizardReturnUrl } });
         }
 
+        /// <summary>
+        /// Action for starting the security question multiPageForm stage of the wizard.
+        /// </summary>
+        /// <param name="returnUrl">The URL to return to after the login wizard has been completed.</param>
+        /// <returns>The <see cref="Task{IActionResult}"/>.</returns>
+        [ResponseCache(CacheProfileName = "Never")]
+        public async Task<IActionResult> SelectSecurityQuestions(string returnUrl)
+        {
+            MyAcountSecurityQuestionsViewModel securityViewModel = new MyAcountSecurityQuestionsViewModel();
+            var result = await this.loginWizardService.GetSecurityQuestionsModel(this.CurrentUserId);
+
+            if (result != null)
+            {
+                securityViewModel.FirstSecurityQuestions = SelectListHelper.MapSelectListWithSelection(result.SecurityQuestions, Convert.ToString(securityViewModel.SelectedFirstQuestionId));
+                securityViewModel.SecondSecurityQuestions = SelectListHelper.MapSelectListWithSelection(result.SecurityQuestions, Convert.ToString(securityViewModel.SelectedSecondQuestionId));
+            }
+
+            this.ViewBag.ReturnUrl = returnUrl;
+            return this.View("SecurityQuestionsDetails", securityViewModel);
+        }
+
+        /// <summary>
+        /// Action for choosing security questions.
+        /// </summary>
+        /// <param name="model">The MyAcountSecurityQuestionsViewModel.</param>
+        /// <param name="returnUrl">The URL to return to after the login wizard has been completed.</param>
+        /// <returns>The <see cref="Task{IActionResult}"/>.</returns>
+        [HttpPost]
+        [ResponseCache(CacheProfileName = "Never")]
+        public async Task<IActionResult> UpdateSecurityQuestionPost(MyAcountSecurityQuestionsViewModel model, string returnUrl)
+        {
+            MyAcountSecurityQuestionsViewModel securityViewModel = new MyAcountSecurityQuestionsViewModel();
+            var result = await this.loginWizardService.GetSecurityQuestionsModel(this.CurrentUserId);
+
+            if (result != null)
+            {
+                securityViewModel.FirstSecurityQuestions = SelectListHelper.MapSelectListWithSelection(result.SecurityQuestions, Convert.ToString(securityViewModel.SelectedFirstQuestionId));
+                securityViewModel.SecondSecurityQuestions = SelectListHelper.MapSelectListWithSelection(result.SecurityQuestions, Convert.ToString(securityViewModel.SelectedSecondQuestionId));
+            }
+
+            if (model != null)
+            {
+                if (model.SelectedFirstQuestionId == model.SelectedSecondQuestionId)
+                {
+                    this.ModelState.AddModelError("DuplicateQuestion", CommonValidationErrorMessages.DuplicateQuestion);
+                }
+
+                if (model.SelectedFirstQuestionId > 0 && string.IsNullOrEmpty(model.SecurityFirstQuestionAnswerHash))
+                {
+                    this.ModelState.AddModelError(nameof(model.SecurityFirstQuestionAnswerHash), CommonValidationErrorMessages.InvalidSecurityQuestionAnswer);
+                }
+
+                if (model.SelectedSecondQuestionId > 0 && string.IsNullOrEmpty(model.SecuritySecondQuestionAnswerHash))
+                {
+                    this.ModelState.AddModelError(nameof(model.SecuritySecondQuestionAnswerHash), CommonValidationErrorMessages.InvalidSecurityQuestionAnswer);
+                }
+
+                if (this.ModelState.IsValid)
+                {
+                    var userSecurityQuestions = new List<UserSecurityQuestionViewModel>
+                {
+                    new UserSecurityQuestionViewModel
+                    {
+                        SecurityQuestionId = model.SelectedFirstQuestionId,
+                        SecurityQuestionAnswerHash = model.SecurityFirstQuestionAnswerHash,
+                        UserId = this.CurrentUserId,
+                    },
+                    new UserSecurityQuestionViewModel
+                    {
+                        SecurityQuestionId = model.SelectedSecondQuestionId,
+                        SecurityQuestionAnswerHash = model.SecuritySecondQuestionAnswerHash,
+                        UserId = this.CurrentUserId,
+                    },
+                };
+
+                    await this.userService.UpdateUserSecurityQuestions(userSecurityQuestions);
+
+                    // Mark stage complete.
+                    var (cacheExists, loginWizard) = await this.cacheService.TryGetAsync<LoginWizardViewModel>(this.LoginWizardCacheKey);
+
+                    if (cacheExists)
+                    {
+                        await this.CompleteLoginWizardStageAsync(loginWizard, LoginWizardStageEnum.SecurityQuestions);
+                        this.TempData.Clear();
+                        return this.RedirectToAction("Index", new RouteValueDictionary { { "returnUrl", returnUrl } });
+                    }
+
+                    this.TempData.Clear();
+                    return this.Redirect("/");
+                }
+                else
+                {
+                    this.ViewBag.ReturnUrl = returnUrl;
+                    return this.View("SecurityQuestionsDetails", securityViewModel);
+                }
+            }
+
+            return this.View("SecurityQuestionsDetails", securityViewModel);
+        }
+
         /// <summary>
         /// The complete login wizard stage.
         /// </summary>