You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fineract.apache.org by "b0c1 (via GitHub)" <gi...@apache.org> on 2023/02/06 15:54:34 UTC
[GitHub] [fineract] b0c1 opened a new pull request, #2954: FINERACT-1839 Accounting for CBR Reversal
b0c1 opened a new pull request, #2954:
URL: https://github.com/apache/fineract/pull/2954
FINERACT-1839 Accounting for CBR Reversal
- [x] Accrual and Cash Processor support
- [x] Integration test
- [x] Sonarlint code smell fix
## Description
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 commented on a diff in pull request #2954: FINERACT-1839 Accounting for CBR Reversal
Posted by "adamsaghy (via GitHub)" <gi...@apache.org>.
adamsaghy commented on code in PR #2954:
URL: https://github.com/apache/fineract/pull/2954#discussion_r1097589487
##########
integration-tests/src/test/java/org/apache/fineract/integrationtests/ClientLoanIntegrationTest.java:
##########
@@ -7232,6 +7241,12 @@ public void testCreditBalanceRefundAfterMaturityWithReverseReplayOfRepayments()
assertEquals(100.0, loanDetails.getRepaymentSchedule().getPeriods().get(2).getPrincipalPaid());
assertEquals(100.0, loanDetails.getRepaymentSchedule().getPeriods().get(2).getPrincipalOutstanding());
+ journalEntriesForTransaction = journalEntryHelper.getJournalEntries("L" + loanDetails.getTransactions().get(3).getId());
+ journalItems = journalEntriesForTransaction.getPageItems();
+ assertEquals(3, journalItems.size());
+ assertEquals(1, journalItems.stream().filter(item -> item.getAmount() == 200.0d).count());
+ assertEquals(2, journalItems.stream().filter(item -> item.getAmount() == 100.0d).count());
Review Comment:
It would be better if it is checking which glaccount is used...
--
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 #2954: FINERACT-1839 Accounting for CBR Reversal
Posted by "adamsaghy (via GitHub)" <gi...@apache.org>.
adamsaghy commented on code in PR #2954:
URL: https://github.com/apache/fineract/pull/2954#discussion_r1097586045
##########
fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/AccrualBasedAccountingProcessorForLoan.java:
##########
@@ -129,15 +129,15 @@ private void createJournalEntriesForChargeAdjustment(LoanDTO loanDTO, LoanTransa
Map<GLAccount, BigDecimal> accountMap = new HashMap<>();
// handle principal payment (and reversals)
- if (principalAmount != null && !(principalAmount.compareTo(BigDecimal.ZERO) == 0)) {
+ if (principalAmount != null && principalAmount.compareTo(BigDecimal.ZERO) != 0) {
Review Comment:
It should never happen, but still > 0 would be better... only positive amount it can be
--
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 #2954: FINERACT-1839 Accounting for CBR Reversal
Posted by "adamsaghy (via GitHub)" <gi...@apache.org>.
adamsaghy commented on code in PR #2954:
URL: https://github.com/apache/fineract/pull/2954#discussion_r1097582573
##########
fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/AccrualBasedAccountingProcessorForLoan.java:
##########
@@ -129,15 +129,15 @@ private void createJournalEntriesForChargeAdjustment(LoanDTO loanDTO, LoanTransa
Map<GLAccount, BigDecimal> accountMap = new HashMap<>();
// handle principal payment (and reversals)
- if (principalAmount != null && !(principalAmount.compareTo(BigDecimal.ZERO) == 0)) {
+ if (principalAmount != null && principalAmount.compareTo(BigDecimal.ZERO) != 0) {
Review Comment:
sonar?
--
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 #2954: FINERACT-1839 Accounting for CBR Reversal
Posted by "adamsaghy (via GitHub)" <gi...@apache.org>.
adamsaghy commented on code in PR #2954:
URL: https://github.com/apache/fineract/pull/2954#discussion_r1097701720
##########
fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/CashBasedAccountingProcessorForLoan.java:
##########
@@ -477,13 +476,27 @@ private void createJournalEntriesForCreditBalanceRefund(final LoanDTO loanDTO, f
// transaction properties
final String transactionId = loanTransactionDTO.getTransactionId();
final LocalDate transactionDate = loanTransactionDTO.getTransactionDate();
- final BigDecimal refundAmount = loanTransactionDTO.getAmount();
final boolean isReversal = loanTransactionDTO.isReversed();
final Long paymentTypeId = loanTransactionDTO.getPaymentTypeId();
- this.helper.createJournalEntriesAndReversalsForLoan(office, currencyCode, CashAccountsForLoan.OVERPAYMENT.getValue(),
- CashAccountsForLoan.FUND_SOURCE.getValue(), loanProductId, paymentTypeId, loanId, transactionId, transactionDate,
- refundAmount, isReversal);
+ BigDecimal overpaymentAmount = loanTransactionDTO.getOverPayment();
+ BigDecimal principalAmount = loanTransactionDTO.getPrincipal();
+
+ BigDecimal totalAmount = BigDecimal.ZERO;
+ List<JournalAmountHolder> journalAmountHolders = new ArrayList<>();
+
+ if (principalAmount != null && principalAmount.compareTo(BigDecimal.ZERO) > 0) {
+ totalAmount = totalAmount.add(principalAmount);
+ journalAmountHolders.add(new JournalAmountHolder(AccrualAccountsForLoan.LOAN_PORTFOLIO.getValue(), principalAmount));
+ }
+ if (overpaymentAmount != null && overpaymentAmount.compareTo(BigDecimal.ZERO) > 0) {
+ totalAmount = totalAmount.add(overpaymentAmount);
+ journalAmountHolders.add(new JournalAmountHolder(AccrualAccountsForLoan.OVERPAYMENT.getValue(), overpaymentAmount));
+ }
+
+ JournalAmountHolder totalAmountHolder = new JournalAmountHolder(AccrualAccountsForLoan.FUND_SOURCE.getValue(), totalAmount);
Review Comment:
Use `CashAccountsForLoan` enum here
--
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 #2954: FINERACT-1839 Accounting for CBR Reversal
Posted by "adamsaghy (via GitHub)" <gi...@apache.org>.
adamsaghy commented on code in PR #2954:
URL: https://github.com/apache/fineract/pull/2954#discussion_r1097589487
##########
integration-tests/src/test/java/org/apache/fineract/integrationtests/ClientLoanIntegrationTest.java:
##########
@@ -7232,6 +7241,12 @@ public void testCreditBalanceRefundAfterMaturityWithReverseReplayOfRepayments()
assertEquals(100.0, loanDetails.getRepaymentSchedule().getPeriods().get(2).getPrincipalPaid());
assertEquals(100.0, loanDetails.getRepaymentSchedule().getPeriods().get(2).getPrincipalOutstanding());
+ journalEntriesForTransaction = journalEntryHelper.getJournalEntries("L" + loanDetails.getTransactions().get(3).getId());
+ journalItems = journalEntriesForTransaction.getPageItems();
+ assertEquals(3, journalItems.size());
+ assertEquals(1, journalItems.stream().filter(item -> item.getAmount() == 200.0d).count());
+ assertEquals(2, journalItems.stream().filter(item -> item.getAmount() == 100.0d).count());
Review Comment:
seems one of the assertion is missing
--
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 #2954: FINERACT-1839 Accounting for CBR Reversal
Posted by "adamsaghy (via GitHub)" <gi...@apache.org>.
adamsaghy commented on code in PR #2954:
URL: https://github.com/apache/fineract/pull/2954#discussion_r1097701210
##########
fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/CashBasedAccountingProcessorForLoan.java:
##########
@@ -477,13 +476,27 @@ private void createJournalEntriesForCreditBalanceRefund(final LoanDTO loanDTO, f
// transaction properties
final String transactionId = loanTransactionDTO.getTransactionId();
final LocalDate transactionDate = loanTransactionDTO.getTransactionDate();
- final BigDecimal refundAmount = loanTransactionDTO.getAmount();
final boolean isReversal = loanTransactionDTO.isReversed();
final Long paymentTypeId = loanTransactionDTO.getPaymentTypeId();
- this.helper.createJournalEntriesAndReversalsForLoan(office, currencyCode, CashAccountsForLoan.OVERPAYMENT.getValue(),
- CashAccountsForLoan.FUND_SOURCE.getValue(), loanProductId, paymentTypeId, loanId, transactionId, transactionDate,
- refundAmount, isReversal);
+ BigDecimal overpaymentAmount = loanTransactionDTO.getOverPayment();
+ BigDecimal principalAmount = loanTransactionDTO.getPrincipal();
+
+ BigDecimal totalAmount = BigDecimal.ZERO;
+ List<JournalAmountHolder> journalAmountHolders = new ArrayList<>();
+
+ if (principalAmount != null && principalAmount.compareTo(BigDecimal.ZERO) > 0) {
+ totalAmount = totalAmount.add(principalAmount);
+ journalAmountHolders.add(new JournalAmountHolder(AccrualAccountsForLoan.LOAN_PORTFOLIO.getValue(), principalAmount));
Review Comment:
Use CashAccountsForLoan enum here pls
##########
fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/CashBasedAccountingProcessorForLoan.java:
##########
@@ -477,13 +476,27 @@ private void createJournalEntriesForCreditBalanceRefund(final LoanDTO loanDTO, f
// transaction properties
final String transactionId = loanTransactionDTO.getTransactionId();
final LocalDate transactionDate = loanTransactionDTO.getTransactionDate();
- final BigDecimal refundAmount = loanTransactionDTO.getAmount();
final boolean isReversal = loanTransactionDTO.isReversed();
final Long paymentTypeId = loanTransactionDTO.getPaymentTypeId();
- this.helper.createJournalEntriesAndReversalsForLoan(office, currencyCode, CashAccountsForLoan.OVERPAYMENT.getValue(),
- CashAccountsForLoan.FUND_SOURCE.getValue(), loanProductId, paymentTypeId, loanId, transactionId, transactionDate,
- refundAmount, isReversal);
+ BigDecimal overpaymentAmount = loanTransactionDTO.getOverPayment();
+ BigDecimal principalAmount = loanTransactionDTO.getPrincipal();
+
+ BigDecimal totalAmount = BigDecimal.ZERO;
+ List<JournalAmountHolder> journalAmountHolders = new ArrayList<>();
+
+ if (principalAmount != null && principalAmount.compareTo(BigDecimal.ZERO) > 0) {
+ totalAmount = totalAmount.add(principalAmount);
+ journalAmountHolders.add(new JournalAmountHolder(AccrualAccountsForLoan.LOAN_PORTFOLIO.getValue(), principalAmount));
+ }
+ if (overpaymentAmount != null && overpaymentAmount.compareTo(BigDecimal.ZERO) > 0) {
+ totalAmount = totalAmount.add(overpaymentAmount);
+ journalAmountHolders.add(new JournalAmountHolder(AccrualAccountsForLoan.OVERPAYMENT.getValue(), overpaymentAmount));
Review Comment:
Use `CashAccountsForLoan` enum here pls
--
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 #2954: FINERACT-1839 Accounting for CBR Reversal
Posted by "adamsaghy (via GitHub)" <gi...@apache.org>.
adamsaghy commented on code in PR #2954:
URL: https://github.com/apache/fineract/pull/2954#discussion_r1097701210
##########
fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/CashBasedAccountingProcessorForLoan.java:
##########
@@ -477,13 +476,27 @@ private void createJournalEntriesForCreditBalanceRefund(final LoanDTO loanDTO, f
// transaction properties
final String transactionId = loanTransactionDTO.getTransactionId();
final LocalDate transactionDate = loanTransactionDTO.getTransactionDate();
- final BigDecimal refundAmount = loanTransactionDTO.getAmount();
final boolean isReversal = loanTransactionDTO.isReversed();
final Long paymentTypeId = loanTransactionDTO.getPaymentTypeId();
- this.helper.createJournalEntriesAndReversalsForLoan(office, currencyCode, CashAccountsForLoan.OVERPAYMENT.getValue(),
- CashAccountsForLoan.FUND_SOURCE.getValue(), loanProductId, paymentTypeId, loanId, transactionId, transactionDate,
- refundAmount, isReversal);
+ BigDecimal overpaymentAmount = loanTransactionDTO.getOverPayment();
+ BigDecimal principalAmount = loanTransactionDTO.getPrincipal();
+
+ BigDecimal totalAmount = BigDecimal.ZERO;
+ List<JournalAmountHolder> journalAmountHolders = new ArrayList<>();
+
+ if (principalAmount != null && principalAmount.compareTo(BigDecimal.ZERO) > 0) {
+ totalAmount = totalAmount.add(principalAmount);
+ journalAmountHolders.add(new JournalAmountHolder(AccrualAccountsForLoan.LOAN_PORTFOLIO.getValue(), principalAmount));
Review Comment:
Use `CashAccountsForLoan` enum here pls
--
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 #2954: FINERACT-1839 Accounting for CBR Reversal
Posted by "adamsaghy (via GitHub)" <gi...@apache.org>.
adamsaghy commented on code in PR #2954:
URL: https://github.com/apache/fineract/pull/2954#discussion_r1097585430
##########
fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/AccrualBasedAccountingProcessorForLoan.java:
##########
@@ -565,13 +565,28 @@ private void createJournalEntriesForCreditBalanceRefund(final LoanDTO loanDTO, f
// transaction properties
final String transactionId = loanTransactionDTO.getTransactionId();
final LocalDate transactionDate = loanTransactionDTO.getTransactionDate();
- final BigDecimal refundAmount = loanTransactionDTO.getAmount();
final boolean isReversal = loanTransactionDTO.isReversed();
final Long paymentTypeId = loanTransactionDTO.getPaymentTypeId();
- this.helper.createJournalEntriesAndReversalsForLoan(office, currencyCode, AccrualAccountsForLoan.OVERPAYMENT.getValue(),
- AccrualAccountsForLoan.FUND_SOURCE.getValue(), loanProductId, paymentTypeId, loanId, transactionId, transactionDate,
- refundAmount, isReversal);
+ BigDecimal overpaymentAmount = loanTransactionDTO.getOverPayment();
+ BigDecimal principalAmount = loanTransactionDTO.getPrincipal();
+
+ BigDecimal totalAmount = BigDecimal.ZERO;
+ List<JournalAmountHolder> journalAmountHolders = new ArrayList<>();
+
+ if (principalAmount != null && principalAmount.compareTo(BigDecimal.ZERO) != 0) {
Review Comment:
It should never happen, but still > 0 would be better... only positive amount it can be
--
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 #2954: FINERACT-1839 Accounting for CBR Reversal
Posted by "adamsaghy (via GitHub)" <gi...@apache.org>.
adamsaghy merged PR #2954:
URL: https://github.com/apache/fineract/pull/2954
--
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