diff --git a/src/java/lodge/data/AccountList.java b/src/java/lodge/data/AccountList.java index b033173..d238f14 100644 --- a/src/java/lodge/data/AccountList.java +++ b/src/java/lodge/data/AccountList.java @@ -30,6 +30,7 @@ public class AccountList extends ArrayList { } } } catch (DuplicateObjectException e) { + System.out.println(String.format("%s", e.getMessage())); return false; } return super.add(account); diff --git a/src/java/lodge/data/AccountReservationList.java b/src/java/lodge/data/AccountReservationList.java index 91b08c5..b962715 100644 --- a/src/java/lodge/data/AccountReservationList.java +++ b/src/java/lodge/data/AccountReservationList.java @@ -18,6 +18,8 @@ class AccountReservationList extends ArrayList { @Override public synchronized boolean add(final IReservation reservation) throws RuntimeException { boolean result = true; + ((Reservation) reservation) + .setReservation_number(AccountReservationList.reservationSerial((Reservation) reservation)); Reservation rsrv = this.find(reservation.getReservation_number()); result = rsrv == null; if (!result) { @@ -27,8 +29,6 @@ class AccountReservationList extends ArrayList { result = ((IReservation) reservation).checkValid(); if (result) { - ((Reservation) reservation) - .setReservation_number(AccountReservationList.reservationSerial((Reservation) reservation)); ((Reservation) reservation).setPrice(reservation.calculatePrice()); result = super.add(reservation); } else { diff --git a/src/resources/acc-A1450981765.json b/src/resources/acc-A1450981765.json old mode 100755 new mode 100644 diff --git a/src/resources/acc-A2074212339.json b/src/resources/acc-A2074212339.json old mode 100755 new mode 100644 diff --git a/src/resources/rsv-R0123087344.json b/src/resources/rsv-R0123087344.json old mode 100755 new mode 100644 index 48af0e9..f174413 --- a/src/resources/rsv-R0123087344.json +++ b/src/resources/rsv-R0123087344.json @@ -1,33 +1 @@ -{ - "HotelReservation": { - "reservation_type": "HotelReservation", - "reservation_number": "R0123087344", - "reservation_status": "Canceled", - "reservation_start_date": "2025-09-05T10:00Z[UTC]", - "reservation_end_date": "2025-09-09T10:00Z[UTC]", - "account_number": "A2074212339", - "physical_address": { - "Address": { - "street": "400 hotel ave", - "city": "Maryland City", - "state": "MD", - "zip": "20723" - } - }, - "mailing_address": { - "Address": { - "street": "400 hotel ave", - "city": "Maryland City", - "state": "MD", - "zip": "20723" - } - }, - "kitchen": "Kitchenette", - "numberOfBeds": "2", - "numberOfBedRooms": "1", - "numberOfBathRooms": "1", - "numberOfFloors": "1", - "squareFeet": "450", - "price": "410.0" - } -} \ No newline at end of file +{ "HotelReservation":{"reservation_type": "HotelReservation","reservation_number": "R0123087344","reservation_status": "Canceled","reservation_start_date": "2025-09-05T10:00Z[UTC]","reservation_end_date": "2025-09-09T10:00Z[UTC]","account_number": "A2074212339","physical_address": { "Address":{"street": "400 hotel ave","city": "Maryland City","state": "MD","zip": "20723"}},"mailing_address": { "Address":{"street": "400 hotel ave","city": "Maryland City","state": "MD","zip": "20723"}},"kitchen": "Kitchenette","numberOfBeds": "2","numberOfBedRooms": "1","numberOfBathRooms": "1","numberOfFloors": "1","squareFeet": "450","price": "410.0"}} \ No newline at end of file diff --git a/src/resources/rsv-R0499811708.json b/src/resources/rsv-R0499811708.json old mode 100755 new mode 100644 index 5aecfb4..d09837e --- a/src/resources/rsv-R0499811708.json +++ b/src/resources/rsv-R0499811708.json @@ -1,33 +1 @@ -{ - "HouseReservation": { - "reservation_type": "HouseReservation", - "reservation_number": "R0499811708", - "reservation_status": "Draft", - "reservation_start_date": "2025-09-05T10:00Z[UTC]", - "reservation_end_date": "2025-09-09T10:00Z[UTC]", - "account_number": "A1450981765", - "physical_address": { - "Address": { - "street": "3000 Osage ave", - "city": "GreenBelt", - "state": "MD", - "zip": "20740" - } - }, - "mailing_address": { - "Address": { - "street": "40012 College ave", - "city": "College Park", - "state": "MD", - "zip": "20740" - } - }, - "kitchen": "Kitchenette", - "numberOfBeds": "2", - "numberOfBedRooms": "1", - "numberOfBathRooms": "1", - "numberOfFloors": "1", - "squareFeet": "450", - "price": "360.0" - } -} \ No newline at end of file +{ "HouseReservation":{"reservation_type": "HouseReservation","reservation_number": "R0499811708","reservation_status": "Draft","reservation_start_date": "2025-09-05T10:00Z[UTC]","reservation_end_date": "2025-09-09T10:00Z[UTC]","account_number": "A1450981765","physical_address": { "Address":{"street": "3000 Osage ave","city": "GreenBelt","state": "MD","zip": "20740"}},"mailing_address": { "Address":{"street": "40012 College ave","city": "College Park","state": "MD","zip": "20740"}},"kitchen": "Kitchenette","numberOfBeds": "2","numberOfBedRooms": "1","numberOfBathRooms": "1","numberOfFloors": "1","squareFeet": "450","price": "360.0"}} \ No newline at end of file diff --git a/src/resources/rsv-R0535276622.json b/src/resources/rsv-R0535276622.json old mode 100755 new mode 100644 diff --git a/src/resources/rsv-R2042828431.json b/src/resources/rsv-R2042828431.json old mode 100755 new mode 100644