fix adding dups
This commit is contained in:
@@ -30,6 +30,7 @@ public class AccountList extends ArrayList<Account> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (DuplicateObjectException e) {
|
} catch (DuplicateObjectException e) {
|
||||||
|
System.out.println(String.format("%s", e.getMessage()));
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
return super.add(account);
|
return super.add(account);
|
||||||
|
|||||||
@@ -18,6 +18,8 @@ class AccountReservationList extends ArrayList<IReservation> {
|
|||||||
@Override
|
@Override
|
||||||
public synchronized boolean add(final IReservation reservation) throws RuntimeException {
|
public synchronized boolean add(final IReservation reservation) throws RuntimeException {
|
||||||
boolean result = true;
|
boolean result = true;
|
||||||
|
((Reservation) reservation)
|
||||||
|
.setReservation_number(AccountReservationList.reservationSerial((Reservation) reservation));
|
||||||
Reservation rsrv = this.find(reservation.getReservation_number());
|
Reservation rsrv = this.find(reservation.getReservation_number());
|
||||||
result = rsrv == null;
|
result = rsrv == null;
|
||||||
if (!result) {
|
if (!result) {
|
||||||
@@ -27,8 +29,6 @@ class AccountReservationList extends ArrayList<IReservation> {
|
|||||||
result = ((IReservation) reservation).checkValid();
|
result = ((IReservation) reservation).checkValid();
|
||||||
|
|
||||||
if (result) {
|
if (result) {
|
||||||
((Reservation) reservation)
|
|
||||||
.setReservation_number(AccountReservationList.reservationSerial((Reservation) reservation));
|
|
||||||
((Reservation) reservation).setPrice(reservation.calculatePrice());
|
((Reservation) reservation).setPrice(reservation.calculatePrice());
|
||||||
result = super.add(reservation);
|
result = super.add(reservation);
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
0
src/resources/acc-A1450981765.json
Executable file → Normal file
0
src/resources/acc-A1450981765.json
Executable file → Normal file
0
src/resources/acc-A2074212339.json
Executable file → Normal file
0
src/resources/acc-A2074212339.json
Executable file → Normal file
34
src/resources/rsv-R0123087344.json
Executable file → Normal file
34
src/resources/rsv-R0123087344.json
Executable file → Normal file
@@ -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"}}
|
||||||
"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"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
34
src/resources/rsv-R0499811708.json
Executable file → Normal file
34
src/resources/rsv-R0499811708.json
Executable file → Normal file
@@ -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"}}
|
||||||
"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"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
0
src/resources/rsv-R0535276622.json
Executable file → Normal file
0
src/resources/rsv-R0535276622.json
Executable file → Normal file
0
src/resources/rsv-R2042828431.json
Executable file → Normal file
0
src/resources/rsv-R2042828431.json
Executable file → Normal file
Reference in New Issue
Block a user