diff --git a/bin/main/lodge/reservationsystem/Account.class b/bin/main/lodge/reservationsystem/Account.class index 10bd66c..e83e575 100644 Binary files a/bin/main/lodge/reservationsystem/Account.class and b/bin/main/lodge/reservationsystem/Account.class differ diff --git a/bin/main/lodge/reservationsystem/Reservation.class b/bin/main/lodge/reservationsystem/Reservation.class index 384593b..077cd73 100644 Binary files a/bin/main/lodge/reservationsystem/Reservation.class and b/bin/main/lodge/reservationsystem/Reservation.class differ diff --git a/src/java/lodge/reservationsystem/Account.java b/src/java/lodge/reservationsystem/Account.java index a9ebce3..63f1649 100644 --- a/src/java/lodge/reservationsystem/Account.java +++ b/src/java/lodge/reservationsystem/Account.java @@ -48,6 +48,7 @@ public class Account { return reservation_list.add(rsrv); } + // @TODO Write Account out in JSON public static void Write(Account acct) throws IOException { String dataRoot = DataRepository.getPath(); @@ -58,6 +59,10 @@ public class Account { writer.write(acct.toString()); writer.flush(); } + + for (Reservation r: acct.reservation_list){ + r.Write(r); + } } public String account_number() { diff --git a/src/java/lodge/reservationsystem/Reservation.java b/src/java/lodge/reservationsystem/Reservation.java index a0935aa..dad7a51 100644 --- a/src/java/lodge/reservationsystem/Reservation.java +++ b/src/java/lodge/reservationsystem/Reservation.java @@ -175,7 +175,7 @@ public abstract class Reservation{ public String toString() { StringBuilder sb = new StringBuilder(); - sb.append("{ \"Reservation\":{"); + sb.append(String.format("{ \"%s\":{", ReservationType())); sb.append("\"reservation_type\": \"" + ReservationType() + "\","); sb.append("\"reservation_number\": \"" + reservation_number + "\","); sb.append("\"reservation_status\": \"" + reservation_status + "\","); @@ -200,7 +200,7 @@ public abstract class Reservation{ Path path = Paths.get(dataRoot); try (BufferedWriter writer = Files.newBufferedWriter(path, StandardCharsets.UTF_8)) { - writer.write(super.toString()); + writer.write(toString()); writer.flush(); } } diff --git a/src/resources/rsv-R0000000062.json b/src/resources/rsv-R0000000062.json new file mode 100644 index 0000000..4ef8b90 --- /dev/null +++ b/src/resources/rsv-R0000000062.json @@ -0,0 +1 @@ +{ "HotelReservation":{"reservation_type": "HotelReservation","reservation_number": "R0000000062","reservation_status": "Canceled","reservation_start_date": "null","reservation_start_date": "null","physical_address": "{ "Address":{"street": "30 cabin ave","city": "Carnelian","state": "CA","zip": "96140"}}","mailing_address": "{ "Address":{"street": "40 cabin ave","city": "Carnelian Bay","state": "CA","zip": "96140"}}","numberOfBeds": "4","numberOfBedRooms": "3","numberOfBathRooms": "1","numberOfFloors": "2","squareFeet": "806","price": "120.0"}} \ No newline at end of file diff --git a/src/resources/rsv-R000000062.json b/src/resources/rsv-R000000062.json deleted file mode 100644 index fdd80ad..0000000 --- a/src/resources/rsv-R000000062.json +++ /dev/null @@ -1,5 +0,0 @@ -{"CabinReservation": { - - "reservation_number":"R000000062" - - }} \ No newline at end of file