FINERACT-1500:SavingsHoldAccountLien

fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/SavingsApiConstants.java

@@ -142,6 +142,7 @@ public class SavingsApiConstants {
 
     // transaction parameters
     public static final String transactionDateParamName = "transactionDate";
+    public static final String lienParamName = "lien";
     public static final String transactionAmountParamName = "transactionAmount";
     public static final String paymentDetailDataParamName = "paymentDetailData";
     public static final String runningBalanceParamName = "runningBalance";

fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/data/SavingsAccountTransactionDataValidator.java

@@ -23,6 +23,7 @@ import static org.apache.fineract.portfolio.savings.SavingsApiConstants.activate
 import static org.apache.fineract.portfolio.savings.SavingsApiConstants.bankNumberParamName;
 import static org.apache.fineract.portfolio.savings.SavingsApiConstants.checkNumberParamName;
 import static org.apache.fineract.portfolio.savings.SavingsApiConstants.closedOnDateParamName;
+import static org.apache.fineract.portfolio.savings.SavingsApiConstants.lienParamName;
 import static org.apache.fineract.portfolio.savings.SavingsApiConstants.paymentTypeIdParamName;
 import static org.apache.fineract.portfolio.savings.SavingsApiConstants.receiptNumberParamName;
 import static org.apache.fineract.portfolio.savings.SavingsApiConstants.routingCodeParamName;
@@ -68,7 +69,7 @@ public class SavingsAccountTransactionDataValidator {
     private final FromJsonHelper fromApiJsonHelper;
     private static final Set<String> SAVINGS_ACCOUNT_HOLD_AMOUNT_REQUEST_DATA_PARAMETERS = new HashSet<>(
             Arrays.asList(transactionDateParamName, SavingsApiConstants.dateFormatParamName, SavingsApiConstants.localeParamName,
-                    transactionAmountParamName));
+                    transactionAmountParamName, lienParamName));
     private final ConfigurationDomainService configurationDomainService;
 
     @Autowired
@@ -206,6 +207,7 @@ public class SavingsAccountTransactionDataValidator {
 
     public SavingsAccountTransaction validateHoldAndAssembleForm(final String json, final SavingsAccount account, final AppUser createdUser,
             final boolean backdatedTxnsAllowedTill) {
+
         if (StringUtils.isBlank(json)) {
             throw new InvalidJsonException();
         }
@@ -222,6 +224,7 @@ public class SavingsAccountTransactionDataValidator {
         final BigDecimal amount = this.fromApiJsonHelper.extractBigDecimalWithLocaleNamed(transactionAmountParamName, element);
         baseDataValidator.reset().parameter(transactionAmountParamName).value(amount).notNull().positiveAmount();
         final LocalDate transactionDate = this.fromApiJsonHelper.extractLocalDateNamed(transactionDateParamName, element);
+
         baseDataValidator.reset().parameter(transactionDateParamName).value(transactionDate).notNull();
         boolean isActive = account.isActive();
 
@@ -230,8 +233,22 @@ public class SavingsAccountTransactionDataValidator {
                     .failWithCodeNoParameterAddedToErrorCode(SavingsApiConstants.ERROR_MSG_SAVINGS_ACCOUNT_NOT_ACTIVE);
         }
         account.holdAmount(amount);
-        if (account.getWithdrawableBalance().compareTo(BigDecimal.ZERO) < 0) {
-            baseDataValidator.reset().failWithCodeNoParameterAddedToErrorCode("insufficient balance", account.getId());
+
+        if (account.getEnforceMinRequiredBalance()) {
+            if (account.getWithdrawableBalance().compareTo(BigDecimal.ZERO) < 0) {
+                baseDataValidator.reset().failWithCodeNoParameterAddedToErrorCode("insufficient balance", account.getId());
+            }
+        }
+
+        Boolean lien = false;
+
+        if (this.fromApiJsonHelper.parameterExists(lienParamName, element)) {
+            lien = this.fromApiJsonHelper.extractBooleanNamed(lienParamName, element);
+            if (!lien) {
+                if (account.getWithdrawableBalanceWithoutMinimumBalance().compareTo(BigDecimal.ZERO) < 0) {
+                    baseDataValidator.reset().failWithCodeNoParameterAddedToErrorCode("insufficient balance", account.getId());
+                }
+            }
         }
 
         LocalDate lastTransactionDate = null;

fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/SavingsAccount.java

@@ -1935,6 +1935,10 @@ public class SavingsAccount extends AbstractPersistableCustom {
         return this.savingsOfficer;
     }
 
+    public Boolean getEnforceMinRequiredBalance() {
+        return this.enforceMinRequiredBalance;
+    }
+
     public void unassignSavingsOfficer() {
         this.savingsOfficer = null;
     }
@@ -3367,6 +3371,10 @@ public class SavingsAccount extends AbstractPersistableCustom {
                 .subtract(this.getSavingsHoldAmount());
     }
 
+    public BigDecimal getWithdrawableBalanceWithoutMinimumBalance() {
+        return getAccountBalance().subtract(this.getOnHoldFunds()).subtract(this.getSavingsHoldAmount());
+    }
+
     public TaxGroup getTaxGroup() {
         return this.taxGroup;
     }