Passwords added

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

@@ -29,6 +29,10 @@ public class CashMachine {
         accountData = data;
     };
 
+    public void resetPassword(int accountNumber, String newPassword) {
+        bank.resetPassword(accountNumber, newPassword);
+    }
+
     public ObservableList<Integer> getIdList() {
 
         ObservableList<Integer> idList = FXCollections.observableArrayList(bank.getIdList());
@@ -36,6 +40,16 @@ public class CashMachine {
         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),
@@ -61,6 +75,10 @@ public class CashMachine {
         }
     }
 
+    public ActionResult<AccountData> checkWithdraw(AccountData accountData, float amount) {
+        return bank.withdraw(accountData, amount);
+    }
+
     public void exit() {
         if (accountData != null) {
             accountData = null;

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

@@ -67,10 +67,18 @@ public class CashMachineApp extends Application {
         btnWithdraw.setOnAction(e -> {
             float amount = Float.parseFloat(field2.getText());
             cashMachine.withdraw(amount);
-
             areaInfo.setText(cashMachine.toString());
         });
 
+        Button btnResetPassword = new Button("Reset Password");
+        btnResetPassword.setDisable(true);
+        btnResetPassword.setOnAction(e -> {
+            int id = Integer.parseInt(accountNumbers.getValue().toString());
+            String password = field.getText();
+            cashMachine.resetPassword(id, password);
+            areaInfo.setText(cashMachine.message("Password Reset."));
+        });
+
         Button btnExit = new Button("Log Out");
         btnExit.setOnAction(e -> {
             cashMachine.exit();
@@ -79,18 +87,27 @@ public class CashMachineApp extends Application {
             areaInfo.clear();
             btnDeposit.setDisable(true);
             btnWithdraw.setDisable(true);
+            btnResetPassword.setDisable(true);
         });
 
         Button btnSubmit = new Button("Enter");
         btnSubmit.setOnAction(e -> {
             int id = Integer.parseInt(accountNumbers.getValue().toString());
-            cashMachine.login(id);
-
-            areaInfo.setText(cashMachine.toString());
-            btnDeposit.setDisable(false);
-            btnWithdraw.setDisable(false);
+            String password = field.getText();
+            if(cashMachine.checkPassword(id, password)) {
+                cashMachine.login(id);
+                areaInfo.setText(cashMachine.toString());
+                btnDeposit.setDisable(false);
+                btnWithdraw.setDisable(false);
+                btnResetPassword.setDisable(false);
+                password = "New Password:";
+            } else {
+                areaInfo.setText(cashMachine.message("Incorrect Password.  Try Again."));
+            }
         });
 
+
+
         /*
         String path = "https://drive.google.com/file/d/1PR_cLhzJ9IFcnWF46QSX_WEcnFT-uI0Q/view?usp=sharing";
 
@@ -100,6 +117,7 @@ public class CashMachineApp extends Application {
         FlowPane flowpane = new FlowPane();
 
         flowpane.getChildren().add(btnSubmit);
+        flowpane.getChildren().add(btnResetPassword);
         flowpane.getChildren().add(btnNewAccount);
 
         FlowPane flowpane2 = new FlowPane();
@@ -113,7 +131,8 @@ public class CashMachineApp extends Application {
         field.setStyle("-fx-background-color: lightgrey;");
         field2.setStyle("-fx-background-color: lightgrey;");
         Label fieldLabel = new Label("Account Number:");
-        vbox.getChildren().addAll(fieldLabel, accountNumbers, flowpane, fieldLabel2, field2, flowpane2, accountInfo2, areaInfo);
+        Label password = new Label("Password:");
+        vbox.getChildren().addAll(fieldLabel, accountNumbers, password, field, flowpane, fieldLabel2, field2, flowpane2, accountInfo2, areaInfo);
 
 
 

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

@@ -14,6 +14,7 @@ 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. */
@@ -23,50 +24,73 @@ public class Bank {
                 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, "Frankie Smit", "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???
@@ -85,6 +109,14 @@ public class Bank {
 
 */
 
+    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();
@@ -123,4 +155,6 @@ public class Bank {
             return ActionResult.fail("Withdraw failed: " + amount + ". Account has: " + account.getBalance());
         }
     }
+
+
 }