You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fineract.apache.org by "MarianaDmytrivBinariks (via GitHub)" <gi...@apache.org> on 2026/01/08 14:48:50 UTC
Re: [PR] FINERACT-2354: Re-aging:- Accrual and Accrual Activity handling - Equal amortization [fineract]
MarianaDmytrivBinariks commented on code in PR #5224:
URL: https://github.com/apache/fineract/pull/5224#discussion_r2672654978
##########
fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/LoanStepDef.java:
##########
@@ -2212,6 +2212,99 @@ public void loanTransactionsTransactionWithGivenDateDataCheck(String date, DataT
.as(ErrorMessageHelper.wrongValueInLineInTransactionsTab(resourceId, 1, actualValuesList, expectedValues)).isTrue();
}
+ @Then("Loan Transactions tab has the following new accrual data:")
+ public void loanTransactionsTabCheckNewAccruals(DataTable table) {
+ PostLoansResponse loanCreateResponse = testContext().get(TestContextKey.LOAN_CREATE_RESPONSE);
+ List<List<String>> expectedAccruals = testContext().get(TestContextKey.VERIFIED_LOAN_ACCRUALS);
+ if (expectedAccruals == null) {
+ expectedAccruals = new ArrayList<List<String>>();
+ testContext().set(TestContextKey.VERIFIED_LOAN_ACCRUALS, expectedAccruals);
+ }
+ long loanId = loanCreateResponse.getLoanId();
+ String resourceId = String.valueOf(loanId);
+
+ GetLoansLoanIdResponse loanDetailsResponse = ok(() -> fineractClient.loans().retrieveLoan(loanId,
+ Map.of("staffInSelectedOfficeOnly", "false", "associations", "transactions")));
+ List<GetLoansLoanIdTransactions> transactions = loanDetailsResponse.getTransactions().stream().filter(
+ lt -> "Accrual".equalsIgnoreCase(lt.getType().getValue()) || "Accrual Adjustment".equalsIgnoreCase(lt.getType().getValue()))
+ .toList();
+ List<List<String>> data = table.asLists();
+ expectedAccruals.addAll(data.subList(1, data.size()));
+
+ for (int i = 0; i < expectedAccruals.size(); i++) {
+ List<String> expectedValues = expectedAccruals.get(i);
+ String transactionDateExpected = expectedValues.get(0);
+ List<List<String>> actualValuesList = transactions.stream()//
+ .filter(t -> transactionDateExpected.equals(FORMATTER.format(t.getDate())))//
+ .map(t -> fetchValuesOfTransaction(table.row(0), t))//
+ .collect(Collectors.toList());//
+ boolean containsExpectedValues = actualValuesList.stream()//
+ .anyMatch(actualValues -> actualValues.equals(expectedValues));//
+ assertThat(containsExpectedValues)
+ .as(ErrorMessageHelper.wrongValueInLineInTransactionsTab(resourceId, i, actualValuesList, expectedValues)).isTrue();
+ }
+ assertThat(transactions.size())
+ .as(ErrorMessageHelper.nrOfLinesWrongInTransactionsTab(resourceId, transactions.size(), expectedAccruals.size()))
+ .isEqualTo(expectedAccruals.size());
+ }
+
+ @Then("Loan Transactions tab has the following accrual data:")
+ public void loanTransactionsTabCheckAccruals(DataTable table) {
+ PostLoansResponse loanCreateResponse = testContext().get(TestContextKey.LOAN_CREATE_RESPONSE);
+ long loanId = loanCreateResponse.getLoanId();
+ String resourceId = String.valueOf(loanId);
+
+ GetLoansLoanIdResponse loanDetailsResponse = ok(() -> fineractClient.loans().retrieveLoan(loanId,
+ Map.of("staffInSelectedOfficeOnly", "false", "associations", "transactions")));
+ List<GetLoansLoanIdTransactions> transactions = loanDetailsResponse.getTransactions().stream().filter(
+ lt -> "Accrual".equalsIgnoreCase(lt.getType().getValue()) || "Accrual Adjustment".equalsIgnoreCase(lt.getType().getValue()))
+ .toList();
+ List<List<String>> data = table.asLists();
+ for (int i = 1; i < data.size(); i++) {
+ List<String> expectedValues = data.get(i);
+ String transactionDateExpected = expectedValues.get(0);
+ List<List<String>> actualValuesList = transactions.stream()//
+ .filter(t -> transactionDateExpected.equals(FORMATTER.format(t.getDate())))//
+ .map(t -> fetchValuesOfTransaction(table.row(0), t))//
+ .collect(Collectors.toList());//
+ boolean containsExpectedValues = actualValuesList.stream()//
+ .anyMatch(actualValues -> actualValues.equals(expectedValues));//
+ assertThat(containsExpectedValues)
+ .as(ErrorMessageHelper.wrongValueInLineInTransactionsTab(resourceId, i, actualValuesList, expectedValues)).isTrue();
+ }
+ assertThat(transactions.size())
+ .as(ErrorMessageHelper.nrOfLinesWrongInTransactionsTab(resourceId, transactions.size(), data.size() - 1))
+ .isEqualTo(data.size() - 1);
+ }
+
+ @Then("Loan Transactions tab has the following data without accruals:")
+ public void loanTransactionsTabCheckWithoutAccruals(DataTable table) {
+ PostLoansResponse loanCreateResponse = testContext().get(TestContextKey.LOAN_CREATE_RESPONSE);
+ long loanId = loanCreateResponse.getLoanId();
+ String resourceId = String.valueOf(loanId);
+
+ GetLoansLoanIdResponse loanDetailsResponse = ok(() -> fineractClient.loans().retrieveLoan(loanId,
+ Map.of("staffInSelectedOfficeOnly", "false", "associations", "transactions")));
+ List<GetLoansLoanIdTransactions> transactions = loanDetailsResponse.getTransactions().stream()
+ .filter(lt -> !lt.getType().getAccrual() && !"Accrual Adjustment".equalsIgnoreCase(lt.getType().getValue())).toList();
+ List<List<String>> data = table.asLists();
+ for (int i = 1; i < data.size(); i++) {
+ List<String> expectedValues = data.get(i);
+ String transactionDateExpected = expectedValues.get(0);
+ List<List<String>> actualValuesList = transactions.stream()//
+ .filter(t -> transactionDateExpected.equals(FORMATTER.format(t.getDate())))//
+ .map(t -> fetchValuesOfTransaction(table.row(0), t))//
+ .collect(Collectors.toList());//
+ boolean containsExpectedValues = actualValuesList.stream()//
Review Comment:
done
--
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