adamsaghy commented on code in PR #3924:
URL: https://github.com/apache/fineract/pull/3924#discussion_r1634900201
##########
fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/Loan.java:
##########
@@ -3292,54 +3069,40 @@ private boolean
isChronologicallyLatestRepaymentOrWaiver(final LoanTransaction l
for (final LoanTransaction previousTransaction : loanTransactions) {
if (!previousTransaction.isDisbursement() &&
previousTransaction.isNotReversed()
&& (DateUtils.isBefore(currentTransactionDate,
previousTransaction.getTransactionDate())
- || (DateUtils.isEqual(currentTransactionDate,
previousTransaction.getTransactionDate())
- && ((loanTransaction.getId() == null &&
previousTransaction.getId() == null)
- || (loanTransaction.getId() !=
null && (previousTransaction.getId() == null
- ||
loanTransaction.getId().compareTo(previousTransaction.getId()) < 0)))))) {
+ || (DateUtils.isEqual(currentTransactionDate,
previousTransaction.getTransactionDate())
+ && ((loanTransaction.getId() == null &&
previousTransaction.getId() == null)
+ || (loanTransaction.getId() != null &&
(previousTransaction.getId() == null
+ ||
loanTransaction.getId().compareTo(previousTransaction.getId()) < 0)))))) {
isChronologicallyLatestRepaymentOrWaiver = false;
break;
}
}
return isChronologicallyLatestRepaymentOrWaiver;
}
- private boolean isAfterLatRepayment(final LoanTransaction loanTransaction,
final List<LoanTransaction> loanTransactions) {
- boolean isAfterLatRepayment = true;
-
- final LocalDate currentTransactionDate =
loanTransaction.getTransactionDate();
- for (final LoanTransaction previousTransaction : loanTransactions) {
- if (previousTransaction.isRepaymentLikeType() &&
previousTransaction.isNotReversed()
- && DateUtils.isBefore(currentTransactionDate,
previousTransaction.getTransactionDate())) {
- isAfterLatRepayment = false;
- break;
- }
- }
- return isAfterLatRepayment;
+ private boolean isAfterLastRepayment(final LoanTransaction
loanTransaction, final List<LoanTransaction> loanTransactions) {
+ return loanTransactions.stream() //
+ .filter(t -> t.isRepaymentLikeType() && t.isNotReversed()) //
+ .noneMatch(t ->
DateUtils.isEqual(loanTransaction.getTransactionDate(), t.getTransactionDate())
+ ||
DateUtils.isAfter(loanTransaction.getTransactionDate(),
t.getTransactionDate()));
}
private boolean isChronologicallyLatestTransaction(final LoanTransaction
loanTransaction,
final List<LoanTransaction> loanTransactions) {
- boolean isChronologicallyLatestRepaymentOrWaiver = true;
-
- final LocalDate currentTransactionDate =
loanTransaction.getTransactionDate();
- for (final LoanTransaction previousTransaction : loanTransactions) {
- if (previousTransaction.isNotReversed()
- && !DateUtils.isAfter(currentTransactionDate,
previousTransaction.getTransactionDate())) {
- isChronologicallyLatestRepaymentOrWaiver = false;
- break;
- }
- }
- return isChronologicallyLatestRepaymentOrWaiver;
+ return loanTransactions.stream() //
+ .filter(LoanTransaction::isNotReversed) //
+ .noneMatch(t ->
DateUtils.isAfter(loanTransaction.getTransactionDate(),
t.getTransactionDate()));
Review Comment:
I think here the `allMatch` would be the proper one
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]