diff --git a/src/main/java/lodge/datamodel/AccountReservationList.java b/src/main/java/lodge/datamodel/AccountReservationList.java index 2c2458e..210af06 100755 --- a/src/main/java/lodge/datamodel/AccountReservationList.java +++ b/src/main/java/lodge/datamodel/AccountReservationList.java @@ -12,7 +12,7 @@ class AccountReservationList extends ArrayList { String serial = String.format("%010d", Math.abs(java.util.Objects.hash(reservation.getPhysical_address()))); int e = serial.length(); int s = e - 10; - serial = serial.substring(s, e-1); + serial = serial.substring(s, e); return String.format("R%s", serial); } diff --git a/src/main/java/lodge/datamodel/IReservation.java b/src/main/java/lodge/datamodel/IReservation.java index 5f5083b..3a8f287 100644 --- a/src/main/java/lodge/datamodel/IReservation.java +++ b/src/main/java/lodge/datamodel/IReservation.java @@ -1,3 +1,7 @@ +/** + * license: GPLv3 + reservationsystem +*/ package lodge.datamodel; public interface IReservation { diff --git a/src/resources/acc-A07421233.json b/src/resources/acc-A07421233.json index f3a54f9..2ec96d1 100644 --- a/src/resources/acc-A07421233.json +++ b/src/resources/acc-A07421233.json @@ -1 +1 @@ -{ "Account":{"account_number": "A07421233","phone_number": "301-356-3890","mailing_address": { "Address":{"street": "30 Amstadam ave","city": "New York","state": "NY","zip": "12010"}},"email_address": { "EmailAddress":{"email": "newbee952@aol.com"}},"reservations":[{"HotelReservation":{"reservation_number":"R012308734"}},{"CabinReservation":{"reservation_number":"R204282843"}}]}} \ No newline at end of file +{ "Account":{"account_number": "A07421233","phone_number": "301-356-3890","mailing_address": { "Address":{"street": "30 Amstadam ave","city": "New York","state": "NY","zip": "12010"}},"email_address": { "EmailAddress":{"email": "newbee952@aol.com"}},"reservations":[{"HotelReservation":{"reservation_number":"R0123087344"}},{"CabinReservation":{"reservation_number":"R2042828431"}}]}} \ No newline at end of file diff --git a/src/resources/acc-A45098176.json b/src/resources/acc-A45098176.json index 88afc0b..f0bc6f8 100644 --- a/src/resources/acc-A45098176.json +++ b/src/resources/acc-A45098176.json @@ -1 +1 @@ -{ "Account":{"account_number": "A45098176","phone_number": "701-456-7890","mailing_address": { "Address":{"street": "10 wilco ave","city": "wilco","state": "WY","zip": "82801"}},"email_address": { "EmailAddress":{"email": "wilco@wyommin.net"}},"reservations":[{"CabinReservation":{"reservation_number":"R053527662"}},{"HouseReservation":{"reservation_number":"R049981170"}}]}} \ No newline at end of file +{ "Account":{"account_number": "A45098176","phone_number": "701-456-7890","mailing_address": { "Address":{"street": "10 wilco ave","city": "wilco","state": "WY","zip": "82801"}},"email_address": { "EmailAddress":{"email": "wilco@wyommin.net"}},"reservations":[{"CabinReservation":{"reservation_number":"R0535276622"}},{"HouseReservation":{"reservation_number":"R0499811708"}}]}} \ No newline at end of file diff --git a/src/resources/res-R012308734.json b/src/resources/res-R012308734.json deleted file mode 100644 index e6176eb..0000000 --- a/src/resources/res-R012308734.json +++ /dev/null @@ -1 +0,0 @@ -{ "HotelReservation":{"reservation_type": "HotelReservation","reservation_number": "R012308734","reservation_status": "Canceled","reservation_start_date": "2025-09-05T10:00Z[UTC]","reservation_end_date": "2025-09-09T10:00Z[UTC]","account_number": "A07421233","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/res-R0123087344.json b/src/resources/res-R0123087344.json new file mode 100644 index 0000000..9c02269 --- /dev/null +++ b/src/resources/res-R0123087344.json @@ -0,0 +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": "A07421233","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/res-R049981170.json b/src/resources/res-R049981170.json deleted file mode 100644 index c463413..0000000 --- a/src/resources/res-R049981170.json +++ /dev/null @@ -1 +0,0 @@ -{ "HouseReservation":{"reservation_type": "HouseReservation","reservation_number": "R049981170","reservation_status": "Draft","reservation_start_date": "2025-09-05T10:00Z[UTC]","reservation_end_date": "2025-09-09T10:00Z[UTC]","account_number": "A45098176","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/res-R0499811708.json b/src/resources/res-R0499811708.json new file mode 100644 index 0000000..134077c --- /dev/null +++ b/src/resources/res-R0499811708.json @@ -0,0 +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": "A45098176","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/res-R053527662.json b/src/resources/res-R053527662.json deleted file mode 100644 index eada2ef..0000000 --- a/src/resources/res-R053527662.json +++ /dev/null @@ -1 +0,0 @@ -{ "CabinReservation":{"reservation_type": "CabinReservation","reservation_number": "R053527662","reservation_status": "Completed","reservation_start_date": "2025-09-05T10:00Z[UTC]","reservation_end_date": "2025-09-09T10:00Z[UTC]","account_number": "A45098176","physical_address": { "Address":{"street": "40 cabin ave","city": "Carnelian","state": "CA","zip": "96140"}},"mailing_address": { "Address":{"street": "40 cabin ave","city": "Carnelian Bay","state": "CA","zip": "96140"}},"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/res-R0535276622.json b/src/resources/res-R0535276622.json new file mode 100644 index 0000000..2f1f457 --- /dev/null +++ b/src/resources/res-R0535276622.json @@ -0,0 +1 @@ +{ "CabinReservation":{"reservation_type": "CabinReservation","reservation_number": "R0535276622","reservation_status": "Completed","reservation_start_date": "2025-09-05T10:00Z[UTC]","reservation_end_date": "2025-09-09T10:00Z[UTC]","account_number": "A45098176","physical_address": { "Address":{"street": "40 cabin ave","city": "Carnelian","state": "CA","zip": "96140"}},"mailing_address": { "Address":{"street": "40 cabin ave","city": "Carnelian Bay","state": "CA","zip": "96140"}},"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/res-R204282843.json b/src/resources/res-R204282843.json deleted file mode 100644 index 1106bfc..0000000 --- a/src/resources/res-R204282843.json +++ /dev/null @@ -1 +0,0 @@ -{ "CabinReservation":{"reservation_type": "CabinReservation","reservation_number": "R204282843","reservation_status": "Draft","reservation_start_date": "2025-09-05T10:00Z[UTC]","reservation_end_date": "2025-09-09T10:00Z[UTC]","account_number": "A07421233","physical_address": { "Address":{"street": "30 cabin ave","city": "Carnelian","state": "CA","zip": "96140"}},"mailing_address": { "Address":{"street": "30 cabin ave","city": "Carnelian Bay","state": "CA","zip": "96140"}},"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/res-R2042828431.json b/src/resources/res-R2042828431.json new file mode 100644 index 0000000..70e76e8 --- /dev/null +++ b/src/resources/res-R2042828431.json @@ -0,0 +1 @@ +{ "CabinReservation":{"reservation_type": "CabinReservation","reservation_number": "R2042828431","reservation_status": "Draft","reservation_start_date": "2025-09-05T10:00Z[UTC]","reservation_end_date": "2025-09-09T10:00Z[UTC]","account_number": "A07421233","physical_address": { "Address":{"street": "30 cabin ave","city": "Carnelian","state": "CA","zip": "96140"}},"mailing_address": { "Address":{"street": "30 cabin ave","city": "Carnelian Bay","state": "CA","zip": "96140"}},"kitchen": "Kitchenette","numberOfBeds": "2","numberOfBedRooms": "1","numberOfBathRooms": "1","numberOfFloors": "1","squareFeet": "450","price": "360.0"}} \ No newline at end of file