From 9b67c5fa4c53a558a32926ab04b59def510396ab Mon Sep 17 00:00:00 2001 From: WillemDalton Date: Sun, 5 Oct 2025 18:17:01 -0400 Subject: some progress on menu commands for searching --- .../controller/userinput/menus/MainMenu.java | 1 + .../controller/userinput/menus/SearchMenu.java | 28 ++++++++++++++++++++ .../controller/userinput/menus/SelectCourse.java | 30 ++++++++++++++++++++++ .../java/design/persistence/CSVMasterDatabase.java | 24 +++++++++++++++++ .../java/design/persistence/MasterDatabase.java | 2 ++ 5 files changed, 85 insertions(+) create mode 100644 src/main/java/design/controller/userinput/menus/SearchMenu.java create mode 100644 src/main/java/design/controller/userinput/menus/SelectCourse.java (limited to 'src/main/java/design') diff --git a/src/main/java/design/controller/userinput/menus/MainMenu.java b/src/main/java/design/controller/userinput/menus/MainMenu.java index fb3cee9..f2c9c21 100644 --- a/src/main/java/design/controller/userinput/menus/MainMenu.java +++ b/src/main/java/design/controller/userinput/menus/MainMenu.java @@ -15,6 +15,7 @@ public class MainMenu extends Menu { public List getMenuOptions() { return List.of( new MenuOption("user settings...", (a) -> new UserSettings().present()), + new MenuOption("add course to profile...", (a) -> new SearchMenu().present()), new MenuOption("statistics...", (a) -> new StatisticsMenu().present()), new MenuOption("log round...", (a) -> {}), new MenuOption("quit", (a) -> {}) diff --git a/src/main/java/design/controller/userinput/menus/SearchMenu.java b/src/main/java/design/controller/userinput/menus/SearchMenu.java new file mode 100644 index 0000000..f02de09 --- /dev/null +++ b/src/main/java/design/controller/userinput/menus/SearchMenu.java @@ -0,0 +1,28 @@ +package design.controller.userinput.menus; + +import design.controller.userinput.Menu; +import design.controller.userinput.MenuOption; + +import java.util.List; + +public class SearchMenu extends Menu { + + @Override + public String getTitle() { + return "search menu"; + } + + @Override + public List getMenuOptions() { + return List.of( + new MenuOption("return to main menu", (a) -> new MainMenu().present()), + new MenuOption("search...", (a) -> new SelectCourse().present()), + new MenuOption("add difficulty filter...", (a) -> {}), + new MenuOption("add hole count filter...", (a) -> {}), + new MenuOption("add location filter...", (a) -> {}), + new MenuOption("add par filter...", (a) -> {}), + new MenuOption("list filters", (a) -> {}), + new MenuOption("clear all filters", (a) -> {}) + ); + } +} diff --git a/src/main/java/design/controller/userinput/menus/SelectCourse.java b/src/main/java/design/controller/userinput/menus/SelectCourse.java new file mode 100644 index 0000000..ddf8b0b --- /dev/null +++ b/src/main/java/design/controller/userinput/menus/SelectCourse.java @@ -0,0 +1,30 @@ +package design.controller.userinput.menus; + +import design.controller.userinput.Menu; +import design.controller.userinput.MenuOption; +import design.persistence.MasterDatabase; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +public class SelectCourse extends Menu { + MasterDatabase globalDB = MasterDatabase.INSTANCE; + + @Override + public String getTitle() { + return "select user"; + } + + + // gonna need to tweak this to only grab those from the search requirements. + @Override + public List getMenuOptions() { + var l = new ArrayList(); + l.addAll(Arrays.stream(globalDB.getCourses()) + .map(i -> new MenuOption( + i.getName() + ", " + i.getLocation() + ", Difficulty: " + i.getDifficultyRating() + ", " + i.getHoleCount() + " holes", + (a) -> {})).toList()); + return l; + } +} diff --git a/src/main/java/design/persistence/CSVMasterDatabase.java b/src/main/java/design/persistence/CSVMasterDatabase.java index fe89191..adbf759 100644 --- a/src/main/java/design/persistence/CSVMasterDatabase.java +++ b/src/main/java/design/persistence/CSVMasterDatabase.java @@ -16,6 +16,8 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; +import design.model.course_search.*; + public class CSVMasterDatabase implements MasterDatabase { private final List cache; @@ -57,6 +59,28 @@ public class CSVMasterDatabase implements MasterDatabase { return cache.get(id); } + @Override + public CourseList getCourseList() { + CourseList courses = new CourseList(); + for (Course c : cache) + { + courses.add(c); + } + + return courses; + } + + public CourseList getCourses(String s) { + CourseList courses = new CourseList(); + for (Course c : cache) + { + if(c.getName().toLowerCase().contains(s.toLowerCase())) + courses.add(c); + } + + return courses; + } + private static class CourseDeserializer extends JsonDeserializer { int curID = 0; diff --git a/src/main/java/design/persistence/MasterDatabase.java b/src/main/java/design/persistence/MasterDatabase.java index ddc0434..3436ee0 100644 --- a/src/main/java/design/persistence/MasterDatabase.java +++ b/src/main/java/design/persistence/MasterDatabase.java @@ -1,10 +1,12 @@ package design.persistence; import design.model.Course; +import design.model.course_search.CourseList; public interface MasterDatabase { MasterDatabase INSTANCE = new CSVMasterDatabase("data/golf_courses_1000.csv"); Course[] getCourses(); + CourseList getCourseList(); // unique from courses as this is a composite of ICourses. Course getCourse(int id); } -- cgit v1.2.3 From 3cc12738542bd7267606185ded60293d0acd7af6 Mon Sep 17 00:00:00 2001 From: WillemDalton Date: Sun, 5 Oct 2025 19:02:08 -0400 Subject: more work on UI for the course searching --- .../controller/userinput/menus/FiltersMenu.java | 42 ++++++++++++++++++++++ .../controller/userinput/menus/SearchMenu.java | 14 +++++--- .../design/model/course_search/CourseSorter.java | 1 + .../model/course_search/SortByDifficulty.java | 8 +++++ .../design/model/course_search/SortByHoles.java | 11 +++++- .../design/model/course_search/SortByLocation.java | 8 +++++ .../design/model/course_search/SortByName.java | 8 +++++ .../java/design/model/course_search/SortByPar.java | 8 +++++ 8 files changed, 94 insertions(+), 6 deletions(-) create mode 100644 src/main/java/design/controller/userinput/menus/FiltersMenu.java (limited to 'src/main/java/design') diff --git a/src/main/java/design/controller/userinput/menus/FiltersMenu.java b/src/main/java/design/controller/userinput/menus/FiltersMenu.java new file mode 100644 index 0000000..434e395 --- /dev/null +++ b/src/main/java/design/controller/userinput/menus/FiltersMenu.java @@ -0,0 +1,42 @@ +package design.controller.userinput.menus; + +import design.controller.userinput.Menu; +import design.controller.userinput.MenuOption; +import design.model.course_search.*; + +import java.util.ArrayList; +import java.util.List; + +public class FiltersMenu extends Menu { + private final List filters = new ArrayList(); + + @Override + public String getTitle() { + return "filter menu"; + } + + public void addFilter(CourseSorter filter) { + filters.add(filter); + System.out.println("\nAdded filter.\n"); + new SearchMenu().present(); + } + + public void clearFilters() { + filters.clear(); + } + + @Override + public List getMenuOptions() { + String filterString = "nothing"; + + for (CourseSorter f : filters) + { + filterString += "-->" + f.toString(); + } + + System.out.println("You are filtering by " + filterString); + return List.of( + new MenuOption("return to search", (c) -> new SearchMenu().present()) + ); + } +} diff --git a/src/main/java/design/controller/userinput/menus/SearchMenu.java b/src/main/java/design/controller/userinput/menus/SearchMenu.java index f02de09..cc91795 100644 --- a/src/main/java/design/controller/userinput/menus/SearchMenu.java +++ b/src/main/java/design/controller/userinput/menus/SearchMenu.java @@ -2,6 +2,10 @@ package design.controller.userinput.menus; import design.controller.userinput.Menu; import design.controller.userinput.MenuOption; +import design.model.course_search.SortByDifficulty; +import design.model.course_search.SortByHoles; +import design.model.course_search.SortByLocation; +import design.model.course_search.SortByPar; import java.util.List; @@ -17,11 +21,11 @@ public class SearchMenu extends Menu { return List.of( new MenuOption("return to main menu", (a) -> new MainMenu().present()), new MenuOption("search...", (a) -> new SelectCourse().present()), - new MenuOption("add difficulty filter...", (a) -> {}), - new MenuOption("add hole count filter...", (a) -> {}), - new MenuOption("add location filter...", (a) -> {}), - new MenuOption("add par filter...", (a) -> {}), - new MenuOption("list filters", (a) -> {}), + new MenuOption("add difficulty filter...", (a) -> new FiltersMenu().addFilter(new SortByDifficulty())), + new MenuOption("add hole count filter...", (a) -> new FiltersMenu().addFilter(new SortByHoles())), + new MenuOption("add location filter...", (a) -> new FiltersMenu().addFilter(new SortByLocation())), + new MenuOption("add par filter...", (a) -> new FiltersMenu().addFilter(new SortByPar())), + new MenuOption("list filters", (a) -> new FiltersMenu().present()), new MenuOption("clear all filters", (a) -> {}) ); } diff --git a/src/main/java/design/model/course_search/CourseSorter.java b/src/main/java/design/model/course_search/CourseSorter.java index 7549645..86c48a5 100644 --- a/src/main/java/design/model/course_search/CourseSorter.java +++ b/src/main/java/design/model/course_search/CourseSorter.java @@ -8,4 +8,5 @@ import java.util.List; */ public interface CourseSorter { public void sortCourses(List courses); + public String toString(); } \ No newline at end of file diff --git a/src/main/java/design/model/course_search/SortByDifficulty.java b/src/main/java/design/model/course_search/SortByDifficulty.java index 8c3251c..7b72b84 100644 --- a/src/main/java/design/model/course_search/SortByDifficulty.java +++ b/src/main/java/design/model/course_search/SortByDifficulty.java @@ -8,8 +8,16 @@ import java.util.Comparator; * Willem Dalton */ public class SortByDifficulty implements CourseSorter { + + @Override public void sortCourses(List courses) { courses.sort(Comparator.comparing(ICourse::getDifficultyRating)); } + + @Override + public String toString() + { + return "Difficulty"; + } } \ No newline at end of file diff --git a/src/main/java/design/model/course_search/SortByHoles.java b/src/main/java/design/model/course_search/SortByHoles.java index b1badab..76e2649 100644 --- a/src/main/java/design/model/course_search/SortByHoles.java +++ b/src/main/java/design/model/course_search/SortByHoles.java @@ -8,8 +8,17 @@ import java.util.Comparator; * Willem Dalton */ public class SortByHoles implements CourseSorter { + + @Override public void sortCourses(List courses) { courses.sort(Comparator.comparing(ICourse::getHoleCount)); } -} \ No newline at end of file + + @Override + public String toString() + { + return "Hole Count"; + } + +} diff --git a/src/main/java/design/model/course_search/SortByLocation.java b/src/main/java/design/model/course_search/SortByLocation.java index 0d8a8d2..e5df839 100644 --- a/src/main/java/design/model/course_search/SortByLocation.java +++ b/src/main/java/design/model/course_search/SortByLocation.java @@ -8,8 +8,16 @@ import java.util.Comparator; * Willem Dalton */ public class SortByLocation implements CourseSorter { + + @Override public void sortCourses(List courses) { courses.sort(Comparator.comparing(ICourse::getLocation)); } + + @Override + public String toString() + { + return "Location"; + } } \ No newline at end of file diff --git a/src/main/java/design/model/course_search/SortByName.java b/src/main/java/design/model/course_search/SortByName.java index 2847d3e..cee3bcc 100644 --- a/src/main/java/design/model/course_search/SortByName.java +++ b/src/main/java/design/model/course_search/SortByName.java @@ -8,8 +8,16 @@ import java.util.Comparator; * Willem Dalton */ public class SortByName implements CourseSorter { + + @Override public void sortCourses(List courses) { courses.sort(Comparator.comparing(ICourse::getName)); } + + @Override + public String toString() + { + return "Name"; + } } \ No newline at end of file diff --git a/src/main/java/design/model/course_search/SortByPar.java b/src/main/java/design/model/course_search/SortByPar.java index 9a3eaf9..cc402b8 100644 --- a/src/main/java/design/model/course_search/SortByPar.java +++ b/src/main/java/design/model/course_search/SortByPar.java @@ -8,8 +8,16 @@ import java.util.Comparator; * Willem Dalton */ public class SortByPar implements CourseSorter { + + @Override public void sortCourses(List courses) { courses.sort(Comparator.comparing(ICourse::getTotalPar)); } + + @Override + public String toString() + { + return "Total Par"; + } } \ No newline at end of file -- cgit v1.2.3 From e21be3aea31959219aafc4e28d983bafa95cde0a Mon Sep 17 00:00:00 2001 From: WillemDalton Date: Mon, 6 Oct 2025 10:25:23 -0400 Subject: moved some menu logic over to the search subystem, added a new query class --- .../controller/userinput/menus/FiltersMenu.java | 21 ++++---- .../controller/userinput/menus/SearchMenu.java | 2 +- .../model/course_search/CurrentSearchQuery.java | 63 ++++++++++++++++++++++ 3 files changed, 75 insertions(+), 11 deletions(-) create mode 100644 src/main/java/design/model/course_search/CurrentSearchQuery.java (limited to 'src/main/java/design') diff --git a/src/main/java/design/controller/userinput/menus/FiltersMenu.java b/src/main/java/design/controller/userinput/menus/FiltersMenu.java index 434e395..e81c093 100644 --- a/src/main/java/design/controller/userinput/menus/FiltersMenu.java +++ b/src/main/java/design/controller/userinput/menus/FiltersMenu.java @@ -4,11 +4,14 @@ import design.controller.userinput.Menu; import design.controller.userinput.MenuOption; import design.model.course_search.*; -import java.util.ArrayList; import java.util.List; +import design.model.course_search.CurrentSearchQuery; + public class FiltersMenu extends Menu { - private final List filters = new ArrayList(); + + CurrentSearchQuery query = CurrentSearchQuery.INSTANCE; + @Override public String getTitle() { @@ -16,25 +19,23 @@ public class FiltersMenu extends Menu { } public void addFilter(CourseSorter filter) { - filters.add(filter); + CurrentSearchQuery.INSTANCE.addFilter(filter); System.out.println("\nAdded filter.\n"); new SearchMenu().present(); } public void clearFilters() { - filters.clear(); + CurrentSearchQuery.INSTANCE.clearFilters(); + System.out.println("\nCleared all filters.\n"); + new SearchMenu().present(); } @Override public List getMenuOptions() { - String filterString = "nothing"; - for (CourseSorter f : filters) - { - filterString += "-->" + f.toString(); - } + System.out.println("\nYou are filtering by "); + System.out.println(query.printFilters()); - System.out.println("You are filtering by " + filterString); return List.of( new MenuOption("return to search", (c) -> new SearchMenu().present()) ); diff --git a/src/main/java/design/controller/userinput/menus/SearchMenu.java b/src/main/java/design/controller/userinput/menus/SearchMenu.java index cc91795..6f3399b 100644 --- a/src/main/java/design/controller/userinput/menus/SearchMenu.java +++ b/src/main/java/design/controller/userinput/menus/SearchMenu.java @@ -26,7 +26,7 @@ public class SearchMenu extends Menu { new MenuOption("add location filter...", (a) -> new FiltersMenu().addFilter(new SortByLocation())), new MenuOption("add par filter...", (a) -> new FiltersMenu().addFilter(new SortByPar())), new MenuOption("list filters", (a) -> new FiltersMenu().present()), - new MenuOption("clear all filters", (a) -> {}) + new MenuOption("clear all filters", (a) -> new FiltersMenu().clearFilters()) ); } } diff --git a/src/main/java/design/model/course_search/CurrentSearchQuery.java b/src/main/java/design/model/course_search/CurrentSearchQuery.java new file mode 100644 index 0000000..45364f4 --- /dev/null +++ b/src/main/java/design/model/course_search/CurrentSearchQuery.java @@ -0,0 +1,63 @@ +package design.model.course_search; + +import java.util.ArrayList; +import java.util.List; + +import design.persistence.MasterDatabase; + +/* + * Represents the state of our current search. + */ +public class CurrentSearchQuery { + public static final CurrentSearchQuery INSTANCE = new CurrentSearchQuery(); + + + private CourseList query; + MasterDatabase db = MasterDatabase.INSTANCE; + private final List filters = new ArrayList(); + + public void initialize() + { + query = db.getCourseList(); + } + + public void addFilter(CourseSorter filter) + { + filters.add(filter); + } + + public void clearFilters() + { + filters.clear(); + } + + public String printFilters() + { + String filterResult = ""; + + if(filters.size() == 0) + { + return "nothing"; + } + + for( CourseSorter f : filters) + { + filterResult += f.toString() + " --> "; + } + + filterResult = filterResult.substring(0, filterResult.length() - 5); + filterResult += "\n"; + + return filterResult; + } + + public List getFilters() + { + return filters; + } + + public CourseList getQueryResult() + { + return query; + } +} -- cgit v1.2.3 From 9843e29a51bb6c21b21567b147c1ad301291ec85 Mon Sep 17 00:00:00 2001 From: WillemDalton Date: Mon, 6 Oct 2025 17:06:42 -0400 Subject: more progress on getting searching to work --- .../controller/userinput/menus/SearchMenu.java | 8 +++++++- .../controller/userinput/menus/SelectCourse.java | 11 +++++++++-- src/main/java/design/model/Course.java | 5 +++++ .../model/course_search/CurrentSearchQuery.java | 21 +++++++++++++++++++++ 4 files changed, 42 insertions(+), 3 deletions(-) (limited to 'src/main/java/design') diff --git a/src/main/java/design/controller/userinput/menus/SearchMenu.java b/src/main/java/design/controller/userinput/menus/SearchMenu.java index 6f3399b..2ca7568 100644 --- a/src/main/java/design/controller/userinput/menus/SearchMenu.java +++ b/src/main/java/design/controller/userinput/menus/SearchMenu.java @@ -8,6 +8,7 @@ import design.model.course_search.SortByLocation; import design.model.course_search.SortByPar; import java.util.List; +import java.util.Scanner; public class SearchMenu extends Menu { @@ -20,7 +21,12 @@ public class SearchMenu extends Menu { public List getMenuOptions() { return List.of( new MenuOption("return to main menu", (a) -> new MainMenu().present()), - new MenuOption("search...", (a) -> new SelectCourse().present()), + new MenuOption("search...", (a) -> { + System.out.print("Enter search term (blank for all): "); + Scanner sc = new Scanner(System.in); + String input = sc.nextLine(); + new SelectCourse().search(new String[]{input}); + }), new MenuOption("add difficulty filter...", (a) -> new FiltersMenu().addFilter(new SortByDifficulty())), new MenuOption("add hole count filter...", (a) -> new FiltersMenu().addFilter(new SortByHoles())), new MenuOption("add location filter...", (a) -> new FiltersMenu().addFilter(new SortByLocation())), diff --git a/src/main/java/design/controller/userinput/menus/SelectCourse.java b/src/main/java/design/controller/userinput/menus/SelectCourse.java index ddf8b0b..51cda62 100644 --- a/src/main/java/design/controller/userinput/menus/SelectCourse.java +++ b/src/main/java/design/controller/userinput/menus/SelectCourse.java @@ -2,26 +2,33 @@ package design.controller.userinput.menus; import design.controller.userinput.Menu; import design.controller.userinput.MenuOption; +import design.model.course_search.CurrentSearchQuery; +import design.model.course_search.ICourse; import design.persistence.MasterDatabase; +import java.lang.reflect.Array; import java.util.ArrayList; import java.util.Arrays; import java.util.List; public class SelectCourse extends Menu { - MasterDatabase globalDB = MasterDatabase.INSTANCE; + CurrentSearchQuery query = CurrentSearchQuery.INSTANCE; @Override public String getTitle() { return "select user"; } + public void search(String[] searchTerm) + { + query.search(searchTerm); + } // gonna need to tweak this to only grab those from the search requirements. @Override public List getMenuOptions() { var l = new ArrayList(); - l.addAll(Arrays.stream(globalDB.getCourses()) + l.addAll(query.getQueryResult().getCourses().stream() .map(i -> new MenuOption( i.getName() + ", " + i.getLocation() + ", Difficulty: " + i.getDifficultyRating() + ", " + i.getHoleCount() + " holes", (a) -> {})).toList()); diff --git a/src/main/java/design/model/Course.java b/src/main/java/design/model/Course.java index f907622..78ee5bd 100644 --- a/src/main/java/design/model/Course.java +++ b/src/main/java/design/model/Course.java @@ -51,4 +51,9 @@ public class Course implements ICourse { public List getHoles() { return holes; } + + @Override + public String toString() { + return name + ", " + location + ", " + difficultyRating + ", " + holeCount + ", " + totalPar; + } } diff --git a/src/main/java/design/model/course_search/CurrentSearchQuery.java b/src/main/java/design/model/course_search/CurrentSearchQuery.java index 45364f4..1f8c8ba 100644 --- a/src/main/java/design/model/course_search/CurrentSearchQuery.java +++ b/src/main/java/design/model/course_search/CurrentSearchQuery.java @@ -2,6 +2,7 @@ package design.model.course_search; import java.util.ArrayList; import java.util.List; +import java.util.stream.Collectors; import design.persistence.MasterDatabase; @@ -16,21 +17,26 @@ public class CurrentSearchQuery { MasterDatabase db = MasterDatabase.INSTANCE; private final List filters = new ArrayList(); + + // initialize the query to the master DB public void initialize() { query = db.getCourseList(); } + // add a new filter public void addFilter(CourseSorter filter) { filters.add(filter); } + // clear the filters public void clearFilters() { filters.clear(); } + // print out the filters ( this is for the model checking used filters ) public String printFilters() { String filterResult = ""; @@ -51,13 +57,28 @@ public class CurrentSearchQuery { return filterResult; } + // get all the filters public List getFilters() { return filters; } + // get our current query. public CourseList getQueryResult() { return query; } + + public CourseList search(String[] searchQuery) + { + List courses = query.getCourses(); + + courses = courses.stream() + .filter(s -> s.toString().toLowerCase().contains(searchQuery[0].toLowerCase())) + .collect(Collectors.toList()); + + query.setCourses(courses); + + return query; + } } -- cgit v1.2.3 From 09f5536f3e21d910e79daf49a67e9e98e9554751 Mon Sep 17 00:00:00 2001 From: WillemDalton Date: Mon, 6 Oct 2025 18:01:55 -0400 Subject: finished searching just need to order by our sorting strategies. --- .../controller/userinput/menus/FiltersMenu.java | 9 +++++ .../controller/userinput/menus/SearchMenu.java | 8 +---- .../controller/userinput/menus/SelectCourse.java | 38 ++++++++++++++++++---- .../model/course_search/CurrentSearchQuery.java | 26 +++++++-------- 4 files changed, 52 insertions(+), 29 deletions(-) (limited to 'src/main/java/design') diff --git a/src/main/java/design/controller/userinput/menus/FiltersMenu.java b/src/main/java/design/controller/userinput/menus/FiltersMenu.java index e81c093..6923d3d 100644 --- a/src/main/java/design/controller/userinput/menus/FiltersMenu.java +++ b/src/main/java/design/controller/userinput/menus/FiltersMenu.java @@ -18,18 +18,27 @@ public class FiltersMenu extends Menu { return "filter menu"; } + /* + * Add a new filter to our filter list + */ public void addFilter(CourseSorter filter) { CurrentSearchQuery.INSTANCE.addFilter(filter); System.out.println("\nAdded filter.\n"); new SearchMenu().present(); } + /* + * clear all of our filters. + */ public void clearFilters() { CurrentSearchQuery.INSTANCE.clearFilters(); System.out.println("\nCleared all filters.\n"); new SearchMenu().present(); } + /* + * show our current filters. + */ @Override public List getMenuOptions() { diff --git a/src/main/java/design/controller/userinput/menus/SearchMenu.java b/src/main/java/design/controller/userinput/menus/SearchMenu.java index 2ca7568..9411b02 100644 --- a/src/main/java/design/controller/userinput/menus/SearchMenu.java +++ b/src/main/java/design/controller/userinput/menus/SearchMenu.java @@ -8,7 +8,6 @@ import design.model.course_search.SortByLocation; import design.model.course_search.SortByPar; import java.util.List; -import java.util.Scanner; public class SearchMenu extends Menu { @@ -21,12 +20,7 @@ public class SearchMenu extends Menu { public List getMenuOptions() { return List.of( new MenuOption("return to main menu", (a) -> new MainMenu().present()), - new MenuOption("search...", (a) -> { - System.out.print("Enter search term (blank for all): "); - Scanner sc = new Scanner(System.in); - String input = sc.nextLine(); - new SelectCourse().search(new String[]{input}); - }), + new MenuOption("search...", (a) -> new SelectCourse().search()), new MenuOption("add difficulty filter...", (a) -> new FiltersMenu().addFilter(new SortByDifficulty())), new MenuOption("add hole count filter...", (a) -> new FiltersMenu().addFilter(new SortByHoles())), new MenuOption("add location filter...", (a) -> new FiltersMenu().addFilter(new SortByLocation())), diff --git a/src/main/java/design/controller/userinput/menus/SelectCourse.java b/src/main/java/design/controller/userinput/menus/SelectCourse.java index 51cda62..44661f5 100644 --- a/src/main/java/design/controller/userinput/menus/SelectCourse.java +++ b/src/main/java/design/controller/userinput/menus/SelectCourse.java @@ -4,34 +4,58 @@ import design.controller.userinput.Menu; import design.controller.userinput.MenuOption; import design.model.course_search.CurrentSearchQuery; import design.model.course_search.ICourse; -import design.persistence.MasterDatabase; -import java.lang.reflect.Array; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; +import java.util.Scanner; public class SelectCourse extends Menu { CurrentSearchQuery query = CurrentSearchQuery.INSTANCE; @Override public String getTitle() { - return "select user"; + return "select course"; } - public void search(String[] searchTerm) + /* + * Prompt for imput and search. + */ + public void search() { + // probably not best practice, but prompt for the search key and search it. + System.out.print("Enter search term (blank for all): "); + Scanner sc = new Scanner(System.in); + String searchTerm = sc.nextLine(); + query.search(searchTerm); + + present(); } - // gonna need to tweak this to only grab those from the search requirements. + /* + * Display the results of our search. + */ @Override - public List getMenuOptions() { + public List getMenuOptions() + { var l = new ArrayList(); + List queryResult = query.getQueryResult().getCourses(); + + // we always want to return to menu as an option. + l.add(new MenuOption("return to main menu", (a) -> new MainMenu().present())); + + // no results? let the user know. + if (queryResult.isEmpty()) + { + System.out.println("\nNo matching courses found.\n"); + } + + // add all of our results. l.addAll(query.getQueryResult().getCourses().stream() .map(i -> new MenuOption( i.getName() + ", " + i.getLocation() + ", Difficulty: " + i.getDifficultyRating() + ", " + i.getHoleCount() + " holes", (a) -> {})).toList()); return l; } + } diff --git a/src/main/java/design/model/course_search/CurrentSearchQuery.java b/src/main/java/design/model/course_search/CurrentSearchQuery.java index 1f8c8ba..0a492b3 100644 --- a/src/main/java/design/model/course_search/CurrentSearchQuery.java +++ b/src/main/java/design/model/course_search/CurrentSearchQuery.java @@ -13,17 +13,10 @@ public class CurrentSearchQuery { public static final CurrentSearchQuery INSTANCE = new CurrentSearchQuery(); - private CourseList query; MasterDatabase db = MasterDatabase.INSTANCE; + private CourseList query = db.getCourseList(); private final List filters = new ArrayList(); - - // initialize the query to the master DB - public void initialize() - { - query = db.getCourseList(); - } - // add a new filter public void addFilter(CourseSorter filter) { @@ -41,6 +34,7 @@ public class CurrentSearchQuery { { String filterResult = ""; + // no filters? let the user know. if(filters.size() == 0) { return "nothing"; @@ -51,7 +45,8 @@ public class CurrentSearchQuery { filterResult += f.toString() + " --> "; } - filterResult = filterResult.substring(0, filterResult.length() - 5); + // very silly way of removing the last arrow from our filter list. it's kind of dumb but it works fine. + filterResult = filterResult.substring(0, filterResult.length() - 5); filterResult += "\n"; return filterResult; @@ -69,16 +64,17 @@ public class CurrentSearchQuery { return query; } - public CourseList search(String[] searchQuery) + public void search(String searchQuery) { - List courses = query.getCourses(); + List courses; - courses = courses.stream() - .filter(s -> s.toString().toLowerCase().contains(searchQuery[0].toLowerCase())) + // compare to our search query. + courses = query.getCourses().stream() + .filter(s -> s != null && s.toString().toLowerCase().contains(searchQuery)) .collect(Collectors.toList()); - query.setCourses(courses); + // TO DO: Filter this based on our current filters, then return it! - return query; + query.setCourses(courses); } } -- cgit v1.2.3 From d4198644b0e3bd79de393afeceb3f9a1d933b956 Mon Sep 17 00:00:00 2001 From: WillemDalton Date: Mon, 6 Oct 2025 21:50:44 -0400 Subject: pushing course search work --- src/main/java/design/controller/userinput/menus/SelectCourse.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/main/java/design') diff --git a/src/main/java/design/controller/userinput/menus/SelectCourse.java b/src/main/java/design/controller/userinput/menus/SelectCourse.java index 44661f5..008adca 100644 --- a/src/main/java/design/controller/userinput/menus/SelectCourse.java +++ b/src/main/java/design/controller/userinput/menus/SelectCourse.java @@ -18,11 +18,10 @@ public class SelectCourse extends Menu { } /* - * Prompt for imput and search. + * Prompt for input and search. */ public void search() { - // probably not best practice, but prompt for the search key and search it. System.out.print("Enter search term (blank for all): "); Scanner sc = new Scanner(System.in); String searchTerm = sc.nextLine(); -- cgit v1.2.3 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 --- .../controller/userinput/menus/SelectCourse.java | 2 +- src/main/java/design/model/Course.java | 30 ++++++++++---- .../design/model/course_search/CourseList.java | 46 ++++++++++++++++++++++ .../design/model/course_search/CourseSorter.java | 1 + .../model/course_search/CurrentSearchQuery.java | 24 ++++++----- .../java/design/model/course_search/ICourse.java | 1 + .../model/course_search/SortByDifficulty.java | 6 +++ .../design/model/course_search/SortByHoles.java | 6 +++ .../design/model/course_search/SortByLocation.java | 6 +++ .../design/model/course_search/SortByName.java | 6 +++ .../java/design/model/course_search/SortByPar.java | 6 +++ 11 files changed, 116 insertions(+), 18 deletions(-) (limited to 'src/main/java/design') diff --git a/src/main/java/design/controller/userinput/menus/SelectCourse.java b/src/main/java/design/controller/userinput/menus/SelectCourse.java index 008adca..0195bcf 100644 --- a/src/main/java/design/controller/userinput/menus/SelectCourse.java +++ b/src/main/java/design/controller/userinput/menus/SelectCourse.java @@ -53,7 +53,7 @@ public class SelectCourse extends Menu { l.addAll(query.getQueryResult().getCourses().stream() .map(i -> new MenuOption( i.getName() + ", " + i.getLocation() + ", Difficulty: " + i.getDifficultyRating() + ", " + i.getHoleCount() + " holes", - (a) -> {})).toList()); + (a) -> {})).toList()); // TO DO: inputing the # for the course should add it to the user's profile return l; } diff --git a/src/main/java/design/model/Course.java b/src/main/java/design/model/Course.java index 78ee5bd..4994381 100644 --- a/src/main/java/design/model/Course.java +++ b/src/main/java/design/model/Course.java @@ -1,5 +1,6 @@ package design.model; +import design.model.course_search.CourseList; import design.model.course_search.ICourse; import java.util.List; @@ -23,37 +24,50 @@ public class Course implements ICourse { this.totalPar = totalPar; this.holes = holes; } - + public int getId() { return id; } - + + @Override public String getName() { return name; } - + + @Override public float getDifficultyRating() { return difficultyRating; } - + + @Override public String getLocation() { return location; } - + + @Override public int getHoleCount() { return holeCount; } - + + @Override public int getTotalPar() { return totalPar; } - + + @Override public List getHoles() { return holes; } - + @Override public String toString() { return name + ", " + location + ", " + difficultyRating + ", " + holeCount + ", " + totalPar; } + + // dummy method due to composite pattern + @Override + public CourseList groupByCurrentSorter() + { + return null; + } } diff --git a/src/main/java/design/model/course_search/CourseList.java b/src/main/java/design/model/course_search/CourseList.java index 82648c2..ac2f334 100644 --- a/src/main/java/design/model/course_search/CourseList.java +++ b/src/main/java/design/model/course_search/CourseList.java @@ -2,6 +2,7 @@ package design.model.course_search; import java.util.ArrayList; import java.util.List; +import java.util.stream.Collectors; import design.model.*; @@ -66,6 +67,44 @@ public class CourseList implements ICourse { sorter.sortCourses(courses); } + public CourseList groupByCurrentSorter() + { + CourseList groupedList = new CourseList(); + + if (courses.isEmpty() || sorter == null) + { + return this; + } + + // Sort by current sorter + sort(); + + // Group consecutive equal elements + List currentGroup = new ArrayList<>(); + ICourse prev = null; + + for (ICourse c : courses) { + if (prev == null || !sorter.isEqual(prev, c)) { + if (!currentGroup.isEmpty()) { + CourseList sublist = new CourseList(); + sublist.setCourses(new ArrayList<>(currentGroup)); + groupedList.add(sublist); + currentGroup.clear(); + } + } + currentGroup.add(c); + prev = c; + } + + if (!currentGroup.isEmpty()) { + CourseList sublist = new CourseList(); + sublist.setCourses(currentGroup); + groupedList.add(sublist); + } + + return groupedList; + } + /* * All overrides of the ICourse class. This is a drawback of the composite pattern, but it's pretty negligible here. return some dummy values. */ @@ -86,4 +125,11 @@ public class CourseList implements ICourse { @Override public List getHoles() { return null; } + + @Override + public String toString() + { + // to do: implement returning courslist children + return "wip"; + } } diff --git a/src/main/java/design/model/course_search/CourseSorter.java b/src/main/java/design/model/course_search/CourseSorter.java index 86c48a5..8b4d42c 100644 --- a/src/main/java/design/model/course_search/CourseSorter.java +++ b/src/main/java/design/model/course_search/CourseSorter.java @@ -9,4 +9,5 @@ import java.util.List; public interface CourseSorter { public void sortCourses(List courses); public String toString(); + public boolean isEqual(ICourse a, ICourse b); } \ No newline at end of file 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; } } diff --git a/src/main/java/design/model/course_search/ICourse.java b/src/main/java/design/model/course_search/ICourse.java index e50eb1b..061bbfa 100644 --- a/src/main/java/design/model/course_search/ICourse.java +++ b/src/main/java/design/model/course_search/ICourse.java @@ -15,4 +15,5 @@ public interface ICourse { List getHoles(); int getHoleCount(); int getTotalPar(); + CourseList groupByCurrentSorter(); } diff --git a/src/main/java/design/model/course_search/SortByDifficulty.java b/src/main/java/design/model/course_search/SortByDifficulty.java index 7b72b84..7660541 100644 --- a/src/main/java/design/model/course_search/SortByDifficulty.java +++ b/src/main/java/design/model/course_search/SortByDifficulty.java @@ -15,6 +15,12 @@ public class SortByDifficulty implements CourseSorter { courses.sort(Comparator.comparing(ICourse::getDifficultyRating)); } + @Override + public boolean isEqual(ICourse a, ICourse b) + { + return a.getDifficultyRating() == b.getDifficultyRating(); + } + @Override public String toString() { diff --git a/src/main/java/design/model/course_search/SortByHoles.java b/src/main/java/design/model/course_search/SortByHoles.java index 76e2649..80c0d16 100644 --- a/src/main/java/design/model/course_search/SortByHoles.java +++ b/src/main/java/design/model/course_search/SortByHoles.java @@ -15,6 +15,12 @@ public class SortByHoles implements CourseSorter { courses.sort(Comparator.comparing(ICourse::getHoleCount)); } + @Override + public boolean isEqual(ICourse a, ICourse b) + { + return a.getHoleCount() == b.getHoleCount(); + } + @Override public String toString() { diff --git a/src/main/java/design/model/course_search/SortByLocation.java b/src/main/java/design/model/course_search/SortByLocation.java index e5df839..98ca0c6 100644 --- a/src/main/java/design/model/course_search/SortByLocation.java +++ b/src/main/java/design/model/course_search/SortByLocation.java @@ -14,6 +14,12 @@ public class SortByLocation implements CourseSorter { { courses.sort(Comparator.comparing(ICourse::getLocation)); } + + @Override + public boolean isEqual(ICourse a, ICourse b) + { + return a.getLocation().equals(b.getLocation()); + } @Override public String toString() diff --git a/src/main/java/design/model/course_search/SortByName.java b/src/main/java/design/model/course_search/SortByName.java index cee3bcc..17553a8 100644 --- a/src/main/java/design/model/course_search/SortByName.java +++ b/src/main/java/design/model/course_search/SortByName.java @@ -15,6 +15,12 @@ public class SortByName implements CourseSorter { courses.sort(Comparator.comparing(ICourse::getName)); } + @Override + public boolean isEqual(ICourse a, ICourse b) + { + return a.getName().equals(b.getName()); + } + @Override public String toString() { diff --git a/src/main/java/design/model/course_search/SortByPar.java b/src/main/java/design/model/course_search/SortByPar.java index cc402b8..203aeaf 100644 --- a/src/main/java/design/model/course_search/SortByPar.java +++ b/src/main/java/design/model/course_search/SortByPar.java @@ -15,6 +15,12 @@ public class SortByPar implements CourseSorter { courses.sort(Comparator.comparing(ICourse::getTotalPar)); } + @Override + public boolean isEqual(ICourse a, ICourse b) + { + return a.getTotalPar() == b.getTotalPar(); + } + @Override public String toString() { -- cgit v1.2.3 From db1ede10a6547b51ffed71dc86d73f3a6c8af129 Mon Sep 17 00:00:00 2001 From: WillemDalton Date: Tue, 7 Oct 2025 09:10:05 -0400 Subject: added some comments, allows users to add courses to profile, fixed displaying course lists --- .../controller/userinput/menus/FiltersMenu.java | 1 - .../controller/userinput/menus/SelectCourse.java | 53 +++++++++++++++++----- src/main/java/design/model/Course.java | 7 --- .../design/model/course_search/CourseList.java | 42 +---------------- .../model/course_search/CurrentSearchQuery.java | 30 ++++++------ .../java/design/model/course_search/ICourse.java | 1 - 6 files changed, 57 insertions(+), 77 deletions(-) (limited to 'src/main/java/design') diff --git a/src/main/java/design/controller/userinput/menus/FiltersMenu.java b/src/main/java/design/controller/userinput/menus/FiltersMenu.java index 6923d3d..3a2463f 100644 --- a/src/main/java/design/controller/userinput/menus/FiltersMenu.java +++ b/src/main/java/design/controller/userinput/menus/FiltersMenu.java @@ -12,7 +12,6 @@ public class FiltersMenu extends Menu { CurrentSearchQuery query = CurrentSearchQuery.INSTANCE; - @Override public String getTitle() { return "filter menu"; diff --git a/src/main/java/design/controller/userinput/menus/SelectCourse.java b/src/main/java/design/controller/userinput/menus/SelectCourse.java index 0195bcf..0a57ab6 100644 --- a/src/main/java/design/controller/userinput/menus/SelectCourse.java +++ b/src/main/java/design/controller/userinput/menus/SelectCourse.java @@ -2,8 +2,9 @@ package design.controller.userinput.menus; import design.controller.userinput.Menu; import design.controller.userinput.MenuOption; -import design.model.course_search.CurrentSearchQuery; -import design.model.course_search.ICourse; +import design.runtime.*; +import design.model.*; +import design.model.course_search.*; import java.util.ArrayList; import java.util.List; @@ -26,9 +27,12 @@ public class SelectCourse extends Menu { Scanner sc = new Scanner(System.in); String searchTerm = sc.nextLine(); - query.search(searchTerm); + // reset the query so we aren't trying to search on an already searched query + query.reset(); - present(); + // search and present + query.search(searchTerm); + this.present(); } /* @@ -40,21 +44,48 @@ public class SelectCourse extends Menu { var l = new ArrayList(); List queryResult = query.getQueryResult().getCourses(); - // we always want to return to menu as an option. + // 0 - return to main menu l.add(new MenuOption("return to main menu", (a) -> new MainMenu().present())); - // no results? let the user know. + // if we find no results, let the user know. if (queryResult.isEmpty()) { System.out.println("\nNo matching courses found.\n"); } - // add all of our results. - l.addAll(query.getQueryResult().getCourses().stream() - .map(i -> new MenuOption( - i.getName() + ", " + i.getLocation() + ", Difficulty: " + i.getDifficultyRating() + ", " + i.getHoleCount() + " holes", - (a) -> {})).toList()); // TO DO: inputing the # for the course should add it to the user's profile + // traverse the course list tree and add menu options for each leaf (course) + addCoursesRecursive(l, query.getQueryResult()); return l; } + + // recursively go through tree structure of courselist to make menu options + private void addCoursesRecursive(List menuOptions, CourseList list) + { + for (ICourse icourse : list.getCourses()) + { + // if we find a leaf (course), display it as a menu option + if (icourse instanceof Course c) + { + menuOptions.add(new MenuOption( c.getName() + ", " + c.getLocation() + ", Difficulty: " + c.getDifficultyRating() + ", " + c.getHoleCount() + " holes", + (a) -> { + Golfer currentGolfer = Session.getCurrentGolfer(); + if(currentGolfer == null) + { + System.out.println("\n\n !!! log into a golfer account to add courses to your profile. !!! \n\n"); + new MainMenu().present(); + } + + currentGolfer.addCourse(c); + System.out.println("\n Course added to profile. \n"); + } + )); + } + // if not, we need to traverse another courselist + else if (icourse instanceof CourseList sublist) + { + addCoursesRecursive(menuOptions, sublist); + } + } + } } diff --git a/src/main/java/design/model/Course.java b/src/main/java/design/model/Course.java index 4994381..c199563 100644 --- a/src/main/java/design/model/Course.java +++ b/src/main/java/design/model/Course.java @@ -63,11 +63,4 @@ public class Course implements ICourse { public String toString() { return name + ", " + location + ", " + difficultyRating + ", " + holeCount + ", " + totalPar; } - - // dummy method due to composite pattern - @Override - public CourseList groupByCurrentSorter() - { - return null; - } } diff --git a/src/main/java/design/model/course_search/CourseList.java b/src/main/java/design/model/course_search/CourseList.java index ac2f334..360dc9b 100644 --- a/src/main/java/design/model/course_search/CourseList.java +++ b/src/main/java/design/model/course_search/CourseList.java @@ -2,7 +2,6 @@ package design.model.course_search; import java.util.ArrayList; import java.util.List; -import java.util.stream.Collectors; import design.model.*; @@ -66,44 +65,6 @@ public class CourseList implements ICourse { { sorter.sortCourses(courses); } - - public CourseList groupByCurrentSorter() - { - CourseList groupedList = new CourseList(); - - if (courses.isEmpty() || sorter == null) - { - return this; - } - - // Sort by current sorter - sort(); - - // Group consecutive equal elements - List currentGroup = new ArrayList<>(); - ICourse prev = null; - - for (ICourse c : courses) { - if (prev == null || !sorter.isEqual(prev, c)) { - if (!currentGroup.isEmpty()) { - CourseList sublist = new CourseList(); - sublist.setCourses(new ArrayList<>(currentGroup)); - groupedList.add(sublist); - currentGroup.clear(); - } - } - currentGroup.add(c); - prev = c; - } - - if (!currentGroup.isEmpty()) { - CourseList sublist = new CourseList(); - sublist.setCourses(currentGroup); - groupedList.add(sublist); - } - - return groupedList; - } /* * All overrides of the ICourse class. This is a drawback of the composite pattern, but it's pretty negligible here. return some dummy values. @@ -129,7 +90,6 @@ public class CourseList implements ICourse { @Override public String toString() { - // to do: implement returning courslist children - return "wip"; + return "Course List"; } } diff --git a/src/main/java/design/model/course_search/CurrentSearchQuery.java b/src/main/java/design/model/course_search/CurrentSearchQuery.java index 3916f0a..c00eb86 100644 --- a/src/main/java/design/model/course_search/CurrentSearchQuery.java +++ b/src/main/java/design/model/course_search/CurrentSearchQuery.java @@ -12,11 +12,19 @@ import design.persistence.MasterDatabase; public class CurrentSearchQuery { public static final CurrentSearchQuery INSTANCE = new CurrentSearchQuery(); - + // initialize our search with the master db data MasterDatabase db = MasterDatabase.INSTANCE; private CourseList query = db.getCourseList(); private final List filters = new ArrayList(); + + // reset the query + public void reset() + { + query = db.getCourseList(); + clearFilters(); + } + // add a new filter public void addFilter(CourseSorter filter) { @@ -29,7 +37,7 @@ public class CurrentSearchQuery { filters.clear(); } - // print out the filters ( this is for the model checking used filters ) + // print out the filters we're currently using and the order public String printFilters() { String filterResult = ""; @@ -45,7 +53,7 @@ public class CurrentSearchQuery { filterResult += f.toString() + " --> "; } - // very silly way of removing the last arrow from our filter list. it's kind of dumb but it works fine. + // remove last arrow and add padding filterResult = filterResult.substring(0, filterResult.length() - 5); filterResult += "\n"; @@ -66,21 +74,11 @@ public class CurrentSearchQuery { public void search(String searchQuery) { + // only grab courses which fit our search List courses = db.getCourseList().getCourses().stream() - .filter(s -> s != null && s.toString().toLowerCase().contains(searchQuery.toLowerCase())) + .filter(s -> s.toString().toLowerCase().contains(searchQuery.toLowerCase())) .collect(Collectors.toList()); - // Start with filtered base - CourseList current = new CourseList(); - current.setCourses(courses); - - // Sequentially apply filters - for (CourseSorter filter : filters) - { - current.setSorter(filter); - current = current.groupByCurrentSorter(); // regroup after each - } - - query = current; + query.setCourses(courses); } } diff --git a/src/main/java/design/model/course_search/ICourse.java b/src/main/java/design/model/course_search/ICourse.java index 061bbfa..e50eb1b 100644 --- a/src/main/java/design/model/course_search/ICourse.java +++ b/src/main/java/design/model/course_search/ICourse.java @@ -15,5 +15,4 @@ public interface ICourse { List getHoles(); int getHoleCount(); int getTotalPar(); - CourseList groupByCurrentSorter(); } -- cgit v1.2.3 From 2ef38d86d8b207bc0dad6e3c6b7780abc6f6e82b Mon Sep 17 00:00:00 2001 From: WillemDalton Date: Wed, 8 Oct 2025 21:49:21 -0400 Subject: finished multi filtering --- .../controller/userinput/menus/CourseSearch.java | 96 ++++++++++++++++++++++ .../controller/userinput/menus/FiltersMenu.java | 4 +- .../controller/userinput/menus/SearchMenu.java | 5 +- .../controller/userinput/menus/SelectCourse.java | 91 -------------------- .../model/course_search/CurrentSearchQuery.java | 77 ++++++++++++++++- 5 files changed, 177 insertions(+), 96 deletions(-) create mode 100644 src/main/java/design/controller/userinput/menus/CourseSearch.java delete mode 100644 src/main/java/design/controller/userinput/menus/SelectCourse.java (limited to 'src/main/java/design') diff --git a/src/main/java/design/controller/userinput/menus/CourseSearch.java b/src/main/java/design/controller/userinput/menus/CourseSearch.java new file mode 100644 index 0000000..6bba2ef --- /dev/null +++ b/src/main/java/design/controller/userinput/menus/CourseSearch.java @@ -0,0 +1,96 @@ +package design.controller.userinput.menus; + +import design.controller.userinput.Menu; +import design.controller.userinput.MenuOption; +import design.runtime.*; +import design.model.*; +import design.model.course_search.*; + +import java.util.ArrayList; +import java.util.List; +import java.util.Scanner; + +/* + * The actual SEARCH feature of course searching. + */ +public class CourseSearch extends Menu { + CurrentSearchQuery query = CurrentSearchQuery.INSTANCE; + + @Override + public String getTitle() { + return "select course"; + } + + /* + * Prompt for input and search. + */ + public void search() + { + System.out.print("Enter search term (blank for all): "); + Scanner sc = new Scanner(System.in); + String searchTerm = sc.nextLine(); + + // search and present + query.search(searchTerm); + this.present(); + + // reset the query after we're done. + query.reset(); + } + + /* + * Display the results of our search. + */ + @Override + public List getMenuOptions() + { + var l = new ArrayList(); + List queryResult = query.getQueryResult().getCourses(); + + // 0 - return to main menu + l.add(new MenuOption("return to main menu", (a) -> new MainMenu().present())); + + // if we find no results, let the user know. + if (queryResult.isEmpty()) + { + System.out.println("\nNo matching courses found.\n"); + } + + // traverse the course list tree and add menu options for each leaf (course) + addCoursesRecursive(l, query.getQueryResult()); + return l; + } + + + // recursively go through tree structure of courselist to make menu options. + // this is all for displaying the menu options, not the actual sorting. + private void addCoursesRecursive(List menuOptions, CourseList list) + { + for (ICourse icourse : list.getCourses()) + { + // if we find a leaf (course), display it as a menu option + if (icourse instanceof Course c) + { + menuOptions.add(new MenuOption( c.getName() + ", " + c.getLocation() + ", Difficulty: " + c.getDifficultyRating() + ", " + c.getHoleCount() + " holes, " + c.getTotalPar() + " total par", + (a) -> { + Golfer currentGolfer = Session.getCurrentGolfer(); + if(currentGolfer == null) + { + // if we aren't logged in, notify the user. + System.out.println("\n\n !!! log into a golfer account to add courses to your profile. !!! \n\n"); + new MainMenu().present(); + } + + currentGolfer.addCourse(c); + System.out.println("\n Course added to profile. \n"); + } + )); + } + // if not, we need to traverse another courselist + else if (icourse instanceof CourseList sublist) + { + addCoursesRecursive(menuOptions, sublist); + } + } + } +} diff --git a/src/main/java/design/controller/userinput/menus/FiltersMenu.java b/src/main/java/design/controller/userinput/menus/FiltersMenu.java index 3a2463f..724f6a3 100644 --- a/src/main/java/design/controller/userinput/menus/FiltersMenu.java +++ b/src/main/java/design/controller/userinput/menus/FiltersMenu.java @@ -8,8 +8,10 @@ import java.util.List; import design.model.course_search.CurrentSearchQuery; +/* + * Tracks the user's current filters on their search. + */ public class FiltersMenu extends Menu { - CurrentSearchQuery query = CurrentSearchQuery.INSTANCE; @Override diff --git a/src/main/java/design/controller/userinput/menus/SearchMenu.java b/src/main/java/design/controller/userinput/menus/SearchMenu.java index 9411b02..198e254 100644 --- a/src/main/java/design/controller/userinput/menus/SearchMenu.java +++ b/src/main/java/design/controller/userinput/menus/SearchMenu.java @@ -9,6 +9,9 @@ import design.model.course_search.SortByPar; import java.util.List; +/* + * The main control panel for course searching. + */ public class SearchMenu extends Menu { @Override @@ -20,7 +23,7 @@ public class SearchMenu extends Menu { public List getMenuOptions() { return List.of( new MenuOption("return to main menu", (a) -> new MainMenu().present()), - new MenuOption("search...", (a) -> new SelectCourse().search()), + new MenuOption("search...", (a) -> new CourseSearch().search()), new MenuOption("add difficulty filter...", (a) -> new FiltersMenu().addFilter(new SortByDifficulty())), new MenuOption("add hole count filter...", (a) -> new FiltersMenu().addFilter(new SortByHoles())), new MenuOption("add location filter...", (a) -> new FiltersMenu().addFilter(new SortByLocation())), diff --git a/src/main/java/design/controller/userinput/menus/SelectCourse.java b/src/main/java/design/controller/userinput/menus/SelectCourse.java deleted file mode 100644 index 0a57ab6..0000000 --- a/src/main/java/design/controller/userinput/menus/SelectCourse.java +++ /dev/null @@ -1,91 +0,0 @@ -package design.controller.userinput.menus; - -import design.controller.userinput.Menu; -import design.controller.userinput.MenuOption; -import design.runtime.*; -import design.model.*; -import design.model.course_search.*; - -import java.util.ArrayList; -import java.util.List; -import java.util.Scanner; - -public class SelectCourse extends Menu { - CurrentSearchQuery query = CurrentSearchQuery.INSTANCE; - - @Override - public String getTitle() { - return "select course"; - } - - /* - * Prompt for input and search. - */ - public void search() - { - System.out.print("Enter search term (blank for all): "); - Scanner sc = new Scanner(System.in); - String searchTerm = sc.nextLine(); - - // reset the query so we aren't trying to search on an already searched query - query.reset(); - - // search and present - query.search(searchTerm); - this.present(); - } - - /* - * Display the results of our search. - */ - @Override - public List getMenuOptions() - { - var l = new ArrayList(); - List queryResult = query.getQueryResult().getCourses(); - - // 0 - return to main menu - l.add(new MenuOption("return to main menu", (a) -> new MainMenu().present())); - - // if we find no results, let the user know. - if (queryResult.isEmpty()) - { - System.out.println("\nNo matching courses found.\n"); - } - - // traverse the course list tree and add menu options for each leaf (course) - addCoursesRecursive(l, query.getQueryResult()); - return l; - } - - - // recursively go through tree structure of courselist to make menu options - private void addCoursesRecursive(List menuOptions, CourseList list) - { - for (ICourse icourse : list.getCourses()) - { - // if we find a leaf (course), display it as a menu option - if (icourse instanceof Course c) - { - menuOptions.add(new MenuOption( c.getName() + ", " + c.getLocation() + ", Difficulty: " + c.getDifficultyRating() + ", " + c.getHoleCount() + " holes", - (a) -> { - Golfer currentGolfer = Session.getCurrentGolfer(); - if(currentGolfer == null) - { - System.out.println("\n\n !!! log into a golfer account to add courses to your profile. !!! \n\n"); - new MainMenu().present(); - } - - currentGolfer.addCourse(c); - System.out.println("\n Course added to profile. \n"); - } - )); - } - // if not, we need to traverse another courselist - else if (icourse instanceof CourseList sublist) - { - addCoursesRecursive(menuOptions, sublist); - } - } - } -} diff --git a/src/main/java/design/model/course_search/CurrentSearchQuery.java b/src/main/java/design/model/course_search/CurrentSearchQuery.java index c00eb86..e1f52ce 100644 --- a/src/main/java/design/model/course_search/CurrentSearchQuery.java +++ b/src/main/java/design/model/course_search/CurrentSearchQuery.java @@ -17,12 +17,10 @@ public class CurrentSearchQuery { private CourseList query = db.getCourseList(); private final List filters = new ArrayList(); - // reset the query public void reset() { query = db.getCourseList(); - clearFilters(); } // add a new filter @@ -79,6 +77,79 @@ public class CurrentSearchQuery { .filter(s -> s.toString().toLowerCase().contains(searchQuery.toLowerCase())) .collect(Collectors.toList()); - query.setCourses(courses); + // and now, we filter it! + CourseList filtered = applyFilters(filters, courses); + query.setCourses(filtered.getCourses()); + } + + // to apply our filters we need to traverse the tree and make new grouping as we go. + public CourseList applyFilters(List filters, List coursesToFilter) + { + CourseList root = new CourseList(); + root.setCourses(applyFiltersRecursive(coursesToFilter, filters, 0)); + return root; + } + + // the actual recursive part. Level is how many filters deep we are. + private List applyFiltersRecursive(List courses, List filters, int level) + { + // base case. we have gone past all filters or theres only one course in this list. already sorted! + if (level >= filters.size() || courses.size() <= 1) + { + return courses; + } + + // grab out current sorting strategy for this level, and sort the courselist. + CourseSorter sorter = filters.get(level); + sorter.sortCourses(courses); + + // the resulting sorted list, with new groupings + List result = new ArrayList<>(); + + // courses with an equal value. + List currentGroup = new ArrayList<>(); + + ICourse prev = null; + + // run through the courses, if + for (ICourse c : courses) + { + /* always add the first course to a new group. when iterating through courses, if we have to values that are equal, we need to add them into a group together. + * think about it this way. If we have [ 1, 2, 2, 2, 3, 4 ]. 1 is first, so its in it's own group. 2 /= 1, so 2 gets its own group. + * now do 2 again. we add it to the existing group 2. Same with the next 2. Now 3. 3 /= 2, so we put it in it's own group. + */ + if (prev == null || !sorter.isEqual(prev, c)) + { + // already a course in that group? we now have two equal values and so + if (!currentGroup.isEmpty()) + { + result.add(makeGroup(currentGroup, filters, level)); + currentGroup = new ArrayList<>(); + } + } + + currentGroup.add(c); + prev = c; + } + + // handle the last group. + if (!currentGroup.isEmpty()) + { + result.add(makeGroup(currentGroup, filters, level)); + } + + return result; } + + // make a CourseList group, a sublist of a group, and filter it. + private ICourse makeGroup(List group, List filters, int level) + { + // base case, group only has one course in it (already sorted) + if (group.size() == 1) return group.get(0); + + // group has more than 1 course in it, it needs to be sorted more if possible. + CourseList subList = new CourseList(); + subList.setCourses(applyFiltersRecursive(group, filters, level + 1)); + return subList; + } } -- cgit v1.2.3 From e265d5cbb6fd803d6bb05e34268f21e6814e0e8b Mon Sep 17 00:00:00 2001 From: WillemDalton Date: Wed, 8 Oct 2025 21:52:21 -0400 Subject: reversed the sorting order of difficulty and par to be descending instead of ascending. --- src/main/java/design/model/course_search/SortByDifficulty.java | 2 +- src/main/java/design/model/course_search/SortByHoles.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/main/java/design') diff --git a/src/main/java/design/model/course_search/SortByDifficulty.java b/src/main/java/design/model/course_search/SortByDifficulty.java index 7660541..c6bb7ac 100644 --- a/src/main/java/design/model/course_search/SortByDifficulty.java +++ b/src/main/java/design/model/course_search/SortByDifficulty.java @@ -12,7 +12,7 @@ public class SortByDifficulty implements CourseSorter { @Override public void sortCourses(List courses) { - courses.sort(Comparator.comparing(ICourse::getDifficultyRating)); + courses.sort(Comparator.comparing(ICourse::getDifficultyRating).reversed()); // hardest to easiest } @Override diff --git a/src/main/java/design/model/course_search/SortByHoles.java b/src/main/java/design/model/course_search/SortByHoles.java index 80c0d16..33c5473 100644 --- a/src/main/java/design/model/course_search/SortByHoles.java +++ b/src/main/java/design/model/course_search/SortByHoles.java @@ -12,7 +12,7 @@ public class SortByHoles implements CourseSorter { @Override public void sortCourses(List courses) { - courses.sort(Comparator.comparing(ICourse::getHoleCount)); + courses.sort(Comparator.comparing(ICourse::getHoleCount).reversed()); // highest par to lowest par } @Override -- cgit v1.2.3 From 88564fc1e48ec1efbbfc91e99339b781146a9a75 Mon Sep 17 00:00:00 2001 From: WillemDalton Date: Wed, 8 Oct 2025 22:05:47 -0400 Subject: added the ability for users to save courses to their profile --- .../design/controller/userinput/menus/CourseSearch.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'src/main/java/design') diff --git a/src/main/java/design/controller/userinput/menus/CourseSearch.java b/src/main/java/design/controller/userinput/menus/CourseSearch.java index 6bba2ef..7170b5d 100644 --- a/src/main/java/design/controller/userinput/menus/CourseSearch.java +++ b/src/main/java/design/controller/userinput/menus/CourseSearch.java @@ -5,7 +5,9 @@ import design.controller.userinput.MenuOption; import design.runtime.*; import design.model.*; import design.model.course_search.*; +import design.persistence.PersonalDatabase; +import java.io.IOException; import java.util.ArrayList; import java.util.List; import java.util.Scanner; @@ -15,6 +17,7 @@ import java.util.Scanner; */ public class CourseSearch extends Menu { CurrentSearchQuery query = CurrentSearchQuery.INSTANCE; + PersonalDatabase GolferDB = PersonalDatabase.INSTANCE; @Override public String getTitle() { @@ -81,8 +84,19 @@ public class CourseSearch extends Menu { new MainMenu().present(); } + // add the course, try to save to DB. currentGolfer.addCourse(c); + try + { + GolferDB.updateGolfer(currentGolfer); + } + catch(IOException e) + { + System.out.println(e); // not sure if we should format this prettier for the user if the DB fails. + } + System.out.println("\n Course added to profile. \n"); + new MainMenu().present(); } )); } -- cgit v1.2.3 From 7623a5c02f6da679016bf8f8671d4fb29c5fdfbb Mon Sep 17 00:00:00 2001 From: sowgro Date: Wed, 8 Oct 2025 23:45:07 -0400 Subject: update for action interface change and cleanup string --- .../design/controller/userinput/menus/CourseSearch.java | 7 ++++--- .../design/controller/userinput/menus/FiltersMenu.java | 2 +- .../design/controller/userinput/menus/SearchMenu.java | 16 ++++++++-------- 3 files changed, 13 insertions(+), 12 deletions(-) (limited to 'src/main/java/design') diff --git a/src/main/java/design/controller/userinput/menus/CourseSearch.java b/src/main/java/design/controller/userinput/menus/CourseSearch.java index 7170b5d..b9e29bd 100644 --- a/src/main/java/design/controller/userinput/menus/CourseSearch.java +++ b/src/main/java/design/controller/userinput/menus/CourseSearch.java @@ -51,7 +51,7 @@ public class CourseSearch extends Menu { List queryResult = query.getQueryResult().getCourses(); // 0 - return to main menu - l.add(new MenuOption("return to main menu", (a) -> new MainMenu().present())); + l.add(new MenuOption("return to main menu", () -> new MainMenu().present())); // if we find no results, let the user know. if (queryResult.isEmpty()) @@ -74,8 +74,9 @@ public class CourseSearch extends Menu { // if we find a leaf (course), display it as a menu option if (icourse instanceof Course c) { - menuOptions.add(new MenuOption( c.getName() + ", " + c.getLocation() + ", Difficulty: " + c.getDifficultyRating() + ", " + c.getHoleCount() + " holes, " + c.getTotalPar() + " total par", - (a) -> { + var name = String.format("%s, %s, Difficulty: %s, %s holes, %s total par", + c.getName(), c.getLocation(), c.getDifficultyRating(), c.getHoleCount(), c.getTotalPar()); + menuOptions.add(new MenuOption(name, () -> { Golfer currentGolfer = Session.getCurrentGolfer(); if(currentGolfer == null) { diff --git a/src/main/java/design/controller/userinput/menus/FiltersMenu.java b/src/main/java/design/controller/userinput/menus/FiltersMenu.java index 724f6a3..9f2d8df 100644 --- a/src/main/java/design/controller/userinput/menus/FiltersMenu.java +++ b/src/main/java/design/controller/userinput/menus/FiltersMenu.java @@ -47,7 +47,7 @@ public class FiltersMenu extends Menu { System.out.println(query.printFilters()); return List.of( - new MenuOption("return to search", (c) -> new SearchMenu().present()) + new MenuOption("return to search", () -> new SearchMenu().present()) ); } } diff --git a/src/main/java/design/controller/userinput/menus/SearchMenu.java b/src/main/java/design/controller/userinput/menus/SearchMenu.java index 198e254..8b50265 100644 --- a/src/main/java/design/controller/userinput/menus/SearchMenu.java +++ b/src/main/java/design/controller/userinput/menus/SearchMenu.java @@ -22,14 +22,14 @@ public class SearchMenu extends Menu { @Override public List getMenuOptions() { return List.of( - new MenuOption("return to main menu", (a) -> new MainMenu().present()), - new MenuOption("search...", (a) -> new CourseSearch().search()), - new MenuOption("add difficulty filter...", (a) -> new FiltersMenu().addFilter(new SortByDifficulty())), - new MenuOption("add hole count filter...", (a) -> new FiltersMenu().addFilter(new SortByHoles())), - new MenuOption("add location filter...", (a) -> new FiltersMenu().addFilter(new SortByLocation())), - new MenuOption("add par filter...", (a) -> new FiltersMenu().addFilter(new SortByPar())), - new MenuOption("list filters", (a) -> new FiltersMenu().present()), - new MenuOption("clear all filters", (a) -> new FiltersMenu().clearFilters()) + new MenuOption("return to main menu", () -> new MainMenu().present()), + new MenuOption("search...", () -> new CourseSearch().search()), + new MenuOption("add difficulty filter...", () -> new FiltersMenu().addFilter(new SortByDifficulty())), + new MenuOption("add hole count filter...", () -> new FiltersMenu().addFilter(new SortByHoles())), + new MenuOption("add location filter...", () -> new FiltersMenu().addFilter(new SortByLocation())), + new MenuOption("add par filter...", () -> new FiltersMenu().addFilter(new SortByPar())), + new MenuOption("list filters", () -> new FiltersMenu().present()), + new MenuOption("clear all filters", () -> new FiltersMenu().clearFilters()) ); } } -- cgit v1.2.3 From ddcfcf82baf737e183ec7b00edeee26894516c58 Mon Sep 17 00:00:00 2001 From: sowgro Date: Thu, 9 Oct 2025 08:06:56 -0400 Subject: fix formatting --- .../controller/userinput/menus/CourseSearch.java | 53 +++++++-------- .../design/model/course_search/CourseList.java | 66 ++++++++++--------- .../model/course_search/CurrentSearchQuery.java | 75 +++++++++------------- .../model/course_search/SortByDifficulty.java | 13 ++-- .../design/model/course_search/SortByHoles.java | 13 ++-- .../design/model/course_search/SortByLocation.java | 15 ++--- .../design/model/course_search/SortByName.java | 13 ++-- .../java/design/model/course_search/SortByPar.java | 13 ++-- .../design/persistence/JSONPersonalDatabase.java | 2 +- 9 files changed, 114 insertions(+), 149 deletions(-) (limited to 'src/main/java/design') diff --git a/src/main/java/design/controller/userinput/menus/CourseSearch.java b/src/main/java/design/controller/userinput/menus/CourseSearch.java index b9e29bd..019965c 100644 --- a/src/main/java/design/controller/userinput/menus/CourseSearch.java +++ b/src/main/java/design/controller/userinput/menus/CourseSearch.java @@ -2,10 +2,13 @@ package design.controller.userinput.menus; import design.controller.userinput.Menu; import design.controller.userinput.MenuOption; -import design.runtime.*; -import design.model.*; -import design.model.course_search.*; +import design.model.Course; +import design.model.Golfer; +import design.model.course_search.CourseList; +import design.model.course_search.CurrentSearchQuery; +import design.model.course_search.ICourse; import design.persistence.PersonalDatabase; +import design.runtime.Session; import java.io.IOException; import java.util.ArrayList; @@ -27,8 +30,7 @@ public class CourseSearch extends Menu { /* * Prompt for input and search. */ - public void search() - { + public void search() { System.out.print("Enter search term (blank for all): "); Scanner sc = new Scanner(System.in); String searchTerm = sc.nextLine(); @@ -45,21 +47,19 @@ public class CourseSearch extends Menu { * Display the results of our search. */ @Override - public List getMenuOptions() - { + public List getMenuOptions() { var l = new ArrayList(); List queryResult = query.getQueryResult().getCourses(); // 0 - return to main menu l.add(new MenuOption("return to main menu", () -> new MainMenu().present())); - + // if we find no results, let the user know. - if (queryResult.isEmpty()) - { + if (queryResult.isEmpty()) { System.out.println("\nNo matching courses found.\n"); } - // traverse the course list tree and add menu options for each leaf (course) + // traverse the course list tree and add menu options for each leaf (course) addCoursesRecursive(l, query.getQueryResult()); return l; } @@ -67,43 +67,36 @@ public class CourseSearch extends Menu { // recursively go through tree structure of courselist to make menu options. // this is all for displaying the menu options, not the actual sorting. - private void addCoursesRecursive(List menuOptions, CourseList list) - { - for (ICourse icourse : list.getCourses()) - { + private void addCoursesRecursive(List menuOptions, CourseList list) { + for (ICourse icourse : list.getCourses()) { // if we find a leaf (course), display it as a menu option - if (icourse instanceof Course c) - { + if (icourse instanceof Course c) { var name = String.format("%s, %s, Difficulty: %s, %s holes, %s total par", c.getName(), c.getLocation(), c.getDifficultyRating(), c.getHoleCount(), c.getTotalPar()); menuOptions.add(new MenuOption(name, () -> { Golfer currentGolfer = Session.getCurrentGolfer(); - if(currentGolfer == null) - { + if (currentGolfer == null) { // if we aren't logged in, notify the user. System.out.println("\n\n !!! log into a golfer account to add courses to your profile. !!! \n\n"); new MainMenu().present(); + return; } // add the course, try to save to DB. currentGolfer.addCourse(c); - try - { + try { GolferDB.updateGolfer(currentGolfer); - } - catch(IOException e) - { - System.out.println(e); // not sure if we should format this prettier for the user if the DB fails. + } catch (IOException e) { + e.printStackTrace(); // not sure if we should format this prettier for the user if the DB fails. } System.out.println("\n Course added to profile. \n"); - new MainMenu().present(); + new MainMenu().present(); } - )); - } + )); + } // if not, we need to traverse another courselist - else if (icourse instanceof CourseList sublist) - { + else if (icourse instanceof CourseList sublist) { addCoursesRecursive(menuOptions, sublist); } } diff --git a/src/main/java/design/model/course_search/CourseList.java b/src/main/java/design/model/course_search/CourseList.java index 360dc9b..c2411f7 100644 --- a/src/main/java/design/model/course_search/CourseList.java +++ b/src/main/java/design/model/course_search/CourseList.java @@ -1,10 +1,10 @@ package design.model.course_search; +import design.model.Hole; + import java.util.ArrayList; import java.util.List; -import design.model.*; - /* * Defines a list of courses that can be sorted, added to or removed from. * Willem Dalton @@ -13,83 +13,87 @@ public class CourseList implements ICourse { private CourseSorter sorter; private List courses; - public CourseList() - { + public CourseList() { courses = new ArrayList<>(); } /* * Grab the list of courses */ - public List getCourses() - { + public List getCourses() { return courses; } /* * Set the list of courses equal to an existing list */ - public void setCourses(List courses) - { + public void setCourses(List courses) { this.courses = courses; } /* - * set the chosen sorting algorithm for the given list. - */ - public void setSorter(CourseSorter courseSorter) - { + * set the chosen sorting algorithm for the given list. + */ + public void setSorter(CourseSorter courseSorter) { sorter = courseSorter; } /* * Add a new course to the list. */ - public void add(ICourse course) - { + public void add(ICourse course) { courses.add(course); } /* - * Remove a course from the list. + * Remove a course from the list. */ - public void remove(ICourse course) - { + public void remove(ICourse course) { courses.remove(course); } /* * Sort the list. */ - public void sort() - { + public void sort() { sorter.sortCourses(courses); } - + /* * All overrides of the ICourse class. This is a drawback of the composite pattern, but it's pretty negligible here. return some dummy values. */ @Override - public String getName() { return "Course List"; } - + public String getName() { + return "Course List"; + } + @Override - public float getDifficultyRating() { return 0; } + public float getDifficultyRating() { + return 0; + } @Override - public String getLocation() { return ""; } - + public String getLocation() { + return ""; + } + @Override - public int getTotalPar() { return 0; } + public int getTotalPar() { + return 0; + } @Override - public int getHoleCount() { return 0; } + public int getHoleCount() { + return 0; + } @Override - public List getHoles() { return null; } + public List getHoles() { + return null; + } - @Override - public String toString() - { + @Override + public String toString() { return "Course List"; } } diff --git a/src/main/java/design/model/course_search/CurrentSearchQuery.java b/src/main/java/design/model/course_search/CurrentSearchQuery.java index e1f52ce..999dfcb 100644 --- a/src/main/java/design/model/course_search/CurrentSearchQuery.java +++ b/src/main/java/design/model/course_search/CurrentSearchQuery.java @@ -1,81 +1,72 @@ package design.model.course_search; +import design.persistence.MasterDatabase; + import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; -import design.persistence.MasterDatabase; - -/* +/* * Represents the state of our current search. */ public class CurrentSearchQuery { public static final CurrentSearchQuery INSTANCE = new CurrentSearchQuery(); - + // initialize our search with the master db data MasterDatabase db = MasterDatabase.INSTANCE; private CourseList query = db.getCourseList(); private final List filters = new ArrayList(); // reset the query - public void reset() - { + public void reset() { query = db.getCourseList(); } // add a new filter - public void addFilter(CourseSorter filter) - { + public void addFilter(CourseSorter filter) { filters.add(filter); } // clear the filters - public void clearFilters() - { + public void clearFilters() { filters.clear(); } // print out the filters we're currently using and the order - public String printFilters() - { + public String printFilters() { String filterResult = ""; // no filters? let the user know. - if(filters.size() == 0) - { + if (filters.size() == 0) { return "nothing"; } - for( CourseSorter f : filters) - { + for (CourseSorter f : filters) { filterResult += f.toString() + " --> "; } // remove last arrow and add padding - filterResult = filterResult.substring(0, filterResult.length() - 5); + filterResult = filterResult.substring(0, filterResult.length() - 5); filterResult += "\n"; return filterResult; } // get all the filters - public List getFilters() - { + public List getFilters() { return filters; } // get our current query. - public CourseList getQueryResult() - { + public CourseList getQueryResult() { return query; } - public void search(String searchQuery) - { + public void search(String searchQuery) { // only grab courses which fit our search List courses = db.getCourseList().getCourses().stream() - .filter(s -> s.toString().toLowerCase().contains(searchQuery.toLowerCase())) - .collect(Collectors.toList()); + .filter(s -> s.toString().toLowerCase().contains(searchQuery.toLowerCase())) + .collect(Collectors.toList()); // and now, we filter it! CourseList filtered = applyFilters(filters, courses); @@ -83,19 +74,16 @@ public class CurrentSearchQuery { } // to apply our filters we need to traverse the tree and make new grouping as we go. - public CourseList applyFilters(List filters, List coursesToFilter) - { + public CourseList applyFilters(List filters, List coursesToFilter) { CourseList root = new CourseList(); root.setCourses(applyFiltersRecursive(coursesToFilter, filters, 0)); return root; } // the actual recursive part. Level is how many filters deep we are. - private List applyFiltersRecursive(List courses, List filters, int level) - { - // base case. we have gone past all filters or theres only one course in this list. already sorted! - if (level >= filters.size() || courses.size() <= 1) - { + private List applyFiltersRecursive(List courses, List filters, int level) { + // base case. we have gone past all filters or theres only one course in this list. already sorted! + if (level >= filters.size() || courses.size() <= 1) { return courses; } @@ -112,17 +100,14 @@ public class CurrentSearchQuery { ICourse prev = null; // run through the courses, if - for (ICourse c : courses) - { + for (ICourse c : courses) { /* always add the first course to a new group. when iterating through courses, if we have to values that are equal, we need to add them into a group together. - * think about it this way. If we have [ 1, 2, 2, 2, 3, 4 ]. 1 is first, so its in it's own group. 2 /= 1, so 2 gets its own group. - * now do 2 again. we add it to the existing group 2. Same with the next 2. Now 3. 3 /= 2, so we put it in it's own group. - */ - if (prev == null || !sorter.isEqual(prev, c)) - { + * think about it this way. If we have [ 1, 2, 2, 2, 3, 4 ]. 1 is first, so its in it's own group. 2 /= 1, so 2 gets its own group. + * now do 2 again. we add it to the existing group 2. Same with the next 2. Now 3. 3 /= 2, so we put it in it's own group. + */ + if (prev == null || !sorter.isEqual(prev, c)) { // already a course in that group? we now have two equal values and so - if (!currentGroup.isEmpty()) - { + if (!currentGroup.isEmpty()) { result.add(makeGroup(currentGroup, filters, level)); currentGroup = new ArrayList<>(); } @@ -133,8 +118,7 @@ public class CurrentSearchQuery { } // handle the last group. - if (!currentGroup.isEmpty()) - { + if (!currentGroup.isEmpty()) { result.add(makeGroup(currentGroup, filters, level)); } @@ -142,8 +126,7 @@ public class CurrentSearchQuery { } // make a CourseList group, a sublist of a group, and filter it. - private ICourse makeGroup(List group, List filters, int level) - { + private ICourse makeGroup(List group, List filters, int level) { // base case, group only has one course in it (already sorted) if (group.size() == 1) return group.get(0); @@ -151,5 +134,5 @@ public class CurrentSearchQuery { CourseList subList = new CourseList(); subList.setCourses(applyFiltersRecursive(group, filters, level + 1)); return subList; - } + } } diff --git a/src/main/java/design/model/course_search/SortByDifficulty.java b/src/main/java/design/model/course_search/SortByDifficulty.java index c6bb7ac..b8a8aea 100644 --- a/src/main/java/design/model/course_search/SortByDifficulty.java +++ b/src/main/java/design/model/course_search/SortByDifficulty.java @@ -1,29 +1,26 @@ package design.model.course_search; -import java.util.List; import java.util.Comparator; +import java.util.List; /* * Concrete strategy for sorting courses by their difficulty rating. * Willem Dalton */ public class SortByDifficulty implements CourseSorter { - + @Override - public void sortCourses(List courses) - { + public void sortCourses(List courses) { courses.sort(Comparator.comparing(ICourse::getDifficultyRating).reversed()); // hardest to easiest } @Override - public boolean isEqual(ICourse a, ICourse b) - { + public boolean isEqual(ICourse a, ICourse b) { return a.getDifficultyRating() == b.getDifficultyRating(); } @Override - public String toString() - { + public String toString() { return "Difficulty"; } } \ No newline at end of file diff --git a/src/main/java/design/model/course_search/SortByHoles.java b/src/main/java/design/model/course_search/SortByHoles.java index 33c5473..1971e42 100644 --- a/src/main/java/design/model/course_search/SortByHoles.java +++ b/src/main/java/design/model/course_search/SortByHoles.java @@ -1,29 +1,26 @@ package design.model.course_search; -import java.util.List; import java.util.Comparator; +import java.util.List; /* * Concrete strategy by sorting courses by their hole count (9 or 18) * Willem Dalton */ public class SortByHoles implements CourseSorter { - + @Override - public void sortCourses(List courses) - { + public void sortCourses(List courses) { courses.sort(Comparator.comparing(ICourse::getHoleCount).reversed()); // highest par to lowest par } @Override - public boolean isEqual(ICourse a, ICourse b) - { + public boolean isEqual(ICourse a, ICourse b) { return a.getHoleCount() == b.getHoleCount(); } @Override - public String toString() - { + public String toString() { return "Hole Count"; } diff --git a/src/main/java/design/model/course_search/SortByLocation.java b/src/main/java/design/model/course_search/SortByLocation.java index 98ca0c6..f748a51 100644 --- a/src/main/java/design/model/course_search/SortByLocation.java +++ b/src/main/java/design/model/course_search/SortByLocation.java @@ -1,29 +1,26 @@ package design.model.course_search; -import java.util.List; import java.util.Comparator; +import java.util.List; /* * Concrete strategy for sorting courses by their location. * Willem Dalton */ public class SortByLocation implements CourseSorter { - + @Override - public void sortCourses(List courses) - { + public void sortCourses(List courses) { courses.sort(Comparator.comparing(ICourse::getLocation)); } - + @Override - public boolean isEqual(ICourse a, ICourse b) - { + public boolean isEqual(ICourse a, ICourse b) { return a.getLocation().equals(b.getLocation()); } @Override - public String toString() - { + public String toString() { return "Location"; } } \ No newline at end of file diff --git a/src/main/java/design/model/course_search/SortByName.java b/src/main/java/design/model/course_search/SortByName.java index 17553a8..68f2a72 100644 --- a/src/main/java/design/model/course_search/SortByName.java +++ b/src/main/java/design/model/course_search/SortByName.java @@ -1,29 +1,26 @@ package design.model.course_search; -import java.util.List; import java.util.Comparator; +import java.util.List; /* * Concrete strategy for sorting courses base on their name. * Willem Dalton */ public class SortByName implements CourseSorter { - + @Override - public void sortCourses(List courses) - { + public void sortCourses(List courses) { courses.sort(Comparator.comparing(ICourse::getName)); } @Override - public boolean isEqual(ICourse a, ICourse b) - { + public boolean isEqual(ICourse a, ICourse b) { return a.getName().equals(b.getName()); } @Override - public String toString() - { + public String toString() { return "Name"; } } \ No newline at end of file diff --git a/src/main/java/design/model/course_search/SortByPar.java b/src/main/java/design/model/course_search/SortByPar.java index 203aeaf..868b39d 100644 --- a/src/main/java/design/model/course_search/SortByPar.java +++ b/src/main/java/design/model/course_search/SortByPar.java @@ -1,29 +1,26 @@ package design.model.course_search; -import java.util.List; import java.util.Comparator; +import java.util.List; /* * Concrete strategy for sorting courses based on their total par. * Willem Dalton */ public class SortByPar implements CourseSorter { - + @Override - public void sortCourses(List courses) - { + public void sortCourses(List courses) { courses.sort(Comparator.comparing(ICourse::getTotalPar)); } @Override - public boolean isEqual(ICourse a, ICourse b) - { + public boolean isEqual(ICourse a, ICourse b) { return a.getTotalPar() == b.getTotalPar(); } @Override - public String toString() - { + public String toString() { return "Total Par"; } } \ No newline at end of file diff --git a/src/main/java/design/persistence/JSONPersonalDatabase.java b/src/main/java/design/persistence/JSONPersonalDatabase.java index b034680..3975d14 100644 --- a/src/main/java/design/persistence/JSONPersonalDatabase.java +++ b/src/main/java/design/persistence/JSONPersonalDatabase.java @@ -76,7 +76,7 @@ public class JSONPersonalDatabase implements PersonalDatabase { @Override public void addGolfer(Golfer golfer) throws IOException { - cache.put(golfer.getUsername(), golfer); + cache.putIfAbsent(golfer.getUsername(), golfer); save(); } -- cgit v1.2.3