Menu cleanup - pass 3

1 files changed, 15 insertions, 5 deletions

diff --git a/src/main/java/design/controller/userinput/menus/SelectClub.java b/src/main/java/design/controller/userinput/menus/SelectClub.java
index 09facdb..f2f36ed 100644
--- a/src/main/java/design/controller/userinput/menus/SelectClub.java
+++ b/src/main/java/design/controller/userinput/menus/SelectClub.java
@@ -4,24 +4,23 @@ import design.controller.userinput.Menu;
 import design.controller.userinput.MenuOption;
 import design.model.Club;
 import design.model.Golfer;
+import design.runtime.Session;
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 
 public class SelectClub extends Menu {
-    private final Golfer golfer;
+    private final Golfer golfer = Session.getCurrentGolfer();
     private Club result;
 
-    public SelectClub(Golfer golfer) {
-        this.golfer = golfer;
-    }
-
     @Override
     public String getTitle() {
         return "select club";
     }
 
     public Club getResult() {
+        Objects.requireNonNull(result);
         return result;
     }
 
@@ -31,4 +30,15 @@ public class SelectClub extends Menu {
                 .map(g -> new MenuOption(g.toString(), () -> result = g))
                 .toList();
     }
+
+    @Override
+    public void present() {
+        if (!golfer.hasClubs()) {
+            System.out.println("You don't have any clubs yet. Add one first.");
+            new MainMenu().present();
+            return;
+        }
+
+        super.present();
+    }
 }