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

update file name of loan schedule data class.

Browse Source
This commit is contained in:
Keith Woodlock
2012-09-19 17:25:31 +01:00
parent a6a74a401b
commit ba8b24ac3b
18 changed files with 45 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mifosng-provider/src/main/java/org/mifosng/platform/api/NewLoanScheduleData.java → mifosng-provider/src/main/java/org/mifosng/platform/api/LoanScheduleNewData.java
+5 -4
View File
@@ -14,8 +14,9 @@ import org.mifosng.platform.api.data.LoanSchedulePeriodData;
* <li>repayment schedule - the principal due, outstanding balance and cost of loan items such as interest and charges</li> * <li>repayment schedule - the principal due, outstanding balance and cost of loan items such as interest and charges</li>
* </ul> * </ul>
*/ */
// TODO - KW - rename file
@SuppressWarnings("unused") @SuppressWarnings("unused")
public class NewLoanScheduleData { public class LoanScheduleNewData {
private final Integer loanTermInDays; private final Integer loanTermInDays;
@@ -95,7 +96,7 @@ public class NewLoanScheduleData {
*/ */
private final Collection<LoanSchedulePeriodData> periods; private final Collection<LoanSchedulePeriodData> periods;
public NewLoanScheduleData() { public LoanScheduleNewData() {
this.cumulativePrincipalDisbursed = null; this.cumulativePrincipalDisbursed = null;
this.cumulativePrincipalPaid = null; this.cumulativePrincipalPaid = null;
this.cumulativePrincipalDue = null; this.cumulativePrincipalDue = null;
@@ -123,7 +124,7 @@ public class NewLoanScheduleData {
this.loanTermInDays = null; this.loanTermInDays = null;
} }
public NewLoanScheduleData( public LoanScheduleNewData(
final CurrencyData currency, final CurrencyData currency,
final Collection<LoanSchedulePeriodData> periods, final Collection<LoanSchedulePeriodData> periods,
final Integer loanTermInDays, final Integer loanTermInDays,
@@ -169,7 +170,7 @@ public class NewLoanScheduleData {
/* /*
* Used when fully populating * Used when fully populating
*/ */
public NewLoanScheduleData(final CurrencyData currency, final Collection<LoanSchedulePeriodData> periods, public LoanScheduleNewData(final CurrencyData currency, final Collection<LoanSchedulePeriodData> periods,
final Integer loanTermInDays, final Integer loanTermInDays,
final BigDecimal cumulativePrincipalDisbursed, final BigDecimal cumulativePrincipalDisbursed,
final BigDecimal cumulativePrincipalDue, final BigDecimal cumulativePrincipalDue,
mifosng-provider/src/main/java/org/mifosng/platform/api/LoansApiResource.java
+2 -2
View File
@@ -180,7 +180,7 @@ public class LoansApiResource {
int loanRepaymentsCount = 0; int loanRepaymentsCount = 0;
Collection<LoanRepaymentTransactionData> loanRepayments = null; Collection<LoanRepaymentTransactionData> loanRepayments = null;
NewLoanScheduleData repaymentSchedule = null; LoanScheduleNewData repaymentSchedule = null;
LoanPermissionData permissions = null; LoanPermissionData permissions = null;
Collection<LoanChargeData> charges = null; Collection<LoanChargeData> charges = null;
@@ -283,7 +283,7 @@ public class LoansApiResource {
private String calculateLoanSchedule(final UriInfo uriInfo, final CalculateLoanScheduleCommand command) { 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<String> typicalLoanScheduleResponseParameters = new HashSet<String>( final Set<String> typicalLoanScheduleResponseParameters = new HashSet<String>(
Arrays.asList("periods", "cumulativePrincipalDisbursed")); Arrays.asList("periods", "cumulativePrincipalDisbursed"));
mifosng-provider/src/main/java/org/mifosng/platform/api/data/LoanAccountData.java
+3 -3
View File
@@ -4,7 +4,7 @@ import java.math.BigDecimal;
import java.util.Collection; import java.util.Collection;
import org.joda.time.LocalDate; import org.joda.time.LocalDate;
import org.mifosng.platform.api.NewLoanScheduleData; import org.mifosng.platform.api.LoanScheduleNewData;
/** /**
* Immutable data object representing loan account data. * Immutable data object representing loan account data.
@@ -53,7 +53,7 @@ public class LoanAccountData {
private final LocalDate lifeCycleStatusDate; private final LocalDate lifeCycleStatusDate;
// associations // associations
private final NewLoanScheduleData repaymentSchedule; private final LoanScheduleNewData repaymentSchedule;
private final Collection<LoanRepaymentTransactionData> loanRepayments; private final Collection<LoanRepaymentTransactionData> loanRepayments;
private final Collection<LoanChargeData> charges; private final Collection<LoanChargeData> charges;
private final LoanPermissionData permissions; private final LoanPermissionData permissions;
@@ -76,7 +76,7 @@ public class LoanAccountData {
public LoanAccountData( public LoanAccountData(
final LoanBasicDetailsData basicDetails, final LoanBasicDetailsData basicDetails,
final boolean convenienceDataRequired, final boolean convenienceDataRequired,
final NewLoanScheduleData repaymentSchedule, final LoanScheduleNewData repaymentSchedule,
final Collection<LoanRepaymentTransactionData> loanRepayments, final Collection<LoanRepaymentTransactionData> loanRepayments,
final LoanPermissionData permissions, final LoanPermissionData permissions,
final Collection<LoanChargeData> charges, final Collection<LoanChargeData> charges,
mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/ApiJsonSerializerService.java
+2 -2
View File
@@ -3,7 +3,7 @@ package org.mifosng.platform.api.infrastructure;
import java.util.Collection; import java.util.Collection;
import java.util.Set; 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.AdditionalFieldsSetData;
import org.mifosng.platform.api.data.AppUserData; import org.mifosng.platform.api.data.AppUserData;
import org.mifosng.platform.api.data.AuthenticatedUserData; import org.mifosng.platform.api.data.AuthenticatedUserData;
@@ -93,7 +93,7 @@ public interface ApiJsonSerializerService {
String serializeNoteDataToJson(boolean prettyPrint, Set<String> responseParameters, NoteData note); String serializeNoteDataToJson(boolean prettyPrint, Set<String> responseParameters, NoteData note);
String serializeLoanScheduleDataToJson(boolean prettyPrint, Set<String> responseParameters, NewLoanScheduleData loanSchedule); String serializeLoanScheduleDataToJson(boolean prettyPrint, Set<String> responseParameters, LoanScheduleNewData loanSchedule);
String serializeLoanAccountDataToJson(boolean prettyPrint, Set<String> responseParameters, LoanAccountData loanAccount); String serializeLoanAccountDataToJson(boolean prettyPrint, Set<String> responseParameters, LoanAccountData loanAccount);
mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/GoogleGsonApiJsonSerializerService.java
+2 -2
View File
@@ -5,7 +5,7 @@ import java.util.Collection;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; 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.AdditionalFieldsSetData;
import org.mifosng.platform.api.data.AppUserData; import org.mifosng.platform.api.data.AppUserData;
import org.mifosng.platform.api.data.AuthenticatedUserData; import org.mifosng.platform.api.data.AuthenticatedUserData;
@@ -499,7 +499,7 @@ public class GoogleGsonApiJsonSerializerService implements ApiJsonSerializerServ
} }
@Override @Override
public String serializeLoanScheduleDataToJson(final boolean prettyPrint, final Set<String> responseParameters, final NewLoanScheduleData loanSchedule) { public String serializeLoanScheduleDataToJson(final boolean prettyPrint, final Set<String> responseParameters, final LoanScheduleNewData loanSchedule) {
final Gson gsonDeserializer = helper final Gson gsonDeserializer = helper
.createGsonBuilderWithParameterExclusionSerializationStrategy(LOAN_SCHEDULE_DATA_PARAMETERS, prettyPrint, responseParameters); .createGsonBuilderWithParameterExclusionSerializationStrategy(LOAN_SCHEDULE_DATA_PARAMETERS, prettyPrint, responseParameters);
return helper.serializedJsonFrom(gsonDeserializer, loanSchedule); return helper.serializedJsonFrom(gsonDeserializer, loanSchedule);
mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/Loan.java
+2 -2
View File
@@ -27,7 +27,7 @@ import org.hibernate.annotations.LazyCollection;
import org.hibernate.annotations.LazyCollectionOption; import org.hibernate.annotations.LazyCollectionOption;
import org.joda.time.DateTime; import org.joda.time.DateTime;
import org.joda.time.LocalDate; 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.commands.LoanApplicationCommand;
import org.mifosng.platform.api.data.LoanSchedulePeriodData; import org.mifosng.platform.api.data.LoanSchedulePeriodData;
import org.mifosng.platform.client.domain.Client; import org.mifosng.platform.client.domain.Client;
@@ -243,7 +243,7 @@ public class Loan extends AbstractAuditableCustom<AppUser, Long> {
} }
public void modifyLoanApplication(final LoanApplicationCommand command, final Client client, final LoanProduct loanProduct, public void modifyLoanApplication(final LoanApplicationCommand command, final Client client, final LoanProduct loanProduct,
final Fund fund, final LoanTransactionProcessingStrategy strategy, final NewLoanScheduleData modifiedLoanSchedule, final Set<LoanCharge> charges, final Fund fund, final LoanTransactionProcessingStrategy strategy, final LoanScheduleNewData modifiedLoanSchedule, final Set<LoanCharge> charges,
final Staff loanOfficer) { final Staff loanOfficer) {
if (command.isClientChanged()) { if (command.isClientChanged()) {
mifosng-provider/src/main/java/org/mifosng/platform/loan/service/CalculationPlatformService.java
+2 -2
View File
@@ -1,12 +1,12 @@
package org.mifosng.platform.loan.service; package org.mifosng.platform.loan.service;
import org.joda.time.LocalDate; 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.commands.CalculateLoanScheduleCommand;
public interface CalculationPlatformService { public interface CalculationPlatformService {
NewLoanScheduleData calculateLoanScheduleNew(CalculateLoanScheduleCommand command); LoanScheduleNewData calculateLoanScheduleNew(CalculateLoanScheduleCommand command);
/** /**
* Not used at present from application. * Not used at present from application.
mifosng-provider/src/main/java/org/mifosng/platform/loan/service/CalculationPlatformServiceImpl.java
+2 -2
View File
@@ -1,7 +1,7 @@
package org.mifosng.platform.loan.service; package org.mifosng.platform.loan.service;
import org.joda.time.LocalDate; 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.commands.CalculateLoanScheduleCommand;
import org.mifosng.platform.api.data.CurrencyData; import org.mifosng.platform.api.data.CurrencyData;
import org.mifosng.platform.api.data.MoneyData; import org.mifosng.platform.api.data.MoneyData;
@@ -45,7 +45,7 @@ public class CalculationPlatformServiceImpl implements CalculationPlatformServic
} }
@Override @Override
public NewLoanScheduleData calculateLoanScheduleNew(final CalculateLoanScheduleCommand command) { public LoanScheduleNewData calculateLoanScheduleNew(final CalculateLoanScheduleCommand command) {
context.authenticatedUser(); context.authenticatedUser();
mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanAssembler.java
+2 -2
View File
@@ -6,7 +6,7 @@ import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Set; 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.LoanApplicationCommand;
import org.mifosng.platform.api.commands.LoanChargeCommand; import org.mifosng.platform.api.commands.LoanChargeCommand;
import org.mifosng.platform.api.data.LoanSchedulePeriodData; 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 loan = Loan.createNew(fund,loanOfficer, loanTransactionProcessingStrategy, loanProduct, client, loanRepaymentScheduleDetail, loanCharges);
loan.setExternalId(command.getExternalId()); 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()) { for (LoanSchedulePeriodData scheduledLoanInstallment : loanSchedule.getPeriods()) {
if (scheduledLoanInstallment.isRepaymentPeriod()) { if (scheduledLoanInstallment.isRepaymentPeriod()) {
mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanReadPlatformService.java
+2 -2
View File
@@ -2,7 +2,7 @@ package org.mifosng.platform.loan.service;
import java.util.Collection; 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.CurrencyData;
import org.mifosng.platform.api.data.DisbursementData; import org.mifosng.platform.api.data.DisbursementData;
import org.mifosng.platform.api.data.LoanBasicDetailsData; import org.mifosng.platform.api.data.LoanBasicDetailsData;
@@ -14,7 +14,7 @@ public interface LoanReadPlatformService {
LoanBasicDetailsData retrieveLoanAccountDetails(Long loanId); LoanBasicDetailsData retrieveLoanAccountDetails(Long loanId);
NewLoanScheduleData retrieveRepaymentSchedule(Long loanId, CurrencyData currency, DisbursementData disbursement); LoanScheduleNewData retrieveRepaymentSchedule(Long loanId, CurrencyData currency, DisbursementData disbursement);
Collection<LoanRepaymentTransactionData> retrieveLoanPayments(Long loanId); Collection<LoanRepaymentTransactionData> retrieveLoanPayments(Long loanId);
mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanReadPlatformServiceImpl.java
+3 -3
View File
@@ -7,7 +7,7 @@ import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import org.joda.time.LocalDate; 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.ClientData;
import org.mifosng.platform.api.data.CurrencyData; import org.mifosng.platform.api.data.CurrencyData;
import org.mifosng.platform.api.data.DisbursementData; import org.mifosng.platform.api.data.DisbursementData;
@@ -91,7 +91,7 @@ public class LoanReadPlatformServiceImpl implements LoanReadPlatformService {
} }
@Override @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 { try {
context.authenticatedUser(); context.authenticatedUser();
@@ -129,7 +129,7 @@ public class LoanReadPlatformServiceImpl implements LoanReadPlatformService {
final BigDecimal totalOutstanding = cumulativePrincipalOutstanding.add(cumulativeInterestOutstanding).add(cumulativeChargesOutstanding); final BigDecimal totalOutstanding = cumulativePrincipalOutstanding.add(cumulativeInterestOutstanding).add(cumulativeChargesOutstanding);
final BigDecimal totalInArrears = null; final BigDecimal totalInArrears = null;
return new NewLoanScheduleData(currency, periods, loanTermInDays, return new LoanScheduleNewData(currency, periods, loanTermInDays,
cumulativePrincipalDisbursed, cumulativePrincipalDue, cumulativePrincipalPaid, cumulativePrincipalOutstanding, cumulativePrincipalDisbursed, cumulativePrincipalDue, cumulativePrincipalPaid, cumulativePrincipalOutstanding,
cumulativeInterestExpected, cumulativeInterestPaid, cumulativeInterestWaived, cumulativeInterestOutstanding, cumulativeInterestExpected, cumulativeInterestPaid, cumulativeInterestWaived, cumulativeInterestOutstanding,
cumulativeChargesToDate, cumulativeChargesPaid, cumulativeChargesOutstanding, cumulativeChargesToDate, cumulativeChargesPaid, cumulativeChargesOutstanding,
mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanWritePlatformServiceJpaRepositoryImpl.java
+3 -3
View File
@@ -8,7 +8,7 @@ import java.util.Set;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.joda.time.LocalDate; 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.AdjustLoanTransactionCommand;
import org.mifosng.platform.api.commands.CalculateLoanScheduleCommand; import org.mifosng.platform.api.commands.CalculateLoanScheduleCommand;
import org.mifosng.platform.api.commands.LoanApplicationCommand; import org.mifosng.platform.api.commands.LoanApplicationCommand;
@@ -146,7 +146,7 @@ public class LoanWritePlatformServiceJpaRepositoryImpl implements LoanWritePlatf
LoanTransactionProcessingStrategy strategy = this.loanAssembler.findStrategyByIdIfProvided(command.getTransactionProcessingStrategyId()); LoanTransactionProcessingStrategy strategy = this.loanAssembler.findStrategyByIdIfProvided(command.getTransactionProcessingStrategyId());
Set<LoanCharge> charges = this.loanAssembler.assembleSetOfLoanCharges(command.getCharges(), loanProduct.getCharges(), loan.getCurrency().getCode()); Set<LoanCharge> 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); loan.modifyLoanApplication(command, client, loanProduct, fund, strategy, loanSchedule, charges, loanOfficer);
this.loanRepository.save(loan); this.loanRepository.save(loan);
@@ -350,7 +350,7 @@ public class LoanWritePlatformServiceJpaRepositoryImpl implements LoanWritePlatf
loanTermFrequency, loanTermFrequencyType, loanTermFrequency, loanTermFrequencyType,
actualDisbursementDate, repaymentsStartingFromDate, interestCalculatedFromDate); actualDisbursementDate, repaymentsStartingFromDate, interestCalculatedFromDate);
NewLoanScheduleData loanSchedule = this.calculationPlatformService.calculateLoanScheduleNew(calculateCommand); LoanScheduleNewData loanSchedule = this.calculationPlatformService.calculateLoanScheduleNew(calculateCommand);
List<LoanRepaymentScheduleInstallment> modifiedLoanRepaymentSchedule = new ArrayList<LoanRepaymentScheduleInstallment>(); List<LoanRepaymentScheduleInstallment> modifiedLoanRepaymentSchedule = new ArrayList<LoanRepaymentScheduleInstallment>();
mifosng-provider/src/main/java/org/mifosng/platform/loanschedule/domain/AmortizationLoanScheduleGenerator.java
+2 -2
View File
@@ -4,13 +4,13 @@ import java.math.BigDecimal;
import java.util.List; import java.util.List;
import org.joda.time.LocalDate; 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.currency.domain.ApplicationCurrency;
import org.mifosng.platform.loan.domain.LoanProductRelatedDetail; import org.mifosng.platform.loan.domain.LoanProductRelatedDetail;
public interface AmortizationLoanScheduleGenerator { public interface AmortizationLoanScheduleGenerator {
NewLoanScheduleData generate( LoanScheduleNewData generate(
ApplicationCurrency applicationCurrency, ApplicationCurrency applicationCurrency,
LoanProductRelatedDetail loanScheduleInfo, LoanProductRelatedDetail loanScheduleInfo,
LocalDate disbursementDate, LocalDate disbursementDate,
mifosng-provider/src/main/java/org/mifosng/platform/loanschedule/domain/DecliningBalanceMethodLoanScheduleGenerator.java
+2 -2
View File
@@ -4,7 +4,7 @@ import java.math.BigDecimal;
import java.util.List; import java.util.List;
import org.joda.time.LocalDate; 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.currency.domain.ApplicationCurrency;
import org.mifosng.platform.loan.domain.AmortizationMethod; import org.mifosng.platform.loan.domain.AmortizationMethod;
import org.mifosng.platform.loan.domain.LoanProductRelatedDetail; import org.mifosng.platform.loan.domain.LoanProductRelatedDetail;
@@ -34,7 +34,7 @@ public class DecliningBalanceMethodLoanScheduleGenerator implements LoanSchedule
private final AmortizationLoanScheduleGeneratorFactory amortizationLoanScheduleGeneratorFactory = new AmortizationLoanScheduleGeneratorFactory(); private final AmortizationLoanScheduleGeneratorFactory amortizationLoanScheduleGeneratorFactory = new AmortizationLoanScheduleGeneratorFactory();
@Override @Override
public NewLoanScheduleData generate( public LoanScheduleNewData generate(
final ApplicationCurrency applicationCurrency, final ApplicationCurrency applicationCurrency,
final LoanProductRelatedDetail loanScheduleInfo, final LoanProductRelatedDetail loanScheduleInfo,
final Integer loanTermFrequency, final Integer loanTermFrequency,
mifosng-provider/src/main/java/org/mifosng/platform/loanschedule/domain/EqualInstallmentsAmortizationLoanScheduleGenerator.java
+3 -3
View File
@@ -7,7 +7,7 @@ import java.util.List;
import org.joda.time.Days; import org.joda.time.Days;
import org.joda.time.LocalDate; 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.CurrencyData;
import org.mifosng.platform.api.data.LoanSchedulePeriodData; import org.mifosng.platform.api.data.LoanSchedulePeriodData;
import org.mifosng.platform.currency.domain.ApplicationCurrency; import org.mifosng.platform.currency.domain.ApplicationCurrency;
@@ -25,7 +25,7 @@ public class EqualInstallmentsAmortizationLoanScheduleGenerator implements Amort
private final PmtCalculator pmtCalculator = new PmtCalculator(); private final PmtCalculator pmtCalculator = new PmtCalculator();
@Override @Override
public NewLoanScheduleData generate( public LoanScheduleNewData generate(
final ApplicationCurrency currency, final ApplicationCurrency currency,
final LoanProductRelatedDetail loanScheduleInfo, final LoanProductRelatedDetail loanScheduleInfo,
final LocalDate disbursementDate, final LocalDate disbursementDate,
@@ -137,7 +137,7 @@ public class EqualInstallmentsAmortizationLoanScheduleGenerator implements Amort
currency.getDisplaySymbol(), currency.getDisplaySymbol(),
currency.getNameCode()); currency.getNameCode());
return new NewLoanScheduleData(currencyData, periods, loanTermInDays, cumulativePrincipalDisbursed, cumulativePrincipalDue, return new LoanScheduleNewData(currencyData, periods, loanTermInDays, cumulativePrincipalDisbursed, cumulativePrincipalDue,
cumulativePrincipalOutstanding, cumulativeInterestExpected, cumulativeChargesToDate, totalExpectedRepayment); cumulativePrincipalOutstanding, cumulativeInterestExpected, cumulativeChargesToDate, totalExpectedRepayment);
} }
} }
mifosng-provider/src/main/java/org/mifosng/platform/loanschedule/domain/EqualPrincipalAmortizationLoanScheduleGenerator.java
+3 -3
View File
@@ -7,7 +7,7 @@ import java.util.List;
import org.joda.time.Days; import org.joda.time.Days;
import org.joda.time.LocalDate; 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.CurrencyData;
import org.mifosng.platform.api.data.LoanSchedulePeriodData; import org.mifosng.platform.api.data.LoanSchedulePeriodData;
import org.mifosng.platform.currency.domain.ApplicationCurrency; import org.mifosng.platform.currency.domain.ApplicationCurrency;
@@ -21,7 +21,7 @@ public class EqualPrincipalAmortizationLoanScheduleGenerator implements Amortiza
private final PaymentPeriodsInOneYearCalculator paymentPeriodsInOneYearCalculator = new DefaultPaymentPeriodsInOneYearCalculator(); private final PaymentPeriodsInOneYearCalculator paymentPeriodsInOneYearCalculator = new DefaultPaymentPeriodsInOneYearCalculator();
@Override @Override
public NewLoanScheduleData generate( public LoanScheduleNewData generate(
ApplicationCurrency currency, ApplicationCurrency currency,
LoanProductRelatedDetail loanScheduleInfo, LoanProductRelatedDetail loanScheduleInfo,
LocalDate disbursementDate, LocalDate firstRepaymentDate, LocalDate disbursementDate, LocalDate firstRepaymentDate,
@@ -117,7 +117,7 @@ public class EqualPrincipalAmortizationLoanScheduleGenerator implements Amortiza
currency.getDisplaySymbol(), currency.getDisplaySymbol(),
currency.getNameCode()); currency.getNameCode());
return new NewLoanScheduleData(currencyData, periods, loanTermInDays, cumulativePrincipalDisbursed, cumulativePrincipalDue, return new LoanScheduleNewData(currencyData, periods, loanTermInDays, cumulativePrincipalDisbursed, cumulativePrincipalDue,
cumulativePrincipalOutstanding, cumulativeInterestExpected, cumulativeChargesToDate, totalExpectedRepayment); cumulativePrincipalOutstanding, cumulativeInterestExpected, cumulativeChargesToDate, totalExpectedRepayment);
} }
} }
mifosng-provider/src/main/java/org/mifosng/platform/loanschedule/domain/FlatMethodLoanScheduleGenerator.java
+3 -3
View File
@@ -9,7 +9,7 @@ import java.util.List;
import org.joda.time.Days; import org.joda.time.Days;
import org.joda.time.LocalDate; 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.CurrencyData;
import org.mifosng.platform.api.data.LoanSchedulePeriodData; import org.mifosng.platform.api.data.LoanSchedulePeriodData;
import org.mifosng.platform.currency.domain.ApplicationCurrency; import org.mifosng.platform.currency.domain.ApplicationCurrency;
@@ -24,7 +24,7 @@ public class FlatMethodLoanScheduleGenerator implements LoanScheduleGenerator {
private final PaymentPeriodsInOneYearCalculator paymentPeriodsInOneYearCalculator = new DefaultPaymentPeriodsInOneYearCalculator(); private final PaymentPeriodsInOneYearCalculator paymentPeriodsInOneYearCalculator = new DefaultPaymentPeriodsInOneYearCalculator();
@Override @Override
public NewLoanScheduleData generate( public LoanScheduleNewData generate(
final ApplicationCurrency currency, final ApplicationCurrency currency,
final LoanProductRelatedDetail loanScheduleInfo, final LoanProductRelatedDetail loanScheduleInfo,
final Integer loanTermFrequency, final Integer loanTermFrequency,
@@ -125,7 +125,7 @@ public class FlatMethodLoanScheduleGenerator implements LoanScheduleGenerator {
currency.getDisplaySymbol(), currency.getDisplaySymbol(),
currency.getNameCode()); currency.getNameCode());
return new NewLoanScheduleData(currencyData, periods, loanTermInDays, cumulativePrincipalDisbursed, cumulativePrincipalDue, return new LoanScheduleNewData(currencyData, periods, loanTermInDays, cumulativePrincipalDisbursed, cumulativePrincipalDue,
cumulativePrincipalOutstanding, cumulativeInterestExpected, cumulativeChargesToDate, totalExpectedRepayment); cumulativePrincipalOutstanding, cumulativeInterestExpected, cumulativeChargesToDate, totalExpectedRepayment);
} }
} }
mifosng-provider/src/main/java/org/mifosng/platform/loanschedule/domain/LoanScheduleGenerator.java
+2 -2
View File
@@ -1,14 +1,14 @@
package org.mifosng.platform.loanschedule.domain; package org.mifosng.platform.loanschedule.domain;
import org.joda.time.LocalDate; 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.currency.domain.ApplicationCurrency;
import org.mifosng.platform.loan.domain.LoanProductRelatedDetail; import org.mifosng.platform.loan.domain.LoanProductRelatedDetail;
import org.mifosng.platform.loan.domain.PeriodFrequencyType; import org.mifosng.platform.loan.domain.PeriodFrequencyType;
public interface LoanScheduleGenerator { public interface LoanScheduleGenerator {
NewLoanScheduleData generate(ApplicationCurrency applicationCurrency, LoanScheduleNewData generate(ApplicationCurrency applicationCurrency,
LoanProductRelatedDetail loanScheduleInfo, LoanProductRelatedDetail loanScheduleInfo,
Integer loanTermFrequency, Integer loanTermFrequency,
PeriodFrequencyType loanTermFrequencyType, PeriodFrequencyType loanTermFrequencyType,