1 files changed, 23 insertions, 30 deletions

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<MenuOption> getMenuOptions() 
-    { 
+    public List<MenuOption> getMenuOptions() {
         var l = new ArrayList<MenuOption>();
         List<ICourse> 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<MenuOption> menuOptions, CourseList list) 
-    {
-        for (ICourse icourse : list.getCourses()) 
-        {
+    private void addCoursesRecursive(List<MenuOption> 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);
             }
         }