From e56ad78ddba089b5bb93af96e33ee7c42b7d0b51 Mon Sep 17 00:00:00 2001 From: sowgro Date: Sun, 9 Nov 2025 00:06:03 -0500 Subject: create most of the model and league DAOs --- src/main/java/design/model/Invite.java | 25 +++++++++++ src/main/java/design/model/League.java | 45 ++++++++++++++++++++ src/main/java/design/model/Match.java | 57 ++++++++++++++++++++++++++ src/main/java/design/model/ScrambleLeague.java | 34 +++++++++++++++ src/main/java/design/model/StrokeLeague.java | 34 +++++++++++++++ src/main/java/design/model/Team.java | 40 ++++++++++++++++++ 6 files changed, 235 insertions(+) create mode 100644 src/main/java/design/model/Invite.java create mode 100644 src/main/java/design/model/League.java create mode 100644 src/main/java/design/model/Match.java create mode 100644 src/main/java/design/model/ScrambleLeague.java create mode 100644 src/main/java/design/model/StrokeLeague.java create mode 100644 src/main/java/design/model/Team.java (limited to 'src/main/java/design/model') diff --git a/src/main/java/design/model/Invite.java b/src/main/java/design/model/Invite.java new file mode 100644 index 0000000..479f520 --- /dev/null +++ b/src/main/java/design/model/Invite.java @@ -0,0 +1,25 @@ +package design.model; + +import java.util.Date; + +public class Invite { + private final Team team; + private final Date sendDate; + + public Invite(Team team, Date sendDate) { + this.team = team; + this.sendDate = sendDate; + } + + public Team getTeam() { + return team; + } + + public Date getSendDate() { + return sendDate; + } + + public void accept(Golfer g) { + team.addMember(g); + } +} diff --git a/src/main/java/design/model/League.java b/src/main/java/design/model/League.java new file mode 100644 index 0000000..98c9bdd --- /dev/null +++ b/src/main/java/design/model/League.java @@ -0,0 +1,45 @@ +package design.model; + +import java.util.Date; + +public abstract class League { + private final int id; + private final String name; + private final Date registrationDate; + private final Date startDate; + private final Date endDate; + private final Golfer owner; + + public League(int id, String name, Date registrationDate, Date startDate, Date endDate, Golfer owner) { + this.id = id; + this.name = name; + this.registrationDate = registrationDate; + this.startDate = startDate; + this.endDate = endDate; + this.owner = owner; + } + + public int getId() { + return id; + } + + public String getName() { + return name; + } + + public Date getRegistrationDate() { + return registrationDate; + } + + public Date getStartDate() { + return startDate; + } + + public Date getEndDate() { + return endDate; + } + + public Golfer getOwner() { + return owner; + } +} diff --git a/src/main/java/design/model/Match.java b/src/main/java/design/model/Match.java new file mode 100644 index 0000000..4f01c98 --- /dev/null +++ b/src/main/java/design/model/Match.java @@ -0,0 +1,57 @@ +package design.model; + +import com.fasterxml.jackson.annotation.JsonCreator; + +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class Match { + private final Course course; + private final Date dateScheduled; + private final LocalDateTime start; + private final int holeCount; + private final List rounds; + + @JsonCreator + private Match(Course course, Date dateScheduled, LocalDateTime start, int holeCount, List rounds) { + this.course = course; + this.dateScheduled = dateScheduled; + this.start = start; + this.holeCount = holeCount; + this.rounds = rounds; + } + + public Match(Course course, Date dateScheduled, LocalDateTime start, int holeCount) { + this.course = course; + this.dateScheduled = dateScheduled; + this.start = start; + this.holeCount = holeCount; + this.rounds = new ArrayList<>(); + } + + public Course getCourse() { + return course; + } + + public Date getDateScheduled() { + return dateScheduled; + } + + public LocalDateTime getStart() { + return start; + } + + public int getHoleCount() { + return holeCount; + } + + public boolean addRound(Round round) { + return rounds.add(round); + } + + public Round[] getRounds() { + return rounds.toArray(Round[]::new); + } +} diff --git a/src/main/java/design/model/ScrambleLeague.java b/src/main/java/design/model/ScrambleLeague.java new file mode 100644 index 0000000..7ff966e --- /dev/null +++ b/src/main/java/design/model/ScrambleLeague.java @@ -0,0 +1,34 @@ +package design.model; + +import com.fasterxml.jackson.annotation.JsonCreator; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class ScrambleLeague extends League { + private final List participants; + + @JsonCreator + private ScrambleLeague(int id, String name, Date registrationDate, Date startDate, Date endDate, Golfer owner, List participants) { + super(id, name, registrationDate, startDate, endDate, owner); + this.participants = participants; + } + + public ScrambleLeague(int id, String name, Date registrationDate, Date startDate, Date endDate, Golfer owner) { + super(id, name, registrationDate, startDate, endDate, owner); + this.participants = new ArrayList<>(); + } + + public boolean addParticipants(Team e) { + return participants.add(e); + } + + public boolean removeParticipants(Team o) { + return participants.remove(o); + } + + public Team[] getParticipants() { + return participants.toArray(Team[]::new); + } +} diff --git a/src/main/java/design/model/StrokeLeague.java b/src/main/java/design/model/StrokeLeague.java new file mode 100644 index 0000000..6bdde0a --- /dev/null +++ b/src/main/java/design/model/StrokeLeague.java @@ -0,0 +1,34 @@ +package design.model; + +import com.fasterxml.jackson.annotation.JsonCreator; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class StrokeLeague extends League { + private final List participants; + + @JsonCreator + private StrokeLeague(int id, String name, Date registrationDate, Date startDate, Date endDate, Golfer owner, List participants) { + super(id, name, registrationDate, startDate, endDate, owner); + this.participants = participants; + } + + public StrokeLeague(int id, String name, Date registrationDate, Date startDate, Date endDate, Golfer owner) { + super(id, name, registrationDate, startDate, endDate, owner); + this.participants = new ArrayList<>(); + } + + public boolean addParticipants(Golfer e) { + return participants.add(e); + } + + public boolean removeParticipants(Golfer o) { + return participants.remove(o); + } + + public Golfer[] getParticipants() { + return participants.toArray(Golfer[]::new); + } +} diff --git a/src/main/java/design/model/Team.java b/src/main/java/design/model/Team.java new file mode 100644 index 0000000..53b276e --- /dev/null +++ b/src/main/java/design/model/Team.java @@ -0,0 +1,40 @@ +package design.model; + +import java.util.ArrayList; +import java.util.List; + +public class Team { + private String name; + private final List members; + private final Golfer owner; + + public Team(String name, Golfer owner) { + this.name = name; + this.owner = owner; + this.members = new ArrayList<>(); + } + + public String getName() { + return name; + } + + public Golfer[] getMembers() { + return members.toArray(Golfer[]::new); + } + + public void setName(String name) { + this.name = name; + } + + public boolean addMember(Golfer golfer) { + return members.add(golfer); + } + + public boolean removeMember(Golfer g) { + return members.remove(g); + } + + public Golfer getOwner() { + return owner; + } +} -- cgit v1.2.3 From 7a87c716e85a12c72c24173b88b2e07729d85241 Mon Sep 17 00:00:00 2001 From: sowgro Date: Sun, 9 Nov 2025 01:01:03 -0500 Subject: complete serialization --- src/main/java/design/model/League.java | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) (limited to 'src/main/java/design/model') diff --git a/src/main/java/design/model/League.java b/src/main/java/design/model/League.java index 98c9bdd..eb9eef5 100644 --- a/src/main/java/design/model/League.java +++ b/src/main/java/design/model/League.java @@ -1,16 +1,19 @@ package design.model; +import com.fasterxml.jackson.annotation.JsonCreator; + import java.util.Date; public abstract class League { - private final int id; + private int id; private final String name; private final Date registrationDate; private final Date startDate; private final Date endDate; private final Golfer owner; - public League(int id, String name, Date registrationDate, Date startDate, Date endDate, Golfer owner) { + @JsonCreator + private League(int id, String name, Date registrationDate, Date startDate, Date endDate, Golfer owner) { this.id = id; this.name = name; this.registrationDate = registrationDate; @@ -19,6 +22,15 @@ public abstract class League { this.owner = owner; } + public League(String name, Date registrationDate, Date startDate, Date endDate, Golfer owner) { + this.id = -1; + this.name = name; + this.registrationDate = registrationDate; + this.startDate = startDate; + this.endDate = endDate; + this.owner = owner; + } + public int getId() { return id; } @@ -42,4 +54,9 @@ public abstract class League { public Golfer getOwner() { return owner; } + + public void setId(int id) { + assert this.id == -1; + this.id = id; + } } -- cgit v1.2.3 From e8e05aa176be4babf5c28a7697e2d057077d2794 Mon Sep 17 00:00:00 2001 From: sowgro Date: Sun, 9 Nov 2025 01:06:16 -0500 Subject: make id system consistent --- src/main/java/design/model/Club.java | 18 ++++++++++++++++-- src/main/java/design/model/Golfer.java | 4 ++-- 2 files changed, 18 insertions(+), 4 deletions(-) (limited to 'src/main/java/design/model') diff --git a/src/main/java/design/model/Club.java b/src/main/java/design/model/Club.java index b12fd99..c19811c 100644 --- a/src/main/java/design/model/Club.java +++ b/src/main/java/design/model/Club.java @@ -1,5 +1,6 @@ package design.model; +import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIdentityInfo; import com.fasterxml.jackson.annotation.ObjectIdGenerators; @@ -21,18 +22,26 @@ public class Club { PUTTER } - private final int id; + private int id; private final String manufacture; private final String nickname; private final ClubType clubType; - public Club(int id, String manufacture, String nickname, ClubType clubType) { + @JsonCreator + private Club(int id, String manufacture, String nickname, ClubType clubType) { this.id = id; this.manufacture = manufacture; this.nickname = nickname; this.clubType = clubType; } + public Club(String manufacture, String nickname, ClubType clubType) { + this.id = -1; + this.manufacture = manufacture; + this.nickname = nickname; + this.clubType = clubType; + } + public int getId() { return id; } @@ -49,6 +58,11 @@ public class Club { return clubType; } + public void setId(int id) { + assert this.id == -1; + this.id = id; + } + @Override public String toString() { return String.format("#%d %s - %s (%s)", id, nickname, manufacture, clubType); diff --git a/src/main/java/design/model/Golfer.java b/src/main/java/design/model/Golfer.java index 48daae8..38a3ba9 100644 --- a/src/main/java/design/model/Golfer.java +++ b/src/main/java/design/model/Golfer.java @@ -86,8 +86,8 @@ public class Golfer { rounds.add(round); } - public Club addClub(String manufacture, String nickname, Club.ClubType type) { - Club c = new Club(nextClubId++, manufacture, nickname, type); + public Club addClub(Club c) { + c.setId(nextClubId++); clubs.add(c); return c; } -- cgit v1.2.3 From 3e946eef622b393a7cdcefcffe5eb6efed0ef2a4 Mon Sep 17 00:00:00 2001 From: sowgro Date: Sun, 9 Nov 2025 14:50:00 -0500 Subject: fix error --- src/main/java/design/model/League.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/java/design/model') diff --git a/src/main/java/design/model/League.java b/src/main/java/design/model/League.java index eb9eef5..0252f89 100644 --- a/src/main/java/design/model/League.java +++ b/src/main/java/design/model/League.java @@ -13,7 +13,7 @@ public abstract class League { private final Golfer owner; @JsonCreator - private 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) { this.id = id; this.name = name; this.registrationDate = registrationDate; -- cgit v1.2.3 From b80389058bb14d2c1c38318d1756418792b82d5f Mon Sep 17 00:00:00 2001 From: sowgro Date: Sun, 9 Nov 2025 17:36:15 -0500 Subject: add invites to golfer --- src/main/java/design/model/Golfer.java | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'src/main/java/design/model') diff --git a/src/main/java/design/model/Golfer.java b/src/main/java/design/model/Golfer.java index 38a3ba9..77f411f 100644 --- a/src/main/java/design/model/Golfer.java +++ b/src/main/java/design/model/Golfer.java @@ -15,16 +15,18 @@ public class Golfer { private final List rounds; private final List clubs; // Keep track of golfer's clubs private int nextClubId; + private final List invites; @JsonCreator private Golfer(String username, int passwordHash, String fullName, List courses, List rounds, - List clubs) { + List clubs, List invites) { this.username = username; this.passwordHash = passwordHash; this.fullName = fullName; this.courses = courses; this.rounds = rounds; this.clubs = clubs; + this.invites = invites; this.nextClubId = this.clubs.stream().mapToInt(Club::getId).max().orElse(0) + 1; } @@ -35,6 +37,7 @@ public class Golfer { this.courses = new ArrayList<>(); this.rounds = new ArrayList<>(); this.clubs = new ArrayList<>(); + this.invites = new ArrayList<>(); this.nextClubId = 1; } @@ -112,4 +115,16 @@ public class Golfer { public void removeClub(Club c) { clubs.remove(c); } + + public boolean addInvite(Invite invite) { + return invites.add(invite); + } + + public boolean removeInvite(Invite o) { + return invites.remove(o); + } + + public Invite[] getInvites() { + return invites.toArray(Invite[]::new); + } } -- cgit v1.2.3 From 05bf6a19f341e2b2cb2b107dea65660a08439a1c Mon Sep 17 00:00:00 2001 From: sowgro Date: Mon, 10 Nov 2025 15:29:14 -0500 Subject: fix circular dependency --- src/main/java/design/model/Golfer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/java/design/model') diff --git a/src/main/java/design/model/Golfer.java b/src/main/java/design/model/Golfer.java index 77f411f..960568f 100644 --- a/src/main/java/design/model/Golfer.java +++ b/src/main/java/design/model/Golfer.java @@ -26,7 +26,7 @@ public class Golfer { this.courses = courses; this.rounds = rounds; this.clubs = clubs; - this.invites = invites; + this.invites = invites != null ? invites : new ArrayList<>(); this.nextClubId = this.clubs.stream().mapToInt(Club::getId).max().orElse(0) + 1; } -- cgit v1.2.3 From fcf058c1999e4d23fd9e79e021901dbb39095367 Mon Sep 17 00:00:00 2001 From: Jacob Shimp Date: Tue, 11 Nov 2025 08:48:38 -0500 Subject: Added list of matches --- src/main/java/design/model/League.java | 3 ++- src/main/java/design/model/ScrambleLeague.java | 8 ++++---- src/main/java/design/model/StrokeLeague.java | 8 ++++---- 3 files changed, 10 insertions(+), 9 deletions(-) (limited to 'src/main/java/design/model') 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 schedule) { this.id = id; this.name = name; this.registrationDate = registrationDate; diff --git a/src/main/java/design/model/ScrambleLeague.java b/src/main/java/design/model/ScrambleLeague.java index 7ff966e..92e7099 100644 --- a/src/main/java/design/model/ScrambleLeague.java +++ b/src/main/java/design/model/ScrambleLeague.java @@ -10,13 +10,13 @@ public class ScrambleLeague extends League { private final List participants; @JsonCreator - private ScrambleLeague(int id, String name, Date registrationDate, Date startDate, Date endDate, Golfer owner, List participants) { - super(id, name, registrationDate, startDate, endDate, owner); + private ScrambleLeague(int id, String name, Date registrationDate, Date startDate, Date endDate, Golfer owner, List participants, List 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<>(); } diff --git a/src/main/java/design/model/StrokeLeague.java b/src/main/java/design/model/StrokeLeague.java index 6bdde0a..f09cabf 100644 --- a/src/main/java/design/model/StrokeLeague.java +++ b/src/main/java/design/model/StrokeLeague.java @@ -10,13 +10,13 @@ public class StrokeLeague extends League { private final List participants; @JsonCreator - private StrokeLeague(int id, String name, Date registrationDate, Date startDate, Date endDate, Golfer owner, List participants) { - super(id, name, registrationDate, startDate, endDate, owner); + private StrokeLeague(int id, String name, Date registrationDate, Date startDate, Date endDate, Golfer owner, List participants, List 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<>(); } -- cgit v1.2.3 From a0b662eccc6422348a1016dc71b8262eeeeee78f Mon Sep 17 00:00:00 2001 From: Jacob Shimp 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') 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 schedule; @JsonCreator protected League(int id, String name, Date registrationDate, Date startDate, Date endDate, Golfer owner, List 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 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 Date: Wed, 12 Nov 2025 12:55:12 -0500 Subject: Fix some serialization stuff --- src/main/java/design/model/League.java | 19 +++++++++++++++---- src/main/java/design/model/ScrambleLeague.java | 12 ++++++++++++ src/main/java/design/model/StrokeLeague.java | 2 ++ 3 files changed, 29 insertions(+), 4 deletions(-) (limited to 'src/main/java/design/model') 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 schedule; + private final List schedule; @JsonCreator protected League(int id, String name, Date registrationDate, Date startDate, Date endDate, Golfer owner, List 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 getSchedule() { - return schedule; + public Match[] getSchedule() { + return schedule.toArray(Match[]::new); } public void addMatchToSchedule(Match match) { diff --git a/src/main/java/design/model/ScrambleLeague.java b/src/main/java/design/model/ScrambleLeague.java index 92e7099..d372264 100644 --- a/src/main/java/design/model/ScrambleLeague.java +++ b/src/main/java/design/model/ScrambleLeague.java @@ -1,11 +1,14 @@ 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 participants; @@ -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; + } } diff --git a/src/main/java/design/model/StrokeLeague.java b/src/main/java/design/model/StrokeLeague.java index f09cabf..2b787b5 100644 --- a/src/main/java/design/model/StrokeLeague.java +++ b/src/main/java/design/model/StrokeLeague.java @@ -1,11 +1,13 @@ 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 participants; -- cgit v1.2.3