diff options
Diffstat (limited to '')
23 files changed, 541 insertions, 28 deletions
diff --git a/src/main/java/design/HelloWorld.java b/src/main/java/design/HelloWorld.java deleted file mode 100644 index ea552f9..0000000 --- a/src/main/java/design/HelloWorld.java +++ /dev/null @@ -1,7 +0,0 @@ -package design; - -public class HelloWorld { - public static void main(String[] args) { - System.out.println("Hello, World!"); - } -} 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 8dfecd8..f907622 100644 --- a/src/main/java/design/model/Course.java +++ b/src/main/java/design/model/Course.java @@ -1,8 +1,12 @@ package design.model; +import design.model.course_search.ICourse; + 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 +14,8 @@ public class Course implements ICourse { private final int totalPar; private final List<Hole> holes; - public Course(String name, int difficultyRating, String location, int holeCount, int totalPar, List<Hole> holes) { + public Course(int id, String name, int difficultyRating, String location, int holeCount, int totalPar, List<Hole> holes) { + this.id = id; this.name = name; this.difficultyRating = difficultyRating; this.location = location; @@ -19,6 +24,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..19d6ac6 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; @@ -7,15 +9,25 @@ public class Golfer { private String username; private int passwordHash; private String fullName; - private final transient List<Course> courses; // might be better to make this like a courseID or something + private final List<Course> courses; private final List<Round> rounds; + private final List<Club> clubs = new ArrayList<>(); // Keep track of golfer's clubs + + @JsonCreator + private Golfer(String username, int passwordHash, String fullName, List<Course> courses, List<Round> 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() { @@ -62,5 +74,12 @@ public class Golfer { 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..f79cc3d 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,15 @@ public class Hole { public int getPar() { return par; } + + @Override + public boolean equals(Object obj){ + if(!(obj instanceof Hole)){ + return false; + } + Hole object = (Hole)obj; + return (object.getNumber() == this.getNumber() && object.getPar() == this.getPar()); + } + + // 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 033de0f..2e083b9 100644 --- a/src/main/java/design/model/Play.java +++ b/src/main/java/design/model/Play.java @@ -1,19 +1,27 @@ package design.model; +import com.fasterxml.jackson.annotation.JsonCreator; + import java.util.ArrayList; import java.util.List; public class Play { - private final double distance; + private int holeNumber; private final List<Swing> swings; - public Play(int distance) { + @JsonCreator + public Play(int holeNumber, List<Swing> swings) { + this.holeNumber = holeNumber; + this.swings = (swings != null) ? swings : new ArrayList<>(); + } + + public Play(int holeNumber) { + this.holeNumber = holeNumber; this.swings = new ArrayList<>(); - this.distance = distance; } - public double getDistance() { - return distance; + public int getHoleNumber() { + return holeNumber; } public void addSwing(Swing swing) { @@ -27,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 9cc1462..e4442d3 100644 --- a/src/main/java/design/model/Round.java +++ b/src/main/java/design/model/Round.java @@ -1,20 +1,37 @@ package design.model; +import com.fasterxml.jackson.annotation.JsonCreator; + import java.time.LocalDateTime; 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<Play> plays; + private int currentHoleIndex; + + @JsonCreator + private Round(Course course, LocalDateTime dateTime, Hole startingHole, List<Play> plays) { + this.course = course; + 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) { this.course = course; 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() { @@ -48,4 +65,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/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/ICourse.java b/src/main/java/design/model/course_search/ICourse.java index fd171d3..e50eb1b 100644 --- a/src/main/java/design/model/ICourse.java +++ b/src/main/java/design/model/course_search/ICourse.java @@ -1,4 +1,6 @@ -package design.model; +package design.model.course_search; + +import design.model.Hole; import java.util.List; 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/model/holeplay/HoleCompleteState.java b/src/main/java/design/model/holeplay/HoleCompleteState.java new file mode 100644 index 0000000..958fe5f --- /dev/null +++ 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 new file mode 100644 index 0000000..7a5d8ef --- /dev/null +++ b/src/main/java/design/model/holeplay/HolePlayContext.java @@ -0,0 +1,112 @@ +package design.model.holeplay; + +import java.io.IOException; +import java.util.ArrayList; + +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; + + 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); + } + + void beginNewPlay(int holeNumber) { + this.currentPlay = new Play(holeNumber); + this.strokes = 0; + } + + void addSwing(Club club, Integer 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); + 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() { + return golfer; + } + + public Round getRound() { + return round; + } + + public Play getCurrentPlay() { + return currentPlay; + } + + public int getStrokes() { + return strokes; + } + + // setters used internally + void setCurrentPlay(Play p) { + this.currentPlay = p; + } + + void setStrokes(int s) { + this.strokes = s; + } +}
\ 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 new file mode 100644 index 0000000..ec0618f --- /dev/null +++ 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 new file mode 100644 index 0000000..e41af6b --- /dev/null +++ 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 new file mode 100644 index 0000000..d49ea0e --- /dev/null +++ b/src/main/java/design/model/holeplay/SetupState.java @@ -0,0 +1,33 @@ +package design.model.holeplay; + +import design.model.Hole; + +public class SetupState implements HoleState { + + @Override + public void enter(HolePlayContext ctx) { + ctx.clearInProgressPlay(); // Maybe we don't need this? + } + + @Override + public void handleStart(HolePlayContext ctx) { + Hole hole = ctx.getRound().getCurrentHole(); + ctx.beginNewPlay(hole.getNumber()); + 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/main/java/design/persistence/CSVMasterDatabase.java b/src/main/java/design/persistence/CSVMasterDatabase.java new file mode 100644 index 0000000..fe89191 --- /dev/null +++ b/src/main/java/design/persistence/CSVMasterDatabase.java @@ -0,0 +1,83 @@ +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<Course> cache; + private final CsvMapper mapper; + private final File file; + + public CSVMasterDatabase(String filename) { + 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); + + try { + load(); + } catch (IOException ex) { + throw new RuntimeException(ex); + } + } + + public void load() throws IOException { + MappingIterator<Course> 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(int id) { + return cache.get(id); + } + + private static class CourseDeserializer extends JsonDeserializer<Course> { + 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(); + 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<Hole> 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(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 new file mode 100644 index 0000000..0efa362 --- /dev/null +++ b/src/main/java/design/persistence/JSONPersonalDatabase.java @@ -0,0 +1,118 @@ +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 java.io.File; +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; + +public class JSONPersonalDatabase implements PersonalDatabase { + + private final Map<String, Golfer> cache; + private final ObjectMapper mapper; + private final File file; + + public JSONPersonalDatabase(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()); + 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); + } + } + + 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.writer(new CustomPrettyPrinter()).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(); + } + + private static class CourseIdSerializer extends JsonSerializer<Course> { + @Override + public void serialize(Course course, JsonGenerator gen, SerializerProvider serializers) throws IOException { + gen.writeNumber(course.getId()); + } + } + + private static class CourseIdDeserializer extends JsonDeserializer<Course> { + MasterDatabase masterDB = MasterDatabase.INSTANCE; + + @Override + public Course deserialize(JsonParser p, DeserializationContext context) throws IOException { + int id = p.getValueAsInt(); + 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(); + } + } +} diff --git a/src/main/java/design/persistence/MasterDatabase.java b/src/main/java/design/persistence/MasterDatabase.java index 9dcfc1f..ddc0434 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 { + 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 e1023cf..a045d59 100644 --- a/src/main/java/design/persistence/PersonalDatabase.java +++ b/src/main/java/design/persistence/PersonalDatabase.java @@ -2,10 +2,14 @@ package design.persistence; import design.model.Golfer; +import java.io.IOException; + public interface PersonalDatabase { + PersonalDatabase INSTANCE = new JSONPersonalDatabase("data/personaldb.json"); + 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; } |