FINERACT-2203: finalized e2e tests and updated step defenitions

Author: Rustam Zeinalov

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

@@ -43,15 +43,7 @@
 import java.time.Duration;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Set;
-import java.util.UUID;
+import java.util.*;
 import java.util.stream.Collectors;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.fineract.avro.loan.v1.LoanAccountDataV1;
@@ -3523,22 +3515,36 @@ public void transactionsExcludedByLoanExternalIdCheck(String excludedTypes, Data
 
     @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<PostLoansResponse> loanCreateResponse = testContext().get(TestContextKey.LOAN_CREATE_RESPONSE);
+        String loanExternalId = loanCreateResponse.body().getResourceExternalId();
+
+        Response<GetLoansLoanIdTransactionsResponse> transactionsByLoanExternalIdFiltered = getTransactionsByLoanIExternalIdFiltered(
+                loanExternalId, transactionsExcluded);
 
-        // Response<GetLoansLoanIdTransactionsResponse> transactionsByLoanIdFiltered =
-        // getTransactionsByLoanIdFiltered(loanId, transactionsExcluded);
-        // TODO make checks here
+        boolean isTransactionPresent = transactionsByLoanExternalIdFiltered.body().getContent().stream()
+                .anyMatch(item -> item.getType().equals(org.apache.fineract.client.models.TransactionType.fromValue(transactionsExcluded)));
+        assertThat(isTransactionPresent).isFalse();
     }
 
     private Response<GetLoansLoanIdTransactionsResponse> getTransactionsByLoanIdFiltered(Long loanId, String excludedTypes)
             throws IOException {
-        return loanTransactionsApi.retrieveTransactionsByLoanId(loanId, excludedTypes, null, null, null).execute();
+        return loanTransactionsApi.retrieveTransactionsByLoanId(loanId, parseExcludedTypes(excludedTypes), null, null, null).execute();
     }
 
     private Response<GetLoansLoanIdTransactionsResponse> getTransactionsByLoanIExternalIdFiltered(String loanExternalId,
             String excludedTypes) throws IOException {
-        return loanTransactionsApi.retrieveTransactionsByExternalLoanId(loanExternalId, excludedTypes, null, null, null).execute();
+
+        return loanTransactionsApi.retrieveTransactionsByExternalLoanId(loanExternalId, parseExcludedTypes(excludedTypes), null, null, null)
+                .execute();
+    }
+
+    public static List<org.apache.fineract.client.models.TransactionType> parseExcludedTypes(String excludedTypes) {
+        if (excludedTypes == null || excludedTypes.trim().isEmpty()) {
+            return Collections.emptyList();
+        } else {
+            return Arrays.stream(excludedTypes.split(",")).map(String::trim).map(String::toUpperCase)
+                    .map(org.apache.fineract.client.models.TransactionType::valueOf).collect(Collectors.toList());
+        }
     }
 
     private List<String> fetchValuesOfFilteredTransaction(List<String> header, GetLoansLoanIdTransactionsTransactionIdResponse t) {
@@ -3567,8 +3573,9 @@ private List<String> fetchValuesOfFilteredTransaction(List<String> header, GetLo
     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();
+                .retrieveTransactionsByLoanId(loanId, parseExcludedTypes(excludedTypes), null, size, null).execute();
 
         Integer totalPagesActual = transactionsByLoanIdFiltered.body().getTotalPages();
 

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

@@ -6442,13 +6442,13 @@ Feature: LoanAccrualActivity
       | 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 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: "waiver"
     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"

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

@@ -1139,7 +1139,7 @@ Feature: LoanAccrualTransaction
       | 20 February 2025 | Accrual                 | 0.02   | 0.0       | 0.02     | 0.0  | 0.0       | 0.0          | false    | false    |
       | 21 February 2025 | Accrual                 | 0.02   | 0.0       | 0.02     | 0.0  | 0.0       | 0.0          | false    | false    |
 
-  @TestRailId:C3532
+  @TestRailId:C3535
   Scenario: Verify the accrual activity creation in case of full repayment on maturity date - absence of negative numbers with low interest rate and small principal
     When Admin sets the business date to "19 February 2025"
     And Admin creates a client with random data
@@ -1280,7 +1280,7 @@ Feature: LoanAccrualTransaction
       | 19 February 2025 | Repayment              | 0.67   | 0.6       | 0.07     | 0.0  | 0.0       | 6.91         | false    | false    |
       | 20 February 2025 | Merchant Issued Refund | 3.35   | 3.35      | 0.0      | 0.0  | 0.0       | 3.56         | false    | false    |
 
-  @TestRailId:C3533
+  @TestRailId:C3536
   Scenario: Verify the accrual activity creation in case of full repayment on maturity date - absence of negative numbers with high interest rate and large principal
     When Admin sets the business date to "19 February 2025"
     And Admin creates a client with random data
@@ -1424,7 +1424,7 @@ Feature: LoanAccrualTransaction
       | 20 February 2025 | Accrual                | 12.33   | 0.0       | 12.33    | 0.0  | 0.0       | 0.0          | false    | false    |
       | 20 February 2025 | Accrual                | 12.33   | 0.0       | 12.33    | 0.0  | 0.0       | 0.0          | false    | false    |
 
-  @TestRailId:C3534
+  @TestRailId:C3537
   Scenario: Verify the accrual activity creation in case of full repayment on maturity date - absence of negative numbers with mid-range interest rate and mid-range principal
     When Admin sets the business date to "19 February 2025"
     And Admin creates a client with random data