Modified permission and navigation check to scoped, making it one request per page load

Author: OluwatobiAwe

LearningHub.Nhs.WebUI/Interfaces/INavigationRequestService.cs

@@ -0,0 +1,29 @@
+namespace LearningHub.Nhs.WebUI.Interfaces
+{
+    using System.Security.Claims;
+    using System.Security.Principal;
+    using System.Threading.Tasks;
+    using LearningHub.Nhs.WebUI.Models;
+
+    /// <summary>
+    /// Defines the <see cref="INavigationRequestService" />.
+    /// </summary>
+    public interface INavigationRequestService
+    {
+        /// <summary>
+        /// GetNavigationModelAsync.
+        /// </summary>
+        /// <param name="user">user.</param>
+        /// <param name="forceRefresh">forceRefresh.</param>
+        /// <param name="controllerName">controllerName.</param>
+        /// <returns>A <see cref="Task{TResult}"/> representing the result of the asynchronous operation.</returns>
+        Task<NavigationModel> GetNavigationModelAsync(IPrincipal user, bool forceRefresh, string controllerName);
+
+        /// <summary>
+        /// GetNotificationCountAsync.
+        /// </summary>
+        /// <param name="userId">userId.</param>
+        /// <returns>A <see cref="Task{TResult}"/> representing the result of the asynchronous operation.</returns>
+        Task<int> GetNotificationCountAsync(int userId);
+    }
+}

LearningHub.Nhs.WebUI/Services/NavigationRequestService.cs

@@ -0,0 +1,70 @@
+namespace LearningHub.Nhs.WebUI.Services
+{
+    using System.Security.Claims;
+    using System.Security.Principal;
+    using System.Threading.Tasks;
+    using LearningHub.Nhs.WebUI.Interfaces;
+    using LearningHub.Nhs.WebUI.Models;
+
+    /// <summary>
+    /// NavigationRequestService.
+    /// </summary>
+    public class NavigationRequestService : INavigationRequestService
+    {
+        private NavigationModel navigationModel;
+        private int? notificationCount;
+
+        private INotificationService notificationService;
+        private INavigationPermissionService permissionService;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="NavigationRequestService"/> class.
+        /// </summary>
+        /// <param name="permissionService">permissionService.</param>
+        /// <param name="notificationService">notificationService.</param>
+        public NavigationRequestService(
+            INavigationPermissionService permissionService,
+            INotificationService notificationService)
+        {
+            this.permissionService = permissionService;
+            this.notificationService = notificationService;
+        }
+
+        /// <summary>
+        /// The GetNavigationModelAsync method.
+        /// </summary>
+        /// <param name="user">user.</param>
+        /// <param name="forceRefresh">forceRefresh.</param>
+        /// <param name="controllerName">controllerName.</param>
+        /// <returns>A <see cref="Task{TResult}"/> representing the result of the asynchronous operation.</returns>
+        public async Task<NavigationModel> GetNavigationModelAsync(
+            IPrincipal user,
+            bool forceRefresh,
+            string controllerName)
+        {
+            if (this.navigationModel != null)
+            {
+                return this.navigationModel;
+            }
+
+            this.navigationModel = await this.permissionService.GetNavigationModelAsync(user, forceRefresh, controllerName);
+            return this.navigationModel;
+        }
+
+        /// <summary>
+        /// The GetNotificationCountAsync.
+        /// </summary>
+        /// <param name="userId">userId.</param>
+        /// <returns>A <see cref="Task{TResult}"/> representing the result of the asynchronous operation.</returns>
+        public async Task<int> GetNotificationCountAsync(int userId)
+        {
+            if (this.notificationCount.HasValue)
+            {
+                return this.notificationCount.Value;
+            }
+
+            this.notificationCount = await this.notificationService.GetUserUnreadNotificationCountAsync(userId);
+            return this.notificationCount.Value;
+        }
+    }
+}

LearningHub.Nhs.WebUI/Startup/ServiceMappings.cs

@@ -87,6 +87,7 @@ public static void AddLearningHubMappings(this IServiceCollection services, ICon
             services.AddScoped<ICountryService, CountryService>();
             services.AddScoped<IJobRoleService, JobRoleService>();
             services.AddScoped<IGradeService, GradeService>();
+            services.AddScoped<INavigationRequestService, NavigationRequestService>();
             services.AddScoped<ISpecialtyService, SpecialtyService>();
             services.AddScoped<ILocationService, LocationService>();
             services.AddScoped<ITermsAndConditionsService, TermsAndConditionsService>();

LearningHub.Nhs.WebUI/ViewComponents/NavigationItemsViewComponent.cs

@@ -13,19 +13,19 @@
     public class NavigationItemsViewComponent : ViewComponent
     {
         private readonly ICacheService cacheService;
-        private INotificationService notificationService;
+        private INavigationRequestService navigationRequestService;
         private INavigationPermissionService permissionService;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="NavigationItemsViewComponent"/> class.
         /// </summary>
-        /// <param name="permissionService">Permission service.</param>
-        /// <param name="notificationService">Notificatin service.</param>
+        /// <param name="navigationRequestService">navigation Request Service.</param>
+        /// <param name="permissionService">permissionService.</param>
         /// <param name="cacheService">The cacheService<see cref="ICacheService"/>.</param>
-        public NavigationItemsViewComponent(INavigationPermissionService permissionService, INotificationService notificationService, ICacheService cacheService)
+        public NavigationItemsViewComponent(INavigationRequestService navigationRequestService, INavigationPermissionService permissionService,  ICacheService cacheService)
         {
+            this.navigationRequestService = navigationRequestService;
             this.permissionService = permissionService;
-            this.notificationService = notificationService;
             this.cacheService = cacheService;
         }
 
@@ -58,9 +58,9 @@ public async Task<IViewComponentResult> InvokeAsync(string navView = "Default",
 
                 var (cacheExists, _) = await this.cacheService.TryGetAsync<string>($"{userId}:LoginWizard");
 
-                model = await this.permissionService.GetNavigationModelAsync(this.User, !cacheExists, controllerName);
+                model = await this.navigationRequestService.GetNavigationModelAsync(this.User, !cacheExists, controllerName);
 
-                model.NotificationCount = await this.notificationService.GetUserUnreadNotificationCountAsync(userId);
+                model.NotificationCount = await this.navigationRequestService.GetNotificationCountAsync(userId);
             }
 
             return await Task.FromResult<IViewComponentResult>(this.View(navView, model));