Merge pull request #1295 from TechnologyEnhancedLearning/Develop/Features/TD-5693_refactor_moodle

Develop/features/td 5693 refactor moodle

Author: binon

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/Helpers/ResourceTypeEnumMoodle.cs

@@ -19,24 +19,6 @@ public static class UtilityHelper
         /// Findwise resource type dictionary.
         /// </summary>
         public static readonly Dictionary<string, ResourceTypeEnum> FindwiseResourceTypeDict = new Dictionary<string, ResourceTypeEnum>()
-        {
-            { "video", ResourceTypeEnum.Video },
-            { "article", ResourceTypeEnum.Article },
-            { "case", ResourceTypeEnum.Case },
-            { "weblink", ResourceTypeEnum.WebLink },
-            { "audio", ResourceTypeEnum.Audio },
-            { "scorm", ResourceTypeEnum.Scorm },
-            { "assessment", ResourceTypeEnum.Assessment },
-            { "genericfile", ResourceTypeEnum.GenericFile },
-            { "image", ResourceTypeEnum.Image },
-            { "html", ResourceTypeEnum.Html },
-        };
-
-        /// TODO: Remove this method after adding to Moodle resource types to models project.
-        /// <summary>
-        /// Findwise Moodle resource type dictionary.
-        /// </summary>
-        public static readonly Dictionary<string, ResourceTypeEnum> FindwiseResourceMoodleTypeDict = new Dictionary<string, ResourceTypeEnum>()
         {
             { "video", ResourceTypeEnum.Video },
             { "article", ResourceTypeEnum.Article },
@@ -166,52 +148,6 @@ public static string GetPrettifiedResourceTypeName(ResourceTypeEnum resourceType
             }
         }
 
-        /// TODO: Remove this method after adding to Moodle resource types to models project.
-        /// <summary>
-        /// Returns a prettified resource type name, suitable for display in the UI. Includes video/audio duration string.
-        /// </summary>
-        /// <param name="resourceType">The resource type.</param>
-        /// <param name="durationInMilliseconds">The media duration in milliseconds.</param>
-        /// <returns>The resource type name, and duration if applicable.</returns>
-        public static string GetPrettifiedResourceTypeNameMoodle(ResourceTypeEnum resourceType, int? durationInMilliseconds = 0)
-        {
-            switch (resourceType)
-            {
-                case ResourceTypeEnum.Assessment:
-                    return "Assessment";
-                case ResourceTypeEnum.Article:
-                    return "Article";
-                case ResourceTypeEnum.Audio:
-                    string durationText = GetDurationText(durationInMilliseconds ?? 0);
-                    durationText = string.IsNullOrEmpty(durationText) ? string.Empty : " - " + durationText;
-                    return "Audio" + durationText;
-                case ResourceTypeEnum.Equipment:
-                    return "Equipment";
-                case ResourceTypeEnum.Image:
-                    return "Image";
-                case ResourceTypeEnum.Scorm:
-                    return "elearning";
-                case ResourceTypeEnum.Video:
-                    durationText = GetDurationText(durationInMilliseconds ?? 0);
-                    durationText = string.IsNullOrEmpty(durationText) ? string.Empty : " - " + durationText;
-                    return "Video" + durationText;
-                case ResourceTypeEnum.WebLink:
-                    return "Web link";
-                case ResourceTypeEnum.GenericFile:
-                    return "File";
-                case ResourceTypeEnum.Embedded:
-                    return "Embedded";
-                case ResourceTypeEnum.Case:
-                    return "Case";
-                case ResourceTypeEnum.Html:
-                    return "HTML";
-                case ResourceTypeEnum.Moodle:
-                    return "Course";
-                default:
-                    return "File";
-            }
-        }
-
         /// <summary>
         /// Returns a prettified resource type name, suitable for display in the UI. Excludes video/audio duration string.
         /// </summary>
@@ -245,6 +181,8 @@ public static string GetPrettifiedResourceTypeName(ResourceTypeEnum resourceType
                     return "Case";
                 case ResourceTypeEnum.Html:
                     return "HTML";
+                case ResourceTypeEnum.Moodle:
+                    return "Course";
                 default:
                     return "File";
             }

LearningHub.Nhs.WebUI/Helpers/UtilityHelper.cs

@@ -26,12 +26,10 @@ public interface IMoodleApiService
         Task<List<MoodleCourseResponseModel>> GetEnrolledCoursesAsync(int currentUserId, int pageNumber);
 
         /// <summary>
-        /// GetEnrolledCoursesAsync.
+        /// GetCourseUrl.
         /// </summary>
-        /// <param name="userId">Moodle user id.</param>
-        /// <param name="courseId">Moodle course id.</param>
-        /// <param name="pageNumber">pageNumber.</param>
-        /// <returns> List of MoodleCourseResponseModel.</returns>
-        Task<MoodleCourseCompletionModel> GetCourseCompletionAsync(int userId, int courseId, int pageNumber);
+        /// <param name="courseId">course Id. </param>
+        /// <returns>return course URL.</returns>
+        string GetCourseUrl(int courseId);
     }
 }

LearningHub.Nhs.WebUI/Interfaces/IMoodleApiService.cs

@@ -113,7 +113,7 @@
 		<PackageReference Include="HtmlAgilityPack" Version="1.11.72" />
 		<PackageReference Include="IdentityModel" Version="4.6.0" />
 		<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.48" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.50" />
 		<PackageReference Include="linqtotwitter" Version="6.9.0" />
 		<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.19.0" />
 		<PackageReference Include="Microsoft.ApplicationInsights.EventCounterCollector" Version="2.21.0" />