FINERACT-2015: Fix saving account with withdrawal fee

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

@@ -1346,11 +1346,13 @@ public class SavingsAccount extends AbstractAuditableWithUTCDateTimeCustom<Long>
 
                 if (charge.isEnablePaymentType() && charge.isEnableFreeWithdrawal()) { // discount transaction to
                                                                                        // specific paymentType
-                    if (paymentDetail.getPaymentType().getName().equals(charge.getCharge().getPaymentType().getName())) {
+                    if (paymentDetail != null && paymentDetail.getPaymentType() != null
+                            && paymentDetail.getPaymentType().getName().equals(charge.getCharge().getPaymentType().getName())) {
                         resetFreeChargeDaysCount(charge, transactionAmount, transactionDate, refNo);
                     }
                 } else if (charge.isEnablePaymentType()) { // normal charge-transaction to specific paymentType
-                    if (paymentDetail.getPaymentType().getName().equals(charge.getCharge().getPaymentType().getName())) {
+                    if (paymentDetail != null && paymentDetail.getPaymentType() != null
+                            && paymentDetail.getPaymentType().getName().equals(charge.getCharge().getPaymentType().getName())) {
                         charge.updateWithdralFeeAmount(transactionAmount);
                         this.payCharge(charge, charge.getAmountOutstanding(this.getCurrency()), transactionDate, backdatedTxnsAllowedTill,
                                 refNo);

integration-tests/src/test/java/org/apache/fineract/integrationtests/savings/AccountTransferWithdrawalFeeTest.java

@@ -0,0 +1,191 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.integrationtests.savings;
+
+import static io.restassured.RestAssured.given;
+
+import java.math.BigDecimal;
+import org.apache.fineract.client.models.AccountTransferRequest;
+import org.apache.fineract.client.models.ChargeRequest;
+import org.apache.fineract.client.models.PaymentTypeRequest;
+import org.apache.fineract.client.models.PostChargesResponse;
+import org.apache.fineract.client.models.PostPaymentTypesResponse;
+import org.apache.fineract.client.models.PostSavingsAccountsResponse;
+import org.apache.fineract.client.models.PostSavingsAccountsSavingsAccountIdChargesRequest;
+import org.apache.fineract.client.models.PostSavingsAccountsSavingsAccountIdChargesResponse;
+import org.apache.fineract.client.models.PostSavingsProductsRequest;
+import org.apache.fineract.client.models.PostSavingsProductsResponse;
+import org.apache.fineract.client.models.SavingsAccountData;
+import org.apache.fineract.integrationtests.common.ClientHelper;
+import org.apache.fineract.integrationtests.common.PaymentTypeHelper;
+import org.apache.fineract.integrationtests.common.Utils;
+import org.apache.fineract.integrationtests.common.charges.ChargesHelper;
+import org.apache.fineract.integrationtests.savings.base.BaseSavingsIntegrationTest;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+public class AccountTransferWithdrawalFeeTest extends BaseSavingsIntegrationTest {
+
+    private static final String ACCOUNT_TRANSFER_AMOUNT = "15000.0";
+    private static final String TRANSFER_DATE = "01 March 2013";
+
+    @Test
+    public void testFromSavingsToSavingsAccountTransferWithWithdrawalFee() {
+        // Create withdrawal fee charge (standard withdrawal fee without payment type binding)
+        final ChargesHelper chargesHelper = new ChargesHelper();
+        final PostChargesResponse withdrawalCharge = chargesHelper
+                .createCharges(new ChargeRequest().active(true).name(Utils.uniqueRandomStringGenerator("Charge_Savings_", 6))
+                        .currencyCode("USD").amount(100.0d).chargeAppliesTo(2).chargeTimeType(5).chargeCalculationType(1).locale("en"));
+        Assertions.assertNotNull(withdrawalCharge.getResourceId());
+
+        // Create clients
+        final Long fromClientId = clientHelper.createClient(ClientHelper.defaultClientCreationRequest()).getClientId();
+        final Long toClientId = clientHelper.createClient(ClientHelper.defaultClientCreationRequest()).getClientId();
+
+        // Create savings product with withdrawalFeeForTransfers enabled
+        final PostSavingsProductsResponse savingsProduct = createProduct(savingsProduct());
+        final Long productId = savingsProduct.getResourceId();
+
+        // Create FROM savings account and enable withdrawalFeeForTransfers on it
+        final PostSavingsAccountsResponse fromSavingsResponse = applySavingsAccount(
+                applySavingsRequest(fromClientId, productId, "01 January 2013"));
+        final Long fromSavingsId = fromSavingsResponse.getSavingsId();
+        enableWithdrawalFeeForTransfers(fromSavingsId);
+
+        approveSavingsAccount(fromSavingsId, "01 January 2013");
+        activateSavingsAccount(fromSavingsId, "01 January 2013");
+        deposit(fromSavingsId, "01 January 2013", BigDecimal.valueOf(30000));
+
+        // Add withdrawal fee charge to FROM savings account
+        final PostSavingsAccountsSavingsAccountIdChargesResponse chargeResponse = ok(fineractClient().savingsAccountCharges
+                .addSavingsAccountCharge(fromSavingsId, new PostSavingsAccountsSavingsAccountIdChargesRequest()
+                        .chargeId(withdrawalCharge.getResourceId()).amount(100.0f).locale("en")));
+        Assertions.assertNotNull(chargeResponse.getResourceId());
+
+        // Create TO savings account
+        final PostSavingsAccountsResponse toSavingsResponse = applySavingsAccount(
+                applySavingsRequest(toClientId, productId, "01 January 2013"));
+        final Long toSavingsId = toSavingsResponse.getSavingsId();
+
+        approveSavingsAccount(toSavingsId, "01 January 2013");
+        activateSavingsAccount(toSavingsId, "01 January 2013");
+
+        // Perform transfer - without null-checks in SavingsAccount.payWithdrawalFee(),
+        // this would trigger NPE because paymentDetail is null during account transfers
+        ok(fineractClient().accountTransfers.create4(new AccountTransferRequest().fromClientId(String.valueOf(fromClientId))
+                .fromAccountId(String.valueOf(fromSavingsId)).fromAccountType("2").fromOfficeId("1").toClientId(String.valueOf(toClientId))
+                .toAccountId(String.valueOf(toSavingsId)).toAccountType("2").toOfficeId("1").transferDate(TRANSFER_DATE)
+                .transferAmount(ACCOUNT_TRANSFER_AMOUNT).transferDescription("Transfer").dateFormat(DATETIME_PATTERN).locale("en_GB")));
+
+        // Verify balances: charge has no payment type binding, so it applies as normal withdrawal fee
+        // from = 30000 - 15000 (transfer) - 100 (withdrawal fee) = 14900
+        SavingsAccountData fromSavingsAccount = ok(fineractClient().savingsAccounts.retrieveOne26(fromSavingsId, false, null, "summary"));
+        Assertions.assertEquals(BigDecimal.valueOf(14900).setScale(0), fromSavingsAccount.getSummary().getAccountBalance().setScale(0),
+                "Verifying From Savings Account Balance after Account Transfer with Withdrawal Fee");
+
+        // to = 0 + 15000 (transfer) = 15000
+        SavingsAccountData toSavingsAccount = ok(fineractClient().savingsAccounts.retrieveOne26(toSavingsId, false, null, "summary"));
+        Assertions.assertEquals(BigDecimal.valueOf(15000).setScale(0), toSavingsAccount.getSummary().getAccountBalance().setScale(0),
+                "Verifying To Savings Account Balance after Account Transfer");
+    }
+
+    @Test
+    public void testFromSavingsToSavingsAccountTransferWithPaymentTypeWithdrawalFee() {
+        // Create Payment Type
+        final PaymentTypeHelper paymentTypeHelper = new PaymentTypeHelper();
+        final PostPaymentTypesResponse paymentTypeResponse = paymentTypeHelper
+                .createPaymentType(new PaymentTypeRequest().name("Bank Transfer " + System.currentTimeMillis())
+                        .description("Payment via bank transfer").isCashPayment(false).position(1));
+        final Long paymentTypeId = paymentTypeResponse.getResourceId();
+
+        // Create withdrawal fee charge WITH payment type binding
+        final ChargesHelper chargesHelper = new ChargesHelper();
+        final PostChargesResponse withdrawalCharge = chargesHelper.createCharges(new ChargeRequest().active(true)
+                .name(Utils.uniqueRandomStringGenerator("Charge_Savings_", 6)).currencyCode("USD").amount(100.0d).chargeAppliesTo(2)
+                .chargeTimeType(5).chargeCalculationType(1).locale("en").enablePaymentType(true).paymentTypeId(paymentTypeId));
+        Assertions.assertNotNull(withdrawalCharge.getResourceId());
+
+        // Create clients
+        final Long fromClientId = clientHelper.createClient(ClientHelper.defaultClientCreationRequest()).getClientId();
+        final Long toClientId = clientHelper.createClient(ClientHelper.defaultClientCreationRequest()).getClientId();
+
+        // Create savings product
+        final PostSavingsProductsResponse savingsProduct = createProduct(savingsProduct());
+        final Long productId = savingsProduct.getResourceId();
+
+        // Create FROM savings account with withdrawal fee enabled for transfers
+        final PostSavingsAccountsResponse fromSavingsResponse = applySavingsAccount(
+                applySavingsRequest(fromClientId, productId, "01 January 2013"));
+        final Long fromSavingsId = fromSavingsResponse.getSavingsId();
+        enableWithdrawalFeeForTransfers(fromSavingsId);
+
+        approveSavingsAccount(fromSavingsId, "01 January 2013");
+        activateSavingsAccount(fromSavingsId, "01 January 2013");
+        deposit(fromSavingsId, "01 January 2013", BigDecimal.valueOf(30000));
+
+        // Add payment-type withdrawal fee charge to FROM savings account
+        final PostSavingsAccountsSavingsAccountIdChargesResponse chargeResponse = ok(fineractClient().savingsAccountCharges
+                .addSavingsAccountCharge(fromSavingsId, new PostSavingsAccountsSavingsAccountIdChargesRequest()
+                        .chargeId(withdrawalCharge.getResourceId()).amount(100.0f).locale("en")));
+        Assertions.assertNotNull(chargeResponse.getResourceId());
+
+        // Create TO savings account
+        final PostSavingsAccountsResponse toSavingsResponse = applySavingsAccount(
+                applySavingsRequest(toClientId, productId, "01 January 2013"));
+        final Long toSavingsId = toSavingsResponse.getSavingsId();
+
+        approveSavingsAccount(toSavingsId, "01 January 2013");
+        activateSavingsAccount(toSavingsId, "01 January 2013");
+
+        // Perform transfer - without null-checks in SavingsAccount.payWithdrawalFee(),
+        // this throws NPE because paymentDetail is null and code tries to call
+        // paymentDetail.getPaymentType().getName()
+        ok(fineractClient().accountTransfers.create4(new AccountTransferRequest().fromClientId(String.valueOf(fromClientId))
+                .fromAccountId(String.valueOf(fromSavingsId)).fromAccountType("2").fromOfficeId("1").toClientId(String.valueOf(toClientId))
+                .toAccountId(String.valueOf(toSavingsId)).toAccountType("2").toOfficeId("1").transferDate(TRANSFER_DATE)
+                .transferAmount(ACCOUNT_TRANSFER_AMOUNT).transferDescription("Transfer").dateFormat(DATETIME_PATTERN).locale("en_GB")));
+
+        // The payment-type fee is not applied because paymentDetail is null during transfer
+        // and the null-check skips the payment type matching
+        // from = 30000 - 15000 = 15000
+        SavingsAccountData fromSavingsAccount = ok(fineractClient().savingsAccounts.retrieveOne26(fromSavingsId, false, null, "summary"));
+        Assertions.assertEquals(BigDecimal.valueOf(15000).setScale(0), fromSavingsAccount.getSummary().getAccountBalance().setScale(0),
+                "Verifying From Savings Account Balance after Account Transfer with Payment Type Withdrawal Fee");
+
+        // to = 0 + 15000 = 15000
+        SavingsAccountData toSavingsAccount = ok(fineractClient().savingsAccounts.retrieveOne26(toSavingsId, false, null, "summary"));
+        Assertions.assertEquals(BigDecimal.valueOf(15000).setScale(0), toSavingsAccount.getSummary().getAccountBalance().setScale(0),
+                "Verifying To Savings Account Balance after Account Transfer");
+    }
+
+    private void enableWithdrawalFeeForTransfers(Long savingsId) {
+        given().spec(requestSpec).body("{\"withdrawalFeeForTransfers\": true}").expect().spec(responseSpec).log().ifError().when()
+                .put("/fineract-provider/api/v1/savingsaccounts/" + savingsId + "?" + Utils.TENANT_IDENTIFIER);
+    }
+
+    private PostSavingsProductsRequest savingsProduct() {
+        return new PostSavingsProductsRequest().locale("en").name(Utils.uniqueRandomStringGenerator("SAVINGS_PRODUCT_", 6))
+                .shortName(Utils.uniqueRandomStringGenerator("", 4)).description("Savings product for withdrawal fee test")
+                .currencyCode("USD").digitsAfterDecimal(2).inMultiplesOf(0).nominalAnnualInterestRate(10.0)
+                .interestCompoundingPeriodType(InterestPeriodType.DAILY).interestPostingPeriodType(InterestPeriodType.MONTHLY)
+                .interestCalculationType(InterestCalculationType.DAILY_BALANCE).interestCalculationDaysInYearType(DaysInYearType.DAYS_365)
+                .accountingRule(1).withdrawalFeeForTransfers(true).allowOverdraft(false).enforceMinRequiredBalance(false).withHoldTax(false)
+                .isDormancyTrackingActive(false);
+    }
+}

integration-tests/src/test/java/org/apache/fineract/integrationtests/savings/base/BaseSavingsIntegrationTest.java

@@ -115,6 +115,7 @@ public class BaseSavingsIntegrationTest extends IntegrationTest {
                 .description("Daily interest posting product") //
                 .nominalAnnualInterestRate(10.0) //
                 .digitsAfterDecimal(0) //
+                .inMultiplesOf(0) //
                 .currencyCode("EUR") //
                 .accountingRule(1) // none
                 .interestCalculationDaysInYearType(DaysInYearType.DAYS_365).interestCompoundingPeriodType(InterestPeriodType.DAILY)