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

diff --git a/src/main/java/design/model/StrokeLeague.java b/src/main/java/design/model/StrokeLeague.java
index 6bdde0a..2b787b5 100644
--- a/src/main/java/design/model/StrokeLeague.java
+++ b/src/main/java/design/model/StrokeLeague.java
@@ -1,22 +1,24 @@
 package design.model;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonTypeName;
 
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
+@JsonTypeName("stroke")
 public class StrokeLeague extends League {
     private final List<Golfer> participants;
 
     @JsonCreator
-    private StrokeLeague(int id, String name, Date registrationDate, Date startDate, Date endDate, Golfer owner, List<Golfer> participants) {
-        super(id, name, registrationDate, startDate, endDate, owner);
+    private StrokeLeague(int id, String name, Date registrationDate, Date startDate, Date endDate, Golfer owner, List<Golfer> participants, List<Match> schedule) {
+        super(id, name, registrationDate, startDate, endDate, owner, schedule);
         this.participants = participants;
     }
 
-    public StrokeLeague(int id, String name, Date registrationDate, Date startDate, Date endDate, Golfer owner) {
-        super(id, name, registrationDate, startDate, endDate, owner);
+    public StrokeLeague(String name, Date registrationDate, Date startDate, Date endDate, Golfer owner) {
+        super(name, registrationDate, startDate, endDate, owner);
         this.participants = new ArrayList<>();
     }