Skip to content

FINERACT-2455: Working Capital Charge Adjustment Transaction #5974

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
alberto-art3ch wants to merge 2 commits into
base: develop
Choose a base branch
from
+1,227 −3
Open

FINERACT-2455: Working Capital Charge Adjustment Transaction #5974

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
cfb883b
FINERACT-2455: Working Capital Charge Adjustment Transaction
alberto-art3ch Jun 10, 2026
7b20db2
FINERACT-2455: Working Capital Charge Adjustment Transaction - E2E tests
peter-kovacs-dpc Jun 17, 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
9 changes: 9 additions & 0 deletions fineract-core/src/main/java/org/apache/fineract/commands/service/CommandWrapperBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1147,6 +1147,15 @@ public CommandWrapperBuilder createWorkingCapitalLoanCharge(final Long loanId) {
return this;
}

public CommandWrapperBuilder adjustmentForWorkingCapitalLoanCharge(final Long loanId, final Long loanChargeId) {
this.actionName = ACTION_ADJUSTMENT;
this.entityName = ENTITY_WORKINGCAPITALLOANCHARGE;
this.entityId = loanChargeId;
this.loanId = loanId;
this.href = "/working-capital-loans/" + loanId + "/charges/" + loanChargeId;
return this;
}

public CommandWrapperBuilder updateLoanCharge(final Long loanId, final Long loanChargeId) {
this.actionName = ACTION_UPDATE;
this.entityName = ENTITY_LOANCHARGE;
Expand Down
138 changes: 138 additions & 0 deletions ...core/src/test/java/org/apache/fineract/test/stepdef/loan/WorkingCapitalChargeStepDef.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
import java.util.Map;
import lombok.RequiredArgsConstructor;
Expand All @@ -39,10 +40,15 @@
import org.apache.fineract.client.models.EnumOptionData;
import org.apache.fineract.client.models.GetBalance;
import org.apache.fineract.client.models.GetChargesResponse;
import org.apache.fineract.client.models.GetWorkingCapitalLoanTransactionIdResponse;
import org.apache.fineract.client.models.GetWorkingCapitalLoanTransactionsResponse;
import org.apache.fineract.client.models.GetWorkingCapitalLoansLoanIdResponse;
import org.apache.fineract.client.models.PostChargesResponse;
import org.apache.fineract.client.models.PostLoansLoanIdChargesRequest;
import org.apache.fineract.client.models.PostLoansLoanIdChargesResponse;
import org.apache.fineract.client.models.PostWorkingCapitalLoanTransactionsRequest;
import org.apache.fineract.client.models.PostWorkingCapitalLoansLoanIdChargesChargeIdRequest;
import org.apache.fineract.client.models.PostWorkingCapitalLoansLoanIdChargesChargeIdResponse;
import org.apache.fineract.client.models.PostWorkingCapitalLoansResponse;
import org.apache.fineract.client.models.WorkingCapitalLoanChargeData;
import org.apache.fineract.test.data.ChargeCalculationType;
Expand Down Expand Up @@ -409,6 +415,101 @@ public void createWclChargeWithInvalidParamsFails(String chargeTimeTypeName, Str
chargeTimeTypeName, chargeCalcTypeName, exception.getStatus(), expectedErrorMessage);
}

@When("Admin makes a charge adjustment for the last added charge with {double} amount on working capital loan")
public void makeWcChargeAdjustment(final Double amount) {
final Long loanId = getLoanId();
final Long loanChargeId = getLastAddedLoanChargeId();
final PostWorkingCapitalLoansLoanIdChargesChargeIdRequest request = new PostWorkingCapitalLoansLoanIdChargesChargeIdRequest()
.amount(amount).locale("en");
final PostWorkingCapitalLoansLoanIdChargesChargeIdResponse response = ok(
() -> fineractClient.workingCapitalLoanCharges().adjustLoanCharge(loanId, loanChargeId, request, "adjustment"));
Assertions.assertNotNull(response);
testContext().set(TestContextKey.WORKING_CAPITAL_CHARGE_ADJUSTMENT_RESPONSE, response);
log.debug("WC charge adjustment response: {}", response);
}

@When("Admin makes a charge adjustment for the last added fee charge with {double} amount on working capital loan")
public void makeWcFeeChargeAdjustment(final Double amount) {
final Long loanId = getLoanId();
final Long loanChargeId = getLastAddedFeeChargeId(loanId);
final PostWorkingCapitalLoansLoanIdChargesChargeIdRequest request = new PostWorkingCapitalLoansLoanIdChargesChargeIdRequest()
.amount(amount).locale("en");
final PostWorkingCapitalLoansLoanIdChargesChargeIdResponse response = ok(
() -> fineractClient.workingCapitalLoanCharges().adjustLoanCharge(loanId, loanChargeId, request, "adjustment"));
Assertions.assertNotNull(response);
testContext().set(TestContextKey.WORKING_CAPITAL_CHARGE_ADJUSTMENT_RESPONSE, response);
log.debug("WC fee charge adjustment response: {}", response);
}

@When("Admin makes a charge adjustment for the last added penalty charge with {double} amount on working capital loan")
public void makeWcPenaltyChargeAdjustment(final Double amount) {
final Long loanId = getLoanId();
final Long loanChargeId = getLastAddedPenaltyChargeId(loanId);
final PostWorkingCapitalLoansLoanIdChargesChargeIdRequest request = new PostWorkingCapitalLoansLoanIdChargesChargeIdRequest()
.amount(amount).locale("en");
final PostWorkingCapitalLoansLoanIdChargesChargeIdResponse response = ok(
() -> fineractClient.workingCapitalLoanCharges().adjustLoanCharge(loanId, loanChargeId, request, "adjustment"));
Assertions.assertNotNull(response);
testContext().set(TestContextKey.WORKING_CAPITAL_CHARGE_ADJUSTMENT_RESPONSE, response);
log.debug("WC penalty charge adjustment response: {}", response);
}

@When("Admin makes a charge adjustment for the last added charge with {double} amount and transaction date {string} on working capital loan")
public void makeWcChargeAdjustmentWithDate(final Double amount, final String transactionDate) {
final Long loanId = getLoanId();
final Long loanChargeId = getLastAddedLoanChargeId();
final LocalDate parsedDate = LocalDate.parse(transactionDate, FORMATTER);
final PostWorkingCapitalLoansLoanIdChargesChargeIdRequest request = new PostWorkingCapitalLoansLoanIdChargesChargeIdRequest()
.amount(amount).transactionDate(parsedDate.format(FORMATTER_API)).dateFormat(DATE_FORMAT_API).locale("en");
final PostWorkingCapitalLoansLoanIdChargesChargeIdResponse response = ok(
() -> fineractClient.workingCapitalLoanCharges().adjustLoanCharge(loanId, loanChargeId, request, "adjustment"));
Assertions.assertNotNull(response);
testContext().set(TestContextKey.WORKING_CAPITAL_CHARGE_ADJUSTMENT_RESPONSE, response);
log.debug("WC charge adjustment with date response: {}", response);
}

@Then("Making a charge adjustment with {double} amount on working capital loan results an error with the following data:")
public void makeWcChargeAdjustmentFails(final Double amount, final DataTable table) {
final Long loanId = getLoanId();
final Long loanChargeId = getLastAddedLoanChargeId();
final PostWorkingCapitalLoansLoanIdChargesChargeIdRequest request = new PostWorkingCapitalLoansLoanIdChargesChargeIdRequest()
.amount(amount).locale("en");
final Map<String, String> expectedData = table.asMaps().get(0);
final int expectedHttpCode = Integer.parseInt(expectedData.get("httpCode"));
final String expectedErrorMessage = expectedData.get("errorMessage").trim();
final CallFailedRuntimeException exception = fail(
() -> fineractClient.workingCapitalLoanCharges().adjustLoanCharge(loanId, loanChargeId, request, "adjustment"));
assertHttpStatus(exception, expectedHttpCode);
assertErrorMessage(exception, expectedErrorMessage);
log.info("Verified WC charge adjustment failed with status {} and message: {}", exception.getStatus(), expectedErrorMessage);
}

@When("Admin reverts the last charge adjustment on working capital loan")
public void revertLastWcChargeAdjustment() {
final Long loanId = getLoanId();
final GetWorkingCapitalLoanTransactionIdResponse adjustmentTxn = getLastChargeAdjustmentTransaction(loanId, false);
final PostWorkingCapitalLoanTransactionsRequest request = new PostWorkingCapitalLoanTransactionsRequest();
ok(() -> fineractClient.workingCapitalLoanTransactions().executeWorkingCapitalLoanTransactionCommandById(loanId,
adjustmentTxn.getId(), "undo", request));
log.debug("Reverted WC charge adjustment transaction id={} on loan {}", adjustmentTxn.getId(), loanId);
}

@Then("Reverting an already reversed charge adjustment on working capital loan results an error with the following data:")
public void revertAlreadyRevertedWcChargeAdjustmentFails(final DataTable table) {
final Long loanId = getLoanId();
final GetWorkingCapitalLoanTransactionIdResponse adjustmentTxn = getLastChargeAdjustmentTransaction(loanId, null);
final PostWorkingCapitalLoanTransactionsRequest request = new PostWorkingCapitalLoanTransactionsRequest();
final Map<String, String> expectedData = table.asMaps().get(0);
final int expectedHttpCode = Integer.parseInt(expectedData.get("httpCode"));
final String expectedErrorMessage = expectedData.get("errorMessage").trim();
final CallFailedRuntimeException exception = fail(() -> fineractClient.workingCapitalLoanTransactions()
.executeWorkingCapitalLoanTransactionCommandById(loanId, adjustmentTxn.getId(), "undo", request));
assertHttpStatus(exception, expectedHttpCode);
assertErrorMessage(exception, expectedErrorMessage);
log.info("Verified reverting already reversed WC charge adjustment failed with status {} and message: {}", expectedHttpCode,
expectedErrorMessage);
}

@Then("Trying to add working capital loan charge by loan id and charge id with amount {double} and due date {string} results an error with the following data:")
public void tryAddWorkingCapitalLoanChargeWithError(Double amount, String dueDate, DataTable table) {
Long loanId = getLoanId();
Expand All @@ -431,6 +532,43 @@ public void tryAddWorkingCapitalLoanChargeWithError(Double amount, String dueDat
expectedErrorMessage);
}

// Charge Adjustment Helpers
private Long getLastAddedLoanChargeId() {
final PostLoansLoanIdChargesResponse response = testContext().get(TestContextKey.ADD_DUE_DATE_CHARGE_WORKING_CAPITAL_RESPONSE);
Assertions.assertNotNull(response, "No charge has been added to the working capital loan yet");
return response.getResourceId();
}

private Long getLastAddedFeeChargeId(final Long loanId) {
return getLastAddedChargeIdByPenaltyFlag(loanId, false);
}

private Long getLastAddedPenaltyChargeId(final Long loanId) {
return getLastAddedChargeIdByPenaltyFlag(loanId, true);
}

private Long getLastAddedChargeIdByPenaltyFlag(final Long loanId, final boolean isPenalty) {
final List<WorkingCapitalLoanChargeData> charges = ok(
() -> fineractClient.workingCapitalLoanCharges().retrieveAllWorkingCapitalLoanChargesByLoanId(loanId));
Assertions.assertNotNull(charges, "No charges found on loan " + loanId);
final String chargeType = isPenalty ? "penalty" : "fee";
return charges.stream().filter(c -> isPenalty == Boolean.TRUE.equals(c.getPenalty()))
.max(Comparator.comparing(WorkingCapitalLoanChargeData::getId)).map(WorkingCapitalLoanChargeData::getId)
.orElseThrow(() -> new IllegalStateException("No active " + chargeType + " charge found on loan " + loanId));
}

private GetWorkingCapitalLoanTransactionIdResponse getLastChargeAdjustmentTransaction(final Long loanId,
final Boolean excludeReversed) {
final GetWorkingCapitalLoanTransactionsResponse body = ok(
() -> fineractClient.workingCapitalLoanTransactions().retrieveWorkingCapitalLoanTransactionsById(loanId));
Assertions.assertNotNull(body.getContent(), "No WC loan transactions found");
return body.getContent().stream()
.filter(t -> t.getType() != null && "loanTransactionType.chargeAdjustment".equals(t.getType().getCode()))
.filter(t -> excludeReversed == null || !Boolean.TRUE.equals(t.getReversed()))
.max(Comparator.comparing(GetWorkingCapitalLoanTransactionIdResponse::getId))
.orElseThrow(() -> new IllegalStateException("No charge adjustment transaction found on loan " + loanId));
}

// Charge API Helpers
private void createChargeAndStore(final ChargeRequest request) {
final PostChargesResponse response = ok(() -> fineractClient.charges().createCharge(request));
Expand Down
3 changes: 2 additions & 1 deletion ...src/test/java/org/apache/fineract/test/stepdef/loan/WorkingCapitalLoanAccountStepDef.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,8 @@ public void createClientAndDisburseWorkingCapitalLoanWithData(final DataTable ta
// Disburse loan using existing helper method
final PostWorkingCapitalLoansLoanIdRequest disburseRequest = workingCapitalLoanRequestFactory
.defaultWorkingCapitalLoanDisburseRequest()//
.actualDisbursementDate(submittedOnDate);
.actualDisbursementDate(submittedOnDate)//
.transactionAmount(new BigDecimal(principalAmount));
executeStateTransition("disburse", disburseRequest, TestContextKey.LOAN_DISBURSE_RESPONSE, false);

// Verify loan is ACTIVE
Expand Down
1 change: 1 addition & 0 deletions fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/support/TestContextKey.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,6 +372,7 @@ public abstract class TestContextKey {
public static final String WORKING_CAPITAL_CHARGE_ID = "workingCapitalChargeId";
public static final String WORKING_CAPITAL_LOAN_CHARGE_IDS = "workingCapitalLoanChargeIds";
public static final String WORKING_CAPITAL_CHARGE_TEMPLATE = "workingCapitalChargeTemplate";
public static final String WORKING_CAPITAL_CHARGE_ADJUSTMENT_RESPONSE = "workingCapitalChargeAdjustmentResponse";
public static final String WORKING_CAPITAL_LOAN_DISBURSE_DISCOUNT_EXTERNAL_ID_USER_GENERATED = "workingCapitalLoanDisburseDiscountExternalIdUserGenerated";
public static final String WORKING_CAPITAL_LOAN_DISCOUNT_FEE_EXTERNAL_ID_USER_GENERATED = "workingCapitalLoanDiscountFeeExternalIdUserGenerated";
public static final String WORKING_CAPITAL_LOAN_DISCOUNT_FEE_RESPONSE = "workingCapitalLoanDiscountFeeResponse";
Expand Down
Loading