FINERACT-2455: Working Capital - Undo disbursement and discount is not handled properly

somasorosdpc · somasorosdpc · commit e7dc573fd5f0 · 2026-05-28T16:31:40.000+02:00
diff --git a/fineract-e2e-tests-runner/src/test/resources/features/WorkingCapitalDiscount.feature b/fineract-e2e-tests-runner/src/test/resources/features/WorkingCapitalDiscount.feature
diff --git a/fineract-e2e-tests-runner/src/test/resources/features/WorkingCapitalLoanAccount.feature b/fineract-e2e-tests-runner/src/test/resources/features/WorkingCapitalLoanAccount.feature
@@ -67,7 +67,7 @@ Feature: WorkingCapitalLoanAccount
     Then Working capital loan creation was successful
     And Working capital loan account has the correct data:
       | product.name                               | submittedOnDate | expectedDisbursementDate | status                         | principal | approvedPrincipal | totalPayment | periodPaymentRate | discountProposed |
-      | WCLP_DISCOUNT_DISALLOW_ATTRIBUTES_OVERRIDE | 2026-01-01      | 2026-01-01               | Submitted and pending approval | 100.0     | 0.0               | 100.0        | 1.0               | null             |
+      | WCLP_DISCOUNT_DISALLOW_ATTRIBUTES_OVERRIDE | 2026-01-01      | 2026-01-01               | Submitted and pending approval | 100.0     | 0.0               | 100.0        | 1.0               | 50.0             |
 
   @TestRailId:C70254
   Scenario: Create Working Capital Loan account - UC5: Create with principal amount greater than WCLP max (Negative)
diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/WorkingCapitalLoanCommandTemplateData.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/WorkingCapitalLoanCommandTemplateData.java
@@ -44,6 +44,8 @@ public class WorkingCapitalLoanCommandTemplateData implements Serializable {
     private Long loanId;
     private LocalDate approvalDate;
     private BigDecimal approvalAmount;
+    private BigDecimal discountAmount;
+    private Boolean overrideDiscountDisabled;
 
     private LocalDate expectedDisbursementDate;
     private BigDecimal expectedAmount;
diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/repository/WorkingCapitalLoanRepository.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/repository/WorkingCapitalLoanRepository.java
@@ -92,7 +92,8 @@ List<Long> findAllLoansByLastClosedBusinessDateAndMinAndMaxLoanIdAndStatuses(Lon
     List<COBIdAndLastClosedBusinessDate> findAllLoansBehindOrNullByLoanIdsAndStatuses(@Param("cobBusinessDate") LocalDate cobBusinessDate,
             @Param("loanIds") List<Long> loanIds, @Param("loanStatuses") Collection<LoanStatus> loanStatuses);
 
-    Long findIdByExternalId(ExternalId externalId);
+    @Query("select loan.id as id from  WorkingCapitalLoan loan where loan.externalId = :externalId")
+    Long findIdByExternalId(@Param("externalId") ExternalId externalId);
 
     @Query("select loan.id, loan.lastClosedBusinessDate from WorkingCapitalLoan loan where loan.id IN :loanIds and loan.loanStatus in :loanStatuses and loan.lastClosedBusinessDate < :cobBusinessDate")
     List<COBIdAndLastClosedBusinessDate> findAllLoansBehindByLoanIdsAndStatuses(@Param("cobBusinessDate") LocalDate cobBusinessDate,
diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/serialization/WorkingCapitalLoanApplicationDataValidator.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/serialization/WorkingCapitalLoanApplicationDataValidator.java
@@ -596,7 +596,7 @@ private void validateOverridables(final JsonElement element, final DataValidator
             }
         }
         if (this.fromApiJsonHelper.parameterExists(WorkingCapitalLoanProductConstants.discountParamName, element)) {
-            if (config.isDiscountDefault()) {
+            if (config.isDiscountDefaultOverridable()) {
                 final BigDecimal discount = this.fromApiJsonHelper
                         .extractBigDecimalNamed(WorkingCapitalLoanProductConstants.discountParamName, element, new java.util.HashSet<>());
                 baseDataValidator.reset().parameter(WorkingCapitalLoanProductConstants.discountParamName).value(discount).ignoreIfNull()
diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/serialization/WorkingCapitalLoanDataValidator.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/serialization/WorkingCapitalLoanDataValidator.java
@@ -119,15 +119,16 @@ public void validateDiscountTransaction(final WorkingCapitalLoan loan, final Str
         final DataValidatorBuilder baseDataValidator = new DataValidatorBuilder(dataValidationErrors)
                 .resource(WorkingCapitalLoanConstants.RESOURCE_NAME);
 
-        if (isDiscountOverrideAllowed(loan)) {
-            baseDataValidator.reset().parameter(WorkingCapitalLoanConstants.discountAmountParamName)
-                    .failWithCode("override.not.allowed.by.product");
-        }
         baseDataValidator.reset().parameter(WorkingCapitalLoanConstants.discountAmountParamName).value(discountAmount).ignoreIfNull()
                 .zeroOrPositiveAmount();
 
-        final BigDecimal currentDiscount = loan.getLoanProductRelatedDetails() != null ? loan.getLoanProductRelatedDetails().getDiscount()
+        final BigDecimal currentDiscount = loan.getLoanProductRelatedDetails() != null
+                ? loan.getLoanProductRelatedDetails().getDiscountApproved()
                 : null;
+        if (isDiscountOverrideDisallowed(loan) && (currentDiscount == null || discountAmount.compareTo(currentDiscount) != 0)) {
+            baseDataValidator.reset().parameter(WorkingCapitalLoanConstants.discountAmountParamName)
+                    .failWithCode("override.not.allowed.by.product");
+        }
         if (currentDiscount == null) {
             validateDiscountAmountWithProductDiscount(discountAmount, loan.getLoanProduct().getRelatedDetail(), baseDataValidator);
         }
@@ -209,17 +210,17 @@ public void validateApproval(final String json, final WorkingCapitalLoan loan) {
 
         // discountAmount must be >= 0 and <= proposed discount (creation-time) discount
         if (this.fromApiJsonHelper.parameterHasValue(WorkingCapitalLoanConstants.discountAmountParamName, element)) {
-            if (isDiscountOverrideAllowed(loan)) {
-                baseDataValidator.reset().parameter(WorkingCapitalLoanConstants.discountAmountParamName)
-                        .failWithCode("override.not.allowed.by.product");
-            }
             final BigDecimal discountAmount = this.fromApiJsonHelper
                     .extractBigDecimalNamed(WorkingCapitalLoanConstants.discountAmountParamName, element, new HashSet<>());
             baseDataValidator.reset().parameter(WorkingCapitalLoanConstants.discountAmountParamName).value(discountAmount).ignoreIfNull()
                     .zeroOrPositiveAmount();
             final BigDecimal currentDiscount = loan.getLoanProductRelatedDetails() != null
                     ? loan.getLoanProductRelatedDetails().getDiscountProposed()
                     : null;
+            if (isDiscountOverrideDisallowed(loan) && (currentDiscount == null || discountAmount.compareTo(currentDiscount) != 0)) {
+                baseDataValidator.reset().parameter(WorkingCapitalLoanConstants.discountAmountParamName)
+                        .failWithCode("override.not.allowed.by.product");
+            }
             if (currentDiscount != null) {
                 if (discountAmount.compareTo(currentDiscount) > 0) {
                     baseDataValidator.reset().parameter(WorkingCapitalLoanConstants.discountAmountParamName)
@@ -352,10 +353,6 @@ public void validateDisbursement(final String json, final WorkingCapitalLoan loa
         }
 
         if (this.fromApiJsonHelper.parameterHasValue(WorkingCapitalLoanConstants.discountAmountParamName, element)) {
-            if (isDiscountOverrideAllowed(loan)) {
-                baseDataValidator.reset().parameter(WorkingCapitalLoanConstants.discountAmountParamName)
-                        .failWithCode("override.not.allowed.by.product");
-            }
             final BigDecimal discountAmount = this.fromApiJsonHelper
                     .extractBigDecimalNamed(WorkingCapitalLoanConstants.discountAmountParamName, element, new HashSet<>());
             baseDataValidator.reset().parameter(WorkingCapitalLoanConstants.discountAmountParamName).value(discountAmount).ignoreIfNull()
@@ -365,6 +362,10 @@ public void validateDisbursement(final String json, final WorkingCapitalLoan loa
             final BigDecimal currentDiscount = loan.getLoanProductRelatedDetails() != null
                     ? loan.getLoanProductRelatedDetails().getDiscountApproved()
                     : null;
+            if (isDiscountOverrideDisallowed(loan) && (currentDiscount == null || currentDiscount.compareTo(discountAmount) != 0)) {
+                baseDataValidator.reset().parameter(WorkingCapitalLoanConstants.discountAmountParamName)
+                        .failWithCode("override.not.allowed.by.product");
+            }
             if (discountAmount != null) {
                 if (currentDiscount != null) {
                     if (discountAmount.compareTo(currentDiscount) > 0) {
@@ -691,8 +692,8 @@ private void throwExceptionIfValidationWarningsExist(final List<ApiParameterErro
         }
     }
 
-    private boolean isDiscountOverrideAllowed(final WorkingCapitalLoan loan) {
+    private boolean isDiscountOverrideDisallowed(final WorkingCapitalLoan loan) {
         return loan.getLoanProduct() == null || loan.getLoanProduct().getConfigurableAttributes() == null
-                || !loan.getLoanProduct().getConfigurableAttributes().isDiscountDefault();
+                || !loan.getLoanProduct().getConfigurableAttributes().isDiscountDefaultOverridable();
     }
 }
diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanApplicationReadPlatformServiceImpl.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanApplicationReadPlatformServiceImpl.java
@@ -173,16 +173,7 @@ public WorkingCapitalLoanData retrieveOne(final Long loanId) {
 
     @Override
     public WorkingCapitalLoanData retrieveOne(final ExternalId externalId) {
-        final WorkingCapitalLoan loan = this.repository.findByExternalIdWithDetails(externalId)
-                .orElseThrow(() -> new WorkingCapitalLoanNotFoundException(externalId));
-        final WorkingCapitalLoan loanWithDetails = this.repository.findByIdWithFullDetails(loan.getId())
-                .orElseThrow(() -> new WorkingCapitalLoanNotFoundException(loan.getId()));
-        WorkingCapitalLoanData data = this.mapper.toData(loanWithDetails);
-        WorkingCapitalLoanCollectionData collectionData = workingCapitalLoanDelinquencyReadPlatformService.getCollectionData(loan.getId(),
-                ThreadLocalContextUtil.getBusinessDate());
-        data.setCollectionData(collectionData);
-        enrichWithRateAndTerm(loanWithDetails, data);
-        return data;
+        return retrieveOne(repository.findIdByExternalId(externalId));
     }
 
     private void enrichWithRateAndTerm(final WorkingCapitalLoan loan, final WorkingCapitalLoanData data) {
diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanAssemblerImpl.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanAssemblerImpl.java
@@ -138,6 +138,7 @@ public WorkingCapitalLoan assembleFrom(final JsonCommand command) {
             detail.setExpectedAmount(principal);
             loan.getDisbursementDetails().add(detail);
         }
+
         loan.setProposedPrincipal(principal);
         loan.setApprovedPrincipal(BigDecimal.ZERO);
         final WorkingCapitalLoanBalance balance = WorkingCapitalLoanBalance.createFor(loan);
@@ -180,6 +181,11 @@ private WorkingCapitalLoanProductRelatedDetails buildLoanProductRelatedDetails(f
         detail.setDiscountProposed(fromApiJsonHelper.parameterExists(WorkingCapitalLoanProductConstants.discountParamName, element)
                 ? fromApiJsonHelper.extractBigDecimalNamed(WorkingCapitalLoanProductConstants.discountParamName, element, new HashSet<>())
                 : null);
+        if (detail.getDiscountProposed() == null && productDetail.getDiscount() != null
+                && productDetail.getDiscount().compareTo(BigDecimal.ZERO) > 0
+                && !product.getConfigurableAttributes().isDiscountDefaultOverridable()) {
+            detail.setDiscountProposed(productDetail.getDiscount());
+        }
         final Long breachId = fromApiJsonHelper.parameterExists(WorkingCapitalLoanProductConstants.breachIdParamName, element)
                 ? fromApiJsonHelper.extractLongNamed(WorkingCapitalLoanProductConstants.breachIdParamName, element)
                 : null;
diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanTransactionReadPlatformServiceImpl.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanTransactionReadPlatformServiceImpl.java
@@ -60,10 +60,14 @@ public WorkingCapitalLoanCommandTemplateData retrieveLoanTransactionTemplate(fin
         if (WorkingCapitalLoanConstants.APPROVE_LOAN_COMMAND.equals(command)) {
             return WorkingCapitalLoanCommandTemplateData.builder().approvalAmount(wcLoan.getProposedPrincipal())
                     .approvalDate(expectedDisbursementDate).expectedDisbursementDate(expectedDisbursementDate)
+                    .discountAmount(wcLoan.getLoanProductRelatedDetails().getDiscountProposed())
+                    .overrideDiscountDisabled(!wcLoan.getLoanProduct().getConfigurableAttributes().isDiscountDefaultOverridable())
                     .currency(wcLoan.getLoanProduct().getCurrency().toData()).build();
         } else if (WorkingCapitalLoanConstants.DISBURSE_LOAN_COMMAND.equals(command)) {
             return WorkingCapitalLoanCommandTemplateData.builder().expectedAmount(wcLoan.getApprovedPrincipal())
                     .expectedDisbursementDate(expectedDisbursementDate).currency(wcLoan.getLoanProduct().getCurrency().toData())
+                    .discountAmount(wcLoan.getLoanProductRelatedDetails().getDiscountApproved())
+                    .overrideDiscountDisabled(!wcLoan.getLoanProduct().getConfigurableAttributes().isDiscountDefaultOverridable())
                     .paymentTypeOptions(paymentTypeReadPlatformService.retrieveAllPaymentTypes())
                     .classificationOptions(codeValueReadPlatformService
                             .retrieveCodeValuesByCode(WorkingCapitalLoanConstants.DISBURSEMENT_CLASSIFICATION_CODE_NAME))
diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanWritePlatformServiceImpl.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanWritePlatformServiceImpl.java
@@ -146,6 +146,8 @@ public CommandProcessingResult approveApplication(final Long loanId, final JsonC
             final BigDecimal discount = this.fromApiJsonHelper.extractBigDecimalNamed(WorkingCapitalLoanConstants.discountAmountParamName,
                     command.parsedJson(), new HashSet<>());
             loan.getLoanProductRelatedDetails().setDiscountApproved(discount);
+        } else if (!loan.getLoanProduct().getConfigurableAttributes().isDiscountDefaultOverridable()) {
+            loan.getLoanProductRelatedDetails().setDiscountApproved(loan.getLoanProductRelatedDetails().getDiscountProposed());
         }
 
         // Keep first tranche expected amount aligned with approved principal (submit stores proposed principal only).
@@ -293,7 +295,12 @@ public CommandProcessingResult disburseLoan(final Long loanId, final JsonCommand
 
         // Discount amount (optional, can only be reduced per requirement)
         BigDecimal discount = null;
-        if (command.parameterExists(WorkingCapitalLoanConstants.discountAmountParamName)) {
+        if (!loan.getLoanProduct().getConfigurableAttributes().isDiscountDefaultOverridable()) {
+            // if default discount is NOT overridable, then we set the approved discount value as default.
+            if (loan.getLoanProductRelatedDetails().getDiscountApproved() != null) {
+                discount = loan.getLoanProductRelatedDetails().getDiscountApproved();
+            }
+        } else if (command.parameterExists(WorkingCapitalLoanConstants.discountAmountParamName)) {
             discount = this.fromApiJsonHelper.extractBigDecimalNamed(WorkingCapitalLoanConstants.discountAmountParamName,
                     command.parsedJson(), new HashSet<>());
             if (discount != null) {
@@ -318,10 +325,10 @@ public CommandProcessingResult disburseLoan(final Long loanId, final JsonCommand
         ExternalId discountTxnExternalId = null;
 
         if (discount != null && discount.compareTo(BigDecimal.ZERO) > 0) {
-            WorkingCapitalLoanTransaction discountTransaction = createAndPersistDiscountFeeTransaction(loan, disbursementTransaction, null,
-                    discount, actualDisbursementDate, null, null);
+            discountTxnExternalId = this.externalIdFactory.create();
+            WorkingCapitalLoanTransaction discountTransaction = createAndPersistDiscountFeeTransaction(loan, disbursementTransaction,
+                    discountTxnExternalId, discount, actualDisbursementDate, null, null);
             discountTransactionId = discountTransaction.getId();
-            discountTxnExternalId = discountTransaction.getExternalId();
             changes.put(WorkingCapitalLoanConstants.discountAmountParamName, discount);
         }
         updateBalanceOnDisburse(loan, transactionAmount);
diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/domain/WorkingCapitalLoanProductConfigurableAttributes.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/domain/WorkingCapitalLoanProductConfigurableAttributes.java
@@ -51,7 +51,7 @@ public class WorkingCapitalLoanProductConfigurableAttributes extends AbstractPer
     private boolean breach;
 
     @Column(name = "discount_default_overridable")
-    private boolean discountDefault;
+    private boolean discountDefaultOverridable;
 
     @Column(name = "period_payment_frequency_overridable")
     private boolean periodPaymentFrequency;
diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/mapper/WorkingCapitalLoanProductMapper.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/mapper/WorkingCapitalLoanProductMapper.java
@@ -172,7 +172,7 @@ default WorkingCapitalLoanProductConfigurableAttributesData configurableAttribut
         return WorkingCapitalLoanProductConfigurableAttributesData.builder() //
                 .delinquencyBucketClassification(configurableAttributes.isDelinquencyBucketClassification()) //
                 .breach(configurableAttributes.isBreach()) //
-                .discountDefault(configurableAttributes.isDiscountDefault()) //
+                .discountDefault(configurableAttributes.isDiscountDefaultOverridable()) //
                 .periodPaymentFrequency(configurableAttributes.isPeriodPaymentFrequency()) //
                 .periodPaymentFrequencyType(configurableAttributes.isPeriodPaymentFrequencyType()) //
                 .build();
diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/service/WorkingCapitalLoanProductUpdateUtil.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/service/WorkingCapitalLoanProductUpdateUtil.java
@@ -189,7 +189,7 @@ public Map<String, Object> updateConfigurableAttributes(final WorkingCapitalLoan
                 updateBooleanField(allowOverrides, WorkingCapitalLoanProductConstants.breachOverridableParamName, config::setBreach,
                         config::isBreach, changes);
                 updateBooleanField(allowOverrides, WorkingCapitalLoanProductConstants.discountDefaultOverridableParamName,
-                        config::setDiscountDefault, config::isDiscountDefault, changes);
+                        config::setDiscountDefaultOverridable, config::isDiscountDefaultOverridable, changes);
                 updateBooleanField(allowOverrides, WorkingCapitalLoanProductConstants.periodPaymentFrequencyOverridableParamName,
                         config::setPeriodPaymentFrequency, config::isPeriodPaymentFrequency, changes);
                 updateBooleanField(allowOverrides, WorkingCapitalLoanProductConstants.periodPaymentFrequencyTypeOverridableParamName,
diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/service/WorkingCapitalLoanProductWritePlatformServiceImpl.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/service/WorkingCapitalLoanProductWritePlatformServiceImpl.java
@@ -469,7 +469,7 @@ private WorkingCapitalLoanProductConfigurableAttributes createConfigurableAttrib
         final WorkingCapitalLoanProductConfigurableAttributes configurableAttributes = new WorkingCapitalLoanProductConfigurableAttributes();
         configurableAttributes.setDelinquencyBucketClassification(delinquencyBucketClassification);
         configurableAttributes.setBreach(breach);
-        configurableAttributes.setDiscountDefault(discountDefault);
+        configurableAttributes.setDiscountDefaultOverridable(discountDefault);
         configurableAttributes.setPeriodPaymentFrequency(periodPaymentFrequency);
         configurableAttributes.setPeriodPaymentFrequencyType(periodPaymentFrequencyType);
         return configurableAttributes;

Original file line number	Diff line number	Diff line change
`@@ -596,7 +596,7 @@ private void validateOverridables(final JsonElement element, final DataValidator`
`596`	`596`	`}`
`597`	`597`	`}`
`598`	`598`	`if (this.fromApiJsonHelper.parameterExists(WorkingCapitalLoanProductConstants.discountParamName, element)) {`
`599`		`- if (config.isDiscountDefault()) {`
	`599`	`+ if (config.isDiscountDefaultOverridable()) {`
`600`	`600`	`final BigDecimal discount = this.fromApiJsonHelper`
`601`	`601`	`.extractBigDecimalNamed(WorkingCapitalLoanProductConstants.discountParamName, element, new java.util.HashSet<>());`
`602`	`602`	`baseDataValidator.reset().parameter(WorkingCapitalLoanProductConstants.discountParamName).value(discount).ignoreIfNull()`