Skip to content

FINERACT-2455: WC - Delinquency Pause Resume #5969

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mariiaKraievska wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

FINERACT-2455: WC - Delinquency Pause Resume #5969

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b412eb5
FINERACT-2455: WC - Delinquency Pause Resume
mariiaKraievska Jun 10, 2026
595902a
FINERACT-2455: added e2e tests for validating WC - Delinquency Pause …
ruzeynalov Jun 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 43 additions & 2 deletions ...src/test/java/org/apache/fineract/test/stepdef/loan/WorkingCapitalDelinquencyStepDef.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,37 @@ public void initiateDelinquencyPauseByExternalId(String startDate, String endDat
startDate, endDate, response);
}

@When("Admin initiate a Working Capital loan delinquency resume with startDate {string}")
public void initiateDelinquencyResume(final String startDate) {
final Long loanId = extractLoanId();
final PostWorkingCapitalLoansDelinquencyActionRequest request = buildResumeRequest(startDate);
final PostWorkingCapitalLoansDelinquencyActionResponse response = createDelinquencyActionById(loanId, request);

log.debug("Delinquency resume initiated for loan {} with startDate: {}, response: {}", loanId, startDate, response);
}

@When("Admin initiate a Working Capital loan delinquency resume by external ID with startDate {string}")
public void initiateDelinquencyResumeByExternalId(final String startDate) {
final String loanExternalId = extractLoanExternalId();
final PostWorkingCapitalLoansDelinquencyActionRequest request = buildResumeRequest(startDate);
final PostWorkingCapitalLoansDelinquencyActionResponse response = createDelinquencyActionByExternalId(loanExternalId, request);

log.debug("Delinquency resume initiated for loan externalId {} with startDate: {}, response: {}", loanExternalId, startDate,
response);
}

@Then("Initiating a Working Capital loan delinquency resume with startDate {string} results an error with the following data:")
public void initiateDelinquencyResumeResultsAnErrorWithDetails(final String startDate, final DataTable table) {
final Long loanId = extractLoanId();
final PostWorkingCapitalLoansDelinquencyActionRequest request = buildResumeRequest(startDate);

final CallFailedRuntimeException exception = fail(
() -> fineractClient.workingCapitalLoanDelinquencyActions().createDelinquencyAction(loanId, request));

verifyDelinquencyPauseErrorWithTable(exception, table);
log.info("Verified delinquency resume initiation failed with expected error for loan {}", loanId);
}

@Then("Initiating a Working Capital loan delinquency pause with startDate {string} and endDate {string} results an error")
public void initiateDelinquencyPauseResultsAnError(String startDate, String endDate) {
initiateDelinquencyPauseResultsAnErrorWithDetails(startDate, endDate, null);
Expand Down Expand Up @@ -127,8 +158,13 @@ private void verifyDelinquencyActionField(WorkingCapitalLoanDelinquencyActionDat
case "action" -> assertThat(actual.getAction().name()).as("Action for row %d", rowNumber).isEqualTo(expectedValue);
case "startDate" ->
assertThat(actual.getStartDate()).as("Start date for row %d", rowNumber).isEqualTo(LocalDate.parse(expectedValue));
case "endDate" ->
assertThat(actual.getEndDate()).as("End date for row %d", rowNumber).isEqualTo(LocalDate.parse(expectedValue));
case "endDate" -> {
if (expectedValue == null || expectedValue.isBlank()) {
assertThat(actual.getEndDate()).as("End date for row %d", rowNumber).isNull();
} else {
assertThat(actual.getEndDate()).as("End date for row %d", rowNumber).isEqualTo(LocalDate.parse(expectedValue));
}
}
default -> throw new IllegalArgumentException("Unknown field name: " + fieldName);
}
}
Expand Down Expand Up @@ -183,6 +219,11 @@ private PostWorkingCapitalLoansDelinquencyActionRequest buildDelinquencyActionRe
.endDate(endDate);
}

private PostWorkingCapitalLoansDelinquencyActionRequest buildResumeRequest(final String startDate) {
return workingCapitalLoanRequestFactory.defaultWorkingCapitalLoansDelinquencyActionRequest("resume").startDate(startDate)
.endDate(null);
}

private PostWorkingCapitalLoansDelinquencyActionResponse createDelinquencyActionById(Long loanId,
PostWorkingCapitalLoansDelinquencyActionRequest request) {
return ok(() -> fineractClient.workingCapitalLoanDelinquencyActions().createDelinquencyAction(loanId, request));
Expand Down
212 changes: 212 additions & 0 deletions ...ract-e2e-tests-runner/src/test/resources/features/WorkingCapitalDelinquencyResume.feature
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions ...ract/portfolio/workingcapitalloan/api/WorkingCapitalLoanDelinquencyActionApiResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@

@Path("/v1/working-capital-loans")
@Component
@Tag(name = "Working Capital Loan Delinquency Actions", description = "Manages delinquency pause actions for Working Capital loans")
@Tag(name = "Working Capital Loan Delinquency Actions", description = "Manages delinquency pause, resume and reschedule actions for Working Capital loans")
@RequiredArgsConstructor
public class WorkingCapitalLoanDelinquencyActionApiResource {

Expand All @@ -66,7 +66,7 @@ public class WorkingCapitalLoanDelinquencyActionApiResource {
@Path("{loanId}/delinquency-actions")
@Consumes({ MediaType.APPLICATION_JSON })
@Produces({ MediaType.APPLICATION_JSON })
@Operation(summary = "Create Delinquency Action", description = "Creates a delinquency action (pause or reschedule) for a Working Capital loan.")
@Operation(summary = "Create Delinquency Action", description = "Creates a delinquency action (pause, resume 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))),
Expand All @@ -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 Action by external id", description = "Creates a delinquency action (pause or reschedule) for a Working Capital loan identified by external id.")
@Operation(operationId = "createDelinquencyActionByExternalId", summary = "Create Delinquency Action by external id", description = "Creates a delinquency action (pause, resume 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))),
Expand Down
6 changes: 3 additions & 3 deletions ...rtfolio/workingcapitalloan/api/WorkingCapitalLoanDelinquencyActionApiResourceSwagger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ public static final class PostWorkingCapitalLoansDelinquencyActionRequest {

private PostWorkingCapitalLoansDelinquencyActionRequest() {}

@Schema(example = "pause", description = "Delinquency action type: pause or reschedule")
@Schema(example = "pause", description = "Delinquency action type: pause, resume or reschedule")
public String action;
@Schema(example = "2026-03-05", description = "Start date of the pause period (required for pause)")
@Schema(example = "2026-03-05", description = "Start date of the pause period (required for pause) or resume date (required for resume, must be current business date)")
public String startDate;
@Schema(example = "2026-03-12", description = "End date of the pause period (required for pause)")
@Schema(example = "2026-03-12", description = "End date of the pause period (required for pause, must not be provided for resume)")
public String endDate;
@Schema(example = "2", description = "Minimum payment value (required together with minimumPaymentType)")
public BigDecimal minimumPayment;
Expand Down
5 changes: 5 additions & 0 deletions ...folio/workingcapitalloan/service/WorkingCapitalLoanDelinquencyActionWriteServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import org.apache.fineract.infrastructure.core.api.JsonCommand;
import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
import org.apache.fineract.infrastructure.core.data.CommandProcessingResultBuilder;
import org.apache.fineract.infrastructure.core.service.DateUtils;
import org.apache.fineract.portfolio.delinquency.domain.DelinquencyAction;
import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan;
import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanDelinquencyAction;
Expand Down Expand Up @@ -63,6 +64,10 @@ public CommandProcessingResult createDelinquencyAction(final Long workingCapital
rangeScheduleService.extendPeriodsForPause(workingCapitalLoan, action.getStartDate(), action.getEndDate());
} else if (DelinquencyAction.RESCHEDULE.equals(action.getAction())) {
rangeScheduleService.rescheduleMinimumPayment(workingCapitalLoan, action);
} else if (DelinquencyAction.RESUME.equals(action.getAction())) {
final WorkingCapitalLoanDelinquencyAction activePause = validator.findActivePauseForResume(existing,
DateUtils.getBusinessLocalDate());
rangeScheduleService.resumeActivePause(workingCapitalLoan, activePause, action);
}

return new CommandProcessingResultBuilder() //
Expand Down
3 changes: 3 additions & 0 deletions ...rtfolio/workingcapitalloan/service/WorkingCapitalLoanDelinquencyRangeScheduleService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,7 @@ public interface WorkingCapitalLoanDelinquencyRangeScheduleService {

void rescheduleMinimumPayment(WorkingCapitalLoan loan, WorkingCapitalLoanDelinquencyAction rescheduleAction);

void resumeActivePause(WorkingCapitalLoan loan, WorkingCapitalLoanDelinquencyAction activePause,
WorkingCapitalLoanDelinquencyAction resumeAction);

}
Loading