diff --git a/.vscode/launch.json b/.vscode/launch.json index a459b7b..a766e5c 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -1,6 +1,13 @@ { "version": "0.2.0", "configurations": [ + { + "type": "java", + "name": "TestAccountLoad", + "request": "launch", + "mainClass": "lodge.TestAccountLoad", + "projectName": "reservationsystem" + }, { "type": "java", "name": "TestReservations", @@ -14,7 +21,7 @@ "request": "launch", "mainClass": "lodge.TestMainFx", "projectName": "reservationsystem", - "vmArgs": " --module-path ./libs:. --add-modules ALL-MODULE-PATH --enable-native-access=javafx.web,javafx.controls,javafx.graphics -Dcom.sun.management.jmxremote=false -Djava.awt.headless=true -XX:+DisableAttachMechanism", + "vmArgs": " --module-path .;${workspaceFolder}/libs;${workspaceFolder}/libs/win32 --add-modules ALL-MODULE-PATH --enable-native-access=javafx.web,javafx.controls,javafx.graphics -Dcom.sun.management.jmxremote=false -Djava.awt.headless=true -XX:+DisableAttachMechanism", "cwd": "${workspaceFolder}", "console": "integratedTerminal" }, diff --git a/libs/javafx-base-24.0.1-linux.jar b/libs/linux/javafx-base-24.0.1-linux.jar similarity index 100% rename from libs/javafx-base-24.0.1-linux.jar rename to libs/linux/javafx-base-24.0.1-linux.jar diff --git a/libs/javafx-controls-24.0.1-linux.jar b/libs/linux/javafx-controls-24.0.1-linux.jar similarity index 100% rename from libs/javafx-controls-24.0.1-linux.jar rename to libs/linux/javafx-controls-24.0.1-linux.jar diff --git a/libs/javafx-fxml-24.0.1-linux.jar b/libs/linux/javafx-fxml-24.0.1-linux.jar similarity index 100% rename from libs/javafx-fxml-24.0.1-linux.jar rename to libs/linux/javafx-fxml-24.0.1-linux.jar diff --git a/libs/javafx-graphics-24.0.1-linux.jar b/libs/linux/javafx-graphics-24.0.1-linux.jar similarity index 100% rename from libs/javafx-graphics-24.0.1-linux.jar rename to libs/linux/javafx-graphics-24.0.1-linux.jar diff --git a/libs/javafx-media-24.0.1-linux.jar b/libs/linux/javafx-media-24.0.1-linux.jar similarity index 100% rename from libs/javafx-media-24.0.1-linux.jar rename to libs/linux/javafx-media-24.0.1-linux.jar diff --git a/libs/javafx-web-24.0.1-linux.jar b/libs/linux/javafx-web-24.0.1-linux.jar similarity index 100% rename from libs/javafx-web-24.0.1-linux.jar rename to libs/linux/javafx-web-24.0.1-linux.jar diff --git a/libs/win32/javafx-base-24.0.1-win.jar b/libs/win32/javafx-base-24.0.1-win.jar new file mode 100644 index 0000000..1194f58 Binary files /dev/null and b/libs/win32/javafx-base-24.0.1-win.jar differ diff --git a/libs/win32/javafx-controls-24.0.1-win.jar b/libs/win32/javafx-controls-24.0.1-win.jar new file mode 100644 index 0000000..4d9e139 Binary files /dev/null and b/libs/win32/javafx-controls-24.0.1-win.jar differ diff --git a/libs/win32/javafx-fxml-24.0.1-win.jar b/libs/win32/javafx-fxml-24.0.1-win.jar new file mode 100644 index 0000000..285a76b Binary files /dev/null and b/libs/win32/javafx-fxml-24.0.1-win.jar differ diff --git a/libs/win32/javafx-graphics-24.0.1-win.jar b/libs/win32/javafx-graphics-24.0.1-win.jar new file mode 100644 index 0000000..3d140eb Binary files /dev/null and b/libs/win32/javafx-graphics-24.0.1-win.jar differ diff --git a/libs/win32/javafx-media-24.0.1-win.jar b/libs/win32/javafx-media-24.0.1-win.jar new file mode 100644 index 0000000..8367c9e Binary files /dev/null and b/libs/win32/javafx-media-24.0.1-win.jar differ diff --git a/libs/win32/javafx-web-24.0.1-win.jar b/libs/win32/javafx-web-24.0.1-win.jar new file mode 100644 index 0000000..10bf334 Binary files /dev/null and b/libs/win32/javafx-web-24.0.1-win.jar differ diff --git a/src/main/java/lodge/TestAccountLoad.java b/src/main/java/lodge/TestAccountLoad.java index fad393f..6d0d93d 100755 --- a/src/main/java/lodge/TestAccountLoad.java +++ b/src/main/java/lodge/TestAccountLoad.java @@ -5,6 +5,9 @@ package lodge; +import java.util.ArrayList; +import java.util.List; + import lodge.datamodel.Account; import lodge.datamodel.Address; import lodge.datamodel.EmailAddress; @@ -30,23 +33,42 @@ public final class TestAccountLoad { // memory mgr.UpdateAccount(acct); } + + final static Address findIventory(List
propertyIventory, String street) { + Address inventory = propertyIventory + .stream() + .filter((Address inv) -> { + return inv.getStreet().equals("10 wilco ave"); + }).findFirst().orElse(null); + return inventory; + } + public static void main(String[] args) throws Exception { // Configure data repository AccomodationManager mgr = new AccomodationManager(AccomodationManager.getRepositoryConfig.getPath()); + List
propertyIventory = new ArrayList
(); + + propertyIventory.add(new Address("10 wilco ave", "wilco", "WY", "82801")); + propertyIventory.add(new Address("30 Amstadam ave", "New York", "NY", "12010")); + propertyIventory.add(new Address("400 hotel ave", "Maryland City", "MD", "20723")); + // 3. Add new account object to the list managed by Manager (if account object // already exists on add action with the same account number, it is considered // an error) - Test_AddAccount(mgr, mgr.newAccount("701-456-7890", - new Address("10 wilco ave", "wilco", "WY", "82801"), - new EmailAddress("wilco@wyommin.net"))); Test_AddAccount(mgr, mgr.newAccount("701-456-7890", - new Address("10 wilco ave", "wilco", "WY", "82801"), + findIventory(propertyIventory, "10 wilco ave"), new EmailAddress("wilco@wyommin.net"))); + System.out.println("Account already exists in list, so add attempt should fail:"); mgr.showAccountList(); + + Test_AddAccount(mgr, mgr.newAccount("701-456-7890", + findIventory(propertyIventory, "10 wilco ave"), + new EmailAddress("wilco@wyommin.net"))); + System.out.println("Program Completed."); } } diff --git a/src/resources/db/acc-A45098176.json b/src/resources/db/acc-A45098176.json index f0bc6f8..3438597 100644 --- a/src/resources/db/acc-A45098176.json +++ b/src/resources/db/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":"R0535276622"}},{"HouseReservation":{"reservation_number":"R0499811708"}}]}} \ 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":[]}} \ No newline at end of file