Skip to content

Commit

Permalink
FINERACT-1981: fix post maturity charge removed by cob on progressive…
Browse files Browse the repository at this point in the history
… loan
  • Loading branch information
magyari-adam committed Dec 5, 2024
1 parent a2c01d2 commit ee725a1
Show file tree
Hide file tree
Showing 2 changed files with 71 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import org.apache.fineract.portfolio.loanaccount.domain.LoanCharge;
import org.apache.fineract.portfolio.loanaccount.loanschedule.data.LoanScheduleDTO;
import org.apache.fineract.portfolio.loanaccount.loanschedule.domain.LoanScheduleModel;
import org.apache.fineract.portfolio.loanaccount.loanschedule.domain.LoanScheduleType;

@RequiredArgsConstructor
public class LoanScheduleService {
Expand Down Expand Up @@ -98,7 +99,8 @@ public void regenerateRepaymentScheduleWithInterestRecalculation(final Loan loan
for (final LoanCharge loanCharge : charges) {
if (!loanCharge.isDueAtDisbursement()) {
loan.updateOverdueScheduleInstallment(loanCharge);
if (loanCharge.getDueLocalDate() == null || !DateUtils.isBefore(lastRepaymentDate, loanCharge.getDueLocalDate())) {
if (loanCharge.getDueLocalDate() == null || (!DateUtils.isBefore(lastRepaymentDate, loanCharge.getDueLocalDate())
&& !loan.getLoanProductRelatedDetail().getLoanScheduleType().equals(LoanScheduleType.PROGRESSIVE))) {
if ((loanCharge.isInstalmentFee() || !loanCharge.isWaived()) && (loanCharge.getDueLocalDate() == null
|| !DateUtils.isAfter(lastTransactionDate, loanCharge.getDueLocalDate()))) {
loanChargeService.recalculateLoanCharge(loan, loanCharge, generatorDTO.getPenaltyWaitPeriod());
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
/**
* 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 java.math.BigDecimal;
import java.util.List;
import org.apache.fineract.client.models.GetLoansLoanIdLoanChargeData;
import org.apache.fineract.client.models.GetLoansLoanIdResponse;
import org.apache.fineract.client.models.PostLoanProductsResponse;
import org.apache.fineract.client.models.PostLoansResponse;
import org.apache.fineract.integrationtests.common.ClientHelper;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

public class LoanChargeProgressiveTest extends BaseLoanIntegrationTest {

private Long clientId;
private Long loanId;

// create client, progressive loan product, loan with disburse limit 1000 for the client,
// and disburse 250 on 01 June 2024
@BeforeEach
public void beforeEach() {
runAt("01 June 2024", () -> {
clientId = clientHelper.createClient(ClientHelper.defaultClientCreationRequest()).getClientId();
final PostLoanProductsResponse loanProductsResponse = loanProductHelper.createLoanProduct(create4IProgressive());
PostLoansResponse postLoansResponse = loanTransactionHelper.applyLoan(
applyLP2ProgressiveLoanRequest(clientId, loanProductsResponse.getResourceId(), "01 June 2024", 1000.0, 10.0, 4, null));
loanId = postLoansResponse.getLoanId();
loanTransactionHelper.approveLoan(loanId, approveLoanRequest(1000.0, "01 June 2024"));
disburseLoan(loanId, BigDecimal.valueOf(250.0), "01 June 2024");
});
}

@Test
public void loanChargeAfterMaturityTest() {
runAt("02 October 2024", () -> {
addLoanCharge(loanId, 6L, "02 October 2024", 25.0d);

final GetLoansLoanIdResponse loanDetails = loanTransactionHelper.getLoanDetails(loanId);
final List<GetLoansLoanIdLoanChargeData> charges = loanDetails.getCharges();
Assertions.assertFalse(charges.isEmpty());

executeInlineCOB(loanId);

final GetLoansLoanIdResponse loanDetails2 = loanTransactionHelper.getLoanDetails(loanId);
final List<GetLoansLoanIdLoanChargeData> charges2 = loanDetails2.getCharges();
Assertions.assertNull(charges2);
});
}
}

0 comments on commit ee725a1

Please sign in to comment.