CBSNexora/cbsnexora-backend
4
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

FINERACT-1806: Unify Charge-off reason mapping fields

Browse Source
This commit is contained in:
Adam Saghy
2024-12-19 17:26:24 +01:00
parent 8123276981
commit e94e6c421a
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fineract-accounting/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/service/ProductToGLAccountMappingReadPlatformServiceImpl.java
+1 -1
View File
@@ -285,7 +285,7 @@ public class ProductToGLAccountMappingReadPlatformServiceImpl implements Product
.description(codeDescription).position(orderPosition).active(isActive).mandatory(isMandatory).build(); .description(codeDescription).position(orderPosition).active(isActive).mandatory(isMandatory).build();
final ChargeOffReasonToGLAccountMapper chargeOffReasonToGLAccountMapper = new ChargeOffReasonToGLAccountMapper() final ChargeOffReasonToGLAccountMapper chargeOffReasonToGLAccountMapper = new ChargeOffReasonToGLAccountMapper()
.setChargeOffReasonCodeValue(chargeOffReasonsCodeValue).setChargeOffExpenseAccount(chargeOffExpenseAccount); .setChargeOffReasonCodeValue(chargeOffReasonsCodeValue).setExpenseAccount(chargeOffExpenseAccount);
chargeOffReasonToGLAccountMappers.add(chargeOffReasonToGLAccountMapper); chargeOffReasonToGLAccountMappers.add(chargeOffReasonToGLAccountMapper);
} }
return chargeOffReasonToGLAccountMappers; return chargeOffReasonToGLAccountMappers;
fineract-core/src/main/java/org/apache/fineract/accounting/common/AccountingConstants.java
+1 -1
View File
@@ -174,7 +174,7 @@ public final class AccountingConstants {
INCOME_FROM_GOODWILL_CREDIT_FEES("incomeFromGoodwillCreditFeesAccountId"), // INCOME_FROM_GOODWILL_CREDIT_FEES("incomeFromGoodwillCreditFeesAccountId"), //
INCOME_FROM_GOODWILL_CREDIT_PENALTY("incomeFromGoodwillCreditPenaltyAccountId"), // INCOME_FROM_GOODWILL_CREDIT_PENALTY("incomeFromGoodwillCreditPenaltyAccountId"), //
CHARGE_OFF_REASON_TO_EXPENSE_ACCOUNT_MAPPINGS("chargeOffReasonToExpenseAccountMappings"), // 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"); // CHARGE_OFF_REASON_CODE_VALUE_ID("chargeOffReasonCodeValueId"); //
private final String value; private final String value;
fineract-core/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/data/ChargeOffReasonToGLAccountMapper.java
+1 -1
View File
@@ -32,5 +32,5 @@ public class ChargeOffReasonToGLAccountMapper implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private CodeValueData chargeOffReasonCodeValue; private CodeValueData chargeOffReasonCodeValue;
private GLAccountData chargeOffExpenseAccount; private GLAccountData expenseAccount;
} }
fineract-loan/src/main/java/org/apache/fineract/portfolio/loanproduct/api/LoanProductsApiResourceSwagger.java
+2 -2
View File
@@ -333,7 +333,7 @@ final class LoanProductsApiResourceSwagger {
@Schema(example = "1") @Schema(example = "1")
public Long chargeOffReasonCodeValueId; public Long chargeOffReasonCodeValueId;
@Schema(example = "1") @Schema(example = "1")
public Long expenseGLAccountId; public Long expenseAccountId;
} }
} }
@@ -1234,7 +1234,7 @@ final class LoanProductsApiResourceSwagger {
private GetChargeOffReasonToExpenseAccountMappings() {} private GetChargeOffReasonToExpenseAccountMappings() {}
public GetCodeValueData chargeOffReasonCodeValue; public GetCodeValueData chargeOffReasonCodeValue;
public GetGLAccountData chargeOffExpenseAccount; public GetGLAccountData expenseAccount;
static final class GetCodeValueData { static final class GetCodeValueData {
integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanProductChargeOffReasonMappingsTest.java
+3 -3
View File
@@ -59,7 +59,7 @@ public class LoanProductChargeOffReasonMappingsTest extends BaseLoanIntegrationT
GetLoanProductsProductIdResponse loanProductDetails = loanTransactionHelper.getLoanProduct(localLoanProductId.intValue()); GetLoanProductsProductIdResponse loanProductDetails = loanTransactionHelper.getLoanProduct(localLoanProductId.intValue());
Assertions.assertEquals(expenseAccount.getAccountID().longValue(), Assertions.assertEquals(expenseAccount.getAccountID().longValue(),
loanProductDetails.getChargeOffReasonToExpenseAccountMappings().get(0).getChargeOffExpenseAccount().getId()); loanProductDetails.getChargeOffReasonToExpenseAccountMappings().get(0).getExpenseAccount().getId());
Assertions.assertEquals(Long.valueOf(chargeOffReasons), Assertions.assertEquals(Long.valueOf(chargeOffReasons),
loanProductDetails.getChargeOffReasonToExpenseAccountMappings().get(0).getChargeOffReasonCodeValue().getId()); loanProductDetails.getChargeOffReasonToExpenseAccountMappings().get(0).getChargeOffReasonCodeValue().getId());
@@ -71,7 +71,7 @@ public class LoanProductChargeOffReasonMappingsTest extends BaseLoanIntegrationT
loanProductDetails = loanTransactionHelper.getLoanProduct(localLoanProductId.intValue()); loanProductDetails = loanTransactionHelper.getLoanProduct(localLoanProductId.intValue());
Assertions.assertEquals(otherExpenseAccount.getAccountID().longValue(), Assertions.assertEquals(otherExpenseAccount.getAccountID().longValue(),
loanProductDetails.getChargeOffReasonToExpenseAccountMappings().get(0).getChargeOffExpenseAccount().getId()); loanProductDetails.getChargeOffReasonToExpenseAccountMappings().get(0).getExpenseAccount().getId());
Assertions.assertEquals(Long.valueOf(chargeOffReasons), Assertions.assertEquals(Long.valueOf(chargeOffReasons),
loanProductDetails.getChargeOffReasonToExpenseAccountMappings().get(0).getChargeOffReasonCodeValue().getId()); loanProductDetails.getChargeOffReasonToExpenseAccountMappings().get(0).getChargeOffReasonCodeValue().getId());
}); });
@@ -232,7 +232,7 @@ public class LoanProductChargeOffReasonMappingsTest extends BaseLoanIntegrationT
List<PostChargeOffReasonToExpenseAccountMappings> chargeOffReasonToExpenseAccountMappings = new ArrayList<>(); List<PostChargeOffReasonToExpenseAccountMappings> chargeOffReasonToExpenseAccountMappings = new ArrayList<>();
PostChargeOffReasonToExpenseAccountMappings chargeOffReasonToExpenseAccountMapping = new PostChargeOffReasonToExpenseAccountMappings(); PostChargeOffReasonToExpenseAccountMappings chargeOffReasonToExpenseAccountMapping = new PostChargeOffReasonToExpenseAccountMappings();
chargeOffReasonToExpenseAccountMapping.setChargeOffReasonCodeValueId(chargeOffReasonId); chargeOffReasonToExpenseAccountMapping.setChargeOffReasonCodeValueId(chargeOffReasonId);
chargeOffReasonToExpenseAccountMapping.setExpenseGLAccountId(glAccountId); chargeOffReasonToExpenseAccountMapping.setExpenseAccountId(glAccountId);
chargeOffReasonToExpenseAccountMappings.add(chargeOffReasonToExpenseAccountMapping); chargeOffReasonToExpenseAccountMappings.add(chargeOffReasonToExpenseAccountMapping);
return chargeOffReasonToExpenseAccountMappings; return chargeOffReasonToExpenseAccountMappings;
} }