galovics commented on code in PR #2928: URL: https://github.com/apache/fineract/pull/2928#discussion_r1094718415
########## fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/jobs/updateloanarrearsageing/LoanArrearsAgeingUpdateHandler.java: ########## @@ -0,0 +1,202 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.fineract.portfolio.loanaccount.jobs.updateloanarrearsageing; + +import java.sql.Types; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.fineract.infrastructure.core.service.ThreadLocalContextUtil; +import org.apache.fineract.infrastructure.core.service.database.DatabaseSpecificSQLGenerator; +import org.apache.fineract.portfolio.loanaccount.loanschedule.data.LoanSchedulePeriodData; +import org.apache.fineract.portfolio.loanaccount.service.LoanArrearsAgingService; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Component; + +@Slf4j +@Component +@RequiredArgsConstructor +public class LoanArrearsAgeingUpdateHandler { + + private final JdbcTemplate jdbcTemplate; + private final DatabaseSpecificSQLGenerator sqlGenerator; + private final LoanArrearsAgingService loanArrearsAgingService; + + private void truncateLoanArrearsAgingDetails() { + jdbcTemplate.execute("truncate table m_loan_arrears_aging"); + } + + private void deleteLoanArrearsAgingDetails(List<Long> loanIds) { + // delete existing record for loan from m_loan_arrears_aging table + for (Long loanId : loanIds) { + jdbcTemplate.update("delete from m_loan_arrears_aging where loan_id=?", loanId); + } + } + + public void updateLoanArrearsAgeingDetailsForAllLoans() { + truncateLoanArrearsAgingDetails(); + String updateSQL = buildQueryForUpdateAgeingDetails(Boolean.TRUE); + List<String> insertStatements = updateLoanArrearsAgeingDetailsWithOriginalScheduleForAllLoans(); + insertStatements.add(0, updateSQL); + final int[] records = this.jdbcTemplate.batchUpdate(insertStatements.toArray(new String[0])); + int result = 0; + for (int record : records) { + result += record; + } + + log.debug("{}: Records affected by updateLoanArrearsAgeingDetails: {}", ThreadLocalContextUtil.getTenant().getName(), result); + } + + public void updateLoanArrearsAgeingDetails(List<Long> loanIdsForUpdate) { + + deleteLoanArrearsAgingDetails(loanIdsForUpdate); + String updateSQL = buildQueryForUpdateAgeingDetails(Boolean.FALSE); + List<Object[]> batch = new ArrayList<Object[]>(); + if (!loanIdsForUpdate.isEmpty()) { + for (Long loanId : loanIdsForUpdate) { + Object[] values = new Object[] { loanId }; + batch.add(values); + } + } + final int[] recordsUpdatedWithoutOriginalSchedule = this.jdbcTemplate.batchUpdate(updateSQL, batch); + int result = 0; + for (int recordWithoutOriginalSchedule : recordsUpdatedWithoutOriginalSchedule) { + result += recordWithoutOriginalSchedule; + } + List<String> insertStatements = updateLoanArrearsAgeingDetailsWithOriginalSchedule(loanIdsForUpdate); + if (!insertStatements.isEmpty()) { + final int[] recordsUpdatedWithOriginalSchedule = this.jdbcTemplate.batchUpdate(insertStatements.toArray(new String[0])); + for (int recordWithOriginalSchedule : recordsUpdatedWithOriginalSchedule) { + result += recordWithOriginalSchedule; + } + } + log.debug("{}: Records affected by updateLoanArrearsAgeingDetails: {}", ThreadLocalContextUtil.getTenant().getName(), result); + + } + + private String buildQueryForUpdateAgeingDetails(Boolean isForAllLoans) { + final StringBuilder updateSqlBuilder = new StringBuilder(900); + final String principalOverdueCalculationSql = "SUM(COALESCE(mr.principal_amount, 0) - coalesce(mr.principal_completed_derived, 0) - coalesce(mr.principal_writtenoff_derived, 0))"; + final String interestOverdueCalculationSql = "SUM(COALESCE(mr.interest_amount, 0) - coalesce(mr.interest_writtenoff_derived, 0) - coalesce(mr.interest_waived_derived, 0) - " + + "coalesce(mr.interest_completed_derived, 0))"; + final String feeChargesOverdueCalculationSql = "SUM(COALESCE(mr.fee_charges_amount, 0) - coalesce(mr.fee_charges_writtenoff_derived, 0) - " + + "coalesce(mr.fee_charges_waived_derived, 0) - coalesce(mr.fee_charges_completed_derived, 0))"; + final String penaltyChargesOverdueCalculationSql = "SUM(COALESCE(mr.penalty_charges_amount, 0) - coalesce(mr.penalty_charges_writtenoff_derived, 0) - " + + "coalesce(mr.penalty_charges_waived_derived, 0) - coalesce(mr.penalty_charges_completed_derived, 0))"; + + updateSqlBuilder.append( + "INSERT INTO m_loan_arrears_aging(loan_id,principal_overdue_derived,interest_overdue_derived,fee_charges_overdue_derived,penalty_charges_overdue_derived,total_overdue_derived,overdue_since_date_derived)"); + updateSqlBuilder.append("select ml.id as loanId,"); Review Comment: This is not an update query, can we rename it to insertSqlBuilder then? ########## fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/jobs/updateloanarrearsageing/LoanArrearsAgeingUpdateHandler.java: ########## @@ -0,0 +1,202 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.fineract.portfolio.loanaccount.jobs.updateloanarrearsageing; + +import java.sql.Types; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.fineract.infrastructure.core.service.ThreadLocalContextUtil; +import org.apache.fineract.infrastructure.core.service.database.DatabaseSpecificSQLGenerator; +import org.apache.fineract.portfolio.loanaccount.loanschedule.data.LoanSchedulePeriodData; +import org.apache.fineract.portfolio.loanaccount.service.LoanArrearsAgingService; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Component; + +@Slf4j +@Component +@RequiredArgsConstructor +public class LoanArrearsAgeingUpdateHandler { + + private final JdbcTemplate jdbcTemplate; + private final DatabaseSpecificSQLGenerator sqlGenerator; + private final LoanArrearsAgingService loanArrearsAgingService; + + private void truncateLoanArrearsAgingDetails() { + jdbcTemplate.execute("truncate table m_loan_arrears_aging"); + } + + private void deleteLoanArrearsAgingDetails(List<Long> loanIds) { + // delete existing record for loan from m_loan_arrears_aging table + for (Long loanId : loanIds) { + jdbcTemplate.update("delete from m_loan_arrears_aging where loan_id=?", loanId); + } + } + + public void updateLoanArrearsAgeingDetailsForAllLoans() { + truncateLoanArrearsAgingDetails(); + String updateSQL = buildQueryForUpdateAgeingDetails(Boolean.TRUE); + List<String> insertStatements = updateLoanArrearsAgeingDetailsWithOriginalScheduleForAllLoans(); + insertStatements.add(0, updateSQL); + final int[] records = this.jdbcTemplate.batchUpdate(insertStatements.toArray(new String[0])); + int result = 0; + for (int record : records) { + result += record; + } + + log.debug("{}: Records affected by updateLoanArrearsAgeingDetails: {}", ThreadLocalContextUtil.getTenant().getName(), result); + } + + public void updateLoanArrearsAgeingDetails(List<Long> loanIdsForUpdate) { + + deleteLoanArrearsAgingDetails(loanIdsForUpdate); + String updateSQL = buildQueryForUpdateAgeingDetails(Boolean.FALSE); + List<Object[]> batch = new ArrayList<Object[]>(); + if (!loanIdsForUpdate.isEmpty()) { + for (Long loanId : loanIdsForUpdate) { + Object[] values = new Object[] { loanId }; + batch.add(values); + } + } + final int[] recordsUpdatedWithoutOriginalSchedule = this.jdbcTemplate.batchUpdate(updateSQL, batch); + int result = 0; + for (int recordWithoutOriginalSchedule : recordsUpdatedWithoutOriginalSchedule) { + result += recordWithoutOriginalSchedule; + } + List<String> insertStatements = updateLoanArrearsAgeingDetailsWithOriginalSchedule(loanIdsForUpdate); + if (!insertStatements.isEmpty()) { + final int[] recordsUpdatedWithOriginalSchedule = this.jdbcTemplate.batchUpdate(insertStatements.toArray(new String[0])); + for (int recordWithOriginalSchedule : recordsUpdatedWithOriginalSchedule) { + result += recordWithOriginalSchedule; + } + } + log.debug("{}: Records affected by updateLoanArrearsAgeingDetails: {}", ThreadLocalContextUtil.getTenant().getName(), result); + + } + + private String buildQueryForUpdateAgeingDetails(Boolean isForAllLoans) { Review Comment: Method parameter should be primitive. ########## fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/jobs/updateloanarrearsageing/LoanArrearsAgeingUpdateHandler.java: ########## @@ -0,0 +1,202 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.fineract.portfolio.loanaccount.jobs.updateloanarrearsageing; + +import java.sql.Types; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.fineract.infrastructure.core.service.ThreadLocalContextUtil; +import org.apache.fineract.infrastructure.core.service.database.DatabaseSpecificSQLGenerator; +import org.apache.fineract.portfolio.loanaccount.loanschedule.data.LoanSchedulePeriodData; +import org.apache.fineract.portfolio.loanaccount.service.LoanArrearsAgingService; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Component; + +@Slf4j +@Component +@RequiredArgsConstructor +public class LoanArrearsAgeingUpdateHandler { + + private final JdbcTemplate jdbcTemplate; + private final DatabaseSpecificSQLGenerator sqlGenerator; + private final LoanArrearsAgingService loanArrearsAgingService; + + private void truncateLoanArrearsAgingDetails() { + jdbcTemplate.execute("truncate table m_loan_arrears_aging"); + } + + private void deleteLoanArrearsAgingDetails(List<Long> loanIds) { + // delete existing record for loan from m_loan_arrears_aging table + for (Long loanId : loanIds) { + jdbcTemplate.update("delete from m_loan_arrears_aging where loan_id=?", loanId); + } + } + + public void updateLoanArrearsAgeingDetailsForAllLoans() { + truncateLoanArrearsAgingDetails(); + String updateSQL = buildQueryForUpdateAgeingDetails(Boolean.TRUE); + List<String> insertStatements = updateLoanArrearsAgeingDetailsWithOriginalScheduleForAllLoans(); + insertStatements.add(0, updateSQL); + final int[] records = this.jdbcTemplate.batchUpdate(insertStatements.toArray(new String[0])); + int result = 0; Review Comment: Can we only do this calculation only if debug logging is enabled? I mean the calculation itself is only needed to log the result. ########## fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/jobs/updateloanarrearsageing/LoanArrearsAgeingUpdateHandler.java: ########## @@ -0,0 +1,202 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.fineract.portfolio.loanaccount.jobs.updateloanarrearsageing; + +import java.sql.Types; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.fineract.infrastructure.core.service.ThreadLocalContextUtil; +import org.apache.fineract.infrastructure.core.service.database.DatabaseSpecificSQLGenerator; +import org.apache.fineract.portfolio.loanaccount.loanschedule.data.LoanSchedulePeriodData; +import org.apache.fineract.portfolio.loanaccount.service.LoanArrearsAgingService; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Component; + +@Slf4j +@Component +@RequiredArgsConstructor +public class LoanArrearsAgeingUpdateHandler { + + private final JdbcTemplate jdbcTemplate; + private final DatabaseSpecificSQLGenerator sqlGenerator; + private final LoanArrearsAgingService loanArrearsAgingService; + + private void truncateLoanArrearsAgingDetails() { + jdbcTemplate.execute("truncate table m_loan_arrears_aging"); + } + + private void deleteLoanArrearsAgingDetails(List<Long> loanIds) { + // delete existing record for loan from m_loan_arrears_aging table + for (Long loanId : loanIds) { + jdbcTemplate.update("delete from m_loan_arrears_aging where loan_id=?", loanId); + } + } + + public void updateLoanArrearsAgeingDetailsForAllLoans() { + truncateLoanArrearsAgingDetails(); + String updateSQL = buildQueryForUpdateAgeingDetails(Boolean.TRUE); + List<String> insertStatements = updateLoanArrearsAgeingDetailsWithOriginalScheduleForAllLoans(); + insertStatements.add(0, updateSQL); + final int[] records = this.jdbcTemplate.batchUpdate(insertStatements.toArray(new String[0])); + int result = 0; + for (int record : records) { + result += record; + } + + log.debug("{}: Records affected by updateLoanArrearsAgeingDetails: {}", ThreadLocalContextUtil.getTenant().getName(), result); + } + + public void updateLoanArrearsAgeingDetails(List<Long> loanIdsForUpdate) { + + deleteLoanArrearsAgingDetails(loanIdsForUpdate); + String updateSQL = buildQueryForUpdateAgeingDetails(Boolean.FALSE); + List<Object[]> batch = new ArrayList<Object[]>(); + if (!loanIdsForUpdate.isEmpty()) { + for (Long loanId : loanIdsForUpdate) { + Object[] values = new Object[] { loanId }; + batch.add(values); + } + } + final int[] recordsUpdatedWithoutOriginalSchedule = this.jdbcTemplate.batchUpdate(updateSQL, batch); + int result = 0; + for (int recordWithoutOriginalSchedule : recordsUpdatedWithoutOriginalSchedule) { + result += recordWithoutOriginalSchedule; + } + List<String> insertStatements = updateLoanArrearsAgeingDetailsWithOriginalSchedule(loanIdsForUpdate); + if (!insertStatements.isEmpty()) { + final int[] recordsUpdatedWithOriginalSchedule = this.jdbcTemplate.batchUpdate(insertStatements.toArray(new String[0])); + for (int recordWithOriginalSchedule : recordsUpdatedWithOriginalSchedule) { + result += recordWithOriginalSchedule; + } + } + log.debug("{}: Records affected by updateLoanArrearsAgeingDetails: {}", ThreadLocalContextUtil.getTenant().getName(), result); + + } + + private String buildQueryForUpdateAgeingDetails(Boolean isForAllLoans) { + final StringBuilder updateSqlBuilder = new StringBuilder(900); + final String principalOverdueCalculationSql = "SUM(COALESCE(mr.principal_amount, 0) - coalesce(mr.principal_completed_derived, 0) - coalesce(mr.principal_writtenoff_derived, 0))"; + final String interestOverdueCalculationSql = "SUM(COALESCE(mr.interest_amount, 0) - coalesce(mr.interest_writtenoff_derived, 0) - coalesce(mr.interest_waived_derived, 0) - " + + "coalesce(mr.interest_completed_derived, 0))"; + final String feeChargesOverdueCalculationSql = "SUM(COALESCE(mr.fee_charges_amount, 0) - coalesce(mr.fee_charges_writtenoff_derived, 0) - " + + "coalesce(mr.fee_charges_waived_derived, 0) - coalesce(mr.fee_charges_completed_derived, 0))"; + final String penaltyChargesOverdueCalculationSql = "SUM(COALESCE(mr.penalty_charges_amount, 0) - coalesce(mr.penalty_charges_writtenoff_derived, 0) - " + + "coalesce(mr.penalty_charges_waived_derived, 0) - coalesce(mr.penalty_charges_completed_derived, 0))"; + + updateSqlBuilder.append( + "INSERT INTO m_loan_arrears_aging(loan_id,principal_overdue_derived,interest_overdue_derived,fee_charges_overdue_derived,penalty_charges_overdue_derived,total_overdue_derived,overdue_since_date_derived)"); + updateSqlBuilder.append("select ml.id as loanId,"); + updateSqlBuilder.append(principalOverdueCalculationSql + " as principal_overdue_derived,"); + updateSqlBuilder.append(interestOverdueCalculationSql + " as interest_overdue_derived,"); + updateSqlBuilder.append(feeChargesOverdueCalculationSql + " as fee_charges_overdue_derived,"); + updateSqlBuilder.append(penaltyChargesOverdueCalculationSql + " as penalty_charges_overdue_derived,"); + updateSqlBuilder.append(principalOverdueCalculationSql + "+" + interestOverdueCalculationSql + "+"); + updateSqlBuilder.append(feeChargesOverdueCalculationSql + "+" + penaltyChargesOverdueCalculationSql + " as total_overdue_derived,"); + updateSqlBuilder.append("MIN(mr.duedate) as overdue_since_date_derived "); + updateSqlBuilder.append(" FROM m_loan ml "); + updateSqlBuilder.append(" INNER JOIN m_loan_repayment_schedule mr on mr.loan_id = ml.id "); + updateSqlBuilder.append(" left join m_product_loan_recalculation_details prd on prd.product_id = ml.product_id "); + updateSqlBuilder.append(" WHERE ml.loan_status_id = 300 ");// active + if (!isForAllLoans) { + updateSqlBuilder.append(" and ml.id IN (?)"); + } + updateSqlBuilder.append(" and mr.completed_derived is false "); + updateSqlBuilder.append(" and mr.duedate < ") + .append(sqlGenerator.subDate(sqlGenerator.currentBusinessDate(), "COALESCE(ml.grace_on_arrears_ageing, 0)", "day")) + .append(" "); + updateSqlBuilder.append(" and (prd.arrears_based_on_original_schedule = false or prd.arrears_based_on_original_schedule is null) "); + updateSqlBuilder.append(" GROUP BY ml.id"); + return updateSqlBuilder.toString(); + } + + private List<String> updateLoanArrearsAgeingDetailsWithOriginalSchedule(List<Long> loanIdsForUpdate) { + List<String> insertStatement = new ArrayList<>(); + String sqlForLoanIdentifiers = buildQueryForLoanIdentifiersWithOriginalSchedule(Boolean.FALSE); + List<Object> loanIdsForQuery = new ArrayList<>(); + for (Long loanId : loanIdsForUpdate) { + loanIdsForQuery.add(loanId); + } + List<Long> loanIds = this.jdbcTemplate.queryForList(sqlForLoanIdentifiers, loanIdsForQuery.toArray(), new int[] { Types.BIGINT }, + Long.class); + if (!loanIds.isEmpty()) { + String loanIdsAsString = loanIds.toString(); + loanIdsAsString = loanIdsAsString.substring(1, loanIdsAsString.length() - 1); + Map<Long, List<LoanSchedulePeriodData>> scheduleDate = loanArrearsAgingService.getScheduleDate(loanIdsAsString); + + List<Map<String, Object>> loanSummary = getLoanSummary(loanIdsAsString); + loanArrearsAgingService.updateScheduleWithPaidDetail(scheduleDate, loanSummary); + loanArrearsAgingService.createInsertStatements(insertStatement, scheduleDate, true); + } + + return insertStatement; + } + + private List<String> updateLoanArrearsAgeingDetailsWithOriginalScheduleForAllLoans() { + List<String> insertStatement = new ArrayList<>(); + String sqlForLoanIdentifiers = buildQueryForLoanIdentifiersWithOriginalSchedule(Boolean.TRUE); + List<Long> loanIds = this.jdbcTemplate.queryForList(sqlForLoanIdentifiers, Long.class); + if (!loanIds.isEmpty()) { + String loanIdsAsString = loanIds.toString(); Review Comment: Same as above. ########## fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/jobs/updateloanarrearsageing/LoanArrearsAgeingUpdateHandler.java: ########## @@ -0,0 +1,202 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.fineract.portfolio.loanaccount.jobs.updateloanarrearsageing; + +import java.sql.Types; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.fineract.infrastructure.core.service.ThreadLocalContextUtil; +import org.apache.fineract.infrastructure.core.service.database.DatabaseSpecificSQLGenerator; +import org.apache.fineract.portfolio.loanaccount.loanschedule.data.LoanSchedulePeriodData; +import org.apache.fineract.portfolio.loanaccount.service.LoanArrearsAgingService; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Component; + +@Slf4j +@Component +@RequiredArgsConstructor +public class LoanArrearsAgeingUpdateHandler { + + private final JdbcTemplate jdbcTemplate; + private final DatabaseSpecificSQLGenerator sqlGenerator; + private final LoanArrearsAgingService loanArrearsAgingService; + + private void truncateLoanArrearsAgingDetails() { + jdbcTemplate.execute("truncate table m_loan_arrears_aging"); + } + + private void deleteLoanArrearsAgingDetails(List<Long> loanIds) { + // delete existing record for loan from m_loan_arrears_aging table + for (Long loanId : loanIds) { + jdbcTemplate.update("delete from m_loan_arrears_aging where loan_id=?", loanId); + } + } + + public void updateLoanArrearsAgeingDetailsForAllLoans() { + truncateLoanArrearsAgingDetails(); + String updateSQL = buildQueryForUpdateAgeingDetails(Boolean.TRUE); + List<String> insertStatements = updateLoanArrearsAgeingDetailsWithOriginalScheduleForAllLoans(); + insertStatements.add(0, updateSQL); + final int[] records = this.jdbcTemplate.batchUpdate(insertStatements.toArray(new String[0])); + int result = 0; + for (int record : records) { + result += record; + } + + log.debug("{}: Records affected by updateLoanArrearsAgeingDetails: {}", ThreadLocalContextUtil.getTenant().getName(), result); + } + + public void updateLoanArrearsAgeingDetails(List<Long> loanIdsForUpdate) { + + deleteLoanArrearsAgingDetails(loanIdsForUpdate); + String updateSQL = buildQueryForUpdateAgeingDetails(Boolean.FALSE); + List<Object[]> batch = new ArrayList<Object[]>(); + if (!loanIdsForUpdate.isEmpty()) { + for (Long loanId : loanIdsForUpdate) { + Object[] values = new Object[] { loanId }; + batch.add(values); + } + } + final int[] recordsUpdatedWithoutOriginalSchedule = this.jdbcTemplate.batchUpdate(updateSQL, batch); + int result = 0; + for (int recordWithoutOriginalSchedule : recordsUpdatedWithoutOriginalSchedule) { + result += recordWithoutOriginalSchedule; + } + List<String> insertStatements = updateLoanArrearsAgeingDetailsWithOriginalSchedule(loanIdsForUpdate); + if (!insertStatements.isEmpty()) { + final int[] recordsUpdatedWithOriginalSchedule = this.jdbcTemplate.batchUpdate(insertStatements.toArray(new String[0])); + for (int recordWithOriginalSchedule : recordsUpdatedWithOriginalSchedule) { + result += recordWithOriginalSchedule; + } + } + log.debug("{}: Records affected by updateLoanArrearsAgeingDetails: {}", ThreadLocalContextUtil.getTenant().getName(), result); + + } + + private String buildQueryForUpdateAgeingDetails(Boolean isForAllLoans) { Review Comment: Method name, not about update but insert. ########## fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/jobs/updateloanarrearsageing/LoanArrearsAgeingUpdateHandler.java: ########## @@ -0,0 +1,202 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.fineract.portfolio.loanaccount.jobs.updateloanarrearsageing; + +import java.sql.Types; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.fineract.infrastructure.core.service.ThreadLocalContextUtil; +import org.apache.fineract.infrastructure.core.service.database.DatabaseSpecificSQLGenerator; +import org.apache.fineract.portfolio.loanaccount.loanschedule.data.LoanSchedulePeriodData; +import org.apache.fineract.portfolio.loanaccount.service.LoanArrearsAgingService; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Component; + +@Slf4j +@Component +@RequiredArgsConstructor +public class LoanArrearsAgeingUpdateHandler { + + private final JdbcTemplate jdbcTemplate; + private final DatabaseSpecificSQLGenerator sqlGenerator; + private final LoanArrearsAgingService loanArrearsAgingService; + + private void truncateLoanArrearsAgingDetails() { + jdbcTemplate.execute("truncate table m_loan_arrears_aging"); + } + + private void deleteLoanArrearsAgingDetails(List<Long> loanIds) { + // delete existing record for loan from m_loan_arrears_aging table + for (Long loanId : loanIds) { + jdbcTemplate.update("delete from m_loan_arrears_aging where loan_id=?", loanId); + } + } + + public void updateLoanArrearsAgeingDetailsForAllLoans() { + truncateLoanArrearsAgingDetails(); + String updateSQL = buildQueryForUpdateAgeingDetails(Boolean.TRUE); + List<String> insertStatements = updateLoanArrearsAgeingDetailsWithOriginalScheduleForAllLoans(); + insertStatements.add(0, updateSQL); + final int[] records = this.jdbcTemplate.batchUpdate(insertStatements.toArray(new String[0])); + int result = 0; + for (int record : records) { + result += record; + } + + log.debug("{}: Records affected by updateLoanArrearsAgeingDetails: {}", ThreadLocalContextUtil.getTenant().getName(), result); + } + + public void updateLoanArrearsAgeingDetails(List<Long> loanIdsForUpdate) { + + deleteLoanArrearsAgingDetails(loanIdsForUpdate); + String updateSQL = buildQueryForUpdateAgeingDetails(Boolean.FALSE); + List<Object[]> batch = new ArrayList<Object[]>(); + if (!loanIdsForUpdate.isEmpty()) { + for (Long loanId : loanIdsForUpdate) { + Object[] values = new Object[] { loanId }; + batch.add(values); + } + } + final int[] recordsUpdatedWithoutOriginalSchedule = this.jdbcTemplate.batchUpdate(updateSQL, batch); + int result = 0; + for (int recordWithoutOriginalSchedule : recordsUpdatedWithoutOriginalSchedule) { + result += recordWithoutOriginalSchedule; + } + List<String> insertStatements = updateLoanArrearsAgeingDetailsWithOriginalSchedule(loanIdsForUpdate); + if (!insertStatements.isEmpty()) { + final int[] recordsUpdatedWithOriginalSchedule = this.jdbcTemplate.batchUpdate(insertStatements.toArray(new String[0])); + for (int recordWithOriginalSchedule : recordsUpdatedWithOriginalSchedule) { + result += recordWithOriginalSchedule; + } + } + log.debug("{}: Records affected by updateLoanArrearsAgeingDetails: {}", ThreadLocalContextUtil.getTenant().getName(), result); + + } + + private String buildQueryForUpdateAgeingDetails(Boolean isForAllLoans) { + final StringBuilder updateSqlBuilder = new StringBuilder(900); + final String principalOverdueCalculationSql = "SUM(COALESCE(mr.principal_amount, 0) - coalesce(mr.principal_completed_derived, 0) - coalesce(mr.principal_writtenoff_derived, 0))"; + final String interestOverdueCalculationSql = "SUM(COALESCE(mr.interest_amount, 0) - coalesce(mr.interest_writtenoff_derived, 0) - coalesce(mr.interest_waived_derived, 0) - " + + "coalesce(mr.interest_completed_derived, 0))"; + final String feeChargesOverdueCalculationSql = "SUM(COALESCE(mr.fee_charges_amount, 0) - coalesce(mr.fee_charges_writtenoff_derived, 0) - " + + "coalesce(mr.fee_charges_waived_derived, 0) - coalesce(mr.fee_charges_completed_derived, 0))"; + final String penaltyChargesOverdueCalculationSql = "SUM(COALESCE(mr.penalty_charges_amount, 0) - coalesce(mr.penalty_charges_writtenoff_derived, 0) - " + + "coalesce(mr.penalty_charges_waived_derived, 0) - coalesce(mr.penalty_charges_completed_derived, 0))"; + + updateSqlBuilder.append( + "INSERT INTO m_loan_arrears_aging(loan_id,principal_overdue_derived,interest_overdue_derived,fee_charges_overdue_derived,penalty_charges_overdue_derived,total_overdue_derived,overdue_since_date_derived)"); + updateSqlBuilder.append("select ml.id as loanId,"); + updateSqlBuilder.append(principalOverdueCalculationSql + " as principal_overdue_derived,"); + updateSqlBuilder.append(interestOverdueCalculationSql + " as interest_overdue_derived,"); + updateSqlBuilder.append(feeChargesOverdueCalculationSql + " as fee_charges_overdue_derived,"); + updateSqlBuilder.append(penaltyChargesOverdueCalculationSql + " as penalty_charges_overdue_derived,"); + updateSqlBuilder.append(principalOverdueCalculationSql + "+" + interestOverdueCalculationSql + "+"); + updateSqlBuilder.append(feeChargesOverdueCalculationSql + "+" + penaltyChargesOverdueCalculationSql + " as total_overdue_derived,"); + updateSqlBuilder.append("MIN(mr.duedate) as overdue_since_date_derived "); + updateSqlBuilder.append(" FROM m_loan ml "); + updateSqlBuilder.append(" INNER JOIN m_loan_repayment_schedule mr on mr.loan_id = ml.id "); + updateSqlBuilder.append(" left join m_product_loan_recalculation_details prd on prd.product_id = ml.product_id "); + updateSqlBuilder.append(" WHERE ml.loan_status_id = 300 ");// active + if (!isForAllLoans) { + updateSqlBuilder.append(" and ml.id IN (?)"); + } + updateSqlBuilder.append(" and mr.completed_derived is false "); + updateSqlBuilder.append(" and mr.duedate < ") + .append(sqlGenerator.subDate(sqlGenerator.currentBusinessDate(), "COALESCE(ml.grace_on_arrears_ageing, 0)", "day")) + .append(" "); + updateSqlBuilder.append(" and (prd.arrears_based_on_original_schedule = false or prd.arrears_based_on_original_schedule is null) "); + updateSqlBuilder.append(" GROUP BY ml.id"); + return updateSqlBuilder.toString(); + } + + private List<String> updateLoanArrearsAgeingDetailsWithOriginalSchedule(List<Long> loanIdsForUpdate) { + List<String> insertStatement = new ArrayList<>(); + String sqlForLoanIdentifiers = buildQueryForLoanIdentifiersWithOriginalSchedule(Boolean.FALSE); + List<Object> loanIdsForQuery = new ArrayList<>(); + for (Long loanId : loanIdsForUpdate) { + loanIdsForQuery.add(loanId); + } + List<Long> loanIds = this.jdbcTemplate.queryForList(sqlForLoanIdentifiers, loanIdsForQuery.toArray(), new int[] { Types.BIGINT }, + Long.class); + if (!loanIds.isEmpty()) { + String loanIdsAsString = loanIds.toString(); Review Comment: This definitely is not going to fly with me. Calling the toString on the List and then cutting it off to be appended to the SQL string, that's purely wrong. Use parameterized queries with proper types. ########## fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/jobs/updateloanarrearsageing/LoanArrearsAgeingUpdateHandler.java: ########## @@ -0,0 +1,202 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.fineract.portfolio.loanaccount.jobs.updateloanarrearsageing; + +import java.sql.Types; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.fineract.infrastructure.core.service.ThreadLocalContextUtil; +import org.apache.fineract.infrastructure.core.service.database.DatabaseSpecificSQLGenerator; +import org.apache.fineract.portfolio.loanaccount.loanschedule.data.LoanSchedulePeriodData; +import org.apache.fineract.portfolio.loanaccount.service.LoanArrearsAgingService; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Component; + +@Slf4j +@Component +@RequiredArgsConstructor +public class LoanArrearsAgeingUpdateHandler { + + private final JdbcTemplate jdbcTemplate; + private final DatabaseSpecificSQLGenerator sqlGenerator; + private final LoanArrearsAgingService loanArrearsAgingService; + + private void truncateLoanArrearsAgingDetails() { + jdbcTemplate.execute("truncate table m_loan_arrears_aging"); + } + + private void deleteLoanArrearsAgingDetails(List<Long> loanIds) { + // delete existing record for loan from m_loan_arrears_aging table + for (Long loanId : loanIds) { + jdbcTemplate.update("delete from m_loan_arrears_aging where loan_id=?", loanId); + } + } + + public void updateLoanArrearsAgeingDetailsForAllLoans() { + truncateLoanArrearsAgingDetails(); + String updateSQL = buildQueryForUpdateAgeingDetails(Boolean.TRUE); + List<String> insertStatements = updateLoanArrearsAgeingDetailsWithOriginalScheduleForAllLoans(); + insertStatements.add(0, updateSQL); + final int[] records = this.jdbcTemplate.batchUpdate(insertStatements.toArray(new String[0])); + int result = 0; + for (int record : records) { + result += record; + } + + log.debug("{}: Records affected by updateLoanArrearsAgeingDetails: {}", ThreadLocalContextUtil.getTenant().getName(), result); + } + + public void updateLoanArrearsAgeingDetails(List<Long> loanIdsForUpdate) { + + deleteLoanArrearsAgingDetails(loanIdsForUpdate); + String updateSQL = buildQueryForUpdateAgeingDetails(Boolean.FALSE); + List<Object[]> batch = new ArrayList<Object[]>(); + if (!loanIdsForUpdate.isEmpty()) { + for (Long loanId : loanIdsForUpdate) { + Object[] values = new Object[] { loanId }; + batch.add(values); + } + } + final int[] recordsUpdatedWithoutOriginalSchedule = this.jdbcTemplate.batchUpdate(updateSQL, batch); + int result = 0; + for (int recordWithoutOriginalSchedule : recordsUpdatedWithoutOriginalSchedule) { + result += recordWithoutOriginalSchedule; + } + List<String> insertStatements = updateLoanArrearsAgeingDetailsWithOriginalSchedule(loanIdsForUpdate); + if (!insertStatements.isEmpty()) { + final int[] recordsUpdatedWithOriginalSchedule = this.jdbcTemplate.batchUpdate(insertStatements.toArray(new String[0])); + for (int recordWithOriginalSchedule : recordsUpdatedWithOriginalSchedule) { + result += recordWithOriginalSchedule; + } + } + log.debug("{}: Records affected by updateLoanArrearsAgeingDetails: {}", ThreadLocalContextUtil.getTenant().getName(), result); Review Comment: Same thing as above. ########## fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/jobs/updateloanarrearsageing/LoanArrearsAgeingUpdateHandler.java: ########## @@ -0,0 +1,202 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.fineract.portfolio.loanaccount.jobs.updateloanarrearsageing; + +import java.sql.Types; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.fineract.infrastructure.core.service.ThreadLocalContextUtil; +import org.apache.fineract.infrastructure.core.service.database.DatabaseSpecificSQLGenerator; +import org.apache.fineract.portfolio.loanaccount.loanschedule.data.LoanSchedulePeriodData; +import org.apache.fineract.portfolio.loanaccount.service.LoanArrearsAgingService; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Component; + +@Slf4j +@Component +@RequiredArgsConstructor +public class LoanArrearsAgeingUpdateHandler { + + private final JdbcTemplate jdbcTemplate; + private final DatabaseSpecificSQLGenerator sqlGenerator; + private final LoanArrearsAgingService loanArrearsAgingService; + + private void truncateLoanArrearsAgingDetails() { + jdbcTemplate.execute("truncate table m_loan_arrears_aging"); + } + + private void deleteLoanArrearsAgingDetails(List<Long> loanIds) { + // delete existing record for loan from m_loan_arrears_aging table + for (Long loanId : loanIds) { + jdbcTemplate.update("delete from m_loan_arrears_aging where loan_id=?", loanId); + } + } + + public void updateLoanArrearsAgeingDetailsForAllLoans() { + truncateLoanArrearsAgingDetails(); + String updateSQL = buildQueryForUpdateAgeingDetails(Boolean.TRUE); + List<String> insertStatements = updateLoanArrearsAgeingDetailsWithOriginalScheduleForAllLoans(); + insertStatements.add(0, updateSQL); + final int[] records = this.jdbcTemplate.batchUpdate(insertStatements.toArray(new String[0])); + int result = 0; + for (int record : records) { + result += record; + } + + log.debug("{}: Records affected by updateLoanArrearsAgeingDetails: {}", ThreadLocalContextUtil.getTenant().getName(), result); + } + + public void updateLoanArrearsAgeingDetails(List<Long> loanIdsForUpdate) { + + deleteLoanArrearsAgingDetails(loanIdsForUpdate); + String updateSQL = buildQueryForUpdateAgeingDetails(Boolean.FALSE); + List<Object[]> batch = new ArrayList<Object[]>(); + if (!loanIdsForUpdate.isEmpty()) { + for (Long loanId : loanIdsForUpdate) { + Object[] values = new Object[] { loanId }; + batch.add(values); + } + } + final int[] recordsUpdatedWithoutOriginalSchedule = this.jdbcTemplate.batchUpdate(updateSQL, batch); + int result = 0; + for (int recordWithoutOriginalSchedule : recordsUpdatedWithoutOriginalSchedule) { + result += recordWithoutOriginalSchedule; + } + List<String> insertStatements = updateLoanArrearsAgeingDetailsWithOriginalSchedule(loanIdsForUpdate); + if (!insertStatements.isEmpty()) { + final int[] recordsUpdatedWithOriginalSchedule = this.jdbcTemplate.batchUpdate(insertStatements.toArray(new String[0])); + for (int recordWithOriginalSchedule : recordsUpdatedWithOriginalSchedule) { + result += recordWithOriginalSchedule; + } + } + log.debug("{}: Records affected by updateLoanArrearsAgeingDetails: {}", ThreadLocalContextUtil.getTenant().getName(), result); + + } + + private String buildQueryForUpdateAgeingDetails(Boolean isForAllLoans) { + final StringBuilder updateSqlBuilder = new StringBuilder(900); + final String principalOverdueCalculationSql = "SUM(COALESCE(mr.principal_amount, 0) - coalesce(mr.principal_completed_derived, 0) - coalesce(mr.principal_writtenoff_derived, 0))"; + final String interestOverdueCalculationSql = "SUM(COALESCE(mr.interest_amount, 0) - coalesce(mr.interest_writtenoff_derived, 0) - coalesce(mr.interest_waived_derived, 0) - " + + "coalesce(mr.interest_completed_derived, 0))"; + final String feeChargesOverdueCalculationSql = "SUM(COALESCE(mr.fee_charges_amount, 0) - coalesce(mr.fee_charges_writtenoff_derived, 0) - " + + "coalesce(mr.fee_charges_waived_derived, 0) - coalesce(mr.fee_charges_completed_derived, 0))"; + final String penaltyChargesOverdueCalculationSql = "SUM(COALESCE(mr.penalty_charges_amount, 0) - coalesce(mr.penalty_charges_writtenoff_derived, 0) - " + + "coalesce(mr.penalty_charges_waived_derived, 0) - coalesce(mr.penalty_charges_completed_derived, 0))"; + + updateSqlBuilder.append( + "INSERT INTO m_loan_arrears_aging(loan_id,principal_overdue_derived,interest_overdue_derived,fee_charges_overdue_derived,penalty_charges_overdue_derived,total_overdue_derived,overdue_since_date_derived)"); + updateSqlBuilder.append("select ml.id as loanId,"); + updateSqlBuilder.append(principalOverdueCalculationSql + " as principal_overdue_derived,"); + updateSqlBuilder.append(interestOverdueCalculationSql + " as interest_overdue_derived,"); + updateSqlBuilder.append(feeChargesOverdueCalculationSql + " as fee_charges_overdue_derived,"); + updateSqlBuilder.append(penaltyChargesOverdueCalculationSql + " as penalty_charges_overdue_derived,"); + updateSqlBuilder.append(principalOverdueCalculationSql + "+" + interestOverdueCalculationSql + "+"); + updateSqlBuilder.append(feeChargesOverdueCalculationSql + "+" + penaltyChargesOverdueCalculationSql + " as total_overdue_derived,"); + updateSqlBuilder.append("MIN(mr.duedate) as overdue_since_date_derived "); + updateSqlBuilder.append(" FROM m_loan ml "); + updateSqlBuilder.append(" INNER JOIN m_loan_repayment_schedule mr on mr.loan_id = ml.id "); + updateSqlBuilder.append(" left join m_product_loan_recalculation_details prd on prd.product_id = ml.product_id "); + updateSqlBuilder.append(" WHERE ml.loan_status_id = 300 ");// active + if (!isForAllLoans) { + updateSqlBuilder.append(" and ml.id IN (?)"); + } + updateSqlBuilder.append(" and mr.completed_derived is false "); + updateSqlBuilder.append(" and mr.duedate < ") + .append(sqlGenerator.subDate(sqlGenerator.currentBusinessDate(), "COALESCE(ml.grace_on_arrears_ageing, 0)", "day")) + .append(" "); + updateSqlBuilder.append(" and (prd.arrears_based_on_original_schedule = false or prd.arrears_based_on_original_schedule is null) "); + updateSqlBuilder.append(" GROUP BY ml.id"); + return updateSqlBuilder.toString(); Review Comment: No need to call toString(). ########## fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/jobs/updateloanarrearsageing/LoanArrearsAgeingUpdateHandler.java: ########## @@ -0,0 +1,202 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.fineract.portfolio.loanaccount.jobs.updateloanarrearsageing; + +import java.sql.Types; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.fineract.infrastructure.core.service.ThreadLocalContextUtil; +import org.apache.fineract.infrastructure.core.service.database.DatabaseSpecificSQLGenerator; +import org.apache.fineract.portfolio.loanaccount.loanschedule.data.LoanSchedulePeriodData; +import org.apache.fineract.portfolio.loanaccount.service.LoanArrearsAgingService; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Component; + +@Slf4j +@Component +@RequiredArgsConstructor +public class LoanArrearsAgeingUpdateHandler { + + private final JdbcTemplate jdbcTemplate; + private final DatabaseSpecificSQLGenerator sqlGenerator; + private final LoanArrearsAgingService loanArrearsAgingService; + + private void truncateLoanArrearsAgingDetails() { + jdbcTemplate.execute("truncate table m_loan_arrears_aging"); + } + + private void deleteLoanArrearsAgingDetails(List<Long> loanIds) { + // delete existing record for loan from m_loan_arrears_aging table + for (Long loanId : loanIds) { + jdbcTemplate.update("delete from m_loan_arrears_aging where loan_id=?", loanId); + } + } + + public void updateLoanArrearsAgeingDetailsForAllLoans() { + truncateLoanArrearsAgingDetails(); + String updateSQL = buildQueryForUpdateAgeingDetails(Boolean.TRUE); + List<String> insertStatements = updateLoanArrearsAgeingDetailsWithOriginalScheduleForAllLoans(); + insertStatements.add(0, updateSQL); + final int[] records = this.jdbcTemplate.batchUpdate(insertStatements.toArray(new String[0])); + int result = 0; + for (int record : records) { + result += record; + } + + log.debug("{}: Records affected by updateLoanArrearsAgeingDetails: {}", ThreadLocalContextUtil.getTenant().getName(), result); Review Comment: Let's remove the tenant parameter from this log message. If we wanna have the tenant in the log, let's adjust the generic logback.xml to always have the tenant. ########## fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/jobs/updateloanarrearsageing/LoanArrearsAgeingUpdateHandler.java: ########## @@ -0,0 +1,202 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.fineract.portfolio.loanaccount.jobs.updateloanarrearsageing; + +import java.sql.Types; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.fineract.infrastructure.core.service.ThreadLocalContextUtil; +import org.apache.fineract.infrastructure.core.service.database.DatabaseSpecificSQLGenerator; +import org.apache.fineract.portfolio.loanaccount.loanschedule.data.LoanSchedulePeriodData; +import org.apache.fineract.portfolio.loanaccount.service.LoanArrearsAgingService; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Component; + +@Slf4j +@Component +@RequiredArgsConstructor +public class LoanArrearsAgeingUpdateHandler { + + private final JdbcTemplate jdbcTemplate; + private final DatabaseSpecificSQLGenerator sqlGenerator; + private final LoanArrearsAgingService loanArrearsAgingService; + + private void truncateLoanArrearsAgingDetails() { + jdbcTemplate.execute("truncate table m_loan_arrears_aging"); + } + + private void deleteLoanArrearsAgingDetails(List<Long> loanIds) { + // delete existing record for loan from m_loan_arrears_aging table + for (Long loanId : loanIds) { + jdbcTemplate.update("delete from m_loan_arrears_aging where loan_id=?", loanId); + } + } + + public void updateLoanArrearsAgeingDetailsForAllLoans() { + truncateLoanArrearsAgingDetails(); + String updateSQL = buildQueryForUpdateAgeingDetails(Boolean.TRUE); + List<String> insertStatements = updateLoanArrearsAgeingDetailsWithOriginalScheduleForAllLoans(); + insertStatements.add(0, updateSQL); + final int[] records = this.jdbcTemplate.batchUpdate(insertStatements.toArray(new String[0])); + int result = 0; + for (int record : records) { + result += record; + } + + log.debug("{}: Records affected by updateLoanArrearsAgeingDetails: {}", ThreadLocalContextUtil.getTenant().getName(), result); + } + + public void updateLoanArrearsAgeingDetails(List<Long> loanIdsForUpdate) { + + deleteLoanArrearsAgingDetails(loanIdsForUpdate); + String updateSQL = buildQueryForUpdateAgeingDetails(Boolean.FALSE); + List<Object[]> batch = new ArrayList<Object[]>(); + if (!loanIdsForUpdate.isEmpty()) { + for (Long loanId : loanIdsForUpdate) { + Object[] values = new Object[] { loanId }; + batch.add(values); + } + } + final int[] recordsUpdatedWithoutOriginalSchedule = this.jdbcTemplate.batchUpdate(updateSQL, batch); + int result = 0; + for (int recordWithoutOriginalSchedule : recordsUpdatedWithoutOriginalSchedule) { + result += recordWithoutOriginalSchedule; + } + List<String> insertStatements = updateLoanArrearsAgeingDetailsWithOriginalSchedule(loanIdsForUpdate); + if (!insertStatements.isEmpty()) { + final int[] recordsUpdatedWithOriginalSchedule = this.jdbcTemplate.batchUpdate(insertStatements.toArray(new String[0])); + for (int recordWithOriginalSchedule : recordsUpdatedWithOriginalSchedule) { + result += recordWithOriginalSchedule; + } + } + log.debug("{}: Records affected by updateLoanArrearsAgeingDetails: {}", ThreadLocalContextUtil.getTenant().getName(), result); + + } + + private String buildQueryForUpdateAgeingDetails(Boolean isForAllLoans) { + final StringBuilder updateSqlBuilder = new StringBuilder(900); + final String principalOverdueCalculationSql = "SUM(COALESCE(mr.principal_amount, 0) - coalesce(mr.principal_completed_derived, 0) - coalesce(mr.principal_writtenoff_derived, 0))"; + final String interestOverdueCalculationSql = "SUM(COALESCE(mr.interest_amount, 0) - coalesce(mr.interest_writtenoff_derived, 0) - coalesce(mr.interest_waived_derived, 0) - " + + "coalesce(mr.interest_completed_derived, 0))"; + final String feeChargesOverdueCalculationSql = "SUM(COALESCE(mr.fee_charges_amount, 0) - coalesce(mr.fee_charges_writtenoff_derived, 0) - " + + "coalesce(mr.fee_charges_waived_derived, 0) - coalesce(mr.fee_charges_completed_derived, 0))"; + final String penaltyChargesOverdueCalculationSql = "SUM(COALESCE(mr.penalty_charges_amount, 0) - coalesce(mr.penalty_charges_writtenoff_derived, 0) - " + + "coalesce(mr.penalty_charges_waived_derived, 0) - coalesce(mr.penalty_charges_completed_derived, 0))"; + + updateSqlBuilder.append( + "INSERT INTO m_loan_arrears_aging(loan_id,principal_overdue_derived,interest_overdue_derived,fee_charges_overdue_derived,penalty_charges_overdue_derived,total_overdue_derived,overdue_since_date_derived)"); + updateSqlBuilder.append("select ml.id as loanId,"); + updateSqlBuilder.append(principalOverdueCalculationSql + " as principal_overdue_derived,"); + updateSqlBuilder.append(interestOverdueCalculationSql + " as interest_overdue_derived,"); + updateSqlBuilder.append(feeChargesOverdueCalculationSql + " as fee_charges_overdue_derived,"); + updateSqlBuilder.append(penaltyChargesOverdueCalculationSql + " as penalty_charges_overdue_derived,"); + updateSqlBuilder.append(principalOverdueCalculationSql + "+" + interestOverdueCalculationSql + "+"); + updateSqlBuilder.append(feeChargesOverdueCalculationSql + "+" + penaltyChargesOverdueCalculationSql + " as total_overdue_derived,"); + updateSqlBuilder.append("MIN(mr.duedate) as overdue_since_date_derived "); + updateSqlBuilder.append(" FROM m_loan ml "); + updateSqlBuilder.append(" INNER JOIN m_loan_repayment_schedule mr on mr.loan_id = ml.id "); + updateSqlBuilder.append(" left join m_product_loan_recalculation_details prd on prd.product_id = ml.product_id "); + updateSqlBuilder.append(" WHERE ml.loan_status_id = 300 ");// active + if (!isForAllLoans) { + updateSqlBuilder.append(" and ml.id IN (?)"); + } + updateSqlBuilder.append(" and mr.completed_derived is false "); + updateSqlBuilder.append(" and mr.duedate < ") + .append(sqlGenerator.subDate(sqlGenerator.currentBusinessDate(), "COALESCE(ml.grace_on_arrears_ageing, 0)", "day")) + .append(" "); + updateSqlBuilder.append(" and (prd.arrears_based_on_original_schedule = false or prd.arrears_based_on_original_schedule is null) "); + updateSqlBuilder.append(" GROUP BY ml.id"); + return updateSqlBuilder.toString(); + } + + private List<String> updateLoanArrearsAgeingDetailsWithOriginalSchedule(List<Long> loanIdsForUpdate) { + List<String> insertStatement = new ArrayList<>(); + String sqlForLoanIdentifiers = buildQueryForLoanIdentifiersWithOriginalSchedule(Boolean.FALSE); + List<Object> loanIdsForQuery = new ArrayList<>(); + for (Long loanId : loanIdsForUpdate) { + loanIdsForQuery.add(loanId); + } + List<Long> loanIds = this.jdbcTemplate.queryForList(sqlForLoanIdentifiers, loanIdsForQuery.toArray(), new int[] { Types.BIGINT }, + Long.class); + if (!loanIds.isEmpty()) { + String loanIdsAsString = loanIds.toString(); + loanIdsAsString = loanIdsAsString.substring(1, loanIdsAsString.length() - 1); + Map<Long, List<LoanSchedulePeriodData>> scheduleDate = loanArrearsAgingService.getScheduleDate(loanIdsAsString); + + List<Map<String, Object>> loanSummary = getLoanSummary(loanIdsAsString); + loanArrearsAgingService.updateScheduleWithPaidDetail(scheduleDate, loanSummary); + loanArrearsAgingService.createInsertStatements(insertStatement, scheduleDate, true); + } + + return insertStatement; + } + + private List<String> updateLoanArrearsAgeingDetailsWithOriginalScheduleForAllLoans() { + List<String> insertStatement = new ArrayList<>(); + String sqlForLoanIdentifiers = buildQueryForLoanIdentifiersWithOriginalSchedule(Boolean.TRUE); + List<Long> loanIds = this.jdbcTemplate.queryForList(sqlForLoanIdentifiers, Long.class); + if (!loanIds.isEmpty()) { + String loanIdsAsString = loanIds.toString(); + loanIdsAsString = loanIdsAsString.substring(1, loanIdsAsString.length() - 1); + Map<Long, List<LoanSchedulePeriodData>> scheduleDate = loanArrearsAgingService.getScheduleDate(loanIdsAsString); + + List<Map<String, Object>> loanSummary = getLoanSummary(loanIdsAsString); + loanArrearsAgingService.updateScheduleWithPaidDetail(scheduleDate, loanSummary); + loanArrearsAgingService.createInsertStatements(insertStatement, scheduleDate, true); + } + + return insertStatement; + } + + private String buildQueryForLoanIdentifiersWithOriginalSchedule(Boolean isForAllLoans) { + final StringBuilder loanIdentifier = new StringBuilder(); + loanIdentifier.append("select ml.id as loanId FROM m_loan ml "); + loanIdentifier.append("INNER JOIN m_loan_repayment_schedule mr on mr.loan_id = ml.id "); + loanIdentifier.append( + "inner join m_product_loan_recalculation_details prd on prd.product_id = ml.product_id and prd.arrears_based_on_original_schedule = true "); + loanIdentifier.append("WHERE ml.loan_status_id = 300 "); + if (!isForAllLoans) { + loanIdentifier.append(" and ml.id IN (?)"); + } + loanIdentifier.append(" and mr.completed_derived is false and mr.duedate < ") + .append(sqlGenerator.subDate(sqlGenerator.currentBusinessDate(), "COALESCE(ml.grace_on_arrears_ageing, 0)", "day")) + .append(" group by ml.id"); + return loanIdentifier.toString(); + } + + private List<Map<String, Object>> getLoanSummary(final String loanIdsAsString) { + final StringBuilder transactionsSql = new StringBuilder(); + transactionsSql.append("select ml.id as loanId, "); + transactionsSql + .append("ml.principal_repaid_derived as principalAmtPaid, ml.principal_writtenoff_derived as principalAmtWrittenoff, "); + transactionsSql.append(" ml.interest_repaid_derived as interestAmtPaid, ml.interest_waived_derived as interestAmtWaived, "); + transactionsSql.append("ml.fee_charges_repaid_derived as feeAmtPaid, ml.fee_charges_waived_derived as feeAmtWaived, "); + transactionsSql + .append("ml.penalty_charges_repaid_derived as penaltyAmtPaid, ml.penalty_charges_waived_derived as penaltyAmtWaived "); + transactionsSql.append("from m_loan ml "); + transactionsSql.append("where ml.id IN (").append(loanIdsAsString).append(") order by ml.id"); Review Comment: Nah, lets not append the String directly. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
