FINERACT-2311: add tests for buy down fees on product level

Author: MarianaDmytrivBinariks

fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/factory/LoanRequestFactory.java

@@ -309,11 +309,6 @@ public static PostLoansLoanIdRequest defaultContractTerminationUndoRequest() {
         return new PostLoansLoanIdRequest().note("Contract Termination Undo");
     }
 
-    public static PostLoansLoanIdTransactionsRequest defaultBuyDownFeeIncomeRequest() {
-        return new PostLoansLoanIdTransactionsRequest().transactionDate(DEFAULT_TRANSACTION_DATE).dateFormat(DATE_FORMAT)
-                .locale(DEFAULT_LOCALE).note("Buy Down fee");
-    }
-
     public static PostLoansLoanIdRequest defaultLoanContractTerminationRequest() {
         return new PostLoansLoanIdRequest().dateFormat(DATE_FORMAT).locale(DEFAULT_LOCALE).note("Contract Termination");
     }

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

@@ -154,6 +154,7 @@
 import org.apache.fineract.test.messaging.store.EventStore;
 import org.apache.fineract.test.stepdef.AbstractStepDef;
 import org.apache.fineract.test.support.TestContextKey;
+import org.assertj.core.api.SoftAssertions;
 import org.springframework.beans.factory.annotation.Autowired;
 import retrofit2.Response;
 
@@ -4181,6 +4182,13 @@ public void checkPagination(Integer totalPagesExpected, Integer size, String exc
 
     @Then("Loan Product response contains interestRecognitionOnDisbursementDate flag with value {string}")
     public void verifyInterestRecognitionOnDisbursementDateFlag(final String expectedValue) throws IOException {
+        GetLoanProductsResponse targetProduct = getLoanProductResponse();
+
+        assertNotNull(targetProduct.getInterestRecognitionOnDisbursementDate());
+        assertThat(targetProduct.getInterestRecognitionOnDisbursementDate().toString()).isEqualTo(expectedValue);
+    }
+
+    public GetLoanProductsResponse getLoanProductResponse() throws IOException {
         final Response<PostLoansResponse> loanResponse = testContext().get(TestContextKey.LOAN_CREATE_RESPONSE);
         assertNotNull(loanResponse.body());
         final Long loanId = loanResponse.body().getLoanId();
@@ -4203,8 +4211,94 @@ public void verifyInterestRecognitionOnDisbursementDateFlag(final String expecte
             return product.getId().equals(targetLoanProductId);
         }).findFirst().orElseThrow(() -> new AssertionError("Loan product with ID " + targetLoanProductId + " not found in response"));
 
-        assertNotNull(targetProduct.getInterestRecognitionOnDisbursementDate());
-        assertThat(targetProduct.getInterestRecognitionOnDisbursementDate().toString()).isEqualTo(expectedValue);
+        return targetProduct;
+    }
+
+    @Then("Loan Product response contains Buy Down Fees flag {string} with data:")
+    public void verifyLoanProductWithBuyDownFeesData(String expectedValue, DataTable table) throws IOException {
+        GetLoanProductsResponse targetProduct = getLoanProductResponse();
+
+        assertNotNull(targetProduct.getEnableBuyDownFee());
+        assertThat(targetProduct.getEnableBuyDownFee().toString()).isEqualTo(expectedValue);
+
+        List<String> data = table.asLists().get(1); // skip header
+        String buyDownFeeCalculationType = data.get(0);
+        String buyDownFeeStrategy = data.get(1);
+        String buyDownFeeIncomeType = data.get(2);
+
+        assertNotNull(targetProduct.getBuyDownFeeCalculationType());
+        assertNotNull(targetProduct.getBuyDownFeeStrategy());
+        assertNotNull(targetProduct.getBuyDownFeeIncomeType());
+
+        SoftAssertions assertions = new SoftAssertions();
+        assertions.assertThat(buyDownFeeCalculationType).isEqualTo(targetProduct.getBuyDownFeeCalculationType().getValue());
+        assertions.assertThat(buyDownFeeStrategy).isEqualTo(targetProduct.getBuyDownFeeStrategy().getValue());
+        assertions.assertThat(buyDownFeeIncomeType).isEqualTo(targetProduct.getBuyDownFeeIncomeType().getValue());
+        assertions.assertAll();
+    }
+
+    @Then("Loan Product response contains Buy Down Fees flag {string}")
+    public void verifyLoanProductWithBuyDownFeesFlag(String expectedValue) throws IOException {
+        GetLoanProductsResponse targetProduct = getLoanProductResponse();
+
+        assertNotNull(targetProduct.getEnableBuyDownFee());
+        assertThat(targetProduct.getEnableBuyDownFee().toString()).isEqualTo(expectedValue);
+    }
+
+    public Response<GetLoansLoanIdResponse> getLoanDetailsResponse() throws IOException {
+        Response<PostLoansResponse> loanResponse = testContext().get(TestContextKey.LOAN_CREATE_RESPONSE);
+
+        long loanId = loanResponse.body().getLoanId();
+
+        Optional<Response<GetLoansLoanIdResponse>> loanDetailsResponseOptional = Optional
+                .of(loansApi.retrieveLoan(loanId, false, "", "", "").execute());
+        Response<GetLoansLoanIdResponse> loanDetailsResponse = loanDetailsResponseOptional
+                .orElseThrow(() -> new RuntimeException("Failed to retrieve loan details - response is null"));
+
+        ErrorHelper.checkSuccessfulApiCall(loanDetailsResponse);
+        testContext().set(TestContextKey.LOAN_RESPONSE, loanDetailsResponse);
+        return loanDetailsResponse;
+    }
+
+    @Then("Loan Details response contains Buy Down Fees flag {string} and data:")
+    public void verifyBuyDownFeeDataInLoanResponse(final String expectedValue, DataTable table) throws IOException {
+        Response<GetLoansLoanIdResponse> loanDetailsResponse = getLoanDetailsResponse();
+
+        ErrorHelper.checkSuccessfulApiCall(loanDetailsResponse);
+        testContext().set(TestContextKey.LOAN_RESPONSE, loanDetailsResponse);
+
+        GetLoansLoanIdResponse loanDetails = loanDetailsResponse.body();
+
+        assertNotNull(loanDetails.getEnableBuyDownFee());
+        assertThat(loanDetails.getEnableBuyDownFee().toString()).isEqualTo(expectedValue);
+
+        List<String> data = table.asLists().get(1); // skip header
+        String buyDownFeeCalculationType = data.get(0);
+        String buyDownFeeStrategy = data.get(1);
+        String buyDownFeeIncomeType = data.get(2);
+
+        assertNotNull(loanDetails.getBuyDownFeeCalculationType());
+        assertNotNull(loanDetails.getBuyDownFeeStrategy());
+        assertNotNull(loanDetails.getBuyDownFeeIncomeType());
+
+        SoftAssertions assertions = new SoftAssertions();
+        assertions.assertThat(buyDownFeeCalculationType).isEqualTo(loanDetails.getBuyDownFeeCalculationType().getValue());
+        assertions.assertThat(buyDownFeeStrategy).isEqualTo(loanDetails.getBuyDownFeeStrategy().getValue());
+        assertions.assertThat(buyDownFeeIncomeType).isEqualTo(loanDetails.getBuyDownFeeIncomeType().getValue());
+        assertions.assertAll();
+    }
+
+    @Then("Loan Details response contains Buy Down Fees flag {string}")
+    public void verifyBuyDownFeeFlagInLoanResponse(final String expectedValue) throws IOException {
+        Response<GetLoansLoanIdResponse> loanDetailsResponse = getLoanDetailsResponse();
+
+        ErrorHelper.checkSuccessfulApiCall(loanDetailsResponse);
+        testContext().set(TestContextKey.LOAN_RESPONSE, loanDetailsResponse);
+
+        GetLoansLoanIdResponse loanDetails = loanDetailsResponse.body();
+
+        assertNotNull(loanDetails.getEnableBuyDownFee());
+        assertThat(loanDetails.getEnableBuyDownFee().toString()).isEqualTo(expectedValue);
     }
 
     @Then("Loan Details response contains chargedOffOnDate set to {string}")
@@ -4283,23 +4377,6 @@ public Response<PostLoansLoanIdTransactionsResponse> addCapitalizedIncomeToTheLo
         return capitalizedIncomeResponse;
     }
 
-    public Response<PostLoansLoanIdTransactionsResponse> addBuyDownFeeToTheLoanOnWithEURTransactionAmount(
-            final String transactionPaymentType, final String transactionDate, final String amount) throws IOException {
-        final Response<PostLoansResponse> loanResponse = testContext().get(TestContextKey.LOAN_CREATE_RESPONSE);
-        final long loanId = loanResponse.body().getLoanId();
-
-        final DefaultPaymentType paymentType = DefaultPaymentType.valueOf(transactionPaymentType);
-        final Long paymentTypeValue = paymentTypeResolver.resolve(paymentType);
-
-        final PostLoansLoanIdTransactionsRequest buyDownFeeRequest = LoanRequestFactory.defaultBuyDownFeeIncomeRequest()
-                .transactionDate(transactionDate).transactionAmount(Double.valueOf(amount)).paymentTypeId(paymentTypeValue)
-                .externalId("EXT-BUY-DOWN-FEES" + UUID.randomUUID());
-
-        final Response<PostLoansLoanIdTransactionsResponse> buyDownFeeResponse = loanTransactionsApi
-                .executeLoanTransaction(loanId, buyDownFeeRequest, "buyDownFee").execute();
-        return buyDownFeeResponse;
-    }
-
     @And("Admin adds capitalized income with {string} payment type to the loan on {string} with {string} EUR transaction amount")
     public void adminAddsCapitalizedIncomeToTheLoanOnWithEURTransactionAmount(final String transactionPaymentType,
             final String transactionDate, final String amount) throws IOException {
@@ -4309,15 +4386,6 @@ public void adminAddsCapitalizedIncomeToTheLoanOnWithEURTransactionAmount(final
         ErrorHelper.checkSuccessfulApiCall(capitalizedIncomeResponse);
     }
 
-    @And("Admin adds buy down fee with {string} payment type to the loan on {string} with {string} EUR transaction amount")
-    public void adminAddsBuyDownFeesToTheLoanOnWithEURTransactionAmount(final String transactionPaymentType, final String transactionDate,
-            final String amount) throws IOException {
-        final Response<PostLoansLoanIdTransactionsResponse> buyDownFeesIncomeResponse = addBuyDownFeeToTheLoanOnWithEURTransactionAmount(
-                transactionPaymentType, transactionDate, amount);
-        testContext().set(TestContextKey.LOAN_BUY_DOWN_FEE_RESPONSE, buyDownFeesIncomeResponse);
-        ErrorHelper.checkSuccessfulApiCall(buyDownFeesIncomeResponse);
-    }
-
     public Response<PostLoansLoanIdTransactionsResponse> adjustCapitalizedIncome(final String transactionPaymentType,
             final String transactionDate, final String amount, final Long transactionId) throws IOException {
 

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

@@ -104,8 +104,8 @@ Feature: Loan
     When Admin sets the business date to "1 January 2024"
     And Admin creates a client with random data
     And Admin creates a fully customized loan with the following data:
-      | LoanProduct                                                                                  | submitted on date | with Principal | ANNUAL interest rate % | interest type     | interest calculation period | amortization type  | loanTermFrequency | loanTermFrequencyType | repaymentEvery | repaymentFrequencyType | numberOfRepayments | graceOnPrincipalPayment | graceOnInterestPayment | interest free period | Payment strategy            | charge calculation type  | charge amount % |
-      | LP2_ADV_PYMNT_INTEREST_DAILY_RECALC_EMI_360_30_APPROVED_OVER_APPLIED_FLAT_CAPITALIZED_INCOME | 01 January 2024   | 1000           | 7                      | DECLINING_BALANCE | DAILY                       | EQUAL_INSTALLMENTS | 6                 | MONTHS                | 1              | MONTHS                 | 6                  | 0                       | 0                      | 0                    | ADVANCED_PAYMENT_ALLOCATION | LOAN_DISBURSEMENT_CHARGE | 2               |
+      | LoanProduct                                                                                  | submitted on date | with Principal | ANNUAL interest rate % | interest type     | interest calculation period | amortization type  | loanTermFrequency | loanTermFrequencyType | repaymentEvery | repaymentFrequencyType | numberOfRepayments | graceOnPrincipalPayment | graceOnInterestPayment | interest free period | Payment strategy            |
+      | LP2_ADV_PYMNT_INTEREST_DAILY_RECALC_EMI_360_30_APPROVED_OVER_APPLIED_FLAT_CAPITALIZED_INCOME | 01 January 2024   | 1000           | 7                      | DECLINING_BALANCE | DAILY                       | EQUAL_INSTALLMENTS | 6                 | MONTHS                | 1              | MONTHS                 | 6                  | 0                       | 0                      | 0                    | ADVANCED_PAYMENT_ALLOCATION |
     Then Admin fails to approve the loan on "1 January 2024" with "2001" amount and expected disbursement date on "1 January 2024" because of wrong amount
 
     And Admin successfully rejects the loan on "1 January 2024"
@@ -116,8 +116,8 @@ Feature: Loan
     When Admin sets the business date to "1 January 2024"
     And Admin creates a client with random data
     And Admin creates a fully customized loan with the following data:
-      | LoanProduct                                                   | submitted on date | with Principal | ANNUAL interest rate % | interest type     | interest calculation period | amortization type  | loanTermFrequency | loanTermFrequencyType | repaymentEvery | repaymentFrequencyType | numberOfRepayments | graceOnPrincipalPayment | graceOnInterestPayment | interest free period | Payment strategy            | charge calculation type  | charge amount % |
-      | LP2_ADV_CUSTOM_PMT_ALLOC_PROGRESSIVE_LOAN_SCHEDULE_HORIZONTAL | 01 January 2024   | 1000           | 7                      | DECLINING_BALANCE | DAILY                       | EQUAL_INSTALLMENTS | 6                 | MONTHS                | 1              | MONTHS                 | 6                  | 0                       | 0                      | 0                    | ADVANCED_PAYMENT_ALLOCATION | LOAN_DISBURSEMENT_CHARGE | 2               |
+      | LoanProduct                                                   | submitted on date | with Principal | ANNUAL interest rate % | interest type     | interest calculation period | amortization type  | loanTermFrequency | loanTermFrequencyType | repaymentEvery | repaymentFrequencyType | numberOfRepayments | graceOnPrincipalPayment | graceOnInterestPayment | interest free period | Payment strategy            |
+      | LP2_ADV_CUSTOM_PMT_ALLOC_PROGRESSIVE_LOAN_SCHEDULE_HORIZONTAL | 01 January 2024   | 1000           | 7                      | DECLINING_BALANCE | DAILY                       | EQUAL_INSTALLMENTS | 6                 | MONTHS                | 1              | MONTHS                 | 6                  | 0                       | 0                      | 0                    | ADVANCED_PAYMENT_ALLOCATION |
     And Admin successfully approves the loan on "1 January 2024" with "9000" amount and expected disbursement date on "1 January 2024"
     And Admin successfully disburse the loan on "1 January 2024" with "9900" EUR transaction amount
     Then Admin fails to disburse the loan on "1 January 2024" with "1200" EUR transaction amount because of wrong amount