Merge pull request #2 from jasquier/jasquier

Jasquier

Author: jasquier

.idea/workspace.xml

@@ -3,4 +3,4 @@
 /**
  * Created by johnsquier on 1/17/17.
  */
-public enum ApprovalStatus {APPROVED, NOT_APPROVED, ZERO_TRANSACTION;}
+public enum ApprovalStatus {APPROVED, NOT_APPROVED, ZERO_TRANSACTION, CANT_COMPLETE_DUE_TO_ACCT_STATUS;}

AccessControlLab.png

@@ -9,7 +9,7 @@ public class BankAccount {
 
     private BankAccountType accountType;
     private int accountNumber;
-    private static int nextAccoutNumber = 1;
+    private static int nextAccountNumber = 1;
     private double balance;
     private String accountHoldersName;
     private double interestRate;
@@ -20,7 +20,7 @@ public class BankAccount {
     public BankAccount(BankAccountType accountType, double balance, String accountHoldersName, double interestRate,
                        BankAccountStatus accountStatus, OverdraftProtection overdraftProtection) {
         this.accountType = accountType;
-        accountNumber = nextAccoutNumber++;
+        accountNumber = nextAccountNumber++;
         this.balance = balance;
         this.accountHoldersName = accountHoldersName;
         this.interestRate = interestRate;
@@ -31,30 +31,174 @@ public BankAccount(BankAccountType accountType, double balance, String accountHo
 
     public Double getBalance() {
         if ( accountStatus.equals(BankAccountStatus.OFAC_FROZEN) ) {
-            // do nothing probably throw an expection at some point
             return null;
         }
         else {
             return balance;
         }
     }
 
+    public String getAccountHoldersName() {
+        return accountHoldersName;
+    }
+
+    public void setAccountHoldersName(String newName) {
+        if ( accountStatus.equals(BankAccountStatus.OPEN) ) {
+            accountHoldersName = newName;
+
+            transactionRecord.add(new BankAccountTransaction(TransactionType.NAME_CHANGE, 0.0,
+                                                            accountStatus, this.accountHoldersName)); 
+
+        return;
+    }
+
+    public BankAccountStatus getAccountStatus() {
+        return accountStatus;
+    }
+
+    public void setAccountStatus(BankAccountStatus accountStatus) {
+        if ( isAccountOpenOrFrozen() ) {
+            // check balance if trying to close
+            if ( isNewAccountStatusClose(accountStatus) ) {
+                if ( this.balance == 0.0 ) {
+                    this.accountStatus = accountStatus;
+
+                    transactionRecord.add(new BankAccountTransaction(TransactionType.STATUS_CHANGE, 0.0,
+                                                                    this.accountStatus, accountHoldersName));
+                }
+            }
+            else {
+                this.accountStatus = accountStatus;
+
+                transactionRecord.add(new BankAccountTransaction(TransactionType.STATUS_CHANGE, 0.0,
+                        this.accountStatus, accountHoldersName));
+            }
+        }
+
+        return;
+    }
+
+    private boolean isAccountOpenOrFrozen() {
+        return !accountStatus.equals(BankAccountStatus.CLOSED);
+    }
+
+    private boolean isNewAccountStatusClose(BankAccountStatus newStatus) {
+        return newStatus.equals(BankAccountStatus.CLOSED);
+    }
+
     public ApprovalStatus updateBalanceWithCreditOrDebit(double amount) {
+
         if ( accountStatus.equals(BankAccountStatus.OPEN) ) {
+
+            if ( overdraftProtection.equals(OverdraftProtection.ENABLED) ) {
+                if ( isTransactionAnOverDraft(amount) ) {
+                    return ApprovalStatus.NOT_APPROVED;
+                }
+            }
+
             if ( amount > 0.0 ) {
-                credit(amount);
+                return credit(amount);
+            }
+            else if ( amount < 0.0 ) {
+                return debit(amount);
             }
             else {
-                debit(amount);
+                return ApprovalStatus.ZERO_TRANSACTION;
+            }
+        }
+        else {
+            return ApprovalStatus.CANT_COMPLETE_DUE_TO_ACCT_STATUS;
+        }
+    }
+
+    private ApprovalStatus credit(double amountToCredit) {
+        Double previousBalance = getBalance();
+        balance += amountToCredit;
+
+        // check if balance updated
+        if ( (previousBalance + amountToCredit) == getBalance() ) {
+            // create new transaction record and add to list
+            transactionRecord.add(new BankAccountTransaction(TransactionType.DEPOSIT,
+                                                            amountToCredit, accountStatus, accountHoldersName));
+            return ApprovalStatus.APPROVED;
+        }
+        else {
+            return ApprovalStatus.NOT_APPROVED;
+        }
+    }
+
+    private ApprovalStatus debit(double amountToDebit) {
+        Double previousBalance = getBalance();
+        balance += amountToDebit;
+
+        if ( (previousBalance - amountToDebit) == getBalance() ) {
+            // create new transaction record
+            transactionRecord.add(new BankAccountTransaction(TransactionType.WITHDRAWL, amountToDebit,
+                                                            accountStatus, accountHoldersName));
+            return ApprovalStatus.APPROVED;
+        }
+        else {
+            return ApprovalStatus.NOT_APPROVED;
+        }
+    }
+
+
+    private boolean isTransactionAnOverDraft(double amount) {
+        return (Math.abs(amount) > this.getBalance());
+    }
+
+    // refactor this and transferBalanceTo, gotta be some reapeat code
+    public ApprovalStatus transferBalanceFrom(BankAccount transferFrom, double amountToTransfer) {
+        if ( bothAccountsHaveSameOwner(this, transferFrom) ) {
+
+            if ( doesAccountHaveSufficientBalance(transferFrom, amountToTransfer) ) {
+                ApprovalStatus debitApproval = transferFrom.updateBalanceWithCreditOrDebit(-amountToTransfer);
+                ApprovalStatus creditApproval = this.updateBalanceWithCreditOrDebit(amountToTransfer);
+
+                transactionRecord.add(new BankAccountTransaction(TransactionType.TRANSFER, amountToTransfer,
+                                                                accountStatus, accountHoldersName));
+
+                // pull out into check approvals method
+                if ( (debitApproval.equals(ApprovalStatus.APPROVED))
+                        && creditApproval.equals(ApprovalStatus.APPROVED) ) {
+                    return ApprovalStatus.APPROVED;
+                }
             }
         }
+
+        return ApprovalStatus.NOT_APPROVED;
     }
 
-    private ApprovalStatus credit(double amount) {
+    public ApprovalStatus transferBalanceTo(BankAccount transferTo, double amountToTransfer) {
+        // check if both accts have the same owener
+        if ( bothAccountsHaveSameOwner(this, transferTo) ) {
+
+            // check if from has enough money
+            if (doesAccountHaveSufficientBalance(this, amountToTransfer)) {
 
+                // do the transfer
+                ApprovalStatus debitApproval = this.updateBalanceWithCreditOrDebit(-amountToTransfer);
+                ApprovalStatus creditApproval = transferTo.updateBalanceWithCreditOrDebit(amountToTransfer);
+
+                transactionRecord.add(new BankAccountTransaction(TransactionType.TRANSFER, amountToTransfer,
+                        accountStatus, accountHoldersName));
+
+
+                if ((debitApproval.equals(ApprovalStatus.APPROVED))
+                        && creditApproval.equals(ApprovalStatus.APPROVED)) {
+                    return ApprovalStatus.APPROVED;
+                }
+            }
+        }
+
+        return ApprovalStatus.NOT_APPROVED;
     }
 
-    private ApprovalStatus debit(double amount) {
+    private boolean bothAccountsHaveSameOwner(BankAccount transferFrom, BankAccount transferTo) {
+        return transferFrom.getAccountHoldersName().equals(transferTo.accountHoldersName);
+    }
 
+    private boolean doesAccountHaveSufficientBalance(BankAccount acct, double amount) {
+        return acct.getBalance() >= amount;
     }
 }

src/main/java/squier/john/accessControl/ApprovalStatus.java

@@ -5,7 +5,7 @@
  */
 public class BankAccountTransaction {
     private TransactionType transactionType;
-    private double transactionAmount;
+    private Double transactionAmount;
     private BankAccountStatus newStatus;
     private String newName;
 
@@ -16,4 +16,9 @@ public BankAccountTransaction(TransactionType transactionType, double transactio
         this.newStatus = newStatus;
         this.newName = newName;
     }
+
+    public TransactionType getTransactionType() { return transactionType; }
+    public Double getTransactionAmount() { return transactionAmount; }
+    public BankAccountStatus getBankAccountStatus() { return newStatus; }
+    public String getName() { return  newName}
 }