Menu cleanup - pass 3

1 files changed, 17 insertions, 5 deletions

diff --git a/src/main/java/design/controller/userinput/menus/SelectCourse.java b/src/main/java/design/controller/userinput/menus/SelectCourse.java
index 811586f..efbdef5 100644
--- a/src/main/java/design/controller/userinput/menus/SelectCourse.java
+++ b/src/main/java/design/controller/userinput/menus/SelectCourse.java
@@ -4,24 +4,23 @@ import design.controller.userinput.Menu;
 import design.controller.userinput.MenuOption;
 import design.model.Course;
 import design.model.Golfer;
+import design.runtime.Session;
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 
 public class SelectCourse extends Menu {
-    private final Golfer golfer;
+    private final Golfer golfer = Session.getCurrentGolfer();
     private Course result;
 
-    public SelectCourse(Golfer golfer) {
-        this.golfer = golfer;
-    }
-
     @Override
     public String getTitle() {
         return "select course";
     }
 
     public Course getResult() {
+        Objects.requireNonNull(result);
         return result;
     }
 
@@ -31,4 +30,17 @@ public class SelectCourse extends Menu {
                 .map(c -> new MenuOption(c.toString(), () -> result = c))
                 .toList();
     }
+
+    @Override
+    public void present() {
+        // Checks user has courses of not informs them to add one to their profile
+        if (!golfer.hasCourses()) {
+            System.out.println("You don't have any courses saved to your profile yet.");
+            System.out.println("Use the 'Add Course to Profile' menu first.");
+            new MainMenu().present();
+            return;
+        }
+
+        super.present();
+    }
 }