FINERACT-2455: WC - Delinquency Management - Delinquency days & Delinquency Bucket handling - E2E tests

Author: peter-kovacs-dpc

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

@@ -872,10 +872,10 @@ private void createWorkingCapitalLoanAccount(final List<String> loanData) {
 
     @SuppressWarnings("unchecked")
     private void trackLoanIdIfEnabled(final Long loanId) {
-        final List<Long> trackedIds = testContext().get(TestContextKey.WC_LOAN_IDS);
-        if (trackedIds != null) {
-            trackedIds.add(loanId);
+        if (testContext().get(TestContextKey.WC_LOAN_IDS) == null) {
+            testContext().set(TestContextKey.WC_LOAN_IDS, new ArrayList<>());
         }
+        ((List<Long>) testContext().get(TestContextKey.WC_LOAN_IDS)).add(loanId);
     }
 
     private void modifyWorkingCapitalLoanAccount(final List<String> loanData) {

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

@@ -724,21 +724,34 @@ private void assertGLAccountMappingId(final Map<String, ?> mappings, final Strin
         assertions.assertAll();
     }
 
-    @When("make Internal Payment {string} on {string}")
+    private Long getWorkingCapitalLoanResourceId() {
+        PostWorkingCapitalLoansResponse response = testContext().get(TestContextKey.LOAN_CREATE_RESPONSE);
+        return response.getResourceId();
+    }
+
+    @When("Admin makes Internal Payment {string} on {string}")
     public void internalPayWCLoan(String amount, String transactionDate) {
-        PostWorkingCapitalLoansResponse workingCapitalLoanProductsResponse = testContext().get(TestContextKey.LOAN_CREATE_RESPONSE);
-        Long resourceId = workingCapitalLoanProductsResponse.getResourceId();
+        Long resourceId = getWorkingCapitalLoanResourceId();
         fineractFeignClient.workingCapitalLoans().payment(resourceId, new InternalWorkingCapitalLoanPaymentRequest()
                 .amount(BigDecimal.valueOf(Double.parseDouble(amount))).transactionDate(LocalDate.parse(transactionDate)));
     }
 
-    @Then("Delinquency Tag History for WC Loan has lines:")
+    @Then("Delinquency Tag History for Working Capital loan has lines:")
     public void checkDelinquencyHistory(final DataTable table) {
-        PostWorkingCapitalLoansResponse workingCapitalLoanProductsResponse = testContext().get(TestContextKey.LOAN_CREATE_RESPONSE);
-        Long resourceId = workingCapitalLoanProductsResponse.getResourceId();
+        Long resourceId = getWorkingCapitalLoanResourceId();
         List<GetWorkingCapitalLoanDelinquencyRangeScheduleTagHistoryResponse> actualLines = ok(
                 () -> fineractFeignClient.workingCapitalLoans().getDelinquencyRangeScheduleTagHistoryById(resourceId));
-        log.info("Loan {}", actualLines);
+
+        // Sort by addedOnDate (descending), then by periodNumber (descending)
+        actualLines.sort((a, b) -> {
+            int dateCompare = b.getAddedOnDate().compareTo(a.getAddedOnDate());
+            if (dateCompare != 0) {
+                return dateCompare;
+            }
+            return b.getPeriodNumber().compareTo(a.getPeriodNumber());
+        });
+
+        log.debug("Sorted Loan Delinquency History: {}", actualLines);
         List<List<String>> rows = table.asLists();
         Assertions.assertEquals(rows.size() - 1, actualLines.size());
         for (int i = 0; i < rows.size() - 1; i++) {