TD-4893 Delegate activities - view course delegates resulted in 500 error when course admin field applied filters got deleted

Author: sherif-olaboye

DigitalLearningSolutions.Data/DataServices/CourseDataService.cs

@@ -2040,7 +2040,6 @@ public bool IsSelfEnrollmentAllowed(int customisationId)
                         ,DiagObjSelect
                         ,HideInLearnerPortal
                         ,NotificationEmails
-                        ,Q1Options
                     FROM Customisations 
 						WHERE CustomisationID = @customisationID ",
                 new { customisationId }).FirstOrDefault();

DigitalLearningSolutions.Data/Helpers/FilteringHelper.cs

@@ -66,35 +66,7 @@ public static string BuildFilterValueString(string group, string propertyName, s
                 ? defaultFilterValue
                 : AddNewFilterToFilterString(existingFilterString, newFilterToAdd);
         }
-        public static string? GetFilterString(
-           string? existingFilterString,
-           string? newFilterToAdd,
-           bool clearFilters,
-           HttpRequest request,
-           string cookieName,
-           string? q1Options,
-           string? defaultFilterValue = null
-       )
-        {
-            var cookieHasBeenSet = request.Cookies.ContainsKey(cookieName);
-            var noFiltersInQueryParams = existingFilterString == null && newFilterToAdd == null;
-            var cookieValue = request.Cookies[cookieName];
-            if ((clearFilters) || (q1Options == null && cookieValue != null && cookieValue.Contains("Answer1|Not Allowed") ||
-    (cookieValue != null && cookieValue.Contains("Answer1|Allowed"))))
-            {
-                return null;
-            }
-
-            if (cookieHasBeenSet && noFiltersInQueryParams)
-            {
-                return request.Cookies[cookieName] == EmptyFiltersCookieValue ? null : request.Cookies[cookieName];
-            }
-
-            return noFiltersInQueryParams
-                ? defaultFilterValue
-                : AddNewFilterToFilterString(existingFilterString, newFilterToAdd);
-        }
-        public static string? GetCategoryAndTopicFilterString(
+       public static string? GetCategoryAndTopicFilterString(
             string? categoryFilterString,
             string? topicFilterString
         )
@@ -195,7 +167,36 @@ 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)
+        {
+            if (!request.Cookies.ContainsKey(cookieName) || string.IsNullOrEmpty(request.Cookies[cookieName]) || clearFilters)
+                return null;
+
+            var cookieValue = request.Cookies[cookieName];
+            if (string.IsNullOrEmpty(cookieValue) || cookieValue == EmptyFiltersCookieValue)
+            {
+                return existingFilterString;
+            }
+            var existingFilters = cookieValue.Split('╡');
+            var validFilterValues = availableFilters
+                .SelectMany(filter => filter.FilterOptions)
+                .Select(option => option.FilterValue)
+                .ToHashSet();
+           
+            var filteredResults = existingFilters
+        .Where(entry => IsFilterInvalid(entry, validFilterValues))
+        .ToList();
+            var newCookieValue = string.Join("╡", filteredResults);
+            if (string.IsNullOrEmpty(newCookieValue)) return null;
+            return AddNewFilterToFilterString(newCookieValue, newFilterToAdd);  
+        }
 
+        private static  bool IsFilterInvalid(string filterEntry, HashSet<string> validFilterValues)
+        {
+            if (validFilterValues.Contains(filterEntry)) return true;
+            return false;
+        }
         private static IEnumerable<FilterOptionModel> GetFilterOptionsForPromptWithOptions(Prompt prompt)
         {
             var group = GetFilterGroupForPrompt(prompt);

DigitalLearningSolutions.Data/Models/Courses/Customisation.cs

@@ -43,7 +43,6 @@ public Customisation(
         public string? NotificationEmails { get; set; }
         public int CustomisationId { get; set; }
         public bool Active { get; set; }
-        public string? Q1Options { get; set; }
 
     }
 }

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

@@ -95,14 +95,12 @@ public IActionResult Index(
 
             sortBy ??= DefaultSortByOptions.Name.PropertyName;
             sortDirection ??= GenericSortingHelper.Ascending;
-          var course =  courseService.GetCourse(customisationId);
                 existingFilterString = FilteringHelper.GetFilterString(
                 existingFilterString,
                 newFilterToAdd,
                 clearFilters,
                 Request,
                 filterCookieName,
-                course.Q1Options,
                 CourseDelegateAccountStatusFilterOptions.Active.FilterValue
             );
 
@@ -277,7 +275,7 @@ public IActionResult Index(
                 var activityName = isCourseDelegate
                     ? courseService.GetCourseNameAndApplication((int)customisationId).CourseName
                     : selfAssessmentService.GetSelfAssessmentNameById((int)selfAssessmentId);
-
+                existingFilterString = FilteringHelper.CheckIfFilterisValid(clearFilters, existingFilterString, newFilterToAdd, availableFilters, Request, filterCookieName, Response);
                 if (isCourseDelegate)
                 {
                     var result = paginateService.Paginate(