TD-4893 Remove filter duplicate

Author: sherif-olaboye

DigitalLearningSolutions.Data/Helpers/FilteringHelper.cs

@@ -167,8 +167,7 @@ public static string GetFilterValueForRegistrationPrompt(int promptNumber, strin
                 : answer;
             return BuildFilterValueString(group, group.Split('(')[0], propertyValue);
         }
-        public  static  string? CheckIfFilterisValid(bool clearFilters, string existingFilterString, string newFilterToAdd, IEnumerable<FilterModel> availableFilters, HttpRequest request,
-       string cookieName, HttpResponse response)
+        public  static  string? GetValidFilters(string existingFilterString, string newFilterToAdd, IEnumerable<FilterModel> availableFilters, HttpRequest request, string cookieName)
         {
             var cookieValue = request.Cookies[cookieName];
             if (string.IsNullOrEmpty(cookieValue) || cookieValue == EmptyFiltersCookieValue)
@@ -186,14 +185,41 @@ public static string GetFilterValueForRegistrationPrompt(int promptNumber, strin
         .ToList();
             var newCookieValue = string.Join("╡", filteredResults);
             if (string.IsNullOrEmpty(newCookieValue)) return null;
-            return AddNewFilterToFilterString(newCookieValue, newFilterToAdd);  
+            newCookieValue = AddNewFilterToFilterString(newCookieValue, newFilterToAdd);
+            return RemoveDuplicateFilters( newFilterToAdd, newCookieValue);
         }
 
         private static  bool IsFilterInvalid(string filterEntry, HashSet<string> validFilterValues)
         {
             if (validFilterValues.Contains(filterEntry)) return true;
             return false;
         }
+        public  static string RemoveDuplicateFilters(string newFilterToAdd, string? existingFilterString)
+        {
+            if (string.IsNullOrEmpty(existingFilterString))
+            {
+                return existingFilterString ?? string.Empty;
+            }
+            var selectedFilters = existingFilterString.Split(FilteringHelper.FilterSeparator).ToList();
+            if (!string.IsNullOrEmpty(newFilterToAdd))
+            {
+                var filterHeader = newFilterToAdd.Split(FilteringHelper.Separator)[0];
+                var dupfilters = selectedFilters.Where(x => x.Contains(filterHeader));
+                if (dupfilters.Count() > 1)
+                {
+                    foreach (var filter in selectedFilters)
+                    {
+                        if (filter.Contains(filterHeader))
+                        {
+                            selectedFilters.Remove(filter);
+                            existingFilterString = string.Join(FilteringHelper.FilterSeparator, selectedFilters);
+                            break;
+                        }
+                    }
+                }
+            }
+            return existingFilterString;
+        }
         private static IEnumerable<FilterOptionModel> GetFilterOptionsForPromptWithOptions(Prompt prompt)
         {
             var group = GetFilterGroupForPrompt(prompt);

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

@@ -141,25 +141,7 @@ public IActionResult Index(
             if (!string.IsNullOrEmpty(existingFilterString))
             {
                 var selectedFilters = existingFilterString.Split(FilteringHelper.FilterSeparator).ToList();
-
-                if (!string.IsNullOrEmpty(newFilterToAdd))
-                {
-                    var filterHeader = newFilterToAdd.Split(FilteringHelper.Separator)[0];
-                    var dupfilters = selectedFilters.Where(x => x.Contains(filterHeader));
-                    if (dupfilters.Count() > 1)
-                    {
-                        foreach (var filter in selectedFilters)
-                        {
-                            if (filter.Contains(filterHeader))
-                            {
-                                selectedFilters.Remove(filter);
-                                existingFilterString = string.Join(FilteringHelper.FilterSeparator, selectedFilters);
-                                break;
-                            }
-                        }
-                    }
-                }
-
+                existingFilterString = FilteringHelper.RemoveDuplicateFilters(newFilterToAdd, existingFilterString);
                 if (selectedFilters.Count > 0)
                 {
                     foreach (var filter in selectedFilters)
@@ -277,7 +259,7 @@ public IActionResult Index(
                     : selfAssessmentService.GetSelfAssessmentNameById((int)selfAssessmentId);
                 if (!string.IsNullOrEmpty(existingFilterString))
                 {
-                    existingFilterString = FilteringHelper.CheckIfFilterisValid(clearFilters, existingFilterString, newFilterToAdd, availableFilters, Request, filterCookieName, Response);
+                    existingFilterString = FilteringHelper.GetValidFilters( existingFilterString, newFilterToAdd, availableFilters, Request, filterCookieName);
                 }
                 if (isCourseDelegate)
                 {
@@ -593,6 +575,7 @@ DelegateAccessRoute accessedVia
                 return RedirectToAction("Index", "ActivityDelegates", routeData, returnPageQuery.Value.ItemIdToReturnTo);
             }
         }
+
     }
 }