1 files changed, 34 insertions, 49 deletions

diff --git a/src/main/java/design/controller/userinput/menus/ManageClubs.java b/src/main/java/design/controller/userinput/menus/ManageClubs.java
index 56d645f..6786553 100644
--- a/src/main/java/design/controller/userinput/menus/ManageClubs.java
+++ b/src/main/java/design/controller/userinput/menus/ManageClubs.java
@@ -8,12 +8,13 @@ import design.persistence.PersonalDatabase;
 import design.runtime.Session;
 
 import java.io.IOException;
-import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Scanner;
 
 public class ManageClubs extends Menu {
-    Golfer golfer = Session.getCurrentGolfer();
+    private final Golfer golfer = Session.getCurrentGolfer();
+    private final PersonalDatabase personalDB = PersonalDatabase.INSTANCE;
 
     @Override
     public String getTitle() {
@@ -33,34 +34,13 @@ public class ManageClubs extends Menu {
         }));
 
         opts.add(new MenuOption("remove club...", () -> {
-            new Menu() {
-                @Override
-                public String getTitle() {
-                    return "remove club";
-                }
-
-                @Override
-                public List<MenuOption> getMenuOptions() {
-                    List<MenuOption> list = new ArrayList<>();
-                    for (Club c : golfer.getClubs()) {
-                        MenuOption menuOption = new MenuOption(c.toString(), () -> {
-                            golfer.removeClub(c);
-                            this.present();
-                        });
-                        list.add(menuOption);
-                    }
-                    return list;
-                }
-            }.present();
+            var selector = new SelectClub(golfer);
+            selector.present();
+            golfer.removeClub(selector.getResult());
+            this.present();
         }));
 
         opts.add(new MenuOption("add club...", () -> {
-            if (golfer == null) {
-                System.out.println("No user loaded.");
-                new UserSettings().present();
-                return;
-            }
-
             Scanner sc = new Scanner(System.in);
 
             System.out.print("Manufacturer: ");
@@ -69,37 +49,42 @@ public class ManageClubs extends Menu {
             System.out.print("Nickname: ");
             String nickname = sc.nextLine().trim();
 
-            // Pick type
-            Club.ClubType[] types = Club.ClubType.values();
-            System.out.println("Club type:");
-            for (int i = 0; i < types.length; i++) {
-                System.out.printf("%d: %s%n", i + 1, types[i]);
-            }
-
-            Club.ClubType type = null;
-            while (type == null) {
-                System.out.print("Select (1.." + types.length + "): ");
-                String line = sc.nextLine().trim();
-                int idx = Integer.parseInt(line);
-                if (idx < 1 || idx > types.length) {
-                    System.out.println("Out of range. Try again.");
-                    continue;
-                }
-                type = types[idx - 1];
-            }
+            var selector = new SelectClubType();
+            selector.present();
+            Club.ClubType type = selector.getResult();
 
             golfer.addClub(manufacture, nickname, type);
 
             // Add club to JSON
             try {
-                PersonalDatabase.INSTANCE.updateGolfer(golfer);
+                personalDB.updateGolfer(golfer);
                 System.out.println("Club added and saved.");
             } catch (IOException e) {
                 throw new RuntimeException("Failed to save club", e);
             }
-            new UserSettings().present();
-        }));// Pick type
-// Add club to JSON
+            this.present();
+        }));
+
         return opts;
     }
+
+    private static class SelectClubType extends Menu {
+        private Club.ClubType result;
+
+        @Override
+        public String getTitle() {
+            return "select club type";
+        }
+
+        public Club.ClubType getResult() {
+            return result;
+        }
+
+        @Override
+        public List<MenuOption> getMenuOptions() {
+            return Arrays.stream(Club.ClubType.values())
+                    .map(t -> new MenuOption(t.name(), () -> result = t))
+                    .toList();
+        }
+    }
 }