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/06/02 12:58:15 UTC
[GitHub] [fineract] ruchiD opened a new pull request, #3220: FINERACT-1806-Post-ChargeOff-Scenarios-1
ruchiD opened a new pull request, #3220:
URL: https://github.com/apache/fineract/pull/3220
## Description
Post Charge-off scenarios:
[1] Repayment and Payments before charge-off
[2] Reverse repayment before charge-off
[3] Reverse replay for transaction before charge-off
[4] Journal entries pre and post charge-off
[5] Tests
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 #3220: FINERACT-1806-Post-ChargeOff-Scenarios-1
Posted by "adamsaghy (via GitHub)" <gi...@apache.org>.
adamsaghy commented on code in PR #3220:
URL: https://github.com/apache/fineract/pull/3220#discussion_r1220975183
##########
fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/Loan.java:
##########
@@ -4484,6 +4486,147 @@ public BigDecimal getProposedPrincipal() {
return this.proposedPrincipal;
}
+ public List<Map<String, Object>> deriveAccountingBridgeDataForChargeOff(final String currencyCode,
+ final List<Long> existingTransactionIds, final List<Long> existingReversedTransactionIds, boolean isAccountTransfer) {
+
+ final List<Map<String, Object>> accountingBridgeData = new ArrayList<>();
+
+ final Map<String, Object> accountingBridgeDataGenericAttributes = new LinkedHashMap<>();
+ accountingBridgeDataGenericAttributes.put("loanId", getId());
+ accountingBridgeDataGenericAttributes.put("loanProductId", productId());
+ accountingBridgeDataGenericAttributes.put("officeId", getOfficeId());
+ accountingBridgeDataGenericAttributes.put("currencyCode", currencyCode);
+ accountingBridgeDataGenericAttributes.put("calculatedInterest", this.summary.getTotalInterestCharged());
+ accountingBridgeDataGenericAttributes.put("cashBasedAccountingEnabled", isCashBasedAccountingEnabledOnLoanProduct());
+ accountingBridgeDataGenericAttributes.put("upfrontAccrualBasedAccountingEnabled", isUpfrontAccrualAccountingEnabledOnLoanProduct());
+ accountingBridgeDataGenericAttributes.put("periodicAccrualBasedAccountingEnabled",
+ isPeriodicAccrualAccountingEnabledOnLoanProduct());
+ accountingBridgeDataGenericAttributes.put("isAccountTransfer", isAccountTransfer);
+
+ // get map before charge-off
+ final Map<String, Object> accountingBridgeDataBeforeChargeOff = new LinkedHashMap<>(accountingBridgeDataGenericAttributes);
+ accountingBridgeDataBeforeChargeOff.put("isChargeOff", false);
+ accountingBridgeDataBeforeChargeOff.put("isFraud", false);
+
+ Predicate<LoanTransaction> isBeforeChargeOff = transaction -> transaction.getTransactionDate().isBefore(getChargedOffOnDate());
+ final List<Map<String, Object>> newLoanTransactionsBeforeChargeOff = new ArrayList<>();
+
+ getTransactionsForAccountingBridgeData(currencyCode, existingTransactionIds, existingReversedTransactionIds,
+ newLoanTransactionsBeforeChargeOff, isBeforeChargeOff);
+
+ // get map after charge-off
+ final Map<String, Object> accountingBridgeDataAfterChargeOff = new LinkedHashMap<>(accountingBridgeDataGenericAttributes);
+ accountingBridgeDataAfterChargeOff.put("isChargeOff", isChargedOff());
+ accountingBridgeDataAfterChargeOff.put("isFraud", isFraud());
+
+ Predicate<LoanTransaction> isAfterChargeOff = transaction -> transaction.getTransactionDate().isAfter(getChargedOffOnDate());
+ final List<Map<String, Object>> newLoanTransactionsAfterChargeOff = new ArrayList<>();
+
+ getTransactionsForAccountingBridgeData(currencyCode, existingTransactionIds, existingReversedTransactionIds,
+ newLoanTransactionsAfterChargeOff, isAfterChargeOff);
+
+ // get map onCharge off date
+ Predicate<LoanTransaction> isOnChargeOff = transaction -> transaction.getTransactionDate().isEqual(getChargedOffOnDate());
+ getTransactionsForAccountingBridgeDataOnChargeOffDate(currencyCode, existingTransactionIds, existingReversedTransactionIds,
+ newLoanTransactionsBeforeChargeOff, newLoanTransactionsAfterChargeOff, isOnChargeOff);
+
+ accountingBridgeDataBeforeChargeOff.put("newLoanTransactions", newLoanTransactionsBeforeChargeOff);
+ accountingBridgeData.add(accountingBridgeDataBeforeChargeOff);
+
+ accountingBridgeDataAfterChargeOff.put("newLoanTransactions", newLoanTransactionsAfterChargeOff);
+ accountingBridgeData.add(accountingBridgeDataAfterChargeOff);
+
+ return accountingBridgeData;
+ }
+
+ private void getTransactionsForAccountingBridgeDataOnChargeOffDate(String currencyCode, List<Long> existingTransactionIds,
+ List<Long> existingReversedTransactionIds, List<Map<String, Object>> newLoanTransactionsBeforeChargeOff,
+ List<Map<String, Object>> newLoanTransactionsAfterChargeOff, Predicate<LoanTransaction> chargeOffDateCriteria) {
+ List<LoanTransaction> transactionsOnChargeOffDate = this.loanTransactions.stream().filter(chargeOffDateCriteria)
+ .collect(Collectors.toList());
+ /**
+ *
+ * TODO: Modify logic to retrieve correct charge-off transaction once reverse replay of charge-off is
+ * implemented
+ */
+ LoanTransaction chargeOffTransaction = this.loanTransactions.stream().filter(LoanTransaction::isChargeOff).findFirst().get();
+ Predicate<LoanTransactionRelation> isReplayed = transactionRelation -> transactionRelation.getRelationType()
+ .equals(LoanTransactionRelationTypeEnum.REPLAYED);
+ for (final LoanTransaction transaction : transactionsOnChargeOffDate) {
+ if (!transaction.isChargeOff()) {
+ if (transaction.isReversed() && existingTransactionIds.contains(transaction.getId())
+ && !existingReversedTransactionIds.contains(transaction.getId())) {
+ // transaction on charge-off date got reversed
+ compareWithChargeOffIdAndAddTransactionForAccountingData(currencyCode, newLoanTransactionsBeforeChargeOff,
+ newLoanTransactionsAfterChargeOff, transaction, chargeOffTransaction.getId());
+
+ } else if (!existingTransactionIds.contains(transaction.getId())) {
+ // new transaction,backdated transaction or reverse replay on chargeoff date
+
+ // check transaction relations
+ if (!transaction.getLoanTransactionRelations().isEmpty()) {
+ // if relations has REPLAYED relation then it is reverse replay scenario
+ List<LoanTransactionRelation> replayedTransactionRelations = transaction.getLoanTransactionRelations().stream()
+ .filter(isReplayed).collect(Collectors.toList());
+ if (!replayedTransactionRelations.isEmpty()) {
+ // get transaction Id for first reversed transaction relation
+ Long transactionIdForReversedTransaction = replayedTransactionRelations.get(0).getToTransaction().getId();
+ if (transactionIdForReversedTransaction > chargeOffTransaction.getId()) {
Review Comment:
Both of them are used, the problem is only the transaction date precision is not enough (multiple transaction on the same day). By leveraging on the id is a workaround (for now)
--
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 #3220: FINERACT-1806-Post-ChargeOff-Scenarios-1
Posted by "adamsaghy (via GitHub)" <gi...@apache.org>.
adamsaghy commented on code in PR #3220:
URL: https://github.com/apache/fineract/pull/3220#discussion_r1220975183
##########
fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/Loan.java:
##########
@@ -4484,6 +4486,147 @@ public BigDecimal getProposedPrincipal() {
return this.proposedPrincipal;
}
+ public List<Map<String, Object>> deriveAccountingBridgeDataForChargeOff(final String currencyCode,
+ final List<Long> existingTransactionIds, final List<Long> existingReversedTransactionIds, boolean isAccountTransfer) {
+
+ final List<Map<String, Object>> accountingBridgeData = new ArrayList<>();
+
+ final Map<String, Object> accountingBridgeDataGenericAttributes = new LinkedHashMap<>();
+ accountingBridgeDataGenericAttributes.put("loanId", getId());
+ accountingBridgeDataGenericAttributes.put("loanProductId", productId());
+ accountingBridgeDataGenericAttributes.put("officeId", getOfficeId());
+ accountingBridgeDataGenericAttributes.put("currencyCode", currencyCode);
+ accountingBridgeDataGenericAttributes.put("calculatedInterest", this.summary.getTotalInterestCharged());
+ accountingBridgeDataGenericAttributes.put("cashBasedAccountingEnabled", isCashBasedAccountingEnabledOnLoanProduct());
+ accountingBridgeDataGenericAttributes.put("upfrontAccrualBasedAccountingEnabled", isUpfrontAccrualAccountingEnabledOnLoanProduct());
+ accountingBridgeDataGenericAttributes.put("periodicAccrualBasedAccountingEnabled",
+ isPeriodicAccrualAccountingEnabledOnLoanProduct());
+ accountingBridgeDataGenericAttributes.put("isAccountTransfer", isAccountTransfer);
+
+ // get map before charge-off
+ final Map<String, Object> accountingBridgeDataBeforeChargeOff = new LinkedHashMap<>(accountingBridgeDataGenericAttributes);
+ accountingBridgeDataBeforeChargeOff.put("isChargeOff", false);
+ accountingBridgeDataBeforeChargeOff.put("isFraud", false);
+
+ Predicate<LoanTransaction> isBeforeChargeOff = transaction -> transaction.getTransactionDate().isBefore(getChargedOffOnDate());
+ final List<Map<String, Object>> newLoanTransactionsBeforeChargeOff = new ArrayList<>();
+
+ getTransactionsForAccountingBridgeData(currencyCode, existingTransactionIds, existingReversedTransactionIds,
+ newLoanTransactionsBeforeChargeOff, isBeforeChargeOff);
+
+ // get map after charge-off
+ final Map<String, Object> accountingBridgeDataAfterChargeOff = new LinkedHashMap<>(accountingBridgeDataGenericAttributes);
+ accountingBridgeDataAfterChargeOff.put("isChargeOff", isChargedOff());
+ accountingBridgeDataAfterChargeOff.put("isFraud", isFraud());
+
+ Predicate<LoanTransaction> isAfterChargeOff = transaction -> transaction.getTransactionDate().isAfter(getChargedOffOnDate());
+ final List<Map<String, Object>> newLoanTransactionsAfterChargeOff = new ArrayList<>();
+
+ getTransactionsForAccountingBridgeData(currencyCode, existingTransactionIds, existingReversedTransactionIds,
+ newLoanTransactionsAfterChargeOff, isAfterChargeOff);
+
+ // get map onCharge off date
+ Predicate<LoanTransaction> isOnChargeOff = transaction -> transaction.getTransactionDate().isEqual(getChargedOffOnDate());
+ getTransactionsForAccountingBridgeDataOnChargeOffDate(currencyCode, existingTransactionIds, existingReversedTransactionIds,
+ newLoanTransactionsBeforeChargeOff, newLoanTransactionsAfterChargeOff, isOnChargeOff);
+
+ accountingBridgeDataBeforeChargeOff.put("newLoanTransactions", newLoanTransactionsBeforeChargeOff);
+ accountingBridgeData.add(accountingBridgeDataBeforeChargeOff);
+
+ accountingBridgeDataAfterChargeOff.put("newLoanTransactions", newLoanTransactionsAfterChargeOff);
+ accountingBridgeData.add(accountingBridgeDataAfterChargeOff);
+
+ return accountingBridgeData;
+ }
+
+ private void getTransactionsForAccountingBridgeDataOnChargeOffDate(String currencyCode, List<Long> existingTransactionIds,
+ List<Long> existingReversedTransactionIds, List<Map<String, Object>> newLoanTransactionsBeforeChargeOff,
+ List<Map<String, Object>> newLoanTransactionsAfterChargeOff, Predicate<LoanTransaction> chargeOffDateCriteria) {
+ List<LoanTransaction> transactionsOnChargeOffDate = this.loanTransactions.stream().filter(chargeOffDateCriteria)
+ .collect(Collectors.toList());
+ /**
+ *
+ * TODO: Modify logic to retrieve correct charge-off transaction once reverse replay of charge-off is
+ * implemented
+ */
+ LoanTransaction chargeOffTransaction = this.loanTransactions.stream().filter(LoanTransaction::isChargeOff).findFirst().get();
+ Predicate<LoanTransactionRelation> isReplayed = transactionRelation -> transactionRelation.getRelationType()
+ .equals(LoanTransactionRelationTypeEnum.REPLAYED);
+ for (final LoanTransaction transaction : transactionsOnChargeOffDate) {
+ if (!transaction.isChargeOff()) {
+ if (transaction.isReversed() && existingTransactionIds.contains(transaction.getId())
+ && !existingReversedTransactionIds.contains(transaction.getId())) {
+ // transaction on charge-off date got reversed
+ compareWithChargeOffIdAndAddTransactionForAccountingData(currencyCode, newLoanTransactionsBeforeChargeOff,
+ newLoanTransactionsAfterChargeOff, transaction, chargeOffTransaction.getId());
+
+ } else if (!existingTransactionIds.contains(transaction.getId())) {
+ // new transaction,backdated transaction or reverse replay on chargeoff date
+
+ // check transaction relations
+ if (!transaction.getLoanTransactionRelations().isEmpty()) {
+ // if relations has REPLAYED relation then it is reverse replay scenario
+ List<LoanTransactionRelation> replayedTransactionRelations = transaction.getLoanTransactionRelations().stream()
+ .filter(isReplayed).collect(Collectors.toList());
+ if (!replayedTransactionRelations.isEmpty()) {
+ // get transaction Id for first reversed transaction relation
+ Long transactionIdForReversedTransaction = replayedTransactionRelations.get(0).getToTransaction().getId();
+ if (transactionIdForReversedTransaction > chargeOffTransaction.getId()) {
Review Comment:
Both of them are used, the problem is only the transaction date precision is not enough (multiple transaction on the same day). Leveraging on the id is a workaround (for now)
--
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] galovics merged pull request #3220: FINERACT-1806-Post-ChargeOff-Scenarios-1
Posted by "galovics (via GitHub)" <gi...@apache.org>.
galovics merged PR #3220:
URL: https://github.com/apache/fineract/pull/3220
--
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 #3220: FINERACT-1806-Post-ChargeOff-Scenarios-1
Posted by "adamsaghy (via GitHub)" <gi...@apache.org>.
adamsaghy commented on code in PR #3220:
URL: https://github.com/apache/fineract/pull/3220#discussion_r1219169252
##########
integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanPostChargeOffScenariosTest.java:
##########
@@ -0,0 +1,652 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.integrationtests;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import io.restassured.builder.RequestSpecBuilder;
+import io.restassured.builder.ResponseSpecBuilder;
+import io.restassured.http.ContentType;
+import io.restassured.specification.RequestSpecification;
+import io.restassured.specification.ResponseSpecification;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeFormatterBuilder;
+import java.util.UUID;
+import org.apache.fineract.client.models.GetLoanTransactionRelation;
+import org.apache.fineract.client.models.GetLoansLoanIdResponse;
+import org.apache.fineract.client.models.GetLoansLoanIdTransactionsTransactionIdResponse;
+import org.apache.fineract.client.models.PostLoansLoanIdTransactionsRequest;
+import org.apache.fineract.client.models.PostLoansLoanIdTransactionsResponse;
+import org.apache.fineract.integrationtests.common.ClientHelper;
+import org.apache.fineract.integrationtests.common.Utils;
+import org.apache.fineract.integrationtests.common.accounting.Account;
+import org.apache.fineract.integrationtests.common.accounting.AccountHelper;
+import org.apache.fineract.integrationtests.common.accounting.JournalEntry;
+import org.apache.fineract.integrationtests.common.accounting.JournalEntryHelper;
+import org.apache.fineract.integrationtests.common.charges.ChargesHelper;
+import org.apache.fineract.integrationtests.common.loans.LoanApplicationTestBuilder;
+import org.apache.fineract.integrationtests.common.loans.LoanProductTestBuilder;
+import org.apache.fineract.integrationtests.common.loans.LoanTestLifecycleExtension;
+import org.apache.fineract.integrationtests.common.loans.LoanTransactionHelper;
+import org.apache.fineract.integrationtests.common.system.CodeHelper;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+
+@ExtendWith(LoanTestLifecycleExtension.class)
+public class LoanPostChargeOffScenariosTest {
+
+ private ResponseSpecification responseSpec;
+ private RequestSpecification requestSpec;
+ private ClientHelper clientHelper;
+ private LoanTransactionHelper loanTransactionHelper;
+ private JournalEntryHelper journalEntryHelper;
+ private AccountHelper accountHelper;
+ private Account assetAccount;
+ private Account incomeAccount;
+ private Account expenseAccount;
+ private Account overpaymentAccount;
+ private DateTimeFormatter dateFormatter = new DateTimeFormatterBuilder().appendPattern("dd MMMM yyyy").toFormatter();
+
+ @BeforeEach
+ public void setup() {
+ Utils.initializeRESTAssured();
+ this.requestSpec = new RequestSpecBuilder().setContentType(ContentType.JSON).build();
+ this.requestSpec.header("Authorization", "Basic " + Utils.loginIntoServerAndGetBase64EncodedAuthenticationKey());
+ this.responseSpec = new ResponseSpecBuilder().expectStatusCode(200).build();
+ this.loanTransactionHelper = new LoanTransactionHelper(this.requestSpec, this.responseSpec);
+ this.accountHelper = new AccountHelper(this.requestSpec, this.responseSpec);
+ this.assetAccount = this.accountHelper.createAssetAccount();
+ this.incomeAccount = this.accountHelper.createIncomeAccount();
+ this.expenseAccount = this.accountHelper.createExpenseAccount();
+ this.overpaymentAccount = this.accountHelper.createLiabilityAccount();
+ this.journalEntryHelper = new JournalEntryHelper(this.requestSpec, this.responseSpec);
+ this.clientHelper = new ClientHelper(this.requestSpec, this.responseSpec);
+ }
+
+ @Test
+ public void postChargeOffAddBackdatedTransactionTest() {
Review Comment:
I am afraid these tests are not really validating whether the proper "charged-off" journal accounts were used.... Can you please enhance them and validate whether the reverse-replayed transactions has the proper charged-off journal entries?
--
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] abraham-menyhart commented on a diff in pull request #3220: FINERACT-1806-Post-ChargeOff-Scenarios-1
Posted by "abraham-menyhart (via GitHub)" <gi...@apache.org>.
abraham-menyhart commented on code in PR #3220:
URL: https://github.com/apache/fineract/pull/3220#discussion_r1219238103
##########
fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/Loan.java:
##########
@@ -4484,6 +4486,147 @@ public BigDecimal getProposedPrincipal() {
return this.proposedPrincipal;
}
+ public List<Map<String, Object>> deriveAccountingBridgeDataForChargeOff(final String currencyCode,
Review Comment:
For readability, I would suggest to break this big method into smaller parts (10-20 lines/method).
##########
fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/Loan.java:
##########
@@ -4484,6 +4486,147 @@ public BigDecimal getProposedPrincipal() {
return this.proposedPrincipal;
}
+ public List<Map<String, Object>> deriveAccountingBridgeDataForChargeOff(final String currencyCode,
+ final List<Long> existingTransactionIds, final List<Long> existingReversedTransactionIds, boolean isAccountTransfer) {
+
+ final List<Map<String, Object>> accountingBridgeData = new ArrayList<>();
+
+ final Map<String, Object> accountingBridgeDataGenericAttributes = new LinkedHashMap<>();
+ accountingBridgeDataGenericAttributes.put("loanId", getId());
+ accountingBridgeDataGenericAttributes.put("loanProductId", productId());
+ accountingBridgeDataGenericAttributes.put("officeId", getOfficeId());
+ accountingBridgeDataGenericAttributes.put("currencyCode", currencyCode);
+ accountingBridgeDataGenericAttributes.put("calculatedInterest", this.summary.getTotalInterestCharged());
+ accountingBridgeDataGenericAttributes.put("cashBasedAccountingEnabled", isCashBasedAccountingEnabledOnLoanProduct());
+ accountingBridgeDataGenericAttributes.put("upfrontAccrualBasedAccountingEnabled", isUpfrontAccrualAccountingEnabledOnLoanProduct());
+ accountingBridgeDataGenericAttributes.put("periodicAccrualBasedAccountingEnabled",
+ isPeriodicAccrualAccountingEnabledOnLoanProduct());
+ accountingBridgeDataGenericAttributes.put("isAccountTransfer", isAccountTransfer);
+
+ // get map before charge-off
+ final Map<String, Object> accountingBridgeDataBeforeChargeOff = new LinkedHashMap<>(accountingBridgeDataGenericAttributes);
Review Comment:
You added 3 comments here, in this method, they are perfect markers what you should extract into smaller methods.
Like this first one, you commented "get map before charge-off", and this could be extracted into getAccountingBridgeDataBeforeChargeOff(), or something like this.
##########
fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/Loan.java:
##########
@@ -4484,6 +4486,147 @@ public BigDecimal getProposedPrincipal() {
return this.proposedPrincipal;
}
+ public List<Map<String, Object>> deriveAccountingBridgeDataForChargeOff(final String currencyCode,
+ final List<Long> existingTransactionIds, final List<Long> existingReversedTransactionIds, boolean isAccountTransfer) {
+
+ final List<Map<String, Object>> accountingBridgeData = new ArrayList<>();
+
+ final Map<String, Object> accountingBridgeDataGenericAttributes = new LinkedHashMap<>();
Review Comment:
For example extract this part (creating the accountingBridgeDataGenericAttributes) into a method, like createAccountingBridgeDataGenericAttributes, or something like this.
##########
fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/Loan.java:
##########
@@ -4484,6 +4486,147 @@ public BigDecimal getProposedPrincipal() {
return this.proposedPrincipal;
}
+ public List<Map<String, Object>> deriveAccountingBridgeDataForChargeOff(final String currencyCode,
+ final List<Long> existingTransactionIds, final List<Long> existingReversedTransactionIds, boolean isAccountTransfer) {
+
+ final List<Map<String, Object>> accountingBridgeData = new ArrayList<>();
+
+ final Map<String, Object> accountingBridgeDataGenericAttributes = new LinkedHashMap<>();
+ accountingBridgeDataGenericAttributes.put("loanId", getId());
+ accountingBridgeDataGenericAttributes.put("loanProductId", productId());
+ accountingBridgeDataGenericAttributes.put("officeId", getOfficeId());
+ accountingBridgeDataGenericAttributes.put("currencyCode", currencyCode);
+ accountingBridgeDataGenericAttributes.put("calculatedInterest", this.summary.getTotalInterestCharged());
+ accountingBridgeDataGenericAttributes.put("cashBasedAccountingEnabled", isCashBasedAccountingEnabledOnLoanProduct());
+ accountingBridgeDataGenericAttributes.put("upfrontAccrualBasedAccountingEnabled", isUpfrontAccrualAccountingEnabledOnLoanProduct());
+ accountingBridgeDataGenericAttributes.put("periodicAccrualBasedAccountingEnabled",
+ isPeriodicAccrualAccountingEnabledOnLoanProduct());
+ accountingBridgeDataGenericAttributes.put("isAccountTransfer", isAccountTransfer);
+
+ // get map before charge-off
+ final Map<String, Object> accountingBridgeDataBeforeChargeOff = new LinkedHashMap<>(accountingBridgeDataGenericAttributes);
+ accountingBridgeDataBeforeChargeOff.put("isChargeOff", false);
+ accountingBridgeDataBeforeChargeOff.put("isFraud", false);
+
+ Predicate<LoanTransaction> isBeforeChargeOff = transaction -> transaction.getTransactionDate().isBefore(getChargedOffOnDate());
+ final List<Map<String, Object>> newLoanTransactionsBeforeChargeOff = new ArrayList<>();
+
+ getTransactionsForAccountingBridgeData(currencyCode, existingTransactionIds, existingReversedTransactionIds,
+ newLoanTransactionsBeforeChargeOff, isBeforeChargeOff);
+
+ // get map after charge-off
+ final Map<String, Object> accountingBridgeDataAfterChargeOff = new LinkedHashMap<>(accountingBridgeDataGenericAttributes);
+ accountingBridgeDataAfterChargeOff.put("isChargeOff", isChargedOff());
+ accountingBridgeDataAfterChargeOff.put("isFraud", isFraud());
+
+ Predicate<LoanTransaction> isAfterChargeOff = transaction -> transaction.getTransactionDate().isAfter(getChargedOffOnDate());
+ final List<Map<String, Object>> newLoanTransactionsAfterChargeOff = new ArrayList<>();
+
+ getTransactionsForAccountingBridgeData(currencyCode, existingTransactionIds, existingReversedTransactionIds,
+ newLoanTransactionsAfterChargeOff, isAfterChargeOff);
+
+ // get map onCharge off date
+ Predicate<LoanTransaction> isOnChargeOff = transaction -> transaction.getTransactionDate().isEqual(getChargedOffOnDate());
+ getTransactionsForAccountingBridgeDataOnChargeOffDate(currencyCode, existingTransactionIds, existingReversedTransactionIds,
+ newLoanTransactionsBeforeChargeOff, newLoanTransactionsAfterChargeOff, isOnChargeOff);
+
+ accountingBridgeDataBeforeChargeOff.put("newLoanTransactions", newLoanTransactionsBeforeChargeOff);
+ accountingBridgeData.add(accountingBridgeDataBeforeChargeOff);
+
+ accountingBridgeDataAfterChargeOff.put("newLoanTransactions", newLoanTransactionsAfterChargeOff);
+ accountingBridgeData.add(accountingBridgeDataAfterChargeOff);
+
+ return accountingBridgeData;
+ }
+
+ private void getTransactionsForAccountingBridgeDataOnChargeOffDate(String currencyCode, List<Long> existingTransactionIds,
+ List<Long> existingReversedTransactionIds, List<Map<String, Object>> newLoanTransactionsBeforeChargeOff,
+ List<Map<String, Object>> newLoanTransactionsAfterChargeOff, Predicate<LoanTransaction> chargeOffDateCriteria) {
+ List<LoanTransaction> transactionsOnChargeOffDate = this.loanTransactions.stream().filter(chargeOffDateCriteria)
+ .collect(Collectors.toList());
+ /**
+ *
+ * TODO: Modify logic to retrieve correct charge-off transaction once reverse replay of charge-off is
+ * implemented
+ */
+ LoanTransaction chargeOffTransaction = this.loanTransactions.stream().filter(LoanTransaction::isChargeOff).findFirst().get();
+ Predicate<LoanTransactionRelation> isReplayed = transactionRelation -> transactionRelation.getRelationType()
+ .equals(LoanTransactionRelationTypeEnum.REPLAYED);
+ for (final LoanTransaction transaction : transactionsOnChargeOffDate) {
+ if (!transaction.isChargeOff()) {
+ if (transaction.isReversed() && existingTransactionIds.contains(transaction.getId())
+ && !existingReversedTransactionIds.contains(transaction.getId())) {
+ // transaction on charge-off date got reversed
+ compareWithChargeOffIdAndAddTransactionForAccountingData(currencyCode, newLoanTransactionsBeforeChargeOff,
+ newLoanTransactionsAfterChargeOff, transaction, chargeOffTransaction.getId());
+
+ } else if (!existingTransactionIds.contains(transaction.getId())) {
+ // new transaction,backdated transaction or reverse replay on chargeoff date
+
+ // check transaction relations
+ if (!transaction.getLoanTransactionRelations().isEmpty()) {
+ // if relations has REPLAYED relation then it is reverse replay scenario
+ List<LoanTransactionRelation> replayedTransactionRelations = transaction.getLoanTransactionRelations().stream()
+ .filter(isReplayed).collect(Collectors.toList());
+ if (!replayedTransactionRelations.isEmpty()) {
+ // get transaction Id for first reversed transaction relation
+ Long transactionIdForReversedTransaction = replayedTransactionRelations.get(0).getToTransaction().getId();
+ if (transactionIdForReversedTransaction > chargeOffTransaction.getId()) {
Review Comment:
I'm not sure about this, but are we using transaction id here, to determine whether the transaction happened before/after the chargeOff? I saw transactionDate in the code above, I think that is a better approach to use that.
But I'm not familiar with the business logic here. Maybe @adamsaghy could help me with this.
##########
fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/Loan.java:
##########
@@ -4484,6 +4486,147 @@ public BigDecimal getProposedPrincipal() {
return this.proposedPrincipal;
}
+ public List<Map<String, Object>> deriveAccountingBridgeDataForChargeOff(final String currencyCode,
+ final List<Long> existingTransactionIds, final List<Long> existingReversedTransactionIds, boolean isAccountTransfer) {
+
+ final List<Map<String, Object>> accountingBridgeData = new ArrayList<>();
+
+ final Map<String, Object> accountingBridgeDataGenericAttributes = new LinkedHashMap<>();
+ accountingBridgeDataGenericAttributes.put("loanId", getId());
+ accountingBridgeDataGenericAttributes.put("loanProductId", productId());
+ accountingBridgeDataGenericAttributes.put("officeId", getOfficeId());
+ accountingBridgeDataGenericAttributes.put("currencyCode", currencyCode);
+ accountingBridgeDataGenericAttributes.put("calculatedInterest", this.summary.getTotalInterestCharged());
+ accountingBridgeDataGenericAttributes.put("cashBasedAccountingEnabled", isCashBasedAccountingEnabledOnLoanProduct());
+ accountingBridgeDataGenericAttributes.put("upfrontAccrualBasedAccountingEnabled", isUpfrontAccrualAccountingEnabledOnLoanProduct());
+ accountingBridgeDataGenericAttributes.put("periodicAccrualBasedAccountingEnabled",
+ isPeriodicAccrualAccountingEnabledOnLoanProduct());
+ accountingBridgeDataGenericAttributes.put("isAccountTransfer", isAccountTransfer);
+
+ // get map before charge-off
+ final Map<String, Object> accountingBridgeDataBeforeChargeOff = new LinkedHashMap<>(accountingBridgeDataGenericAttributes);
+ accountingBridgeDataBeforeChargeOff.put("isChargeOff", false);
+ accountingBridgeDataBeforeChargeOff.put("isFraud", false);
+
+ Predicate<LoanTransaction> isBeforeChargeOff = transaction -> transaction.getTransactionDate().isBefore(getChargedOffOnDate());
+ final List<Map<String, Object>> newLoanTransactionsBeforeChargeOff = new ArrayList<>();
+
+ getTransactionsForAccountingBridgeData(currencyCode, existingTransactionIds, existingReversedTransactionIds,
+ newLoanTransactionsBeforeChargeOff, isBeforeChargeOff);
+
+ // get map after charge-off
+ final Map<String, Object> accountingBridgeDataAfterChargeOff = new LinkedHashMap<>(accountingBridgeDataGenericAttributes);
+ accountingBridgeDataAfterChargeOff.put("isChargeOff", isChargedOff());
+ accountingBridgeDataAfterChargeOff.put("isFraud", isFraud());
+
+ Predicate<LoanTransaction> isAfterChargeOff = transaction -> transaction.getTransactionDate().isAfter(getChargedOffOnDate());
+ final List<Map<String, Object>> newLoanTransactionsAfterChargeOff = new ArrayList<>();
+
+ getTransactionsForAccountingBridgeData(currencyCode, existingTransactionIds, existingReversedTransactionIds,
+ newLoanTransactionsAfterChargeOff, isAfterChargeOff);
+
+ // get map onCharge off date
+ Predicate<LoanTransaction> isOnChargeOff = transaction -> transaction.getTransactionDate().isEqual(getChargedOffOnDate());
+ getTransactionsForAccountingBridgeDataOnChargeOffDate(currencyCode, existingTransactionIds, existingReversedTransactionIds,
+ newLoanTransactionsBeforeChargeOff, newLoanTransactionsAfterChargeOff, isOnChargeOff);
+
+ accountingBridgeDataBeforeChargeOff.put("newLoanTransactions", newLoanTransactionsBeforeChargeOff);
+ accountingBridgeData.add(accountingBridgeDataBeforeChargeOff);
+
+ accountingBridgeDataAfterChargeOff.put("newLoanTransactions", newLoanTransactionsAfterChargeOff);
+ accountingBridgeData.add(accountingBridgeDataAfterChargeOff);
+
+ return accountingBridgeData;
+ }
+
+ private void getTransactionsForAccountingBridgeDataOnChargeOffDate(String currencyCode, List<Long> existingTransactionIds,
+ List<Long> existingReversedTransactionIds, List<Map<String, Object>> newLoanTransactionsBeforeChargeOff,
+ List<Map<String, Object>> newLoanTransactionsAfterChargeOff, Predicate<LoanTransaction> chargeOffDateCriteria) {
+ List<LoanTransaction> transactionsOnChargeOffDate = this.loanTransactions.stream().filter(chargeOffDateCriteria)
+ .collect(Collectors.toList());
+ /**
+ *
+ * TODO: Modify logic to retrieve correct charge-off transaction once reverse replay of charge-off is
+ * implemented
+ */
+ LoanTransaction chargeOffTransaction = this.loanTransactions.stream().filter(LoanTransaction::isChargeOff).findFirst().get();
+ Predicate<LoanTransactionRelation> isReplayed = transactionRelation -> transactionRelation.getRelationType()
Review Comment:
Generally, it is better to use the `equals` on the constant, not on the object. If the `getRelationType()` returns a null, then you got `NullPointException`. But if you wrote `REPLAYED.equals(transactionRelation.getRelationType())` , then you are safe. Or you could use `Objects.equals()`, and the order wont matter.
--
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 #3220: FINERACT-1806-Post-ChargeOff-Scenarios-1
Posted by "adamsaghy (via GitHub)" <gi...@apache.org>.
adamsaghy commented on code in PR #3220:
URL: https://github.com/apache/fineract/pull/3220#discussion_r1219162707
##########
fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/Loan.java:
##########
@@ -4484,6 +4486,147 @@ public BigDecimal getProposedPrincipal() {
return this.proposedPrincipal;
}
+ public List<Map<String, Object>> deriveAccountingBridgeDataForChargeOff(final String currencyCode,
+ final List<Long> existingTransactionIds, final List<Long> existingReversedTransactionIds, boolean isAccountTransfer) {
+
+ final List<Map<String, Object>> accountingBridgeData = new ArrayList<>();
+
+ final Map<String, Object> accountingBridgeDataGenericAttributes = new LinkedHashMap<>();
+ accountingBridgeDataGenericAttributes.put("loanId", getId());
+ accountingBridgeDataGenericAttributes.put("loanProductId", productId());
+ accountingBridgeDataGenericAttributes.put("officeId", getOfficeId());
+ accountingBridgeDataGenericAttributes.put("currencyCode", currencyCode);
+ accountingBridgeDataGenericAttributes.put("calculatedInterest", this.summary.getTotalInterestCharged());
+ accountingBridgeDataGenericAttributes.put("cashBasedAccountingEnabled", isCashBasedAccountingEnabledOnLoanProduct());
+ accountingBridgeDataGenericAttributes.put("upfrontAccrualBasedAccountingEnabled", isUpfrontAccrualAccountingEnabledOnLoanProduct());
+ accountingBridgeDataGenericAttributes.put("periodicAccrualBasedAccountingEnabled",
+ isPeriodicAccrualAccountingEnabledOnLoanProduct());
+ accountingBridgeDataGenericAttributes.put("isAccountTransfer", isAccountTransfer);
+
+ // get map before charge-off
+ final Map<String, Object> accountingBridgeDataBeforeChargeOff = new LinkedHashMap<>(accountingBridgeDataGenericAttributes);
+ accountingBridgeDataBeforeChargeOff.put("isChargeOff", false);
+ accountingBridgeDataBeforeChargeOff.put("isFraud", false);
+
+ Predicate<LoanTransaction> isBeforeChargeOff = transaction -> transaction.getTransactionDate().isBefore(getChargedOffOnDate());
+ final List<Map<String, Object>> newLoanTransactionsBeforeChargeOff = new ArrayList<>();
+
+ getTransactionsForAccountingBridgeData(currencyCode, existingTransactionIds, existingReversedTransactionIds,
+ newLoanTransactionsBeforeChargeOff, isBeforeChargeOff);
+
+ // get map after charge-off
+ final Map<String, Object> accountingBridgeDataAfterChargeOff = new LinkedHashMap<>(accountingBridgeDataGenericAttributes);
+ accountingBridgeDataAfterChargeOff.put("isChargeOff", isChargedOff());
+ accountingBridgeDataAfterChargeOff.put("isFraud", isFraud());
+
+ Predicate<LoanTransaction> isAfterChargeOff = transaction -> transaction.getTransactionDate().isAfter(getChargedOffOnDate());
+ final List<Map<String, Object>> newLoanTransactionsAfterChargeOff = new ArrayList<>();
+
+ getTransactionsForAccountingBridgeData(currencyCode, existingTransactionIds, existingReversedTransactionIds,
+ newLoanTransactionsAfterChargeOff, isAfterChargeOff);
+
+ // get map onCharge off date
+ Predicate<LoanTransaction> isOnChargeOff = transaction -> transaction.getTransactionDate().isEqual(getChargedOffOnDate());
+ getTransactionsForAccountingBridgeDataOnChargeOffDate(currencyCode, existingTransactionIds, existingReversedTransactionIds,
+ newLoanTransactionsBeforeChargeOff, newLoanTransactionsAfterChargeOff, isOnChargeOff);
+
+ accountingBridgeDataBeforeChargeOff.put("newLoanTransactions", newLoanTransactionsBeforeChargeOff);
+ accountingBridgeData.add(accountingBridgeDataBeforeChargeOff);
+
+ accountingBridgeDataAfterChargeOff.put("newLoanTransactions", newLoanTransactionsAfterChargeOff);
+ accountingBridgeData.add(accountingBridgeDataAfterChargeOff);
+
+ return accountingBridgeData;
+ }
+
+ private void getTransactionsForAccountingBridgeDataOnChargeOffDate(String currencyCode, List<Long> existingTransactionIds,
+ List<Long> existingReversedTransactionIds, List<Map<String, Object>> newLoanTransactionsBeforeChargeOff,
+ List<Map<String, Object>> newLoanTransactionsAfterChargeOff, Predicate<LoanTransaction> chargeOffDateCriteria) {
+ List<LoanTransaction> transactionsOnChargeOffDate = this.loanTransactions.stream().filter(chargeOffDateCriteria)
+ .collect(Collectors.toList());
+ /**
+ *
+ * TODO: Modify logic to retrieve correct charge-off transaction once reverse replay of charge-off is
+ * implemented
+ */
+ LoanTransaction chargeOffTransaction = this.loanTransactions.stream().filter(LoanTransaction::isChargeOff).findFirst().get();
+ Predicate<LoanTransactionRelation> isReplayed = transactionRelation -> transactionRelation.getRelationType()
+ .equals(LoanTransactionRelationTypeEnum.REPLAYED);
+ for (final LoanTransaction transaction : transactionsOnChargeOffDate) {
+ if (!transaction.isChargeOff()) {
+ if (transaction.isReversed() && existingTransactionIds.contains(transaction.getId())
+ && !existingReversedTransactionIds.contains(transaction.getId())) {
+ // transaction on charge-off date got reversed
+ compareWithChargeOffIdAndAddTransactionForAccountingData(currencyCode, newLoanTransactionsBeforeChargeOff,
+ newLoanTransactionsAfterChargeOff, transaction, chargeOffTransaction.getId());
+
+ } else if (!existingTransactionIds.contains(transaction.getId())) {
+ // new transaction,backdated transaction or reverse replay on chargeoff date
+
+ // check transaction relations
+ if (!transaction.getLoanTransactionRelations().isEmpty()) {
+ // if relations has REPLAYED relation then it is reverse replay scenario
+ List<LoanTransactionRelation> replayedTransactionRelations = transaction.getLoanTransactionRelations().stream()
Review Comment:
this is on unordered list, the below .get(0) might not give you 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: 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 #3220: FINERACT-1806-Post-ChargeOff-Scenarios-1
Posted by "adamsaghy (via GitHub)" <gi...@apache.org>.
adamsaghy commented on code in PR #3220:
URL: https://github.com/apache/fineract/pull/3220#discussion_r1217717032
##########
fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/Loan.java:
##########
@@ -4484,6 +4485,67 @@ public BigDecimal getProposedPrincipal() {
return this.proposedPrincipal;
}
+ public List<Map<String, Object>> deriveAccountingBridgeDataForChargeOff(final String currencyCode,
+ final List<Long> existingTransactionIds, final List<Long> existingReversedTransactionIds, boolean isAccountTransfer) {
+
+ final List<Map<String, Object>> accountingBridgeData = new ArrayList<>();
+
+ final Map<String, Object> accountingBridgeDataGenericAttributes = new LinkedHashMap<>();
+ accountingBridgeDataGenericAttributes.put("loanId", getId());
+ accountingBridgeDataGenericAttributes.put("loanProductId", productId());
+ accountingBridgeDataGenericAttributes.put("officeId", getOfficeId());
+ accountingBridgeDataGenericAttributes.put("currencyCode", currencyCode);
+ accountingBridgeDataGenericAttributes.put("calculatedInterest", this.summary.getTotalInterestCharged());
+ accountingBridgeDataGenericAttributes.put("cashBasedAccountingEnabled", isCashBasedAccountingEnabledOnLoanProduct());
+ accountingBridgeDataGenericAttributes.put("upfrontAccrualBasedAccountingEnabled", isUpfrontAccrualAccountingEnabledOnLoanProduct());
+ accountingBridgeDataGenericAttributes.put("periodicAccrualBasedAccountingEnabled",
+ isPeriodicAccrualAccountingEnabledOnLoanProduct());
+ accountingBridgeDataGenericAttributes.put("isAccountTransfer", isAccountTransfer);
+
+ // get map before charge-off
+ final Map<String, Object> accountingBridgeDataBeforeChargeOff = new LinkedHashMap<>(accountingBridgeDataGenericAttributes);
+ accountingBridgeDataBeforeChargeOff.put("isChargeOff", false);
+ accountingBridgeDataBeforeChargeOff.put("isFraud", false);
+
+ Predicate<LoanTransaction> isBeforeChargeOff = transaction -> transaction.getTransactionDate().isBefore(getChargedOffOnDate());
+ final List<Map<String, Object>> newLoanTransactionsBeforeChargeOff = new ArrayList<>();
+
+ getTransactionsForAccountingBridgeData(currencyCode, existingTransactionIds, existingReversedTransactionIds,
+ newLoanTransactionsBeforeChargeOff, isBeforeChargeOff);
+ accountingBridgeDataBeforeChargeOff.put("newLoanTransactions", newLoanTransactionsBeforeChargeOff);
+ accountingBridgeData.add(accountingBridgeDataBeforeChargeOff);
+
+ // get map after charge-off
+ final Map<String, Object> accountingBridgeDataAfterChargeOff = new LinkedHashMap<>(accountingBridgeDataGenericAttributes);
+ accountingBridgeDataAfterChargeOff.put("isChargeOff", isChargedOff());
+ accountingBridgeDataAfterChargeOff.put("isFraud", isFraud());
+
+ Predicate<LoanTransaction> isOnOrAfterChargeOff = transaction -> transaction.getTransactionDate().isEqual(getChargedOffOnDate())
Review Comment:
I dont think this is right... technically it can happen a transaction happened on the same day as the charge-off and one it was before the charge off happened.
--
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