Merge pull request #5718

FINERACT-2455: WC delinquency RESCHEDULE action to change minimum payment amount and frequency

Author: adamsaghy

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

@@ -863,9 +863,18 @@ private void createWorkingCapitalLoanAccount(final List<String> loanData) {
         final PostWorkingCapitalLoansResponse response = ok(
                 () -> fineractClient.workingCapitalLoans().submitWorkingCapitalLoanApplication(loansRequest));
         testContext().set(TestContextKey.LOAN_CREATE_RESPONSE, response);
+        trackLoanIdIfEnabled(response.getLoanId());
         log.info("Working Capital Loan created with ID: {}", response.getLoanId());
     }
 
+    @SuppressWarnings("unchecked")
+    private void trackLoanIdIfEnabled(final Long loanId) {
+        final List<Long> trackedIds = testContext().get(TestContextKey.WC_LOAN_IDS);
+        if (trackedIds != null) {
+            trackedIds.add(loanId);
+        }
+    }
+
     private void modifyWorkingCapitalLoanAccount(final List<String> loanData) {
         final PutWorkingCapitalLoansLoanIdRequest modifyRequest = buildModifyLoanRequest(loanData);
 
@@ -945,6 +954,11 @@ private Long extractClientId() {
     }
 
     private Long resolveLoanProductId(final String loanProductName) {
+        if ("WCLP_DELINQUENCY".equals(loanProductName)) {
+            final PostWorkingCapitalLoanProductsResponse response = testContext()
+                    .get(TestContextKey.WORKING_CAPITAL_LOAN_PRODUCT_CREATE_RESPONSE);
+            return response.getResourceId();
+        }
         final DefaultWorkingCapitalLoanProduct product = DefaultWorkingCapitalLoanProduct.valueOf(loanProductName);
         return workingCapitalLoanProductResolver.resolve(product);
     }

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

@@ -20,5 +20,6 @@
 
 public enum DelinquencyAction {
     PAUSE, //
-    RESUME //
+    RESUME, //
+    RESCHEDULE //
 }

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

@@ -66,7 +66,7 @@ public class WorkingCapitalLoanDelinquencyActionApiResource {
     @Path("{loanId}/delinquency-actions")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @Operation(summary = "Create Delinquency Pause Action", description = "Creates a delinquency pause action for a Working Capital loan, extending the active delinquency range period and shifting future periods by the pause duration.")
+    @Operation(summary = "Create Delinquency Action", description = "Creates a delinquency action (pause or reschedule) for a Working Capital loan.")
     @RequestBody(required = true, content = @Content(schema = @Schema(implementation = WorkingCapitalLoanDelinquencyActionApiResourceSwagger.PostWorkingCapitalLoansDelinquencyActionRequest.class)))
     @ApiResponses({
             @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = WorkingCapitalLoanDelinquencyActionApiResourceSwagger.PostWorkingCapitalLoansDelinquencyActionResponse.class))),
@@ -86,7 +86,7 @@ public CommandProcessingResult createDelinquencyAction(@PathParam("loanId") @Par
     @Path("external-id/{loanExternalId}/delinquency-actions")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @Operation(operationId = "createDelinquencyActionByExternalId", summary = "Create Delinquency Pause Action by external id", description = "Creates a delinquency pause action for a Working Capital loan identified by external id, extending the active delinquency range period and shifting future periods by the pause duration.")
+    @Operation(operationId = "createDelinquencyActionByExternalId", summary = "Create Delinquency Action by external id", description = "Creates a delinquency action (pause or reschedule) for a Working Capital loan identified by external id.")
     @RequestBody(required = true, content = @Content(schema = @Schema(implementation = WorkingCapitalLoanDelinquencyActionApiResourceSwagger.PostWorkingCapitalLoansDelinquencyActionRequest.class)))
     @ApiResponses({
             @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = WorkingCapitalLoanDelinquencyActionApiResourceSwagger.PostWorkingCapitalLoansDelinquencyActionResponse.class))),

fineract-loan/src/main/java/org/apache/fineract/portfolio/delinquency/domain/DelinquencyAction.java

@@ -19,6 +19,7 @@
 package org.apache.fineract.portfolio.workingcapitalloan.api;
 
 import io.swagger.v3.oas.annotations.media.Schema;
+import java.math.BigDecimal;
 
 public final class WorkingCapitalLoanDelinquencyActionApiResourceSwagger {
 
@@ -29,12 +30,20 @@ public static final class PostWorkingCapitalLoansDelinquencyActionRequest {
 
         private PostWorkingCapitalLoansDelinquencyActionRequest() {}
 
-        @Schema(example = "pause")
+        @Schema(example = "pause", description = "Delinquency action type: pause or reschedule")
         public String action;
-        @Schema(example = "2026-03-05")
+        @Schema(example = "2026-03-05", description = "Start date of the pause period (required for pause)")
         public String startDate;
-        @Schema(example = "2026-03-12")
+        @Schema(example = "2026-03-12", description = "End date of the pause period (required for pause)")
         public String endDate;
+        @Schema(example = "2", description = "Minimum payment value (required together with minimumPaymentType)")
+        public BigDecimal minimumPayment;
+        @Schema(example = "PERCENTAGE", description = "Minimum payment type: PERCENTAGE, FLAT (required together with minimumPayment)")
+        public String minimumPaymentType;
+        @Schema(example = "30", description = "Frequency value (required together with frequencyType)")
+        public Integer frequency;
+        @Schema(example = "DAYS", description = "Frequency type: DAYS, WEEKS, MONTHS, YEARS (required together with frequency)")
+        public String frequencyType;
         @Schema(example = "yyyy-MM-dd")
         public String dateFormat;
         @Schema(example = "en")

fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/api/WorkingCapitalLoanDelinquencyActionApiResource.java

@@ -18,11 +18,14 @@
  */
 package org.apache.fineract.portfolio.workingcapitalloan.data;
 
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.Setter;
 import org.apache.fineract.portfolio.delinquency.domain.DelinquencyAction;
+import org.apache.fineract.portfolio.delinquency.domain.DelinquencyFrequencyType;
+import org.apache.fineract.portfolio.delinquency.domain.DelinquencyMinimumPaymentType;
 
 @AllArgsConstructor
 @Getter
@@ -33,5 +36,9 @@ public class WorkingCapitalLoanDelinquencyActionData {
     private DelinquencyAction action;
     private LocalDate startDate;
     private LocalDate endDate;
+    private BigDecimal minimumPayment;
+    private DelinquencyMinimumPaymentType minimumPaymentType;
+    private Integer frequency;
+    private DelinquencyFrequencyType frequencyType;
 
 }

fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/api/WorkingCapitalLoanDelinquencyActionApiResourceSwagger.java

@@ -26,12 +26,15 @@
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.Table;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 import org.apache.fineract.infrastructure.core.domain.AbstractAuditableWithUTCDateTimeCustom;
 import org.apache.fineract.portfolio.delinquency.domain.DelinquencyAction;
+import org.apache.fineract.portfolio.delinquency.domain.DelinquencyFrequencyType;
+import org.apache.fineract.portfolio.delinquency.domain.DelinquencyMinimumPaymentType;
 
 @Getter
 @Setter
@@ -51,7 +54,21 @@ public class WorkingCapitalLoanDelinquencyAction extends AbstractAuditableWithUT
     @Column(name = "start_date", nullable = false)
     private LocalDate startDate;
 
-    @Column(name = "end_date", nullable = false)
+    @Column(name = "end_date")
     private LocalDate endDate;
 
+    @Column(name = "minimum_payment", scale = 6, precision = 19)
+    private BigDecimal minimumPayment;
+
+    @Enumerated(EnumType.STRING)
+    @Column(name = "minimum_payment_type")
+    private DelinquencyMinimumPaymentType minimumPaymentType;
+
+    @Column(name = "frequency")
+    private Integer frequency;
+
+    @Enumerated(EnumType.STRING)
+    @Column(name = "frequency_type")
+    private DelinquencyFrequencyType frequencyType;
+
 }

fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/WorkingCapitalLoanDelinquencyActionData.java

@@ -25,6 +25,7 @@
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.Table;
 import jakarta.persistence.UniqueConstraint;
+import jakarta.persistence.Version;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import lombok.Getter;
@@ -40,6 +41,10 @@
         @UniqueConstraint(columnNames = { "wc_loan_id", "period_number" }, name = "uc_wc_delinquency_range_schedule_loan_period") })
 public class WorkingCapitalLoanDelinquencyRangeSchedule extends AbstractAuditableWithUTCDateTimeCustom<Long> {
 
+    @Version
+    @Column(name = "version")
+    private Integer version;
+
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "wc_loan_id", nullable = false)
     private WorkingCapitalLoan loan;

fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanDelinquencyAction.java

@@ -19,6 +19,8 @@
 package org.apache.fineract.portfolio.workingcapitalloan.repository;
 
 import java.util.List;
+import java.util.Optional;
+import org.apache.fineract.portfolio.delinquency.domain.DelinquencyAction;
 import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanDelinquencyAction;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
@@ -28,4 +30,7 @@ public interface WorkingCapitalLoanDelinquencyActionRepository extends JpaReposi
 
     List<WorkingCapitalLoanDelinquencyAction> findByWorkingCapitalLoanIdOrderById(Long workingCapitalLoanId);
 
+    Optional<WorkingCapitalLoanDelinquencyAction> findTopByWorkingCapitalLoanIdAndActionOrderByIdDesc(Long workingCapitalLoanId,
+            DelinquencyAction action);
+
 }