CBSNexora/cbsnexora-backend
4
0
Fork 0
Code Issues Pull Requests Actions 28 Packages Projects Releases Wiki Activity

FINERACT-2181: No Accrual Activity for not active loans

Browse Source
This commit is contained in:
Adam Saghy
2025-04-12 09:14:52 +02:00
committed by Arnold Gálovics
parent d947183529
commit 815421fd94
2 changed files with 31 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanAccrualActivityProcessingServiceImpl.java
+1 -1
View File
@@ -65,7 +65,7 @@ public class LoanAccrualActivityProcessingServiceImpl implements LoanAccrualActi
@Override
public void makeAccrualActivityTransaction(@NotNull Loan loan, @NotNull LocalDate currentDate) {
if (!loan.getLoanProductRelatedDetail().isEnableAccrualActivityPosting() || loan.isClosed() || loan.getStatus().isOverpaid()) {
if (!loan.getLoanProductRelatedDetail().isEnableAccrualActivityPosting() || !loan.isOpen()) {
return;
}
// check if loan has installment in the past or due on current date
fineract-provider/src/test/java/org/apache/fineract/portfolio/loanaccount/service/LoanAccrualActivityProcessingServiceImplTest.java
+30 -27
View File
@@ -26,17 +26,13 @@ import static org.mockito.Mockito.when;
import java.time.LocalDate;
import java.time.ZoneId;
import java.util.stream.Stream;
import java.util.ArrayList;
import org.apache.fineract.infrastructure.event.business.service.BusinessEventNotifierService;
import org.apache.fineract.portfolio.loanaccount.domain.Loan;
import org.apache.fineract.portfolio.loanaccount.domain.LoanAccountService;
import org.apache.fineract.portfolio.loanaccount.domain.LoanStatus;
import org.apache.fineract.portfolio.loanproduct.domain.LoanProductRelatedDetail;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
@@ -53,9 +49,6 @@ public class LoanAccrualActivityProcessingServiceImplTest {
@Mock
private Loan loan;
@Mock
private LoanStatus loanStatus;
@Mock
private LoanProductRelatedDetail loanProductRelatedDetail;
@@ -68,22 +61,12 @@ public class LoanAccrualActivityProcessingServiceImplTest {
@Mock
private LoanTransactionAssembler loanTransactionAssembler;
@BeforeEach
void setUp() {
when(loan.isClosed()).thenReturn(false);
when(loan.getStatus()).thenReturn(loanStatus);
when(loanStatus.isOverpaid()).thenReturn(false);
}
@ParameterizedTest
@MethodSource("loanStatusTestCases")
void addPeriodicAccruals_ShouldNotProceed_WhenLoanIsClosedOrOverpaid(final boolean isClosed, final boolean isOverpaid) {
@Test
void addPeriodicAccruals_ShouldNotProceed_WhenLoanIsNotOpen() {
// Given
final LocalDate currentDate = LocalDate.now(ZoneId.systemDefault());
when(loan.isClosed()).thenReturn(isClosed);
when(loan.getStatus()).thenReturn(loanStatus);
when(loanStatus.isOverpaid()).thenReturn(isOverpaid);
when(loan.isOpen()).thenReturn(false);
when(loan.getLoanProductRelatedDetail()).thenReturn(loanProductRelatedDetail);
when(loanProductRelatedDetail.isEnableAccrualActivityPosting()).thenReturn(true);
@@ -92,7 +75,7 @@ public class LoanAccrualActivityProcessingServiceImplTest {
accrualActivityProcessingService.makeAccrualActivityTransaction(loan, currentDate);
// Then
verify(loan, times(1)).isClosed();
verify(loan, times(1)).isOpen();
verify(loan, never()).getRepaymentScheduleInstallments(any());
verify(loan, never()).addLoanTransaction(any());
@@ -102,9 +85,29 @@ public class LoanAccrualActivityProcessingServiceImplTest {
verify(businessEventNotifierService, never()).notifyPostBusinessEvent(any());
}
private static Stream<Arguments> loanStatusTestCases() {
return Stream.of(Arguments.of(true, false), // Loan is closed
Arguments.of(false, true) // Loan is overpaid
);
@Test
void addPeriodicAccruals_ShouldProceed_WhenLoanIsOpen() {
// Given
final LocalDate currentDate = LocalDate.now(ZoneId.systemDefault());
when(loan.isOpen()).thenReturn(true);
when(loan.getLoanProductRelatedDetail()).thenReturn(loanProductRelatedDetail);
when(loanProductRelatedDetail.isEnableAccrualActivityPosting()).thenReturn(true);
when(loan.getRepaymentScheduleInstallments()).thenReturn(new ArrayList<>());
// When
accrualActivityProcessingService.makeAccrualActivityTransaction(loan, currentDate);
// Then
verify(loan, times(1)).isOpen();
verify(loan).getRepaymentScheduleInstallments(any());
verify(loan, never()).addLoanTransaction(any());
verify(loanAccountService, never()).saveLoanTransactionWithDataIntegrityViolationChecks(any());
verify(loanTransactionAssembler, never()).assembleAccrualActivityTransaction(any(), any(), any());
verify(businessEventNotifierService, never()).notifyPreBusinessEvent(any());
verify(businessEventNotifierService, never()).notifyPostBusinessEvent(any());
}
}