FINERACT-1806: fetch loan product details must return the chargeoffreason mapping
This commit is contained in:
committed by
Adam Saghy
parent
479e71cdad
commit
bfae135b54
+3
@@ -20,6 +20,7 @@ package org.apache.fineract.accounting.producttoaccountmapping.service;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import org.apache.fineract.accounting.producttoaccountmapping.data.ChargeOffReasonToGLAccountMapper;
|
||||
import org.apache.fineract.accounting.producttoaccountmapping.data.ChargeToGLAccountMapper;
|
||||
import org.apache.fineract.accounting.producttoaccountmapping.data.PaymentTypeToGLAccountMapper;
|
||||
|
||||
@@ -46,4 +47,6 @@ public interface ProductToGLAccountMappingReadPlatformService {
|
||||
List<PaymentTypeToGLAccountMapper> fetchPaymentTypeToFundSourceMappingsForShareProduct(Long productId);
|
||||
|
||||
List<ChargeToGLAccountMapper> fetchFeeToIncomeAccountMappingsForShareProduct(Long productId);
|
||||
|
||||
List<ChargeOffReasonToGLAccountMapper> fetchChargeOffReasonMappingsForLoanProduct(Long loanProductId);
|
||||
}
|
||||
|
||||
+57
-3
@@ -37,8 +37,10 @@ import org.apache.fineract.accounting.common.AccountingConstants.SharesProductAc
|
||||
import org.apache.fineract.accounting.common.AccountingRuleType;
|
||||
import org.apache.fineract.accounting.common.AccountingValidations;
|
||||
import org.apache.fineract.accounting.glaccount.data.GLAccountData;
|
||||
import org.apache.fineract.accounting.producttoaccountmapping.data.ChargeOffReasonToGLAccountMapper;
|
||||
import org.apache.fineract.accounting.producttoaccountmapping.data.ChargeToGLAccountMapper;
|
||||
import org.apache.fineract.accounting.producttoaccountmapping.data.PaymentTypeToGLAccountMapper;
|
||||
import org.apache.fineract.infrastructure.codes.data.CodeValueData;
|
||||
import org.apache.fineract.infrastructure.core.domain.JdbcSupport;
|
||||
import org.apache.fineract.portfolio.PortfolioProductType;
|
||||
import org.apache.fineract.portfolio.charge.data.ChargeData;
|
||||
@@ -59,10 +61,11 @@ public class ProductToGLAccountMappingReadPlatformServiceImpl implements Product
|
||||
public String schema() {
|
||||
return " mapping.id as id, mapping.gl_account_id as glAccountId,glaccount.name as name,glaccount.gl_code as code,"
|
||||
+ " mapping.product_id as productId, mapping.product_type as productType,mapping.financial_account_type as financialAccountType, "
|
||||
+ " mapping.payment_type as paymentTypeId,pt.value as paymentTypeValue, mapping.charge_id as chargeId, charge.is_penalty as penalty, "
|
||||
+ " charge.name as chargeName "
|
||||
+ " mapping.payment_type as paymentTypeId,pt.value as paymentTypeValue, mapping.charge_id as chargeId, mapping.charge_off_reason_id as chargeOffReasonId, charge.is_penalty as penalty, "
|
||||
+ " charge.name as chargeName, codeValue.code_value as codeValueName, codeValue.code_description as codeDescription, codeValue.order_position as orderPosition, codeValue.is_active as isActive, codeValue.is_mandatory as isMandatory "
|
||||
+ " from acc_product_mapping mapping left join m_charge charge on mapping.charge_id=charge.id "
|
||||
+ " left join acc_gl_account as glaccount on mapping.gl_account_id = glaccount.id"
|
||||
+ " left join acc_gl_account as glaccount on mapping.gl_account_id = glaccount.id "
|
||||
+ " left join m_code_value as codeValue on mapping.charge_off_reason_id = codeValue.id "
|
||||
+ " left join m_payment_type pt on mapping.payment_type=pt.id" + " where mapping.product_type= ? ";
|
||||
}
|
||||
|
||||
@@ -81,6 +84,12 @@ public class ProductToGLAccountMappingReadPlatformServiceImpl implements Product
|
||||
final String glCode = rs.getString("code");
|
||||
final String chargeName = rs.getString("chargeName");
|
||||
final Boolean penalty = rs.getBoolean("penalty");
|
||||
final Integer chargeOffReasonId = rs.getInt("chargeOffReasonId");
|
||||
final String codeValue = rs.getString("codeValueName");
|
||||
final String codeDescription = rs.getString("codeDescription");
|
||||
final Integer orderPosition = rs.getInt("orderPosition");
|
||||
final Integer isActive = rs.getInt("isActive");
|
||||
final Integer isMandatory = rs.getInt("isMandatory");
|
||||
|
||||
final Map<String, Object> loanProductToGLAccountMap = new LinkedHashMap<>(5);
|
||||
loanProductToGLAccountMap.put("id", id);
|
||||
@@ -95,6 +104,12 @@ public class ProductToGLAccountMappingReadPlatformServiceImpl implements Product
|
||||
loanProductToGLAccountMap.put("penalty", penalty);
|
||||
loanProductToGLAccountMap.put("glAccountName", glAccountName);
|
||||
loanProductToGLAccountMap.put("glCode", glCode);
|
||||
loanProductToGLAccountMap.put("chargeOffReasonId", chargeOffReasonId);
|
||||
loanProductToGLAccountMap.put("codeValue", codeValue);
|
||||
loanProductToGLAccountMap.put("codeDescription", codeDescription);
|
||||
loanProductToGLAccountMap.put("orderPosition", orderPosition);
|
||||
loanProductToGLAccountMap.put("isActive", isActive);
|
||||
loanProductToGLAccountMap.put("isMandatory", isMandatory);
|
||||
return loanProductToGLAccountMap;
|
||||
}
|
||||
}
|
||||
@@ -342,6 +357,40 @@ public class ProductToGLAccountMappingReadPlatformServiceImpl implements Product
|
||||
return chargeToGLAccountMappers;
|
||||
}
|
||||
|
||||
private List<ChargeOffReasonToGLAccountMapper> fetchChargeOffReasonMappings(final PortfolioProductType portfolioProductType,
|
||||
final Long loanProductId) {
|
||||
final ProductToGLAccountMappingMapper rm = new ProductToGLAccountMappingMapper();
|
||||
String sql = "select " + rm.schema() + " and product_id = ? and mapping.charge_off_reason_id is not null";
|
||||
|
||||
final List<Map<String, Object>> chargeOffReasonMappingsList = this.jdbcTemplate.query(sql, rm, // NOSONAR
|
||||
new Object[] { portfolioProductType.getValue(), loanProductId });
|
||||
List<ChargeOffReasonToGLAccountMapper> chargeOffReasonToGLAccountMappers = null;
|
||||
for (final Map<String, Object> chargeOffReasonMap : chargeOffReasonMappingsList) {
|
||||
if (chargeOffReasonToGLAccountMappers == null) {
|
||||
chargeOffReasonToGLAccountMappers = new ArrayList<>();
|
||||
}
|
||||
final Long glAccountId = (Long) chargeOffReasonMap.get("glAccountId");
|
||||
final String glAccountName = (String) chargeOffReasonMap.get("glAccountName");
|
||||
final String glCode = (String) chargeOffReasonMap.get("glCode");
|
||||
final GLAccountData chargeOffExpenseAccount = new GLAccountData().setId(glAccountId).setName(glAccountName).setGlCode(glCode);
|
||||
final Integer chargeOffReasonId = (Integer) chargeOffReasonMap.get("chargeOffReasonId");
|
||||
final String codeValue = (String) chargeOffReasonMap.get("codeValue");
|
||||
final String codeDescription = (String) chargeOffReasonMap.get("codeDescription");
|
||||
final Integer orderPosition = (Integer) chargeOffReasonMap.get("orderPosition");
|
||||
final Integer isActive = (Integer) chargeOffReasonMap.get("isActive");
|
||||
final Integer isMandatory = (Integer) chargeOffReasonMap.get("isMandatory");
|
||||
final boolean active = isActive != null && isActive == 1;
|
||||
final boolean mandatory = isMandatory != null && isMandatory == 1;
|
||||
final CodeValueData chargeOffReasonsCodeValue = CodeValueData.builder().id(Long.valueOf(chargeOffReasonId)).name(codeValue)
|
||||
.description(codeDescription).position(orderPosition).active(active).mandatory(mandatory).build();
|
||||
|
||||
final ChargeOffReasonToGLAccountMapper chargeOffReasonToGLAccountMapper = new ChargeOffReasonToGLAccountMapper()
|
||||
.setChargeOffReasonsCodeValue(chargeOffReasonsCodeValue).setChargeOffExpenseAccount(chargeOffExpenseAccount);
|
||||
chargeOffReasonToGLAccountMappers.add(chargeOffReasonToGLAccountMapper);
|
||||
}
|
||||
return chargeOffReasonToGLAccountMappers;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map<String, Object> fetchAccountMappingDetailsForShareProduct(Long productId, Integer accountingType) {
|
||||
|
||||
@@ -388,6 +437,11 @@ public class ProductToGLAccountMappingReadPlatformServiceImpl implements Product
|
||||
return fetchChargeToIncomeAccountMappings(PortfolioProductType.SHARES, productId, false);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<ChargeOffReasonToGLAccountMapper> fetchChargeOffReasonMappingsForLoanProduct(Long loanProductId) {
|
||||
return fetchChargeOffReasonMappings(PortfolioProductType.LOAN, loanProductId);
|
||||
}
|
||||
|
||||
private Map<String, Object> setAccrualPeriodicSavingsProductToGLAccountMaps(
|
||||
final List<Map<String, Object>> listOfProductToGLAccountMaps) {
|
||||
final Map<String, Object> accountMappingDetails = new LinkedHashMap<>(8);
|
||||
|
||||
Reference in New Issue
Block a user