FINERACT-2354: Re-aging: -Interest Handling Option: Equal amortization -- EMICalculator fix & chargeback handling

Author: somasorosdpc

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

@@ -72,29 +72,11 @@ public void createReAgingTransaction(DataTable table) throws IOException {
         Response<PostLoansResponse> loanResponse = testContext().get(TestContextKey.LOAN_CREATE_RESPONSE);
         long loanId = loanResponse.body().getLoanId();
 
-        List<List<String>> tableRows = table.asLists();
-        List<String> headers = tableRows.get(0);
-        List<String> values = tableRows.get(1);
-
-        Map<String, String> rowData = new LinkedHashMap<>();
-        int columnCount = Math.min(headers.size(), values.size());
-        for (int i = 0; i < columnCount; i++) {
-            rowData.put(headers.get(i), values.get(i));
-        }
-
-        int frequencyNumber = Integer.parseInt(resolveValue(rowData, values, 0, "frequencyNumber"));
-        String frequencyType = resolveValue(rowData, values, 1, "frequencyType");
-        String startDate = resolveValue(rowData, values, 2, "startDate");
-        int numberOfInstallments = Integer.parseInt(resolveValue(rowData, values, 3, "numberOfInstallments"));
-
-        PostLoansLoanIdTransactionsRequest reAgingRequest = LoanRequestFactory//
-                .defaultReAgingRequest()//
-                .frequencyNumber(frequencyNumber)//
-                .frequencyType(frequencyType)//
-                .startDate(startDate)//
-                .numberOfInstallments(numberOfInstallments);//
-
-        applyAdditionalFields(reAgingRequest, rowData, Set.of("frequencyNumber", "frequencyType", "startDate", "numberOfInstallments"));
+        PostLoansLoanIdTransactionsRequest reAgingRequest = setReAgeingRequestProperties(//
+                LoanRequestFactory.defaultReAgingRequest(), //
+                table.row(0), //
+                table.row(1) //
+        );
 
         Response<PostLoansLoanIdTransactionsResponse> response = loanTransactionsApi.executeLoanTransaction(loanId, reAgingRequest, "reAge")
                 .execute();
@@ -195,18 +177,11 @@ public void createReAgingTransactionByLoanExternalId(DataTable table) throws IOE
         Response<PostLoansResponse> loanResponse = testContext().get(TestContextKey.LOAN_CREATE_RESPONSE);
         String loanExternalId = loanResponse.body().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));
-
-        PostLoansLoanIdTransactionsRequest reAgingRequest = LoanRequestFactory//
-                .defaultReAgingRequest()//
-                .frequencyNumber(frequencyNumber)//
-                .frequencyType(frequencyType)//
-                .startDate(startDate)//
-                .numberOfInstallments(numberOfInstallments);//
+        PostLoansLoanIdTransactionsRequest reAgingRequest = setReAgeingRequestProperties(//
+                LoanRequestFactory.defaultReAgingRequest(), //
+                table.row(0), //
+                table.row(1) //
+        );
 
         Response<PostLoansLoanIdTransactionsResponse> response = loanTransactionsApi
                 .executeLoanTransaction1(loanExternalId, reAgingRequest, "reAge").execute();
@@ -521,4 +496,19 @@ private List<String> validateRepaymentScheduleTotal(List<String> header, LoanSch
         return actualValues;
     }
 
+    PostLoansLoanIdTransactionsRequest setReAgeingRequestProperties(PostLoansLoanIdTransactionsRequest request, List<String> headers,
+                                                                    List<String> values) {
+        for (int i = 0; i < headers.size(); i++) {
+            String header = headers.get(i).toLowerCase().trim().replaceAll(" ", "");
+            switch (header) {
+                case "frequencynumber" -> request.setFrequencyNumber(Integer.parseInt(values.get(i)));
+                case "frequencytype" -> request.setFrequencyType(values.get(i));
+                case "startdate" -> request.setStartDate(values.get(i));
+                case "numberofinstallments" -> request.setNumberOfInstallments(Integer.parseInt(values.get(i)));
+                case "reageinteresthandling" -> request.setReAgeInterestHandling(values.get(i));
+                default -> throw new IllegalStateException("Unknown header: " + header);
+            }
+        }
+        return request;
+    }
 }