From 986cf32fc8af6ddb95d3ae6c89a11b46427fb267 Mon Sep 17 00:00:00 2001 From: Keith Woodlock Date: Sun, 27 May 2012 23:26:46 +0100 Subject: [PATCH] use JdbcSupport throughout backend. --- .../java/org/mifosng/data/AppUserData.java | 3 -- .../org/mifosng/data/ConfigurationData.java | 3 -- ...tionReadModel.java => EnumOptionData.java} | 6 +-- .../java/org/mifosng/data/EnumOptionList.java | 8 ++-- .../org/mifosng/data/LoanProductData.java | 33 +++++++------- .../java/org/mifosng/data/OfficeData.java | 3 -- .../main/java/org/mifosng/data/RoleData.java | 3 -- .../ClientReadPlatformServiceImpl.java | 40 ++++++++--------- .../CurrencyReadPlatformServiceImpl.java | 6 +-- .../LoanDropdownReadPlatformService.java | 12 ++--- .../LoanDropdownReadPlatformServiceImpl.java | 44 +++++++++---------- .../LoanProductReadPlatformServiceImpl.java | 12 ++--- .../AppUserReadPlatformServiceImpl.java | 11 ++--- .../PermissionReadPlatformServiceImpl.java | 7 +-- .../service/RoleReadPlatformServiceImpl.java | 8 ++-- 15 files changed, 92 insertions(+), 107 deletions(-) rename mifosng-data/src/main/java/org/mifosng/data/{EnumOptionReadModel.java => EnumOptionData.java} (74%) diff --git a/mifosng-data/src/main/java/org/mifosng/data/AppUserData.java b/mifosng-data/src/main/java/org/mifosng/data/AppUserData.java index 252bc6445..29a4b93dc 100644 --- a/mifosng-data/src/main/java/org/mifosng/data/AppUserData.java +++ b/mifosng-data/src/main/java/org/mifosng/data/AppUserData.java @@ -3,12 +3,9 @@ package org.mifosng.data; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlRootElement; - import org.codehaus.jackson.annotate.JsonIgnoreProperties; import org.codehaus.jackson.map.annotate.JsonFilter; -@XmlRootElement(name = "user") @JsonIgnoreProperties({ "orgId" }) @JsonFilter("userFilter") public class AppUserData { diff --git a/mifosng-data/src/main/java/org/mifosng/data/ConfigurationData.java b/mifosng-data/src/main/java/org/mifosng/data/ConfigurationData.java index 824ed27b7..888b86362 100644 --- a/mifosng-data/src/main/java/org/mifosng/data/ConfigurationData.java +++ b/mifosng-data/src/main/java/org/mifosng/data/ConfigurationData.java @@ -4,11 +4,8 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlRootElement; - import org.codehaus.jackson.map.annotate.JsonFilter; -@XmlRootElement(name = "configuration") @JsonFilter("myFilter") public class ConfigurationData implements Serializable { diff --git a/mifosng-data/src/main/java/org/mifosng/data/EnumOptionReadModel.java b/mifosng-data/src/main/java/org/mifosng/data/EnumOptionData.java similarity index 74% rename from mifosng-data/src/main/java/org/mifosng/data/EnumOptionReadModel.java rename to mifosng-data/src/main/java/org/mifosng/data/EnumOptionData.java index 00ba7d7da..9ffc41dc6 100644 --- a/mifosng-data/src/main/java/org/mifosng/data/EnumOptionReadModel.java +++ b/mifosng-data/src/main/java/org/mifosng/data/EnumOptionData.java @@ -5,16 +5,16 @@ import java.io.Serializable; import javax.xml.bind.annotation.XmlRootElement; @XmlRootElement(name = "option") -public class EnumOptionReadModel implements Serializable { +public class EnumOptionData implements Serializable { private Long id; private String value; - public EnumOptionReadModel() { + public EnumOptionData() { // } - public EnumOptionReadModel(final String value, final Long id) { + public EnumOptionData(final String value, final Long id) { this.value = value; this.id = id; } diff --git a/mifosng-data/src/main/java/org/mifosng/data/EnumOptionList.java b/mifosng-data/src/main/java/org/mifosng/data/EnumOptionList.java index 764ad9be4..a74c5b61d 100644 --- a/mifosng-data/src/main/java/org/mifosng/data/EnumOptionList.java +++ b/mifosng-data/src/main/java/org/mifosng/data/EnumOptionList.java @@ -9,21 +9,21 @@ import javax.xml.bind.annotation.XmlRootElement; @XmlRootElement public class EnumOptionList { - private Collection options = new ArrayList(); + private Collection options = new ArrayList(); protected EnumOptionList() { // } - public EnumOptionList(final List options) { + public EnumOptionList(final List options) { this.options = options; } - public Collection getOptions() { + public Collection getOptions() { return this.options; } - public void setOptions(final Collection 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 index 88338ef9f..36ec73b91 100644 --- a/mifosng-data/src/main/java/org/mifosng/data/LoanProductData.java +++ b/mifosng-data/src/main/java/org/mifosng/data/LoanProductData.java @@ -5,12 +5,9 @@ import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlRootElement; - import org.codehaus.jackson.map.annotate.JsonFilter; import org.joda.time.DateTime; -@XmlRootElement(name = "loanProduct") @JsonFilter("myFilter") public class LoanProductData implements Serializable { @@ -34,11 +31,11 @@ public class LoanProductData implements Serializable { 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(); + 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() { // @@ -199,39 +196,39 @@ public class LoanProductData implements Serializable { this.possibleCurrencies = possibleCurrencies; } - public List getPossibleAmortizationOptions() { + public List getPossibleAmortizationOptions() { return possibleAmortizationOptions; } public void setPossibleAmortizationOptions( - List possibleAmortizationOptions) { + List possibleAmortizationOptions) { this.possibleAmortizationOptions = possibleAmortizationOptions; } - public List getPossibleInterestOptions() { + public List getPossibleInterestOptions() { return possibleInterestOptions; } public void setPossibleInterestOptions( - List possibleInterestOptions) { + List possibleInterestOptions) { this.possibleInterestOptions = possibleInterestOptions; } - public List getRepaymentFrequencyOptions() { + public List getRepaymentFrequencyOptions() { return repaymentFrequencyOptions; } public void setRepaymentFrequencyOptions( - List repaymentFrequencyOptions) { + List repaymentFrequencyOptions) { this.repaymentFrequencyOptions = repaymentFrequencyOptions; } - public List getInterestFrequencyOptions() { + public List getInterestFrequencyOptions() { return interestFrequencyOptions; } public void setInterestFrequencyOptions( - List interestFrequencyOptions) { + List interestFrequencyOptions) { this.interestFrequencyOptions = interestFrequencyOptions; } @@ -251,12 +248,12 @@ public class LoanProductData implements Serializable { this.interestRateCalculatedInPeriod = interestRateCalculatedInPeriod; } - public List getPossibleInterestRateCalculatedInPeriodOptions() { + public List getPossibleInterestRateCalculatedInPeriodOptions() { return possibleInterestRateCalculatedInPeriodOptions; } public void setPossibleInterestRateCalculatedInPeriodOptions( - List possibleInterestRateCalculatedInPeriodOptions) { + List possibleInterestRateCalculatedInPeriodOptions) { this.possibleInterestRateCalculatedInPeriodOptions = possibleInterestRateCalculatedInPeriodOptions; } } \ No newline at end of file diff --git a/mifosng-data/src/main/java/org/mifosng/data/OfficeData.java b/mifosng-data/src/main/java/org/mifosng/data/OfficeData.java index 3c0bb7688..6b3de16bb 100644 --- a/mifosng-data/src/main/java/org/mifosng/data/OfficeData.java +++ b/mifosng-data/src/main/java/org/mifosng/data/OfficeData.java @@ -4,12 +4,9 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlRootElement; - import org.codehaus.jackson.map.annotate.JsonFilter; import org.joda.time.LocalDate; -@XmlRootElement(name = "office") @JsonFilter("myFilter") public class OfficeData implements Serializable { diff --git a/mifosng-data/src/main/java/org/mifosng/data/RoleData.java b/mifosng-data/src/main/java/org/mifosng/data/RoleData.java index 2f8f2f723..d9df33dce 100644 --- a/mifosng-data/src/main/java/org/mifosng/data/RoleData.java +++ b/mifosng-data/src/main/java/org/mifosng/data/RoleData.java @@ -3,12 +3,9 @@ package org.mifosng.data; import java.util.ArrayList; import java.util.Collection; -import javax.xml.bind.annotation.XmlRootElement; - import org.codehaus.jackson.annotate.JsonIgnoreProperties; import org.codehaus.jackson.map.annotate.JsonFilter; -@XmlRootElement(name = "role") @JsonIgnoreProperties({ "orgId" }) @JsonFilter("roleFilter") public class RoleData { 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 3d2e972aa..d476ced61 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 @@ -19,6 +19,7 @@ import org.mifosng.data.NoteData; import org.mifosng.data.OfficeData; import org.mifosng.data.OfficeLookup; import org.mifosng.platform.exceptions.ClientNotFoundException; +import org.mifosng.platform.infrastructure.JdbcSupport; import org.mifosng.platform.organisation.domain.Organisation; import org.mifosng.platform.organisation.service.OfficeReadPlatformService; import org.mifosng.platform.security.PlatformSecurityContext; @@ -131,16 +132,16 @@ public class ClientReadPlatformServiceImpl implements ClientReadPlatformService public ClientData mapRow(final ResultSet rs, final int rowNum) throws SQLException { - Long orgId = rs.getLong("orgId"); - Long officeId = rs.getLong("officeId"); - Long id = rs.getLong("id"); + Long orgId = JdbcSupport.getLong(rs, "orgId"); + Long officeId = JdbcSupport.getLong(rs, "officeId"); + Long id = JdbcSupport.getLong(rs, "id"); String firstname = rs.getString("firstname"); if (StringUtils.isBlank(firstname)) { firstname = ""; } String lastname = rs.getString("lastname"); String externalId = rs.getString("externalId"); - LocalDate joinedDate = new LocalDate(rs.getDate("joinedDate")); + LocalDate joinedDate = JdbcSupport.getLocalDate(rs, "joinedDate"); String officeName = fromOfficeList(this.offices, officeId); @@ -149,8 +150,7 @@ public class ClientReadPlatformServiceImpl implements ClientReadPlatformService orgname = organisation.getName(); } - return new ClientData(orgId, orgname, officeId, officeName, id, - firstname, lastname, externalId, joinedDate); + return new ClientData(orgId, orgname, officeId, officeName, id, firstname, lastname, externalId, joinedDate); } private String fromOfficeList(final List officeList, @@ -220,11 +220,11 @@ public class ClientReadPlatformServiceImpl implements ClientReadPlatformService @Override public ClientLoanAccountSummaryData mapRow(final ResultSet rs, final int rowNum) throws SQLException { - Long id = rs.getLong("id"); + Long id = JdbcSupport.getLong(rs, "id"); String externalId = rs.getString("externalId"); - Long productId = rs.getLong("productId"); + Long productId = JdbcSupport.getLong(rs, "productId"); String loanProductName = rs.getString("productName"); - Integer loanStatusId = rs.getInt("statusId"); + Integer loanStatusId = JdbcSupport.getInteger(rs, "statusId"); String lifeCycleStatusText = rs.getString("statusName"); LoanStatusMapper statusMapper = new LoanStatusMapper(loanStatusId); @@ -297,20 +297,19 @@ public class ClientReadPlatformServiceImpl implements ClientReadPlatformService public NoteData mapRow(final ResultSet rs, final int rowNum) throws SQLException { - Long id = rs.getLong("id"); - Long clientId = rs.getLong("clientId"); - Long loanId = rs.getLong("loanId"); - Long transactionId = rs.getLong("transactionId"); - Integer noteTypeId = rs.getInt("noteTypeEnum"); + Long id = JdbcSupport.getLong(rs, "id"); + Long clientId = JdbcSupport.getLong(rs, "clientId"); + Long loanId = JdbcSupport.getLong(rs, "loanId"); + Long transactionId = JdbcSupport.getLong(rs, "transactionId"); + Integer noteTypeId = JdbcSupport.getInteger(rs, "noteTypeEnum"); String note = rs.getString("note"); - DateTime createdDate = new DateTime(rs.getTimestamp("createdDate")); - Long createdById = rs.getLong("createdById"); + DateTime createdDate = JdbcSupport.getDateTime(rs, "createdDate"); + Long createdById = JdbcSupport.getLong(rs, "createdById"); String createdByUsername = findUserById(createdById, allUsers); - DateTime lastModifiedDate = new DateTime( - rs.getTimestamp("lastModifiedDate")); - Long lastModifiedById = rs.getLong("lastModifiedById"); + DateTime lastModifiedDate = JdbcSupport.getDateTime(rs, "lastModifiedDate"); + Long lastModifiedById = JdbcSupport.getLong(rs, "lastModifiedById"); String updatedByUsername = findUserById(createdById, allUsers); return new NoteData(id, clientId, loanId, transactionId, @@ -319,8 +318,7 @@ public class ClientReadPlatformServiceImpl implements ClientReadPlatformService updatedByUsername); } - private String findUserById(Long createdById, - Collection allUsers) { + private String findUserById(Long createdById, Collection allUsers) { String username = ""; for (AppUserData appUserData : allUsers) { if (appUserData.getId().equals(createdById)) { diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/currency/service/CurrencyReadPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosng/platform/currency/service/CurrencyReadPlatformServiceImpl.java index de67646f4..aefca2788 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/currency/service/CurrencyReadPlatformServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/currency/service/CurrencyReadPlatformServiceImpl.java @@ -7,6 +7,7 @@ import java.util.List; import javax.sql.DataSource; import org.mifosng.data.CurrencyData; +import org.mifosng.platform.infrastructure.JdbcSupport; import org.mifosng.platform.security.PlatformSecurityContext; import org.mifosng.platform.user.domain.AppUser; import org.springframework.beans.factory.annotation.Autowired; @@ -57,12 +58,11 @@ public class CurrencyReadPlatformServiceImpl implements CurrencyReadPlatformServ String code = rs.getString("code"); String name = rs.getString("name"); - int decimalPlaces = rs.getInt("decimalPlaces"); + int decimalPlaces = JdbcSupport.getInteger(rs, "decimalPlaces"); String displaySymbol = rs.getString("displaySymbol"); String nameCode = rs.getString("nameCode"); - return new CurrencyData(code, name, decimalPlaces, displaySymbol, - nameCode); + return new CurrencyData(code, name, decimalPlaces, displaySymbol, nameCode); } } } \ No newline at end of file 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 16402e93e..2d19fa7e6 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 @@ -2,17 +2,17 @@ package org.mifosng.platform.loanproduct.service; import java.util.List; -import org.mifosng.data.EnumOptionReadModel; +import org.mifosng.data.EnumOptionData; public interface LoanDropdownReadPlatformService { - List retrieveLoanAmortizationMethodOptions(); + List retrieveLoanAmortizationMethodOptions(); - List retrieveLoanInterestMethodOptions(); + List retrieveLoanInterestMethodOptions(); - List retrieveLoanInterestRateCalculatedInPeriodOptions(); + List retrieveLoanInterestRateCalculatedInPeriodOptions(); - List retrieveRepaymentFrequencyOptions(); + List retrieveRepaymentFrequencyOptions(); - List retrieveInterestFrequencyOptions(); + List retrieveInterestFrequencyOptions(); } \ 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 590ff80bd..50752db53 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 @@ -5,7 +5,7 @@ import java.util.List; import javax.sql.DataSource; -import org.mifosng.data.EnumOptionReadModel; +import org.mifosng.data.EnumOptionData; import org.mifosng.platform.loan.domain.AmortizationMethod; import org.mifosng.platform.loan.domain.PeriodFrequencyType; import org.mifosng.platform.security.PlatformSecurityContext; @@ -30,28 +30,28 @@ public class LoanDropdownReadPlatformServiceImpl implements LoanDropdownReadPlat } @Override - public List retrieveLoanAmortizationMethodOptions() { - EnumOptionReadModel equalInstallments = new EnumOptionReadModel( + public List retrieveLoanAmortizationMethodOptions() { + EnumOptionData equalInstallments = new EnumOptionData( "Equal installments", AmortizationMethod.EQUAL_INSTALLMENTS .getValue().longValue()); - EnumOptionReadModel equalPrinciplePayments = new EnumOptionReadModel( + EnumOptionData equalPrinciplePayments = new EnumOptionData( "Equal principle payments", AmortizationMethod.EQUAL_PRINCIPAL .getValue().longValue()); - List allowedAmortizationMethods = Arrays.asList( + List allowedAmortizationMethods = Arrays.asList( equalInstallments, equalPrinciplePayments); return allowedAmortizationMethods; } @Override - public List retrieveLoanInterestMethodOptions() { - EnumOptionReadModel interestRateCalculationMethod2 = new EnumOptionReadModel( + public List retrieveLoanInterestMethodOptions() { + EnumOptionData interestRateCalculationMethod2 = new EnumOptionData( "Declining Balance", Long.valueOf(0)); - EnumOptionReadModel interestRateCalculationMethod1 = new EnumOptionReadModel( + EnumOptionData interestRateCalculationMethod1 = new EnumOptionData( "Flat", Long.valueOf(1)); - List allowedRepaymentScheduleCalculationMethods = Arrays + List allowedRepaymentScheduleCalculationMethods = Arrays .asList(interestRateCalculationMethod2, interestRateCalculationMethod1); @@ -59,40 +59,40 @@ public class LoanDropdownReadPlatformServiceImpl implements LoanDropdownReadPlat } @Override - public List retrieveLoanInterestRateCalculatedInPeriodOptions() { + public List retrieveLoanInterestRateCalculatedInPeriodOptions() { - EnumOptionReadModel option1 = new EnumOptionReadModel("Daily", + EnumOptionData option1 = new EnumOptionData("Daily", Long.valueOf(0)); - EnumOptionReadModel option2 = new EnumOptionReadModel( + EnumOptionData option2 = new EnumOptionData( "Same as repayment period", Long.valueOf(1)); - List allowedOptions = Arrays.asList(option1, + List allowedOptions = Arrays.asList(option1, option2); return allowedOptions; } @Override - public List retrieveRepaymentFrequencyOptions() { - EnumOptionReadModel frequency1 = new EnumOptionReadModel("Days", + public List retrieveRepaymentFrequencyOptions() { + EnumOptionData frequency1 = new EnumOptionData("Days", Long.valueOf(0)); - EnumOptionReadModel frequency2 = new EnumOptionReadModel("Weeks", + EnumOptionData frequency2 = new EnumOptionData("Weeks", Long.valueOf(1)); - EnumOptionReadModel frequency3 = new EnumOptionReadModel("Months", + EnumOptionData frequency3 = new EnumOptionData("Months", Long.valueOf(2)); - List repaymentFrequencyOptions = Arrays.asList( + List repaymentFrequencyOptions = Arrays.asList( frequency1, frequency2, frequency3); return repaymentFrequencyOptions; } @Override - public List retrieveInterestFrequencyOptions() { + public List retrieveInterestFrequencyOptions() { // support for monthly and annual percentage rate (MPR) and (APR) - EnumOptionReadModel perMonth = new EnumOptionReadModel("Per month", + EnumOptionData perMonth = new EnumOptionData("Per month", PeriodFrequencyType.MONTHS.getValue().longValue()); - EnumOptionReadModel perYear = new EnumOptionReadModel("Per year", + EnumOptionData perYear = new EnumOptionData("Per year", PeriodFrequencyType.YEARS.getValue().longValue()); - List repaymentFrequencyOptions = Arrays.asList( + List repaymentFrequencyOptions = Arrays.asList( perMonth, perYear); return repaymentFrequencyOptions; } 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 02cdbff59..b3bd244f9 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 @@ -10,7 +10,7 @@ import javax.sql.DataSource; import org.joda.time.DateTime; import org.mifosng.data.CurrencyData; -import org.mifosng.data.EnumOptionReadModel; +import org.mifosng.data.EnumOptionData; import org.mifosng.data.LoanProductData; import org.mifosng.data.MoneyData; import org.mifosng.platform.currency.service.CurrencyReadPlatformService; @@ -180,11 +180,11 @@ public class LoanProductReadPlatformServiceImpl implements LoanProductReadPlatfo List possibleCurrencies = currencyReadPlatformService.retrieveAllowedCurrencies(); - List possibleAmortizationOptions = dropdownReadPlatformService.retrieveLoanAmortizationMethodOptions(); - List possibleInterestOptions = dropdownReadPlatformService.retrieveLoanInterestMethodOptions(); - List possibleInterestRateCalculatedInPeriodOptions = dropdownReadPlatformService.retrieveLoanInterestRateCalculatedInPeriodOptions(); - List repaymentFrequencyOptions = dropdownReadPlatformService.retrieveRepaymentFrequencyOptions(); - List interestFrequencyOptions = dropdownReadPlatformService.retrieveInterestFrequencyOptions(); + 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); 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 422832f4c..5e3454b11 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 @@ -16,6 +16,7 @@ import org.mifosng.data.OfficeData; import org.mifosng.data.OfficeLookup; import org.mifosng.data.RoleData; import org.mifosng.platform.exceptions.PlatformResourceNotFoundException; +import org.mifosng.platform.infrastructure.JdbcSupport; import org.mifosng.platform.organisation.service.OfficeReadPlatformService; import org.mifosng.platform.security.PlatformSecurityContext; import org.mifosng.platform.user.domain.AppUser; @@ -143,13 +144,13 @@ public class AppUserReadPlatformServiceImpl implements AppUserReadPlatformServic String firstname = rs.getString("firstname"); String lastname = rs.getString("lastname"); String email = rs.getString("email"); - Long orgId = rs.getLong("orgId"); - Long officeId = rs.getLong("officeId"); - + Long orgId = JdbcSupport.getLong(rs, "orgId"); + Long officeId = JdbcSupport.getLong(rs, "officeId"); + + // FIXME - change sql query to join to get office id and name information. String officeName = fromOfficeList(this.offices, officeId); - AppUserData user = new AppUserData(id, username, email, orgId, - officeId, officeName); + AppUserData user = new AppUserData(id, username, email, orgId, officeId, officeName); user.setLastname(lastname); user.setFirstname(firstname); 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 e66177a94..a983e3a82 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 @@ -7,6 +7,7 @@ import java.util.Collection; import javax.sql.DataSource; import org.mifosng.data.PermissionData; +import org.mifosng.platform.infrastructure.JdbcSupport; import org.mifosng.platform.security.PlatformSecurityContext; import org.mifosng.platform.user.domain.AppUser; import org.springframework.beans.factory.annotation.Autowired; @@ -43,12 +44,12 @@ public class PermissionReadPlatformServiceImpl implements PermissionReadPlatform @Override public PermissionData mapRow(final ResultSet rs, final int rowNum) throws SQLException { - Long id = rs.getLong("id"); - Long orgId = rs.getLong("orgId"); + Long id = JdbcSupport.getLong(rs, "id"); + Long orgId = JdbcSupport.getLong(rs, "orgId"); String name = rs.getString("name"); String description = rs.getString("description"); String code = rs.getString("code"); - int groupType = rs.getInt("groupType"); + Integer groupType = JdbcSupport.getInteger(rs, "groupType"); return new PermissionData(id, orgId, name, description, code, groupType); } 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 be2d11b2b..c6696c560 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 @@ -7,6 +7,7 @@ import java.util.Collection; import javax.sql.DataSource; import org.mifosng.data.RoleData; +import org.mifosng.platform.infrastructure.JdbcSupport; import org.mifosng.platform.security.PlatformSecurityContext; import org.mifosng.platform.user.domain.AppUser; import org.mifosng.platform.user.domain.Role; @@ -37,8 +38,7 @@ public class RoleReadPlatformServiceImpl implements RoleReadPlatformService { RoleMapper mapper = new RoleMapper(); String sql = "select " + mapper.schema() + " where r.org_id = ?"; - return this.jdbcTemplate.query(sql, mapper, new Object[] { currentUser - .getOrganisation().getId() }); + return this.jdbcTemplate.query(sql, mapper, new Object[] {currentUser.getOrganisation().getId() }); } // FIXME - does it make sense to use JDBC over repository for this? @@ -56,8 +56,8 @@ public class RoleReadPlatformServiceImpl implements RoleReadPlatformService { public RoleData mapRow(final ResultSet rs, final int rowNum) throws SQLException { - Long id = rs.getLong("id"); - Long orgId = rs.getLong("orgId"); + Long id = JdbcSupport.getLong(rs, "id"); + Long orgId = JdbcSupport.getLong(rs, "orgId"); String name = rs.getString("name"); String description = rs.getString("description");