Merge pull request #2715 from TechnologyEnhancedLearning/Develop/Features/TD-3918-RequestSupportTicketController-refactor(Controller-Service-Repositorypattern)

TD-3918 request support ticket controller refactor(controller service repository pattern)

Author: rshrirohit

DigitalLearningSolutions.Web/Controllers/Support/RequestSupportTicketController.cs

@@ -1,8 +1,6 @@
 
 namespace DigitalLearningSolutions.Web.Controllers.Support
 {
-    using DigitalLearningSolutions.Data.DataServices.UserDataService;
-    using DigitalLearningSolutions.Data.DataServices;
     using DigitalLearningSolutions.Web.Helpers;
     using DigitalLearningSolutions.Web.Models.Enums;
     using Microsoft.AspNetCore.Mvc;
@@ -32,26 +30,26 @@ namespace DigitalLearningSolutions.Web.Controllers.Support
     public class RequestSupportTicketController : Controller
     {
         private readonly IConfiguration configuration;
-        private readonly IUserDataService userDataService;
-        private readonly ICentresDataService centresDataService;
+        private readonly IUserService userService;
+        private readonly ICentresService centresService;
         private readonly IWebHostEnvironment webHostEnvironment;
-        private readonly IRequestSupportTicketDataService requestSupportTicketDataService;
+        private readonly IRequestSupportTicketService requestSupportTicketService;
         private readonly IFreshdeskService freshdeskService;
         private readonly IMultiPageFormService multiPageFormService;
         string uploadDir = string.Empty;
         public RequestSupportTicketController(IConfiguration configuration
-                                        , IUserDataService userDataService
-                                        , ICentresDataService centresDataService
+                                        , IUserService userService
+                                        , ICentresService centresService
                                         , IWebHostEnvironment webHostEnvironment
-                                        , IRequestSupportTicketDataService requestSupportTicketDataService
+                                        , IRequestSupportTicketService requestSupportTicketService
                                         , IFreshdeskService freshdeskService
                                         , IMultiPageFormService multiPageFormService)
         {
             this.configuration = configuration;
-            this.userDataService = userDataService;
-            this.centresDataService = centresDataService;
+            this.userService = userService;
+            this.centresService = centresService;
             this.webHostEnvironment = webHostEnvironment;
-            this.requestSupportTicketDataService = requestSupportTicketDataService;
+            this.requestSupportTicketService = requestSupportTicketService;
             this.freshdeskService = freshdeskService;
             this.multiPageFormService = multiPageFormService;
             uploadDir = Path.Combine(webHostEnvironment.WebRootPath, "Uploads\\");
@@ -65,18 +63,18 @@ public IActionResult Index(DlsSubApplication dlsSubApplication)
                 configuration.GetCurrentSystemBaseUrl()
             );
             var centreId = User.GetCentreIdKnownNotNull();
-            var userName = userDataService.GetUserDisplayName(User.GetUserId() ?? 0);
-            var userCentreEmail = requestSupportTicketDataService.GetUserCentreEmail(User.GetUserId() ?? 0, centreId);
+            var userName = userService.GetUserDisplayName(User.GetUserId() ?? 0);
+            var userCentreEmail = requestSupportTicketService.GetUserCentreEmail(User.GetUserId() ?? 0, centreId);
             var adminUserID = User.GetAdminId();
-            var centreName = centresDataService.GetCentreName(centreId);
+            var centreName = centresService.GetCentreName(centreId);
             setupRequestSupportData(userName, userCentreEmail, adminUserID ?? 0, centreName);
             return View("Request", model);
         }
 
         [Route("/{dlsSubApplication}/RequestSupport/TypeofRequest")]
         public IActionResult TypeofRequest(DlsSubApplication dlsSubApplication)
         {
-            var requestTypes = requestSupportTicketDataService.GetRequestTypes();
+            var requestTypes = requestSupportTicketService.GetRequestTypes();
             var data = multiPageFormService.GetMultiPageFormData<RequestSupportTicketData>(
                 MultiPageFormDataFeature.AddCustomWebForm("RequestSupportTicketCWF"),
                 TempData
@@ -89,7 +87,7 @@ public IActionResult TypeofRequest(DlsSubApplication dlsSubApplication)
         [Route("/{dlsSubApplication}/RequestSupport/setRequestType")]
         public IActionResult setRequestType(DlsSubApplication dlsSubApplication, RequestTypeViewModel RequestTypemodel, int requestType)
         {
-            var requestTypes = requestSupportTicketDataService.GetRequestTypes();
+            var requestTypes = requestSupportTicketService.GetRequestTypes();
             var reqType = requestTypes.ToList().Where(x => x.ID == requestType)
                 .Select(ticketRequestTypes => new { ticketRequestTypes.RequestTypes, ticketRequestTypes.FreshdeskRequestTypes }).FirstOrDefault();
 

DigitalLearningSolutions.Web/Services/RequestSupportTicketService.cs

@@ -0,0 +1,30 @@
+using DigitalLearningSolutions.Data.DataServices;
+using DigitalLearningSolutions.Data.Models.Support;
+using System.Collections.Generic;
+
+namespace DigitalLearningSolutions.Web.Services
+{
+    public interface IRequestSupportTicketService
+    {
+        IEnumerable<RequestType> GetRequestTypes();
+        string? GetUserCentreEmail(int userId, int centreId);
+
+    }
+    public class RequestSupportTicketService : IRequestSupportTicketService
+    {
+        private readonly IRequestSupportTicketDataService requestSupportTicketDataService;
+        public RequestSupportTicketService(IRequestSupportTicketDataService requestSupportTicketDataService)
+        {
+            this.requestSupportTicketDataService = requestSupportTicketDataService; 
+        }
+        public IEnumerable<RequestType> GetRequestTypes()
+        {
+           return  requestSupportTicketDataService.GetRequestTypes();
+        }
+
+        public string? GetUserCentreEmail(int userId, int centreId)
+        {
+            return requestSupportTicketDataService.GetUserCentreEmail(userId, centreId);
+        }
+    }
+}

DigitalLearningSolutions.Web/Services/UserService.cs

@@ -11,6 +11,7 @@ namespace DigitalLearningSolutions.Web.Services
     using DigitalLearningSolutions.Data.Models;
     using DigitalLearningSolutions.Data.Models.User;
     using DigitalLearningSolutions.Data.Utilities;
+    using DocumentFormat.OpenXml.Office2010.Excel;
     using Microsoft.Extensions.Configuration;
     using Microsoft.Extensions.Logging;
     using ConfigurationExtensions = DigitalLearningSolutions.Data.Extensions.ConfigurationExtensions;
@@ -154,7 +155,10 @@ void SetCentreEmail(
         );
         int GetDelegateCountWithAnswerForPrompt(int centreId, int promptNumber);
         List<AdminUser> GetAdminUsersByCentreId(int centreId);
+
         AdminUser? GetAdminUserById(int id);
+        string GetUserDisplayName(int userId);
+
     }
 
     public class UserService : IUserService
@@ -828,9 +832,16 @@ public List<AdminUser> GetAdminUsersByCentreId(int centreId)
             return userDataService.GetAdminUsersByCentreId(centreId);
         }
 
+
         public AdminUser? GetAdminUserById(int id)
         {
             return userDataService.GetAdminUserById(id);
+
+        }
+
+        public string GetUserDisplayName(int userId)
+        {
+            return userDataService.GetUserDisplayName(userId);
         }
     }
 }

DigitalLearningSolutions.Web/Startup.cs

@@ -476,6 +476,7 @@ private static void RegisterServices(IServiceCollection services)
             services.AddScoped<ICentreApplicationsService, CentreApplicationsService>();
             services.AddScoped<ICentreSelfAssessmentsService, CentreSelfAssessmentsService>();
             services.AddScoped<IUserFeedbackService, UserFeedbackService>();
+            services.AddScoped<IRequestSupportTicketService, RequestSupportTicketService>();
         }
 
         private static void RegisterDataServices(IServiceCollection services)