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 9acfe9844..801777b59 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 @@ -25,10 +25,9 @@ import java.util.ArrayList; import java.util.List; import lombok.RequiredArgsConstructor; import org.apache.fineract.client.models.AllowAttributeOverrides; -import org.apache.fineract.client.models.ChargeToGLAccountMapper; -import org.apache.fineract.client.models.GetLoanFeeToIncomeAccountMappings; import org.apache.fineract.client.models.GetLoanPaymentChannelToFundSourceMappings; import org.apache.fineract.client.models.LoanProductChargeData; +import org.apache.fineract.client.models.LoanProductChargeToGLAccountMapper; import org.apache.fineract.client.models.PostChargeOffReasonToExpenseAccountMappings; import org.apache.fineract.client.models.PostLoanProductsRequest; import org.apache.fineract.test.data.AccountingRule; @@ -132,8 +131,8 @@ public class LoanProductsRequestFactory { List numberOfRepaymentVariationsForBorrowerCycle = new ArrayList<>(); List interestRateVariationsForBorrowerCycle = new ArrayList<>(); List charges = new ArrayList<>(); - List penaltyToIncomeAccountMappings = new ArrayList<>(); - List feeToIncomeAccountMappings = new ArrayList<>(); + List penaltyToIncomeAccountMappings = new ArrayList<>(); + List feeToIncomeAccountMappings = new ArrayList<>(); List paymentChannelToFundSourceMappings = new ArrayList<>(); GetLoanPaymentChannelToFundSourceMappings loanPaymentChannelToFundSourceMappings = new GetLoanPaymentChannelToFundSourceMappings(); @@ -242,8 +241,8 @@ public class LoanProductsRequestFactory { List numberOfRepaymentVariationsForBorrowerCycle = new ArrayList<>(); List interestRateVariationsForBorrowerCycle = new ArrayList<>(); List charges = new ArrayList<>(); - List penaltyToIncomeAccountMappings = new ArrayList<>(); - List feeToIncomeAccountMappings = new ArrayList<>(); + List penaltyToIncomeAccountMappings = new ArrayList<>(); + List feeToIncomeAccountMappings = new ArrayList<>(); List paymentChannelToFundSourceMappings = new ArrayList<>(); GetLoanPaymentChannelToFundSourceMappings loanPaymentChannelToFundSourceMappings = new GetLoanPaymentChannelToFundSourceMappings(); @@ -350,8 +349,8 @@ public class LoanProductsRequestFactory { List numberOfRepaymentVariationsForBorrowerCycle = new ArrayList<>(); List interestRateVariationsForBorrowerCycle = new ArrayList<>(); List charges = new ArrayList<>(); - List penaltyToIncomeAccountMappings = new ArrayList<>(); - List feeToIncomeAccountMappings = new ArrayList<>(); + List penaltyToIncomeAccountMappings = new ArrayList<>(); + List feeToIncomeAccountMappings = new ArrayList<>(); List paymentChannelToFundSourceMappings = new ArrayList<>(); GetLoanPaymentChannelToFundSourceMappings loanPaymentChannelToFundSourceMappings = new GetLoanPaymentChannelToFundSourceMappings(); @@ -458,8 +457,8 @@ public class LoanProductsRequestFactory { List numberOfRepaymentVariationsForBorrowerCycle = new ArrayList<>(); List interestRateVariationsForBorrowerCycle = new ArrayList<>(); List charges = new ArrayList<>(); - List penaltyToIncomeAccountMappings = new ArrayList<>(); - List feeToIncomeAccountMappings = new ArrayList<>(); + List penaltyToIncomeAccountMappings = new ArrayList<>(); + List feeToIncomeAccountMappings = new ArrayList<>(); List paymentChannelToFundSourceMappings = new ArrayList<>(); GetLoanPaymentChannelToFundSourceMappings loanPaymentChannelToFundSourceMappings = new GetLoanPaymentChannelToFundSourceMappings(); @@ -571,8 +570,8 @@ public class LoanProductsRequestFactory { List numberOfRepaymentVariationsForBorrowerCycle = new ArrayList<>(); List interestRateVariationsForBorrowerCycle = new ArrayList<>(); List charges = new ArrayList<>(); - List penaltyToIncomeAccountMappings = new ArrayList<>(); - List feeToIncomeAccountMappings = new ArrayList<>(); + List penaltyToIncomeAccountMappings = new ArrayList<>(); + List feeToIncomeAccountMappings = new ArrayList<>(); List paymentChannelToFundSourceMappings = new ArrayList<>(); GetLoanPaymentChannelToFundSourceMappings loanPaymentChannelToFundSourceMappings = new GetLoanPaymentChannelToFundSourceMappings(); @@ -677,8 +676,8 @@ public class LoanProductsRequestFactory { final String name = Utils.randomNameGenerator(NAME_PREFIX_INTEREST_RECALCULATION, 4); final String shortName = Utils.randomNameGenerator(SHORT_NAME_PREFIX_INTEREST, 3); - List penaltyToIncomeAccountMappings = new ArrayList<>(); - List feeToIncomeAccountMappings = new ArrayList<>(); + List penaltyToIncomeAccountMappings = new ArrayList<>(); + List feeToIncomeAccountMappings = new ArrayList<>(); List paymentChannelToFundSourceMappings = new ArrayList<>(); GetLoanPaymentChannelToFundSourceMappings loanPaymentChannelToFundSourceMappings = new GetLoanPaymentChannelToFundSourceMappings(); @@ -796,8 +795,8 @@ public class LoanProductsRequestFactory { List numberOfRepaymentVariationsForBorrowerCycle = new ArrayList<>(); List interestRateVariationsForBorrowerCycle = new ArrayList<>(); List charges = new ArrayList<>(); - List penaltyToIncomeAccountMappings = new ArrayList<>(); - List feeToIncomeAccountMappings = new ArrayList<>(); + List penaltyToIncomeAccountMappings = new ArrayList<>(); + List feeToIncomeAccountMappings = new ArrayList<>(); List paymentChannelToFundSourceMappings = new ArrayList<>(); GetLoanPaymentChannelToFundSourceMappings loanPaymentChannelToFundSourceMappings = new GetLoanPaymentChannelToFundSourceMappings(); @@ -909,8 +908,8 @@ public class LoanProductsRequestFactory { List numberOfRepaymentVariationsForBorrowerCycle = new ArrayList<>(); List interestRateVariationsForBorrowerCycle = new ArrayList<>(); List charges = new ArrayList<>(); - List penaltyToIncomeAccountMappings = new ArrayList<>(); - List feeToIncomeAccountMappings = new ArrayList<>(); + List penaltyToIncomeAccountMappings = new ArrayList<>(); + List feeToIncomeAccountMappings = new ArrayList<>(); List paymentChannelToFundSourceMappings = new ArrayList<>(); GetLoanPaymentChannelToFundSourceMappings loanPaymentChannelToFundSourceMappings = new GetLoanPaymentChannelToFundSourceMappings(); @@ -1020,8 +1019,8 @@ public class LoanProductsRequestFactory { List numberOfRepaymentVariationsForBorrowerCycle = new ArrayList<>(); List interestRateVariationsForBorrowerCycle = new ArrayList<>(); List charges = new ArrayList<>(); - List penaltyToIncomeAccountMappings = new ArrayList<>(); - List feeToIncomeAccountMappings = new ArrayList<>(); + List penaltyToIncomeAccountMappings = new ArrayList<>(); + List feeToIncomeAccountMappings = new ArrayList<>(); List paymentChannelToFundSourceMappings = new ArrayList<>(); GetLoanPaymentChannelToFundSourceMappings loanPaymentChannelToFundSourceMappings = new GetLoanPaymentChannelToFundSourceMappings(); @@ -1130,8 +1129,8 @@ public class LoanProductsRequestFactory { List numberOfRepaymentVariationsForBorrowerCycle = new ArrayList<>(); List interestRateVariationsForBorrowerCycle = new ArrayList<>(); List charges = new ArrayList<>(); - List penaltyToIncomeAccountMappings = new ArrayList<>(); - List feeToIncomeAccountMappings = new ArrayList<>(); + List penaltyToIncomeAccountMappings = new ArrayList<>(); + List feeToIncomeAccountMappings = new ArrayList<>(); List paymentChannelToFundSourceMappings = new ArrayList<>(); GetLoanPaymentChannelToFundSourceMappings loanPaymentChannelToFundSourceMappings = new GetLoanPaymentChannelToFundSourceMappings(); diff --git a/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanproduct/api/LoanProductsApiResourceSwagger.java b/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanproduct/api/LoanProductsApiResourceSwagger.java index 56a557b71..64fcb0d3c 100644 --- a/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanproduct/api/LoanProductsApiResourceSwagger.java +++ b/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanproduct/api/LoanProductsApiResourceSwagger.java @@ -23,7 +23,7 @@ import java.math.BigDecimal; import java.time.LocalDate; import java.util.List; import java.util.Set; -import org.apache.fineract.accounting.producttoaccountmapping.data.ChargeToGLAccountMapper; +import org.apache.fineract.accounting.glaccount.data.GLAccountData; import org.apache.fineract.infrastructure.core.data.EnumOptionData; import org.apache.fineract.infrastructure.core.data.StringEnumOptionData; import org.apache.fineract.portfolio.delinquency.api.DelinquencyApiResourceSwagger.GetDelinquencyBucketsResponse; @@ -35,6 +35,25 @@ final class LoanProductsApiResourceSwagger { private LoanProductsApiResourceSwagger() {} + @Schema(description = "LoanProductChargeData") + public static final class LoanProductChargeData { + + private LoanProductChargeData() {} + + @Schema(example = "1") + public Long id; + } + + @Schema(description = "LoanProductChargeToGLAccountMapper") + public static final class LoanProductChargeToGLAccountMapper { + + private LoanProductChargeToGLAccountMapper() {} + + public LoanProductChargeData charge; + public GLAccountData incomeAccount; + + } + @Schema(description = "PostLoanProductsRequest") public static final class PostLoanProductsRequest { @@ -251,9 +270,9 @@ final class LoanProductsApiResourceSwagger { @Schema(example = "11") public Long incomeFromGoodwillCreditPenaltyAccountId; public List paymentChannelToFundSourceMappings; - public List feeToIncomeAccountMappings; + public List feeToIncomeAccountMappings; public List chargeOffReasonToExpenseAccountMappings; - public List penaltyToIncomeAccountMappings; + public List penaltyToIncomeAccountMappings; // Multi Disburse @Schema(example = "true") @@ -302,14 +321,6 @@ final class LoanProductsApiResourceSwagger { public boolean graceOnArrearsAgeing; } - static final class LoanProductChargeData { - - private LoanProductChargeData() {} - - @Schema(example = "1") - public Long id; - } - static final class RateData { private RateData() {} @@ -1639,9 +1650,9 @@ final class LoanProductsApiResourceSwagger { @Schema(example = "11") public Long incomeFromChargeOffPenaltyAccountId; public List paymentChannelToFundSourceMappings; - public List feeToIncomeAccountMappings; + public List feeToIncomeAccountMappings; public List chargeOffReasonToExpenseAccountMappings; - public List penaltyToIncomeAccountMappings; + public List penaltyToIncomeAccountMappings; @Schema(example = "false") public Boolean enableAccrualActivityPosting; @@ -1657,7 +1668,7 @@ final class LoanProductsApiResourceSwagger { @Schema(example = "36000.00") public Double outstandingLoanBalance; - public List charges; + public List charges; @Schema(example = "en_GB") public String locale; @Schema(example = "dd MMMM yyyy") diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanAccountChargeOffWithAdvancedPaymentAllocationTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanAccountChargeOffWithAdvancedPaymentAllocationTest.java index 28c3d549d..78c5efe19 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanAccountChargeOffWithAdvancedPaymentAllocationTest.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanAccountChargeOffWithAdvancedPaymentAllocationTest.java @@ -39,15 +39,14 @@ import java.util.UUID; import java.util.concurrent.atomic.AtomicReference; import org.apache.fineract.client.models.AdvancedPaymentData; import org.apache.fineract.client.models.AllowAttributeOverrides; -import org.apache.fineract.client.models.ChargeToGLAccountMapper; import org.apache.fineract.client.models.GetJournalEntriesTransactionIdResponse; -import org.apache.fineract.client.models.GetLoanFeeToIncomeAccountMappings; import org.apache.fineract.client.models.GetLoanPaymentChannelToFundSourceMappings; import org.apache.fineract.client.models.GetLoanTransactionRelation; import org.apache.fineract.client.models.GetLoansLoanIdResponse; import org.apache.fineract.client.models.GetLoansLoanIdTransactionsTransactionIdResponse; import org.apache.fineract.client.models.JournalEntryTransactionItem; import org.apache.fineract.client.models.LoanProductChargeData; +import org.apache.fineract.client.models.LoanProductChargeToGLAccountMapper; import org.apache.fineract.client.models.PaymentTypeRequest; import org.apache.fineract.client.models.PostClientsResponse; import org.apache.fineract.client.models.PostLoanProductsRequest; @@ -663,8 +662,8 @@ public class LoanAccountChargeOffWithAdvancedPaymentAllocationTest extends BaseL List numberOfRepaymentVariationsForBorrowerCycle = new ArrayList<>(); List interestRateVariationsForBorrowerCycle = new ArrayList<>(); List charges = new ArrayList<>(); - List penaltyToIncomeAccountMappings = new ArrayList<>(); - List feeToIncomeAccountMappings = new ArrayList<>(); + List penaltyToIncomeAccountMappings = new ArrayList<>(); + List feeToIncomeAccountMappings = new ArrayList<>(); String paymentTypeName = PaymentTypeHelper.randomNameGenerator("P_T", 5); String description = PaymentTypeHelper.randomNameGenerator("PT_Desc", 15); diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanAccountChargeReveseReplayWithAdvancedPaymentAllocationTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanAccountChargeReveseReplayWithAdvancedPaymentAllocationTest.java index e67ba55a5..6e778f398 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanAccountChargeReveseReplayWithAdvancedPaymentAllocationTest.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanAccountChargeReveseReplayWithAdvancedPaymentAllocationTest.java @@ -35,11 +35,10 @@ import java.util.List; import java.util.UUID; import org.apache.fineract.client.models.AdvancedPaymentData; import org.apache.fineract.client.models.AllowAttributeOverrides; -import org.apache.fineract.client.models.ChargeToGLAccountMapper; -import org.apache.fineract.client.models.GetLoanFeeToIncomeAccountMappings; import org.apache.fineract.client.models.GetLoanPaymentChannelToFundSourceMappings; import org.apache.fineract.client.models.GetLoansLoanIdResponse; import org.apache.fineract.client.models.LoanProductChargeData; +import org.apache.fineract.client.models.LoanProductChargeToGLAccountMapper; import org.apache.fineract.client.models.PaymentTypeRequest; import org.apache.fineract.client.models.PostLoanProductsRequest; import org.apache.fineract.client.models.PostLoanProductsResponse; @@ -355,8 +354,8 @@ public class LoanAccountChargeReveseReplayWithAdvancedPaymentAllocationTest exte List numberOfRepaymentVariationsForBorrowerCycle = new ArrayList<>(); List interestRateVariationsForBorrowerCycle = new ArrayList<>(); List charges = new ArrayList<>(); - List penaltyToIncomeAccountMappings = new ArrayList<>(); - List feeToIncomeAccountMappings = new ArrayList<>(); + List penaltyToIncomeAccountMappings = new ArrayList<>(); + List feeToIncomeAccountMappings = new ArrayList<>(); String paymentTypeName = PaymentTypeHelper.randomNameGenerator("P_T", 5); String description = PaymentTypeHelper.randomNameGenerator("PT_Desc", 15); diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanPostChargeOffScenariosTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanPostChargeOffScenariosTest.java index 8a0f6f7a9..1b45b076d 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanPostChargeOffScenariosTest.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanPostChargeOffScenariosTest.java @@ -34,15 +34,14 @@ import java.util.ArrayList; import java.util.List; import java.util.UUID; import org.apache.fineract.client.models.AllowAttributeOverrides; -import org.apache.fineract.client.models.ChargeToGLAccountMapper; import org.apache.fineract.client.models.GetJournalEntriesTransactionIdResponse; -import org.apache.fineract.client.models.GetLoanFeeToIncomeAccountMappings; import org.apache.fineract.client.models.GetLoanPaymentChannelToFundSourceMappings; import org.apache.fineract.client.models.GetLoanTransactionRelation; import org.apache.fineract.client.models.GetLoansLoanIdResponse; import org.apache.fineract.client.models.GetLoansLoanIdTransactionsTransactionIdResponse; import org.apache.fineract.client.models.JournalEntryTransactionItem; import org.apache.fineract.client.models.LoanProductChargeData; +import org.apache.fineract.client.models.LoanProductChargeToGLAccountMapper; import org.apache.fineract.client.models.PaymentTypeRequest; import org.apache.fineract.client.models.PostLoanProductsRequest; import org.apache.fineract.client.models.PostLoanProductsResponse; @@ -1129,8 +1128,8 @@ public class LoanPostChargeOffScenariosTest extends BaseLoanIntegrationTest { List numberOfRepaymentVariationsForBorrowerCycle = new ArrayList<>(); List interestRateVariationsForBorrowerCycle = new ArrayList<>(); List charges = new ArrayList<>(); - List penaltyToIncomeAccountMappings = new ArrayList<>(); - List feeToIncomeAccountMappings = new ArrayList<>(); + List penaltyToIncomeAccountMappings = new ArrayList<>(); + List feeToIncomeAccountMappings = new ArrayList<>(); String paymentTypeName = PaymentTypeHelper.randomNameGenerator("P_T", 5); String description = PaymentTypeHelper.randomNameGenerator("PT_Desc", 15); diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanProductChargeOffReasonMappingsTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanProductChargeOffReasonMappingsTest.java index 801cd870b..d06dc4228 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanProductChargeOffReasonMappingsTest.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanProductChargeOffReasonMappingsTest.java @@ -24,11 +24,10 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import org.apache.fineract.client.models.AllowAttributeOverrides; -import org.apache.fineract.client.models.ChargeToGLAccountMapper; -import org.apache.fineract.client.models.GetLoanFeeToIncomeAccountMappings; import org.apache.fineract.client.models.GetLoanPaymentChannelToFundSourceMappings; import org.apache.fineract.client.models.GetLoanProductsProductIdResponse; import org.apache.fineract.client.models.LoanProductChargeData; +import org.apache.fineract.client.models.LoanProductChargeToGLAccountMapper; import org.apache.fineract.client.models.PostChargeOffReasonToExpenseAccountMappings; import org.apache.fineract.client.models.PostLoanProductsRequest; import org.apache.fineract.client.models.PutLoanProductsProductIdRequest; @@ -108,8 +107,8 @@ public class LoanProductChargeOffReasonMappingsTest extends BaseLoanIntegrationT List numberOfRepaymentVariationsForBorrowerCycle = new ArrayList<>(); List interestRateVariationsForBorrowerCycle = new ArrayList<>(); List charges = new ArrayList<>(); - List penaltyToIncomeAccountMappings = new ArrayList<>(); - List feeToIncomeAccountMappings = new ArrayList<>(); + List penaltyToIncomeAccountMappings = new ArrayList<>(); + List feeToIncomeAccountMappings = new ArrayList<>(); List chargeOffReasonToExpenseAccountMappings = createPostChargeOffReasonToExpenseAccountMappings( chargeOffReasonId, glAccountId); diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanTransactionAccrualActivityPostingTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanTransactionAccrualActivityPostingTest.java index 724a760df..7b0a7a584 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanTransactionAccrualActivityPostingTest.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanTransactionAccrualActivityPostingTest.java @@ -36,12 +36,11 @@ import java.util.concurrent.atomic.AtomicReference; import org.apache.fineract.client.models.AdvancedPaymentData; import org.apache.fineract.client.models.AllowAttributeOverrides; import org.apache.fineract.client.models.ChargeRequest; -import org.apache.fineract.client.models.ChargeToGLAccountMapper; -import org.apache.fineract.client.models.GetLoanFeeToIncomeAccountMappings; import org.apache.fineract.client.models.GetLoanPaymentChannelToFundSourceMappings; import org.apache.fineract.client.models.GetLoansLoanIdResponse; import org.apache.fineract.client.models.GetLoansLoanIdStatus; import org.apache.fineract.client.models.LoanProductChargeData; +import org.apache.fineract.client.models.LoanProductChargeToGLAccountMapper; import org.apache.fineract.client.models.PostChargesResponse; import org.apache.fineract.client.models.PostClientsResponse; import org.apache.fineract.client.models.PostLoanProductsRequest; @@ -1433,8 +1432,8 @@ public class LoanTransactionAccrualActivityPostingTest extends BaseLoanIntegrati List numberOfRepaymentVariationsForBorrowerCycle = new ArrayList<>(); List interestRateVariationsForBorrowerCycle = new ArrayList<>(); List charges = new ArrayList<>(); - List penaltyToIncomeAccountMappings = new ArrayList<>(); - List feeToIncomeAccountMappings = new ArrayList<>(); + List penaltyToIncomeAccountMappings = new ArrayList<>(); + List feeToIncomeAccountMappings = new ArrayList<>(); List paymentChannelToFundSourceMappings = new ArrayList<>(); GetLoanPaymentChannelToFundSourceMappings loanPaymentChannelToFundSourceMappings = new GetLoanPaymentChannelToFundSourceMappings(); diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/RepaymentReverseExternalIdTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/RepaymentReverseExternalIdTest.java index 0e1c93c6a..254e1d9bf 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/RepaymentReverseExternalIdTest.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/RepaymentReverseExternalIdTest.java @@ -33,12 +33,11 @@ import java.util.ArrayList; import java.util.List; import java.util.UUID; import org.apache.fineract.client.models.AllowAttributeOverrides; -import org.apache.fineract.client.models.ChargeToGLAccountMapper; -import org.apache.fineract.client.models.GetLoanFeeToIncomeAccountMappings; import org.apache.fineract.client.models.GetLoanPaymentChannelToFundSourceMappings; import org.apache.fineract.client.models.GetLoansLoanIdResponse; import org.apache.fineract.client.models.GetLoansLoanIdTransactions; import org.apache.fineract.client.models.LoanProductChargeData; +import org.apache.fineract.client.models.LoanProductChargeToGLAccountMapper; import org.apache.fineract.client.models.PostLoanProductsRequest; import org.apache.fineract.client.models.PostLoansLoanIdRequest; import org.apache.fineract.client.models.PostLoansLoanIdTransactionsRequest; @@ -141,8 +140,8 @@ public class RepaymentReverseExternalIdTest extends BaseLoanIntegrationTest { List numberOfRepaymentVariationsForBorrowerCycle = new ArrayList<>(); List interestRateVariationsForBorrowerCycle = new ArrayList<>(); List charges = new ArrayList<>(); - List penaltyToIncomeAccountMappings = new ArrayList<>(); - List feeToIncomeAccountMappings = new ArrayList<>(); + List penaltyToIncomeAccountMappings = new ArrayList<>(); + List feeToIncomeAccountMappings = new ArrayList<>(); List paymentChannelToFundSourceMappings = new ArrayList<>(); GetLoanPaymentChannelToFundSourceMappings loanPaymentChannelToFundSourceMappings = new GetLoanPaymentChannelToFundSourceMappings(); diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/UndoRepaymentWithDownPaymentIntegrationTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/UndoRepaymentWithDownPaymentIntegrationTest.java index 803a2101c..78c250144 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/UndoRepaymentWithDownPaymentIntegrationTest.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/UndoRepaymentWithDownPaymentIntegrationTest.java @@ -36,12 +36,11 @@ import java.util.List; import java.util.UUID; import org.apache.fineract.client.models.AdvancedPaymentData; import org.apache.fineract.client.models.AllowAttributeOverrides; -import org.apache.fineract.client.models.ChargeToGLAccountMapper; -import org.apache.fineract.client.models.GetLoanFeeToIncomeAccountMappings; import org.apache.fineract.client.models.GetLoanPaymentChannelToFundSourceMappings; import org.apache.fineract.client.models.GetLoanProductsProductIdResponse; import org.apache.fineract.client.models.GetLoansLoanIdResponse; import org.apache.fineract.client.models.LoanProductChargeData; +import org.apache.fineract.client.models.LoanProductChargeToGLAccountMapper; import org.apache.fineract.client.models.PaymentTypeRequest; import org.apache.fineract.client.models.PostLoanProductsRequest; import org.apache.fineract.client.models.PostLoanProductsResponse; @@ -204,8 +203,8 @@ public class UndoRepaymentWithDownPaymentIntegrationTest extends BaseLoanIntegra List numberOfRepaymentVariationsForBorrowerCycle = new ArrayList<>(); List interestRateVariationsForBorrowerCycle = new ArrayList<>(); List charges = new ArrayList<>(); - List penaltyToIncomeAccountMappings = new ArrayList<>(); - List feeToIncomeAccountMappings = new ArrayList<>(); + List penaltyToIncomeAccountMappings = new ArrayList<>(); + List feeToIncomeAccountMappings = new ArrayList<>(); String paymentTypeName = PaymentTypeHelper.randomNameGenerator("P_T", 5); String description = PaymentTypeHelper.randomNameGenerator("PT_Desc", 15);