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 ++++++++++++++ .../design/persistence/JSONLeagueDatabase.java | 63 ++++++++++++++++++++++ .../java/design/persistence/LeagueDatabase.java | 19 +++++++ .../java/design/persistence/MasterDatabase.java | 2 + 9 files changed, 319 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 create mode 100644 src/main/java/design/persistence/JSONLeagueDatabase.java create mode 100644 src/main/java/design/persistence/LeagueDatabase.java (limited to 'src/main') 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; + } +} diff --git a/src/main/java/design/persistence/JSONLeagueDatabase.java b/src/main/java/design/persistence/JSONLeagueDatabase.java new file mode 100644 index 0000000..01f4fc3 --- /dev/null +++ b/src/main/java/design/persistence/JSONLeagueDatabase.java @@ -0,0 +1,63 @@ +package design.persistence; + +import design.model.League; + +import java.io.File; +import java.util.HashMap; +import java.util.Map; + +public class JSONLeagueDatabase implements LeagueDatabase { + + private static JSONLeagueDatabase INSTANCE; + + public static JSONLeagueDatabase instance() { + if (INSTANCE == null) { + INSTANCE = new JSONLeagueDatabase("data/leaguedb.json"); + } + return INSTANCE; + } + + private final Map cache; + private final File file; + + public JSONLeagueDatabase(String filename) { + this.file = new File(filename); + this.cache = new HashMap<>(); + } + + private void load() { + //TODO impl + } + + private void save() { + //TODO impl + } + + @Override + public League getLeague(int id) { + return cache.get(id); + } + + @Override + public League[] getLeagues() { + return cache.values().toArray(League[]::new); + } + + @Override + public void addLeague(League league) { + cache.putIfAbsent(league.getId(), league); + save(); + } + + @Override + public void removeLeague(League league) { + cache.remove(league.getId()); + save(); + } + + @Override + public void updateLeague(League league) { + cache.put(league.getId(), league); + save(); + } +} diff --git a/src/main/java/design/persistence/LeagueDatabase.java b/src/main/java/design/persistence/LeagueDatabase.java new file mode 100644 index 0000000..2ab3e30 --- /dev/null +++ b/src/main/java/design/persistence/LeagueDatabase.java @@ -0,0 +1,19 @@ +package design.persistence; + +import design.model.League; + +public interface LeagueDatabase { + static LeagueDatabase instance() { + return JSONLeagueDatabase.instance(); + } + + League getLeague(int id); + + League[] getLeagues(); + + void addLeague(League league); + + void removeLeague(League league); + + void updateLeague(League league); +} diff --git a/src/main/java/design/persistence/MasterDatabase.java b/src/main/java/design/persistence/MasterDatabase.java index 59e3ebd..86e326b 100644 --- a/src/main/java/design/persistence/MasterDatabase.java +++ b/src/main/java/design/persistence/MasterDatabase.java @@ -10,6 +10,8 @@ public interface MasterDatabase { } Course[] getCourses(); + CourseList getCourseList(); // unique from courses as this is a composite of ICourses. + Course getCourse(int id); } -- 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 ++++++- .../design/persistence/JSONLeagueDatabase.java | 72 +++++++++++++++++++--- .../design/persistence/JSONPersonalDatabase.java | 8 +-- .../java/design/persistence/LeagueDatabase.java | 8 ++- 4 files changed, 92 insertions(+), 17 deletions(-) (limited to 'src/main') 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; + } } diff --git a/src/main/java/design/persistence/JSONLeagueDatabase.java b/src/main/java/design/persistence/JSONLeagueDatabase.java index 01f4fc3..78e1903 100644 --- a/src/main/java/design/persistence/JSONLeagueDatabase.java +++ b/src/main/java/design/persistence/JSONLeagueDatabase.java @@ -1,11 +1,26 @@ package design.persistence; +import com.fasterxml.jackson.annotation.JsonAutoDetect; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.PropertyAccessor; +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.databind.*; +import com.fasterxml.jackson.databind.module.SimpleModule; +import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; +import com.fasterxml.jackson.module.paramnames.ParameterNamesModule; +import design.model.Course; +import design.model.Golfer; import design.model.League; import java.io.File; +import java.io.IOException; +import java.util.Arrays; import java.util.HashMap; import java.util.Map; +import static design.persistence.JSONPersonalDatabase.*; + public class JSONLeagueDatabase implements LeagueDatabase { private static JSONLeagueDatabase INSTANCE; @@ -18,19 +33,44 @@ public class JSONLeagueDatabase implements LeagueDatabase { } private final Map cache; + private final ObjectMapper mapper; private final File file; + private int nextLeagueID; public JSONLeagueDatabase(String filename) { this.file = new File(filename); this.cache = new HashMap<>(); + this.mapper = new ObjectMapper(); + + SimpleModule module = new SimpleModule(); + module.addDeserializer(Course.class, new CourseIdDeserializer()); + module.addSerializer(Course.class, new CourseIdSerializer()); + module.addDeserializer(Golfer.class, new GolferUsernameDeserializer()); + module.addSerializer(Golfer.class, new GolferUsernameSerializer()); + mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); + mapper.registerModule(module); + mapper.setVisibility(PropertyAccessor.FIELD, JsonAutoDetect.Visibility.ANY); + mapper.registerModule(new ParameterNamesModule(JsonCreator.Mode.PROPERTIES)); + mapper.registerModule(new JavaTimeModule()); + + try { + load(); + } catch (IOException ex) { + throw new RuntimeException(ex); + } + + this.nextLeagueID = cache.values().stream().mapToInt(League::getId).max().orElse(0) + 1; } - private void load() { - //TODO impl + private void load() throws IOException { + League[] data = mapper.readValue(file, League[].class); + cache.clear(); + Arrays.stream(data).forEach(i -> cache.put(i.getId(), i)); } - private void save() { - //TODO impl + private void save() throws IOException { + League[] data = cache.values().toArray(League[]::new); + mapper.writer(new CustomPrettyPrinter()).writeValue(file, data); } @Override @@ -44,20 +84,38 @@ public class JSONLeagueDatabase implements LeagueDatabase { } @Override - public void addLeague(League league) { + public void addLeague(League league) throws IOException { + league.setId(nextLeagueID++); cache.putIfAbsent(league.getId(), league); save(); } @Override - public void removeLeague(League league) { + public void removeLeague(League league) throws IOException { cache.remove(league.getId()); save(); } @Override - public void updateLeague(League league) { + public void updateLeague(League league) throws IOException { cache.put(league.getId(), league); save(); } + + protected static class GolferUsernameSerializer extends JsonSerializer { + @Override + public void serialize(Golfer course, JsonGenerator gen, SerializerProvider serializers) throws IOException { + gen.writeString(course.getUsername()); + } + } + + protected static class GolferUsernameDeserializer extends JsonDeserializer { + PersonalDatabase personalDB = PersonalDatabase.instance(); + + @Override + public Golfer deserialize(JsonParser p, DeserializationContext context) throws IOException { + String username = p.getValueAsString(); + return personalDB.getGolfer(username); + } + } } diff --git a/src/main/java/design/persistence/JSONPersonalDatabase.java b/src/main/java/design/persistence/JSONPersonalDatabase.java index 70aa1ab..00b6398 100644 --- a/src/main/java/design/persistence/JSONPersonalDatabase.java +++ b/src/main/java/design/persistence/JSONPersonalDatabase.java @@ -11,13 +11,11 @@ import com.fasterxml.jackson.databind.*; import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import com.fasterxml.jackson.module.paramnames.ParameterNamesModule; -import design.model.Club; import design.model.Course; import design.model.Golfer; import java.io.File; import java.io.IOException; -import java.util.Collection; import java.util.HashMap; import java.util.Map; @@ -102,14 +100,14 @@ public class JSONPersonalDatabase implements PersonalDatabase { save(); } - private static class CourseIdSerializer extends JsonSerializer { + protected static class CourseIdSerializer extends JsonSerializer { @Override public void serialize(Course course, JsonGenerator gen, SerializerProvider serializers) throws IOException { gen.writeNumber(course.getId()); } } - private static class CourseIdDeserializer extends JsonDeserializer { + protected static class CourseIdDeserializer extends JsonDeserializer { MasterDatabase masterDB = MasterDatabase.instance(); @Override @@ -119,7 +117,7 @@ public class JSONPersonalDatabase implements PersonalDatabase { } } - private static class CustomPrettyPrinter extends DefaultPrettyPrinter { + protected static class CustomPrettyPrinter extends DefaultPrettyPrinter { public CustomPrettyPrinter() { super._arrayIndenter = new DefaultIndenter(); super._objectFieldValueSeparatorWithSpaces = _separators.getObjectFieldValueSeparator() + " "; diff --git a/src/main/java/design/persistence/LeagueDatabase.java b/src/main/java/design/persistence/LeagueDatabase.java index 2ab3e30..953624d 100644 --- a/src/main/java/design/persistence/LeagueDatabase.java +++ b/src/main/java/design/persistence/LeagueDatabase.java @@ -2,6 +2,8 @@ package design.persistence; import design.model.League; +import java.io.IOException; + public interface LeagueDatabase { static LeagueDatabase instance() { return JSONLeagueDatabase.instance(); @@ -11,9 +13,9 @@ public interface LeagueDatabase { League[] getLeagues(); - void addLeague(League league); + void addLeague(League league) throws IOException; - void removeLeague(League league); + void removeLeague(League league) throws IOException; - void updateLeague(League league); + void updateLeague(League league) throws IOException; } -- 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 --- .../design/controller/userinput/menus/ManageClubs.java | 3 ++- src/main/java/design/model/Club.java | 18 ++++++++++++++++-- src/main/java/design/model/Golfer.java | 4 ++-- 3 files changed, 20 insertions(+), 5 deletions(-) (limited to 'src/main') diff --git a/src/main/java/design/controller/userinput/menus/ManageClubs.java b/src/main/java/design/controller/userinput/menus/ManageClubs.java index 27b011c..6b6811b 100644 --- a/src/main/java/design/controller/userinput/menus/ManageClubs.java +++ b/src/main/java/design/controller/userinput/menus/ManageClubs.java @@ -58,7 +58,8 @@ public class ManageClubs extends Menu { selector.present(); Club.ClubType type = selector.getResult(); - golfer.addClub(manufacture, nickname, type); + Club c = new Club(manufacture, nickname, type); + golfer.addClub(c); // Add club to JSON try { 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') 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 708b2c1fca41f0fb5d7e73aa3470839ce2463892 Mon Sep 17 00:00:00 2001 From: sowgro Date: Sun, 9 Nov 2025 17:27:07 -0500 Subject: add serializer for leagues in golfer, reorganize serializers --- .../design/persistence/JSONLeagueDatabase.java | 31 ++------- .../design/persistence/JSONPersonalDatabase.java | 43 ++---------- src/main/java/design/persistence/Serializers.java | 81 ++++++++++++++++++++++ 3 files changed, 92 insertions(+), 63 deletions(-) create mode 100644 src/main/java/design/persistence/Serializers.java (limited to 'src/main') diff --git a/src/main/java/design/persistence/JSONLeagueDatabase.java b/src/main/java/design/persistence/JSONLeagueDatabase.java index 78e1903..8b201e6 100644 --- a/src/main/java/design/persistence/JSONLeagueDatabase.java +++ b/src/main/java/design/persistence/JSONLeagueDatabase.java @@ -3,8 +3,6 @@ package design.persistence; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.PropertyAccessor; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.*; import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; @@ -19,8 +17,6 @@ import java.util.Arrays; import java.util.HashMap; import java.util.Map; -import static design.persistence.JSONPersonalDatabase.*; - public class JSONLeagueDatabase implements LeagueDatabase { private static JSONLeagueDatabase INSTANCE; @@ -43,10 +39,10 @@ public class JSONLeagueDatabase implements LeagueDatabase { this.mapper = new ObjectMapper(); SimpleModule module = new SimpleModule(); - module.addDeserializer(Course.class, new CourseIdDeserializer()); - module.addSerializer(Course.class, new CourseIdSerializer()); - module.addDeserializer(Golfer.class, new GolferUsernameDeserializer()); - module.addSerializer(Golfer.class, new GolferUsernameSerializer()); + module.addDeserializer(Course.class, new Serializers.CourseIdDeserializer()); + module.addSerializer(Course.class, new Serializers.CourseIdSerializer()); + module.addDeserializer(Golfer.class, new Serializers.GolferUsernameDeserializer()); + module.addSerializer(Golfer.class, new Serializers.GolferUsernameSerializer()); mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); mapper.registerModule(module); mapper.setVisibility(PropertyAccessor.FIELD, JsonAutoDetect.Visibility.ANY); @@ -70,7 +66,7 @@ public class JSONLeagueDatabase implements LeagueDatabase { private void save() throws IOException { League[] data = cache.values().toArray(League[]::new); - mapper.writer(new CustomPrettyPrinter()).writeValue(file, data); + mapper.writer(new Serializers.CustomPrettyPrinter()).writeValue(file, data); } @Override @@ -101,21 +97,4 @@ public class JSONLeagueDatabase implements LeagueDatabase { cache.put(league.getId(), league); save(); } - - protected static class GolferUsernameSerializer extends JsonSerializer { - @Override - public void serialize(Golfer course, JsonGenerator gen, SerializerProvider serializers) throws IOException { - gen.writeString(course.getUsername()); - } - } - - protected static class GolferUsernameDeserializer extends JsonDeserializer { - PersonalDatabase personalDB = PersonalDatabase.instance(); - - @Override - public Golfer deserialize(JsonParser p, DeserializationContext context) throws IOException { - String username = p.getValueAsString(); - return personalDB.getGolfer(username); - } - } } diff --git a/src/main/java/design/persistence/JSONPersonalDatabase.java b/src/main/java/design/persistence/JSONPersonalDatabase.java index 00b6398..0e95437 100644 --- a/src/main/java/design/persistence/JSONPersonalDatabase.java +++ b/src/main/java/design/persistence/JSONPersonalDatabase.java @@ -3,16 +3,13 @@ package design.persistence; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.PropertyAccessor; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.util.DefaultIndenter; -import com.fasterxml.jackson.core.util.DefaultPrettyPrinter; import com.fasterxml.jackson.databind.*; import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import com.fasterxml.jackson.module.paramnames.ParameterNamesModule; import design.model.Course; import design.model.Golfer; +import design.model.League; import java.io.File; import java.io.IOException; @@ -44,8 +41,10 @@ public class JSONPersonalDatabase implements PersonalDatabase { mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); SimpleModule module = new SimpleModule(); - module.addDeserializer(Course.class, new CourseIdDeserializer()); - module.addSerializer(Course.class, new CourseIdSerializer()); + module.addDeserializer(Course.class, new Serializers.CourseIdDeserializer()); + module.addSerializer(Course.class, new Serializers.CourseIdSerializer()); + module.addSerializer(League.class, new Serializers.LeagueIDSerializer()); + module.addDeserializer(League.class, new Serializers.LeagueIDDeserializer()); mapper.registerModule(module); mapper.setVisibility(PropertyAccessor.FIELD, JsonAutoDetect.Visibility.ANY); mapper.registerModule(new ParameterNamesModule(JsonCreator.Mode.PROPERTIES)); @@ -68,7 +67,7 @@ public class JSONPersonalDatabase implements PersonalDatabase { private void save() throws IOException { Golfer[] data = cache.values().toArray(Golfer[]::new); - mapper.writer(new CustomPrettyPrinter()).writeValue(file, data); + mapper.writer(new Serializers.CustomPrettyPrinter()).writeValue(file, data); } // turns that collection into a real array of golfers @@ -99,34 +98,4 @@ public class JSONPersonalDatabase implements PersonalDatabase { cache.put(golfer.getUsername(), golfer); save(); } - - protected static class CourseIdSerializer extends JsonSerializer { - @Override - public void serialize(Course course, JsonGenerator gen, SerializerProvider serializers) throws IOException { - gen.writeNumber(course.getId()); - } - } - - protected static class CourseIdDeserializer extends JsonDeserializer { - MasterDatabase masterDB = MasterDatabase.instance(); - - @Override - public Course deserialize(JsonParser p, DeserializationContext context) throws IOException { - int id = p.getValueAsInt(); - return masterDB.getCourse(id); - } - } - - protected static class CustomPrettyPrinter extends DefaultPrettyPrinter { - public CustomPrettyPrinter() { - super._arrayIndenter = new DefaultIndenter(); - super._objectFieldValueSeparatorWithSpaces = _separators.getObjectFieldValueSeparator() + " "; - super._arrayEmptySeparator = ""; - } - - @Override - public CustomPrettyPrinter createInstance() { - return new CustomPrettyPrinter(); - } - } } diff --git a/src/main/java/design/persistence/Serializers.java b/src/main/java/design/persistence/Serializers.java new file mode 100644 index 0000000..ab4b18b --- /dev/null +++ b/src/main/java/design/persistence/Serializers.java @@ -0,0 +1,81 @@ +package design.persistence; + +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.core.util.DefaultIndenter; +import com.fasterxml.jackson.core.util.DefaultPrettyPrinter; +import com.fasterxml.jackson.databind.DeserializationContext; +import com.fasterxml.jackson.databind.JsonDeserializer; +import com.fasterxml.jackson.databind.JsonSerializer; +import com.fasterxml.jackson.databind.SerializerProvider; +import design.model.Course; +import design.model.Golfer; +import design.model.League; + +import java.io.IOException; + +public class Serializers { + public static class CustomPrettyPrinter extends DefaultPrettyPrinter { + public CustomPrettyPrinter() { + super._arrayIndenter = new DefaultIndenter(); + super._objectFieldValueSeparatorWithSpaces = _separators.getObjectFieldValueSeparator() + " "; + super._arrayEmptySeparator = ""; + } + + @Override + public CustomPrettyPrinter createInstance() { + return new CustomPrettyPrinter(); + } + } + + public static class CourseIdSerializer extends JsonSerializer { + @Override + public void serialize(Course course, JsonGenerator gen, SerializerProvider serializers) throws IOException { + gen.writeNumber(course.getId()); + } + } + + public static class CourseIdDeserializer extends JsonDeserializer { + MasterDatabase masterDB = MasterDatabase.instance(); + + @Override + public Course deserialize(JsonParser p, DeserializationContext context) throws IOException { + int id = p.getValueAsInt(); + return masterDB.getCourse(id); + } + } + + public static class LeagueIDSerializer extends JsonSerializer { + @Override + public void serialize(League value, JsonGenerator gen, SerializerProvider serializers) throws IOException { + gen.writeNumber(value.getId()); + } + } + + public static class LeagueIDDeserializer extends JsonDeserializer { + LeagueDatabase leagueDB = LeagueDatabase.instance(); + + @Override + public League deserialize(JsonParser p, DeserializationContext ctxt) throws IOException { + int id = p.getValueAsInt(); + return leagueDB.getLeague(id); + } + } + + public static class GolferUsernameSerializer extends JsonSerializer { + @Override + public void serialize(Golfer course, JsonGenerator gen, SerializerProvider serializers) throws IOException { + gen.writeString(course.getUsername()); + } + } + + public static class GolferUsernameDeserializer extends JsonDeserializer { + PersonalDatabase personalDB = PersonalDatabase.instance(); + + @Override + public Golfer deserialize(JsonParser p, DeserializationContext context) throws IOException { + String username = p.getValueAsString(); + return personalDB.getGolfer(username); + } + } +} -- 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') 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 +- src/main/java/design/persistence/Serializers.java | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'src/main') 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; } diff --git a/src/main/java/design/persistence/Serializers.java b/src/main/java/design/persistence/Serializers.java index ab4b18b..3940b44 100644 --- a/src/main/java/design/persistence/Serializers.java +++ b/src/main/java/design/persistence/Serializers.java @@ -36,10 +36,9 @@ public class Serializers { } public static class CourseIdDeserializer extends JsonDeserializer { - MasterDatabase masterDB = MasterDatabase.instance(); - @Override public Course deserialize(JsonParser p, DeserializationContext context) throws IOException { + MasterDatabase masterDB = MasterDatabase.instance(); int id = p.getValueAsInt(); return masterDB.getCourse(id); } @@ -53,10 +52,9 @@ public class Serializers { } public static class LeagueIDDeserializer extends JsonDeserializer { - LeagueDatabase leagueDB = LeagueDatabase.instance(); - @Override public League deserialize(JsonParser p, DeserializationContext ctxt) throws IOException { + LeagueDatabase leagueDB = LeagueDatabase.instance(); int id = p.getValueAsInt(); return leagueDB.getLeague(id); } @@ -70,10 +68,10 @@ public class Serializers { } public static class GolferUsernameDeserializer extends JsonDeserializer { - PersonalDatabase personalDB = PersonalDatabase.instance(); @Override public Golfer deserialize(JsonParser p, DeserializationContext context) throws IOException { + PersonalDatabase personalDB = PersonalDatabase.instance(); String username = p.getValueAsString(); return personalDB.getGolfer(username); } -- 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') 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') 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 ++ .../java/design/persistence/JSONLeagueDatabase.java | 4 +++- .../java/design/persistence/JSONPersonalDatabase.java | 4 +++- 5 files changed, 35 insertions(+), 6 deletions(-) (limited to 'src/main') 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; diff --git a/src/main/java/design/persistence/JSONLeagueDatabase.java b/src/main/java/design/persistence/JSONLeagueDatabase.java index 8b201e6..8a55065 100644 --- a/src/main/java/design/persistence/JSONLeagueDatabase.java +++ b/src/main/java/design/persistence/JSONLeagueDatabase.java @@ -3,7 +3,9 @@ package design.persistence; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.PropertyAccessor; +import com.fasterxml.jackson.core.StreamReadFeature; import com.fasterxml.jackson.databind.*; +import com.fasterxml.jackson.databind.json.JsonMapper; import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import com.fasterxml.jackson.module.paramnames.ParameterNamesModule; @@ -36,7 +38,7 @@ public class JSONLeagueDatabase implements LeagueDatabase { public JSONLeagueDatabase(String filename) { this.file = new File(filename); this.cache = new HashMap<>(); - this.mapper = new ObjectMapper(); + this.mapper = JsonMapper.builder().enable(StreamReadFeature.INCLUDE_SOURCE_IN_LOCATION).build(); SimpleModule module = new SimpleModule(); module.addDeserializer(Course.class, new Serializers.CourseIdDeserializer()); diff --git a/src/main/java/design/persistence/JSONPersonalDatabase.java b/src/main/java/design/persistence/JSONPersonalDatabase.java index 0e95437..30c280a 100644 --- a/src/main/java/design/persistence/JSONPersonalDatabase.java +++ b/src/main/java/design/persistence/JSONPersonalDatabase.java @@ -3,7 +3,9 @@ package design.persistence; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.PropertyAccessor; +import com.fasterxml.jackson.core.StreamReadFeature; import com.fasterxml.jackson.databind.*; +import com.fasterxml.jackson.databind.json.JsonMapper; import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import com.fasterxml.jackson.module.paramnames.ParameterNamesModule; @@ -34,7 +36,7 @@ public class JSONPersonalDatabase implements PersonalDatabase { private JSONPersonalDatabase(String filename) { this.file = new File(filename); this.cache = new HashMap<>(); - this.mapper = new ObjectMapper(); + this.mapper = JsonMapper.builder().enable(StreamReadFeature.INCLUDE_SOURCE_IN_LOCATION).build();; // TODO: Once the saved JSON matches the model, consider removing. // TEMP: tolerate unknown props while the model stabilizes -- cgit v1.2.3 From af23c48329b749ba3d0a4fcd841723d55a16ae95 Mon Sep 17 00:00:00 2001 From: sowgro Date: Wed, 12 Nov 2025 12:57:08 -0500 Subject: stub out some menus --- .../controller/userinput/menus/LeageMenu.java | 30 ++++++++ .../controller/userinput/menus/MainMenu.java | 3 +- .../controller/userinput/menus/SelectLeague.java | 83 ++++++++++++++++++++++ 3 files changed, 115 insertions(+), 1 deletion(-) create mode 100644 src/main/java/design/controller/userinput/menus/LeageMenu.java create mode 100644 src/main/java/design/controller/userinput/menus/SelectLeague.java (limited to 'src/main') diff --git a/src/main/java/design/controller/userinput/menus/LeageMenu.java b/src/main/java/design/controller/userinput/menus/LeageMenu.java new file mode 100644 index 0000000..d9afa91 --- /dev/null +++ b/src/main/java/design/controller/userinput/menus/LeageMenu.java @@ -0,0 +1,30 @@ +package design.controller.userinput.menus; + +import design.controller.userinput.Menu; +import design.controller.userinput.MenuOption; +import design.model.League; + +import java.util.ArrayList; +import java.util.List; + +public class LeageMenu extends Menu { + private final League league; + + public LeageMenu(League league) { + this.league = league; + } + + @Override + public String getTitle() { + return "League Menu"; + } + + @Override + public List getMenuOptions() { + List options = new ArrayList<>(); + options.add(new MenuOption("statistics...", () -> {})); + options.add(new MenuOption("leaderboard...", () -> {})); + options.add(new MenuOption("log round...", () -> {})); + return options; + } +} diff --git a/src/main/java/design/controller/userinput/menus/MainMenu.java b/src/main/java/design/controller/userinput/menus/MainMenu.java index 7522ceb..e476997 100644 --- a/src/main/java/design/controller/userinput/menus/MainMenu.java +++ b/src/main/java/design/controller/userinput/menus/MainMenu.java @@ -19,7 +19,8 @@ public class MainMenu extends Menu { new MenuOption("manage courses...", () -> new ManageCourses().present()), new MenuOption("manage clubs...", () -> new ManageClubs().present()), new MenuOption("statistics...", () -> new StatisticsMenu().present()), - new MenuOption("log round...", () -> new HolePlayMenu().present()) + new MenuOption("log round...", () -> new HolePlayMenu().present()), + new MenuOption("League play...", () -> new SelectLeague().present()) ); } } diff --git a/src/main/java/design/controller/userinput/menus/SelectLeague.java b/src/main/java/design/controller/userinput/menus/SelectLeague.java new file mode 100644 index 0000000..08f6c91 --- /dev/null +++ b/src/main/java/design/controller/userinput/menus/SelectLeague.java @@ -0,0 +1,83 @@ +package design.controller.userinput.menus; + +import design.controller.userinput.Menu; +import design.controller.userinput.MenuOption; +import design.model.Golfer; +import design.model.League; +import design.model.ScrambleLeague; +import design.model.StrokeLeague; +import design.persistence.LeagueDatabase; +import design.runtime.Session; + +import java.io.IOException; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.*; + +public class SelectLeague extends Menu { + private final Golfer golfer = Session.getCurrentGolfer(); + + @Override + public String getTitle() { + return "Select League"; + } + + @Override + public List getMenuOptions() { + List options = new ArrayList<>(); + for (League l : LeagueDatabase.instance().getLeagues()) { + options.add(new MenuOption(l.getName(), () -> { + if (l instanceof ScrambleLeague sl && sl.locateTeam(golfer) == null) { + Scanner sc = new Scanner(System.in); + System.out.print("You are not a member of a team for this league. Would you like to create one (Y/n): "); + if (sc.next().equals("n")) { + new MainMenu().present(); + } else { + // create team + } + } else { + new LeageMenu(l).present(); + } + })); + } + options.add(new MenuOption("", this::createLeagueWizard)); + return options; + } + + private void createLeagueWizard() { + try { + Scanner scanner = new Scanner(System.in); + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); + + System.out.print("Enter league name: "); + String name = scanner.nextLine(); + + System.out.print("Enter registration date (yyyy-MM-dd): "); + Date registrationDate = dateFormat.parse(scanner.nextLine()); + + System.out.print("Enter start date (yyyy-MM-dd): "); + Date startDate = dateFormat.parse(scanner.nextLine()); + + System.out.print("Enter end date (yyyy-MM-dd): "); + Date endDate = dateFormat.parse(scanner.nextLine()); + + Golfer owner = Session.getCurrentGolfer(); + + System.out.print("Enter format (stroke/scramble): "); + String scramble = scanner.nextLine(); + + League league; + switch (scramble) { + case "scramble" -> league = new ScrambleLeague(name, registrationDate, startDate, endDate, owner); + case "stroke" -> league = new StrokeLeague(name, registrationDate, startDate, endDate, owner); + default -> throw new RuntimeException(); + } + LeagueDatabase.instance().addLeague(league); + } catch (ParseException ex) { + System.out.println("Invalid format"); + } catch (IOException ex) { + System.out.println("Error writing to file"); + } + this.present(); + } +} -- cgit v1.2.3