FINERACT-2060: Accrual reverse replay logic and Handling

marta-jankovics · Nov 22, 2024 · a28b331 · a28b331
1 parent 281aff3
commit a28b331
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/Loan.java b/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/Loan.java
@@ -3679,6 +3679,10 @@ public void updateInterestRateFrequencyType() {
         this.loanRepaymentScheduleDetail.setInterestPeriodFrequencyType(this.loanProduct.getInterestPeriodFrequencyType());
     }
 
+    public void updateInterestRateFrequencyType(PeriodFrequencyType periodFrequencyType) {
+        this.loanRepaymentScheduleDetail.setInterestPeriodFrequencyType(periodFrequencyType);
+    }
+
     public void addLoanTransaction(final LoanTransaction loanTransaction) {
         this.loanTransactions.add(loanTransaction);
     }

diff --git a/...ineract/portfolio/loanaccount/loanschedule/data/ProgressiveLoanInterestScheduleModel.java b/...ineract/portfolio/loanaccount/loanschedule/data/ProgressiveLoanInterestScheduleModel.java
@@ -34,7 +34,6 @@
 import lombok.experimental.Accessors;
 import org.apache.fineract.infrastructure.core.service.DateUtils;
 import org.apache.fineract.organisation.monetary.domain.Money;
-import org.apache.fineract.portfolio.loanaccount.domain.LoanRepaymentScheduleProcessingWrapper;
 import org.apache.fineract.portfolio.loanproduct.domain.LoanProductRelatedDetail;
 
 @Data
@@ -145,8 +144,16 @@ Optional<RepaymentPeriod> findRepaymentPeriodForBalanceChange(final LocalDate ba
         }
         // TODO use isInPeriod
         return repaymentPeriods.stream()//
-                .filter(repaymentPeriod -> LoanRepaymentScheduleProcessingWrapper.isInPeriod(balanceChangeDate,
-                        repaymentPeriod.getFromDate(), repaymentPeriod.getDueDate(), repaymentPeriod.getPrevious().isEmpty()))
+                .filter(repaymentPeriod -> {
+                    final boolean isFirstPeriod = repaymentPeriod.getPrevious().isEmpty();
+                    if (isFirstPeriod) {
+                        return !balanceChangeDate.isBefore(repaymentPeriod.getFromDate())
+                                && !balanceChangeDate.isAfter(repaymentPeriod.getDueDate());
+                    } else {
+                        return balanceChangeDate.isAfter(repaymentPeriod.getFromDate())
+                                && !balanceChangeDate.isAfter(repaymentPeriod.getDueDate());
+                    }
+                })//
                 .findFirst();
     }