Merge pull request #1530 from TechnologyEnhancedLearning/RC

TEST

Author: AnjuJose011

AdminUI/LearningHub.Nhs.AdminUI/Configuration/MoodleApiConfig.cs

@@ -0,0 +1,33 @@
+namespace LearningHub.Nhs.AdminUI.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";
+    }
+}

AdminUI/LearningHub.Nhs.AdminUI/Controllers/CatalogueController.cs

@@ -1,28 +1,28 @@
 namespace LearningHub.Nhs.AdminUI.Controllers
 {
-    using System;
-    using System.Collections.Generic;
-    using System.ComponentModel.DataAnnotations;
-    using System.Drawing;
-    using System.Linq;
-    using System.Net.Mail;
-    using System.Text.RegularExpressions;
-    using System.Threading.Tasks;
     using LearningHub.Nhs.AdminUI.Configuration;
     using LearningHub.Nhs.AdminUI.Extensions;
     using LearningHub.Nhs.AdminUI.Interfaces;
     using LearningHub.Nhs.AdminUI.Models;
     using LearningHub.Nhs.Models.Catalogue;
     using LearningHub.Nhs.Models.Common;
-    using LearningHub.Nhs.Models.Common.Enums;
+    using LearningHub.Nhs.Models.Moodle;
     using LearningHub.Nhs.Models.Paging;
     using LearningHub.Nhs.Models.Resource;
     using LearningHub.Nhs.Models.User;
     using Microsoft.AspNetCore.Hosting;
     using Microsoft.AspNetCore.Http;
     using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
     using Microsoft.Extensions.Logging;
     using Microsoft.Extensions.Options;
+    using System;
+    using System.Collections.Generic;
+    using System.Drawing;
+    using System.Linq;
+    using System.Net;
+    using System.Text.RegularExpressions;
+    using System.Threading.Tasks;
 
     /// <summary>
     /// Defines the <see cref="CatalogueController" />.
@@ -65,6 +65,11 @@ public class CatalogueController : BaseController
         /// </summary>
         private readonly IProviderService providerService;
 
+        /// <summary>
+        /// Defines the moodleApiService.
+        /// </summary>
+        private readonly IMoodleApiService moodleApiService;
+
         /// <summary>
         /// Defines the _settings.
         /// </summary>
@@ -98,6 +103,7 @@ public class CatalogueController : BaseController
         /// <param name="userGroupService">The userService<see cref="IUserGroupService"/>.</param>
         /// <param name="fileService">The fileService<see cref="IFileService"/>.</param>
         /// <param name="providerService">The providerService<see cref="IProviderService"/>.</param>
+        /// <param name="moodleApiService">The moodleApiService<see cref="IMoodleApiService"/>.</param>
         /// <param name="logger">The logger<see cref="ILogger{LogController}"/>.</param>
         /// <param name="options">The options<see cref="IOptions{WebSettings}"/>.</param>
         /// <param name="websettings">The websettings<see cref="IOptions{WebSettings}"/>.</param>
@@ -107,6 +113,7 @@ public CatalogueController(
             IUserGroupService userGroupService,
             IFileService fileService,
             IProviderService providerService,
+            IMoodleApiService moodleApiService,
             ILogger<LogController> logger,
             IOptions<WebSettings> options,
             IOptions<WebSettings> websettings)
@@ -116,6 +123,7 @@ public CatalogueController(
             this.userGroupService = userGroupService;
             this.fileService = fileService;
             this.providerService = providerService;
+            this.moodleApiService = moodleApiService;
             this.logger = logger;
             this.websettings = websettings;
             this.settings = options.Value;
@@ -254,6 +262,38 @@ public async Task<IActionResult> CatalogueOwner(int id)
             return this.View(vm);
         }
 
+        /// <summary>
+        /// The CatalogueOwner.
+        /// </summary>
+        /// <param name="id">The id<see cref="int"/>.</param>
+        /// <returns>The <see cref="Task{IActionResult}"/>.</returns>
+        [HttpGet]
+        [Route("MoodleCategory/{id}")]
+        public async Task<IActionResult> MoodleCategory(int id)
+        {
+            var vm = await this.catalogueService.GetCatalogueAsync(id);
+            if (vm == null)
+            {
+                return this.RedirectToAction("Error");
+            }
+
+            var categories = await this.moodleApiService.GetAllMoodleCategoriesAsync();
+
+            vm.MoodleCategories = categories;
+
+            // Build hierarchical select list
+            var selectList = BuildList(categories, parentId: null, depth: 0);
+            foreach (var item in selectList)
+            {
+                item.Text = WebUtility.HtmlDecode(item.Text);
+            }
+            vm.MoodleCategorySelectList = new SelectList(selectList, "Value", "Text");
+            this.ViewData["CatalogueName"] = vm.Name;
+            this.ViewData["id"] = id;
+
+            return this.View(vm);
+        }
+
         /// <summary>
         /// The UserGroups.
         /// </summary>
@@ -678,6 +718,77 @@ public async Task<IActionResult> AddUserGroupsToCatalogue(int catalogueNodeId, i
             }
         }
 
+        /// <summary>
+        /// The AddCategoryToCatalogue.
+        /// </summary>
+        /// <param name="catalogueViewModel">The catalogueViewModel<see cref="CatalogueViewModel"/>.</param>
+        /// <returns>The <see cref="Task{IActionResult}"/>.</returns>
+        [HttpPost]
+        [Route("AddCategoryToCatalogue")]
+        public async Task<IActionResult> AddCategoryToCatalogue(CatalogueViewModel catalogueViewModel)
+        {
+            if (catalogueViewModel.SelectedCategoryId == 0)
+            {
+                this.ModelState.AddModelError("SelectedCategoryId", "Please select a category.");
+            }
+            var vm = await this.catalogueService.GetCatalogueAsync(catalogueViewModel.CatalogueNodeVersionId);
+            vm.SelectedCategoryId = catalogueViewModel.SelectedCategoryId;
+            var vr = await this.catalogueService.AddCategoryToCatalogue(vm);
+            if (vr.Success)
+            {
+                var categories = await this.moodleApiService.GetAllMoodleCategoriesAsync();
+                vm.MoodleCategories = categories;
+                // Build hierarchical select list
+                var selectList = BuildList(categories, parentId: null, depth: 0);
+      
+                foreach (var item in selectList)
+                {
+                    item.Text = WebUtility.HtmlDecode(item.Text);
+                }
+
+                vm.MoodleCategorySelectList = new SelectList(selectList, "Value", "Text");
+                return this.View("MoodleCategory", vm);
+            }
+            else
+            {
+                this.ViewBag.ErrorMessage = $"Category Update failed.";
+                return this.View("MoodleCategory", vm);
+            }
+        }
+
+        /// <summary>
+        /// The RemoveCategoryFromCatalogue.
+        /// </summary>
+        /// <param name="categoryId">The categoryId/>.</param>
+        /// <param name="catalogueNodeVersionId">The CatalogueNodeVersionId.</param>
+        /// <returns>The <see cref="Task{IActionResult}"/>.</returns>
+        [HttpGet]
+        [Route("RemoveCategoryFromCatalogue/{categoryId}/{catalogueNodeVersionId}")]
+        public async Task<IActionResult> RemoveCategoryFromCatalogue(int categoryId, int catalogueNodeVersionId)
+        {
+            var vm = await this.catalogueService.GetCatalogueAsync(catalogueNodeVersionId);
+            vm.SelectedCategoryId = categoryId;
+            var vr = await this.catalogueService.RemoveCategoryFromCatalogue(vm);
+            if (vr.Success)
+            {
+                var categories = await this.moodleApiService.GetAllMoodleCategoriesAsync();
+                vm.MoodleCategories = categories;
+                vm.SelectedCategoryId = 0;
+                // Build hierarchical select list
+                var selectList = BuildList(categories, parentId: null, depth: 0);
+                foreach (var item in selectList)
+                {
+                    item.Text = WebUtility.HtmlDecode(item.Text);
+                }
+                vm.MoodleCategorySelectList = new SelectList(selectList, "Value", "Text");
+                return this.View("MoodleCategory", vm);
+            }
+            else
+            {
+                this.ViewBag.ErrorMessage = $"Category update failed.";
+                return this.View("MoodleCategory", vm);
+            }
+        }
         /// <summary>
         /// The CreateCatalogue.
         /// </summary>
@@ -978,5 +1089,34 @@ private void ValidateCatalogueOwnerVm(CatalogueOwnerViewModel vm)
                 this.ModelState.AddModelError("Notes", "The notes are required.");
             }
         }
+
+        private List<SelectListItem> BuildList(IEnumerable<MoodleCategory> allCategories, int? parentId, int depth)
+        {
+            var selectList = new List<SelectListItem>();
+
+            // Handle both null and 0 as top-level depending on Moodle data
+            var children = allCategories
+                .Where(c => c.Parent == parentId || (parentId == null && (c.Parent == 0 || c.Parent == 0)))
+                .OrderBy(c => c.Name)
+                .ToList();
+
+            foreach (var child in children)
+            {
+                // Indent with non-breaking spaces so browser keeps them
+                string indent = new string('\u00A0', depth * 3);
+
+                selectList.Add(new SelectListItem
+                {
+                    Value = child.Id.ToString(),
+                    Text = $"{indent}{child.Name}"
+                });
+
+                // Recursively add nested children
+                selectList.AddRange(BuildList(allCategories, child.Id, depth + 1));
+            }
+
+            return selectList;
+        }
+
     }
 }

AdminUI/LearningHub.Nhs.AdminUI/Interfaces/ICatalogueService.cs

@@ -69,5 +69,19 @@ public interface ICatalogueService
         /// <param name="catalogueOwner">The catalogue owner<see cref="CatalogueOwnerViewModel"/>.</param>
         /// <returns>The <see cref="Task"/>.</returns>
         Task<ApiResponse> UpdateCatalogueOwnerAsync(CatalogueOwnerViewModel catalogueOwner);
+
+        /// <summary>
+        /// AddCategoryToCatalogue
+        /// </summary>
+        /// <param name="catalogue">The catalogue.</param>
+        /// <returns></returns>
+        Task<ApiResponse> AddCategoryToCatalogue(CatalogueViewModel catalogue);
+
+        /// <summary>
+        /// RemoveCategoryFromCatalogue
+        /// </summary>
+        /// <param name="catalogue">The catalogue.</param>
+        /// <returns></returns>
+        Task<ApiResponse> RemoveCategoryFromCatalogue(CatalogueViewModel catalogue);
     }
 }

AdminUI/LearningHub.Nhs.AdminUI/Interfaces/IMoodleApiService.cs

@@ -0,0 +1,26 @@
+namespace LearningHub.Nhs.AdminUI.Interfaces
+{
+    using System.Collections.Generic;
+    using System.Threading.Tasks;
+    using LearningHub.Nhs.Models.Moodle;
+    using LearningHub.Nhs.Models.Moodle.API;
+
+    /// <summary>
+    /// IMoodleApiService.
+    /// </summary>
+    public interface IMoodleApiService
+    {
+        /// <summary>
+        /// GetMoodleUserIdByUsernameAsync.
+        /// </summary>
+        /// <param name="currentUserId">The current LH User Id.</param>
+        /// <returns>A <see cref="Task{TResult}"/> representing the result of the asynchronous operation.</returns>
+        Task<int> GetMoodleUserIdByUsernameAsync(int currentUserId);
+
+        /// <summary>
+        /// GetEnrolledCoursesAsync.
+        /// </summary>
+        /// <returns> List of MoodleCategory.</returns>
+        Task<List<MoodleCategory>> GetAllMoodleCategoriesAsync();
+    }
+}

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="4.0.2" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.3" />
 		<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" />

AdminUI/LearningHub.Nhs.AdminUI/Models/CatalogueNavViewModel.cs

@@ -34,6 +34,11 @@ public enum CatalogueNavPage
         /// Defines the Catalogue Owner.
         /// </summary>
         CatalogueOwner,
+
+        /// <summary>
+        /// Defines the Category.
+        /// </summary>
+        Category
     }
 
     /// <summary>

AdminUI/LearningHub.Nhs.AdminUI/ServiceCollectionExtension.cs

@@ -106,6 +106,7 @@ public static void ConfigureServices(this IServiceCollection services, IConfigur
             services.AddTransient<IUserSessionHelper, UserSessionHelper>();
             services.AddTransient<IInternalSystemService, InternalSystemService>();
             services.AddScoped<IProviderService, ProviderService>();
+            services.AddScoped<IMoodleApiService, MoodleApiService>();
 
             // web settings binding
             var webSettings = new WebSettings();

AdminUI/LearningHub.Nhs.AdminUI/Services/CatalogueService.cs

@@ -1,14 +1,20 @@
 namespace LearningHub.Nhs.AdminUI.Services
 {
+    using System;
     using System.Collections.Generic;
     using System.Net;
+    using System.Net.Http;
+    using System.Text;
     using System.Threading.Tasks;
     using LearningHub.Nhs.AdminUI.Helpers;
     using LearningHub.Nhs.AdminUI.Interfaces;
     using LearningHub.Nhs.Models.Catalogue;
     using LearningHub.Nhs.Models.Common;
+    using LearningHub.Nhs.Models.Enums;
     using LearningHub.Nhs.Models.Paging;
     using LearningHub.Nhs.Models.Provider;
+    using LearningHub.Nhs.Models.User;
+    using LearningHub.Nhs.Models.Validation;
     using Newtonsoft.Json;
 
     /// <summary>
@@ -132,5 +138,25 @@ public async Task<ApiResponse> UpdateCatalogueOwnerAsync(CatalogueOwnerViewModel
         {
             return await this.facade.PutAsync("Catalogue/UpdateCatalogueOwner", catalogueOwner);
         }
+
+        /// <summary>
+        /// The AddUserGroupsToCatalogue.
+        /// </summary>
+        /// <param name="catalogue">The CatalogueViewModel.</param>
+        /// <returns>The <see cref="Task{IActionResult}"/>.</returns>
+        public async Task<ApiResponse> AddCategoryToCatalogue(CatalogueViewModel catalogue)
+        {
+            return await this.facade.PostAsync<ApiResponse, CatalogueViewModel>("Catalogue/AddCategoryToCatalogue", catalogue);
+        }
+
+        /// <summary>
+        /// The RemoveCategoryFromCatalogue.
+        /// </summary>
+        /// <param name="catalogue">The CatalogueViewModel.</param>
+        /// <returns>The <see cref="Task{IActionResult}"/>.</returns>
+        public async Task<ApiResponse> RemoveCategoryFromCatalogue(CatalogueViewModel catalogue)
+        {
+            return await this.facade.PostAsync<ApiResponse, CatalogueViewModel>("Catalogue/RemoveCategoryFromCatalogue", catalogue);
+        }    
     }
 }