4 files changed, 41 insertions, 7 deletions

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<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 +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..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;
 
@@ -7,15 +9,24 @@ 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;
 
+    @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() {
@@ -61,6 +72,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..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,6 +9,12 @@ public class Play {
     private final int distance;
     private final List<Swing> swings;
 
+    @JsonCreator
+    private Play(int distance, List<Swing> 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..048a21a 100644
--- a/src/main/java/design/model/Round.java
+++ b/src/main/java/design/model/Round.java
@@ -1,15 +1,25 @@
 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;
 
+    @JsonCreator
+    private Round(Course course, LocalDateTime dateTime, Hole startingHole, List<Play> 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;