FINERACT-2354: Re-aging: -Interest Handling Option: Equal amortization

Refactor and code cleanup Loan's isReage() & getReAgeInterestHandlingType()

Author: somasorosdpc

fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/Loan.java

@@ -1825,17 +1825,12 @@ public boolean hasContractTerminationTransaction() {
         return getLoanTransactions().stream().anyMatch(t -> t.isContractTermination() && t.isNotReversed());
     }
 
-    public boolean isReAged() {
-        return getRepaymentScheduleInstallments().stream().anyMatch(LoanRepaymentScheduleInstallment::isReAged);
-    }
-
     public LoanReAgeInterestHandlingType getReAgeInterestHandlingType() {
-        if (isReAged()) {
-            // todo use transaction service
-            return loanTransactions.stream().filter(LoanTransaction::isNotReversed).filter(LoanTransaction::isReAge).findFirst()
-                    .orElseThrow().getLoanReAgeParameter().getInterestHandlingType();
-        }
-        return null;
+        Optional<LoanTransaction> lastReAgeTransaction = loanTransactions.stream()//
+                .filter(LoanTransaction::isNotReversed)//
+                .filter(LoanTransaction::isReAge)//
+                .findFirst();//
+        return lastReAgeTransaction.map(loanTransaction -> loanTransaction.getLoanReAgeParameter().getInterestHandlingType()).orElse(null);
     }
 
     public boolean hasReAgingTransaction() {

fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/reaging/LoanReAgingServiceImpl.java

@@ -95,7 +95,7 @@ public CommandProcessingResult reAge(Long loanId, JsonCommand command) {
         if (reAgeTransaction.getTransactionDate().isBefore(reAgeTransaction.getSubmittedOnDate())
                 || loan.isInterestBearingAndInterestRecalculationEnabled()) {
             if (loan.isProgressiveSchedule() && ((loan.hasChargeOffTransaction() && loan.hasAccelerateChargeOffStrategy())
-                    || loan.hasContractTerminationTransaction() || loan.isReAged())) {
+                    || loan.hasContractTerminationTransaction() || loan.hasReAgingTransaction())) {
                 final ScheduleGeneratorDTO scheduleGeneratorDTO = loanUtilService.buildScheduleGeneratorDTO(loan, null);
                 loanScheduleService.regenerateRepaymentSchedule(loan, scheduleGeneratorDTO);
             }