FINERACT-2354: e2e tests for re-age preview with equal amortization

Author: MarianaDmytrivBinariks

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

@@ -33,6 +33,7 @@
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -296,43 +297,35 @@ public void reAgeContractTerminatedLoanFailure(final DataTable table) throws IOE
         assertThat(exception.getDeveloperMessage()).contains(ErrorMessageHelper.reAgeContractTerminatedLoanFailure());
     }
 
+    private Map<String, Object> resolveReAgingQueryParams(DataTable table) {
+        List<String> header = table.asLists().get(0);
+        List<String> data = table.asLists().get(1);
+        Map<String, Object> queryParams = new HashMap<>(Map.of("dateFormat", DATE_FORMAT, "locale", "en"));
+        for (int i = 0; i < header.size(); i++) {
+            queryParams.put(header.get(i), data.get(i));
+        }
+        return queryParams;
+    }
+
     @When("Admin creates a Loan re-aging preview with the following data:")
     public void createReAgingPreview(DataTable table) throws IOException {
         PostLoansResponse loanResponse = testContext().get(TestContextKey.LOAN_CREATE_RESPONSE);
         long loanId = loanResponse.getLoanId();
 
-        List<String> data = table.asLists().get(1);
-        int frequencyNumber = Integer.parseInt(data.get(0));
-        String frequencyType = data.get(1);
-        String startDate = data.get(2);
-        int numberOfInstallments = Integer.parseInt(data.get(3));
-
-        Map<String, Object> queryParams = Map.of("frequencyNumber", frequencyNumber, "frequencyType", frequencyType, "startDate", startDate,
-                "numberOfInstallments", numberOfInstallments, "dateFormat", DATE_FORMAT, "locale", "en");
+        Map<String, Object> queryParams = resolveReAgingQueryParams(table);
         LoanScheduleData response = ok(() -> fineractClient.loanTransactions().previewReAgeSchedule(loanId, queryParams));
         testContext().set(TestContextKey.LOAN_REAGING_PREVIEW_RESPONSE, response);
 
-        log.info(
-                "Re-aging preview created for loan ID: {} with parameters: frequencyNumber={}, frequencyType={}, startDate={}, numberOfInstallments={}",
-                loanId, frequencyNumber, frequencyType, startDate, numberOfInstallments);
+        log.info("Re-aging preview created for loan ID: {} with parameters: {}", loanId, queryParams);
     }
 
     public LoanScheduleData reAgingPreviewByLoanExternalId(DataTable table) throws IOException {
         PostLoansResponse loanResponse = testContext().get(TestContextKey.LOAN_CREATE_RESPONSE);
         String loanExternalId = loanResponse.getResourceExternalId();
 
-        List<String> data = table.asLists().get(1);
-        int frequencyNumber = Integer.parseInt(data.get(0));
-        String frequencyType = data.get(1);
-        String startDate = data.get(2);
-        int numberOfInstallments = Integer.parseInt(data.get(3));
-
-        Map<String, Object> queryParams = Map.of("frequencyNumber", frequencyNumber, "frequencyType", frequencyType, "startDate", startDate,
-                "numberOfInstallments", numberOfInstallments, "dateFormat", DATE_FORMAT, "locale", "en");
+        Map<String, Object> queryParams = resolveReAgingQueryParams(table);
         LoanScheduleData result = ok(() -> fineractClient.loanTransactions().previewReAgeSchedule1(loanExternalId, queryParams));
-        log.info(
-                "Re-aging preview is requested to be created with loan external ID: {} with parameters: frequencyNumber={}, frequencyType={}, startDate={}, numberOfInstallments={}",
-                loanExternalId, frequencyNumber, frequencyType, startDate, numberOfInstallments);
+        log.info("Re-aging preview is requested to be created with loan external ID: {} with parameters: {}", loanExternalId, queryParams);
         return result;
     }
 

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

@@ -11650,7 +11650,7 @@ Then Loan Repayment schedule has 4 periods, with the following data for periods:
       | 1  | 0    | 01 January 2024   | 01 January 2024  | 75.0            | 25.0          | 0.0      | 0.0  | 0.0       | 25.0  | 25.0  | 0.0        | 0.0  | 0.0         |
       | 2  | 31   | 01 February 2024  | 01 February 2024 | 62.68           | 12.32         | 0.44     | 0.0  | 0.0       | 12.76 | 12.76 | 0.0        | 0.0  | 0.0         |
       | 3  | 29   | 01 March 2024     | 15 March 2024    | 62.68           | 0.0           | 0.0      | 0.0  | 0.0       | 0.0   | 0.0   | 0.0        | 0.0  | 0.0         |
-      | 4  | 14   | 15 March 2024    | 15 March 2024    | 62.68           | 0.0           | 0.0      | 0.0  | 0.0       | 0.0   | 0.0   | 0.0        | 0.0  | 0.0         |
+      | 4  | 14   | 15 March 2024     | 15 March 2024    | 62.68           | 0.0           | 0.0      | 0.0  | 0.0       | 0.0   | 0.0   | 0.0        | 0.0  | 0.0         |
       | 5  | 17   | 01 April 2024     |                  | 52.23           | 10.45         | 0.19     | 0.0  | 0.0       | 10.64 | 0.0   | 0.0        | 0.0  | 10.64       |
       | 6  | 30   | 01 May 2024       |                  | 41.78           | 10.45         | 0.19     | 0.0  | 0.0       | 10.64 | 0.0   | 0.0        | 0.0  | 10.64       |
       | 7  | 31   | 01 June 2024      |                  | 31.33           | 10.45         | 0.19     | 0.0  | 0.0       | 10.64 | 0.0   | 0.0        | 0.0  | 10.64       |