MIFOSX-1161: Enforce minRequiredBalance

2014-06-14 12:06:24 -07:00
parent 2aa8b89d65
commit 7f5ff5780f
1 changed files with 9 additions and 2 deletions
@@ -789,9 +789,16 @@ public class SavingsAccount extends AbstractPersistable<Long> {
                runningBalance = runningBalance.minus(transaction.getAmount(this.currency));
            }

+            final BigDecimal withdrawalFee = null;
+            // deal with potential minRequiredBalance and allowOverdraftMinBalance
+            if (this.minRequiredBalance != null && !this.allowOverdraftMinBalance) {
+                if (runningBalance.minus(this.minRequiredBalance).isLessThanZero()) {
+                    throw new InsufficientAccountBalanceException("transactionAmount",
+                            getAccountBalance(), withdrawalFee, transactionAmount);
+                }
+            }
+
            if (runningBalance.isLessThanZero()) {
-                //
-                final BigDecimal withdrawalFee = null;
                Money limit = runningBalance.zero();
                if (this.allowOverdraft) {
                    if (this.overdraftLimit != null) {