From fcf058c1999e4d23fd9e79e021901dbb39095367 Mon Sep 17 00:00:00 2001
From: Jacob Shimp <jrs9538@g.rit.edu>
Date: Tue, 11 Nov 2025 08:48:38 -0500
Subject: Added list of matches

---
 src/main/java/design/model/League.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/main/java/design/model/League.java')

diff --git a/src/main/java/design/model/League.java b/src/main/java/design/model/League.java
index 0252f89..6621513 100644
--- a/src/main/java/design/model/League.java
+++ b/src/main/java/design/model/League.java
@@ -3,6 +3,7 @@ package design.model;
 import com.fasterxml.jackson.annotation.JsonCreator;
 
 import java.util.Date;
+import java.util.List;
 
 public abstract class League {
     private int id;
@@ -13,7 +14,7 @@ public abstract class League {
     private final Golfer owner;
 
     @JsonCreator
-    protected League(int id, String name, Date registrationDate, Date startDate, Date endDate, Golfer owner) {
+    protected League(int id, String name, Date registrationDate, Date startDate, Date endDate, Golfer owner, List<Match> schedule) {
         this.id = id;
         this.name = name;
         this.registrationDate = registrationDate;
-- 
cgit v1.2.3


From a0b662eccc6422348a1016dc71b8262eeeeee78f Mon Sep 17 00:00:00 2001
From: Jacob Shimp <jrs9538@g.rit.edu>
Date: Tue, 11 Nov 2025 09:02:20 -0500
Subject: working with matches in league

---
 src/main/java/design/model/League.java | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'src/main/java/design/model/League.java')

diff --git a/src/main/java/design/model/League.java b/src/main/java/design/model/League.java
index 6621513..6dab033 100644
--- a/src/main/java/design/model/League.java
+++ b/src/main/java/design/model/League.java
@@ -2,6 +2,7 @@ package design.model;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -12,6 +13,7 @@ public abstract class League {
     private final Date startDate;
     private final Date endDate;
     private final Golfer owner;
+    private List<Match> schedule;
 
     @JsonCreator
     protected League(int id, String name, Date registrationDate, Date startDate, Date endDate, Golfer owner, List<Match> schedule) {
@@ -21,6 +23,7 @@ public abstract class League {
         this.startDate = startDate;
         this.endDate = endDate;
         this.owner = owner;
+        this.schedule = schedule;
     }
 
     public League(String name, Date registrationDate, Date startDate, Date endDate, Golfer owner) {
@@ -30,6 +33,7 @@ public abstract class League {
         this.startDate = startDate;
         this.endDate = endDate;
         this.owner = owner;
+        this.schedule = new ArrayList<>();
     }
 
     public int getId() {
@@ -56,6 +60,18 @@ public abstract class League {
         return owner;
     }
 
+    public List<Match> getSchedule() {
+        return schedule;
+    }
+
+    public void addMatchToSchedule(Match match) {
+        Date date = match.getDateScheduled();
+        if(date.after(endDate)){
+            throw new IllegalArgumentException("Cannot create match after league has ended");
+        }
+        schedule.add(match);
+    }
+
     public void setId(int id) {
         assert this.id == -1;
         this.id = id;
-- 
cgit v1.2.3


From 9a0949d31a7a0e8c9c311b07e92852cff867cc66 Mon Sep 17 00:00:00 2001
From: sowgro <tpoke.ferrari@gmail.com>
Date: Wed, 12 Nov 2025 12:55:12 -0500
Subject: Fix some serialization stuff

---
 src/main/java/design/model/League.java | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

(limited to 'src/main/java/design/model/League.java')

diff --git a/src/main/java/design/model/League.java b/src/main/java/design/model/League.java
index 6dab033..881e25f 100644
--- a/src/main/java/design/model/League.java
+++ b/src/main/java/design/model/League.java
@@ -1,11 +1,22 @@
 package design.model;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
+@JsonTypeInfo(
+        use = JsonTypeInfo.Id.NAME,
+        include = JsonTypeInfo.As.PROPERTY,
+        property = "type"
+)
+@JsonSubTypes({
+        @JsonSubTypes.Type(value = ScrambleLeague.class, name = "scramble"),
+        @JsonSubTypes.Type(value = StrokeLeague.class, name = "stroke")
+})
 public abstract class League {
     private int id;
     private final String name;
@@ -13,7 +24,7 @@ public abstract class League {
     private final Date startDate;
     private final Date endDate;
     private final Golfer owner;
-    private List<Match> schedule;
+    private final List<Match> schedule;
 
     @JsonCreator
     protected League(int id, String name, Date registrationDate, Date startDate, Date endDate, Golfer owner, List<Match> schedule) {
@@ -23,7 +34,7 @@ public abstract class League {
         this.startDate = startDate;
         this.endDate = endDate;
         this.owner = owner;
-        this.schedule = schedule;
+        this.schedule = schedule != null ? schedule : new ArrayList<>();
     }
 
     public League(String name, Date registrationDate, Date startDate, Date endDate, Golfer owner) {
@@ -60,8 +71,8 @@ public abstract class League {
         return owner;
     }
 
-    public List<Match> getSchedule() {
-        return schedule;
+    public Match[] getSchedule() {
+        return schedule.toArray(Match[]::new);
     }
 
     public void addMatchToSchedule(Match match) {
-- 
cgit v1.2.3