README.TXT

@@ -4,8 +4,8 @@
 
 A simple cash account <-> bank system implementation (very loosely modelled!)
 
-This project uses JavaFX for the user interface toolkit. JavaFX is a software platform for creating 
-and delivering desktop applications, as well as rich Internet applications (RIAs) 
+This project uses JavaFX for the user interface toolkit. JavaFX is a software platform for creating
+and delivering desktop applications, as well as rich Internet applications (RIAs)
 that can run across a wide variety of devices. It is part of the standard Java distribution.
 
 Welcome to your first App. "ZipCloudBank", a local Wilmington fintech startup, has a minimally
@@ -16,24 +16,24 @@ The Board of Directors of ZipCloudBank have empowered me to let you take a crack
 and improving their app over this weekend. Impressed that you are a ZipCode student, they are
 expecting great things. Don't panic: we think you can do this.
 
-The point of this lab is to read thru some existing code, in this case, a program/app that 
+The point of this lab is to read thru some existing code, in this case, a program/app that
 launches a window on your computer and lets you play with a couple of "banking accounts".
 You should run the app, learn how to use it, so you understand what it does. It is not,
 shall we say, user-friendly. So you may find what you have to do to make it work somewhat
-awkward. 
+awkward.
 
-Then, you should read thru the code repository seeing how the code actually implements the things you 
+Then, you should read thru the code repository seeing how the code actually implements the things you
 see when you run the code. Find the "main" routine, which is where the app starts up. Trace from there
 to see what code gets called where and when. Trace how the operations of the code work.
 
 Finally, you are to add some new functionality to the app, to make it "more useful, powerful &
-more rewarding for the user". 
+more rewarding for the user".
 Your effort will be met with promotions, parades, and stock options. (no, just kidding).
 
 Lab Brief
 =========
 
-Notice the structure of the current project before you start. Read thru the 
+Notice the structure of the current project before you start. Read thru the
 code up here on git.zipcode.rocks.
 Read thru the code. READ THRU THE CODE.
 READ THRU THE CODE.
@@ -63,23 +63,23 @@ Notice when reading the code...
 Things to Change for the Lab
 ============================
 
-FIRST, fork this repo into your own account. 
+FIRST, fork this repo into your own account.
        =====================================
 
-     After getting each of these items completed, 
-     be sure to do a 'git commit' to save you work. 
+     After getting each of these items completed,
+     be sure to do a 'git commit' to save you work.
      Learn your git.
-     Never Lose Code. 
+     Never Lose Code.
      NEVER LOSE CODE. EVER. :-)
 
 How about making a new git branch, named "dev" from the master branch for you to do all
 your work in?? (what great idea!)
 
-NOW, maybe you're ready to start making changes. 
+NOW, maybe you're ready to start making changes.
 
 
 
-* Add more accounts to the default constructor of the Bank class.
+X  * Add more accounts to the default constructor of the Bank class.
 * When you overdraft an account, print an alert message to the areaInfo object on the window.
 
 Additional things to add
@@ -89,24 +89,18 @@ You need not do these things in this order. Do as many as you can. When you fini
 make sure the project runs. (Else the Board... well, disappointment lies that direction.)
      ---------------------
 
-* Make the account display more user friendly
-  * add a Form layout that has separate TextFields for each piece of account info. 
-  * You'll probably find a layout that lets you do this, a little like the FlowPane.
-  * Make the login stuff more clear
-  * Disable the three buttons that operate on an account until a login happens 
-  * and then enable them. add another TextField for the amount entries. 
-  * Make it different from the TextField where you set the account ID.
+Make the account display more user friendly
+X   * Add a Form layout that has separate TextFields for each piece of account info. You'll probably find a layout that lets you do this, a little like the FlowPane.
+X  * Make the login stuff more clear
+X  * Disable the three buttons that operate on an account until a login happens and then enable them.
+X  * Add another TextField for the amount entries. Make it different from the TextField where you set the account ID.
+X  * Enable the amount entries to be floating point numbers instead of just integers when doing deposits and withdrawals.
+X   * Add a menu with a list of accounts in it and the menu action switched to that account. You may find that JavaFX already has such a thing.
 
-* Enable the amount entries to be floating point numbers instead of 
-  just integers when doing deposits and withdrawals.
-
-* Add a menu with a list of accounts in it and the menu action switched 
-  to that account. You may find that JavaFX already has such a thing.
-
-**** Add a New Account Window(!) that takes in the info required thru 
-     TextFields and creates the correct objects so that is can be changed 
+**** Add a New Account Window(!) that takes in the info required thru
+     TextFields and creates the correct objects so that is can be changed
      like the pre-wired accounts.
 
-NB: When googling for information on how to do all this, 
-be sure you start every query with "javafx " and your other search terms. 
+NB: When googling for information on how to do all this,
+be sure you start every query with "javafx " and your other search terms.
 That will limit the results to things that probably are closer to what you need.

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

@@ -1,8 +1,13 @@
 package rocks.zipcode.atm;
 
+import com.sun.javafx.binding.StringFormatter;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
 import rocks.zipcode.atm.bank.AccountData;
 import rocks.zipcode.atm.bank.Bank;
 
+import java.util.ArrayList;
+import java.util.Observable;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 
@@ -15,13 +20,55 @@ public class CashMachine {
     private AccountData accountData = null;
 
     public CashMachine(Bank bank) {
+
         this.bank = bank;
+
+
+    }
+
+    public int getId() {
+        return accountData.getId();
+    }
+
+    public String getName() {
+        return accountData.getName();
+    }
+
+    public String getEmail() {
+        return accountData.getEmail();
+    }
+
+
+    public Float getBalance() {
+
+        return accountData.getBalance();
     }
 
     private Consumer<AccountData> update = data -> {
         accountData = data;
     };
 
+    public void resetPassword(int accountNumber, String newPassword) {
+        bank.resetPassword(accountNumber, newPassword);
+    }
+
+    public ObservableList<Integer> getIdList() {
+
+        ObservableList<Integer> idList = FXCollections.observableArrayList(bank.getIdList());
+
+        return idList;
+    }
+
+    public String message(String message) {
+        return message;
+    }
+
+    public boolean checkPassword(int accountNumber, String password) {
+
+        password.toLowerCase();
+        return bank.getPassword(accountNumber).equals(password);
+    }
+
     public void login(int id) {
         tryCall(
                 () -> bank.getAccountById(id),
@@ -29,7 +76,7 @@ public class CashMachine {
         );
     }
 
-    public void deposit(int amount) {
+    public void deposit(float amount) {
         if (accountData != null) {
             tryCall(
                     () -> bank.deposit(accountData, amount),
@@ -38,15 +85,17 @@ public class CashMachine {
         }
     }
 
-    public void withdraw(int amount) {
+    public void withdraw(float amount) {
         if (accountData != null) {
             tryCall(
                     () -> bank.withdraw(accountData, amount),
                     update
             );
+
         }
     }
 
+
     public void exit() {
         if (accountData != null) {
             accountData = null;
@@ -55,9 +104,10 @@ 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() : "Incorrect account number. \nTry again or click 'Forgot Account Number'";
     }
 
+
     private <T> void tryCall(Supplier<ActionResult<T> > action, Consumer<T> postAction) {
         try {
             ActionResult<T> result = action.get();
@@ -72,4 +122,5 @@ public class CashMachine {
             System.out.println("Error: " + e.getMessage());
         }
     }
+
 }

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

@@ -1,78 +1,278 @@
 package rocks.zipcode.atm;
 
+import javafx.geometry.Pos;
+import javafx.scene.control.*;
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
+import javafx.scene.control.TextArea;
+import javafx.scene.control.TextField;
+import javafx.scene.image.ImageViewBuilder;
+import javafx.scene.layout.HBox;
+import javafx.scene.text.TextAlignment;
+import javafx.scene.text.TextFlow;
+import javafx.stage.StageStyle;
 import rocks.zipcode.atm.bank.Bank;
 import javafx.application.Application;
 import javafx.scene.Parent;
 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;
 
+
+import javax.swing.*;
+import javax.swing.text.html.ImageView;
+import javax.xml.soap.Text;
+import java.awt.*;
+import java.awt.Image;
+import java.io.FileInputStream;
+import java.util.HashMap;
+
 /**
  * @author ZipCodeWilmington
  */
 public class CashMachineApp extends Application {
 
     private TextField field = new TextField();
+    private TextField field2 = new TextField();
     private CashMachine cashMachine = new CashMachine(new Bank());
+    private ComboBox accountNumbers = new ComboBox(cashMachine.getIdList());
 
     private Parent createContent() {
         VBox vbox = new VBox(10);
-        vbox.setPrefSize(600, 600);
+        vbox.setPrefSize(600, 820);
+        vbox.setStyle("-fx-background-color: lightslategray; -fx-padding: 20; -fx-font-size: 20;");
+
+        Label header = new Label("Welcome to ZipCloud Bank");
+        header.setStyle("-fx-text-fill: turquoise; -fx-font-size: 42; -fx-font-family: Charter; -fx-border-radius: 10; -fx-label-padding: 8; -fx-border-width: 4; -fx-border-color: greenyellow;");
+
+
+
+        TextField areaAccountId = new TextField();
+        areaAccountId.setStyle("-fx-background-color: lightsteelblue;");
+        areaAccountId.setManaged(false);
+        areaAccountId.setEditable(false);
+
+        Label accountId = new Label("Account ID:");
+        accountId.setManaged(false);
+        accountId.setStyle("-fx-text-fill: white;");
+
+       // HBox accountIdInfo = new HBox(5);
+        //accountIdInfo.getChildren().addAll(accountId, areaAccountId);
 
-        TextArea areaInfo = new TextArea();
+        TextField areaAccountName = new TextField();
+        areaAccountName.setManaged(false);
+        areaAccountName.setStyle("-fx-background-color: lightsteelblue;");
+        areaAccountName.setEditable(false);
 
-        Button btnSubmit = new Button("Set Account ID");
+        Label accountName = new Label("Account Holder:");
+        accountName.setStyle("-fx-text-fill: white;");
+        accountName.setManaged(false);
+
+        //HBox nameInfo = new HBox(5);
+        //nameInfo.getChildren().addAll(accountName, areaAccountName);
+
+        TextField areaAccountEmail = new TextField();
+        areaAccountEmail.setManaged(false);
+        areaAccountEmail.setStyle("-fx-background-color: lightsteelblue;");
+        areaAccountEmail.setEditable(false);
+
+        Label accountEmail = new Label("Email:");
+        accountEmail.setStyle("-fx-text-fill: white;");
+        accountEmail.setManaged(false);
+
+        //HBox accountEmailInfo = new HBox(5);
+        //accountEmailInfo.getChildren().addAll(accountEmail, areaAccountEmail);
+
+        TextField areaAccountAmount = new TextField();
+        areaAccountAmount.setManaged(false);
+        areaAccountAmount.setStyle("-fx-background-color: mediumturquoise;");
+        areaAccountAmount.setEditable(false);
+
+        Label accountBalance = new Label("Balance:");
+        accountBalance.setStyle("-fx-text-fill: greenyellow;");
+        accountBalance.setManaged(false);
+
+        /*
+        HBox accountBalanceInfo = new HBox(5);
+        accountBalanceInfo.getChildren().addAll(accountBalance, areaAccountAmount);
+
+        accountIdInfo.setPrefSize(100, 100);
+        accountIdInfo.setStyle("-fx-background-color: mediumaquamarine; -fx-padding: 20; -fx-font-size: 20;");
+        */
+
+        field2.setManaged(false);
+
+        Label fieldLabel2 = new Label("Amount:");
+        fieldLabel2.setManaged(false);
+        fieldLabel2.setStyle("-fx-text-fill: greenyellow;");
+        Label fieldLabel = new Label("Select Your Account Number:");
+        fieldLabel.setStyle("-fx-text-fill: greenyellow;");
+
+        field.setStyle("-fx-background-color: lightgrey;");
+        field2.setStyle("-fx-background-color: lightgrey;");
+        Label passwordLabel = new Label("Password:");
+        passwordLabel.setStyle("-fx-text-fill: greenyellow;");
+
+
+        //Make Button Do something.
+        Button btnNewAccount = new Button("Setup New Account");
+        btnNewAccount.setDisable(true);
+       /*
         btnSubmit.setOnAction(e -> {
-            int id = Integer.parseInt(field.getText());
-            cashMachine.login(id);
 
-            areaInfo.setText(cashMachine.toString());
         });
+*/
 
         Button btnDeposit = new Button("Deposit");
+        btnDeposit.setManaged(false);
         btnDeposit.setOnAction(e -> {
-            int amount = Integer.parseInt(field.getText());
+            float amount = Float.parseFloat(field2.getText());
             cashMachine.deposit(amount);
 
-            areaInfo.setText(cashMachine.toString());
+            areaAccountAmount.setText(Float.toString(cashMachine.getBalance()));
         });
 
+
         Button btnWithdraw = new Button("Withdraw");
+        btnWithdraw.setManaged(false);
         btnWithdraw.setOnAction(e -> {
-            int amount = Integer.parseInt(field.getText());
+            float amount = Float.parseFloat(field2.getText());
             cashMachine.withdraw(amount);
+            areaAccountAmount.setText(Float.toString(cashMachine.getBalance()));
+        });
 
-            areaInfo.setText(cashMachine.toString());
+        Button btnResetPassword = new Button("Reset Password");
+        btnResetPassword.setManaged(false);
+        btnResetPassword.setOnAction(e -> {
+            int id = Integer.parseInt(accountNumbers.getValue().toString());
+            String password = field.getText();
+            cashMachine.resetPassword(id, password);
+            passwordLabel.setText(cashMachine.message("Password Reset."));
         });
 
-        Button btnExit = new Button("Exit");
+        Button btnExit = new Button("Log Out");
+        btnExit.setManaged(false);
         btnExit.setOnAction(e -> {
             cashMachine.exit();
+            field.clear();
+            field2.clear();
+            areaAccountAmount.clear();
+            areaAccountEmail.clear();
+            areaAccountId.clear();
+            areaAccountName.clear();
+            passwordLabel.setText("Password:");
+
+
+            field2.setVisible(false);
+            fieldLabel2.setVisible(false);
+            btnDeposit.setVisible(false);
+            btnWithdraw.setVisible(false);
+            btnExit.setVisible(false);
+            btnResetPassword.setVisible(false);
+
+            areaAccountAmount.setVisible(false);
+            areaAccountEmail.setVisible(false);
+            areaAccountId.setVisible(false);
+            areaAccountName.setVisible(false);
+
+            accountBalance.setVisible(false);
+            accountEmail.setVisible(false);
+            accountId.setVisible(false);
+            accountName.setVisible(false);
+        });
+
+        Button btnSubmit = new Button("Enter");
+        btnSubmit.setOnAction(e -> {
+            int id = Integer.parseInt(accountNumbers.getValue().toString());
+            String passwordInput = field.getText();
+            if(cashMachine.checkPassword(id, passwordInput)) {
+                cashMachine.login(id);
+                areaAccountAmount.setText(Float.toString(cashMachine.getBalance()));
+                areaAccountEmail.setText(cashMachine.getEmail());
+                areaAccountId.setText(Integer.toString(cashMachine.getId()));
+                areaAccountName.setText(cashMachine.getName());
+                areaAccountAmount.setManaged(true);
+                areaAccountEmail.setManaged(true);
+                areaAccountId.setManaged(true);
+                areaAccountName.setManaged(true);
+                accountId.setManaged(true);
+                accountName.setManaged(true);
+                accountEmail.setManaged(true);
+                accountBalance.setManaged(true);
+                passwordLabel.setText("New Password:");
+                btnDeposit.setManaged(true);
+                btnWithdraw.setManaged(true);
+                btnExit.setManaged(true);
+                btnResetPassword.setManaged(true);
+                accountId.setManaged(true);
+                field2.setManaged(true);
+                fieldLabel2.setManaged(true);
+
+                field2.setVisible(true);
+                fieldLabel2.setVisible(true);
+                btnDeposit.setVisible(true);
+                btnWithdraw.setVisible(true);
+                btnExit.setVisible(true);
+                btnResetPassword.setVisible(true);
+
+                areaAccountAmount.setVisible(true);
+                areaAccountEmail.setVisible(true);
+                areaAccountId.setVisible(true);
+                areaAccountName.setVisible(true);
+
+                accountBalance.setVisible(true);
+                accountEmail.setVisible(true);
+                accountId.setVisible(true);
+                accountName.setVisible(true);
 
-            areaInfo.setText(cashMachine.toString());
+            } else {
+                passwordLabel.setText(cashMachine.message("Incorrect Password.  Try Again."));
+            }
         });
 
+
+
+        /*
+        String path = "https://drive.google.com/file/d/1PR_cLhzJ9IFcnWF46QSX_WEcnFT-uI0Q/view?usp=sharing";
+
+        Image image = new Image(path);
+*/
+
         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);
+        flowpane.getChildren().add(btnResetPassword);
+        flowpane.getChildren().add(btnNewAccount);
+
+        FlowPane flowpane2 = new FlowPane();
+
+        flowpane2.getChildren().add(btnDeposit);
+        flowpane2.getChildren().add(btnWithdraw);
+        flowpane2.getChildren().add(btnExit);
+
+        vbox.getChildren().addAll(header, fieldLabel, accountNumbers, passwordLabel, field, flowpane, fieldLabel2, field2, flowpane2, accountId, areaAccountId, accountName, areaAccountName, accountEmail, areaAccountEmail, accountBalance, areaAccountAmount);
+
+
+
         return vbox;
+
+
     }
 
     @Override
-    public void start(Stage stage) throws Exception {
-        stage.setScene(new Scene(createContent()));
-        stage.show();
+    public void start(Stage primarystage) throws Exception {
+        primarystage.setTitle("ZipCloud Bank");
+        primarystage.setScene(new Scene(createContent()));
+        primarystage.show();
+
     }
 
     public static void main(String[] args) {
+
         launch(args);
+
     }
+
+
 }

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

@@ -15,11 +15,11 @@ public abstract class Account {
         return accountData;
     }
 
-    public void deposit(int amount) {
+    public void deposit(float amount) {
         updateBalance(getBalance() + amount);
     }
 
-    public boolean withdraw(int amount) {
+    public boolean withdraw(float amount) {
         if (canWithdraw(amount)) {
             updateBalance(getBalance() - amount);
             return true;
@@ -28,15 +28,15 @@ public abstract class Account {
         }
     }
 
-    protected boolean canWithdraw(int amount) {
+    protected boolean canWithdraw(float amount) {
         return getBalance() >= amount;
     }
 
-    public int getBalance() {
+    public float getBalance() {
         return accountData.getBalance();
     }
 
-    private void updateBalance(int newBalance) {
+    private void updateBalance(float newBalance) {
         accountData = new AccountData(accountData.getId(), accountData.getName(), accountData.getEmail(),
                 newBalance);
     }

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

@@ -9,9 +9,9 @@ public final class AccountData {
     private final String name;
     private final String email;
 
-    private final int balance;
+    private final float balance;
 
-    AccountData(int id, String name, String email, int balance) {
+    AccountData(int id, String name, String email, float balance) {
         this.id = id;
         this.name = name;
         this.email = email;
@@ -30,15 +30,15 @@ public final class AccountData {
         return email;
     }
 
-    public int getBalance() {
+    public float getBalance() {
         return balance;
     }
 
     @Override
     public String toString() {
-        return "Account id: " + id + '\n' +
+        return "Account ID: " + id + '\n' +
                 "Name: " + name + '\n' +
                 "Email: " + email + '\n' +
-                "Balance: " + balance;
+                "Balance: $" + String.format("%,.2f", balance);
     }
 }

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

@@ -1,7 +1,11 @@
 package rocks.zipcode.atm.bank;
 
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
 import rocks.zipcode.atm.ActionResult;
 
+import java.awt.*;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -11,15 +15,118 @@ import java.util.Map;
 public class Bank {
 
     private Map<Integer, Account> accounts = new HashMap<>();
+    private Map<Integer, String> passwords = new HashMap<>();
+    //private static int nextId = 1000;
+
+    /* Add options for user to create an account and have a number issued to them. */
 
     public Bank() {
         accounts.put(1000, new BasicAccount(new AccountData(
-                1000, "Example 1", "example1@gmail.com", 500
+                1000, "Nick Foles", "LIImvp@gmail.com", 500
+        )));
+
+        passwords.put(1000, "password");
+
+        accounts.put(1100, new BasicAccount(new AccountData(
+                1100, "Dan Green", "dgreen@gmail.com", 100000
+        )));
+
+        passwords.put(1100, "password");
+
+        accounts.put(1200, new BasicAccount(new AccountData(
+                1200, "Billy Madison", "back2school@gmail.com", 500
+        )));
+
+        passwords.put(1200, "password");
+
+        accounts.put(1300, new BasicAccount(new AccountData(
+                1300, "Chase Utley", "grandpa@gmail.com", 2008
+        )));
+
+        passwords.put(1300, "password");
+
+        accounts.put(1400, new PremiumAccount(new AccountData(
+                1400, "Elle Woods", "pink@gmail.com", 20
         )));
 
+        passwords.put(1400, "password");
+
+        accounts.put(1500, new PremiumAccount(new AccountData(
+                1500, "Harry Potter", "seeker4life@wizmail.com", 200
+        )));
+
+        passwords.put(1500, "password");
+
+        accounts.put(1600, new BasicAccount(new AccountData(
+                1600, "Hermione Granger", "librarylover@gmail.com", 950
+        )));
+
+        passwords.put(1600, "password");
+
+        accounts.put(1700, new BasicAccount(new AccountData(
+                1700, "Hayden Stewart", "hstew@gmail.com", 100
+        )));
+
+        passwords.put(1700, "password");
+
+        accounts.put(1800, new BasicAccount(new AccountData(
+                1800, "Jack Traven", "speed@gmail.com", 50
+        )));
+
+        passwords.put(1800, "password");
+
+        accounts.put(1900, new BasicAccount(new AccountData(
+                1900, "Jimmy Fallon", "jimmy@nbc.com", 1000
+        )));
+
+        passwords.put(1900, "password");
+
         accounts.put(2000, new PremiumAccount(new AccountData(
-                2000, "Example 2", "example2@gmail.com", 200
+                2000, "Frankie Smith", "frank@gmail.com", 2040
         )));
+
+        passwords.put(2000, "password");
+
+        accounts.put(2100, new PremiumAccount(new AccountData(
+                2100, "Ron Weasley", "ron@wizmail.com", 2003
+        )));
+
+        passwords.put(2100, "password");
+    }
+
+/*How to use this???
+    public Bank(String name, String email, int initialBalance, boolean typeOfAccount) {
+        nextId++;
+        if (!typeOfAccount) {
+        accounts.put(nextId, new BasicAccount(new AccountData(
+                nextId, name, email, initialBalance
+        ))); } else {
+            accounts.put(nextId, new PremiumAccount(new AccountData(
+                    nextId, name, email, initialBalance
+            )));
+        }
+
+    }
+
+*/
+
+    public String getPassword(int accountNumber) {
+        return passwords.get(accountNumber);
+    }
+
+    public void resetPassword(int accountNumber, String newPassword) {
+        passwords.put(accountNumber, newPassword);
+    }
+
+    public ObservableList<Integer> getIdList() {
+
+        ObservableList<Integer> idList = FXCollections.observableArrayList();
+
+        for (Integer key: accounts.keySet()) {
+
+            idList.add(key);
+        }
+            return idList;
     }
 
     public ActionResult<AccountData> getAccountById(int id) {
@@ -28,25 +135,26 @@ 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);
         }
     }
 
-    public ActionResult<AccountData> deposit(AccountData accountData, int amount) {
+    public ActionResult<AccountData> deposit(AccountData accountData, float amount) {
         Account account = accounts.get(accountData.getId());
         account.deposit(amount);
 
         return ActionResult.success(account.getAccountData());
     }
 
-    public ActionResult<AccountData> withdraw(AccountData accountData, int amount) {
+    public ActionResult<AccountData> withdraw(AccountData accountData, float amount) {
         Account account = accounts.get(accountData.getId());
         boolean ok = account.withdraw(amount);
-
         if (ok) {
             return ActionResult.success(account.getAccountData());
         } else {
             return ActionResult.fail("Withdraw failed: " + amount + ". Account has: " + account.getBalance());
         }
     }
+
+
 }

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

@@ -12,7 +12,7 @@ public class PremiumAccount extends Account {
     }
 
     @Override
-    protected boolean canWithdraw(int amount) {
+    protected boolean canWithdraw(float amount) {
         return getBalance() + OVERDRAFT_LIMIT >= amount;
     }
 }