From d7249ab93dad3ba9be0389f402c1378d7f1eb5ad Mon Sep 17 00:00:00 2001 From: sowgro Date: Thu, 2 Oct 2025 22:09:13 -0400 Subject: Implement basic serialization --- pom.xml | 18 +++-- .../java/design/persistence/CSVMasterDatabase.java | 76 ++++++++++++++++++++++ .../design/persistence/JSONPersonalDatabase.java | 65 ++++++++++++++++++ .../java/design/persistence/PersonalDatabase.java | 8 ++- 4 files changed, 160 insertions(+), 7 deletions(-) create mode 100644 src/main/java/design/persistence/CSVMasterDatabase.java create mode 100644 src/main/java/design/persistence/JSONPersonalDatabase.java diff --git a/pom.xml b/pom.xml index 28c2fb7..1de52ff 100644 --- a/pom.xml +++ b/pom.xml @@ -6,8 +6,8 @@ 1 UTF-8 - 19 - 19 + 21 + 21 @@ -16,6 +16,16 @@ 5.4.0 test + + com.fasterxml.jackson.core + jackson-databind + 2.20.0 + + + com.fasterxml.jackson.dataformat + jackson-dataformat-csv + 2.20.0 + @@ -24,7 +34,7 @@ maven-compiler-plugin 3.8.0 - 20 + 21 @@ -35,4 +45,4 @@ - + \ No newline at end of file diff --git a/src/main/java/design/persistence/CSVMasterDatabase.java b/src/main/java/design/persistence/CSVMasterDatabase.java new file mode 100644 index 0000000..94ac470 --- /dev/null +++ b/src/main/java/design/persistence/CSVMasterDatabase.java @@ -0,0 +1,76 @@ +package design.persistence; + +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.databind.DeserializationContext; +import com.fasterxml.jackson.databind.JsonDeserializer; +import com.fasterxml.jackson.databind.MappingIterator; +import com.fasterxml.jackson.databind.module.SimpleModule; +import com.fasterxml.jackson.databind.node.ObjectNode; +import com.fasterxml.jackson.dataformat.csv.CsvMapper; +import com.fasterxml.jackson.dataformat.csv.CsvSchema; +import design.model.Course; +import design.model.Hole; + +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; + +public class CSVMasterDatabase implements MasterDatabase { + + private final List cache; + private final CsvMapper mapper; + private final File file; + + public CSVMasterDatabase(String filename) throws IOException { + this.cache = new ArrayList<>(); + this.mapper = new CsvMapper(); + this.file = new File(filename); + + SimpleModule module = new SimpleModule(); + module.addDeserializer(Course.class, new CourseDeserializer()); + mapper.registerModule(module); + + load(); + } + + public void load() throws IOException { + MappingIterator it = mapper + .readerFor(Course.class) + .with(CsvSchema.emptySchema().withHeader()) + .readValues(file); + + cache.addAll(it.readAll()); + } + + @Override + public Course[] getCourses() { + return cache.toArray(Course[]::new); + } + + @Override + public Course getCourse(String name) { + return null; + } + + private static class CourseDeserializer extends JsonDeserializer { + @Override + public Course deserialize(JsonParser p, DeserializationContext ctxt) throws IOException { + ObjectNode node = p.getCodec().readTree(p); + + String name = node.get("Course Name").asText(); + double difficulty = node.get("Difficulty Rating").asDouble(); + String location = node.get("Location").asText(); + int holes = node.get("Number of Holes").asInt(); + int totalPar = node.get("Total Par").asInt(); + + String[] parValues = node.get("Par Per Hole").asText().split(";"); + List holeList = new ArrayList<>(); + for (int i = 0; i < parValues.length; i++) { + holeList.add(new Hole(i + 1, Integer.parseInt(parValues[i].trim()))); + } + + return new Course(name, (int) difficulty, location, holes, totalPar, holeList); + } + } +} diff --git a/src/main/java/design/persistence/JSONPersonalDatabase.java b/src/main/java/design/persistence/JSONPersonalDatabase.java new file mode 100644 index 0000000..3ec0012 --- /dev/null +++ b/src/main/java/design/persistence/JSONPersonalDatabase.java @@ -0,0 +1,65 @@ +package design.persistence; + +import com.fasterxml.jackson.databind.ObjectMapper; +import design.model.Golfer; + +import java.io.File; +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; + +public class JSONPersonalDatabase implements PersonalDatabase { + + private final Map cache; + private final ObjectMapper mapper; + private final File file; + + public JSONPersonalDatabase(String filename) throws IOException { + this.file = new File(filename); + this.cache = new HashMap<>(); + this.mapper = new ObjectMapper(); + + load(); + } + + private void load() throws IOException { + Golfer[] data = mapper.readValue(file, Golfer[].class); + cache.clear(); + for (Golfer i : data) { + cache.put(i.getUsername(), i); + } + } + + private void save() throws IOException { + Golfer[] data = cache.values().toArray(Golfer[]::new); + mapper.writeValue(file, data); + } + + @Override + public Golfer[] getGolfers() { + return new Golfer[0]; + } + + @Override + public Golfer getGolfer(String username) { + return cache.get(username); + } + + @Override + public void addGolfer(Golfer golfer) throws IOException { + cache.put(golfer.getUsername(), golfer); + save(); + } + + @Override + public void removeGolfer(Golfer golfer) throws IOException { + cache.remove(golfer.getUsername()); + save(); + } + + @Override + public void updateGolfer(Golfer golfer) throws IOException { + cache.put(golfer.getUsername(), golfer); + save(); + } +} diff --git a/src/main/java/design/persistence/PersonalDatabase.java b/src/main/java/design/persistence/PersonalDatabase.java index e1023cf..783e982 100644 --- a/src/main/java/design/persistence/PersonalDatabase.java +++ b/src/main/java/design/persistence/PersonalDatabase.java @@ -2,10 +2,12 @@ package design.persistence; import design.model.Golfer; +import java.io.IOException; + public interface PersonalDatabase { Golfer[] getGolfers(); Golfer getGolfer(String name); - void addGolfer(Golfer golfer); - void removeGolfer(Golfer golfer); - void updateGolfer(Golfer golfer); + void addGolfer(Golfer golfer) throws IOException; + void removeGolfer(Golfer golfer) throws IOException; + void updateGolfer(Golfer golfer) throws IOException; } -- cgit v1.2.3 From d982cfe8a22ec7eb89186fed875a483a51c3505f Mon Sep 17 00:00:00 2001 From: sowgro Date: Fri, 3 Oct 2025 00:31:02 -0400 Subject: Add code to handle id serialization --- data/personaldb.json | 1 + src/main/java/design/HelloWorld.java | 21 ++++++++++-- src/main/java/design/model/Course.java | 9 ++++- src/main/java/design/model/Golfer.java | 17 ++++++--- src/main/java/design/model/Play.java | 6 ++++ src/main/java/design/model/Round.java | 10 +++++- .../java/design/persistence/CSVMasterDatabase.java | 17 ++++++--- .../design/persistence/JSONPersonalDatabase.java | 40 ++++++++++++++++++++-- .../java/design/persistence/MasterDatabase.java | 4 ++- .../java/design/persistence/PersonalDatabase.java | 2 ++ 10 files changed, 109 insertions(+), 18 deletions(-) create mode 100644 data/personaldb.json diff --git a/data/personaldb.json b/data/personaldb.json new file mode 100644 index 0000000..86259e5 --- /dev/null +++ b/data/personaldb.json @@ -0,0 +1 @@ +[{"username":"sowgro","passwordHash":3433489,"fullName":"Tyler Ferrari","courses":[8],"rounds":[]}] \ No newline at end of file diff --git a/src/main/java/design/HelloWorld.java b/src/main/java/design/HelloWorld.java index ea552f9..5e16cec 100644 --- a/src/main/java/design/HelloWorld.java +++ b/src/main/java/design/HelloWorld.java @@ -1,7 +1,24 @@ package design; +import design.model.Golfer; +import design.persistence.CSVMasterDatabase; +import design.persistence.JSONPersonalDatabase; +import design.persistence.MasterDatabase; +import design.persistence.PersonalDatabase; + +import java.io.IOException; + public class HelloWorld { - public static void main(String[] args) { - System.out.println("Hello, World!"); + public static void main(String[] args) throws IOException { + var mdb = MasterDatabase.INSTANCE; + var pdb = PersonalDatabase.INSTANCE; + +// Golfer g = new Golfer("Tyler Ferrari", "sowgro", "pass"); +// g.addCourse(mdb.getCourse(8)); +// +// pdb.addGolfer(g); + + System.out.println("done"); + } } diff --git a/src/main/java/design/model/Course.java b/src/main/java/design/model/Course.java index 8dfecd8..f90c8d9 100644 --- a/src/main/java/design/model/Course.java +++ b/src/main/java/design/model/Course.java @@ -3,6 +3,8 @@ package design.model; import java.util.List; public class Course implements ICourse { + + private final int id; private final String name; private final int difficultyRating; private final String location; @@ -10,7 +12,8 @@ public class Course implements ICourse { private final int totalPar; private final List holes; - public Course(String name, int difficultyRating, String location, int holeCount, int totalPar, List holes) { + public Course(int id, String name, int difficultyRating, String location, int holeCount, int totalPar, List holes) { + this.id = id; this.name = name; this.difficultyRating = difficultyRating; this.location = location; @@ -19,6 +22,10 @@ public class Course implements ICourse { this.holes = holes; } + public int getId() { + return id; + } + public String getName() { return name; } diff --git a/src/main/java/design/model/Golfer.java b/src/main/java/design/model/Golfer.java index 8f09067..1a6c7b6 100644 --- a/src/main/java/design/model/Golfer.java +++ b/src/main/java/design/model/Golfer.java @@ -7,15 +7,24 @@ public class Golfer { private String username; private int passwordHash; private String fullName; - private final transient List courses; // might be better to make this like a courseID or something + private final List courses; private final List rounds; + // for deserialization + public Golfer(String username, int passwordHash, String fullName, List courses, List rounds) { + this.username = username; + this.passwordHash = passwordHash; + this.fullName = fullName; + this.courses = courses; + this.rounds = rounds; + } + public Golfer(String fullName, String username, String password) { - this.courses = new ArrayList<>(); - this.rounds = new ArrayList<>(); this.fullName = fullName; this.username = username; this.passwordHash = password.hashCode(); + this.courses = new ArrayList<>(); + this.rounds = new ArrayList<>(); } public String getUsername() { @@ -61,6 +70,4 @@ public class Golfer { public void addRound(Round round) { rounds.add(round); } - - } diff --git a/src/main/java/design/model/Play.java b/src/main/java/design/model/Play.java index b61228b..cf44cd8 100644 --- a/src/main/java/design/model/Play.java +++ b/src/main/java/design/model/Play.java @@ -7,6 +7,12 @@ public class Play { private final int distance; private final List swings; + // for deserialization + private Play(int distance, List swings) { + this.distance = distance; + this.swings = swings; + } + public Play(int distance) { this.swings = new ArrayList<>(); this.distance = distance; diff --git a/src/main/java/design/model/Round.java b/src/main/java/design/model/Round.java index 38975da..39de907 100644 --- a/src/main/java/design/model/Round.java +++ b/src/main/java/design/model/Round.java @@ -5,11 +5,19 @@ import java.util.ArrayList; import java.util.List; public class Round { - private final transient Course course; + private final Course course; private final LocalDateTime dateTime; private final Hole startingHole; private final List plays; + // for deserialization + private Round(Course course, LocalDateTime dateTime, Hole startingHole, List plays) { + this.course = course; + this.dateTime = dateTime; + this.startingHole = startingHole; + this.plays = plays; + } + public Round(Course course, LocalDateTime dateTime, Hole startingHole) { this.course = course; this.dateTime = dateTime; diff --git a/src/main/java/design/persistence/CSVMasterDatabase.java b/src/main/java/design/persistence/CSVMasterDatabase.java index 94ac470..fe89191 100644 --- a/src/main/java/design/persistence/CSVMasterDatabase.java +++ b/src/main/java/design/persistence/CSVMasterDatabase.java @@ -22,7 +22,7 @@ public class CSVMasterDatabase implements MasterDatabase { private final CsvMapper mapper; private final File file; - public CSVMasterDatabase(String filename) throws IOException { + public CSVMasterDatabase(String filename) { this.cache = new ArrayList<>(); this.mapper = new CsvMapper(); this.file = new File(filename); @@ -31,7 +31,11 @@ public class CSVMasterDatabase implements MasterDatabase { module.addDeserializer(Course.class, new CourseDeserializer()); mapper.registerModule(module); - load(); + try { + load(); + } catch (IOException ex) { + throw new RuntimeException(ex); + } } public void load() throws IOException { @@ -49,15 +53,18 @@ public class CSVMasterDatabase implements MasterDatabase { } @Override - public Course getCourse(String name) { - return null; + public Course getCourse(int id) { + return cache.get(id); } private static class CourseDeserializer extends JsonDeserializer { + int curID = 0; + @Override public Course deserialize(JsonParser p, DeserializationContext ctxt) throws IOException { ObjectNode node = p.getCodec().readTree(p); + int id = curID++; String name = node.get("Course Name").asText(); double difficulty = node.get("Difficulty Rating").asDouble(); String location = node.get("Location").asText(); @@ -70,7 +77,7 @@ public class CSVMasterDatabase implements MasterDatabase { holeList.add(new Hole(i + 1, Integer.parseInt(parValues[i].trim()))); } - return new Course(name, (int) difficulty, location, holes, totalPar, holeList); + return new Course(id, name, (int) difficulty, location, holes, totalPar, holeList); } } } diff --git a/src/main/java/design/persistence/JSONPersonalDatabase.java b/src/main/java/design/persistence/JSONPersonalDatabase.java index 3ec0012..511d962 100644 --- a/src/main/java/design/persistence/JSONPersonalDatabase.java +++ b/src/main/java/design/persistence/JSONPersonalDatabase.java @@ -1,6 +1,12 @@ package design.persistence; -import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.annotation.JsonAutoDetect; +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 design.model.Course; import design.model.Golfer; import java.io.File; @@ -14,12 +20,23 @@ public class JSONPersonalDatabase implements PersonalDatabase { private final ObjectMapper mapper; private final File file; - public JSONPersonalDatabase(String filename) throws IOException { + public JSONPersonalDatabase(String filename) { this.file = new File(filename); this.cache = new HashMap<>(); this.mapper = new ObjectMapper(); - load(); + SimpleModule module = new SimpleModule(); + module.addDeserializer(Course.class, new CourseIdDeserializer()); + module.addSerializer(Course.class, new CourseIdSerializer()); + mapper.registerModule(module); + mapper.setVisibility(PropertyAccessor.FIELD, JsonAutoDetect.Visibility.ANY); + mapper.writerWithDefaultPrettyPrinter(); + + try { + load(); + } catch (IOException ex) { + throw new RuntimeException(ex); + } } private void load() throws IOException { @@ -62,4 +79,21 @@ public class JSONPersonalDatabase implements PersonalDatabase { cache.put(golfer.getUsername(), golfer); save(); } + + private 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 { + MasterDatabase masterDB = MasterDatabase.INSTANCE; + + @Override + public Course deserialize(JsonParser p, DeserializationContext context) throws IOException { + int id = p.getValueAsInt(); + return masterDB.getCourse(id); + } + } } diff --git a/src/main/java/design/persistence/MasterDatabase.java b/src/main/java/design/persistence/MasterDatabase.java index 9dcfc1f..2852349 100644 --- a/src/main/java/design/persistence/MasterDatabase.java +++ b/src/main/java/design/persistence/MasterDatabase.java @@ -3,6 +3,8 @@ package design.persistence; import design.model.Course; public interface MasterDatabase { + public static final MasterDatabase INSTANCE = new CSVMasterDatabase("data/golf_courses_1000.csv"); + Course[] getCourses(); - Course getCourse(String name); + Course getCourse(int id); } diff --git a/src/main/java/design/persistence/PersonalDatabase.java b/src/main/java/design/persistence/PersonalDatabase.java index 783e982..524263b 100644 --- a/src/main/java/design/persistence/PersonalDatabase.java +++ b/src/main/java/design/persistence/PersonalDatabase.java @@ -5,6 +5,8 @@ import design.model.Golfer; import java.io.IOException; public interface PersonalDatabase { + public static final PersonalDatabase INSTANCE = new JSONPersonalDatabase("data/personaldb.json"); + Golfer[] getGolfers(); Golfer getGolfer(String name); void addGolfer(Golfer golfer) throws IOException; -- cgit v1.2.3 From 29c4a7caffea3957b8ac5f6be13d640c1a798989 Mon Sep 17 00:00:00 2001 From: sowgro Date: Fri, 3 Oct 2025 20:37:43 -0400 Subject: Serialization fully working --- src/main/java/design/model/Golfer.java | 6 ++++-- src/main/java/design/model/Play.java | 4 +++- src/main/java/design/model/Round.java | 4 +++- src/main/java/design/persistence/JSONPersonalDatabase.java | 6 ++++-- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/main/java/design/model/Golfer.java b/src/main/java/design/model/Golfer.java index 1a6c7b6..04ad8bc 100644 --- a/src/main/java/design/model/Golfer.java +++ b/src/main/java/design/model/Golfer.java @@ -1,5 +1,7 @@ package design.model; +import com.fasterxml.jackson.annotation.JsonCreator; + import java.util.ArrayList; import java.util.List; @@ -10,8 +12,8 @@ public class Golfer { private final List courses; private final List rounds; - // for deserialization - public Golfer(String username, int passwordHash, String fullName, List courses, List rounds) { + @JsonCreator + private Golfer(String username, int passwordHash, String fullName, List courses, List rounds) { this.username = username; this.passwordHash = passwordHash; this.fullName = fullName; diff --git a/src/main/java/design/model/Play.java b/src/main/java/design/model/Play.java index cf44cd8..ca6dac2 100644 --- a/src/main/java/design/model/Play.java +++ b/src/main/java/design/model/Play.java @@ -1,5 +1,7 @@ package design.model; +import com.fasterxml.jackson.annotation.JsonCreator; + import java.util.ArrayList; import java.util.List; @@ -7,7 +9,7 @@ public class Play { private final int distance; private final List swings; - // for deserialization + @JsonCreator private Play(int distance, List swings) { this.distance = distance; this.swings = swings; diff --git a/src/main/java/design/model/Round.java b/src/main/java/design/model/Round.java index 39de907..048a21a 100644 --- a/src/main/java/design/model/Round.java +++ b/src/main/java/design/model/Round.java @@ -1,5 +1,7 @@ package design.model; +import com.fasterxml.jackson.annotation.JsonCreator; + import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; @@ -10,7 +12,7 @@ public class Round { private final Hole startingHole; private final List plays; - // for deserialization + @JsonCreator private Round(Course course, LocalDateTime dateTime, Hole startingHole, List plays) { this.course = course; this.dateTime = dateTime; diff --git a/src/main/java/design/persistence/JSONPersonalDatabase.java b/src/main/java/design/persistence/JSONPersonalDatabase.java index 511d962..dd63407 100644 --- a/src/main/java/design/persistence/JSONPersonalDatabase.java +++ b/src/main/java/design/persistence/JSONPersonalDatabase.java @@ -1,11 +1,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.databind.*; import com.fasterxml.jackson.databind.module.SimpleModule; +import com.fasterxml.jackson.module.paramnames.ParameterNamesModule; import design.model.Course; import design.model.Golfer; @@ -30,7 +32,7 @@ public class JSONPersonalDatabase implements PersonalDatabase { module.addSerializer(Course.class, new CourseIdSerializer()); mapper.registerModule(module); mapper.setVisibility(PropertyAccessor.FIELD, JsonAutoDetect.Visibility.ANY); - mapper.writerWithDefaultPrettyPrinter(); + mapper.registerModule(new ParameterNamesModule(JsonCreator.Mode.PROPERTIES)); try { load(); @@ -49,7 +51,7 @@ public class JSONPersonalDatabase implements PersonalDatabase { private void save() throws IOException { Golfer[] data = cache.values().toArray(Golfer[]::new); - mapper.writeValue(file, data); + mapper.writerWithDefaultPrettyPrinter().writeValue(file, data); } @Override -- cgit v1.2.3 From 81329220b007f0ed0961a63fe9ecbcdf6e1aafb5 Mon Sep 17 00:00:00 2001 From: sowgro Date: Fri, 3 Oct 2025 20:44:00 -0400 Subject: push updated pom --- pom.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pom.xml b/pom.xml index 1de52ff..e8a8fed 100644 --- a/pom.xml +++ b/pom.xml @@ -26,6 +26,11 @@ jackson-dataformat-csv 2.20.0 + + com.fasterxml.jackson.module + jackson-module-parameter-names + 2.20.0 + @@ -35,6 +40,9 @@ 3.8.0 21 + + -parameters + -- cgit v1.2.3 From 0d9775a779f656ab55a22e5df5f6f83f7069fa95 Mon Sep 17 00:00:00 2001 From: sowgro Date: Fri, 3 Oct 2025 21:40:23 -0400 Subject: tweak pretty print and datetime serialization --- data/personaldb.json | 2 +- pom.xml | 10 ++++++++++ .../java/design/persistence/JSONPersonalDatabase.java | 19 ++++++++++++++++++- 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/data/personaldb.json b/data/personaldb.json index 86259e5..0637a08 100644 --- a/data/personaldb.json +++ b/data/personaldb.json @@ -1 +1 @@ -[{"username":"sowgro","passwordHash":3433489,"fullName":"Tyler Ferrari","courses":[8],"rounds":[]}] \ No newline at end of file +[] \ No newline at end of file diff --git a/pom.xml b/pom.xml index e8a8fed..1486a8b 100644 --- a/pom.xml +++ b/pom.xml @@ -31,6 +31,16 @@ jackson-module-parameter-names 2.20.0 + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + 2.20.0 + + + com.fasterxml.jackson.datatype + jackson-datatype-jdk8 + 2.20.0 + diff --git a/src/main/java/design/persistence/JSONPersonalDatabase.java b/src/main/java/design/persistence/JSONPersonalDatabase.java index dd63407..0efa362 100644 --- a/src/main/java/design/persistence/JSONPersonalDatabase.java +++ b/src/main/java/design/persistence/JSONPersonalDatabase.java @@ -5,8 +5,11 @@ 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; @@ -33,6 +36,7 @@ public class JSONPersonalDatabase implements PersonalDatabase { mapper.registerModule(module); mapper.setVisibility(PropertyAccessor.FIELD, JsonAutoDetect.Visibility.ANY); mapper.registerModule(new ParameterNamesModule(JsonCreator.Mode.PROPERTIES)); + mapper.registerModule(new JavaTimeModule()); try { load(); @@ -51,7 +55,7 @@ public class JSONPersonalDatabase implements PersonalDatabase { private void save() throws IOException { Golfer[] data = cache.values().toArray(Golfer[]::new); - mapper.writerWithDefaultPrettyPrinter().writeValue(file, data); + mapper.writer(new CustomPrettyPrinter()).writeValue(file, data); } @Override @@ -98,4 +102,17 @@ public class JSONPersonalDatabase implements PersonalDatabase { return masterDB.getCourse(id); } } + + private static class CustomPrettyPrinter extends DefaultPrettyPrinter { + public CustomPrettyPrinter() { + super._arrayIndenter = new DefaultIndenter(); + super._objectFieldValueSeparatorWithSpaces = _separators.getObjectFieldValueSeparator() + " "; + super._arrayEmptySeparator = ""; + } + + @Override + public CustomPrettyPrinter createInstance() { + return new CustomPrettyPrinter(); + } + } } -- cgit v1.2.3 From 42fcc633ddc0e328561f984a6aa0b8593765dcf2 Mon Sep 17 00:00:00 2001 From: sowgro Date: Fri, 3 Oct 2025 21:52:50 -0400 Subject: minor project reorganization --- src/main/java/design/HelloWorld.java | 24 ---------------------- src/main/java/design/ParPal.java | 14 +++++++++++++ src/main/java/design/model/Course.java | 2 ++ src/main/java/design/model/ICourse.java | 16 --------------- .../design/model/course_search/CourseSorter.java | 1 - .../java/design/model/course_search/ICourse.java | 18 ++++++++++++++++ .../model/course_search/SortByDifficulty.java | 1 - .../design/model/course_search/SortByHoles.java | 1 - .../design/model/course_search/SortByLocation.java | 1 - .../design/model/course_search/SortByName.java | 1 - .../java/design/model/course_search/SortByPar.java | 1 - .../java/design/persistence/MasterDatabase.java | 2 +- .../java/design/persistence/PersonalDatabase.java | 2 +- 13 files changed, 36 insertions(+), 48 deletions(-) delete mode 100644 src/main/java/design/HelloWorld.java create mode 100644 src/main/java/design/ParPal.java delete mode 100644 src/main/java/design/model/ICourse.java create mode 100644 src/main/java/design/model/course_search/ICourse.java diff --git a/src/main/java/design/HelloWorld.java b/src/main/java/design/HelloWorld.java deleted file mode 100644 index 5e16cec..0000000 --- a/src/main/java/design/HelloWorld.java +++ /dev/null @@ -1,24 +0,0 @@ -package design; - -import design.model.Golfer; -import design.persistence.CSVMasterDatabase; -import design.persistence.JSONPersonalDatabase; -import design.persistence.MasterDatabase; -import design.persistence.PersonalDatabase; - -import java.io.IOException; - -public class HelloWorld { - public static void main(String[] args) throws IOException { - var mdb = MasterDatabase.INSTANCE; - var pdb = PersonalDatabase.INSTANCE; - -// Golfer g = new Golfer("Tyler Ferrari", "sowgro", "pass"); -// g.addCourse(mdb.getCourse(8)); -// -// pdb.addGolfer(g); - - System.out.println("done"); - - } -} diff --git a/src/main/java/design/ParPal.java b/src/main/java/design/ParPal.java new file mode 100644 index 0000000..db6891e --- /dev/null +++ b/src/main/java/design/ParPal.java @@ -0,0 +1,14 @@ +package design; + +import design.persistence.MasterDatabase; +import design.persistence.PersonalDatabase; + +public class ParPal { + public static void main(String[] args) { + var mdb = MasterDatabase.INSTANCE; + var pdb = PersonalDatabase.INSTANCE; + + System.out.println("done"); + + } +} diff --git a/src/main/java/design/model/Course.java b/src/main/java/design/model/Course.java index f90c8d9..f907622 100644 --- a/src/main/java/design/model/Course.java +++ b/src/main/java/design/model/Course.java @@ -1,5 +1,7 @@ package design.model; +import design.model.course_search.ICourse; + import java.util.List; public class Course implements ICourse { diff --git a/src/main/java/design/model/ICourse.java b/src/main/java/design/model/ICourse.java deleted file mode 100644 index fd171d3..0000000 --- a/src/main/java/design/model/ICourse.java +++ /dev/null @@ -1,16 +0,0 @@ -package design.model; - -import java.util.List; - -/* - * Defines the interface for courses to implement - * Willem Dalton - */ -public interface ICourse { - String getName(); - float getDifficultyRating(); - String getLocation(); - List getHoles(); - int getHoleCount(); - int getTotalPar(); -} diff --git a/src/main/java/design/model/course_search/CourseSorter.java b/src/main/java/design/model/course_search/CourseSorter.java index a3d1186..7549645 100644 --- a/src/main/java/design/model/course_search/CourseSorter.java +++ b/src/main/java/design/model/course_search/CourseSorter.java @@ -1,6 +1,5 @@ package design.model.course_search; -import design.model.*; import java.util.List; /* diff --git a/src/main/java/design/model/course_search/ICourse.java b/src/main/java/design/model/course_search/ICourse.java new file mode 100644 index 0000000..e50eb1b --- /dev/null +++ b/src/main/java/design/model/course_search/ICourse.java @@ -0,0 +1,18 @@ +package design.model.course_search; + +import design.model.Hole; + +import java.util.List; + +/* + * Defines the interface for courses to implement + * Willem Dalton + */ +public interface ICourse { + String getName(); + float getDifficultyRating(); + String getLocation(); + List getHoles(); + int getHoleCount(); + int getTotalPar(); +} diff --git a/src/main/java/design/model/course_search/SortByDifficulty.java b/src/main/java/design/model/course_search/SortByDifficulty.java index c006a40..8c3251c 100644 --- a/src/main/java/design/model/course_search/SortByDifficulty.java +++ b/src/main/java/design/model/course_search/SortByDifficulty.java @@ -1,6 +1,5 @@ package design.model.course_search; -import design.model.*; import java.util.List; import java.util.Comparator; diff --git a/src/main/java/design/model/course_search/SortByHoles.java b/src/main/java/design/model/course_search/SortByHoles.java index da98d4f..b1badab 100644 --- a/src/main/java/design/model/course_search/SortByHoles.java +++ b/src/main/java/design/model/course_search/SortByHoles.java @@ -1,6 +1,5 @@ package design.model.course_search; -import design.model.*; import java.util.List; import java.util.Comparator; diff --git a/src/main/java/design/model/course_search/SortByLocation.java b/src/main/java/design/model/course_search/SortByLocation.java index ae9bd8b..0d8a8d2 100644 --- a/src/main/java/design/model/course_search/SortByLocation.java +++ b/src/main/java/design/model/course_search/SortByLocation.java @@ -1,6 +1,5 @@ package design.model.course_search; -import design.model.*; import java.util.List; import java.util.Comparator; diff --git a/src/main/java/design/model/course_search/SortByName.java b/src/main/java/design/model/course_search/SortByName.java index 04625c6..2847d3e 100644 --- a/src/main/java/design/model/course_search/SortByName.java +++ b/src/main/java/design/model/course_search/SortByName.java @@ -1,6 +1,5 @@ package design.model.course_search; -import design.model.*; import java.util.List; import java.util.Comparator; diff --git a/src/main/java/design/model/course_search/SortByPar.java b/src/main/java/design/model/course_search/SortByPar.java index 2fa388c..9a3eaf9 100644 --- a/src/main/java/design/model/course_search/SortByPar.java +++ b/src/main/java/design/model/course_search/SortByPar.java @@ -1,6 +1,5 @@ package design.model.course_search; -import design.model.*; import java.util.List; import java.util.Comparator; diff --git a/src/main/java/design/persistence/MasterDatabase.java b/src/main/java/design/persistence/MasterDatabase.java index 2852349..ddc0434 100644 --- a/src/main/java/design/persistence/MasterDatabase.java +++ b/src/main/java/design/persistence/MasterDatabase.java @@ -3,7 +3,7 @@ package design.persistence; import design.model.Course; public interface MasterDatabase { - public static final MasterDatabase INSTANCE = new CSVMasterDatabase("data/golf_courses_1000.csv"); + MasterDatabase INSTANCE = new CSVMasterDatabase("data/golf_courses_1000.csv"); Course[] getCourses(); Course getCourse(int id); diff --git a/src/main/java/design/persistence/PersonalDatabase.java b/src/main/java/design/persistence/PersonalDatabase.java index 524263b..a045d59 100644 --- a/src/main/java/design/persistence/PersonalDatabase.java +++ b/src/main/java/design/persistence/PersonalDatabase.java @@ -5,7 +5,7 @@ import design.model.Golfer; import java.io.IOException; public interface PersonalDatabase { - public static final PersonalDatabase INSTANCE = new JSONPersonalDatabase("data/personaldb.json"); + PersonalDatabase INSTANCE = new JSONPersonalDatabase("data/personaldb.json"); Golfer[] getGolfers(); Golfer getGolfer(String name); -- cgit v1.2.3 From 4c485841954cb566d82b2e14a0cddf347a3d8e18 Mon Sep 17 00:00:00 2001 From: Michael Lizzio Date: Sun, 5 Oct 2025 03:37:44 -0400 Subject: Created holepaly in model --- src/main/java/design/model/holeplay/HoleCompleteState.java | 0 src/main/java/design/model/holeplay/HolePlayContext.java | 0 src/main/java/design/model/holeplay/HoleState.java | 0 src/main/java/design/model/holeplay/PlayState.java | 0 src/main/java/design/model/holeplay/SetupState.java | 0 5 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/java/design/model/holeplay/HoleCompleteState.java create mode 100644 src/main/java/design/model/holeplay/HolePlayContext.java create mode 100644 src/main/java/design/model/holeplay/HoleState.java create mode 100644 src/main/java/design/model/holeplay/PlayState.java create mode 100644 src/main/java/design/model/holeplay/SetupState.java diff --git a/src/main/java/design/model/holeplay/HoleCompleteState.java b/src/main/java/design/model/holeplay/HoleCompleteState.java new file mode 100644 index 0000000..e69de29 diff --git a/src/main/java/design/model/holeplay/HolePlayContext.java b/src/main/java/design/model/holeplay/HolePlayContext.java new file mode 100644 index 0000000..e69de29 diff --git a/src/main/java/design/model/holeplay/HoleState.java b/src/main/java/design/model/holeplay/HoleState.java new file mode 100644 index 0000000..e69de29 diff --git a/src/main/java/design/model/holeplay/PlayState.java b/src/main/java/design/model/holeplay/PlayState.java new file mode 100644 index 0000000..e69de29 diff --git a/src/main/java/design/model/holeplay/SetupState.java b/src/main/java/design/model/holeplay/SetupState.java new file mode 100644 index 0000000..e69de29 -- cgit v1.2.3 From fc8584b1defdbfeaf80ad3e0c7bdb9f53cf2929c Mon Sep 17 00:00:00 2001 From: Michael Lizzio Date: Sun, 5 Oct 2025 03:57:37 -0400 Subject: Completed first take of holeplay logic and added empty test files --- .../design/model/holeplay/HoleCompleteState.java | 28 ++++++++ .../design/model/holeplay/HolePlayContext.java | 84 ++++++++++++++++++++++ src/main/java/design/model/holeplay/HoleState.java | 15 ++++ src/main/java/design/model/holeplay/PlayState.java | 31 ++++++++ .../java/design/model/holeplay/SetupState.java | 32 +++++++++ .../model/holeplay/HoleCompleteStateTest.java | 5 ++ .../design/model/holeplay/HolePlayContextTest.java | 5 ++ .../java/design/model/holeplay/HoleStateTest.java | 6 ++ .../java/design/model/holeplay/PlayStateTest.java | 6 ++ .../java/design/model/holeplay/SetupStateTest.java | 7 ++ 10 files changed, 219 insertions(+) create mode 100644 src/test/java/design/model/holeplay/HoleCompleteStateTest.java create mode 100644 src/test/java/design/model/holeplay/HolePlayContextTest.java create mode 100644 src/test/java/design/model/holeplay/HoleStateTest.java create mode 100644 src/test/java/design/model/holeplay/PlayStateTest.java create mode 100644 src/test/java/design/model/holeplay/SetupStateTest.java diff --git a/src/main/java/design/model/holeplay/HoleCompleteState.java b/src/main/java/design/model/holeplay/HoleCompleteState.java index e69de29..958fe5f 100644 --- a/src/main/java/design/model/holeplay/HoleCompleteState.java +++ b/src/main/java/design/model/holeplay/HoleCompleteState.java @@ -0,0 +1,28 @@ +package design.model.holeplay; + +public class HoleCompleteState implements HoleState { + @Override + public void enter(HolePlayContext ctx) { + /* compute summaries if needed */ } + + @Override + public void handleStart(HolePlayContext ctx) { + // optional: treat this as “Next Hole” + ctx.setState(new SetupState()); + } + + @Override + public void handleShot(HolePlayContext ctx, design.model.Club club, Integer distanceYds) { + throw new IllegalStateException("Hole is complete; start next hole."); + } + + @Override + public void handleHoleOut(HolePlayContext ctx) { + throw new IllegalStateException("Already holed out."); + } + + @Override + public String name() { + return "HoleCompleteState"; + } +} diff --git a/src/main/java/design/model/holeplay/HolePlayContext.java b/src/main/java/design/model/holeplay/HolePlayContext.java index e69de29..7445073 100644 --- a/src/main/java/design/model/holeplay/HolePlayContext.java +++ b/src/main/java/design/model/holeplay/HolePlayContext.java @@ -0,0 +1,84 @@ +package design.model.holeplay; + +import design.model.*; +import design.persistence.PersonalDatabase; + +public class HolePlayContext { + private final Golfer golfer; + private final Round round; + private final PersonalDatabase pdb; + + private HoleState state; + private Play currentPlay; + private int strokes; + private int distanceRemainingYds; + + public HolePlayContext(Golfer golfer, Round round, PersonalDatabase pdb) { + this.golfer = golfer; + this.round = round; + this.pdb = pdb; + setState(new SetupState()); + } + + public void setState(HoleState next) { + this.state = next; + next.enter(this); + } + + // API the PTUI/Commands will call: + public void startHole() { + state.handleStart(this); + } + + public void recordShot(Club club, Integer distanceYds) { + state.handleShot(this, club, distanceYds); + } + + public void holeOut() { + state.handleHoleOut(this); + } + + // package-private helpers the states use: + void beginNewPlay(int holeNumber, int par) { + /* create Play, reset counters */ } + + void addSwing(Club club, Integer distanceYds) { + /* add Swing to currentPlay; strokes++; distanceRemainingYds -= distanceYds */ } + + void finalizePlayAndPersist() { + /* round.addPlay(currentPlay); currentPlay=null; pdb.updateGolfer(golfer); */ } + + // getters you’ll want: + public Golfer getGolfer() { + return golfer; + } + + public Round getRound() { + return round; + } + + public Play getCurrentPlay() { + return currentPlay; + } + + public int getStrokes() { + return strokes; + } + + public int getDistanceRemainingYds() { + return distanceRemainingYds; + } + + // setters used internally + void setCurrentPlay(Play p) { + this.currentPlay = p; + } + + void setStrokes(int s) { + this.strokes = s; + } + + void setDistanceRemainingYds(int d) { + this.distanceRemainingYds = d; + } +} \ No newline at end of file diff --git a/src/main/java/design/model/holeplay/HoleState.java b/src/main/java/design/model/holeplay/HoleState.java index e69de29..ec0618f 100644 --- a/src/main/java/design/model/holeplay/HoleState.java +++ b/src/main/java/design/model/holeplay/HoleState.java @@ -0,0 +1,15 @@ +package design.model.holeplay; + +import design.model.Club; + +public interface HoleState { + void enter(HolePlayContext ctx); + + void handleStart(HolePlayContext ctx); + + void handleShot(HolePlayContext ctx, Club club, Integer distanceYds); // distance may be null + + void handleHoleOut(HolePlayContext ctx); + + String name(); +} \ No newline at end of file diff --git a/src/main/java/design/model/holeplay/PlayState.java b/src/main/java/design/model/holeplay/PlayState.java index e69de29..e41af6b 100644 --- a/src/main/java/design/model/holeplay/PlayState.java +++ b/src/main/java/design/model/holeplay/PlayState.java @@ -0,0 +1,31 @@ +package design.model.holeplay; + +import design.model.Club; + +public class PlayState implements HoleState { + @Override + public void enter(HolePlayContext ctx) { + /* no-op */ } + + @Override + public void handleStart(HolePlayContext ctx) { + throw new IllegalStateException("Hole already started."); + } + + @Override + public void handleShot(HolePlayContext ctx, Club club, Integer distanceYds) { + ctx.addSwing(club, distanceYds); + // remain in PlayState + } + + @Override + public void handleHoleOut(HolePlayContext ctx) { + ctx.finalizePlayAndPersist(); + ctx.setState(new HoleCompleteState()); + } + + @Override + public String name() { + return "PlayState"; + } +} diff --git a/src/main/java/design/model/holeplay/SetupState.java b/src/main/java/design/model/holeplay/SetupState.java index e69de29..2715e7c 100644 --- a/src/main/java/design/model/holeplay/SetupState.java +++ b/src/main/java/design/model/holeplay/SetupState.java @@ -0,0 +1,32 @@ +package design.model.holeplay; + +import design.model.Hole; + +public class SetupState implements HoleState { + @Override + public void enter(HolePlayContext ctx) { + /* no-op */ } + + @Override + public void handleStart(HolePlayContext ctx) { + // Pull current hole number & par from Round/Course + Hole start = ctx.getRound().getStartingHole(); // or compute from current-hole tracking if you add it + ctx.beginNewPlay(start.getNumber(), start.getPar()); + ctx.setState(new PlayState()); + } + + @Override + public void handleShot(HolePlayContext ctx, design.model.Club club, Integer distanceYds) { + throw new IllegalStateException("Cannot record a shot during setup."); + } + + @Override + public void handleHoleOut(HolePlayContext ctx) { + throw new IllegalStateException("Cannot hole out during setup."); + } + + @Override + public String name() { + return "SetupState"; + } +} diff --git a/src/test/java/design/model/holeplay/HoleCompleteStateTest.java b/src/test/java/design/model/holeplay/HoleCompleteStateTest.java new file mode 100644 index 0000000..71d72b8 --- /dev/null +++ b/src/test/java/design/model/holeplay/HoleCompleteStateTest.java @@ -0,0 +1,5 @@ +package design.model.holeplay; + +public class HoleCompleteStateTest { + +} diff --git a/src/test/java/design/model/holeplay/HolePlayContextTest.java b/src/test/java/design/model/holeplay/HolePlayContextTest.java new file mode 100644 index 0000000..de0f1e9 --- /dev/null +++ b/src/test/java/design/model/holeplay/HolePlayContextTest.java @@ -0,0 +1,5 @@ +package design.model.holeplay; + +public class HolePlayContextTest { + +} \ No newline at end of file diff --git a/src/test/java/design/model/holeplay/HoleStateTest.java b/src/test/java/design/model/holeplay/HoleStateTest.java new file mode 100644 index 0000000..27200e5 --- /dev/null +++ b/src/test/java/design/model/holeplay/HoleStateTest.java @@ -0,0 +1,6 @@ +package design.model.holeplay; + +import design.model.Club; + +public interface HoleStateTest { +} \ No newline at end of file diff --git a/src/test/java/design/model/holeplay/PlayStateTest.java b/src/test/java/design/model/holeplay/PlayStateTest.java new file mode 100644 index 0000000..8548461 --- /dev/null +++ b/src/test/java/design/model/holeplay/PlayStateTest.java @@ -0,0 +1,6 @@ +package design.model.holeplay; + +import design.model.Club; + +public class PlayStateTest { +} diff --git a/src/test/java/design/model/holeplay/SetupStateTest.java b/src/test/java/design/model/holeplay/SetupStateTest.java new file mode 100644 index 0000000..ff97464 --- /dev/null +++ b/src/test/java/design/model/holeplay/SetupStateTest.java @@ -0,0 +1,7 @@ +package design.model.holeplay; + +import design.model.Hole; + +public class SetupStateTest { + +} -- cgit v1.2.3 From 40470b1788c28f1c95bba7339dd9819b0e9b95cc Mon Sep 17 00:00:00 2001 From: Michael Lizzio Date: Sun, 5 Oct 2025 05:29:38 -0400 Subject: Updated logic and completed holeplay subsystem --- .gitignore | 3 ++ data/personaldb.json | 37 +++++++++++++- src/main/java/design/model/Golfer.java | 10 ++++ src/main/java/design/model/Hole.java | 3 ++ src/main/java/design/model/Play.java | 25 ++++++---- src/main/java/design/model/Round.java | 17 +++++++ .../design/model/holeplay/HolePlayContext.java | 56 ++++++++++++++++------ .../java/design/model/holeplay/SetupState.java | 9 ++-- 8 files changed, 133 insertions(+), 27 deletions(-) diff --git a/.gitignore b/.gitignore index 65dbea6..7750ed4 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,6 @@ target/** # Ignore tool files .vscode + +# Ignore helper dev python files +*.py \ No newline at end of file diff --git a/data/personaldb.json b/data/personaldb.json index 0637a08..069f15b 100644 --- a/data/personaldb.json +++ b/data/personaldb.json @@ -1 +1,36 @@ -[] \ No newline at end of file +[ + { + "username": "happy", + "passwordHash": 1234567890, + "fullName": "Happy Gilmore", + "rounds": [ + { + "dateTime": "2025-10-02T14:35:00", + "startingHole": { "number": 1, "par": 4 }, + "plays": [ + { + "distance": 260, + "swings": [ + { + "distance": 240, + "clubUsed": { + "manufacture": "Titleist", + "nickname": "Big Dog", + "clubType": "Driver" + } + }, + { + "distance": 20, + "clubUsed": { + "manufacture": "Cleveland", + "nickname": "RTX ZipCore", + "clubType": "SandWedge" + } + } + ] + } + ] + } + ] + } +] diff --git a/src/main/java/design/model/Golfer.java b/src/main/java/design/model/Golfer.java index 04ad8bc..19d6ac6 100644 --- a/src/main/java/design/model/Golfer.java +++ b/src/main/java/design/model/Golfer.java @@ -11,6 +11,7 @@ public class Golfer { private String fullName; private final List courses; private final List rounds; + private final List clubs = new ArrayList<>(); // Keep track of golfer's clubs @JsonCreator private Golfer(String username, int passwordHash, String fullName, List courses, List rounds) { @@ -72,4 +73,13 @@ public class Golfer { public void addRound(Round round) { rounds.add(round); } + + // Helpers dealing with clubs + public void addClub(Club c) { + clubs.add(c); + } + + public boolean hasClub(Club c) { + return clubs.contains(c); + } } diff --git a/src/main/java/design/model/Hole.java b/src/main/java/design/model/Hole.java index bc9fdb9..23dc783 100644 --- a/src/main/java/design/model/Hole.java +++ b/src/main/java/design/model/Hole.java @@ -3,6 +3,7 @@ package design.model; public class Hole { private final int number; private final int par; + // TODO: Maybe add a yardage interger var public Hole(int number, int par) { this.number = number; @@ -16,4 +17,6 @@ public class Hole { public int getPar() { return par; } + + // TODO: Maybe add a get yardage method } diff --git a/src/main/java/design/model/Play.java b/src/main/java/design/model/Play.java index ca6dac2..2e083b9 100644 --- a/src/main/java/design/model/Play.java +++ b/src/main/java/design/model/Play.java @@ -6,22 +6,22 @@ import java.util.ArrayList; import java.util.List; public class Play { - private final int distance; + private int holeNumber; private final List swings; @JsonCreator - private Play(int distance, List swings) { - this.distance = distance; - this.swings = swings; + public Play(int holeNumber, List swings) { + this.holeNumber = holeNumber; + this.swings = (swings != null) ? swings : new ArrayList<>(); } - public Play(int distance) { + public Play(int holeNumber) { + this.holeNumber = holeNumber; this.swings = new ArrayList<>(); - this.distance = distance; } - public int getDistance() { - return distance; + public int getHoleNumber() { + return holeNumber; } public void addSwing(Swing swing) { @@ -35,4 +35,13 @@ public class Play { public int getSwingCount() { return swings.size(); } + + // Returns the sum of all swing distances + public int getDistance() { + int total = 0; + for (Swing s : swings) { + total += s.getDistance(); + } + return total; + } } diff --git a/src/main/java/design/model/Round.java b/src/main/java/design/model/Round.java index 048a21a..bc4914e 100644 --- a/src/main/java/design/model/Round.java +++ b/src/main/java/design/model/Round.java @@ -11,6 +11,7 @@ public class Round { private final LocalDateTime dateTime; private final Hole startingHole; private final List plays; + private int currentHoleIndex; @JsonCreator private Round(Course course, LocalDateTime dateTime, Hole startingHole, List plays) { @@ -18,6 +19,9 @@ public class Round { this.dateTime = dateTime; this.startingHole = startingHole; this.plays = plays; + // Allows the golfer to start anywhere on the course. Helps HolePalyContext be + // simpler. + this.currentHoleIndex = Math.max(0, startingHole.getNumber() - 1); } public Round(Course course, LocalDateTime dateTime, Hole startingHole) { @@ -25,6 +29,9 @@ public class Round { this.dateTime = dateTime; this.startingHole = startingHole; plays = new ArrayList<>(); + // Allows the golfer to start anywhere on the course. Helps HolePalyContext be + // simpler. + this.currentHoleIndex = Math.max(0, startingHole.getNumber() - 1); } public int getTotalSwings() { @@ -52,4 +59,14 @@ public class Round { public void addPlay(Play play) { plays.add(play); } + + // Current hole + public Hole getCurrentHole() { + return course.getHoles().get(currentHoleIndex); + } + + // Handles wraparound too + public void nextHole() { + currentHoleIndex = (currentHoleIndex + 1) % course.getHoleCount(); + } } diff --git a/src/main/java/design/model/holeplay/HolePlayContext.java b/src/main/java/design/model/holeplay/HolePlayContext.java index 7445073..7a5d8ef 100644 --- a/src/main/java/design/model/holeplay/HolePlayContext.java +++ b/src/main/java/design/model/holeplay/HolePlayContext.java @@ -1,5 +1,8 @@ package design.model.holeplay; +import java.io.IOException; +import java.util.ArrayList; + import design.model.*; import design.persistence.PersonalDatabase; @@ -11,7 +14,6 @@ public class HolePlayContext { private HoleState state; private Play currentPlay; private int strokes; - private int distanceRemainingYds; public HolePlayContext(Golfer golfer, Round round, PersonalDatabase pdb) { this.golfer = golfer; @@ -38,15 +40,49 @@ public class HolePlayContext { state.handleHoleOut(this); } - // package-private helpers the states use: - void beginNewPlay(int holeNumber, int par) { - /* create Play, reset counters */ } + void beginNewPlay(int holeNumber) { + this.currentPlay = new Play(holeNumber); + this.strokes = 0; + } void addSwing(Club club, Integer distanceYds) { - /* add Swing to currentPlay; strokes++; distanceRemainingYds -= distanceYds */ } + // Checks golfer owns club maybe not necessary + // if (golfer.hasClub(club)) { + // throw new IllegalArgumentException("Club not in golfer's bag"); + // } + int d = (distanceYds == null ? 0 : distanceYds); + this.currentPlay.addSwing(new Swing(d, club)); + this.strokes++; + + } void finalizePlayAndPersist() { - /* round.addPlay(currentPlay); currentPlay=null; pdb.updateGolfer(golfer); */ } + round.addPlay(currentPlay); + round.nextHole(); + currentPlay = null; + strokes = 0; + // Not sure if try catch is necessary + try { + pdb.updateGolfer(golfer); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + + public void clearInProgressPlay() { + this.setCurrentPlay(null); + this.setStrokes(0); + } + + public void endRoundNow() { + try { + pdb.updateGolfer(golfer); // persist whatever’s done so far + } catch (IOException e) { + e.printStackTrace(); + } + setState(new SetupState()); + } // getters you’ll want: public Golfer getGolfer() { @@ -65,10 +101,6 @@ public class HolePlayContext { return strokes; } - public int getDistanceRemainingYds() { - return distanceRemainingYds; - } - // setters used internally void setCurrentPlay(Play p) { this.currentPlay = p; @@ -77,8 +109,4 @@ public class HolePlayContext { void setStrokes(int s) { this.strokes = s; } - - void setDistanceRemainingYds(int d) { - this.distanceRemainingYds = d; - } } \ No newline at end of file diff --git a/src/main/java/design/model/holeplay/SetupState.java b/src/main/java/design/model/holeplay/SetupState.java index 2715e7c..d49ea0e 100644 --- a/src/main/java/design/model/holeplay/SetupState.java +++ b/src/main/java/design/model/holeplay/SetupState.java @@ -3,15 +3,16 @@ package design.model.holeplay; import design.model.Hole; public class SetupState implements HoleState { + @Override public void enter(HolePlayContext ctx) { - /* no-op */ } + ctx.clearInProgressPlay(); // Maybe we don't need this? + } @Override public void handleStart(HolePlayContext ctx) { - // Pull current hole number & par from Round/Course - Hole start = ctx.getRound().getStartingHole(); // or compute from current-hole tracking if you add it - ctx.beginNewPlay(start.getNumber(), start.getPar()); + Hole hole = ctx.getRound().getCurrentHole(); + ctx.beginNewPlay(hole.getNumber()); ctx.setState(new PlayState()); } -- cgit v1.2.3