diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/NewLoanScheduleData.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/LoanScheduleNewData.java similarity index 97% rename from mifosng-provider/src/main/java/org/mifosng/platform/api/NewLoanScheduleData.java rename to mifosng-provider/src/main/java/org/mifosng/platform/api/LoanScheduleNewData.java index e4f341fb6..ec987e8fc 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/NewLoanScheduleData.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/LoanScheduleNewData.java @@ -14,8 +14,9 @@ import org.mifosng.platform.api.data.LoanSchedulePeriodData; *
  • repayment schedule - the principal due, outstanding balance and cost of loan items such as interest and charges
    • * */ +// TODO - KW - rename file @SuppressWarnings("unused") -public class NewLoanScheduleData { +public class LoanScheduleNewData { private final Integer loanTermInDays; @@ -95,7 +96,7 @@ public class NewLoanScheduleData { */ private final Collection periods; - public NewLoanScheduleData() { + public LoanScheduleNewData() { this.cumulativePrincipalDisbursed = null; this.cumulativePrincipalPaid = null; this.cumulativePrincipalDue = null; @@ -123,7 +124,7 @@ public class NewLoanScheduleData { this.loanTermInDays = null; } - public NewLoanScheduleData( + public LoanScheduleNewData( final CurrencyData currency, final Collection periods, final Integer loanTermInDays, @@ -169,7 +170,7 @@ public class NewLoanScheduleData { /* * Used when fully populating */ - public NewLoanScheduleData(final CurrencyData currency, final Collection periods, + public LoanScheduleNewData(final CurrencyData currency, final Collection periods, final Integer loanTermInDays, final BigDecimal cumulativePrincipalDisbursed, final BigDecimal cumulativePrincipalDue, diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/LoansApiResource.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/LoansApiResource.java index 51cfcf973..2037c2613 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/LoansApiResource.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/LoansApiResource.java @@ -180,7 +180,7 @@ public class LoansApiResource { int loanRepaymentsCount = 0; Collection loanRepayments = null; - NewLoanScheduleData repaymentSchedule = null; + LoanScheduleNewData repaymentSchedule = null; LoanPermissionData permissions = null; Collection charges = null; @@ -283,7 +283,7 @@ public class LoansApiResource { private String calculateLoanSchedule(final UriInfo uriInfo, final CalculateLoanScheduleCommand command) { - final NewLoanScheduleData loanSchedule = this.calculationPlatformService.calculateLoanScheduleNew(command); + final LoanScheduleNewData loanSchedule = this.calculationPlatformService.calculateLoanScheduleNew(command); final Set typicalLoanScheduleResponseParameters = new HashSet( Arrays.asList("periods", "cumulativePrincipalDisbursed")); diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/data/LoanAccountData.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/data/LoanAccountData.java index 509476f33..c2c30453e 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/data/LoanAccountData.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/data/LoanAccountData.java @@ -4,7 +4,7 @@ import java.math.BigDecimal; import java.util.Collection; import org.joda.time.LocalDate; -import org.mifosng.platform.api.NewLoanScheduleData; +import org.mifosng.platform.api.LoanScheduleNewData; /** * Immutable data object representing loan account data. @@ -53,7 +53,7 @@ public class LoanAccountData { private final LocalDate lifeCycleStatusDate; // associations - private final NewLoanScheduleData repaymentSchedule; + private final LoanScheduleNewData repaymentSchedule; private final Collection loanRepayments; private final Collection charges; private final LoanPermissionData permissions; @@ -76,7 +76,7 @@ public class LoanAccountData { public LoanAccountData( final LoanBasicDetailsData basicDetails, final boolean convenienceDataRequired, - final NewLoanScheduleData repaymentSchedule, + final LoanScheduleNewData repaymentSchedule, final Collection loanRepayments, final LoanPermissionData permissions, final Collection charges, diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/ApiJsonSerializerService.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/ApiJsonSerializerService.java index 4d8f9018b..fe83919d9 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/ApiJsonSerializerService.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/ApiJsonSerializerService.java @@ -3,7 +3,7 @@ package org.mifosng.platform.api.infrastructure; import java.util.Collection; import java.util.Set; -import org.mifosng.platform.api.NewLoanScheduleData; +import org.mifosng.platform.api.LoanScheduleNewData; import org.mifosng.platform.api.data.AdditionalFieldsSetData; import org.mifosng.platform.api.data.AppUserData; import org.mifosng.platform.api.data.AuthenticatedUserData; @@ -93,7 +93,7 @@ public interface ApiJsonSerializerService { String serializeNoteDataToJson(boolean prettyPrint, Set responseParameters, NoteData note); - String serializeLoanScheduleDataToJson(boolean prettyPrint, Set responseParameters, NewLoanScheduleData loanSchedule); + String serializeLoanScheduleDataToJson(boolean prettyPrint, Set responseParameters, LoanScheduleNewData loanSchedule); String serializeLoanAccountDataToJson(boolean prettyPrint, Set responseParameters, LoanAccountData loanAccount); diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/GoogleGsonApiJsonSerializerService.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/GoogleGsonApiJsonSerializerService.java index 1e4d84572..75a83e3ec 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/GoogleGsonApiJsonSerializerService.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/GoogleGsonApiJsonSerializerService.java @@ -5,7 +5,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.Set; -import org.mifosng.platform.api.NewLoanScheduleData; +import org.mifosng.platform.api.LoanScheduleNewData; import org.mifosng.platform.api.data.AdditionalFieldsSetData; import org.mifosng.platform.api.data.AppUserData; import org.mifosng.platform.api.data.AuthenticatedUserData; @@ -499,7 +499,7 @@ public class GoogleGsonApiJsonSerializerService implements ApiJsonSerializerServ } @Override - public String serializeLoanScheduleDataToJson(final boolean prettyPrint, final Set responseParameters, final NewLoanScheduleData loanSchedule) { + public String serializeLoanScheduleDataToJson(final boolean prettyPrint, final Set responseParameters, final LoanScheduleNewData loanSchedule) { final Gson gsonDeserializer = helper .createGsonBuilderWithParameterExclusionSerializationStrategy(LOAN_SCHEDULE_DATA_PARAMETERS, prettyPrint, responseParameters); return helper.serializedJsonFrom(gsonDeserializer, loanSchedule); diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/Loan.java b/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/Loan.java index c5e34e987..d789c4731 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/Loan.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/Loan.java @@ -27,7 +27,7 @@ import org.hibernate.annotations.LazyCollection; import org.hibernate.annotations.LazyCollectionOption; import org.joda.time.DateTime; import org.joda.time.LocalDate; -import org.mifosng.platform.api.NewLoanScheduleData; +import org.mifosng.platform.api.LoanScheduleNewData; import org.mifosng.platform.api.commands.LoanApplicationCommand; import org.mifosng.platform.api.data.LoanSchedulePeriodData; import org.mifosng.platform.client.domain.Client; @@ -243,7 +243,7 @@ public class Loan extends AbstractAuditableCustom { } public void modifyLoanApplication(final LoanApplicationCommand command, final Client client, final LoanProduct loanProduct, - final Fund fund, final LoanTransactionProcessingStrategy strategy, final NewLoanScheduleData modifiedLoanSchedule, final Set charges, + final Fund fund, final LoanTransactionProcessingStrategy strategy, final LoanScheduleNewData modifiedLoanSchedule, final Set charges, final Staff loanOfficer) { if (command.isClientChanged()) { diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/CalculationPlatformService.java b/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/CalculationPlatformService.java index b5f64fbb9..ccf07bcca 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/CalculationPlatformService.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/CalculationPlatformService.java @@ -1,12 +1,12 @@ package org.mifosng.platform.loan.service; import org.joda.time.LocalDate; -import org.mifosng.platform.api.NewLoanScheduleData; +import org.mifosng.platform.api.LoanScheduleNewData; import org.mifosng.platform.api.commands.CalculateLoanScheduleCommand; public interface CalculationPlatformService { - NewLoanScheduleData calculateLoanScheduleNew(CalculateLoanScheduleCommand command); + LoanScheduleNewData calculateLoanScheduleNew(CalculateLoanScheduleCommand command); /** * Not used at present from application. diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/CalculationPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/CalculationPlatformServiceImpl.java index b53154d88..4f854d403 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/CalculationPlatformServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/CalculationPlatformServiceImpl.java @@ -1,7 +1,7 @@ package org.mifosng.platform.loan.service; import org.joda.time.LocalDate; -import org.mifosng.platform.api.NewLoanScheduleData; +import org.mifosng.platform.api.LoanScheduleNewData; import org.mifosng.platform.api.commands.CalculateLoanScheduleCommand; import org.mifosng.platform.api.data.CurrencyData; import org.mifosng.platform.api.data.MoneyData; @@ -45,7 +45,7 @@ public class CalculationPlatformServiceImpl implements CalculationPlatformServic } @Override - public NewLoanScheduleData calculateLoanScheduleNew(final CalculateLoanScheduleCommand command) { + public LoanScheduleNewData calculateLoanScheduleNew(final CalculateLoanScheduleCommand command) { context.authenticatedUser(); diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanAssembler.java b/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanAssembler.java index 3af2cfd0c..ccf04c79f 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanAssembler.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanAssembler.java @@ -6,7 +6,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.mifosng.platform.api.NewLoanScheduleData; +import org.mifosng.platform.api.LoanScheduleNewData; import org.mifosng.platform.api.commands.LoanApplicationCommand; import org.mifosng.platform.api.commands.LoanChargeCommand; import org.mifosng.platform.api.data.LoanSchedulePeriodData; @@ -109,7 +109,7 @@ public class LoanAssembler { Loan loan = Loan.createNew(fund,loanOfficer, loanTransactionProcessingStrategy, loanProduct, client, loanRepaymentScheduleDetail, loanCharges); loan.setExternalId(command.getExternalId()); - final NewLoanScheduleData loanSchedule = this.calculationPlatformService.calculateLoanScheduleNew(command.toCalculateLoanScheduleCommand()); + final LoanScheduleNewData loanSchedule = this.calculationPlatformService.calculateLoanScheduleNew(command.toCalculateLoanScheduleCommand()); for (LoanSchedulePeriodData scheduledLoanInstallment : loanSchedule.getPeriods()) { if (scheduledLoanInstallment.isRepaymentPeriod()) { diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanReadPlatformService.java b/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanReadPlatformService.java index 9216c09cf..5c6c17f2e 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanReadPlatformService.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanReadPlatformService.java @@ -2,7 +2,7 @@ package org.mifosng.platform.loan.service; import java.util.Collection; -import org.mifosng.platform.api.NewLoanScheduleData; +import org.mifosng.platform.api.LoanScheduleNewData; import org.mifosng.platform.api.data.CurrencyData; import org.mifosng.platform.api.data.DisbursementData; import org.mifosng.platform.api.data.LoanBasicDetailsData; @@ -14,7 +14,7 @@ public interface LoanReadPlatformService { LoanBasicDetailsData retrieveLoanAccountDetails(Long loanId); - NewLoanScheduleData retrieveRepaymentSchedule(Long loanId, CurrencyData currency, DisbursementData disbursement); + LoanScheduleNewData retrieveRepaymentSchedule(Long loanId, CurrencyData currency, DisbursementData disbursement); Collection retrieveLoanPayments(Long loanId); diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanReadPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanReadPlatformServiceImpl.java index 58964f6ea..a8cbb9ad1 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanReadPlatformServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanReadPlatformServiceImpl.java @@ -7,7 +7,7 @@ import java.util.ArrayList; import java.util.Collection; import org.joda.time.LocalDate; -import org.mifosng.platform.api.NewLoanScheduleData; +import org.mifosng.platform.api.LoanScheduleNewData; import org.mifosng.platform.api.data.ClientData; import org.mifosng.platform.api.data.CurrencyData; import org.mifosng.platform.api.data.DisbursementData; @@ -91,7 +91,7 @@ public class LoanReadPlatformServiceImpl implements LoanReadPlatformService { } @Override - public NewLoanScheduleData retrieveRepaymentSchedule(final Long loanId, final CurrencyData currency, final DisbursementData disbursement) { + public LoanScheduleNewData retrieveRepaymentSchedule(final Long loanId, final CurrencyData currency, final DisbursementData disbursement) { try { context.authenticatedUser(); @@ -129,7 +129,7 @@ public class LoanReadPlatformServiceImpl implements LoanReadPlatformService { final BigDecimal totalOutstanding = cumulativePrincipalOutstanding.add(cumulativeInterestOutstanding).add(cumulativeChargesOutstanding); final BigDecimal totalInArrears = null; - return new NewLoanScheduleData(currency, periods, loanTermInDays, + return new LoanScheduleNewData(currency, periods, loanTermInDays, cumulativePrincipalDisbursed, cumulativePrincipalDue, cumulativePrincipalPaid, cumulativePrincipalOutstanding, cumulativeInterestExpected, cumulativeInterestPaid, cumulativeInterestWaived, cumulativeInterestOutstanding, cumulativeChargesToDate, cumulativeChargesPaid, cumulativeChargesOutstanding, diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanWritePlatformServiceJpaRepositoryImpl.java b/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanWritePlatformServiceJpaRepositoryImpl.java index 935ffb6f4..426f88ad6 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanWritePlatformServiceJpaRepositoryImpl.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanWritePlatformServiceJpaRepositoryImpl.java @@ -8,7 +8,7 @@ import java.util.Set; import org.apache.commons.lang.StringUtils; import org.joda.time.LocalDate; -import org.mifosng.platform.api.NewLoanScheduleData; +import org.mifosng.platform.api.LoanScheduleNewData; import org.mifosng.platform.api.commands.AdjustLoanTransactionCommand; import org.mifosng.platform.api.commands.CalculateLoanScheduleCommand; import org.mifosng.platform.api.commands.LoanApplicationCommand; @@ -146,7 +146,7 @@ public class LoanWritePlatformServiceJpaRepositoryImpl implements LoanWritePlatf LoanTransactionProcessingStrategy strategy = this.loanAssembler.findStrategyByIdIfProvided(command.getTransactionProcessingStrategyId()); Set charges = this.loanAssembler.assembleSetOfLoanCharges(command.getCharges(), loanProduct.getCharges(), loan.getCurrency().getCode()); - final NewLoanScheduleData loanSchedule = this.calculationPlatformService.calculateLoanScheduleNew(command.toCalculateLoanScheduleCommand()); + final LoanScheduleNewData loanSchedule = this.calculationPlatformService.calculateLoanScheduleNew(command.toCalculateLoanScheduleCommand()); loan.modifyLoanApplication(command, client, loanProduct, fund, strategy, loanSchedule, charges, loanOfficer); this.loanRepository.save(loan); @@ -350,7 +350,7 @@ public class LoanWritePlatformServiceJpaRepositoryImpl implements LoanWritePlatf loanTermFrequency, loanTermFrequencyType, actualDisbursementDate, repaymentsStartingFromDate, interestCalculatedFromDate); - NewLoanScheduleData loanSchedule = this.calculationPlatformService.calculateLoanScheduleNew(calculateCommand); + LoanScheduleNewData loanSchedule = this.calculationPlatformService.calculateLoanScheduleNew(calculateCommand); List modifiedLoanRepaymentSchedule = new ArrayList(); diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/loanschedule/domain/AmortizationLoanScheduleGenerator.java b/mifosng-provider/src/main/java/org/mifosng/platform/loanschedule/domain/AmortizationLoanScheduleGenerator.java index 37c74f052..a34330447 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/loanschedule/domain/AmortizationLoanScheduleGenerator.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/loanschedule/domain/AmortizationLoanScheduleGenerator.java @@ -4,13 +4,13 @@ import java.math.BigDecimal; import java.util.List; import org.joda.time.LocalDate; -import org.mifosng.platform.api.NewLoanScheduleData; +import org.mifosng.platform.api.LoanScheduleNewData; import org.mifosng.platform.currency.domain.ApplicationCurrency; import org.mifosng.platform.loan.domain.LoanProductRelatedDetail; public interface AmortizationLoanScheduleGenerator { - NewLoanScheduleData generate( + LoanScheduleNewData generate( ApplicationCurrency applicationCurrency, LoanProductRelatedDetail loanScheduleInfo, LocalDate disbursementDate, 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 3355a360d..fcf10a403 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 @@ -4,7 +4,7 @@ import java.math.BigDecimal; import java.util.List; import org.joda.time.LocalDate; -import org.mifosng.platform.api.NewLoanScheduleData; +import org.mifosng.platform.api.LoanScheduleNewData; import org.mifosng.platform.currency.domain.ApplicationCurrency; import org.mifosng.platform.loan.domain.AmortizationMethod; import org.mifosng.platform.loan.domain.LoanProductRelatedDetail; @@ -34,7 +34,7 @@ public class DecliningBalanceMethodLoanScheduleGenerator implements LoanSchedule private final AmortizationLoanScheduleGeneratorFactory amortizationLoanScheduleGeneratorFactory = new AmortizationLoanScheduleGeneratorFactory(); @Override - public NewLoanScheduleData generate( + public LoanScheduleNewData generate( final ApplicationCurrency applicationCurrency, final LoanProductRelatedDetail loanScheduleInfo, final Integer loanTermFrequency, diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/loanschedule/domain/EqualInstallmentsAmortizationLoanScheduleGenerator.java b/mifosng-provider/src/main/java/org/mifosng/platform/loanschedule/domain/EqualInstallmentsAmortizationLoanScheduleGenerator.java index 1971616d9..d45ec98b2 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/loanschedule/domain/EqualInstallmentsAmortizationLoanScheduleGenerator.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/loanschedule/domain/EqualInstallmentsAmortizationLoanScheduleGenerator.java @@ -7,7 +7,7 @@ import java.util.List; import org.joda.time.Days; import org.joda.time.LocalDate; -import org.mifosng.platform.api.NewLoanScheduleData; +import org.mifosng.platform.api.LoanScheduleNewData; import org.mifosng.platform.api.data.CurrencyData; import org.mifosng.platform.api.data.LoanSchedulePeriodData; import org.mifosng.platform.currency.domain.ApplicationCurrency; @@ -25,7 +25,7 @@ public class EqualInstallmentsAmortizationLoanScheduleGenerator implements Amort private final PmtCalculator pmtCalculator = new PmtCalculator(); @Override - public NewLoanScheduleData generate( + public LoanScheduleNewData generate( final ApplicationCurrency currency, final LoanProductRelatedDetail loanScheduleInfo, final LocalDate disbursementDate, @@ -137,7 +137,7 @@ public class EqualInstallmentsAmortizationLoanScheduleGenerator implements Amort currency.getDisplaySymbol(), currency.getNameCode()); - return new NewLoanScheduleData(currencyData, periods, loanTermInDays, cumulativePrincipalDisbursed, cumulativePrincipalDue, + return new LoanScheduleNewData(currencyData, periods, loanTermInDays, cumulativePrincipalDisbursed, cumulativePrincipalDue, cumulativePrincipalOutstanding, cumulativeInterestExpected, cumulativeChargesToDate, totalExpectedRepayment); } } \ No newline at end of file diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/loanschedule/domain/EqualPrincipalAmortizationLoanScheduleGenerator.java b/mifosng-provider/src/main/java/org/mifosng/platform/loanschedule/domain/EqualPrincipalAmortizationLoanScheduleGenerator.java index 7fe3bdf0a..366283d1d 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/loanschedule/domain/EqualPrincipalAmortizationLoanScheduleGenerator.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/loanschedule/domain/EqualPrincipalAmortizationLoanScheduleGenerator.java @@ -7,7 +7,7 @@ import java.util.List; import org.joda.time.Days; import org.joda.time.LocalDate; -import org.mifosng.platform.api.NewLoanScheduleData; +import org.mifosng.platform.api.LoanScheduleNewData; import org.mifosng.platform.api.data.CurrencyData; import org.mifosng.platform.api.data.LoanSchedulePeriodData; import org.mifosng.platform.currency.domain.ApplicationCurrency; @@ -21,7 +21,7 @@ public class EqualPrincipalAmortizationLoanScheduleGenerator implements Amortiza private final PaymentPeriodsInOneYearCalculator paymentPeriodsInOneYearCalculator = new DefaultPaymentPeriodsInOneYearCalculator(); @Override - public NewLoanScheduleData generate( + public LoanScheduleNewData generate( ApplicationCurrency currency, LoanProductRelatedDetail loanScheduleInfo, LocalDate disbursementDate, LocalDate firstRepaymentDate, @@ -117,7 +117,7 @@ public class EqualPrincipalAmortizationLoanScheduleGenerator implements Amortiza currency.getDisplaySymbol(), currency.getNameCode()); - return new NewLoanScheduleData(currencyData, periods, loanTermInDays, cumulativePrincipalDisbursed, cumulativePrincipalDue, + return new LoanScheduleNewData(currencyData, periods, loanTermInDays, cumulativePrincipalDisbursed, cumulativePrincipalDue, cumulativePrincipalOutstanding, cumulativeInterestExpected, cumulativeChargesToDate, totalExpectedRepayment); } } \ No newline at end of file diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/loanschedule/domain/FlatMethodLoanScheduleGenerator.java b/mifosng-provider/src/main/java/org/mifosng/platform/loanschedule/domain/FlatMethodLoanScheduleGenerator.java index 9fed3b65e..b248b3a27 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/loanschedule/domain/FlatMethodLoanScheduleGenerator.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/loanschedule/domain/FlatMethodLoanScheduleGenerator.java @@ -9,7 +9,7 @@ import java.util.List; import org.joda.time.Days; import org.joda.time.LocalDate; -import org.mifosng.platform.api.NewLoanScheduleData; +import org.mifosng.platform.api.LoanScheduleNewData; import org.mifosng.platform.api.data.CurrencyData; import org.mifosng.platform.api.data.LoanSchedulePeriodData; import org.mifosng.platform.currency.domain.ApplicationCurrency; @@ -24,7 +24,7 @@ public class FlatMethodLoanScheduleGenerator implements LoanScheduleGenerator { private final PaymentPeriodsInOneYearCalculator paymentPeriodsInOneYearCalculator = new DefaultPaymentPeriodsInOneYearCalculator(); @Override - public NewLoanScheduleData generate( + public LoanScheduleNewData generate( final ApplicationCurrency currency, final LoanProductRelatedDetail loanScheduleInfo, final Integer loanTermFrequency, @@ -125,7 +125,7 @@ public class FlatMethodLoanScheduleGenerator implements LoanScheduleGenerator { currency.getDisplaySymbol(), currency.getNameCode()); - return new NewLoanScheduleData(currencyData, periods, loanTermInDays, cumulativePrincipalDisbursed, cumulativePrincipalDue, + return new LoanScheduleNewData(currencyData, periods, loanTermInDays, cumulativePrincipalDisbursed, cumulativePrincipalDue, cumulativePrincipalOutstanding, cumulativeInterestExpected, cumulativeChargesToDate, totalExpectedRepayment); } } \ No newline at end of file diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/loanschedule/domain/LoanScheduleGenerator.java b/mifosng-provider/src/main/java/org/mifosng/platform/loanschedule/domain/LoanScheduleGenerator.java index 32eacb71e..8b517bd2b 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/loanschedule/domain/LoanScheduleGenerator.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/loanschedule/domain/LoanScheduleGenerator.java @@ -1,14 +1,14 @@ package org.mifosng.platform.loanschedule.domain; import org.joda.time.LocalDate; -import org.mifosng.platform.api.NewLoanScheduleData; +import org.mifosng.platform.api.LoanScheduleNewData; import org.mifosng.platform.currency.domain.ApplicationCurrency; import org.mifosng.platform.loan.domain.LoanProductRelatedDetail; import org.mifosng.platform.loan.domain.PeriodFrequencyType; public interface LoanScheduleGenerator { - NewLoanScheduleData generate(ApplicationCurrency applicationCurrency, + LoanScheduleNewData generate(ApplicationCurrency applicationCurrency, LoanProductRelatedDetail loanScheduleInfo, Integer loanTermFrequency, PeriodFrequencyType loanTermFrequencyType,