Merge branch 'main' into import-exportimport-export

# Conflicts:
#	data/personaldb.json
#	src/main/java/design/controller/userinput/menus/MainMenu.java
#	src/main/java/design/persistence/JSONLeagueDatabase.java
#	src/main/java/design/persistence/JSONPersonalDatabase.java
#	src/test/java/design/model/ClubTest.java
#	src/test/java/design/model/GolferTest.java

1 files changed, 8 insertions, 1 deletions

diff --git a/src/main/java/design/controller/userinput/menus/ManageClubs.java b/src/main/java/design/controller/userinput/menus/ManageClubs.java
index 6b6811b..9c23433 100644
--- a/src/main/java/design/controller/userinput/menus/ManageClubs.java
+++ b/src/main/java/design/controller/userinput/menus/ManageClubs.java
@@ -6,6 +6,7 @@ import design.model.Club;
 import design.model.Golfer;
 import design.persistence.PersonalDatabase;
 import design.runtime.Session;
+import design.model.undo.UndoManager;
 
 import java.io.IOException;
 import java.util.Arrays;
@@ -36,7 +37,11 @@ public class ManageClubs extends Menu {
         opts.add(new MenuOption("remove club...", () -> {
             var selector = new SelectClub();
             selector.present();
-            golfer.removeClub(selector.getResult());
+            Club toRemove = selector.getResult();
+
+            UndoManager.instance().capture(golfer, "Remove club " + toRemove);
+
+            golfer.removeClub(toRemove);
             try {
                 personalDB.updateGolfer(golfer);
             } catch (IOException ex) {
@@ -46,6 +51,8 @@ public class ManageClubs extends Menu {
         }));
 
         opts.add(new MenuOption("add club...", () -> {
+            UndoManager.instance().capture(golfer, "Add club");
+
             Scanner sc = new Scanner(System.in);
 
             System.out.print("Manufacturer: ");