From 6a0f4b3f6fc1f580e48c2f6b568b3b265bbce87e Mon Sep 17 00:00:00 2001 From: Keith Woodlock Date: Wed, 30 May 2012 16:12:13 +0100 Subject: [PATCH] align loan product data with field names used for create. return enumerations with extra information that describe it better. --- .../java/org/mifosng/data/EnumOptionData.java | 19 +- .../java/org/mifosng/data/EnumOptionList.java | 29 -- .../org/mifosng/data/LoanProductData.java | 259 ------------------ .../mifosng/data/LoanRepaymentPeriodData.java | 2 +- .../java/org/mifosng/data/LoanSchedule.java | 2 +- .../main/java/org/mifosng/data/MoneyData.java | 24 +- .../mifosng/data/OrganisationReadModel.java | 60 ---- .../data/ScheduledLoanInstallment.java | 2 +- .../data/command/KeyValueInformation.java | 35 --- .../UpdateClientInformationCommand.java | 40 --- .../WEB-INF/views/admin/accountsettings.jsp | 4 +- .../webapp/WEB-INF/views/admin/orghome.jsp | 4 +- .../webapp/WEB-INF/views/admin/userhome.jsp | 4 +- .../views/administration-view-templates.jsp | 30 +- .../views/client/viewClientAccount.jsp | 4 +- .../src/main/webapp/WEB-INF/views/home.jsp | 4 +- .../WEB-INF/views/newloanapplication.jsp | 4 +- .../webapp/WEB-INF/views/view-templates.jsp | 30 +- .../platform/api/ClientApiResource.java | 4 +- .../platform/api/LoanProductApiResource.java | 6 +- .../platform/api/LoansApiResource.java | 2 +- .../platform/api/OfficeApiResource.java | 2 +- .../platform/api/PermissionApiResource.java | 2 +- .../mifosng/platform/api/RoleApiResource.java | 4 +- .../mifosng/platform/api/UserApiResource.java | 2 +- .../platform/api}/data/AppUserData.java | 2 +- .../platform/api}/data/ClientData.java | 2 +- .../platform/api/data/LoanProductData.java | 258 +++++++++++++++++ .../api}/data/NewLoanWorkflowStepOneData.java | 3 +- .../platform/api}/data/OfficeData.java | 2 +- .../platform/api}/data/OfficeLookup.java | 2 +- .../platform/api}/data/PermissionData.java | 2 +- .../mifosng/platform/api}/data/RoleData.java | 2 +- .../service/ClientReadPlatformService.java | 2 +- .../ClientReadPlatformServiceImpl.java | 8 +- .../loan/domain/AmortizationMethod.java | 12 +- .../loan/domain/DerivedLoanDataProcessor.java | 2 +- .../InterestCalculationPeriodMethod.java | 12 +- .../platform/loan/domain/InterestMethod.java | 12 +- .../loan/domain/PeriodFrequencyType.java | 10 +- .../loan/service/LoanReadPlatformService.java | 2 +- .../service/LoanReadPlatformServiceImpl.java | 6 +- ...WritePlatformServiceJpaRepositoryImpl.java | 2 +- .../LoanDropdownReadPlatformService.java | 8 +- .../LoanDropdownReadPlatformServiceImpl.java | 87 ++---- .../loanproduct/service/LoanEnumerations.java | 115 ++++++++ .../LoanProductReadPlatformService.java | 2 +- .../LoanProductReadPlatformServiceImpl.java | 91 +++--- .../service/OfficeReadPlatformService.java | 4 +- .../OfficeReadPlatformServiceImpl.java | 4 +- .../platform/rest/LoanOpenResource.java | 3 +- .../platform/user/domain/Permission.java | 2 +- .../mifosng/platform/user/domain/Role.java | 4 +- .../service/AppUserReadPlatformService.java | 2 +- .../AppUserReadPlatformServiceImpl.java | 8 +- .../PermissionReadPlatformService.java | 2 +- .../PermissionReadPlatformServiceImpl.java | 2 +- .../user/service/RoleReadPlatformService.java | 2 +- .../service/RoleReadPlatformServiceImpl.java | 2 +- 59 files changed, 608 insertions(+), 649 deletions(-) delete mode 100644 mifosng-data/src/main/java/org/mifosng/data/EnumOptionList.java delete mode 100644 mifosng-data/src/main/java/org/mifosng/data/LoanProductData.java delete mode 100644 mifosng-data/src/main/java/org/mifosng/data/OrganisationReadModel.java delete mode 100644 mifosng-data/src/main/java/org/mifosng/data/command/KeyValueInformation.java delete mode 100644 mifosng-data/src/main/java/org/mifosng/data/command/UpdateClientInformationCommand.java rename {mifosng-data/src/main/java/org/mifosng => mifosng-provider/src/main/java/org/mifosng/platform/api}/data/AppUserData.java (98%) rename {mifosng-data/src/main/java/org/mifosng => mifosng-provider/src/main/java/org/mifosng/platform/api}/data/ClientData.java (98%) create mode 100644 mifosng-provider/src/main/java/org/mifosng/platform/api/data/LoanProductData.java rename {mifosng-data/src/main/java/org/mifosng => mifosng-provider/src/main/java/org/mifosng/platform/api}/data/NewLoanWorkflowStepOneData.java (98%) rename {mifosng-data/src/main/java/org/mifosng => mifosng-provider/src/main/java/org/mifosng/platform/api}/data/OfficeData.java (98%) rename {mifosng-data/src/main/java/org/mifosng => mifosng-provider/src/main/java/org/mifosng/platform/api}/data/OfficeLookup.java (91%) rename {mifosng-data/src/main/java/org/mifosng => mifosng-provider/src/main/java/org/mifosng/platform/api}/data/PermissionData.java (97%) rename {mifosng-data/src/main/java/org/mifosng => mifosng-provider/src/main/java/org/mifosng/platform/api}/data/RoleData.java (98%) create mode 100644 mifosng-provider/src/main/java/org/mifosng/platform/loanproduct/service/LoanEnumerations.java diff --git a/mifosng-data/src/main/java/org/mifosng/data/EnumOptionData.java b/mifosng-data/src/main/java/org/mifosng/data/EnumOptionData.java index 9ffc41dc6..7e207cc83 100644 --- a/mifosng-data/src/main/java/org/mifosng/data/EnumOptionData.java +++ b/mifosng-data/src/main/java/org/mifosng/data/EnumOptionData.java @@ -2,21 +2,20 @@ package org.mifosng.data; import java.io.Serializable; -import javax.xml.bind.annotation.XmlRootElement; - -@XmlRootElement(name = "option") public class EnumOptionData implements Serializable { private Long id; + private String code; private String value; - public EnumOptionData() { + protected EnumOptionData() { // } - public EnumOptionData(final String value, final Long id) { - this.value = value; + public EnumOptionData(final Long id, final String code, final String value) { this.id = id; + this.code = code; + this.value = value; } public Long getId() { @@ -34,4 +33,12 @@ public class EnumOptionData implements Serializable { public void setValue(final String value) { this.value = value; } + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } } \ No newline at end of file diff --git a/mifosng-data/src/main/java/org/mifosng/data/EnumOptionList.java b/mifosng-data/src/main/java/org/mifosng/data/EnumOptionList.java deleted file mode 100644 index a74c5b61d..000000000 --- a/mifosng-data/src/main/java/org/mifosng/data/EnumOptionList.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.mifosng.data; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -import javax.xml.bind.annotation.XmlRootElement; - -@XmlRootElement -public class EnumOptionList { - - private Collection options = new ArrayList(); - - protected EnumOptionList() { - // - } - - public EnumOptionList(final List options) { - this.options = options; - } - - public Collection getOptions() { - return this.options; - } - - public void setOptions(final Collection options) { - this.options = options; - } -} \ No newline at end of file diff --git a/mifosng-data/src/main/java/org/mifosng/data/LoanProductData.java b/mifosng-data/src/main/java/org/mifosng/data/LoanProductData.java deleted file mode 100644 index 36ec73b91..000000000 --- a/mifosng-data/src/main/java/org/mifosng/data/LoanProductData.java +++ /dev/null @@ -1,259 +0,0 @@ -package org.mifosng.data; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.List; - -import org.codehaus.jackson.map.annotate.JsonFilter; -import org.joda.time.DateTime; - -@JsonFilter("myFilter") -public class LoanProductData implements Serializable { - - private Long id; - private String name; - private String description; - private MoneyData principalMoney; - private BigDecimal interestRatePerPeriod = BigDecimal.ZERO; - private int interestRatePeriod; - private BigDecimal annualInterestRate = BigDecimal.ZERO; - private int interestMethod; - private int interestRateCalculatedInPeriod; - - private Integer numberOfInterestFreePeriods = Integer.valueOf(0); - private Integer repaidEvery; - private int repaymentPeriodFrequency; - private Integer numberOfRepayments; - private int amortizationMethod; - private MoneyData inArrearsTolerance; - private DateTime createdOn; - private DateTime lastModifedOn; - - private List possibleCurrencies = new ArrayList(); - private List possibleAmortizationOptions = new ArrayList(); - private List possibleInterestOptions = new ArrayList(); - private List possibleInterestRateCalculatedInPeriodOptions = new ArrayList(); - private List repaymentFrequencyOptions = new ArrayList(); - private List interestFrequencyOptions = new ArrayList(); - - public LoanProductData() { - // - } - - public LoanProductData(final Long id, final String name, - String description, - final MoneyData principalMoney, - final BigDecimal interestRatePerPeriod, - final int interestRatePeriod, final BigDecimal annualInterestRate, - final int interestMethod, final int interestCalculationInPeriodMethod, - final Integer repaidEvery, - final int repaymentPeriodFrequency, final Integer numberOfRepayments, - final int amortizationMethod, MoneyData inArrearsTolerance, DateTime createdOn, DateTime lastModifedOn) { - this.id = id; - this.name = name; - this.description = description; - this.principalMoney = principalMoney; - this.interestRatePerPeriod = interestRatePerPeriod; - this.interestRatePeriod = interestRatePeriod; - this.annualInterestRate = annualInterestRate; - this.interestMethod = interestMethod; - this.interestRateCalculatedInPeriod = interestCalculationInPeriodMethod; - this.numberOfRepayments = numberOfRepayments; - this.repaidEvery = repaidEvery; - this.repaymentPeriodFrequency = repaymentPeriodFrequency; - this.amortizationMethod = amortizationMethod; - this.inArrearsTolerance = inArrearsTolerance; - this.createdOn = createdOn; - this.lastModifedOn = lastModifedOn; - } - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public MoneyData getPrincipalMoney() { - return principalMoney; - } - - public void setPrincipalMoney(MoneyData principalMoney) { - this.principalMoney = principalMoney; - } - - public BigDecimal getInterestRatePerPeriod() { - return interestRatePerPeriod; - } - - public void setInterestRatePerPeriod(BigDecimal interestRatePerPeriod) { - this.interestRatePerPeriod = interestRatePerPeriod; - } - - public int getInterestRatePeriod() { - return interestRatePeriod; - } - - public void setInterestRatePeriod(int interestRatePeriod) { - this.interestRatePeriod = interestRatePeriod; - } - - public BigDecimal getAnnualInterestRate() { - return annualInterestRate; - } - - public void setAnnualInterestRate(BigDecimal annualInterestRate) { - this.annualInterestRate = annualInterestRate; - } - - public int getInterestMethod() { - return interestMethod; - } - - public void setInterestMethod(int interestMethod) { - this.interestMethod = interestMethod; - } - - public Integer getRepaidEvery() { - return repaidEvery; - } - - public void setRepaidEvery(Integer repaidEvery) { - this.repaidEvery = repaidEvery; - } - - public int getRepaymentPeriodFrequency() { - return repaymentPeriodFrequency; - } - - public void setRepaymentPeriodFrequency(int repaymentPeriodFrequency) { - this.repaymentPeriodFrequency = repaymentPeriodFrequency; - } - - public Integer getNumberOfRepayments() { - return numberOfRepayments; - } - - public void setNumberOfRepayments(Integer numberOfRepayments) { - this.numberOfRepayments = numberOfRepayments; - } - - public int getAmortizationMethod() { - return amortizationMethod; - } - - public void setAmortizationMethod(int amortizationMethod) { - this.amortizationMethod = amortizationMethod; - } - - public MoneyData getInArrearsTolerance() { - return inArrearsTolerance; - } - - public void setInArrearsTolerance(MoneyData inArrearsTolerance) { - this.inArrearsTolerance = inArrearsTolerance; - } - - public DateTime getCreatedOn() { - return createdOn; - } - - public void setCreatedOn(DateTime createdOn) { - this.createdOn = createdOn; - } - - public DateTime getLastModifedOn() { - return lastModifedOn; - } - - public void setLastModifedOn(DateTime lastModifedOn) { - this.lastModifedOn = lastModifedOn; - } - - public List getPossibleCurrencies() { - return possibleCurrencies; - } - - public void setPossibleCurrencies(List possibleCurrencies) { - this.possibleCurrencies = possibleCurrencies; - } - - public List getPossibleAmortizationOptions() { - return possibleAmortizationOptions; - } - - public void setPossibleAmortizationOptions( - List possibleAmortizationOptions) { - this.possibleAmortizationOptions = possibleAmortizationOptions; - } - - public List getPossibleInterestOptions() { - return possibleInterestOptions; - } - - public void setPossibleInterestOptions( - List possibleInterestOptions) { - this.possibleInterestOptions = possibleInterestOptions; - } - - public List getRepaymentFrequencyOptions() { - return repaymentFrequencyOptions; - } - - public void setRepaymentFrequencyOptions( - List repaymentFrequencyOptions) { - this.repaymentFrequencyOptions = repaymentFrequencyOptions; - } - - public List getInterestFrequencyOptions() { - return interestFrequencyOptions; - } - - public void setInterestFrequencyOptions( - List interestFrequencyOptions) { - this.interestFrequencyOptions = interestFrequencyOptions; - } - - public Integer getNumberOfInterestFreePeriods() { - return numberOfInterestFreePeriods; - } - - public void setNumberOfInterestFreePeriods(Integer numberOfInterestFreePeriods) { - this.numberOfInterestFreePeriods = numberOfInterestFreePeriods; - } - - public int getInterestRateCalculatedInPeriod() { - return interestRateCalculatedInPeriod; - } - - public void setInterestRateCalculatedInPeriod(int interestRateCalculatedInPeriod) { - this.interestRateCalculatedInPeriod = interestRateCalculatedInPeriod; - } - - public List getPossibleInterestRateCalculatedInPeriodOptions() { - return possibleInterestRateCalculatedInPeriodOptions; - } - - public void setPossibleInterestRateCalculatedInPeriodOptions( - List possibleInterestRateCalculatedInPeriodOptions) { - this.possibleInterestRateCalculatedInPeriodOptions = possibleInterestRateCalculatedInPeriodOptions; - } -} \ No newline at end of file diff --git a/mifosng-data/src/main/java/org/mifosng/data/LoanRepaymentPeriodData.java b/mifosng-data/src/main/java/org/mifosng/data/LoanRepaymentPeriodData.java index aacde326e..7f894dd23 100644 --- a/mifosng-data/src/main/java/org/mifosng/data/LoanRepaymentPeriodData.java +++ b/mifosng-data/src/main/java/org/mifosng/data/LoanRepaymentPeriodData.java @@ -29,7 +29,7 @@ public class LoanRepaymentPeriodData { private static CurrencyData currencyData(MoneyData moneyData) { String code = moneyData.getCurrencyCode(); String name = moneyData.getDefaultName(); - int decimalPlaces = moneyData.getCurrencyDigitsAfterDecimal(); + int decimalPlaces = moneyData.getDigitsAfterDecimal(); String displaySymbol = moneyData.getDisplaySymbol(); String nameCode = moneyData.getNameCode(); return new CurrencyData(code, name, decimalPlaces, displaySymbol, nameCode); diff --git a/mifosng-data/src/main/java/org/mifosng/data/LoanSchedule.java b/mifosng-data/src/main/java/org/mifosng/data/LoanSchedule.java index f512f9643..be93a2a80 100644 --- a/mifosng-data/src/main/java/org/mifosng/data/LoanSchedule.java +++ b/mifosng-data/src/main/java/org/mifosng/data/LoanSchedule.java @@ -14,7 +14,7 @@ public class LoanSchedule implements Serializable { private static CurrencyData currencyData(MoneyData moneyData) { String code = moneyData.getCurrencyCode(); String name = moneyData.getDefaultName(); - int decimalPlaces = moneyData.getCurrencyDigitsAfterDecimal(); + int decimalPlaces = moneyData.getDigitsAfterDecimal(); String displaySymbol = moneyData.getDisplaySymbol(); String nameCode = moneyData.getNameCode(); return new CurrencyData(code, name, decimalPlaces, displaySymbol, nameCode); diff --git a/mifosng-data/src/main/java/org/mifosng/data/MoneyData.java b/mifosng-data/src/main/java/org/mifosng/data/MoneyData.java index ffbd945a3..d6faaa99c 100644 --- a/mifosng-data/src/main/java/org/mifosng/data/MoneyData.java +++ b/mifosng-data/src/main/java/org/mifosng/data/MoneyData.java @@ -10,7 +10,7 @@ import javax.xml.bind.annotation.XmlRootElement; public class MoneyData implements Serializable, Comparable { private String currencyCode; - private Integer currencyDigitsAfterDecimal; + private Integer digitsAfterDecimal; private BigDecimal amount; private String defaultName; private String nameCode; @@ -33,12 +33,12 @@ public class MoneyData implements Serializable, Comparable { String defaultName, String nameCode, String displaySymbol, final BigDecimal amount) { this.currencyCode = currencyCode; - this.currencyDigitsAfterDecimal = currencyDigitsAfterDecimal; + this.digitsAfterDecimal = currencyDigitsAfterDecimal; this.defaultName = defaultName; this.nameCode = nameCode; this.displaySymbol = displaySymbol; BigDecimal amountStripped = amount.stripTrailingZeros(); - this.amount = amountStripped.setScale(this.currencyDigitsAfterDecimal, + this.amount = amountStripped.setScale(this.digitsAfterDecimal, RoundingMode.HALF_EVEN); } @@ -75,7 +75,7 @@ public class MoneyData implements Serializable, Comparable { private static CurrencyData currencyData(MoneyData moneyData) { String code = moneyData.getCurrencyCode(); String name = moneyData.getDefaultName(); - int decimalPlaces = moneyData.getCurrencyDigitsAfterDecimal(); + int decimalPlaces = moneyData.getDigitsAfterDecimal(); String displaySymbol = moneyData.getDisplaySymbol(); String nameCode = moneyData.getNameCode(); return new CurrencyData(code, name, decimalPlaces, displaySymbol, nameCode); @@ -96,10 +96,6 @@ public class MoneyData implements Serializable, Comparable { return this.currencyCode; } - public Integer getCurrencyDigitsAfterDecimal() { - return this.currencyDigitsAfterDecimal; - } - public BigDecimal getAmount() { return this.amount; } @@ -108,10 +104,6 @@ public class MoneyData implements Serializable, Comparable { this.currencyCode = currencyCode; } - public void setCurrencyDigitsAfterDecimal(final Integer currencyDigitsAfterDecimal) { - this.currencyDigitsAfterDecimal = currencyDigitsAfterDecimal; - } - public void setAmount(final BigDecimal amount) { this.amount = amount; } @@ -185,4 +177,12 @@ public class MoneyData implements Serializable, Comparable { public String getDisplaySymbolValue() { return new StringBuilder().append(this.amount.toPlainString()).append(' ').append(this.displaySymbol).toString().trim(); } + + public Integer getDigitsAfterDecimal() { + return digitsAfterDecimal; + } + + public void setDigitsAfterDecimal(Integer digitsAfterDecimal) { + this.digitsAfterDecimal = digitsAfterDecimal; + } } \ No newline at end of file diff --git a/mifosng-data/src/main/java/org/mifosng/data/OrganisationReadModel.java b/mifosng-data/src/main/java/org/mifosng/data/OrganisationReadModel.java deleted file mode 100644 index bf629a9b2..000000000 --- a/mifosng-data/src/main/java/org/mifosng/data/OrganisationReadModel.java +++ /dev/null @@ -1,60 +0,0 @@ -package org.mifosng.data; - -import java.io.Serializable; - -import javax.xml.bind.annotation.XmlRootElement; - -import org.joda.time.LocalDate; - -@XmlRootElement(name = "organisation") -public class OrganisationReadModel implements Serializable { - - private Long id; - private String name; - private String contactName; - private LocalDate openingDate; - - public OrganisationReadModel() { - // - } - - public OrganisationReadModel(final Long id, final String name, - final String contactName, final LocalDate openingDate) { - this.id = id; - this.name = name; - this.contactName = contactName; - this.openingDate = openingDate; - } - - public Long getId() { - return this.id; - } - - public String getName() { - return this.name; - } - - public String getContactName() { - return this.contactName; - } - - public LocalDate getOpeningDate() { - return this.openingDate; - } - - public void setId(final Long id) { - this.id = id; - } - - public void setName(final String name) { - this.name = name; - } - - public void setContactName(final String contactName) { - this.contactName = contactName; - } - - public void setOpeningDate(final LocalDate openingDate) { - this.openingDate = openingDate; - } -} \ No newline at end of file diff --git a/mifosng-data/src/main/java/org/mifosng/data/ScheduledLoanInstallment.java b/mifosng-data/src/main/java/org/mifosng/data/ScheduledLoanInstallment.java index 1bfdad631..7525bd66b 100644 --- a/mifosng-data/src/main/java/org/mifosng/data/ScheduledLoanInstallment.java +++ b/mifosng-data/src/main/java/org/mifosng/data/ScheduledLoanInstallment.java @@ -63,7 +63,7 @@ public class ScheduledLoanInstallment implements Serializable { private CurrencyData currencyData(MoneyData moneyData) { String code = moneyData.getCurrencyCode(); String name = moneyData.getDefaultName(); - int decimalPlaces = moneyData.getCurrencyDigitsAfterDecimal(); + int decimalPlaces = moneyData.getDigitsAfterDecimal(); String displaySymbol = moneyData.getDisplaySymbol(); String nameCode = moneyData.getNameCode(); return new CurrencyData(code, name, decimalPlaces, displaySymbol, nameCode); diff --git a/mifosng-data/src/main/java/org/mifosng/data/command/KeyValueInformation.java b/mifosng-data/src/main/java/org/mifosng/data/command/KeyValueInformation.java deleted file mode 100644 index 4f1ca2dc2..000000000 --- a/mifosng-data/src/main/java/org/mifosng/data/command/KeyValueInformation.java +++ /dev/null @@ -1,35 +0,0 @@ -package org.mifosng.data.command; - -import javax.xml.bind.annotation.XmlRootElement; - -@XmlRootElement -public class KeyValueInformation { - - private String key; - private String value; - - protected KeyValueInformation() { - // - } - - public KeyValueInformation(String key, String value) { - this.key = key; - this.value = value; - } - - public String getKey() { - return key; - } - - public void setKey(String key) { - this.key = key; - } - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } -} diff --git a/mifosng-data/src/main/java/org/mifosng/data/command/UpdateClientInformationCommand.java b/mifosng-data/src/main/java/org/mifosng/data/command/UpdateClientInformationCommand.java deleted file mode 100644 index b40069808..000000000 --- a/mifosng-data/src/main/java/org/mifosng/data/command/UpdateClientInformationCommand.java +++ /dev/null @@ -1,40 +0,0 @@ -package org.mifosng.data.command; - -import java.util.ArrayList; -import java.util.List; - -import javax.xml.bind.annotation.XmlRootElement; - -import org.mifosng.data.EntityIdentifier; - -@XmlRootElement -public class UpdateClientInformationCommand { - - private EntityIdentifier id; - private List fields = new ArrayList(); - - protected UpdateClientInformationCommand() { - // - } - - public UpdateClientInformationCommand(EntityIdentifier id, List fields) { - this.id = id; - this.fields = fields; - } - - public List getFields() { - return fields; - } - - public void setFields(List fields) { - this.fields = fields; - } - - public EntityIdentifier getId() { - return id; - } - - public void setId(EntityIdentifier id) { - this.id = id; - } -} \ No newline at end of file diff --git a/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/admin/accountsettings.jsp b/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/admin/accountsettings.jsp index f210d4719..78ff34410 100644 --- a/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/admin/accountsettings.jsp +++ b/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/admin/accountsettings.jsp @@ -32,14 +32,14 @@ $(document).ready(function() { Globalize.culture().numberFormat.currency.symbol = monetaryObj.displaySymbol; - var digits = monetaryObj.currencyDigitsAfterDecimal.toFixed(0); + var digits = monetaryObj.digitsAfterDecimal.toFixed(0); return Globalize.format(monetaryObj.amount, "n" + digits); }, moneyWithCurrency: function(monetaryObj) { Globalize.culture().numberFormat.currency.symbol = monetaryObj.displaySymbol; - var digits = monetaryObj.currencyDigitsAfterDecimal.toFixed(0); + var digits = monetaryObj.digitsAfterDecimal.toFixed(0); return Globalize.format(monetaryObj.amount, "c" + digits); }, decimal: function(number, digits) { diff --git a/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/admin/orghome.jsp b/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/admin/orghome.jsp index 73c73b90d..86a563beb 100644 --- a/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/admin/orghome.jsp +++ b/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/admin/orghome.jsp @@ -26,14 +26,14 @@ Globalize.culture().numberFormat.currency.symbol = monetaryObj.displaySymbol; - var digits = monetaryObj.currencyDigitsAfterDecimal.toFixed(0); + var digits = monetaryObj.digitsAfterDecimal.toFixed(0); return Globalize.format(monetaryObj.amount, "n" + digits); }, moneyWithCurrency: function(monetaryObj) { Globalize.culture().numberFormat.currency.symbol = monetaryObj.displaySymbol; - var digits = monetaryObj.currencyDigitsAfterDecimal.toFixed(0); + var digits = monetaryObj.digitsAfterDecimal.toFixed(0); return Globalize.format(monetaryObj.amount, "c" + digits); }, decimal: function(number, digits) { diff --git a/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/admin/userhome.jsp b/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/admin/userhome.jsp index e75ace628..5a2e2276c 100644 --- a/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/admin/userhome.jsp +++ b/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/admin/userhome.jsp @@ -25,14 +25,14 @@ $(document).ready(function() { Globalize.culture().numberFormat.currency.symbol = monetaryObj.displaySymbol; - var digits = monetaryObj.currencyDigitsAfterDecimal.toFixed(0); + var digits = monetaryObj.digitsAfterDecimal.toFixed(0); return Globalize.format(monetaryObj.amount, "n" + digits); }, moneyWithCurrency: function(monetaryObj) { Globalize.culture().numberFormat.currency.symbol = monetaryObj.displaySymbol; - var digits = monetaryObj.currencyDigitsAfterDecimal.toFixed(0); + var digits = monetaryObj.digitsAfterDecimal.toFixed(0); return Globalize.format(monetaryObj.amount, "c" + digits); }, decimal: function(number, digits) { diff --git a/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/administration-view-templates.jsp b/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/administration-view-templates.jsp index cf55bec09..8f44ee6f1 100644 --- a/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/administration-view-templates.jsp +++ b/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/administration-view-templates.jsp @@ -37,8 +37,8 @@ - +
@@ -58,17 +58,17 @@ - + - + - {{#each possibleAmortizationOptions}} - {{#if $ctx.number($parent.parent.data.amortizationMethod)===$ctx.number(id)}} + {{#each amortizationTypeOptions}} + {{#if $ctx.number($parent.parent.data.amortizationType.id)===$ctx.number(id)}} {{#else}} @@ -121,8 +121,8 @@ - {{#each possibleInterestRateCalculatedInPeriodOptions}} - {{#if $ctx.number($parent.parent.data.interestRateCalculatedInPeriod)===$ctx.number(id)}} + {{#each interestCalculationPeriodTypeOptions}} + {{#if $ctx.number($parent.parent.data.interestCalculationPeriodType.id)===$ctx.number(id)}} {{#else}} diff --git a/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/client/viewClientAccount.jsp b/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/client/viewClientAccount.jsp index cdaff0c3f..7fc4f1828 100644 --- a/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/client/viewClientAccount.jsp +++ b/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/client/viewClientAccount.jsp @@ -32,14 +32,14 @@ $(document).ready(function() { Globalize.culture().numberFormat.currency.symbol = monetaryObj.displaySymbol; - var digits = monetaryObj.currencyDigitsAfterDecimal.toFixed(0); + var digits = monetaryObj.digitsAfterDecimal.toFixed(0); return Globalize.format(monetaryObj.amount, "n" + digits); }, moneyWithCurrency: function(monetaryObj) { Globalize.culture().numberFormat.currency.symbol = monetaryObj.displaySymbol; - var digits = monetaryObj.currencyDigitsAfterDecimal.toFixed(0); + var digits = monetaryObj.digitsAfterDecimal.toFixed(0); return Globalize.format(monetaryObj.amount, "c" + digits); }, decimal: function(number, digits) { diff --git a/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/home.jsp b/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/home.jsp index 818a6b1aa..1ab3c9cdf 100644 --- a/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/home.jsp +++ b/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/home.jsp @@ -24,14 +24,14 @@ $(document).ready(function() { Globalize.culture().numberFormat.currency.symbol = monetaryObj.displaySymbol; - var digits = monetaryObj.currencyDigitsAfterDecimal.toFixed(0); + var digits = monetaryObj.digitsAfterDecimal.toFixed(0); return Globalize.format(monetaryObj.amount, "n" + digits); }, moneyWithCurrency: function(monetaryObj) { Globalize.culture().numberFormat.currency.symbol = monetaryObj.displaySymbol; - var digits = monetaryObj.currencyDigitsAfterDecimal.toFixed(0); + var digits = monetaryObj.digitsAfterDecimal.toFixed(0); return Globalize.format(monetaryObj.amount, "c" + digits); }, decimal: function(number, digits) { diff --git a/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/newloanapplication.jsp b/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/newloanapplication.jsp index 9d9eb75ff..69a4584c8 100644 --- a/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/newloanapplication.jsp +++ b/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/newloanapplication.jsp @@ -23,14 +23,14 @@ $(document).ready(function() { Globalize.culture().numberFormat.currency.symbol = monetaryObj.displaySymbol; - var digits = monetaryObj.currencyDigitsAfterDecimal.toFixed(0); + var digits = monetaryObj.digitsAfterDecimal.toFixed(0); return Globalize.format(monetaryObj.amount, "n" + digits); }, moneyWithCurrency: function(monetaryObj) { Globalize.culture().numberFormat.currency.symbol = monetaryObj.displaySymbol; - var digits = monetaryObj.currencyDigitsAfterDecimal.toFixed(0); + var digits = monetaryObj.digitsAfterDecimal.toFixed(0); return Globalize.format(monetaryObj.amount, "c" + digits); }, decimal: function(number, digits) { diff --git a/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/view-templates.jsp b/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/view-templates.jsp index 7f3fbb852..36c3590d8 100644 --- a/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/view-templates.jsp +++ b/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/view-templates.jsp @@ -55,8 +55,8 @@
- - + +
@@ -103,18 +103,18 @@ - - + + - + - {{#each selectedProduct.possibleAmortizationOptions}} - {{#if $ctx.number($parent.parent.data.selectedProduct.amortizationMethod)===$ctx.number(id)}} + {{#each selectedProduct.amortizationTypeOptions}} + {{#if $ctx.number($parent.parent.data.selectedProduct.amortizationType.id)===$ctx.number(id)}} {{#else}} @@ -186,8 +186,8 @@ - {{#each selectedProduct.possibleInterestRateCalculatedInPeriodOptions}} - {{#if $ctx.number($parent.parent.data.selectedProduct.interestRateCalculatedInPeriod)===$ctx.number(id)}} + {{#each selectedProduct.interestCalculationPeriodTypeOptions}} + {{#if $ctx.number($parent.parent.data.selectedProduct.interestCalculationPeriodType.id)===$ctx.number(id)}} {{#else}} diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/ClientApiResource.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/ClientApiResource.java index 5436ee734..fc6ec1907 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/ClientApiResource.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/ClientApiResource.java @@ -17,13 +17,13 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; import org.joda.time.LocalDate; -import org.mifosng.data.ClientData; import org.mifosng.data.ClientLoanAccountSummaryCollectionData; import org.mifosng.data.EntityIdentifier; import org.mifosng.data.NoteData; -import org.mifosng.data.OfficeLookup; import org.mifosng.platform.api.commands.ClientCommand; import org.mifosng.platform.api.commands.NoteCommand; +import org.mifosng.platform.api.data.ClientData; +import org.mifosng.platform.api.data.OfficeLookup; import org.mifosng.platform.api.infrastructure.ApiDataConversionService; import org.mifosng.platform.api.infrastructure.ApiJSONFormattingService; import org.mifosng.platform.client.service.ClientReadPlatformService; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/LoanProductApiResource.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/LoanProductApiResource.java index f0cb05d0f..860207d38 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/LoanProductApiResource.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/LoanProductApiResource.java @@ -17,8 +17,8 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; import org.mifosng.data.EntityIdentifier; -import org.mifosng.data.LoanProductData; import org.mifosng.platform.api.commands.LoanProductCommand; +import org.mifosng.platform.api.data.LoanProductData; import org.mifosng.platform.api.infrastructure.ApiDataConversionService; import org.mifosng.platform.api.infrastructure.ApiJSONFormattingService; import org.mifosng.platform.loanproduct.service.LoanProductReadPlatformService; @@ -32,8 +32,8 @@ import org.springframework.stereotype.Component; @Scope("singleton") public class LoanProductApiResource { - private String defaultFieldList = "principalMoney,inArrearsTolerance,amortizationMethod,interestMethod,repaymentPeriodFrequency,interestRatePeriod,interestRateCalculatedInPeriod,repaidEvery,numberOfRepayments,interestRatePerPeriod,annualInterestRate,numberOfInterestFreePeriods,flexible,interestRebateAllowed"; - private String allowedFieldList = "possibleCurrencies,possibleAmortizationOptions,possibleInterestOptions,possibleInterestRateCalculatedInPeriodOptions,repaymentFrequencyOptions,interestFrequencyOptions"; + private String defaultFieldList = "principal,inArrearsTolerance,numberOfRepayments,repaymentEvery,interestRatePerPeriod,annualInterestRate,repaymentFrequencyType,interestRateFrequencyType,amortizationType,interestType,interestCalculationPeriodType"; + private String allowedFieldList = "currencyOptions,amortizationTypeOptions,interestTypeOptions,interestCalculationPeriodTypeOptions,repaymentFrequencyTypeOptions,interestRateFrequencyTypeOptions"; private String filterName = "myFilter"; @Autowired 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 8ec09736b..74e450d56 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 @@ -22,13 +22,13 @@ import org.mifosng.data.EntityIdentifier; import org.mifosng.data.LoanAccountData; import org.mifosng.data.LoanRepaymentData; import org.mifosng.data.LoanSchedule; -import org.mifosng.data.NewLoanWorkflowStepOneData; import org.mifosng.platform.api.commands.AdjustLoanTransactionCommand; import org.mifosng.platform.api.commands.CalculateLoanScheduleCommand; import org.mifosng.platform.api.commands.LoanStateTransitionCommand; import org.mifosng.platform.api.commands.LoanTransactionCommand; import org.mifosng.platform.api.commands.SubmitLoanApplicationCommand; import org.mifosng.platform.api.commands.UndoStateTransitionCommand; +import org.mifosng.platform.api.data.NewLoanWorkflowStepOneData; import org.mifosng.platform.api.infrastructure.ApiDataConversionService; import org.mifosng.platform.api.infrastructure.ApiJSONFormattingService; import org.mifosng.platform.exceptions.UnrecognizedQueryParamException; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/OfficeApiResource.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/OfficeApiResource.java index 43f29b4eb..9f23a8904 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/OfficeApiResource.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/OfficeApiResource.java @@ -17,8 +17,8 @@ import javax.ws.rs.core.UriInfo; import org.joda.time.LocalDate; import org.mifosng.data.EntityIdentifier; -import org.mifosng.data.OfficeData; import org.mifosng.platform.api.commands.OfficeCommand; +import org.mifosng.platform.api.data.OfficeData; import org.mifosng.platform.api.infrastructure.ApiDataConversionService; import org.mifosng.platform.api.infrastructure.ApiJSONFormattingService; import org.mifosng.platform.organisation.service.OfficeReadPlatformService; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/PermissionApiResource.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/PermissionApiResource.java index c351c29b9..823fc9b8d 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/PermissionApiResource.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/PermissionApiResource.java @@ -10,7 +10,7 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.UriInfo; -import org.mifosng.data.PermissionData; +import org.mifosng.platform.api.data.PermissionData; import org.mifosng.platform.api.infrastructure.ApiJSONFormattingService; import org.mifosng.platform.user.service.PermissionReadPlatformService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/RoleApiResource.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/RoleApiResource.java index 697043b9c..365faffbf 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/RoleApiResource.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/RoleApiResource.java @@ -16,9 +16,9 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; import org.mifosng.data.EntityIdentifier; -import org.mifosng.data.PermissionData; -import org.mifosng.data.RoleData; import org.mifosng.platform.api.commands.RoleCommand; +import org.mifosng.platform.api.data.PermissionData; +import org.mifosng.platform.api.data.RoleData; import org.mifosng.platform.api.infrastructure.ApiJSONFormattingService; import org.mifosng.platform.user.service.PermissionReadPlatformService; import org.mifosng.platform.user.service.RoleReadPlatformService; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/UserApiResource.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/UserApiResource.java index afbc213fe..e07b6c51f 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/UserApiResource.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/UserApiResource.java @@ -15,9 +15,9 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; -import org.mifosng.data.AppUserData; import org.mifosng.data.EntityIdentifier; import org.mifosng.platform.api.commands.UserCommand; +import org.mifosng.platform.api.data.AppUserData; import org.mifosng.platform.api.infrastructure.ApiJSONFormattingService; import org.mifosng.platform.user.service.AppUserReadPlatformService; import org.mifosng.platform.user.service.AppUserWritePlatformService; diff --git a/mifosng-data/src/main/java/org/mifosng/data/AppUserData.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/data/AppUserData.java similarity index 98% rename from mifosng-data/src/main/java/org/mifosng/data/AppUserData.java rename to mifosng-provider/src/main/java/org/mifosng/platform/api/data/AppUserData.java index 29a4b93dc..a625ce02d 100644 --- a/mifosng-data/src/main/java/org/mifosng/data/AppUserData.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/data/AppUserData.java @@ -1,4 +1,4 @@ -package org.mifosng.data; +package org.mifosng.platform.api.data; import java.util.ArrayList; import java.util.List; diff --git a/mifosng-data/src/main/java/org/mifosng/data/ClientData.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/data/ClientData.java similarity index 98% rename from mifosng-data/src/main/java/org/mifosng/data/ClientData.java rename to mifosng-provider/src/main/java/org/mifosng/platform/api/data/ClientData.java index 36515c8ed..a18f807cb 100644 --- a/mifosng-data/src/main/java/org/mifosng/data/ClientData.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/data/ClientData.java @@ -1,4 +1,4 @@ -package org.mifosng.data; +package org.mifosng.platform.api.data; import java.io.Serializable; import java.util.ArrayList; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/data/LoanProductData.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/data/LoanProductData.java new file mode 100644 index 000000000..f1879ea6f --- /dev/null +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/data/LoanProductData.java @@ -0,0 +1,258 @@ +package org.mifosng.platform.api.data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; + +import org.codehaus.jackson.map.annotate.JsonFilter; +import org.joda.time.DateTime; +import org.mifosng.data.CurrencyData; +import org.mifosng.data.EnumOptionData; +import org.mifosng.data.MoneyData; + +@JsonFilter("myFilter") +public class LoanProductData implements Serializable { + + private Long id; + private String name; + private String description; + + private MoneyData principal; + private MoneyData inArrearsTolerance; + + private Integer numberOfRepayments; + private Integer repaymentEvery; + private BigDecimal interestRatePerPeriod = BigDecimal.ZERO; + private BigDecimal annualInterestRate = BigDecimal.ZERO; + + private EnumOptionData repaymentFrequencyType; + private EnumOptionData interestRateFrequencyType; + private EnumOptionData amortizationType; + private EnumOptionData interestType; + private EnumOptionData interestCalculationPeriodType; + + private DateTime createdOn; + private DateTime lastModifedOn; + + private List currencyOptions = new ArrayList(); + private List amortizationTypeOptions = new ArrayList(); + private List interestTypeOptions = new ArrayList(); + private List interestCalculationPeriodTypeOptions = new ArrayList(); + private List repaymentFrequencyTypeOptions = new ArrayList(); + private List interestRateFrequencyTypeOptions = new ArrayList(); + + public LoanProductData() { + // + } + + public LoanProductData(DateTime createdOn, DateTime lastModifedOn, Long id, + String name, String description, MoneyData principal, + MoneyData tolerance, Integer numberOfRepayments, + Integer repaymentEvery, BigDecimal interestRatePerPeriod, + BigDecimal annualInterestRate, + EnumOptionData repaymentFrequencyType, + EnumOptionData interestRateFrequencyType, + EnumOptionData amortizationType, + EnumOptionData interestType, + EnumOptionData interestCalculationPeriodType) { + this.createdOn = createdOn; + this.lastModifedOn = lastModifedOn; + this.id = id; + this.name = name; + this.description = description; + this.principal = principal; + this.inArrearsTolerance = tolerance; + this.numberOfRepayments = numberOfRepayments; + this.repaymentEvery = repaymentEvery; + this.interestRatePerPeriod = interestRatePerPeriod; + this.annualInterestRate = annualInterestRate; + this.repaymentFrequencyType = repaymentFrequencyType; + this.interestRateFrequencyType = interestRateFrequencyType; + this.amortizationType = amortizationType; + this.interestType = interestType; + this.interestCalculationPeriodType = interestCalculationPeriodType; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public MoneyData getPrincipal() { + return principal; + } + + public void setPrincipal(MoneyData principal) { + this.principal = principal; + } + + public MoneyData getInArrearsTolerance() { + return inArrearsTolerance; + } + + public void setInArrearsTolerance(MoneyData inArrearsTolerance) { + this.inArrearsTolerance = inArrearsTolerance; + } + + public Integer getNumberOfRepayments() { + return numberOfRepayments; + } + + public void setNumberOfRepayments(Integer numberOfRepayments) { + this.numberOfRepayments = numberOfRepayments; + } + + public Integer getRepaymentEvery() { + return repaymentEvery; + } + + public void setRepaymentEvery(Integer repaymentEvery) { + this.repaymentEvery = repaymentEvery; + } + + public BigDecimal getInterestRatePerPeriod() { + return interestRatePerPeriod; + } + + public void setInterestRatePerPeriod(BigDecimal interestRatePerPeriod) { + this.interestRatePerPeriod = interestRatePerPeriod; + } + + public BigDecimal getAnnualInterestRate() { + return annualInterestRate; + } + + public void setAnnualInterestRate(BigDecimal annualInterestRate) { + this.annualInterestRate = annualInterestRate; + } + + public DateTime getCreatedOn() { + return createdOn; + } + + public void setCreatedOn(DateTime createdOn) { + this.createdOn = createdOn; + } + + public DateTime getLastModifedOn() { + return lastModifedOn; + } + + public void setLastModifedOn(DateTime lastModifedOn) { + this.lastModifedOn = lastModifedOn; + } + + public EnumOptionData getRepaymentFrequencyType() { + return repaymentFrequencyType; + } + + public void setRepaymentFrequencyType(EnumOptionData repaymentFrequencyType) { + this.repaymentFrequencyType = repaymentFrequencyType; + } + + public EnumOptionData getInterestRateFrequencyType() { + return interestRateFrequencyType; + } + + public void setInterestRateFrequencyType( + EnumOptionData interestRateFrequencyType) { + this.interestRateFrequencyType = interestRateFrequencyType; + } + + public EnumOptionData getAmortizationType() { + return amortizationType; + } + + public void setAmortizationType(EnumOptionData amortizationType) { + this.amortizationType = amortizationType; + } + + public EnumOptionData getInterestType() { + return interestType; + } + + public void setInterestType(EnumOptionData interestType) { + this.interestType = interestType; + } + + public EnumOptionData getInterestCalculationPeriodType() { + return interestCalculationPeriodType; + } + + public void setInterestCalculationPeriodType( + EnumOptionData interestCalculationPeriodType) { + this.interestCalculationPeriodType = interestCalculationPeriodType; + } + + public List getRepaymentFrequencyTypeOptions() { + return repaymentFrequencyTypeOptions; + } + + public void setRepaymentFrequencyTypeOptions( + List repaymentFrequencyTypeOptions) { + this.repaymentFrequencyTypeOptions = repaymentFrequencyTypeOptions; + } + + public List getInterestRateFrequencyTypeOptions() { + return interestRateFrequencyTypeOptions; + } + + public void setInterestRateFrequencyTypeOptions( + List interestRateFrequencyTypeOptions) { + this.interestRateFrequencyTypeOptions = interestRateFrequencyTypeOptions; + } + + public List getCurrencyOptions() { + return currencyOptions; + } + + public void setCurrencyOptions(List currencyOptions) { + this.currencyOptions = currencyOptions; + } + + public List getAmortizationTypeOptions() { + return amortizationTypeOptions; + } + + public void setAmortizationTypeOptions( + List amortizationTypeOptions) { + this.amortizationTypeOptions = amortizationTypeOptions; + } + + public List getInterestTypeOptions() { + return interestTypeOptions; + } + + public void setInterestTypeOptions(List interestTypeOptions) { + this.interestTypeOptions = interestTypeOptions; + } + + public List getInterestCalculationPeriodTypeOptions() { + return interestCalculationPeriodTypeOptions; + } + + public void setInterestCalculationPeriodTypeOptions( + List interestCalculationPeriodTypeOptions) { + this.interestCalculationPeriodTypeOptions = interestCalculationPeriodTypeOptions; + } +} \ No newline at end of file diff --git a/mifosng-data/src/main/java/org/mifosng/data/NewLoanWorkflowStepOneData.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/data/NewLoanWorkflowStepOneData.java similarity index 98% rename from mifosng-data/src/main/java/org/mifosng/data/NewLoanWorkflowStepOneData.java rename to mifosng-provider/src/main/java/org/mifosng/platform/api/data/NewLoanWorkflowStepOneData.java index 7d4f02a66..04242a43e 100644 --- a/mifosng-data/src/main/java/org/mifosng/data/NewLoanWorkflowStepOneData.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/data/NewLoanWorkflowStepOneData.java @@ -1,4 +1,4 @@ -package org.mifosng.data; +package org.mifosng.platform.api.data; import java.io.Serializable; import java.util.ArrayList; @@ -9,6 +9,7 @@ import javax.xml.bind.annotation.XmlRootElement; import org.codehaus.jackson.annotate.JsonIgnoreProperties; import org.codehaus.jackson.map.annotate.JsonFilter; import org.joda.time.LocalDate; +import org.mifosng.data.LoanSchedule; @XmlRootElement(name = "newloanworkflow") @JsonIgnoreProperties({ "organisationId", "organisationName" }) diff --git a/mifosng-data/src/main/java/org/mifosng/data/OfficeData.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/data/OfficeData.java similarity index 98% rename from mifosng-data/src/main/java/org/mifosng/data/OfficeData.java rename to mifosng-provider/src/main/java/org/mifosng/platform/api/data/OfficeData.java index 6b3de16bb..886b77742 100644 --- a/mifosng-data/src/main/java/org/mifosng/data/OfficeData.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/data/OfficeData.java @@ -1,4 +1,4 @@ -package org.mifosng.data; +package org.mifosng.platform.api.data; import java.io.Serializable; import java.util.ArrayList; diff --git a/mifosng-data/src/main/java/org/mifosng/data/OfficeLookup.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/data/OfficeLookup.java similarity index 91% rename from mifosng-data/src/main/java/org/mifosng/data/OfficeLookup.java rename to mifosng-provider/src/main/java/org/mifosng/platform/api/data/OfficeLookup.java index ef73d26a0..9352b89fb 100644 --- a/mifosng-data/src/main/java/org/mifosng/data/OfficeLookup.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/data/OfficeLookup.java @@ -1,4 +1,4 @@ -package org.mifosng.data; +package org.mifosng.platform.api.data; import java.io.Serializable; diff --git a/mifosng-data/src/main/java/org/mifosng/data/PermissionData.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/data/PermissionData.java similarity index 97% rename from mifosng-data/src/main/java/org/mifosng/data/PermissionData.java rename to mifosng-provider/src/main/java/org/mifosng/platform/api/data/PermissionData.java index 4c00b84fe..fe360201a 100644 --- a/mifosng-data/src/main/java/org/mifosng/data/PermissionData.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/data/PermissionData.java @@ -1,4 +1,4 @@ -package org.mifosng.data; +package org.mifosng.platform.api.data; import java.io.Serializable; diff --git a/mifosng-data/src/main/java/org/mifosng/data/RoleData.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/data/RoleData.java similarity index 98% rename from mifosng-data/src/main/java/org/mifosng/data/RoleData.java rename to mifosng-provider/src/main/java/org/mifosng/platform/api/data/RoleData.java index d9df33dce..cc29e00d7 100644 --- a/mifosng-data/src/main/java/org/mifosng/data/RoleData.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/data/RoleData.java @@ -1,4 +1,4 @@ -package org.mifosng.data; +package org.mifosng.platform.api.data; import java.util.ArrayList; import java.util.Collection; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/client/service/ClientReadPlatformService.java b/mifosng-provider/src/main/java/org/mifosng/platform/client/service/ClientReadPlatformService.java index e9a5d8687..76489a832 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/client/service/ClientReadPlatformService.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/client/service/ClientReadPlatformService.java @@ -2,9 +2,9 @@ package org.mifosng.platform.client.service; import java.util.Collection; -import org.mifosng.data.ClientData; import org.mifosng.data.ClientLoanAccountSummaryCollectionData; import org.mifosng.data.NoteData; +import org.mifosng.platform.api.data.ClientData; public interface ClientReadPlatformService { diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/client/service/ClientReadPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosng/platform/client/service/ClientReadPlatformServiceImpl.java index 944dd7d05..575eb2609 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/client/service/ClientReadPlatformServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/client/service/ClientReadPlatformServiceImpl.java @@ -11,13 +11,13 @@ import javax.sql.DataSource; import org.apache.commons.lang.StringUtils; import org.joda.time.DateTime; import org.joda.time.LocalDate; -import org.mifosng.data.AppUserData; -import org.mifosng.data.ClientData; import org.mifosng.data.ClientLoanAccountSummaryCollectionData; import org.mifosng.data.ClientLoanAccountSummaryData; import org.mifosng.data.NoteData; -import org.mifosng.data.OfficeData; -import org.mifosng.data.OfficeLookup; +import org.mifosng.platform.api.data.AppUserData; +import org.mifosng.platform.api.data.ClientData; +import org.mifosng.platform.api.data.OfficeData; +import org.mifosng.platform.api.data.OfficeLookup; import org.mifosng.platform.exceptions.ClientNotFoundException; import org.mifosng.platform.exceptions.NoteNotFoundException; import org.mifosng.platform.infrastructure.JdbcSupport; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/AmortizationMethod.java b/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/AmortizationMethod.java index f9058ee60..1de7a7216 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/AmortizationMethod.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/AmortizationMethod.java @@ -1,19 +1,25 @@ package org.mifosng.platform.loan.domain; public enum AmortizationMethod { - EQUAL_PRINCIPAL(0), EQUAL_INSTALLMENTS(1), INVALID(2); + EQUAL_PRINCIPAL(0, "amortizationType.equal.principal"), EQUAL_INSTALLMENTS(1, "amortizationType.equal.installments"), INVALID(2, "amortizationType.invalid"); private final Integer value; + private final String code; - private AmortizationMethod(final Integer value) { + private AmortizationMethod(final Integer value, final String code) { this.value = value; + this.code = code; } public Integer getValue() { return this.value; } + + public String getCode() { + return code; + } - public static AmortizationMethod fromInt(final Integer selectedMethod) { + public static AmortizationMethod fromInt(final Integer selectedMethod) { if (selectedMethod == null) { return null; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/DerivedLoanDataProcessor.java b/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/DerivedLoanDataProcessor.java index 397bc0eef..974936700 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/DerivedLoanDataProcessor.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/DerivedLoanDataProcessor.java @@ -483,7 +483,7 @@ public class DerivedLoanDataProcessor { } private Money moneyFrom(MoneyData money) { - MonetaryCurrency monetaryCurrency = new MonetaryCurrency(money.getCurrencyCode(), money.getCurrencyDigitsAfterDecimal()); + MonetaryCurrency monetaryCurrency = new MonetaryCurrency(money.getCurrencyCode(), money.getDigitsAfterDecimal()); return Money.of(monetaryCurrency, money.getAmount()); } diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/InterestCalculationPeriodMethod.java b/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/InterestCalculationPeriodMethod.java index ce6801ce8..ffbff6cb4 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/InterestCalculationPeriodMethod.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/InterestCalculationPeriodMethod.java @@ -1,19 +1,25 @@ package org.mifosng.platform.loan.domain; public enum InterestCalculationPeriodMethod { - DAILY(0), SAME_AS_REPAYMENT_PERIOD(1), INVALID(2); + DAILY(0, "interestCalculationPeriodType.daily"), SAME_AS_REPAYMENT_PERIOD(1, "interestCalculationPeriodType.same.as.repayment.period"), INVALID(2, "interestCalculationPeriodType.invalid"); private final Integer value; + private final String code; - private InterestCalculationPeriodMethod(final Integer value) { + private InterestCalculationPeriodMethod(final Integer value, final String code) { this.value = value; + this.code = code; } public Integer getValue() { return this.value; } + + public String getCode() { + return code; + } - public static InterestCalculationPeriodMethod fromInt(final Integer selectedMethod) { + public static InterestCalculationPeriodMethod fromInt(final Integer selectedMethod) { InterestCalculationPeriodMethod repaymentMethod = null; switch (selectedMethod) { diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/InterestMethod.java b/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/InterestMethod.java index 4ac0a0725..408ad8b99 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/InterestMethod.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/InterestMethod.java @@ -1,19 +1,25 @@ package org.mifosng.platform.loan.domain; public enum InterestMethod { - DECLINING_BALANCE(0), FLAT(1), INVALID(2); + DECLINING_BALANCE(0, "interestType.declining.balance"), FLAT(1, "interestType.flat"), INVALID(2, "interestType.invalid"); private final Integer value; + private final String code; - private InterestMethod(final Integer value) { + private InterestMethod(final Integer value, final String code) { this.value = value; + this.code = code; } public Integer getValue() { return this.value; } + + public String getCode() { + return code; + } - public static InterestMethod fromInt(final Integer selectedMethod) { + public static InterestMethod fromInt(final Integer selectedMethod) { InterestMethod repaymentMethod = null; switch (selectedMethod) { diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/PeriodFrequencyType.java b/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/PeriodFrequencyType.java index 37608689a..1b72e8918 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/PeriodFrequencyType.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/PeriodFrequencyType.java @@ -1,17 +1,23 @@ package org.mifosng.platform.loan.domain; public enum PeriodFrequencyType { - DAYS(0), WEEKS(1), MONTHS(2), YEARS(3), INVALID(4); + DAYS(0, "periodFrequencyType.days"), WEEKS(1, "periodFrequencyType.weeks"), MONTHS(2, "periodFrequencyType.months"), YEARS(3, "periodFrequencyType.years"), INVALID(4, "periodFrequencyType.invalid"); private final Integer value; + private final String code; - private PeriodFrequencyType(final Integer value) { + private PeriodFrequencyType(final Integer value, final String code) { this.value = value; + this.code = code; } public Integer getValue() { return this.value; } + + public String getCode() { + return code; + } public static PeriodFrequencyType fromInt(final Integer frequency) { 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 a960940f6..a3c5b9b49 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 org.mifosng.data.LoanAccountData; import org.mifosng.data.LoanRepaymentData; -import org.mifosng.data.NewLoanWorkflowStepOneData; +import org.mifosng.platform.api.data.NewLoanWorkflowStepOneData; public interface LoanReadPlatformService { 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 3b5e81e15..137b5c847 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,14 +7,14 @@ import java.util.ArrayList; import java.util.Collection; import org.joda.time.LocalDate; -import org.mifosng.data.ClientData; import org.mifosng.data.CurrencyData; import org.mifosng.data.DerivedLoanData; import org.mifosng.data.LoanAccountData; -import org.mifosng.data.LoanProductData; import org.mifosng.data.LoanRepaymentData; import org.mifosng.data.MoneyData; -import org.mifosng.data.NewLoanWorkflowStepOneData; +import org.mifosng.platform.api.data.ClientData; +import org.mifosng.platform.api.data.LoanProductData; +import org.mifosng.platform.api.data.NewLoanWorkflowStepOneData; import org.mifosng.platform.client.service.ClientReadPlatformService; import org.mifosng.platform.currency.domain.ApplicationCurrency; import org.mifosng.platform.currency.domain.ApplicationCurrencyRepository; 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 a8e0f843b..cfcea1f5a 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 @@ -297,7 +297,7 @@ public class LoanWritePlatformServiceJpaRepositoryImpl implements LoanWritePlatf final MonetaryCurrency monetaryCurrency = new MonetaryCurrency( scheduledLoanInstallment.getPrincipalDue().getCurrencyCode(), - scheduledLoanInstallment.getPrincipalDue().getCurrencyDigitsAfterDecimal()); + scheduledLoanInstallment.getPrincipalDue().getDigitsAfterDecimal()); Money principal = Money.of(monetaryCurrency, scheduledLoanInstallment.getPrincipalDue().getAmount()); diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/loanproduct/service/LoanDropdownReadPlatformService.java b/mifosng-provider/src/main/java/org/mifosng/platform/loanproduct/service/LoanDropdownReadPlatformService.java index 2d19fa7e6..69360069c 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/loanproduct/service/LoanDropdownReadPlatformService.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/loanproduct/service/LoanDropdownReadPlatformService.java @@ -6,13 +6,13 @@ import org.mifosng.data.EnumOptionData; public interface LoanDropdownReadPlatformService { - List retrieveLoanAmortizationMethodOptions(); + List retrieveLoanAmortizationTypeOptions(); - List retrieveLoanInterestMethodOptions(); + List retrieveLoanInterestTypeOptions(); List retrieveLoanInterestRateCalculatedInPeriodOptions(); - List retrieveRepaymentFrequencyOptions(); + List retrieveRepaymentFrequencyTypeOptions(); - List retrieveInterestFrequencyOptions(); + List retrieveInterestRateFrequencyTypeOptions(); } \ No newline at end of file diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/loanproduct/service/LoanDropdownReadPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosng/platform/loanproduct/service/LoanDropdownReadPlatformServiceImpl.java index 50752db53..03f1cc3b2 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/loanproduct/service/LoanDropdownReadPlatformServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/loanproduct/service/LoanDropdownReadPlatformServiceImpl.java @@ -1,59 +1,40 @@ package org.mifosng.platform.loanproduct.service; +import static org.mifosng.platform.loanproduct.service.LoanEnumerations.amortizationType; +import static org.mifosng.platform.loanproduct.service.LoanEnumerations.interestCalculationPeriodType; +import static org.mifosng.platform.loanproduct.service.LoanEnumerations.interestRateFrequencyType; +import static org.mifosng.platform.loanproduct.service.LoanEnumerations.interestType; +import static org.mifosng.platform.loanproduct.service.LoanEnumerations.repaymentFrequencyType; + import java.util.Arrays; import java.util.List; -import javax.sql.DataSource; - import org.mifosng.data.EnumOptionData; import org.mifosng.platform.loan.domain.AmortizationMethod; +import org.mifosng.platform.loan.domain.InterestCalculationPeriodMethod; +import org.mifosng.platform.loan.domain.InterestMethod; import org.mifosng.platform.loan.domain.PeriodFrequencyType; -import org.mifosng.platform.security.PlatformSecurityContext; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.jdbc.core.simple.SimpleJdbcTemplate; import org.springframework.stereotype.Service; -/* - * FIXME - remove hardcoded return of loan dropdown options - */ -@SuppressWarnings("unused") @Service -public class LoanDropdownReadPlatformServiceImpl implements LoanDropdownReadPlatformService { - - private final PlatformSecurityContext context; - private final SimpleJdbcTemplate jdbcTemplate; - - @Autowired - public LoanDropdownReadPlatformServiceImpl(final PlatformSecurityContext context, final DataSource dataSource) { - this.context = context; - this.jdbcTemplate = new SimpleJdbcTemplate(dataSource); - } +public class LoanDropdownReadPlatformServiceImpl implements + LoanDropdownReadPlatformService { @Override - public List retrieveLoanAmortizationMethodOptions() { - EnumOptionData equalInstallments = new EnumOptionData( - "Equal installments", AmortizationMethod.EQUAL_INSTALLMENTS - .getValue().longValue()); - EnumOptionData equalPrinciplePayments = new EnumOptionData( - "Equal principle payments", AmortizationMethod.EQUAL_PRINCIPAL - .getValue().longValue()); + public List retrieveLoanAmortizationTypeOptions() { List allowedAmortizationMethods = Arrays.asList( - equalInstallments, equalPrinciplePayments); + amortizationType(AmortizationMethod.EQUAL_INSTALLMENTS), + amortizationType(AmortizationMethod.EQUAL_PRINCIPAL)); return allowedAmortizationMethods; } @Override - public List retrieveLoanInterestMethodOptions() { - EnumOptionData interestRateCalculationMethod2 = new EnumOptionData( - "Declining Balance", Long.valueOf(0)); - EnumOptionData interestRateCalculationMethod1 = new EnumOptionData( - "Flat", Long.valueOf(1)); - + public List retrieveLoanInterestTypeOptions() { List allowedRepaymentScheduleCalculationMethods = Arrays - .asList(interestRateCalculationMethod2, - interestRateCalculationMethod1); + .asList(interestType(InterestMethod.FLAT), + interestType(InterestMethod.DECLINING_BALANCE)); return allowedRepaymentScheduleCalculationMethods; } @@ -61,39 +42,29 @@ public class LoanDropdownReadPlatformServiceImpl implements LoanDropdownReadPlat @Override public List retrieveLoanInterestRateCalculatedInPeriodOptions() { - EnumOptionData option1 = new EnumOptionData("Daily", - Long.valueOf(0)); - EnumOptionData option2 = new EnumOptionData( - "Same as repayment period", Long.valueOf(1)); - - List allowedOptions = Arrays.asList(option1, - option2); + List allowedOptions = Arrays + .asList(interestCalculationPeriodType(InterestCalculationPeriodMethod.DAILY), + interestCalculationPeriodType(InterestCalculationPeriodMethod.SAME_AS_REPAYMENT_PERIOD)); return allowedOptions; } @Override - public List retrieveRepaymentFrequencyOptions() { - EnumOptionData frequency1 = new EnumOptionData("Days", - Long.valueOf(0)); - EnumOptionData frequency2 = new EnumOptionData("Weeks", - Long.valueOf(1)); - EnumOptionData frequency3 = new EnumOptionData("Months", - Long.valueOf(2)); + public List retrieveRepaymentFrequencyTypeOptions() { + List repaymentFrequencyOptions = Arrays.asList( - frequency1, frequency2, frequency3); + repaymentFrequencyType(PeriodFrequencyType.DAYS), + repaymentFrequencyType(PeriodFrequencyType.WEEKS), + repaymentFrequencyType(PeriodFrequencyType.MONTHS)); return repaymentFrequencyOptions; } @Override - public List retrieveInterestFrequencyOptions() { + public List retrieveInterestRateFrequencyTypeOptions() { // support for monthly and annual percentage rate (MPR) and (APR) - EnumOptionData perMonth = new EnumOptionData("Per month", - PeriodFrequencyType.MONTHS.getValue().longValue()); - EnumOptionData perYear = new EnumOptionData("Per year", - PeriodFrequencyType.YEARS.getValue().longValue()); - List repaymentFrequencyOptions = Arrays.asList( - perMonth, perYear); - return repaymentFrequencyOptions; + List interestRateFrequencyTypeOptions = Arrays.asList( + interestRateFrequencyType(PeriodFrequencyType.MONTHS), + interestRateFrequencyType(PeriodFrequencyType.YEARS)); + return interestRateFrequencyTypeOptions; } } \ No newline at end of file diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/loanproduct/service/LoanEnumerations.java b/mifosng-provider/src/main/java/org/mifosng/platform/loanproduct/service/LoanEnumerations.java new file mode 100644 index 000000000..b107be79c --- /dev/null +++ b/mifosng-provider/src/main/java/org/mifosng/platform/loanproduct/service/LoanEnumerations.java @@ -0,0 +1,115 @@ +package org.mifosng.platform.loanproduct.service; + +import org.mifosng.data.EnumOptionData; +import org.mifosng.platform.loan.domain.AmortizationMethod; +import org.mifosng.platform.loan.domain.InterestCalculationPeriodMethod; +import org.mifosng.platform.loan.domain.InterestMethod; +import org.mifosng.platform.loan.domain.PeriodFrequencyType; + +public class LoanEnumerations { + + public static EnumOptionData repaymentFrequencyType(final int id) { + return repaymentFrequencyType(PeriodFrequencyType.fromInt(id)); + } + + public static EnumOptionData repaymentFrequencyType(final PeriodFrequencyType type) { + final String codePrefix = "repaymentFrequency."; + EnumOptionData optionData = null; + switch (type) { + case DAYS: + optionData = new EnumOptionData(PeriodFrequencyType.DAYS.getValue().longValue(), codePrefix + PeriodFrequencyType.DAYS.getCode(), "Days"); + break; + case WEEKS: + optionData = new EnumOptionData(PeriodFrequencyType.WEEKS.getValue().longValue(), codePrefix + PeriodFrequencyType.WEEKS.getCode(), "Weeks"); + break; + case MONTHS: + optionData = new EnumOptionData(PeriodFrequencyType.MONTHS.getValue().longValue(), codePrefix + PeriodFrequencyType.MONTHS.getCode(), "Months"); + break; + default: + optionData = new EnumOptionData(PeriodFrequencyType.INVALID.getValue().longValue(), PeriodFrequencyType.INVALID.getCode(), "Invalid"); + break; + } + return optionData; + } + + public static EnumOptionData interestRateFrequencyType(final int id) { + return interestRateFrequencyType(PeriodFrequencyType.fromInt(id)); + } + + public static EnumOptionData interestRateFrequencyType(final PeriodFrequencyType type) { + final String codePrefix = "interestRateFrequency."; + EnumOptionData optionData = null; + switch (type) { + case MONTHS: + optionData = new EnumOptionData(PeriodFrequencyType.MONTHS.getValue().longValue(), codePrefix + PeriodFrequencyType.MONTHS.getCode(), "Per month"); + break; + case YEARS: + optionData = new EnumOptionData(PeriodFrequencyType.YEARS.getValue().longValue(), codePrefix + PeriodFrequencyType.YEARS.getCode(), "Per year"); + break; + default: + optionData = new EnumOptionData(PeriodFrequencyType.INVALID.getValue().longValue(), PeriodFrequencyType.INVALID.getCode(), "Invalid"); + break; + } + return optionData; + } + + public static EnumOptionData amortizationType(Integer id) { + return amortizationType(AmortizationMethod.fromInt(id)); + } + + public static EnumOptionData amortizationType(AmortizationMethod amortizationMethod) { + EnumOptionData optionData = null; + switch (amortizationMethod) { + case EQUAL_INSTALLMENTS: + optionData = new EnumOptionData(AmortizationMethod.EQUAL_INSTALLMENTS.getValue().longValue(), AmortizationMethod.EQUAL_INSTALLMENTS.getCode(), "Equal installments"); + break; + case EQUAL_PRINCIPAL: + optionData = new EnumOptionData(AmortizationMethod.EQUAL_PRINCIPAL.getValue().longValue(), AmortizationMethod.EQUAL_PRINCIPAL.getCode(), "Equal principle payments"); + break; + default: + optionData = new EnumOptionData(AmortizationMethod.INVALID.getValue().longValue(), AmortizationMethod.INVALID.getCode(), "Invalid"); + break; + } + return optionData; + } + + public static EnumOptionData interestType(Integer id) { + return interestType(InterestMethod.fromInt(id)); + } + + public static EnumOptionData interestType(InterestMethod type) { + EnumOptionData optionData = null; + switch (type) { + case FLAT: + optionData = new EnumOptionData(InterestMethod.FLAT.getValue().longValue(), InterestMethod.FLAT.getCode(), "Flat"); + break; + case DECLINING_BALANCE: + optionData = new EnumOptionData(InterestMethod.DECLINING_BALANCE.getValue().longValue(), InterestMethod.DECLINING_BALANCE.getCode(), "Declining Balance"); + break; + default: + optionData = new EnumOptionData(AmortizationMethod.INVALID.getValue().longValue(), AmortizationMethod.INVALID.getCode(), "Invalid"); + break; + } + return optionData; + } + + public static EnumOptionData interestCalculationPeriodType(Integer id) { + return interestCalculationPeriodType(InterestCalculationPeriodMethod.fromInt(id)); + } + + public static EnumOptionData interestCalculationPeriodType(InterestCalculationPeriodMethod type) { + EnumOptionData optionData = null; + switch (type) { + case DAILY: + optionData= new EnumOptionData(InterestCalculationPeriodMethod.DAILY.getValue().longValue(), InterestCalculationPeriodMethod.DAILY.getCode(), "Daily"); + break; + case SAME_AS_REPAYMENT_PERIOD: + optionData = new EnumOptionData(InterestCalculationPeriodMethod.SAME_AS_REPAYMENT_PERIOD.getValue().longValue(), InterestCalculationPeriodMethod.SAME_AS_REPAYMENT_PERIOD.getCode(), "Same as repayment period"); + break; + default: + optionData = new EnumOptionData(AmortizationMethod.INVALID.getValue().longValue(), AmortizationMethod.INVALID.getCode(), "Invalid"); + break; + } + return optionData; + } +} \ No newline at end of file diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/loanproduct/service/LoanProductReadPlatformService.java b/mifosng-provider/src/main/java/org/mifosng/platform/loanproduct/service/LoanProductReadPlatformService.java index 9ff2c7526..0bb05eec6 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/loanproduct/service/LoanProductReadPlatformService.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/loanproduct/service/LoanProductReadPlatformService.java @@ -2,7 +2,7 @@ package org.mifosng.platform.loanproduct.service; import java.util.Collection; -import org.mifosng.data.LoanProductData; +import org.mifosng.platform.api.data.LoanProductData; public interface LoanProductReadPlatformService { diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/loanproduct/service/LoanProductReadPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosng/platform/loanproduct/service/LoanProductReadPlatformServiceImpl.java index 02babda0d..505759aba 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/loanproduct/service/LoanProductReadPlatformServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/loanproduct/service/LoanProductReadPlatformServiceImpl.java @@ -11,11 +11,15 @@ import javax.sql.DataSource; import org.joda.time.DateTime; import org.mifosng.data.CurrencyData; import org.mifosng.data.EnumOptionData; -import org.mifosng.data.LoanProductData; import org.mifosng.data.MoneyData; +import org.mifosng.platform.api.data.LoanProductData; import org.mifosng.platform.currency.service.CurrencyReadPlatformService; import org.mifosng.platform.exceptions.LoanProductNotFoundException; import org.mifosng.platform.infrastructure.JdbcSupport; +import org.mifosng.platform.loan.domain.AmortizationMethod; +import org.mifosng.platform.loan.domain.InterestCalculationPeriodMethod; +import org.mifosng.platform.loan.domain.InterestMethod; +import org.mifosng.platform.loan.domain.PeriodFrequencyType; import org.mifosng.platform.security.PlatformSecurityContext; import org.mifosng.platform.user.domain.AppUser; import org.springframework.beans.factory.annotation.Autowired; @@ -80,24 +84,21 @@ public class LoanProductReadPlatformServiceImpl implements LoanProductReadPlatfo LoanProductData productData = new LoanProductData(); + productData.setAmortizationType(LoanEnumerations.amortizationType(AmortizationMethod.EQUAL_INSTALLMENTS)); + productData.setInterestType(LoanEnumerations.interestType(InterestMethod.DECLINING_BALANCE)); + productData.setRepaymentFrequencyType(LoanEnumerations.repaymentFrequencyType(PeriodFrequencyType.MONTHS)); + productData.setInterestRateFrequencyType(LoanEnumerations.interestRateFrequencyType(PeriodFrequencyType.MONTHS)); + productData.setInterestCalculationPeriodType(LoanEnumerations.interestCalculationPeriodType(InterestCalculationPeriodMethod.SAME_AS_REPAYMENT_PERIOD)); + populateProductDataWithDropdownOptions(productData); - if (productData.getPossibleCurrencies().size() >= 1) { - CurrencyData currency = productData.getPossibleCurrencies().get(0); + if (productData.getCurrencyOptions().size() >= 1) { + CurrencyData currency = productData.getCurrencyOptions().get(0); MoneyData zero = MoneyData.zero(currency); - productData.setPrincipalMoney(zero); + productData.setPrincipal(zero); productData.setInArrearsTolerance(zero); } - - productData.setAmortizationMethod(Integer.valueOf(1)); - productData.setInterestMethod(Integer.valueOf(0)); - productData.setRepaymentPeriodFrequency(2); - productData.setInterestRatePeriod(2); - productData.setInterestRateCalculatedInPeriod(1); - - productData.setRepaidEvery(1); - productData.setNumberOfRepayments(0); - + return productData; } @@ -142,26 +143,32 @@ public class LoanProductReadPlatformServiceImpl implements LoanProductReadPlatfo MoneyData principalMoney = MoneyData.of(currencyData, principal); MoneyData toleranceMoney = MoneyData.of(currencyData, tolerance); - BigDecimal interestRatePerPeriod = rs.getBigDecimal("interestRatePerPeriod"); - int interestRatePeriod = JdbcSupport.getInteger(rs, "interestRatePerPeriodFreq"); - BigDecimal annualInterestRate = rs.getBigDecimal("annualInterestRate"); - int interestMethod = JdbcSupport.getInteger(rs, "interestMethod"); - int interestCalculationInPeriodMethod = JdbcSupport.getInteger(rs, "interestCalculationInPeriodMethod"); - - Integer repaidEvery = JdbcSupport.getInteger(rs, "repaidEvery"); - int repaymentFrequency = JdbcSupport.getInteger(rs, "repaymentPeriodFrequency"); Integer numberOfRepayments = JdbcSupport.getInteger(rs, "numberOfRepayments"); - int amortizationMethod = JdbcSupport.getInteger(rs, "amortizationMethod"); + Integer repaymentEvery = JdbcSupport.getInteger(rs, "repaidEvery"); + BigDecimal interestRatePerPeriod = rs.getBigDecimal("interestRatePerPeriod"); + BigDecimal annualInterestRate = rs.getBigDecimal("annualInterestRate"); + int repaymentFrequencyTypeId = JdbcSupport.getInteger(rs, "repaymentPeriodFrequency"); + EnumOptionData repaymentFrequencyType = LoanEnumerations.repaymentFrequencyType(repaymentFrequencyTypeId); + + int amortizationTypeId = JdbcSupport.getInteger(rs, "amortizationMethod"); + EnumOptionData amortizationType = LoanEnumerations.amortizationType(amortizationTypeId); + + int interestRateFrequencyTypeId = JdbcSupport.getInteger(rs, "interestRatePerPeriodFreq"); + EnumOptionData interestRateFrequencyType = LoanEnumerations.interestRateFrequencyType(interestRateFrequencyTypeId); + + int interestTypeId = JdbcSupport.getInteger(rs, "interestMethod"); + EnumOptionData interestType = LoanEnumerations.interestType(interestTypeId); + + int interestCalculationPeriodTypeId = JdbcSupport.getInteger(rs, "interestCalculationInPeriodMethod"); + EnumOptionData interestCalculationPeriodType = LoanEnumerations.interestCalculationPeriodType(interestCalculationPeriodTypeId); + DateTime createdOn = JdbcSupport.getDateTime(rs, "createdon"); DateTime lastModifedOn = JdbcSupport.getDateTime(rs, "modifiedon"); - return new LoanProductData(id, name, description, principalMoney, - interestRatePerPeriod, interestRatePeriod, - annualInterestRate, interestMethod, interestCalculationInPeriodMethod, - repaidEvery, - repaymentFrequency, numberOfRepayments, amortizationMethod, - toleranceMoney, createdOn, lastModifedOn); + return new LoanProductData(createdOn, lastModifedOn, id, name, description, principalMoney, toleranceMoney, + numberOfRepayments, repaymentEvery, interestRatePerPeriod, annualInterestRate, + repaymentFrequencyType, interestRateFrequencyType, amortizationType, interestType, interestCalculationPeriodType); } private CurrencyData findCurrencyByCode(String currencyCode, List allowedCurrencies) { @@ -178,19 +185,19 @@ public class LoanProductReadPlatformServiceImpl implements LoanProductReadPlatfo private void populateProductDataWithDropdownOptions(LoanProductData productData) { - List possibleCurrencies = currencyReadPlatformService.retrieveAllowedCurrencies(); + List currencyOptions = currencyReadPlatformService.retrieveAllowedCurrencies(); + List amortizationTypeOptions = dropdownReadPlatformService.retrieveLoanAmortizationTypeOptions(); + List interestTypeOptions = dropdownReadPlatformService.retrieveLoanInterestTypeOptions(); + List interestCalculationPeriodTypeOptions = dropdownReadPlatformService.retrieveLoanInterestRateCalculatedInPeriodOptions(); + List repaymentFrequencyTypeOptions = dropdownReadPlatformService.retrieveRepaymentFrequencyTypeOptions(); + List interestRateFrequencyTypeOptions = dropdownReadPlatformService.retrieveInterestRateFrequencyTypeOptions(); - List possibleAmortizationOptions = dropdownReadPlatformService.retrieveLoanAmortizationMethodOptions(); - List possibleInterestOptions = dropdownReadPlatformService.retrieveLoanInterestMethodOptions(); - List possibleInterestRateCalculatedInPeriodOptions = dropdownReadPlatformService.retrieveLoanInterestRateCalculatedInPeriodOptions(); - List repaymentFrequencyOptions = dropdownReadPlatformService.retrieveRepaymentFrequencyOptions(); - List interestFrequencyOptions = dropdownReadPlatformService.retrieveInterestFrequencyOptions(); - - productData.setPossibleCurrencies(possibleCurrencies); - productData.setPossibleAmortizationOptions(possibleAmortizationOptions); - productData.setPossibleInterestOptions(possibleInterestOptions); - productData.setPossibleInterestRateCalculatedInPeriodOptions(possibleInterestRateCalculatedInPeriodOptions); - productData.setRepaymentFrequencyOptions(repaymentFrequencyOptions); - productData.setInterestFrequencyOptions(interestFrequencyOptions); + productData.setCurrencyOptions(currencyOptions); + productData.setAmortizationTypeOptions(amortizationTypeOptions); + productData.setInterestTypeOptions(interestTypeOptions); + productData.setInterestCalculationPeriodTypeOptions(interestCalculationPeriodTypeOptions); + productData.setRepaymentFrequencyTypeOptions(repaymentFrequencyTypeOptions); + productData.setInterestRateFrequencyTypeOptions(interestRateFrequencyTypeOptions); } + } \ No newline at end of file diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/organisation/service/OfficeReadPlatformService.java b/mifosng-provider/src/main/java/org/mifosng/platform/organisation/service/OfficeReadPlatformService.java index f3976a22b..d50d42ae4 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/organisation/service/OfficeReadPlatformService.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/organisation/service/OfficeReadPlatformService.java @@ -3,8 +3,8 @@ package org.mifosng.platform.organisation.service; import java.util.Collection; import java.util.List; -import org.mifosng.data.OfficeData; -import org.mifosng.data.OfficeLookup; +import org.mifosng.platform.api.data.OfficeData; +import org.mifosng.platform.api.data.OfficeLookup; public interface OfficeReadPlatformService { diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/organisation/service/OfficeReadPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosng/platform/organisation/service/OfficeReadPlatformServiceImpl.java index 3814127d8..3bc5a91f9 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/organisation/service/OfficeReadPlatformServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/organisation/service/OfficeReadPlatformServiceImpl.java @@ -9,8 +9,8 @@ import java.util.List; import javax.sql.DataSource; import org.joda.time.LocalDate; -import org.mifosng.data.OfficeData; -import org.mifosng.data.OfficeLookup; +import org.mifosng.platform.api.data.OfficeData; +import org.mifosng.platform.api.data.OfficeLookup; import org.mifosng.platform.exceptions.OfficeNotFoundException; import org.mifosng.platform.infrastructure.JdbcSupport; import org.mifosng.platform.security.PlatformSecurityContext; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/rest/LoanOpenResource.java b/mifosng-provider/src/main/java/org/mifosng/platform/rest/LoanOpenResource.java index faeba3a44..d35f73163 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/rest/LoanOpenResource.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/rest/LoanOpenResource.java @@ -102,8 +102,7 @@ public class LoanOpenResource { JSONObject object = new JSONObject(); object.put("amount", money.getAmount()); object.put("currencyCode", money.getCurrencyCode()); - object.put("currencyDigitsAfterDecimal", - money.getCurrencyDigitsAfterDecimal()); + object.put("currencyDigitsAfterDecimal", money.getDigitsAfterDecimal()); return object; } diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/user/domain/Permission.java b/mifosng-provider/src/main/java/org/mifosng/platform/user/domain/Permission.java index e1f63dbca..7a1c5556d 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/user/domain/Permission.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/user/domain/Permission.java @@ -8,7 +8,7 @@ import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; import javax.persistence.Table; -import org.mifosng.data.PermissionData; +import org.mifosng.platform.api.data.PermissionData; import org.mifosng.platform.organisation.domain.Organisation; import org.springframework.data.jpa.domain.AbstractPersistable; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/user/domain/Role.java b/mifosng-provider/src/main/java/org/mifosng/platform/user/domain/Role.java index 08d83d681..303083e34 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/user/domain/Role.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/user/domain/Role.java @@ -15,8 +15,8 @@ import javax.persistence.ManyToMany; import javax.persistence.ManyToOne; import javax.persistence.Table; -import org.mifosng.data.PermissionData; -import org.mifosng.data.RoleData; +import org.mifosng.platform.api.data.PermissionData; +import org.mifosng.platform.api.data.RoleData; import org.mifosng.platform.infrastructure.AbstractAuditableCustom; import org.mifosng.platform.organisation.domain.Organisation; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/user/service/AppUserReadPlatformService.java b/mifosng-provider/src/main/java/org/mifosng/platform/user/service/AppUserReadPlatformService.java index baac12dac..5ed31c4ec 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/user/service/AppUserReadPlatformService.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/user/service/AppUserReadPlatformService.java @@ -2,7 +2,7 @@ package org.mifosng.platform.user.service; import java.util.Collection; -import org.mifosng.data.AppUserData; +import org.mifosng.platform.api.data.AppUserData; public interface AppUserReadPlatformService { diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/user/service/AppUserReadPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosng/platform/user/service/AppUserReadPlatformServiceImpl.java index 4be4db014..32a7fc024 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/user/service/AppUserReadPlatformServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/user/service/AppUserReadPlatformServiceImpl.java @@ -11,10 +11,10 @@ import java.util.Set; import javax.sql.DataSource; -import org.mifosng.data.AppUserData; -import org.mifosng.data.OfficeData; -import org.mifosng.data.OfficeLookup; -import org.mifosng.data.RoleData; +import org.mifosng.platform.api.data.AppUserData; +import org.mifosng.platform.api.data.OfficeData; +import org.mifosng.platform.api.data.OfficeLookup; +import org.mifosng.platform.api.data.RoleData; import org.mifosng.platform.exceptions.UserNotFoundException; import org.mifosng.platform.infrastructure.JdbcSupport; import org.mifosng.platform.organisation.service.OfficeReadPlatformService; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/user/service/PermissionReadPlatformService.java b/mifosng-provider/src/main/java/org/mifosng/platform/user/service/PermissionReadPlatformService.java index dfe4fd536..0ac1255da 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/user/service/PermissionReadPlatformService.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/user/service/PermissionReadPlatformService.java @@ -2,7 +2,7 @@ package org.mifosng.platform.user.service; import java.util.Collection; -import org.mifosng.data.PermissionData; +import org.mifosng.platform.api.data.PermissionData; public interface PermissionReadPlatformService { diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/user/service/PermissionReadPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosng/platform/user/service/PermissionReadPlatformServiceImpl.java index c53005850..caadb28b1 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/user/service/PermissionReadPlatformServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/user/service/PermissionReadPlatformServiceImpl.java @@ -6,7 +6,7 @@ import java.util.Collection; import javax.sql.DataSource; -import org.mifosng.data.PermissionData; +import org.mifosng.platform.api.data.PermissionData; import org.mifosng.platform.infrastructure.JdbcSupport; import org.mifosng.platform.security.PlatformSecurityContext; import org.mifosng.platform.user.domain.AppUser; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/user/service/RoleReadPlatformService.java b/mifosng-provider/src/main/java/org/mifosng/platform/user/service/RoleReadPlatformService.java index f748612b9..9c42e07d6 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/user/service/RoleReadPlatformService.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/user/service/RoleReadPlatformService.java @@ -2,7 +2,7 @@ package org.mifosng.platform.user.service; import java.util.Collection; -import org.mifosng.data.RoleData; +import org.mifosng.platform.api.data.RoleData; public interface RoleReadPlatformService { diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/user/service/RoleReadPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosng/platform/user/service/RoleReadPlatformServiceImpl.java index a8637acb8..5d5977d46 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/user/service/RoleReadPlatformServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/user/service/RoleReadPlatformServiceImpl.java @@ -8,7 +8,7 @@ import java.util.Collection; import javax.sql.DataSource; -import org.mifosng.data.RoleData; +import org.mifosng.platform.api.data.RoleData; import org.mifosng.platform.exceptions.RoleNotFoundException; import org.mifosng.platform.infrastructure.JdbcSupport; import org.mifosng.platform.security.PlatformSecurityContext;