commit to undo

src/main/java/rocks/zipcode/atm/CashMachine.java

@@ -56,7 +56,7 @@ public class CashMachine {
 
     @Override
     public String toString() {
-        return accountData != null ? accountData.toString() : "Try account 1000 or 2000 and click submit.";
+        return accountData != null ? accountData.toString() : "Enter your account ID (1-4) to continue";
     }
 
     private <T> void tryCall(Supplier<ActionResult<T> > action, Consumer<T> postAction) {
@@ -65,7 +65,8 @@ public class CashMachine {
             if (result.isSuccess()) {
                 T data = result.getData();
                 postAction.accept(data);
-            } else {
+            }
+            else {
                 String errorMessage = result.getErrorMessage();
                 throw new RuntimeException(errorMessage);
             }
@@ -74,7 +75,7 @@ public class CashMachine {
             alert.setTitle("Overdraw!");
             alert.setHeaderText("Not enough money!");
             alert.setContentText("You do not have enough money in your account to complete this transaction.");
-            //System.out.println("Error: " + e.getMessage());
+            System.out.println("Error: " + e.getMessage());
         }
     }
 }

src/main/java/rocks/zipcode/atm/CashMachineApp.java

@@ -27,6 +27,7 @@ public class CashMachineApp extends Application {
 
     private TextField field = new TextField();
     private CashMachine cashMachine = new CashMachine(new Bank());
+    private Bank bank = new Bank();
     GridPane grid;
 
     Stage primaryStage = new Stage();
@@ -51,7 +52,11 @@ public class CashMachineApp extends Application {
         grid.add(userID,0,1);
         TextField userTextField = new TextField();
         grid.add(userTextField,1,1);
-        btn.setOnAction(e->primaryStage.setScene(scene2));
+        btn.setOnAction(e->{
+        int id = Integer.parseInt(userTextField.getText());
+        cashMachine.login(id);
+        bank.getAccountById(id);
+        primaryStage.setScene(scene2);} );
        return grid;
     }
 

src/main/java/rocks/zipcode/atm/bank/Bank.java

@@ -1,5 +1,6 @@
 package rocks.zipcode.atm.bank;
 
+import javafx.scene.control.Alert;
 import rocks.zipcode.atm.ActionResult;
 
 import java.util.HashMap;
@@ -14,18 +15,18 @@ public class Bank {
 
     public Bank() {
         accounts.put(1000, new BasicAccount(new AccountData(
-                1000, "Example 1", "example1@gmail.com", 500
+                1, "Doug Funny", "beetz@gmail.com", 500
         )));
 
         accounts.put(2000, new PremiumAccount(new AccountData(
-                2000, "Example 2", "example2@gmail.com", 200
+                2, "Bugs Bunny", "WatsUpDoc@gmail.com", 200
         )));
 
         accounts.put(3000, new PremiumAccount(new AccountData(
-                3000, "Scooby Doo", "scoobs@gmail.com", 50
+                3, "Scooby Doo", "scoobs@gmail.com", 50
         )));
         accounts.put(4000, new BasicAccount(new AccountData(
-                4000, "Road Runner", "beebbeeb@gmail.com", 2000
+                4, "Road Runner", "beebbeeb@gmail.com", 2000
         )));
     }
 
@@ -35,7 +36,7 @@ public class Bank {
         if (account != null) {
             return ActionResult.success(account.getAccountData());
         } else {
-            return ActionResult.fail("No account with id: " + id + "\nTry account 1000 or 2000");
+            return ActionResult.fail("No account with id: " + id );
         }
     }
 
@@ -53,7 +54,11 @@ public class Bank {
         if (ok) {
             return ActionResult.success(account.getAccountData());
         } else {
-            return ActionResult.fail("Withdraw failed: " + amount + ". Account has: " + account.getBalance());
+            Alert alert = new Alert(Alert.AlertType.ERROR);
+            alert.setTitle("Overdraw!");
+            alert.setHeaderText("Not enough money!");
+            alert.setContentText("You do not have enough money in your account to complete this transaction.");
+            return ActionResult.fail("Insufficient Funds");
         }
     }
 }