This is an automated email from the ASF dual-hosted git repository.
adamsaghy pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract.git
The following commit(s) were added to refs/heads/develop by this push:
new dad0c70c8 FINERACT-1888-Full-Chargeback-For-Overpaid-Loan
dad0c70c8 is described below
commit dad0c70c80fe24038ca6b959f0997f6efde7e5e6
Author: Ruchi Dhamankar <[email protected]>
AuthorDate: Mon Feb 13 10:31:06 2023 +0530
FINERACT-1888-Full-Chargeback-For-Overpaid-Loan
---
.../LoanWritePlatformServiceJpaRepositoryImpl.java | 4 +-
...ionFullAmountChargebackForOverpaidLoanTest.java | 168 +++++++++++++++++++++
2 files changed, 170 insertions(+), 2 deletions(-)
diff --git
a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanWritePlatformServiceJpaRepositoryImpl.java
b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanWritePlatformServiceJpaRepositoryImpl.java
index aba8b4476..397559efe 100644
---
a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanWritePlatformServiceJpaRepositoryImpl.java
+++
b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanWritePlatformServiceJpaRepositoryImpl.java
@@ -1305,11 +1305,11 @@ public class LoanWritePlatformServiceJpaRepositoryImpl
implements LoanWritePlatf
for (LoanTransactionRelation loanTransactionRelation :
loanTransaction.getLoanTransactionRelations()) {
if
(loanTransactionRelation.getRelationType().equals(LoanTransactionRelationTypeEnum.CHARGEBACK)
&&
loanTransactionRelation.getToTransaction().isNotReversed()) {
- actualAmount =
actualAmount.add(loanTransactionRelation.getToTransaction().getPrincipalPortion());
+ actualAmount =
actualAmount.add(loanTransactionRelation.getToTransaction().getAmount());
}
}
actualAmount = actualAmount.add(chargebackTransaction.getAmount());
- if (loanTransaction.getPrincipalPortion() != null &&
actualAmount.compareTo(loanTransaction.getPrincipalPortion()) > 0) {
+ if (loanTransaction.getAmount() != null &&
actualAmount.compareTo(loanTransaction.getAmount()) > 0) {
throw new
PlatformServiceUnavailableException("error.msg.loan.chargeback.operation.not.allowed",
"Loan transaction:" + loanTransaction.getId() + "
chargeback not allowed as loan transaction amount is not enough",
loanTransaction.getId());
diff --git
a/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanTransactionFullAmountChargebackForOverpaidLoanTest.java
b/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanTransactionFullAmountChargebackForOverpaidLoanTest.java
new file mode 100644
index 000000000..961a794f7
--- /dev/null
+++
b/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanTransactionFullAmountChargebackForOverpaidLoanTest.java
@@ -0,0 +1,168 @@
+/**
+ * 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;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import io.restassured.builder.RequestSpecBuilder;
+import io.restassured.builder.ResponseSpecBuilder;
+import io.restassured.http.ContentType;
+import io.restassured.specification.RequestSpecification;
+import io.restassured.specification.ResponseSpecification;
+import java.util.HashMap;
+import java.util.UUID;
+import org.apache.fineract.client.models.GetDelinquencyBucketsResponse;
+import org.apache.fineract.client.models.GetLoanProductsProductIdResponse;
+import org.apache.fineract.client.models.GetLoansLoanIdResponse;
+import
org.apache.fineract.client.models.GetLoansLoanIdTransactionsTransactionIdResponse;
+import org.apache.fineract.client.models.PostLoansLoanIdTransactionsRequest;
+import org.apache.fineract.client.models.PostLoansLoanIdTransactionsResponse;
+import
org.apache.fineract.client.models.PostLoansLoanIdTransactionsTransactionIdRequest;
+import org.apache.fineract.integrationtests.common.ClientHelper;
+import org.apache.fineract.integrationtests.common.Utils;
+import
org.apache.fineract.integrationtests.common.loans.LoanApplicationTestBuilder;
+import
org.apache.fineract.integrationtests.common.loans.LoanProductTestBuilder;
+import org.apache.fineract.integrationtests.common.loans.LoanTransactionHelper;
+import
org.apache.fineract.integrationtests.common.products.DelinquencyBucketsHelper;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+public class LoanTransactionFullAmountChargebackForOverpaidLoanTest {
+
+ private ResponseSpecification responseSpec;
+ private ResponseSpecification responseSpecErr400;
+ private ResponseSpecification responseSpecErr503;
+ private RequestSpecification requestSpec;
+ private ClientHelper clientHelper;
+ private LoanTransactionHelper loanTransactionHelper;
+
+ @BeforeEach
+ public void setup() {
+ Utils.initializeRESTAssured();
+ this.requestSpec = new
RequestSpecBuilder().setContentType(ContentType.JSON).build();
+ this.requestSpec.header("Authorization", "Basic " +
Utils.loginIntoServerAndGetBase64EncodedAuthenticationKey());
+ this.responseSpec = new
ResponseSpecBuilder().expectStatusCode(200).build();
+ this.responseSpecErr400 = new
ResponseSpecBuilder().expectStatusCode(400).build();
+ this.responseSpecErr503 = new
ResponseSpecBuilder().expectStatusCode(503).build();
+ this.loanTransactionHelper = new
LoanTransactionHelper(this.requestSpec, this.responseSpec);
+ this.clientHelper = new ClientHelper(this.requestSpec,
this.responseSpec);
+ }
+
+ @Test
+ public void loanTransactionChargebackOfFullAmountForOverpaidLoanTest() {
+ // Loan ExternalId
+ String loanExternalIdStr = UUID.randomUUID().toString();
+
+ // Delinquency Bucket
+ final Integer delinquencyBucketId =
DelinquencyBucketsHelper.createDelinquencyBucket(requestSpec, responseSpec);
+ final GetDelinquencyBucketsResponse delinquencyBucket =
DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec,
+ delinquencyBucketId);
+
+ // Client and Loan account creation
+
+ final Integer clientId =
clientHelper.createClient(ClientHelper.defaultClientCreationRequest()).getClientId().intValue();
+ final GetLoanProductsProductIdResponse getLoanProductsProductResponse
= createLoanProduct(loanTransactionHelper,
+ delinquencyBucketId);
+ assertNotNull(getLoanProductsProductResponse);
+
+ final Integer loanId = createLoanAccount(clientId,
getLoanProductsProductResponse.getId(), loanExternalIdStr);
+
+ // make Repayments
+ final PostLoansLoanIdTransactionsResponse repaymentTransaction_1 =
loanTransactionHelper.makeLoanRepayment(loanExternalIdStr,
+ new PostLoansLoanIdTransactionsRequest().dateFormat("dd MMMM
yyyy").transactionDate("5 September 2022").locale("en")
+ .transactionAmount(450.0));
+
+ final PostLoansLoanIdTransactionsResponse repaymentTransaction_2 =
loanTransactionHelper.makeLoanRepayment(loanExternalIdStr,
+ new PostLoansLoanIdTransactionsRequest().dateFormat("dd MMMM
yyyy").transactionDate("6 September 2022").locale("en")
+ .transactionAmount(450.0));
+
+ final PostLoansLoanIdTransactionsResponse repaymentTransaction_3 =
loanTransactionHelper.makeLoanRepayment(loanExternalIdStr,
+ new PostLoansLoanIdTransactionsRequest().dateFormat("dd MMMM
yyyy").transactionDate("7 September 2022").locale("en")
+ .transactionAmount(300.0));
+
+ GetLoansLoanIdResponse loanDetails =
loanTransactionHelper.getLoanDetails((long) loanId);
+
+ // verify loan is overpaid
+ assertNotNull(loanDetails);
+ assertTrue(loanDetails.getStatus().getOverpaid());
+ assertEquals(loanDetails.getTotalOverpaid(), 200.0);
+
+ // verify loan outstanding
+ assertNotNull(loanDetails.getSummary());
+ assertEquals(loanDetails.getSummary().getTotalOutstanding(), 0.0);
+
+ // verify last transaction amount distribution
+ GetLoansLoanIdTransactionsTransactionIdResponse loanTransaction =
loanTransactionHelper.getLoanTransaction(loanId,
+ repaymentTransaction_3.getResourceId().intValue());
+
+ assertNotNull(loanTransaction);
+ assertEquals(loanTransaction.getAmount(), 300.0);
+ assertEquals(loanTransaction.getPrincipalPortion(), 100.0);
+
+ // chargeback for full amount on last repayment for which the amount
is 300 and principal is 100 due to
+ // overpayment adjustment
+ // This verifies that validation for chargeback amount is with total
amount of transaction and not principal
+ // portion.
+ PostLoansLoanIdTransactionsResponse chargebackTransactionResponse =
loanTransactionHelper.chargebackLoanTransaction(
+ loanExternalIdStr, repaymentTransaction_3.getResourceId(),
+ new
PostLoansLoanIdTransactionsTransactionIdRequest().locale("en").transactionAmount(300.0).paymentTypeId(1L));
+
+ assertNotNull(chargebackTransactionResponse);
+ GetLoansLoanIdResponse loanDetailsAfterChargeback =
loanTransactionHelper.getLoanDetails((long) loanId);
+ assertNotNull(loanDetailsAfterChargeback);
+ assertTrue(loanDetailsAfterChargeback.getStatus().getActive());
+
+ // verify loan outstanding
+ assertNotNull(loanDetailsAfterChargeback.getSummary());
+
assertEquals(loanDetailsAfterChargeback.getSummary().getTotalOutstanding(),
100.0);
+
+ // verify chargeback transaction amount distribution
+ GetLoansLoanIdTransactionsTransactionIdResponse chargebackTransaction
= loanTransactionHelper.getLoanTransaction(loanId,
+ chargebackTransactionResponse.getResourceId().intValue());
+
+ assertNotNull(chargebackTransaction);
+ assertEquals(chargebackTransaction.getAmount(), 300.0);
+ assertEquals(chargebackTransaction.getPrincipalPortion(), 100.0);
+
+ }
+
+ private GetLoanProductsProductIdResponse createLoanProduct(final
LoanTransactionHelper loanTransactionHelper,
+ final Integer delinquencyBucketId) {
+ final HashMap<String, Object> loanProductMap = new
LoanProductTestBuilder().build(null, delinquencyBucketId);
+ final Integer loanProductId =
loanTransactionHelper.getLoanProductId(Utils.convertToJson(loanProductMap));
+ return loanTransactionHelper.getLoanProduct(loanProductId);
+ }
+
+ private Integer createLoanAccount(final Integer clientID, final Long
loanProductID, final String externalId) {
+
+ String loanApplicationJSON = new
LoanApplicationTestBuilder().withPrincipal("1000").withLoanTermFrequency("1")
+
.withLoanTermFrequencyAsMonths().withNumberOfRepayments("1").withRepaymentEveryAfter("1")
+
.withRepaymentFrequencyTypeAsMonths().withInterestRatePerPeriod("0").withInterestTypeAsFlatBalance()
+
.withAmortizationTypeAsEqualPrincipalPayments().withInterestCalculationPeriodTypeSameAsRepaymentPeriod()
+ .withExpectedDisbursementDate("03 September
2022").withSubmittedOnDate("01 September 2022").withLoanType("individual")
+ .withExternalId(externalId).build(clientID.toString(),
loanProductID.toString(), null);
+
+ final Integer loanId =
loanTransactionHelper.getLoanId(loanApplicationJSON);
+ loanTransactionHelper.approveLoan("02 September 2022", "1000", loanId,
null);
+ loanTransactionHelper.disburseLoanWithNetDisbursalAmount("03 September
2022", loanId, "1000");
+ return loanId;
+ }
+}
