From f09055199ac3c5f8cbedca273262d0ab16712ac5 Mon Sep 17 00:00:00 2001 From: MarianaDmytrivBinariks Date: Wed, 25 Jun 2025 12:59:45 +0300 Subject: [PATCH] FINERACT-2311: cover accounting config for buy down fees auto tests --- .../test/data/accounttype/DefaultAccountType.java | 4 +++- .../test/factory/LoanProductsRequestFactory.java | 4 +++- .../initializer/global/GLGlobalInitializerStep.java | 10 ++++++++++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/data/accounttype/DefaultAccountType.java b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/data/accounttype/DefaultAccountType.java index b609cd5b1..21531ad97 100644 --- a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/data/accounttype/DefaultAccountType.java +++ b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/data/accounttype/DefaultAccountType.java @@ -36,6 +36,7 @@ public enum DefaultAccountType implements AccountType { FEE_CHARGE_OFF("Fee Charge Off"), // RECOVERIES("Recoveries"), // INTEREST_INCOME_CHARGE_OFF("Interest Income Charge Off"), // + INCOME_FROM_BUY_DOWN("Income From Buy Down"), // // Liability AA_SUSPENSE_BALANCE("AA Suspense Balance"), // SUSPENSE_CLEARING_ACCOUNT("Suspense/Clearing account"), // @@ -45,7 +46,8 @@ public enum DefaultAccountType implements AccountType { CREDIT_LOSS_BAD_DEBT("Credit Loss/Bad Debt"), // CREDIT_LOSS_BAD_DEBT_FRAUD("Credit Loss/Bad Debt-Fraud"), // GOODWILL_EXPENSE_ACCOUNT("Goodwill Expense Account"), // - WRITTEN_OFF("Written off"); // + WRITTEN_OFF("Written off"), // + BUY_DOWN_EXPENSE("Buy Down Expense"); // private final String customName; diff --git a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/factory/LoanProductsRequestFactory.java b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/factory/LoanProductsRequestFactory.java index 01fb592fb..e355322f9 100644 --- a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/factory/LoanProductsRequestFactory.java +++ b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/factory/LoanProductsRequestFactory.java @@ -1752,6 +1752,8 @@ public class LoanProductsRequestFactory { .buyDownFeeStrategy(PostLoanProductsRequest.BuyDownFeeStrategyEnum.EQUAL_AMORTIZATION)// .buyDownFeeCalculationType(PostLoanProductsRequest.BuyDownFeeCalculationTypeEnum.FLAT)// .buyDownFeeIncomeType(PostLoanProductsRequest.BuyDownFeeIncomeTypeEnum.INTEREST)// - .enableBuyDownFee(true);// + .enableBuyDownFee(true)// + .buyDownExpenseAccountId(accountTypeResolver.resolve(DefaultAccountType.BUY_DOWN_EXPENSE))// + .incomeFromBuyDownAccountId(accountTypeResolver.resolve(DefaultAccountType.INCOME_FROM_BUY_DOWN));// } } diff --git a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/initializer/global/GLGlobalInitializerStep.java b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/initializer/global/GLGlobalInitializerStep.java index 6c17e2e65..e0d20e5e6 100644 --- a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/initializer/global/GLGlobalInitializerStep.java +++ b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/initializer/global/GLGlobalInitializerStep.java @@ -60,6 +60,8 @@ public class GLGlobalInitializerStep implements FineractGlobalInitializerStep { public static final String GLA_NAME_20 = "Interest Income Charge Off"; public static final String GLA_NAME_21 = "Asset transfer"; public static final String GLA_NAME_22 = "Deferred Capitalized Income"; + public static final String GLA_NAME_23 = "Buy Down Expense"; + public static final String GLA_NAME_24 = "Income From Buy Down"; public static final String GLA_GL_CODE_1 = "112601"; public static final String GLA_GL_CODE_2 = "112603"; public static final String GLA_GL_CODE_3 = "145800"; @@ -82,6 +84,8 @@ public class GLGlobalInitializerStep implements FineractGlobalInitializerStep { public static final String GLA_GL_CODE_20 = "404001"; public static final String GLA_GL_CODE_21 = "146000"; public static final String GLA_GL_CODE_22 = "145024"; + public static final String GLA_GL_CODE_23 = "450280"; + public static final String GLA_GL_CODE_24 = "450281"; private final GeneralLedgerAccountApi glaApi; @@ -154,5 +158,11 @@ public class GLGlobalInitializerStep implements FineractGlobalInitializerStep { PostGLAccountsRequest postGLAccountsRequest22 = GLAccountRequestFactory.defaultGLAccountRequest(GLA_NAME_22, GLA_GL_CODE_22, GLA_TYPE_LIABILITY, GLA_USAGE_DETAIL, true); glaApi.createGLAccount1(postGLAccountsRequest22).execute(); + PostGLAccountsRequest postGLAccountsRequest23 = GLAccountRequestFactory.defaultGLAccountRequest(GLA_NAME_23, GLA_GL_CODE_23, + GLA_TYPE_EXPENSE, GLA_USAGE_DETAIL, true); + glaApi.createGLAccount1(postGLAccountsRequest23).execute(); + PostGLAccountsRequest postGLAccountsRequest24 = GLAccountRequestFactory.defaultGLAccountRequest(GLA_NAME_24, GLA_GL_CODE_24, + GLA_TYPE_INCOME, GLA_USAGE_DETAIL, true); + glaApi.createGLAccount1(postGLAccountsRequest24).execute(); } }