This is an automated email from the ASF dual-hosted git repository.
adamsaghy pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract.git
The following commit(s) were added to refs/heads/develop by this push:
new e94e6c421 FINERACT-1806: Unify Charge-off reason mapping fields
e94e6c421 is described below
commit e94e6c421ad64dd6a3ecd1e41d42582a2330ea70
Author: Adam Saghy <[email protected]>
AuthorDate: Thu Dec 19 15:05:50 2024 +0100
FINERACT-1806: Unify Charge-off reason mapping fields
---
.../service/ProductToGLAccountMappingReadPlatformServiceImpl.java | 2 +-
.../org/apache/fineract/accounting/common/AccountingConstants.java | 2 +-
.../data/ChargeOffReasonToGLAccountMapper.java | 2 +-
.../portfolio/loanproduct/api/LoanProductsApiResourceSwagger.java | 4 ++--
.../integrationtests/LoanProductChargeOffReasonMappingsTest.java | 6 +++---
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git
a/fineract-accounting/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/service/ProductToGLAccountMappingReadPlatformServiceImpl.java
b/fineract-accounting/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/service/ProductToGLAccountMappingReadPlatformServiceImpl.java
index 9b19c65ab..131365725 100644
---
a/fineract-accounting/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/service/ProductToGLAccountMappingReadPlatformServiceImpl.java
+++
b/fineract-accounting/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/service/ProductToGLAccountMappingReadPlatformServiceImpl.java
@@ -285,7 +285,7 @@ public class
ProductToGLAccountMappingReadPlatformServiceImpl implements Product
.description(codeDescription).position(orderPosition).active(isActive).mandatory(isMandatory).build();
final ChargeOffReasonToGLAccountMapper
chargeOffReasonToGLAccountMapper = new ChargeOffReasonToGLAccountMapper()
-
.setChargeOffReasonCodeValue(chargeOffReasonsCodeValue).setChargeOffExpenseAccount(chargeOffExpenseAccount);
+
.setChargeOffReasonCodeValue(chargeOffReasonsCodeValue).setExpenseAccount(chargeOffExpenseAccount);
chargeOffReasonToGLAccountMappers.add(chargeOffReasonToGLAccountMapper);
}
return chargeOffReasonToGLAccountMappers;
diff --git
a/fineract-core/src/main/java/org/apache/fineract/accounting/common/AccountingConstants.java
b/fineract-core/src/main/java/org/apache/fineract/accounting/common/AccountingConstants.java
index 7976659c3..ac6dbf5d9 100644
---
a/fineract-core/src/main/java/org/apache/fineract/accounting/common/AccountingConstants.java
+++
b/fineract-core/src/main/java/org/apache/fineract/accounting/common/AccountingConstants.java
@@ -174,7 +174,7 @@ public final class AccountingConstants {
INCOME_FROM_GOODWILL_CREDIT_FEES("incomeFromGoodwillCreditFeesAccountId"), //
INCOME_FROM_GOODWILL_CREDIT_PENALTY("incomeFromGoodwillCreditPenaltyAccountId"),
//
CHARGE_OFF_REASON_TO_EXPENSE_ACCOUNT_MAPPINGS("chargeOffReasonToExpenseAccountMappings"),
//
- EXPENSE_GL_ACCOUNT_ID("expenseGLAccountId"), //
+ EXPENSE_GL_ACCOUNT_ID("expenseAccountId"), //
CHARGE_OFF_REASON_CODE_VALUE_ID("chargeOffReasonCodeValueId"); //
private final String value;
diff --git
a/fineract-core/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/data/ChargeOffReasonToGLAccountMapper.java
b/fineract-core/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/data/ChargeOffReasonToGLAccountMapper.java
index f95e933f2..05f61f5b4 100644
---
a/fineract-core/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/data/ChargeOffReasonToGLAccountMapper.java
+++
b/fineract-core/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/data/ChargeOffReasonToGLAccountMapper.java
@@ -32,5 +32,5 @@ public class ChargeOffReasonToGLAccountMapper implements
Serializable {
private static final long serialVersionUID = 1L;
private CodeValueData chargeOffReasonCodeValue;
- private GLAccountData chargeOffExpenseAccount;
+ private GLAccountData expenseAccount;
}
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 76e7c177a..c4ea55c37 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
@@ -333,7 +333,7 @@ final class LoanProductsApiResourceSwagger {
@Schema(example = "1")
public Long chargeOffReasonCodeValueId;
@Schema(example = "1")
- public Long expenseGLAccountId;
+ public Long expenseAccountId;
}
}
@@ -1234,7 +1234,7 @@ final class LoanProductsApiResourceSwagger {
private GetChargeOffReasonToExpenseAccountMappings() {}
public GetCodeValueData chargeOffReasonCodeValue;
- public GetGLAccountData chargeOffExpenseAccount;
+ public GetGLAccountData expenseAccount;
static final class GetCodeValueData {
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 84d518adc..e7e7a2d4e 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
@@ -59,7 +59,7 @@ public class LoanProductChargeOffReasonMappingsTest extends
BaseLoanIntegrationT
GetLoanProductsProductIdResponse loanProductDetails =
loanTransactionHelper.getLoanProduct(localLoanProductId.intValue());
Assertions.assertEquals(expenseAccount.getAccountID().longValue(),
-
loanProductDetails.getChargeOffReasonToExpenseAccountMappings().get(0).getChargeOffExpenseAccount().getId());
+
loanProductDetails.getChargeOffReasonToExpenseAccountMappings().get(0).getExpenseAccount().getId());
Assertions.assertEquals(Long.valueOf(chargeOffReasons),
loanProductDetails.getChargeOffReasonToExpenseAccountMappings().get(0).getChargeOffReasonCodeValue().getId());
@@ -71,7 +71,7 @@ public class LoanProductChargeOffReasonMappingsTest extends
BaseLoanIntegrationT
loanProductDetails =
loanTransactionHelper.getLoanProduct(localLoanProductId.intValue());
Assertions.assertEquals(otherExpenseAccount.getAccountID().longValue(),
-
loanProductDetails.getChargeOffReasonToExpenseAccountMappings().get(0).getChargeOffExpenseAccount().getId());
+
loanProductDetails.getChargeOffReasonToExpenseAccountMappings().get(0).getExpenseAccount().getId());
Assertions.assertEquals(Long.valueOf(chargeOffReasons),
loanProductDetails.getChargeOffReasonToExpenseAccountMappings().get(0).getChargeOffReasonCodeValue().getId());
});
@@ -232,7 +232,7 @@ public class LoanProductChargeOffReasonMappingsTest extends
BaseLoanIntegrationT
List<PostChargeOffReasonToExpenseAccountMappings>
chargeOffReasonToExpenseAccountMappings = new ArrayList<>();
PostChargeOffReasonToExpenseAccountMappings
chargeOffReasonToExpenseAccountMapping = new
PostChargeOffReasonToExpenseAccountMappings();
chargeOffReasonToExpenseAccountMapping.setChargeOffReasonCodeValueId(chargeOffReasonId);
-
chargeOffReasonToExpenseAccountMapping.setExpenseGLAccountId(glAccountId);
+
chargeOffReasonToExpenseAccountMapping.setExpenseAccountId(glAccountId);
chargeOffReasonToExpenseAccountMappings.add(chargeOffReasonToExpenseAccountMapping);
return chargeOffReasonToExpenseAccountMappings;
}
