From a697cdcd21092119208d59209da2127b2ad02477 Mon Sep 17 00:00:00 2001 From: WillemDalton Date: Mon, 6 Oct 2025 22:50:40 -0400 Subject: working on course filtering --- .../model/course_search/CurrentSearchQuery.java | 24 ++++++++++++++-------- 1 file changed, 15 insertions(+), 9 deletions(-) (limited to 'src/main/java/design/model/course_search/CurrentSearchQuery.java') diff --git a/src/main/java/design/model/course_search/CurrentSearchQuery.java b/src/main/java/design/model/course_search/CurrentSearchQuery.java index 0a492b3..3916f0a 100644 --- a/src/main/java/design/model/course_search/CurrentSearchQuery.java +++ b/src/main/java/design/model/course_search/CurrentSearchQuery.java @@ -64,17 +64,23 @@ public class CurrentSearchQuery { return query; } - public void search(String searchQuery) + public void search(String searchQuery) { - List courses; + List courses = db.getCourseList().getCourses().stream() + .filter(s -> s != null && s.toString().toLowerCase().contains(searchQuery.toLowerCase())) + .collect(Collectors.toList()); - // compare to our search query. - courses = query.getCourses().stream() - .filter(s -> s != null && s.toString().toLowerCase().contains(searchQuery)) - .collect(Collectors.toList()); + // Start with filtered base + CourseList current = new CourseList(); + current.setCourses(courses); - // TO DO: Filter this based on our current filters, then return it! - - query.setCourses(courses); + // Sequentially apply filters + for (CourseSorter filter : filters) + { + current.setSorter(filter); + current = current.groupByCurrentSorter(); // regroup after each + } + + query = current; } } -- cgit v1.2.3