Not Broken

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

@@ -32,6 +32,10 @@ public class ActionResult<T> {
         return new ActionResult<E>(data);
     }
 
+    public static <E> ActionResult<E> overdrawn(String overdrawnMessage) {
+        return new ActionResult<E>(overdrawnMessage);
+    }
+
     public static <E> ActionResult<E> fail(String errorMessage) {
         return new ActionResult<E>(errorMessage);
     }

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

@@ -1,5 +1,7 @@
 package rocks.zipcode.atm;
 
+import javafx.geometry.Pos;
+import javafx.scene.layout.GridPane;
 import rocks.zipcode.atm.bank.Bank;
 import javafx.application.Application;
 import javafx.scene.Parent;
@@ -7,63 +9,78 @@ import javafx.scene.Scene;
 import javafx.scene.control.Button;
 import javafx.scene.control.TextArea;
 import javafx.scene.control.TextField;
-import javafx.scene.layout.VBox;
 import javafx.stage.Stage;
-import javafx.scene.layout.FlowPane;
 
 /**
  * @author ZipCodeWilmington
  */
 public class CashMachineApp extends Application {
 
-    private TextField field = new TextField();
     private CashMachine cashMachine = new CashMachine(new Bank());
 
+    private TextField setAccountIdField = new TextField();
+    // private TextField setDeposit = new TextField();
+    // private TextField setAccountIdField = new TextField();
+    // private TextField setAccountIdField = new TextField();
+
     private Parent createContent() {
-        VBox vbox = new VBox(10);
-        vbox.setPrefSize(600, 600);
+        setAccountIdField.setMinSize(220, 40);
+        // seDeposit.setMinSize(220, 40);
+        // setAccountIdField.setMinSize(220, 40);
+        // setAccountIdField.setMinSize(220, 40);
+        
+        GridPane gridPane = new GridPane();
+        gridPane.setPrefSize(600, 400);
+        gridPane.setAlignment(Pos.BASELINE_LEFT);
 
         TextArea areaInfo = new TextArea();
+        areaInfo.setMaxSize(220, 160);
+
 
         Button btnSubmit = new Button("Set Account ID");
+        btnSubmit.setMinSize(220, 40);
         btnSubmit.setOnAction(e -> {
-            int id = Integer.parseInt(field.getText());
+            int id = Integer.parseInt(setAccountIdField.getText());
             cashMachine.login(id);
 
             areaInfo.setText(cashMachine.toString());
         });
 
         Button btnDeposit = new Button("Deposit");
+        btnDeposit.setMinSize(220, 40);
         btnDeposit.setOnAction(e -> {
-            int amount = Integer.parseInt(field.getText());
+            int amount = Integer.parseInt(setAccountIdField.getText());
             cashMachine.deposit(amount);
 
             areaInfo.setText(cashMachine.toString());
         });
 
         Button btnWithdraw = new Button("Withdraw");
+        btnWithdraw.setMinSize(220, 40);
         btnWithdraw.setOnAction(e -> {
-            int amount = Integer.parseInt(field.getText());
+            int amount = Integer.parseInt(setAccountIdField.getText());
             cashMachine.withdraw(amount);
 
             areaInfo.setText(cashMachine.toString());
         });
 
         Button btnExit = new Button("Exit");
+        btnExit.setMinSize(220, 40);
         btnExit.setOnAction(e -> {
             cashMachine.exit();
 
             areaInfo.setText(cashMachine.toString());
         });
 
-        FlowPane flowpane = new FlowPane();
 
-        flowpane.getChildren().add(btnSubmit);
-        flowpane.getChildren().add(btnDeposit);
-        flowpane.getChildren().add(btnWithdraw);
-        flowpane.getChildren().add(btnExit);
-        vbox.getChildren().addAll(field, flowpane, areaInfo);
-        return vbox;
+        GridPane.setConstraints(btnSubmit, 0, 0);
+        GridPane.setConstraints(btnDeposit, 0, 1);
+        GridPane.setConstraints(btnWithdraw, 0, 2);
+        GridPane.setConstraints(btnExit, 0, 3);
+        GridPane.setConstraints(setAccountIdField, 1, 0);
+        GridPane.setConstraints(areaInfo, 1, 4);
+        gridPane.getChildren().addAll(btnSubmit, btnDeposit, btnWithdraw, btnExit, setAccountIdField, areaInfo);
+        return gridPane;
     }
 
     @Override

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

@@ -20,6 +20,14 @@ public class Bank {
         accounts.put(2000, new PremiumAccount(new AccountData(
                 2000, "Example 2", "example2@gmail.com", 200
         )));
+
+        accounts.put(6666, new PremiumAccount(new AccountData(
+                6666, "Nick Satinover", "nsatinover@gmail.com", 20000
+        )));
+
+        accounts.put(7337, new BasicAccount(new AccountData(
+                7337, "Kris HaHaYourBroke", "kris@onedollar.com", 1
+        )));
     }
 
     public ActionResult<AccountData> getAccountById(int id) {
@@ -44,8 +52,12 @@ public class Bank {
         boolean ok = account.withdraw(amount);
 
         if (ok) {
+            if (account.getBalance() < 0) {
+                Overdraft.popupMessage("Overdraft", "Warning, your account is now in overdraft");
+            }
             return ActionResult.success(account.getAccountData());
         } else {
+            Overdraft.popupMessage("Declined", "Declined, account contains insufficient funds");
             return ActionResult.fail("Withdraw failed: " + amount + ". Account has: " + account.getBalance());
         }
     }

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

@@ -0,0 +1,54 @@
+package rocks.zipcode.atm.bank;
+
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
+import javafx.stage.Stage;
+import javafx.scene.*;
+import javafx.scene.layout.*;
+import javafx.scene.control.*;
+import javafx.geometry.*;
+import javafx.stage.Modality;
+
+import java.awt.*;
+
+public class Overdraft {
+
+    public static void popupMessage(String title, String message){
+        // "Warning, your account is now in popupMessage";
+        Stage window = new Stage();
+        window.initModality(Modality.APPLICATION_MODAL); //Block Input until window closed/ resolved
+        window.setTitle(title);
+        window.setMinWidth(250);
+
+        Label label = new Label();
+        label.setText(message);
+
+        Button closeButton = new Button("Close");
+        closeButton.setOnAction(e -> window.close());
+
+        VBox layout = new VBox(10);
+        layout.getChildren().addAll(label, closeButton);
+        layout.setAlignment(Pos.CENTER);
+
+        Scene scene = new Scene(layout);
+        window.setScene(scene);
+        window.showAndWait();
+
+    }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

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

@@ -5,7 +5,7 @@ package rocks.zipcode.atm.bank;
  */
 public class PremiumAccount extends Account {
 
-    private static final int OVERDRAFT_LIMIT = 100;
+    private static final int OVERDRAFT_LIMIT = 1000;
 
     public PremiumAccount(AccountData accountData) {
         super(accountData);