Merge branch 'apache:develop' into fix-swagger-tags-journal

elicsmit · web-flow · commit 91b0286ab018 · 2026-04-27T14:39:36.000+03:00
diff --git a/.github/workflows/build-cucumber.yml b/.github/workflows/build-cucumber.yml
@@ -23,7 +23,7 @@ jobs:
           distribution: 'zulu'
 
       - name: Download workspace
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5
         with:
           name: fineract-workspace-${{ github.run_id }}
           path: .
diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml
@@ -34,7 +34,7 @@ jobs:
           distribution: 'zulu'
 
       - name: Download workspace
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5
         with:
           name: fineract-workspace-${{ github.run_id }}
           path: .
diff --git a/.github/workflows/build-documentation.yml b/.github/workflows/build-documentation.yml
@@ -16,7 +16,7 @@ jobs:
           java-version: '21'
           distribution: 'zulu'
       - name: Download workspace
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5
         with:
           name: fineract-workspace-${{ github.run_id }}
           path: .
diff --git a/.github/workflows/build-e2e-tests.yml b/.github/workflows/build-e2e-tests.yml
@@ -40,7 +40,7 @@ jobs:
           distribution: 'zulu'
 
       - name: Download workspace
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5
         with:
           name: fineract-workspace-${{ github.run_id }}
           path: .
diff --git a/.github/workflows/build-mariadb.yml b/.github/workflows/build-mariadb.yml
@@ -51,7 +51,7 @@ jobs:
           distribution: 'zulu'
 
       - name: Download workspace
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5
         with:
           name: fineract-workspace-${{ github.run_id }}
           path: .
diff --git a/.github/workflows/build-mysql.yml b/.github/workflows/build-mysql.yml
@@ -51,7 +51,7 @@ jobs:
           distribution: 'zulu'
 
       - name: Download workspace
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5
         with:
           name: fineract-workspace-${{ github.run_id }}
           path: .
diff --git a/.github/workflows/build-postgresql.yml b/.github/workflows/build-postgresql.yml
@@ -52,7 +52,7 @@ jobs:
           distribution: 'zulu'
 
       - name: Download workspace
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5
         with:
           name: fineract-workspace-${{ github.run_id }}
           path: .
diff --git a/.github/workflows/build-progressive-loan.yml b/.github/workflows/build-progressive-loan.yml
@@ -23,7 +23,7 @@ jobs:
           distribution: 'zulu'
 
       - name: Download workspace
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5
         with:
           name: fineract-workspace-${{ github.run_id }}
           path: .
diff --git a/.github/workflows/build-quality-checks.yml b/.github/workflows/build-quality-checks.yml
@@ -23,7 +23,7 @@ jobs:
           distribution: 'zulu'
 
       - name: Download workspace
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5
         with:
           name: fineract-workspace-${{ github.run_id }}
           path: .
@@ -64,7 +64,7 @@ jobs:
           distribution: 'zulu'
 
       - name: Download workspace
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5
         with:
           name: fineract-workspace-${{ github.run_id }}
           path: .
@@ -105,7 +105,7 @@ jobs:
           distribution: 'zulu'
 
       - name: Download workspace
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5
         with:
           name: fineract-workspace-${{ github.run_id }}
           path: .
@@ -146,7 +146,7 @@ jobs:
           distribution: 'zulu'
 
       - name: Download workspace
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5
         with:
           name: fineract-workspace-${{ github.run_id }}
           path: .
@@ -187,7 +187,7 @@ jobs:
           distribution: 'zulu'
 
       - name: Download workspace
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5
         with:
           name: fineract-workspace-${{ github.run_id }}
           path: .
diff --git a/.github/workflows/liquibase-only-postgresql.yml b/.github/workflows/liquibase-only-postgresql.yml
@@ -33,7 +33,7 @@ jobs:
           distribution: 'zulu'
 
       - name: Download workspace
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5
         with:
           name: fineract-workspace-${{ github.run_id }}
           path: .
diff --git a/.github/workflows/publish-dockerhub.yml b/.github/workflows/publish-dockerhub.yml
@@ -18,7 +18,7 @@ jobs:
           distribution: 'zulu'
 
       - name: Download workspace
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5
         with:
           name: fineract-workspace-${{ github.run_id }}
           path: .
diff --git a/.github/workflows/run-integration-test-sequentially-postgresql.yml b/.github/workflows/run-integration-test-sequentially-postgresql.yml
@@ -36,7 +36,7 @@ jobs:
           java-version: '21'
           distribution: 'zulu'
       - name: Download workspace
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5
         with:
           name: fineract-workspace-${{ github.run_id }}
           path: .
diff --git a/.github/workflows/smoke-messaging.yml b/.github/workflows/smoke-messaging.yml
@@ -32,7 +32,7 @@ jobs:
           distribution: 'zulu'
 
       - name: Download workspace
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5
         with:
           name: fineract-workspace-${{ github.run_id }}
           path: .
diff --git a/.github/workflows/sonarqube.yml b/.github/workflows/sonarqube.yml
@@ -24,7 +24,7 @@ jobs:
           java-version: '21'
           distribution: 'zulu'
       - name: Download workspace
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5
         with:
           name: fineract-workspace-${{ github.run_id }}
           path: .
diff --git a/.github/workflows/verify-api-backward-compatibility.yml b/.github/workflows/verify-api-backward-compatibility.yml
@@ -50,7 +50,7 @@ jobs:
           java-version: '21'
 
       - name: Download workspace
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5
         with:
           name: fineract-workspace-${{ github.run_id }}
           path: .
diff --git a/.github/workflows/verify-liquibase-backward-compatibility.yml b/.github/workflows/verify-liquibase-backward-compatibility.yml
@@ -48,7 +48,7 @@ jobs:
           java-version: '21'
 
       - name: Download workspace
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5
         with:
           name: fineract-workspace-${{ github.run_id }}
           path: .
diff --git a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/data/loanproduct/DefaultLoanProduct.java b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/data/loanproduct/DefaultLoanProduct.java
@@ -44,6 +44,7 @@ public enum DefaultLoanProduct implements LoanProduct {
     LP2_DOWNPAYMENT, //
     LP2_DOWNPAYMENT_AUTO, //
     LP2_DOWNPAYMENT_AUTO_ADVANCED_PAYMENT_ALLOCATION, //
+    LP2_DOWNPAYMENT_AUTO_ADV_PMT_ALLOC_NO_MULTIPLES_OF, //
     LP2_DOWNPAYMENT_AUTO_ADVANCED_CUSTOM_PAYMENT_ALLOCATION, //
     LP2_DOWNPAYMENT_ADVANCED_PAYMENT_ALLOCATION, //
     LP2_DOWNPAYMENT_INTEREST, //
diff --git a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/support/TestContextKey.java b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/support/TestContextKey.java
@@ -83,6 +83,7 @@ public abstract class TestContextKey {
     public static final String DEFAULT_LOAN_PRODUCT_CREATE_RESPONSE_LP1_INTEREST_DECLINING_PERIOD_DAILY_ACCRUAL_ACTIVITY = "loanProductCreateResponseLP1InterestDecliningPeriodDailyAccrualActivity";
     public static final String DEFAULT_LOAN_PRODUCT_CREATE_RESPONSE_LP1_INTEREST_DECLINING_BALANCE_DAILY_RECALCULATION_COMPOUNDING_NONE_ACCRUAL_ACTIVITY = "loanProductCreateResponseLP1InterestDecliningBalanceRecalculationCompoundingNoneAccrualActivity";
     public static final String DEFAULT_LOAN_PRODUCT_CREATE_RESPONSE_LP2_DOWNPAYMENT_AUTO_ADVANCED_PAYMENT_ALLOCATION = "loanProductCreateResponseLP2DownPaymentAutoAdvancedPaymentAllocation";
+    public static final String DEFAULT_LOAN_PRODUCT_CREATE_RESPONSE_LP2_DOWNPAYMENT_AUTO_ADV_PMT_ALLOC_NO_MULTIPLES_OF = "loanProductCreateResponseLP2DownPaymentAutoAdvPmtAllocNoMultiplesOf";
     public static final String DEFAULT_LOAN_PRODUCT_CREATE_RESPONSE_LP2_DOWNPAYMENT_AUTO_ADVANCED_CUSTOM_PAYMENT_ALLOCATION = "loanProductCreateResponseLP2DownPaymentAutoAdvancedCustomPaymentAllocation";
     public static final String DEFAULT_LOAN_PRODUCT_CREATE_RESPONSE_LP2_ADV_PYMNT_INTEREST_DAILY_RECALC_EMI_360_30_MULTIDISB_CAPITALIZED_INCOME_ADJ_CUSTOM_ALLOC = "loanProductCreateResponseLP2AdvancedPaymentInterestDailyEmi36030InterestRecalculationDailyMultidisbursalCapitalizedIncomeAdjCustomAlloc";
     public static final String DEFAULT_LOAN_PRODUCT_CREATE_RESPONSE_LP2_DOWNPAYMENT_AUTO_ADVANCED_REPAYMENT_ALLOCATION_PAYMENT_START_SUBMITTED = "loanProductCreateResponseLP2DownPaymentAutoAdvancedPaymentAllocationPaymentStartSubmitted";
diff --git a/fineract-e2e-tests-runner/src/test/java/org/apache/fineract/test/initializer/global/LoanProductGlobalInitializerStep.java b/fineract-e2e-tests-runner/src/test/java/org/apache/fineract/test/initializer/global/LoanProductGlobalInitializerStep.java
@@ -335,6 +335,26 @@ public void initialize() throws Exception {
         TestContext.INSTANCE.set(TestContextKey.DEFAULT_LOAN_PRODUCT_CREATE_RESPONSE_LP2_DOWNPAYMENT_AUTO_ADVANCED_PAYMENT_ALLOCATION,
                 responseLoanProductsRequestDownPaymentAutoAdvPaymentAllocation);
 
+        // LP2 with Down-payment+autopayment + advanced payment allocation, no installmentAmountInMultiplesOf
+        // (LP2_DOWNPAYMENT_AUTO_ADV_PMT_ALLOC_NO_MULTIPLES_OF)
+        final String nameDownPaymentAutoAdvPmtAllocNoMultiplesOf = DefaultLoanProduct.LP2_DOWNPAYMENT_AUTO_ADV_PMT_ALLOC_NO_MULTIPLES_OF
+                .getName();
+        final PostLoanProductsRequest loanProductsRequestDownPaymentAutoAdvPmtAllocNoMultiplesOf = loanProductsRequestFactory
+                .defaultLoanProductsRequestLP2()//
+                .name(nameDownPaymentAutoAdvPmtAllocNoMultiplesOf)//
+                .installmentAmountInMultiplesOf(null)//
+                .transactionProcessingStrategyCode(ADVANCED_PAYMENT_ALLOCATION.getValue())//
+                .loanScheduleType("PROGRESSIVE")//
+                .paymentAllocation(List.of(//
+                        createPaymentAllocation("DEFAULT", "REAMORTIZATION"), //
+                        createPaymentAllocation("GOODWILL_CREDIT", "NEXT_INSTALLMENT"), //
+                        createPaymentAllocation("MERCHANT_ISSUED_REFUND", "LAST_INSTALLMENT"), //
+                        createPaymentAllocation("PAYOUT_REFUND", "LAST_INSTALLMENT")));//
+        final PostLoanProductsResponse responseLoanProductsRequestDownPaymentAutoAdvPmtAllocNoMultiplesOf = createLoanProductIdempotent(
+                loanProductsRequestDownPaymentAutoAdvPmtAllocNoMultiplesOf);
+        TestContext.INSTANCE.set(TestContextKey.DEFAULT_LOAN_PRODUCT_CREATE_RESPONSE_LP2_DOWNPAYMENT_AUTO_ADV_PMT_ALLOC_NO_MULTIPLES_OF,
+                responseLoanProductsRequestDownPaymentAutoAdvPmtAllocNoMultiplesOf);
+
         // LP2 with Down-payment + advanced payment allocation - no auto downpayment
         // (LP2_DOWNPAYMENT_ADVANCED_PAYMENT_ALLOCATION)
         String name24 = DefaultLoanProduct.LP2_DOWNPAYMENT_ADVANCED_PAYMENT_ALLOCATION.getName();
diff --git a/fineract-e2e-tests-runner/src/test/resources/features/EMICalculation-Part4.feature b/fineract-e2e-tests-runner/src/test/resources/features/EMICalculation-Part4.feature
diff --git a/fineract-progressive-loan/src/main/java/org/apache/fineract/portfolio/loanproduct/calc/ProgressiveEMICalculator.java b/fineract-progressive-loan/src/main/java/org/apache/fineract/portfolio/loanproduct/calc/ProgressiveEMICalculator.java
