Merge pull request #2667 from TechnologyEnhancedLearning/Develop/Fixes/TD-3885-CorrectingIssueRelatedToPromptFilterAndUATLiveFilter

TD 3885 correcting issue related to prompt filter and UAT live filter

Author: rshrirohit

DigitalLearningSolutions.Web.Tests/Controllers/TrackingSystem/Delegates/AllDelegatesControllerTests.cs

@@ -17,6 +17,7 @@
     using Microsoft.AspNetCore.Http;
     using NUnit.Framework;
     using Microsoft.Extensions.Configuration;
+    using Microsoft.AspNetCore.Hosting;
 
     public class AllDelegatesControllerTests
     {
@@ -32,6 +33,7 @@ public class AllDelegatesControllerTests
         private IUserDataService userDataService = null!;
         private IGroupsService groupsService = null!;
         private IConfiguration? configuration;
+        private IWebHostEnvironment? env;
 
         [SetUp]
         public void Setup()
@@ -46,6 +48,7 @@ public void Setup()
             configuration = A.Fake<IConfiguration>();
             httpRequest = A.Fake<HttpRequest>();
             httpResponse = A.Fake<HttpResponse>();
+            env = A.Fake<IWebHostEnvironment>();
 
             const string cookieValue = "ActiveStatus|Active|false";
 
@@ -56,7 +59,8 @@ public void Setup()
                     jobGroupsDataService,
                     paginateService,
                     groupsService,
-                    configuration
+                    configuration,
+                    env
                 )
                 .WithMockHttpContext(httpRequest, CookieName, cookieValue, httpResponse)
                 .WithMockUser(true)

DigitalLearningSolutions.Web/Controllers/TrackingSystem/Delegates/AllDelegatesController.cs

@@ -18,6 +18,7 @@
     using Microsoft.FeatureManagement.Mvc;
     using Microsoft.Extensions.Configuration;
     using DigitalLearningSolutions.Data.Extensions;
+    using Microsoft.AspNetCore.Hosting;
 
     [FeatureGate(FeatureFlags.RefactoredTrackingSystem)]
     [Authorize(Policy = CustomPolicies.UserCentreAdmin)]
@@ -26,14 +27,15 @@
     [Route("TrackingSystem/Delegates/All")]
     public class AllDelegatesController : Controller
     {
-        private const string DelegateFilterCookieName = "DelegateFilter";
+        private string DelegateFilterCookieName = "DelegateFilter";
         private readonly IDelegateDownloadFileService delegateDownloadFileService;
         private readonly IJobGroupsDataService jobGroupsDataService;
         private readonly PromptsService promptsService;
         private readonly IPaginateService paginateService;
         private readonly IUserDataService userDataService;
         private readonly IGroupsService groupsService;
         private readonly IConfiguration configuration;
+        private readonly IWebHostEnvironment env;
 
         public AllDelegatesController(
             IDelegateDownloadFileService delegateDownloadFileService,
@@ -42,7 +44,8 @@ public AllDelegatesController(
             IJobGroupsDataService jobGroupsDataService,
             IPaginateService paginateService,
             IGroupsService groupsService,
-            IConfiguration configuration
+            IConfiguration configuration,
+            IWebHostEnvironment env
         )
         {
             this.delegateDownloadFileService = delegateDownloadFileService;
@@ -52,6 +55,7 @@ IConfiguration configuration
             this.paginateService = paginateService;
             this.groupsService = groupsService;
             this.configuration = configuration;
+            this.env = env;
         }
 
         [NoCaching]
@@ -76,6 +80,8 @@ public IActionResult Index(
 
             sortBy ??= DefaultSortByOptions.Name.PropertyName;
             sortDirection ??= GenericSortingHelper.Ascending;
+
+            DelegateFilterCookieName += env.EnvironmentName;
             existingFilterString = FilteringHelper.GetFilterString(
                 existingFilterString,
                 newFilterToAdd,
@@ -95,10 +101,8 @@ public IActionResult Index(
             var promptsWithOptions = customPrompts.Where(customPrompt => customPrompt.Options.Count > 0);
             var availableFilters = AllDelegatesViewModelFilterOptions.GetAllDelegatesFilterViewModels(jobGroups, promptsWithOptions, groups);
 
-            var CurrentSiteBaseUrl = configuration.GetCurrentSystemBaseUrl();
-
-            if (((TempData["allDelegatesCentreId"] != null && TempData["allDelegatesCentreId"].ToString() != User.GetCentreId().ToString())
-                     || (TempData["LastBaseUrl"] != null && (TempData["LastBaseUrl"].ToString() != CurrentSiteBaseUrl))) && existingFilterString != null)
+            if (existingFilterString != null && TempData["allDelegatesCentreId"] != null &&
+                TempData["allDelegatesCentreId"].ToString() != User.GetCentreId().ToString())
             {
                 if (existingFilterString.Contains("Answer"))
                     existingFilterString = FilterHelper.RemoveNonExistingPromptFilters(availableFilters, existingFilterString);
@@ -169,8 +173,8 @@ public IActionResult Index(
                             {
                                 groupId = null;
                                 existingFilterString = FilterHelper.RemoveNonExistingFilterOptions(availableFilters, existingFilterString);
-                            }                            
-                        }                            
+                            }
+                        }
 
                         if (filter.Contains("Answer1"))
                             answer1 = filterValue;
@@ -217,14 +221,13 @@ public IActionResult Index(
 
             result.Page = page;
             TempData["Page"] = result.Page;
-            TempData["LastBaseUrl"] = configuration.GetCurrentSystemBaseUrl();
 
             var model = new AllDelegatesViewModel(
                 result,
                 customPrompts,
                 availableFilters
             );
-            
+
             model.TotalPages = (int)(resultCount / itemsPerPage) + ((resultCount % itemsPerPage) > 0 ? 1 : 0);
             model.MatchingSearchResults = resultCount;