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

Merge pull request #564 from pramodn02/MIFOSX-624

Browse Source 
Mifosx 624-added validation for applying annual fee negative balance
This commit is contained in:
Vishwas Babu A J
2013-09-04 03:29:27 -07:00
parent aab79b3561 c3c37e7e64
commit ebba52bb9c
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/domain/SavingsAccount.java
+3 -1
View File
@@ -803,7 +803,9 @@ public class SavingsAccount extends AbstractPersistable<Long> {
final Money annualFee = Money.of(this.currency, this.annualFeeAmount); final Money annualFee = Money.of(this.currency, this.annualFeeAmount);
final SavingsAccountTransaction annualFeeTransaction = SavingsAccountTransaction.annualFee(this, annualFeeTransactionDate, annualFee); final SavingsAccountTransaction annualFeeTransaction = SavingsAccountTransaction.annualFee(this, annualFeeTransactionDate, annualFee);
this.transactions.add(annualFeeTransaction); this.transactions.add(annualFeeTransaction);
validateAccountBalanceDoesNotBecomeNegative(SavingsApiConstants.applyAnnualFeeTransactionAction);
this.summary.updateSummary(this.currency, this.savingsAccountTransactionSummaryWrapper, this.transactions); this.summary.updateSummary(this.currency, this.savingsAccountTransactionSummaryWrapper, this.transactions);
calculateInterestUsing(mc, today); calculateInterestUsing(mc, today);
mifosng-provider/src/main/java/org/mifosplatform/scheduledjobs/service/ScheduledJobRunnerServiceImpl.java
+12 -2
View File
@@ -6,7 +6,10 @@
package org.mifosplatform.scheduledjobs.service; package org.mifosplatform.scheduledjobs.service;
import java.util.Collection; import java.util.Collection;
import java.util.List;
import org.mifosplatform.infrastructure.core.data.ApiParameterError;
import org.mifosplatform.infrastructure.core.exception.PlatformApiDataValidationException;
import org.mifosplatform.infrastructure.core.service.RoutingDataSourceServiceFactory; import org.mifosplatform.infrastructure.core.service.RoutingDataSourceServiceFactory;
import org.mifosplatform.infrastructure.core.service.ThreadLocalContextUtil; import org.mifosplatform.infrastructure.core.service.ThreadLocalContextUtil;
import org.mifosplatform.infrastructure.jobs.annotation.CronTarget; import org.mifosplatform.infrastructure.jobs.annotation.CronTarget;
@@ -204,8 +207,15 @@ public class ScheduledJobRunnerServiceImpl implements ScheduledJobRunnerService
.retrieveAccountsWithAnnualFeeDue(); .retrieveAccountsWithAnnualFeeDue();
for (SavingsAccountAnnualFeeData savingsAccountReference : annualFeeData) { for (SavingsAccountAnnualFeeData savingsAccountReference : annualFeeData) {
this.savingsAccountWritePlatformService.applyAnnualFee(savingsAccountReference.getId(), try{
savingsAccountReference.getNextAnnualFeeDueDate()); this.savingsAccountWritePlatformService.applyAnnualFee(savingsAccountReference.getId(),
savingsAccountReference.getNextAnnualFeeDueDate());
} catch (PlatformApiDataValidationException e) {
List<ApiParameterError> errors = e.getErrors();
for(ApiParameterError error : errors){
logger.error("Apply annual fee failed for account:"+savingsAccountReference.getAccountNo()+" with message "+error.getDeveloperMessage());
}
}
} }
logger.info(ThreadLocalContextUtil.getTenant().getName() + ": Savings accounts affected by update: " + annualFeeData.size()); logger.info(ThreadLocalContextUtil.getTenant().getName() + ": Savings accounts affected by update: " + annualFeeData.size());