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, 16 insertions, 4 deletions

diff --git a/src/main/java/design/model/ScrambleLeague.java b/src/main/java/design/model/ScrambleLeague.java
index 7ff966e..d372264 100644
--- a/src/main/java/design/model/ScrambleLeague.java
+++ b/src/main/java/design/model/ScrambleLeague.java
@@ -1,22 +1,25 @@
 package design.model;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonTypeName;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
+@JsonTypeName("scramble")
 public class ScrambleLeague extends League {
     private final List<Team> participants;
 
     @JsonCreator
-    private ScrambleLeague(int id, String name, Date registrationDate, Date startDate, Date endDate, Golfer owner, List<Team> participants) {
-        super(id, name, registrationDate, startDate, endDate, owner);
+    private ScrambleLeague(int id, String name, Date registrationDate, Date startDate, Date endDate, Golfer owner, List<Team> participants, List<Match> schedule) {
+        super(id, name, registrationDate, startDate, endDate, owner, schedule);
         this.participants = participants;
     }
 
-    public ScrambleLeague(int id, String name, Date registrationDate, Date startDate, Date endDate, Golfer owner) {
-        super(id, name, registrationDate, startDate, endDate, owner);
+    public ScrambleLeague(String name, Date registrationDate, Date startDate, Date endDate, Golfer owner) {
+        super(name, registrationDate, startDate, endDate, owner);
         this.participants = new ArrayList<>();
     }
 
@@ -31,4 +34,13 @@ public class ScrambleLeague extends League {
     public Team[] getParticipants() {
         return participants.toArray(Team[]::new);
     }
+
+    public Team locateTeam(Golfer golfer) {
+        for (Team participant : participants) {
+            if (List.of(participant.getMembers()).contains(golfer)) {
+                return participant;
+            }
+        }
+        return null;
+    }
 }