From 3e5b47f562a52adcbaea9ff8c26b9411cbc5c088 Mon Sep 17 00:00:00 2001 From: Keith Woodlock Date: Mon, 17 Sep 2012 11:08:53 +0100 Subject: [PATCH] wip loan charges and loan schedule --- .../loan/service/LoanProductRelatedDetailAssembler.java | 2 ++ .../domain/DecliningBalanceMethodLoanScheduleGenerator.java | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanProductRelatedDetailAssembler.java b/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanProductRelatedDetailAssembler.java index 1b4f968da..8f93dc119 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanProductRelatedDetailAssembler.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanProductRelatedDetailAssembler.java @@ -13,6 +13,7 @@ import org.mifosng.platform.loan.domain.LoanProductRelatedDetail; import org.mifosng.platform.loan.domain.LoanProductRepository; import org.mifosng.platform.loan.domain.PeriodFrequencyType; import org.mifosng.platform.loanschedule.domain.AprCalculator; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @Service @@ -21,6 +22,7 @@ public class LoanProductRelatedDetailAssembler { private final LoanProductRepository loanProductRepository; private final AprCalculator aprCalculator; + @Autowired public LoanProductRelatedDetailAssembler( final LoanProductRepository loanProductRepository, final AprCalculator aprCalculator) { diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/loanschedule/domain/DecliningBalanceMethodLoanScheduleGenerator.java b/mifosng-provider/src/main/java/org/mifosng/platform/loanschedule/domain/DecliningBalanceMethodLoanScheduleGenerator.java index 046ff1609..9f5207234 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/loanschedule/domain/DecliningBalanceMethodLoanScheduleGenerator.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/loanschedule/domain/DecliningBalanceMethodLoanScheduleGenerator.java @@ -42,15 +42,15 @@ public class DecliningBalanceMethodLoanScheduleGenerator implements LoanSchedule final LocalDate interestCalculatedFrom) { // 1. generate valid set of 'due dates' based on some of the 'loan attributes' - List scheduledDates = this.scheduledDateGenerator.generate(loanScheduleInfo, disbursementDate, firstRepaymentDate); + final List scheduledDates = this.scheduledDateGenerator.generate(loanScheduleInfo, disbursementDate, firstRepaymentDate); - LocalDate idealDisbursementDateBasedOnFirstRepaymentDate = this.scheduledDateGenerator.idealDisbursementDateBasedOnFirstRepaymentDate(loanScheduleInfo, scheduledDates); + final LocalDate idealDisbursementDateBasedOnFirstRepaymentDate = this.scheduledDateGenerator.idealDisbursementDateBasedOnFirstRepaymentDate(loanScheduleInfo, scheduledDates); // 2. determine the 'periodic' interest rate based on the 'repayment periods' so we can use final BigDecimal periodInterestRateForRepaymentPeriod = this.periodicInterestRateCalculator.calculateFrom(loanScheduleInfo); // Determine with 'amortisation' approach to use - AmortizationLoanScheduleGenerator generator = this.amortizationLoanScheduleGeneratorFactory.createGenerator(loanScheduleInfo.getAmortizationMethod()); + final AmortizationLoanScheduleGenerator generator = this.amortizationLoanScheduleGeneratorFactory.createGenerator(loanScheduleInfo.getAmortizationMethod()); return generator.generate( loanScheduleInfo,