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 ++++++++++++++++++++++ 3 files changed, 59 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/controller') 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; + } +} -- 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 +++++--- 2 files changed, 51 insertions(+), 5 deletions(-) create mode 100644 src/main/java/design/controller/userinput/menus/FiltersMenu.java (limited to 'src/main/java/design/controller') 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) -> {}) ); } -- 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 +- 2 files changed, 12 insertions(+), 11 deletions(-) (limited to 'src/main/java/design/controller') 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()) ); } } -- 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 --- .../java/design/controller/userinput/menus/SearchMenu.java | 8 +++++++- .../java/design/controller/userinput/menus/SelectCourse.java | 11 +++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) (limited to 'src/main/java/design/controller') 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()); -- 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 ++++++++++++++++++---- 3 files changed, 41 insertions(+), 14 deletions(-) (limited to 'src/main/java/design/controller') 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; } + } -- 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/controller') 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 --- src/main/java/design/controller/userinput/menus/SelectCourse.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/java/design/controller') 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; } -- 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 +++++++++++++++++----- 2 files changed, 42 insertions(+), 12 deletions(-) (limited to 'src/main/java/design/controller') 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); + } + } + } } -- 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 -------------------- 4 files changed, 103 insertions(+), 93 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/controller') 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); - } - } - } -} -- 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/controller') 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/controller') 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 ++++++++++------------ 1 file changed, 23 insertions(+), 30 deletions(-) (limited to 'src/main/java/design/controller') 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); } } -- cgit v1.2.3