refactor: remove Bank model and integrate services for account management

Author: MasterBlaze9

src/main/java/io/codeforall/bootcamp/javabank/App.java

@@ -1,12 +1,9 @@
 package io.codeforall.bootcamp.javabank;
 
 import io.codeforall.bootcamp.javabank.controller.LoginController;
-import io.codeforall.bootcamp.javabank.model.Bank;
 
 public class App {
 
-    private Bank bank;
-
     public static void main(String[] args) {
 
         App app = new App();
@@ -16,9 +13,9 @@ public static void main(String[] args) {
     private void bootStrap() {
 
         Bootstrap bootstrap = new Bootstrap();
-        bank = bootstrap.generateTestData();
+        bootstrap.generateTestData();
 
-        LoginController loginController = bootstrap.wireObjects(bank);
+        LoginController loginController = bootstrap.wireObjects();
 
         // start application
         loginController.init();

src/main/java/io/codeforall/bootcamp/javabank/Bootstrap.java

@@ -3,10 +3,12 @@
 import io.codeforall.bootcamp.javabank.controller.*;
 import io.codeforall.bootcamp.javabank.controller.transaction.DepositController;
 import io.codeforall.bootcamp.javabank.controller.transaction.WithdrawalController;
-import io.codeforall.bootcamp.javabank.model.Bank;
 import io.codeforall.bootcamp.javabank.model.Customer;
+import io.codeforall.bootcamp.javabank.services.AccountService;
 import io.codeforall.bootcamp.javabank.services.AccountServiceImpl;
+import io.codeforall.bootcamp.javabank.services.AuthService;
 import io.codeforall.bootcamp.javabank.services.AuthServiceImpl;
+import io.codeforall.bootcamp.javabank.services.CustomerService;
 import io.codeforall.bootcamp.javabank.services.CustomerServiceImpl;
 import io.codeforall.bootcamp.javabank.view.*;
 import org.academiadecodigo.bootcamp.Prompt;
@@ -19,39 +21,32 @@
  */
 public class Bootstrap {
 
+    private CustomerService customerService;
+    private AccountService accountService;
+    private AuthService authService;
+
     /**
-     * Creates a {@code Bank} and populates it with data
-     *
-     * @return the bank
+     * Initializes services and populates test data
      */
-    public Bank generateTestData() {
-
-        Bank bank = new Bank();
-        CustomerServiceImpl customerService = new CustomerServiceImpl();
-        AccountServiceImpl accountService = new AccountServiceImpl();
-        AuthServiceImpl authService = new AuthServiceImpl(customerService);
-        
-        bank.setCustomerService(customerService);
-        bank.setAccountService(accountService);
-        bank.setAuthService(authService);
+    public void generateTestData() {
+        customerService = new CustomerServiceImpl();
+        accountService = new AccountServiceImpl();
+        authService = new AuthServiceImpl(customerService);
 
         Customer c1 = new Customer(1, "Rui");
         Customer c2 = new Customer(2, "Sergio");
         Customer c3 = new Customer(3, "Bruno");
-        bank.addCustomer(c1);
-        bank.addCustomer(c2);
-        bank.addCustomer(c3);
-
-        return bank;
+        customerService.add(c1);
+        customerService.add(c2);
+        customerService.add(c3);
     }
 
     /**
      * Wires the necessary object dependencies
      *
-     * @param bank the bank to wire
      * @return the login controller
      */
-    public LoginController wireObjects(Bank bank) {
+    public LoginController wireObjects() {
 
         // attach all input to standard i/o
         Prompt prompt = new Prompt(System.in, System.out);
@@ -60,15 +55,16 @@ public LoginController wireObjects(Bank bank) {
         LoginController loginController = new LoginController();
         LoginView loginView = new LoginView();
         loginController.setView(loginView);
-        loginController.setBank(bank);
-        loginView.setBank(bank);
+        loginController.setAuthService(authService);
+        loginView.setCustomerService(customerService);
         loginView.setLoginController(loginController);
         loginView.setPrompt(prompt);
 
         // wire main controller and view
         MainController mainController = new MainController();
         MainView mainView = new MainView();
-        mainView.setBank(bank);
+        mainView.setCustomerService(customerService);
+        mainView.setAuthService(authService);
         mainView.setPrompt(prompt);
         mainView.setMainController(mainController);
         mainController.setView(mainView);
@@ -78,12 +74,13 @@ public LoginController wireObjects(Bank bank) {
         BalanceController balanceController = new BalanceController();
         BalanceView balanceView = new BalanceView();
         balanceController.setView(balanceView);
-        balanceView.setBank(bank);
+        balanceView.setAuthService(authService);
 
         // wire new account controller and view
         NewAccountView newAccountView = new NewAccountView();
         NewAccountController newAccountController = new NewAccountController();
-        newAccountController.setBank(bank);
+        newAccountController.setAccountService(accountService);
+        newAccountController.setAuthService(authService);
         newAccountController.setView(newAccountView);
         newAccountView.setNewAccountController(newAccountController);
 
@@ -92,14 +89,14 @@ public LoginController wireObjects(Bank bank) {
         WithdrawalController withdrawalController = new WithdrawalController();
         AccountTransactionView depositView = new AccountTransactionView();
         AccountTransactionView withdrawView = new AccountTransactionView();
-        depositController.setBank(bank);
+        depositController.setAccountService(accountService);
         depositController.setView(depositView);
-        withdrawalController.setBank(bank);
+        withdrawalController.setAccountService(accountService);
         withdrawalController.setView(withdrawView);
-        depositView.setBank(bank);
+        depositView.setAuthService(authService);
         depositView.setPrompt(prompt);
         depositView.setTransactionController(depositController);
-        withdrawView.setBank(bank);
+        withdrawView.setAuthService(authService);
         withdrawView.setPrompt(prompt);
         withdrawView.setTransactionController(withdrawalController);
 

src/main/java/io/codeforall/bootcamp/javabank/controller/LoginController.java

@@ -1,6 +1,5 @@
 package io.codeforall.bootcamp.javabank.controller;
 
-import io.codeforall.bootcamp.javabank.model.Bank;
 import io.codeforall.bootcamp.javabank.services.AuthService;
 import io.codeforall.bootcamp.javabank.view.LoginView;
 
@@ -10,15 +9,15 @@
 public class LoginController extends AbstractController  {
 
     private Controller nextController;
-    private Bank bank;
+    private AuthService authService;
 
     /**
-     * Sets the bank
+     * Sets the auth service
      *
-     * @param bank the bank to set
+     * @param authService the auth service to set
      */
-    public void setBank(Bank bank) {
-        this.bank = bank;
+    public void setAuthService(AuthService authService) {
+        this.authService = authService;
     }
 
     /**
@@ -36,7 +35,7 @@ public void setNextController(Controller nextController) {
      * @param id the customer id
      */
     public void onLogin(int id) {
-        bank.getAuthService().authenticate(id);
+        authService.authenticate(id);
         nextController.init();
     }
 }

src/main/java/io/codeforall/bootcamp/javabank/controller/NewAccountController.java

@@ -1,9 +1,9 @@
 package io.codeforall.bootcamp.javabank.controller;
 
 import io.codeforall.bootcamp.javabank.factories.AccountFactory;
-import io.codeforall.bootcamp.javabank.model.Bank;
 import io.codeforall.bootcamp.javabank.model.account.Account;
 import io.codeforall.bootcamp.javabank.model.account.AccountType;
+import io.codeforall.bootcamp.javabank.services.AccountService;
 import io.codeforall.bootcamp.javabank.services.AuthService;
 import io.codeforall.bootcamp.javabank.view.NewAccountView;
 
@@ -12,17 +12,27 @@
  */
 public class NewAccountController extends AbstractController {
 
-    private Bank bank;
+    private AccountService accountService;
+    private AuthService authService;
     private Integer newAccountId;
     private AccountFactory accountFactory = new AccountFactory();
 
     /**
-     * Sets the bank
+     * Sets the account service
      *
-     * @param bank the bank to set
+     * @param accountService the account service to set
      */
-    public void setBank(Bank bank) {
-        this.bank = bank;
+    public void setAccountService(AccountService accountService) {
+        this.accountService = accountService;
+    }
+
+    /**
+     * Sets the auth service
+     *
+     * @param authService the auth service to set
+     */
+    public void setAuthService(AuthService authService) {
+        this.authService = authService;
     }
 
     /**
@@ -47,8 +57,8 @@ public void init() {
 
     private int createAccount() {
         Account newAccount = accountFactory.createAccount(AccountType.CHECKING);
-        bank.getAccountService().add(newAccount);
-        bank.getAuthService().getAccessingCustomer().addAccount(newAccount);
+        accountService.add(newAccount);
+        authService.getAccessingCustomer().addAccount(newAccount);
         return newAccount.getId();
     }
 }

src/main/java/io/codeforall/bootcamp/javabank/controller/transaction/AbstractAccountTransactionController.java

@@ -1,7 +1,7 @@
 package io.codeforall.bootcamp.javabank.controller.transaction;
 
 import io.codeforall.bootcamp.javabank.controller.AbstractController;
-import io.codeforall.bootcamp.javabank.model.Bank;
+import io.codeforall.bootcamp.javabank.services.AccountService;
 
 /**
  * A generic account transaction controller to be used as a base for concrete transaction controller implementations
@@ -10,14 +10,14 @@
  */
 public abstract class AbstractAccountTransactionController extends AbstractController implements AccountTransactionController {
 
-    protected Bank bank;
+    protected AccountService accountService;
 
     /**
-     * Sets the bank
+     * Sets the account service
      *
-     * @param bank the bank to set
+     * @param accountService the account service to set
      */
-    public void setBank(Bank bank) {
-        this.bank = bank;
+    public void setAccountService(AccountService accountService) {
+        this.accountService = accountService;
     }
 }

src/main/java/io/codeforall/bootcamp/javabank/controller/transaction/DepositController.java

@@ -13,6 +13,6 @@ public class DepositController extends AbstractAccountTransactionController {
      */
     @Override
     public void submitTransaction(int accountId, double amount) {
-        bank.getAccountService().deposit(accountId, amount);
+        accountService.deposit(accountId, amount);
     }
 }

src/main/java/io/codeforall/bootcamp/javabank/controller/transaction/WithdrawalController.java

@@ -13,6 +13,6 @@ public class WithdrawalController extends AbstractAccountTransactionController {
      */
     @Override
     public void submitTransaction(int accountId, double amount) {
-        bank.getAccountService().withdraw(accountId, amount);
+        accountService.withdraw(accountId, amount);
     }
 }