FINERACT-2203: extended E2E tests

Author: peter-kovacs-dpc

fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/helper/ErrorMessageHelper.java

@@ -896,4 +896,8 @@ public static String wrongNumberOfLinesInChargeOffReasonOptions(final int actual
     public static String wrongExternalID(String actual, String expected) {
         return String.format("Wrong transaction External ID - %nActual value is: %s %nExpected value is: %s", actual, expected);
     }
+
+    public static String wrongValueInTotalPages(Integer actual, Integer expected) {
+        return String.format("Wrong value for Total pages. %nActual value is: %s %nExpected value is: %s", actual, expected);
+    }
 }

fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/LoanStepDef.java

@@ -3454,14 +3454,81 @@ public void transactionsExcluded(String excludedTypes) throws IOException {
     }
 
     @Then("Log out transaction list by loanExternalId, filtered out the following transaction types: {string}")
-    public void transactionsExcludedBzExternalId(String excludedTypes) throws IOException {
+    public void transactionsExcludedByExternalId(String excludedTypes) throws IOException {
         Response<PostLoansResponse> loanCreateResponse = testContext().get(TestContextKey.LOAN_CREATE_RESPONSE);
         String loanExternalId = loanCreateResponse.body().getResourceExternalId();
 
-        Response<GetLoansLoanIdTransactionsResponse> transactionsByLoanIdFiltered = getTransactionsByLoanIExternalIdFiltered(loanExternalId,
-                excludedTypes);
+        Response<GetLoansLoanIdTransactionsResponse> transactionsByLoanIExternalIdFiltered = getTransactionsByLoanIExternalIdFiltered(
+                loanExternalId, excludedTypes);
         log.info("Transaction list without the following transaction types: {} \n{}", excludedTypes,
-                transactionsByLoanIdFiltered.body().toString());
+                transactionsByLoanIExternalIdFiltered.body().toString());
+    }
+
+    @Then("Filtered out transactions list contains the the following entries when filtered out by loanId for transaction types: {string}")
+    public void transactionsExcludedCheck(String excludedTypes, DataTable table) throws IOException {
+        Response<PostLoansResponse> loanCreateResponse = testContext().get(TestContextKey.LOAN_CREATE_RESPONSE);
+        long loanId = loanCreateResponse.body().getLoanId();
+        String resourceId = String.valueOf(loanId);
+
+        Response<GetLoansLoanIdTransactionsResponse> transactionsByLoanIdFiltered = getTransactionsByLoanIdFiltered(loanId, excludedTypes);
+        ErrorHelper.checkSuccessfulApiCall(transactionsByLoanIdFiltered);
+        List<GetLoansLoanIdTransactionsTransactionIdResponse> transactions = transactionsByLoanIdFiltered.body().getContent();
+        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 -> fetchValuesOfFilteredTransaction(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("Filtered out transactions list contains the the following entries when filtered out by loanExternalId for transaction types: {string}")
+    public void transactionsExcludedByLoanExternalIdCheck(String excludedTypes, DataTable table) throws IOException {
+        Response<PostLoansResponse> loanCreateResponse = testContext().get(TestContextKey.LOAN_CREATE_RESPONSE);
+        String loanExternalId = loanCreateResponse.body().getResourceExternalId();
+        long loanId = loanCreateResponse.body().getLoanId();
+        String resourceId = String.valueOf(loanId);
+
+        Response<GetLoansLoanIdTransactionsResponse> transactionsByLoanExternalIdFiltered = getTransactionsByLoanIExternalIdFiltered(
+                loanExternalId, excludedTypes);
+        ErrorHelper.checkSuccessfulApiCall(transactionsByLoanExternalIdFiltered);
+
+        List<GetLoansLoanIdTransactionsTransactionIdResponse> transactions = transactionsByLoanExternalIdFiltered.body().getContent();
+        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 -> fetchValuesOfFilteredTransaction(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("Filtered out transactions list request results an error when filtered out by loanExternalId for transaction type not exist: {string}")
+    public void transactionsExcludedErrorNotPresent(String transactionsExcluded) throws IOException {
+        // Response<PostLoansResponse> loanCreateResponse = testContext().get(TestContextKey.LOAN_CREATE_RESPONSE);
+        // long loanId = loanCreateResponse.body().getLoanId();
+
+        // Response<GetLoansLoanIdTransactionsResponse> transactionsByLoanIdFiltered =
+        // getTransactionsByLoanIdFiltered(loanId, transactionsExcluded);
+        // TODO make checks here
     }
 
     private Response<GetLoansLoanIdTransactionsResponse> getTransactionsByLoanIdFiltered(Long loanId, String excludedTypes)
@@ -3473,4 +3540,39 @@ private Response<GetLoansLoanIdTransactionsResponse> getTransactionsByLoanIExter
             String excludedTypes) throws IOException {
         return loanTransactionsApi.retrieveTransactionsByExternalLoanId(loanExternalId, excludedTypes, null, null, null).execute();
     }
+
+    private List<String> fetchValuesOfFilteredTransaction(List<String> header, GetLoansLoanIdTransactionsTransactionIdResponse t) {
+        List<String> actualValues = new ArrayList<>();
+        for (String headerName : header) {
+            switch (headerName) {
+                case "Transaction date" -> actualValues.add(t.getDate() == null ? null : FORMATTER.format(t.getDate()));
+                case "Transaction Type" -> actualValues.add(t.getType().getCode() == null ? null : t.getType().getCode().substring(20));
+                case "Amount" -> actualValues.add(t.getAmount() == null ? null : String.valueOf(t.getAmount()));
+                case "Principal" -> actualValues.add(t.getPrincipalPortion() == null ? null : String.valueOf(t.getPrincipalPortion()));
+                case "Interest" -> actualValues.add(t.getInterestPortion() == null ? null : String.valueOf(t.getInterestPortion()));
+                case "Fees" -> actualValues.add(t.getFeeChargesPortion() == null ? null : String.valueOf(t.getFeeChargesPortion()));
+                case "Penalties" ->
+                    actualValues.add(t.getPenaltyChargesPortion() == null ? null : String.valueOf(t.getPenaltyChargesPortion()));
+                case "Loan Balance" ->
+                    actualValues.add(t.getOutstandingLoanBalance() == null ? null : String.valueOf(t.getOutstandingLoanBalance()));
+                case "Overpayment" ->
+                    actualValues.add(t.getOverpaymentPortion() == null ? null : String.valueOf(t.getOverpaymentPortion()));
+                default -> throw new IllegalStateException(String.format("Header name %s cannot be found", headerName));
+            }
+        }
+        return actualValues;
+    }
+
+    @Then("Filtered out transactions list has {int} pages in case of size set to {int} and transactions are filtered out for transaction types: {string}")
+    public void checkPagination(Integer totalPagesExpected, Integer size, String excludedTypes) throws IOException {
+        Response<PostLoansResponse> loanCreateResponse = testContext().get(TestContextKey.LOAN_CREATE_RESPONSE);
+        long loanId = loanCreateResponse.body().getLoanId();
+        Response<GetLoansLoanIdTransactionsResponse> transactionsByLoanIdFiltered = loanTransactionsApi
+                .retrieveTransactionsByLoanId(loanId, excludedTypes, null, size, null).execute();
+
+        Integer totalPagesActual = transactionsByLoanIdFiltered.body().getTotalPages();
+
+        assertThat(totalPagesActual).as(ErrorMessageHelper.wrongValueInTotalPages(totalPagesActual, totalPagesExpected))
+                .isEqualTo(totalPagesExpected);
+    }
 }

fineract-e2e-tests-runner/src/test/resources/features/LoanAccrualActivity.feature

@@ -6404,16 +6404,51 @@ Feature: LoanAccrualActivity
 
   @TestRailId:C3533
   Scenario: Logging out transaction list, excluded given transaction types
-    When Admin sets the business date to "01 January 2024"
+    When Admin sets the business date to "01 January 2025"
     When Admin creates a client with random data
     When Admin creates a fully customized loan with the following data:
       | LoanProduct                                                                       | submitted on date | with Principal | ANNUAL interest rate % | interest type     | interest calculation period | amortization type  | loanTermFrequency | loanTermFrequencyType | repaymentEvery | repaymentFrequencyType | numberOfRepayments | graceOnPrincipalPayment | graceOnInterestPayment | interest free period | Payment strategy            |
-      | LP2_ADV_PYMNT_INTEREST_RECOGNITION_DISBURSEMENT_DAILY_EMI_360_30_ACCRUAL_ACTIVITY | 01 January 2024   | 2000           | 7                      | DECLINING_BALANCE | DAILY                       | EQUAL_INSTALLMENTS | 6                 | MONTHS                | 1              | MONTHS                 | 6                  | 0                       | 0                      | 0                    | ADVANCED_PAYMENT_ALLOCATION |
-    And Admin successfully approves the loan on "01 January 2024" with "2000" amount and expected disbursement date on "01 January 2024"
-    When Admin successfully disburse the loan on "01 January 2024" with "2000" EUR transaction amount
+      | LP2_ADV_PYMNT_INTEREST_RECOGNITION_DISBURSEMENT_DAILY_EMI_360_30_ACCRUAL_ACTIVITY | 01 January 2025   | 2000           | 7                      | DECLINING_BALANCE | DAILY                       | EQUAL_INSTALLMENTS | 6                 | MONTHS                | 1              | MONTHS                 | 6                  | 0                       | 0                      | 0                    | ADVANCED_PAYMENT_ALLOCATION |
+    And Admin successfully approves the loan on "01 January 2025" with "2000" amount and expected disbursement date on "01 January 2025"
+    When Admin successfully disburse the loan on "01 January 2025" with "2000" EUR transaction amount
     And Admin runs inline COB job for Loan
-    When Admin sets the business date to "05 January 2024"
-    And Customer makes "AUTOPAY" repayment on "05 January 2024" with 200 EUR transaction amount
+    When Admin sets the business date to "05 January 2025"
+    And Customer makes "AUTOPAY" repayment on "05 January 2025" with 200 EUR transaction amount
     And Admin runs inline COB job for Loan
+    And Loan Transactions tab has the following data:
+      | Transaction date | Transaction Type | Amount | Principal | Interest | Fees | Penalties | Loan Balance | Reverted | Replayed |
+      | 01 January 2025  | Disbursement     | 2000.0 | 0.0       | 0.0      | 0.0  | 0.0       | 2000.0       | false    | false    |
+      | 01 January 2025  | Accrual          | 0.38   | 0.0       | 0.38     | 0.0  | 0.0       | 0.0          | false    | false    |
+      | 02 January 2025  | Accrual          | 0.37   | 0.0       | 0.37     | 0.0  | 0.0       | 0.0          | false    | false    |
+      | 03 January 2025  | Accrual          | 0.38   | 0.0       | 0.38     | 0.0  | 0.0       | 0.0          | false    | false    |
+      | 04 January 2025  | Accrual          | 0.38   | 0.0       | 0.38     | 0.0  | 0.0       | 0.0          | false    | false    |
+      | 05 January 2025  | Repayment        | 200.0  | 200.0     | 0.0      | 0.0  | 0.0       | 1800.0       | false    | false    |
     Then Log out transaction list by loanId, filtered out the following transaction types: "disbursement, accrual"
     Then Log out transaction list by loanExternalId, filtered out the following transaction types: "accrual"
+    Then Filtered out transactions list contains the the following entries when filtered out by loanId for transaction types: "accrual"
+      | Transaction date | Transaction Type | Amount | Principal | Interest | Fees | Penalties | Loan Balance |
+      | 01 January 2025  | disbursement     | 2000.0 |           |          |      |           | 2000.0       |
+      | 05 January 2025  | repayment        | 200.0  | 200.0     |          |      |           | 1800.0       |
+    Then Filtered out transactions list contains the the following entries when filtered out by loanExternalId for transaction types: "accrual"
+      | Transaction date | Transaction Type | Amount | Principal | Interest | Fees | Penalties | Loan Balance |
+      | 01 January 2025  | disbursement     | 2000.0 |           |          |      |           | 2000.0       |
+      | 05 January 2025  | repayment        | 200.0  | 200.0     |          |      |           | 1800.0       |
+    Then Filtered out transactions list contains the the following entries when filtered out by loanId for transaction types: ""
+      | Transaction date | Transaction Type | Amount | Principal | Interest | Fees | Penalties | Loan Balance |
+      | 01 January 2025  | disbursement     | 2000.0 |           |          |      |           | 2000.0       |
+      | 01 January 2025  | accrual          | 0.38   |           | 0.38     |      |           |              |
+      | 02 January 2025  | accrual          | 0.37   |           | 0.37     |      |           |              |
+      | 03 January 2025  | accrual          | 0.38   |           | 0.38     |      |           |              |
+      | 04 January 2025  | accrual          | 0.38   |           | 0.38     |      |           |              |
+      | 05 January 2025  | repayment        | 200.0  | 200.0     |          |      |           | 1800.0       |
+#    TODO recheck when enums for txn types are implemented (what are the rules for existing but not present txn types AND what for NOT existing txn types)
+#    Then Filtered out transactions list contains the the following entries when filtered out by loanId for transaction types: "merchant_issued_refund"
+#      | Transaction date | Transaction Type | Amount | Principal | Interest | Fees | Penalties | Loan Balance |
+#      | 01 January 2025  | disbursement     | 2000.0 |           |          |      |           | 2000.0       |
+#      | 01 January 2025  | accrual          | 0.38   |           | 0.38     |      |           |              |
+#      | 02 January 2025  | accrual          | 0.37   |           | 0.37     |      |           |              |
+#      | 03 January 2025  | accrual          | 0.38   |           | 0.38     |      |           |              |
+#      | 04 January 2025  | accrual          | 0.38   |           | 0.38     |      |           |              |
+#      | 05 January 2025  | repayment        | 200.0  | 200.0     |          |      |           | 1800.0       |
+#    Then Filtered out transactions list request results an error when filtered out by loanExternalId for transaction type not exist: "test"
+    Then Filtered out transactions list has 4 pages in case of size set to 1 and transactions are filtered out for transaction types: "disbursement, repayment"