You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fineract.apache.org by "ruchiD (via GitHub)" <gi...@apache.org> on 2023/05/19 09:05:31 UTC
[GitHub] [fineract] ruchiD opened a new pull request, #3190: FINERACT-1905-Charge-submitted-date-Accrual-entry-reverse-issue
ruchiD opened a new pull request, #3190:
URL: https://github.com/apache/fineract/pull/3190
## Description
Fixed recalculate accrual for charge submitted-date accrual entry creation.
Describe the changes made and why they were made.
Ignore if these details are present on the associated [Apache Fineract JIRA ticket](https://github.com/apache/fineract/pull/1284).
## Checklist
Please make sure these boxes are checked before submitting your pull request - thanks!
- [ ] Write the commit message as per https://github.com/apache/fineract/#pull-requests
- [ ] Acknowledge that we will not review PRs that are not passing the build _("green")_ - it is your responsibility to get a proposed PR to pass the build, not primarily the project's maintainers.
- [ ] Create/update unit or integration tests for verifying the changes made.
- [ ] Follow coding conventions at https://cwiki.apache.org/confluence/display/FINERACT/Coding+Conventions.
- [ ] Add required Swagger annotation and update API documentation at fineract-provider/src/main/resources/static/legacy-docs/apiLive.htm with details of any API changes
- [ ] Submission is not a "code dump". (Large changes can be made "in repository" via a branch. Ask on the developer mailing list for guidance, if required.)
FYI our guidelines for code reviews are at https://cwiki.apache.org/confluence/display/FINERACT/Code+Review+Guide.
--
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: commits-unsubscribe@fineract.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [fineract] adamsaghy merged pull request #3190: FINERACT-1905-Charge-submitted-date-Accrual-entry-reverse-issue
Posted by "adamsaghy (via GitHub)" <gi...@apache.org>.
adamsaghy merged PR #3190:
URL: https://github.com/apache/fineract/pull/3190
--
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: commits-unsubscribe@fineract.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [fineract] adamsaghy commented on a diff in pull request #3190: FINERACT-1905-Charge-submitted-date-Accrual-entry-reverse-issue
Posted by "adamsaghy (via GitHub)" <gi...@apache.org>.
adamsaghy commented on code in PR #3190:
URL: https://github.com/apache/fineract/pull/3190#discussion_r1198806052
##########
fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/Loan.java:
##########
@@ -1322,8 +1322,54 @@ private void applyAccurals() {
private void applyPeriodicAccruals(final Collection<LoanTransaction> accruals) {
List<LoanRepaymentScheduleInstallment> installments = getRepaymentScheduleInstallments();
+ if (TemporaryConfigurationServiceContainer.getAccrualDateConfigForCharge().equalsIgnoreCase("submitted-date")) {
+ updateInstallmentsForChargeSubmittedDateProcessing(installments, accruals);
+ } else {
+ updateInstallmentsForDefaultProcessing(installments, accruals);
+ }
+ LoanRepaymentScheduleInstallment lastInstallment = getLastLoanRepaymentScheduleInstallment();
+ for (LoanTransaction loanTransaction : accruals) {
+ if (loanTransaction.getTransactionDate().isAfter(lastInstallment.getDueDate()) && !loanTransaction.isReversed()) {
+ loanTransaction.reverse();
+ }
+ }
+ }
+
+ private void updateInstallmentsForChargeSubmittedDateProcessing(List<LoanRepaymentScheduleInstallment> installments,
+ Collection<LoanTransaction> accruals) {
for (LoanRepaymentScheduleInstallment installment : installments) {
+ Money interest = Money.zero(getCurrency());
+ Money fee = Money.zero(getCurrency());
+ Money penality = Money.zero(getCurrency());
+ for (LoanTransaction loanTransaction : accruals) {
+ LocalDate chargeDueDate = loanTransaction.getLoanChargesPaid().stream().findFirst().get().getLoanCharge().getDueDate();
Review Comment:
I think the logic is correct, however i would not have duplicate the rest of the logic instead:
```
boolean isBasedOnSubmittedOnDate = TemporaryConfigurationServiceContainer.getAccrualDateConfigForCharge().equalsIgnoreCase("submitted-date")
for (LoanRepaymentScheduleInstallment installment : installments) {
Money interest = Money.zero(getCurrency());
Money fee = Money.zero(getCurrency());
Money penality = Money.zero(getCurrency());
for (LoanTransaction loanTransaction : accruals) {
LocalDate chargeDueDate = isBasedOnSubmittedOnDate ?loanTransaction.getLoanChargesPaid().stream().findFirst().get().getLoanCharge().getDueDate() : loanTransaction.getTransactionDate();
boolean isInRange = installment.isFirstPeriod()
? !chargeDueDate.isBefore(installment.getFromDate()) && !chargeDueDate.isAfter(installment.getDueDate())
: chargeDueDate.isAfter(installment.getFromDate()) && !chargeDueDate.isAfter(installment.getDueDate());
if (isInRange) {
interest = interest.plus(loanTransaction.getInterestPortion(getCurrency()));
fee = fee.plus(loanTransaction.getFeeChargesPortion(getCurrency()));
penality = penality.plus(loanTransaction.getPenaltyChargesPortion(getCurrency()));
if (installment.getFeeChargesCharged(getCurrency()).isLessThan(fee)
|| installment.getInterestCharged(getCurrency()).isLessThan(interest)
|| installment.getPenaltyChargesCharged(getCurrency()).isLessThan(penality)
|| (isInterestBearing() && getAccruedTill().isEqual(loanTransaction.getTransactionDate())
&& !installment.getDueDate().isEqual(getAccruedTill()))) {
interest = interest.minus(loanTransaction.getInterestPortion(getCurrency()));
fee = fee.minus(loanTransaction.getFeeChargesPortion(getCurrency()));
penality = penality.minus(loanTransaction.getPenaltyChargesPortion(getCurrency()));
loanTransaction.reverse();
}
}
}
installment.updateAccrualPortion(interest, fee, penality);
}
}
```
@ruchiD What do you think?
--
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: commits-unsubscribe@fineract.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org