FINERACT-2455: WC - delinquency bucket for regular loan shouldn't be available on WC loan product creation

fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/data/delinquency/DelinquencyBucketResolver.java

@@ -49,4 +49,15 @@ public long resolve(DelinquencyBucket delinquencyBucket) {
 
         return foundAtr.getId();
     }
+
+    public Long resolveBucketId(final String value) {
+        if (value == null || value.isEmpty()) {
+            return null;
+        }
+        try {
+            return Long.valueOf(value);
+        } catch (NumberFormatException ex) {
+            return resolve(DelinquencyBucket.valueOf(value));
+        }
+    }
 }

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

@@ -100,6 +100,7 @@
 import org.apache.fineract.test.data.codevalue.CodeValue;
 import org.apache.fineract.test.data.codevalue.CodeValueResolver;
 import org.apache.fineract.test.data.codevalue.DefaultCodeValue;
+import org.apache.fineract.test.data.delinquency.DelinquencyBucketResolver;
 import org.apache.fineract.test.data.paymenttype.DefaultPaymentType;
 import org.apache.fineract.test.data.paymenttype.PaymentTypeResolver;
 import org.apache.fineract.test.data.workingcapitalproduct.DefaultWorkingCapitalLoanProduct;
@@ -153,6 +154,7 @@ public class WorkingCapitalLoanAccountStepDef extends AbstractStepDef {
     private final ClientRequestFactory clientRequestFactory;
     private final CodeValueResolver codeValueResolver;
     private final FineractClientConfiguration fineractClientConfiguration;
+    private final DelinquencyBucketResolver delinquencyBucketResolver;
 
     @Given("Admin creates a client with random data and creates-approves-disburses a working capital loan with the following data:")
     public void createClientAndDisburseWorkingCapitalLoanWithData(final DataTable table) {
@@ -473,6 +475,31 @@ public void creatingWorkingCapitalLoanWithLpOverridablesDisabledWillResultAnErro
         log.info("Verified working capital loan creation failed with expected validation errors for LP overridables disabled");
     }
 
+    @Then("Creating a working capital loan with the following data will result an error {string}:")
+    public void creatingWorkingCapitalLoanWithDataWillResultAnError(final String errorMessage, final DataTable table) {
+        final Map<String, String> rawData = table.asMaps().getFirst();
+        final Long clientId = extractClientId();
+        final Long loanProductId = resolveLoanProductId(rawData.get("LoanProduct"));
+
+        final PostWorkingCapitalLoansRequest loansRequest = workingCapitalLoanRequestFactory.defaultWorkingCapitalLoansRequest(clientId)
+                .productId(loanProductId).submittedOnDate(rawData.get("submittedOnDate"))
+                .expectedDisbursementDate(rawData.get("expectedDisbursementDate"))
+                .principalAmount(new BigDecimal(rawData.get("principalAmount")))
+                .totalPaymentVolume(new BigDecimal(rawData.get("totalPaymentVolume")))
+                .periodPaymentRate(new BigDecimal(rawData.get("periodPaymentRate")))
+                .discount(rawData.get("discount") != null && !rawData.get("discount").isEmpty() ? new BigDecimal(rawData.get("discount"))
+                        : null);
+        if (rawData.get("delinquencyBucketId") != null && !rawData.get("delinquencyBucketId").isEmpty()) {
+            loansRequest.delinquencyBucketId(delinquencyBucketResolver.resolveBucketId(rawData.get("delinquencyBucketId")));
+        }
+
+        final CallFailedRuntimeException exception = fail(
+                () -> fineractClient.workingCapitalLoans().submitWorkingCapitalLoanApplication(loansRequest));
+        testContext().set(TestContextKey.LOAN_CREATE_RESPONSE, exception);
+        assertHttpStatus(exception, 400);
+        assertValidationError(exception, errorMessage);
+    }
+
     @Then("Creating a working capital loan with principal amount greater than Working Capital Loan Product max will result an error:")
     public void creatingAWorkingCapitalLoanWithPrincipalAmountGreaterThanWorkingCapitalLoanProductMaxWillResultAnError(
             final DataTable table) {

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

@@ -44,6 +44,7 @@
 import org.apache.fineract.client.models.CommandProcessingResult;
 import org.apache.fineract.client.models.DeleteWorkingCapitalLoanProductsProductIdResponse;
 import org.apache.fineract.client.models.GetConfigurableAttributes;
+import org.apache.fineract.client.models.GetDelinquencyBucket;
 import org.apache.fineract.client.models.GetPaymentAllocation;
 import org.apache.fineract.client.models.GetWorkingCapitalLoanDelinquencyRangeScheduleTagHistoryResponse;
 import org.apache.fineract.client.models.GetWorkingCapitalLoanProductsProductIdResponse;
@@ -69,6 +70,7 @@
 import org.apache.fineract.test.data.codevalue.CodeNames;
 import org.apache.fineract.test.data.codevalue.CodeValueResolver;
 import org.apache.fineract.test.data.codevalue.DefaultCodeValue;
+import org.apache.fineract.test.data.delinquency.DelinquencyBucketResolver;
 import org.apache.fineract.test.data.paymenttype.DefaultPaymentType;
 import org.apache.fineract.test.data.paymenttype.PaymentTypeResolver;
 import org.apache.fineract.test.data.workingcapitalproduct.DefaultWorkingCapitalLoanProduct;
@@ -95,6 +97,7 @@ public class WorkingCapitalStepDef extends AbstractStepDef {
     private final AccountTypeResolver accountTypeResolver;
     private final PaymentTypeResolver paymentTypeResolver;
     private final CodeValueResolver codeValueResolver;
+    private final DelinquencyBucketResolver delinquencyBucketResolver;
     private static final ObjectMapper OBJECT_MAPPER = ObjectMapperFactory.getShared();
     private static final String WC_ADVANCED_MAPPINGS_EXPECTED_CREATE = "wcAdvancedMappingsExpectedCreate";
     private static final String WC_ADVANCED_MAPPINGS_EXPECTED_UPDATE = "wcAdvancedMappingsExpectedUpdate";
@@ -1622,10 +1625,12 @@ public PostWorkingCapitalLoanProductsRequest setWorkingCapitalLoanProductsCreate
                 || fieldName.equalsIgnoreCase(MAX_PERIOD_PAYMENT_RATE_FIELD_NAME) || fieldName.equalsIgnoreCase(DISCOUNT_FIELD_NAME)) {
             valueBigDecimal = fieldValue != null ? new BigDecimal(fieldValue) : null;
         }
-        if (fieldName.equalsIgnoreCase(BREACH_ID_FIELD_NAME) || fieldName.equalsIgnoreCase(NEAR_BREACH_ID_FIELD_NAME)
-                || fieldName.equalsIgnoreCase(DELINQUENCY_BUCKET_ID_FIELD_NAME)) {
+        if (fieldName.equalsIgnoreCase(BREACH_ID_FIELD_NAME) || fieldName.equalsIgnoreCase(NEAR_BREACH_ID_FIELD_NAME)) {
             valueLong = fieldValue != null ? Long.valueOf(fieldValue) : null;
         }
+        if (fieldName.equalsIgnoreCase(DELINQUENCY_BUCKET_ID_FIELD_NAME)) {
+            valueLong = delinquencyBucketResolver.resolveBucketId(fieldValue);
+        }
 
         switch (fieldName) {
             case NAME_FIELD_NAME:
@@ -1746,10 +1751,12 @@ public PutWorkingCapitalLoanProductsProductIdRequest setWorkingCapitalLoanProduc
                 || fieldName.equalsIgnoreCase(MAX_PERIOD_PAYMENT_RATE_FIELD_NAME) || fieldName.equalsIgnoreCase(DISCOUNT_FIELD_NAME)) {
             valueBigDecimal = fieldValue != null ? new BigDecimal(fieldValue) : null;
         }
-        if (fieldName.equalsIgnoreCase(BREACH_ID_FIELD_NAME) || fieldName.equalsIgnoreCase(NEAR_BREACH_ID_FIELD_NAME)
-                || fieldName.equalsIgnoreCase(DELINQUENCY_BUCKET_ID_FIELD_NAME)) {
+        if (fieldName.equalsIgnoreCase(BREACH_ID_FIELD_NAME) || fieldName.equalsIgnoreCase(NEAR_BREACH_ID_FIELD_NAME)) {
             valueLong = fieldValue != null ? Long.valueOf(fieldValue) : null;
         }
+        if (fieldName.equalsIgnoreCase(DELINQUENCY_BUCKET_ID_FIELD_NAME)) {
+            valueLong = delinquencyBucketResolver.resolveBucketId(fieldValue);
+        }
 
         switch (fieldName) {
             case NAME_FIELD_NAME:
@@ -1921,6 +1928,24 @@ public void retrieveProductTemplate() {
         testContext().set(TestContextKey.WORKING_CAPITAL_LOAN_PRODUCT_TEMPLATE_RESPONSE, template);
     }
 
+    @Then("Working Capital Loan Product template delinquencyBucketOptions all have bucketType {string}")
+    public void verifyTemplateDelinquencyBucketOptionsBucketType(final String expectedBucketType) {
+        final GetWorkingCapitalLoanProductsTemplateResponse template = testContext()
+                .get(TestContextKey.WORKING_CAPITAL_LOAN_PRODUCT_TEMPLATE_RESPONSE);
+        assertThat(template.getDelinquencyBucketOptions()).isNotNull().isNotEmpty();
+        assertThat(template.getDelinquencyBucketOptions())
+                .allSatisfy(bucket -> assertThat(bucket.getBucketType()).isEqualTo(expectedBucketType));
+    }
+
+    @Then("Working Capital Loan Product template delinquencyBucketOptions do not contain:")
+    public void verifyTemplateDelinquencyBucketOptionsDoNotContain(final DataTable table) {
+        final GetWorkingCapitalLoanProductsTemplateResponse template = testContext()
+                .get(TestContextKey.WORKING_CAPITAL_LOAN_PRODUCT_TEMPLATE_RESPONSE);
+        assertThat(template.getDelinquencyBucketOptions()).isNotNull();
+        final List<String> bucketNames = template.getDelinquencyBucketOptions().stream().map(GetDelinquencyBucket::getName).toList();
+        assertThat(bucketNames).doesNotContainAnyElementsOf(table.asList());
+    }
+
     @When("Admin creates a new Working Capital Loan Product with Accrual with deferred revenue amortization accounting and advanced mappings")
     public void createWorkingCapitalLoanProductWithAdvancedMappings() {
         final String productName = DefaultWorkingCapitalLoanProduct.WCLP.getName()

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

@@ -1542,3 +1542,10 @@ Feature: WorkingCapitalLoanAccount
       | Type      | Account code | Account name              | Debit  | Credit |
       | ASSET     | 112601       | Loans Receivable          | 9000.0 |        |
       | LIABILITY | 145023       | Suspense/Clearing account |        | 9000.0 |
+
+  Scenario: Create Working Capital Loan account rejects non-WORKING_CAPITAL delinquency bucket
+    When Admin sets the business date to "01 January 2026"
+    And Admin creates a client with random data
+    Then Creating a working capital loan with the following data will result an error "The parameter `delinquencyBucketId` must reference a WORKING_CAPITAL delinquency bucket.":
+      | LoanProduct | submittedOnDate | expectedDisbursementDate | principalAmount | totalPaymentVolume | periodPaymentRate | discount | delinquencyBucketId      |
+      | WCLP        | 01 January 2026 | 01 January 2026          | 100.0           | 100.0              | 1.0               | 0.0      | BASIC_DELINQUENCY_BUCKET |

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

@@ -497,3 +497,25 @@ Feature: WorkingCapitalLoanProduct
   @TestRailId:C80966
   Scenario: Verify WC Loan Product create fails when payment allocation rules contain duplicates
     Then Admin failed to create a new Working Capital Loan Product with duplicate payment allocation rules
+
+  Scenario: Verify WC Loan Product template delinquencyBucketOptions are WORKING_CAPITAL only
+    When Admin retrieves the Working Capital Loan Product template
+    Then Working Capital Loan Product template delinquencyBucketOptions all have bucketType "WORKING_CAPITAL"
+    And Working Capital Loan Product template delinquencyBucketOptions do not contain:
+      | BASIC_DELINQUENCY_BUCKET |
+
+  Scenario Outline: Verify WC Loan Product create rejects non-WORKING_CAPITAL delinquency bucket
+    Then Admin failed to create a new Working Capital Loan Product with field "<wcp_field_name>" invalid data <wcp_invalid_field_value> and got an error <wcp_error_message>
+
+    Examples:
+      | wcp_field_name      | wcp_invalid_field_value    | wcp_error_message                                                                           |
+      | delinquencyBucketId | "BASIC_DELINQUENCY_BUCKET" | "The parameter `delinquencyBucketId` must reference a WORKING_CAPITAL delinquency bucket." |
+
+  Scenario Outline: Verify WC Loan Product update rejects non-WORKING_CAPITAL delinquency bucket
+    When Admin creates a new Working Capital Loan Product
+    Then Admin failed to update a new Working Capital Loan Product field "<wcp_field_name>" with invalid data <wcp_invalid_field_value> and got an error <wcp_error_message>
+    Then Admin deletes a Working Capital Loan Product
+
+    Examples:
+      | wcp_field_name      | wcp_invalid_field_value    | wcp_error_message                                                                          |
+      | delinquencyBucketId | "BASIC_DELINQUENCY_BUCKET" | "The parameter `delinquencyBucketId` must reference a WORKING_CAPITAL delinquency bucket." |

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

@@ -32,4 +32,7 @@ public interface DelinquencyBucketRepository extends JpaRepository<DelinquencyBu
 
     @Query("SELECT b FROM DelinquencyBucket b")
     List<DelinquencyBucket> findAllBuckets();
+
+    @Query("SELECT b FROM DelinquencyBucket b WHERE b.bucketType = :bucketType")
+    List<DelinquencyBucket> findByBucketType(@Param("bucketType") DelinquencyBucketType bucketType);
 }

fineract-loan/src/main/java/org/apache/fineract/portfolio/delinquency/service/DelinquencyReadPlatformService.java

@@ -25,6 +25,7 @@
 import org.apache.fineract.portfolio.delinquency.data.DelinquencyRangeData;
 import org.apache.fineract.portfolio.delinquency.data.LoanDelinquencyTagHistoryData;
 import org.apache.fineract.portfolio.delinquency.data.LoanInstallmentDelinquencyTagData;
+import org.apache.fineract.portfolio.delinquency.domain.DelinquencyBucketType;
 import org.apache.fineract.portfolio.delinquency.domain.LoanDelinquencyAction;
 import org.apache.fineract.portfolio.loanaccount.data.CollectionData;
 import org.apache.fineract.portfolio.loanaccount.domain.Loan;
@@ -38,6 +39,8 @@ public interface DelinquencyReadPlatformService {
 
     List<DelinquencyBucketData> retrieveAllDelinquencyBuckets();
 
+    List<DelinquencyBucketData> retrieveDelinquencyBucketsByType(DelinquencyBucketType bucketType);
+
     DelinquencyBucketData retrieveDelinquencyBucket(Long delinquencyBucketId);
 
     DelinquencyRangeData retrieveCurrentDelinquencyTag(Long loanId);

fineract-loan/src/main/java/org/apache/fineract/portfolio/delinquency/service/DelinquencyReadPlatformServiceImpl.java

@@ -110,6 +110,14 @@ public List<DelinquencyBucketData> retrieveAllDelinquencyBuckets() {
         return result;
     }
 
+    @Override
+    public List<DelinquencyBucketData> retrieveDelinquencyBucketsByType(final DelinquencyBucketType bucketType) {
+        final List<DelinquencyBucket> delinquencyBuckets = repositoryBucket.findByBucketType(bucketType);
+        final List<DelinquencyBucketData> result = mapperBucket.map(delinquencyBuckets);
+        result.forEach(this::enrichWorkingCapitalConfiguration);
+        return result;
+    }
+
     @Override
     public DelinquencyBucketData retrieveDelinquencyBucket(Long delinquencyBucketId) {
         if (!repositoryBucket.existsById(delinquencyBucketId)) {

fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalDelinquencyBucketResolver.java

@@ -0,0 +1,70 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.workingcapitalloan.service;
+
+import java.util.Collection;
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+import org.apache.fineract.infrastructure.core.data.ApiParameterError;
+import org.apache.fineract.infrastructure.core.exception.PlatformApiDataValidationException;
+import org.apache.fineract.portfolio.delinquency.data.DelinquencyBucketData;
+import org.apache.fineract.portfolio.delinquency.domain.DelinquencyBucket;
+import org.apache.fineract.portfolio.delinquency.domain.DelinquencyBucketRepository;
+import org.apache.fineract.portfolio.delinquency.domain.DelinquencyBucketType;
+import org.apache.fineract.portfolio.delinquency.exception.DelinquencyBucketNotFoundException;
+import org.apache.fineract.portfolio.delinquency.service.DelinquencyReadPlatformService;
+import org.apache.fineract.portfolio.workingcapitalloanproduct.WorkingCapitalLoanProductConstants;
+import org.springframework.stereotype.Component;
+
+/**
+ * Resolves and validates delinquency buckets for Working Capital products and loans. Only
+ * {@link DelinquencyBucketType#WORKING_CAPITAL} buckets are allowed.
+ */
+@Component
+@RequiredArgsConstructor
+public class WorkingCapitalDelinquencyBucketResolver {
+
+    private final DelinquencyBucketRepository delinquencyBucketRepository;
+    private final DelinquencyReadPlatformService delinquencyReadPlatformService;
+
+    public Collection<DelinquencyBucketData> retrieveWorkingCapitalDelinquencyBucketOptions() {
+        final List<DelinquencyBucketData> workingCapitalBuckets = this.delinquencyReadPlatformService
+                .retrieveDelinquencyBucketsByType(DelinquencyBucketType.WORKING_CAPITAL);
+        return workingCapitalBuckets.isEmpty() ? null : workingCapitalBuckets;
+    }
+
+    public DelinquencyBucket findWorkingCapitalBucketByIdIfProvided(final Long delinquencyBucketId) {
+        if (delinquencyBucketId == null) {
+            return null;
+        }
+        final DelinquencyBucket bucket = this.delinquencyBucketRepository.findById(delinquencyBucketId)
+                .orElseThrow(() -> DelinquencyBucketNotFoundException.notFound(delinquencyBucketId));
+        validateIsWorkingCapitalType(bucket);
+        return bucket;
+    }
+
+    public void validateIsWorkingCapitalType(final DelinquencyBucket bucket) {
+        if (bucket != null && !DelinquencyBucketType.WORKING_CAPITAL.equals(bucket.getBucketType())) {
+            throw new PlatformApiDataValidationException(
+                    List.of(ApiParameterError.parameterError("validation.msg.delinquencyBucketId.must.be.working.capital.type",
+                            "The parameter `delinquencyBucketId` must reference a WORKING_CAPITAL delinquency bucket.",
+                            WorkingCapitalLoanProductConstants.delinquencyBucketIdParamName, bucket.getId())));
+        }
+    }
+}