Get the resource collection filter working completely

Author: Binon

LearningHub.Nhs.WebUI/Controllers/SearchController.cs

@@ -113,7 +113,7 @@ public async Task<IActionResult> Index(SearchRequestViewModel search, bool noSor
         /// <param name="feedback">The feedback.</param>
         /// <returns>The actionResult.</returns>
         [HttpPost("results")]
-        public async Task<IActionResult> IndexPost([FromQuery] SearchRequestViewModel search, int resourceCount, [FromForm] IEnumerable<string> filters, [FromForm] int? resourceAccessLevelId, [FromForm] IEnumerable<string> providerfilters, [FromForm] int? sortby, [FromForm] string groupId, [FromForm] int searchId, [FromQuery] string actionType, [FromQuery] string resourceCollectionFilter, string feedback)
+        public async Task<IActionResult> IndexPost([FromQuery] SearchRequestViewModel search, int resourceCount, [FromForm] IEnumerable<string> filters, [FromForm] int? resourceAccessLevelId, [FromForm] IEnumerable<string> providerfilters, [FromForm] int? sortby, [FromForm] string groupId, [FromForm] int searchId, [FromQuery] string actionType, [FromForm] IEnumerable<string> resourceCollectionFilter, string feedback)
         {
             if (actionType == "feedback")
             {
@@ -145,14 +145,17 @@ public async Task<IActionResult> IndexPost([FromQuery] SearchRequestViewModel se
                 var existingProviderFilters = (search.ProviderFilters ?? new List<string>()).OrderBy(t => t);
                 var newProviderFilters = providerfilters.OrderBy(t => t);
                 var filterProviderUpdated = !newProviderFilters.SequenceEqual(existingProviderFilters);
+                var existingResourceCollectionFilter = (search.ResourceCollectionFilter ?? new List<string>()).OrderBy(t => t);
+                var newResourceCollectionFilter = resourceCollectionFilter.OrderBy(t => t);
+                var filterResourceCollectionUpdated = !newResourceCollectionFilter.SequenceEqual(existingResourceCollectionFilter);
 
-                // No sort or resource type filter updated or resource access level filter updated or provider filter applied
-                if ((search.Sortby ?? 0) == sortby && !filterUpdated && !resourceAccessLevelFilterUpdated && !filterProviderUpdated)
+                // No sort or resource type filter updated or resource access level filter updated or provider filter applied or resource collection filter applied
+                if ((search.Sortby ?? 0) == sortby && !filterUpdated && !resourceAccessLevelFilterUpdated && !filterProviderUpdated && !filterResourceCollectionUpdated)
                 {
                     return await this.Index(search, noSortFilterError: true);
                 }
 
-                if (search.ResourcePageIndex > 0 && (filterUpdated || resourceAccessLevelFilterUpdated || filterProviderUpdated))
+                if (search.ResourcePageIndex > 0 && (filterUpdated || resourceAccessLevelFilterUpdated || filterProviderUpdated || filterResourceCollectionUpdated))
                 {
                     search.ResourcePageIndex = null;
                 }
@@ -164,6 +167,7 @@ public async Task<IActionResult> IndexPost([FromQuery] SearchRequestViewModel se
             search.GroupId = groupId;
             search.SearchId = searchId;
             search.ResourceAccessLevelId = resourceAccessLevelId;
+            search.ResourceCollectionFilter = resourceCollectionFilter;
 
             var routeValues = new RouteValueDictionary(search)
             {

LearningHub.Nhs.WebUI/Models/Search/SearchRequestViewModel.cs

@@ -79,6 +79,6 @@ public class SearchRequestViewModel
         /// <summary>
         /// Gets or sets the show filter (all, catalogues, courses, resources).
         /// </summary>
-        public string ResourceCollectionFilter { get; set; }
+        public IEnumerable<string> ResourceCollectionFilter { get; set; }
     }
 }

LearningHub.Nhs.WebUI/Models/Search/SearchResultViewModel.cs

@@ -1,6 +1,7 @@
 namespace LearningHub.Nhs.WebUI.Models.Search
 {
     using System;
+    using System.Collections.Generic;
     using LearningHub.Nhs.Models.Paging;
     using LearningHub.Nhs.Models.Search;
 
@@ -97,6 +98,6 @@ public class SearchResultViewModel
         /// <summary>
         /// Gets or sets the show filter (all, catalogues, courses, resources).
         /// </summary>
-        public string ResourceCollectionFilter { get; set; }
+        public List<SearchFilterModel> ResourceCollectionFilter { get; set; }
     }
 }

LearningHub.Nhs.WebUI/Services/SearchService.cs

@@ -75,7 +75,7 @@ public async Task<SearchResultViewModel> PerformSearch(IPrincipal user, SearchRe
             {
                 SearchId = searchRequest.SearchId.Value,
                 SearchText = searchString,
-                FilterText = searchRequest.Filters?.Any() == true ? $"&resource_type={string.Join("&resource_type=", searchRequest.Filters)}" : string.Empty,
+                FilterText = this.BuildFilterText(searchRequest.Filters, searchRequest.ResourceCollectionFilter),
                 ProviderFilterText = searchRequest.ProviderFilters?.Any() == true ? $"&provider_ids={string.Join("&provider_ids=", searchRequest.ProviderFilters)}" : string.Empty,
                 SortColumn = selectedSortItem.Value,
                 SortDirection = selectedSortItem?.SortDirection,
@@ -98,6 +98,7 @@ public async Task<SearchResultViewModel> PerformSearch(IPrincipal user, SearchRe
 
             SearchViewModel resourceResult = null;
             SearchCatalogueViewModel catalogueResult = null;
+            var resourceCollectionFilter = new List<SearchFilterModel>();
 
             if (searchString != string.Empty)
             {
@@ -203,6 +204,28 @@ public async Task<SearchResultViewModel> PerformSearch(IPrincipal user, SearchRe
                             }
                         }
                     }
+
+                    // Process resource_collection facets
+                    var collectionFacet = resourceResult.Facets.FirstOrDefault(x => x.Id == "resource_collection");
+                    if (collectionFacet != null && collectionFacet.Filters != null)
+                    {
+                        foreach (var filteritem in collectionFacet.Filters.Select(x => x.DisplayName).Distinct())
+                        {
+                            var filter = collectionFacet.Filters.Where(x => x.DisplayName == filteritem).FirstOrDefault();
+
+                            if (filter != null && !string.IsNullOrEmpty(filter.DisplayName))
+                            {
+                                var searchfilter = new SearchFilterModel()
+                                {
+                                    DisplayName = filter.DisplayName,
+                                    Count = filter.Count,
+                                    Value = filter.DisplayName.ToLower(),
+                                    Selected = searchRequest.ResourceCollectionFilter?.Contains(filter.DisplayName, StringComparer.OrdinalIgnoreCase) ?? false,
+                                };
+                                resourceCollectionFilter.Add(searchfilter);
+                            }
+                        }
+                    }
                 }
 
                 resourceResult.SortItemList = searchSortItemList;
@@ -222,6 +245,7 @@ public async Task<SearchResultViewModel> PerformSearch(IPrincipal user, SearchRe
                 ResourceSearchResult = resourceResult,
                 CatalogueSearchResult = catalogueResult,
 
+                // SearchCollectionFilters = resourceCollectionFilters,
                 ResourceResultPaging = new SearchResultPagingModel
                 {
                     CurrentPage = searchRequest.ResourcePageIndex ?? 0,
@@ -240,6 +264,8 @@ public async Task<SearchResultViewModel> PerformSearch(IPrincipal user, SearchRe
                 SuggestedResource = suggestedResource,
             };
 
+            searchResultViewModel.ResourceCollectionFilter = resourceCollectionFilter;
+
             return searchResultViewModel;
         }
 
@@ -271,7 +297,7 @@ public async Task<int> RegisterSearchEventsAsync(SearchRequestViewModel search,
                 GroupId = Guid.Parse(search.GroupId),
                 SortDirection = "descending",
                 SortColumn = sortBy.ToString(),
-                FilterText = search.Filters?.Any() == true ? string.Join(",", search.Filters) : null,
+                FilterText = this.BuildAnalyticsFilterText(search.Filters, search.ResourceCollectionFilter),
                 ResourceAccessLevelFilterText = search.ResourceAccessLevelId.HasValue ? search.ResourceAccessLevelId.Value.ToString() : null,
                 ProviderFilterText = search.ProviderFilters?.Any() == true ? string.Join(",", allproviders.Where(n => search.ProviderFilters.Contains(n.Id.ToString())).Select(x => x.Name).ToList()) : null,
             };
@@ -737,6 +763,52 @@ public async Task SendAutoSuggestionClickActionAsync(AutoSuggestionClickPayloadM
             }
         }
 
+        /// <summary>
+        /// Builds the filter text combining resource type and resource collection filters.
+        /// </summary>
+        /// <param name="resourceTypeFilter">The resource type filters.</param>
+        /// <param name="resourceCollectionFilter">The resource collection filters.</param>
+        /// <returns>The combined filter text.</returns>
+        private string BuildFilterText(IEnumerable<string> resourceTypeFilter, IEnumerable<string> resourceCollectionFilter)
+        {
+            var filterParts = new List<string>();
+
+            if (resourceTypeFilter?.Any() == true)
+            {
+                filterParts.Add($"&resource_type={string.Join("&resource_type=", resourceTypeFilter)}");
+            }
+
+            if (resourceCollectionFilter?.Any() == true)
+            {
+                filterParts.Add($"&resource_collection={string.Join("&resource_collection=", resourceCollectionFilter)}");
+            }
+
+            return string.Join(string.Empty, filterParts);
+        }
+
+        /// <summary>
+        /// Builds the analytics filter text combining resource type and resource collection filters for logging.
+        /// </summary>
+        /// <param name="resourceTypeFilter">The resource type filters.</param>
+        /// <param name="resourceCollectionFilter">The resource collection filters.</param>
+        /// <returns>The combined filter text for analytics.</returns>
+        private string BuildAnalyticsFilterText(IEnumerable<string> resourceTypeFilter, IEnumerable<string> resourceCollectionFilter)
+        {
+            var filterParts = new List<string>();
+
+            if (resourceTypeFilter?.Any() == true)
+            {
+                filterParts.AddRange(resourceTypeFilter);
+            }
+
+            if (resourceCollectionFilter?.Any() == true)
+            {
+                filterParts.AddRange(resourceCollectionFilter.Select(f => $"collection:{f}"));
+            }
+
+            return filterParts.Any() ? string.Join(",", filterParts) : null;
+        }
+
         /// <summary>
         /// The RemoveHtmlTags.
         /// </summary>

LearningHub.Nhs.WebUI/Views/Search/_SearchFilter.cshtml

@@ -12,6 +12,7 @@
     var pageUrl = Model.CatalogueId > 0 ? "/catalogue/" + Model.CatalogueUrl + "/search" : "/search/results";
     var actionUrl = QueryHelpers.AddQueryString(pageUrl, queryParams);
     var pageFragment = "#search-filters";
+    var selectedResourceCollection = "all";
 
     string FilterSummary()
     {
@@ -62,27 +63,33 @@
                     <legend class="nhsuk-fieldset__legend">
                         <strong>Show</strong>
                     </legend>
+                    @foreach (var rc in Model.ResourceCollectionFilter)
+                    {
+                        if (rc.Selected)
+                            selectedResourceCollection = rc.Value;
+                    }
                     <div class="nhsuk-radios nhsuk-radios--inline">
                         <div class="nhsuk-radios__item">
-                            <input class="nhsuk-radios__input" id="show-all" name="resourceCollectionFilter" type="radio" value="all" checked="@((Model.ResourceCollectionFilter ?? "all") == "all")" onchange="this.form.submit()">
+                            <input class="nhsuk-radios__input" id="show-all" name="resourceCollectionFilter" type="radio" value="all" checked="@(selectedResourceCollection == "all") onchange="this.form.submit()">
                             <label class="nhsuk-label nhsuk-radios__label" for="show-all">
                                 All
                             </label>
-                        </div>                       
+                        </div>
                         <div class="nhsuk-radios__item">
-                            <input class="nhsuk-radios__input" id="show-catalogues" name="resourceCollectionFilter" type="radio" value="catalogues" checked="@((Model.ResourceCollectionFilter ?? "all") == "catalogues")" onchange="this.form.submit()">
+                            <input class="nhsuk-radios__input" id="show-catalogues" name="resourceCollectionFilter" type="radio" value="catalogue" checked="@(selectedResourceCollection == "catalogue")" onchange="this.form.submit()">
                             <label class="nhsuk-label nhsuk-radios__label" for="show-catalogues">
                                 Catalogues
                             </label>
                         </div>
                         <div class="nhsuk-radios__item">
-                            <input class="nhsuk-radios__input" id="show-courses" name="resourceCollectionFilter" type="radio" value="courses" checked="@((Model.ResourceCollectionFilter ?? "all") == "courses")" ange="this.form.submit()">
+                            <input class="nhsuk-radios__input" id="show-courses" name="resourceCollectionFilter" type="radio" value="course" checked="@(selectedResourceCollection == "course")"
+                                   onchange="this.form.submit()">
                             <label class="nhsuk-label nhsuk-radios__label" for="show-courses">
                                 Courses
                             </label>
                         </div>
                         <div class="nhsuk-radios__item">
-                            <input class="nhsuk-radios__input" id="show-resources" name="resourceCollectionFilter" type="radio" value="resources" checked="@((Model.ResourceCollectionFilter ?? "all") == "resources")" onchange="this.fsubmit()">
+                            <input class="nhsuk-radios__input" id="show-resources" name="resourceCollectionFilter" type="radio" value="resource" checked="@(selectedResourceCollection == "resource")" onchange="this.form.submit()">
                             <label class="nhsuk-label nhsuk-radios__label" for="show-resources">
                                 Resources
                             </label>

OpenAPI/LearningHub.Nhs.OpenApi.Models/ServiceModels/AzureSearch/SearchDocument.cs

@@ -18,7 +18,26 @@ public class SearchDocument
         /// </summary>
         [SearchableField(IsKey = true)]
         [JsonPropertyName("id")]
-        public string Id { get; set; } = string.Empty;
+        public string PrefixedId { get; set; } = string.Empty;
+
+        /// <summary>
+        /// Gets the numeric ID extracted from the PrefixedId.
+        /// </summary>
+        [JsonIgnore]
+        public string Id
+        {
+            get
+            {
+                if (string.IsNullOrWhiteSpace(PrefixedId))
+                    return "0"; 
+
+                var parts = PrefixedId.Split('_');
+                if (parts.Length != 2)
+                    return "0";
+
+                return int.TryParse(parts[1], out int id) ? id.ToString() : "0";
+            }
+        }
 
         /// <summary>
         /// Gets or sets the title.

OpenAPI/LearningHub.Nhs.OpenApi.Services/Helpers/Search/SearchFilterBuilder.cs

@@ -26,7 +26,7 @@ public static Dictionary<string, List<string>> CombineAndNormaliseFilters(string
             MergeFilterDictionary(filters, requestTypeFilters);
             //  MergeFilterDictionary(filters, providerFilters);
 
-            NormalizeResourceTypeFilters(filters);
+            NormaliseFilters(filters);
 
             return filters;
         }
@@ -105,10 +105,10 @@ public static Dictionary<string, List<string>> ParseQueryStringFilters(string? q
         }
 
         /// <summary>
-        /// Normalizes resource type filter values by capitalizing the first letter.
+        /// Normalizes resource type and resource collection filter values by capitalizing the first letter.
         /// </summary>
         /// <param name="filters">The filters dictionary to normalize.</param>
-        public static void NormalizeResourceTypeFilters(Dictionary<string, List<string>>? filters)
+        public static void NormaliseFilters(Dictionary<string, List<string>>? filters)
         {
             if (filters == null || !filters.ContainsKey("resource_type"))
                 return;

OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/AzureSearch/AzureSearchService.cs

@@ -140,7 +140,7 @@ public async Task<SearchResultModel> GetSearchResultAsync(SearchRequestModel sea
 
                         return new Document
                         {
-                            Id = doc.Id?.Substring(1),
+                            Id = doc.Id,
                             Title = doc.Title,
                             Description = doc.Description,
                             ResourceType = doc.ResourceType?.Contains("SCORM e-learning resource") == true ? "scorm" : doc.ResourceType,
@@ -301,7 +301,7 @@ public async Task<SearchCatalogueResultModel> GetCatalogueSearchResultAsync(Cata
 
                         return new CatalogueDocument
                         {
-                            Id = doc.Id?.Substring(1),
+                            Id = doc.Id,
                             Name = doc.Title,
                             Description = doc.Description,
                             Click = new SearchClickModel { Payload = new SearchClickPayloadModel { HitNumber = 1 }, Url = "binon" }
@@ -576,9 +576,10 @@ public async Task<bool> SendResourceForSearchAsync(SearchResourceRequestModel se
                 // Map SearchResourceRequestModel to PocSearchDocument
                 var document = new Models.ServiceModels.AzureSearch.SearchDocument
                 {
-                    Id = searchResourceRequestModel.Id.ToString(),
-                    Title = searchResourceRequestModel.Title ?? string.Empty,
                     // TODO: [BY]
+                    // Id = searchResourceRequestModel.Id.ToString(),
+                    // Title = searchResourceRequestModel.Title ?? string.Empty,
+                    
                     //Description = searchResourceRequestModel.Description ?? string.Empty,
                     //ResourceType = searchResourceRequestModel.ResourceType ?? string.Empty,
                     //ContentType = searchResourceRequestModel.ContentType,
@@ -641,7 +642,7 @@ public async Task<SearchAllCatalogueResultModel> GetAllCatalogueSearchResultsAsy
 
                         return new CatalogueDocument
                         {
-                            Id = doc.Id?.Substring(1),
+                            Id = doc.Id,
                             Name = doc.Title,
                             Description = doc.Description,
                             Click = new SearchClickModel { Payload = new SearchClickPayloadModel { HitNumber = 1 }, Url = "binon" }