1 files changed, 15 insertions, 9 deletions
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<ICourse> courses;
+        List<ICourse> 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;
     }
 }