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

FINERACT-1557 enable previous disabled refundByCash accounting tests

Browse Source
This commit is contained in:
John Woodlock
2022-05-09 17:52:01 +02:00
committed by Aleksandar Vidakovic
parent 9d4d848df5
commit 7f11d815d9
2 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanReadPlatformServiceImpl.java
+5 -7
View File
@@ -2100,20 +2100,18 @@ public class LoanReadPlatformServiceImpl implements LoanReadPlatformService {
@Override @Override
public PaidInAdvanceData retrieveTotalPaidInAdvance(Long loanId) { public PaidInAdvanceData retrieveTotalPaidInAdvance(Long loanId) {
// TODO Auto-generated method stub
try { try {
final String sql = " select (SUM(COALESCE(mr.principal_completed_derived, 0)) +" final String sql = " select (SUM(COALESCE(mr.principal_completed_derived, 0))"
+ " + SUM(COALESCE(mr.interest_completed_derived, 0)) " + " + SUM(COALESCE(mr.fee_charges_completed_derived, 0)) " + " + SUM(COALESCE(mr.interest_completed_derived, 0)) " + " + SUM(COALESCE(mr.fee_charges_completed_derived, 0)) "
+ " + SUM(COALESCE(mr.penalty_charges_completed_derived, 0))) as total_in_advance_derived " + " + SUM(COALESCE(mr.penalty_charges_completed_derived, 0))) as total_in_advance_derived "
+ " from m_loan ml INNER JOIN m_loan_repayment_schedule mr on mr.loan_id = ml.id " + " from m_loan ml INNER JOIN m_loan_repayment_schedule mr on mr.loan_id = ml.id "
+ " where ml.id=? and mr.duedate >= ? group by ml.id having " + " (SUM(COALESCE(mr.principal_completed_derived, 0)) " + " where ml.id=? and mr.duedate >= " + sqlGenerator.currentDate() + " group by ml.id having "
+ " + SUM(COALESCE(mr.interest_completed_derived, 0)) " + " + SUM(COALESCE(mr.fee_charges_completed_derived, 0)) " + " (SUM(COALESCE(mr.principal_completed_derived, 0)) " + " + SUM(COALESCE(mr.interest_completed_derived, 0)) "
+ " + SUM(COALESCE(mr.fee_charges_completed_derived, 0)) "
+ "+ SUM(COALESCE(mr.penalty_charges_completed_derived, 0))) > 0"; + "+ SUM(COALESCE(mr.penalty_charges_completed_derived, 0))) > 0";
BigDecimal bigDecimal = this.jdbcTemplate.queryForObject(sql, BigDecimal.class, BigDecimal bigDecimal = this.jdbcTemplate.queryForObject(sql, BigDecimal.class, new Object[] { loanId }); // NOSONAR
new Object[] { loanId, sqlGenerator.currentDate() }); // NOSONAR
return new PaidInAdvanceData(bigDecimal); return new PaidInAdvanceData(bigDecimal);
} catch (DataAccessException e) { } catch (DataAccessException e) {
// TODO Auto-generated catch block
return new PaidInAdvanceData(new BigDecimal(0)); return new PaidInAdvanceData(new BigDecimal(0));
} }
} }
integration-tests/src/test/java/org/apache/fineract/integrationtests/ClientLoanIntegrationTest.java
+3 -6
View File
@@ -4714,8 +4714,7 @@ public class ClientLoanIntegrationTest {
/*** /***
* Test case to verify default Style payment strategy * Test case to verify default Style payment strategy
*/ */
// @Test // TODO: @galovics failing since @Test
// https://github.com/apache/fineract/commit/d5c611564f7b8c877136f3b3aca647bf7de15fe0
public void testLoanRefundByCashCashBasedAccounting() { public void testLoanRefundByCashCashBasedAccounting() {
this.journalEntryHelper = new JournalEntryHelper(this.requestSpec, this.responseSpec); this.journalEntryHelper = new JournalEntryHelper(this.requestSpec, this.responseSpec);
@@ -4898,8 +4897,7 @@ public class ClientLoanIntegrationTest {
/*** /***
* Test case to verify Default style payment strategy * Test case to verify Default style payment strategy
*/ */
// @Test // TODO: @galovics failing since @Test
// https://github.com/apache/fineract/commit/d5c611564f7b8c877136f3b3aca647bf7de15fe0
public void testLoanRefundByCashAccrualBasedAccounting() { public void testLoanRefundByCashAccrualBasedAccounting() {
this.journalEntryHelper = new JournalEntryHelper(this.requestSpec, this.responseSpec); this.journalEntryHelper = new JournalEntryHelper(this.requestSpec, this.responseSpec);
@@ -5077,8 +5075,7 @@ public class ClientLoanIntegrationTest {
} }
// @Test // TODO: @galovics failing since @Test
// https://github.com/apache/fineract/commit/d5c611564f7b8c877136f3b3aca647bf7de15fe0
public void testLoanRefundByTransferCashBasedAccounting() { public void testLoanRefundByTransferCashBasedAccounting() {
this.journalEntryHelper = new JournalEntryHelper(this.requestSpec, this.responseSpec); this.journalEntryHelper = new JournalEntryHelper(this.requestSpec, this.responseSpec);
this.savingsAccountHelper = new SavingsAccountHelper(this.requestSpec, this.responseSpec); this.savingsAccountHelper = new SavingsAccountHelper(this.requestSpec, this.responseSpec);