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

use JdbcSupport throughout backend.

Browse Source
This commit is contained in:
Keith Woodlock
2012-05-27 23:26:46 +01:00
parent 1465f24298
commit 986cf32fc8
15 changed files with 92 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mifosng-data/src/main/java/org/mifosng/data/AppUserData.java
-3
View File
@@ -3,12 +3,9 @@ package org.mifosng.data;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import javax.xml.bind.annotation.XmlRootElement;
import org.codehaus.jackson.annotate.JsonIgnoreProperties; import org.codehaus.jackson.annotate.JsonIgnoreProperties;
import org.codehaus.jackson.map.annotate.JsonFilter; import org.codehaus.jackson.map.annotate.JsonFilter;
@XmlRootElement(name = "user")
@JsonIgnoreProperties({ "orgId" }) @JsonIgnoreProperties({ "orgId" })
@JsonFilter("userFilter") @JsonFilter("userFilter")
public class AppUserData { public class AppUserData {
mifosng-data/src/main/java/org/mifosng/data/ConfigurationData.java
-3
View File
@@ -4,11 +4,8 @@ import java.io.Serializable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import javax.xml.bind.annotation.XmlRootElement;
import org.codehaus.jackson.map.annotate.JsonFilter; import org.codehaus.jackson.map.annotate.JsonFilter;
@XmlRootElement(name = "configuration")
@JsonFilter("myFilter") @JsonFilter("myFilter")
public class ConfigurationData implements Serializable { public class ConfigurationData implements Serializable {
mifosng-data/src/main/java/org/mifosng/data/EnumOptionReadModel.java → mifosng-data/src/main/java/org/mifosng/data/EnumOptionData.java
+3 -3
View File
@@ -5,16 +5,16 @@ import java.io.Serializable;
import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlRootElement;
@XmlRootElement(name = "option") @XmlRootElement(name = "option")
public class EnumOptionReadModel implements Serializable { public class EnumOptionData implements Serializable {
private Long id; private Long id;
private String value; 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.value = value;
this.id = id; this.id = id;
} }
mifosng-data/src/main/java/org/mifosng/data/EnumOptionList.java
+4 -4
View File
@@ -9,21 +9,21 @@ import javax.xml.bind.annotation.XmlRootElement;
@XmlRootElement @XmlRootElement
public class EnumOptionList { public class EnumOptionList {
private Collection<EnumOptionReadModel> options = new ArrayList<EnumOptionReadModel>(); private Collection<EnumOptionData> options = new ArrayList<EnumOptionData>();
protected EnumOptionList() { protected EnumOptionList() {
// //
} }
public EnumOptionList(final List<EnumOptionReadModel> options) { public EnumOptionList(final List<EnumOptionData> options) {
this.options = options; this.options = options;
} }
public Collection<EnumOptionReadModel> getOptions() { public Collection<EnumOptionData> getOptions() {
return this.options; return this.options;
} }
public void setOptions(final Collection<EnumOptionReadModel> options) { public void setOptions(final Collection<EnumOptionData> options) {
this.options = options; this.options = options;
} }
} }
mifosng-data/src/main/java/org/mifosng/data/LoanProductData.java
+15 -18
View File
@@ -5,12 +5,9 @@ import java.math.BigDecimal;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import javax.xml.bind.annotation.XmlRootElement;
import org.codehaus.jackson.map.annotate.JsonFilter; import org.codehaus.jackson.map.annotate.JsonFilter;
import org.joda.time.DateTime; import org.joda.time.DateTime;
@XmlRootElement(name = "loanProduct")
@JsonFilter("myFilter") @JsonFilter("myFilter")
public class LoanProductData implements Serializable { public class LoanProductData implements Serializable {
@@ -34,11 +31,11 @@ public class LoanProductData implements Serializable {
private DateTime lastModifedOn; private DateTime lastModifedOn;
private List<CurrencyData> possibleCurrencies = new ArrayList<CurrencyData>(); private List<CurrencyData> possibleCurrencies = new ArrayList<CurrencyData>();
private List<EnumOptionReadModel> possibleAmortizationOptions = new ArrayList<EnumOptionReadModel>(); private List<EnumOptionData> possibleAmortizationOptions = new ArrayList<EnumOptionData>();
private List<EnumOptionReadModel> possibleInterestOptions = new ArrayList<EnumOptionReadModel>(); private List<EnumOptionData> possibleInterestOptions = new ArrayList<EnumOptionData>();
private List<EnumOptionReadModel> possibleInterestRateCalculatedInPeriodOptions = new ArrayList<EnumOptionReadModel>(); private List<EnumOptionData> possibleInterestRateCalculatedInPeriodOptions = new ArrayList<EnumOptionData>();
private List<EnumOptionReadModel> repaymentFrequencyOptions = new ArrayList<EnumOptionReadModel>(); private List<EnumOptionData> repaymentFrequencyOptions = new ArrayList<EnumOptionData>();
private List<EnumOptionReadModel> interestFrequencyOptions = new ArrayList<EnumOptionReadModel>(); private List<EnumOptionData> interestFrequencyOptions = new ArrayList<EnumOptionData>();
public LoanProductData() { public LoanProductData() {
// //
@@ -199,39 +196,39 @@ public class LoanProductData implements Serializable {
this.possibleCurrencies = possibleCurrencies; this.possibleCurrencies = possibleCurrencies;
} }
public List<EnumOptionReadModel> getPossibleAmortizationOptions() { public List<EnumOptionData> getPossibleAmortizationOptions() {
return possibleAmortizationOptions; return possibleAmortizationOptions;
} }
public void setPossibleAmortizationOptions( public void setPossibleAmortizationOptions(
List<EnumOptionReadModel> possibleAmortizationOptions) { List<EnumOptionData> possibleAmortizationOptions) {
this.possibleAmortizationOptions = possibleAmortizationOptions; this.possibleAmortizationOptions = possibleAmortizationOptions;
} }
public List<EnumOptionReadModel> getPossibleInterestOptions() { public List<EnumOptionData> getPossibleInterestOptions() {
return possibleInterestOptions; return possibleInterestOptions;
} }
public void setPossibleInterestOptions( public void setPossibleInterestOptions(
List<EnumOptionReadModel> possibleInterestOptions) { List<EnumOptionData> possibleInterestOptions) {
this.possibleInterestOptions = possibleInterestOptions; this.possibleInterestOptions = possibleInterestOptions;
} }
public List<EnumOptionReadModel> getRepaymentFrequencyOptions() { public List<EnumOptionData> getRepaymentFrequencyOptions() {
return repaymentFrequencyOptions; return repaymentFrequencyOptions;
} }
public void setRepaymentFrequencyOptions( public void setRepaymentFrequencyOptions(
List<EnumOptionReadModel> repaymentFrequencyOptions) { List<EnumOptionData> repaymentFrequencyOptions) {
this.repaymentFrequencyOptions = repaymentFrequencyOptions; this.repaymentFrequencyOptions = repaymentFrequencyOptions;
} }
public List<EnumOptionReadModel> getInterestFrequencyOptions() { public List<EnumOptionData> getInterestFrequencyOptions() {
return interestFrequencyOptions; return interestFrequencyOptions;
} }
public void setInterestFrequencyOptions( public void setInterestFrequencyOptions(
List<EnumOptionReadModel> interestFrequencyOptions) { List<EnumOptionData> interestFrequencyOptions) {
this.interestFrequencyOptions = interestFrequencyOptions; this.interestFrequencyOptions = interestFrequencyOptions;
} }
@@ -251,12 +248,12 @@ public class LoanProductData implements Serializable {
this.interestRateCalculatedInPeriod = interestRateCalculatedInPeriod; this.interestRateCalculatedInPeriod = interestRateCalculatedInPeriod;
} }
public List<EnumOptionReadModel> getPossibleInterestRateCalculatedInPeriodOptions() { public List<EnumOptionData> getPossibleInterestRateCalculatedInPeriodOptions() {
return possibleInterestRateCalculatedInPeriodOptions; return possibleInterestRateCalculatedInPeriodOptions;
} }
public void setPossibleInterestRateCalculatedInPeriodOptions( public void setPossibleInterestRateCalculatedInPeriodOptions(
List<EnumOptionReadModel> possibleInterestRateCalculatedInPeriodOptions) { List<EnumOptionData> possibleInterestRateCalculatedInPeriodOptions) {
this.possibleInterestRateCalculatedInPeriodOptions = possibleInterestRateCalculatedInPeriodOptions; this.possibleInterestRateCalculatedInPeriodOptions = possibleInterestRateCalculatedInPeriodOptions;
} }
} }
mifosng-data/src/main/java/org/mifosng/data/OfficeData.java
-3
View File
@@ -4,12 +4,9 @@ import java.io.Serializable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import javax.xml.bind.annotation.XmlRootElement;
import org.codehaus.jackson.map.annotate.JsonFilter; import org.codehaus.jackson.map.annotate.JsonFilter;
import org.joda.time.LocalDate; import org.joda.time.LocalDate;
@XmlRootElement(name = "office")
@JsonFilter("myFilter") @JsonFilter("myFilter")
public class OfficeData implements Serializable { public class OfficeData implements Serializable {
mifosng-data/src/main/java/org/mifosng/data/RoleData.java
-3
View File
@@ -3,12 +3,9 @@ package org.mifosng.data;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import javax.xml.bind.annotation.XmlRootElement;
import org.codehaus.jackson.annotate.JsonIgnoreProperties; import org.codehaus.jackson.annotate.JsonIgnoreProperties;
import org.codehaus.jackson.map.annotate.JsonFilter; import org.codehaus.jackson.map.annotate.JsonFilter;
@XmlRootElement(name = "role")
@JsonIgnoreProperties({ "orgId" }) @JsonIgnoreProperties({ "orgId" })
@JsonFilter("roleFilter") @JsonFilter("roleFilter")
public class RoleData { public class RoleData {
mifosng-provider/src/main/java/org/mifosng/platform/client/service/ClientReadPlatformServiceImpl.java
+19 -21
View File
@@ -19,6 +19,7 @@ import org.mifosng.data.NoteData;
import org.mifosng.data.OfficeData; import org.mifosng.data.OfficeData;
import org.mifosng.data.OfficeLookup; import org.mifosng.data.OfficeLookup;
import org.mifosng.platform.exceptions.ClientNotFoundException; import org.mifosng.platform.exceptions.ClientNotFoundException;
import org.mifosng.platform.infrastructure.JdbcSupport;
import org.mifosng.platform.organisation.domain.Organisation; import org.mifosng.platform.organisation.domain.Organisation;
import org.mifosng.platform.organisation.service.OfficeReadPlatformService; import org.mifosng.platform.organisation.service.OfficeReadPlatformService;
import org.mifosng.platform.security.PlatformSecurityContext; import org.mifosng.platform.security.PlatformSecurityContext;
@@ -131,16 +132,16 @@ public class ClientReadPlatformServiceImpl implements ClientReadPlatformService
public ClientData mapRow(final ResultSet rs, final int rowNum) public ClientData mapRow(final ResultSet rs, final int rowNum)
throws SQLException { throws SQLException {
Long orgId = rs.getLong("orgId"); Long orgId = JdbcSupport.getLong(rs, "orgId");
Long officeId = rs.getLong("officeId"); Long officeId = JdbcSupport.getLong(rs, "officeId");
Long id = rs.getLong("id"); Long id = JdbcSupport.getLong(rs, "id");
String firstname = rs.getString("firstname"); String firstname = rs.getString("firstname");
if (StringUtils.isBlank(firstname)) { if (StringUtils.isBlank(firstname)) {
firstname = ""; firstname = "";
} }
String lastname = rs.getString("lastname"); String lastname = rs.getString("lastname");
String externalId = rs.getString("externalId"); String externalId = rs.getString("externalId");
LocalDate joinedDate = new LocalDate(rs.getDate("joinedDate")); LocalDate joinedDate = JdbcSupport.getLocalDate(rs, "joinedDate");
String officeName = fromOfficeList(this.offices, officeId); String officeName = fromOfficeList(this.offices, officeId);
@@ -149,8 +150,7 @@ public class ClientReadPlatformServiceImpl implements ClientReadPlatformService
orgname = organisation.getName(); orgname = organisation.getName();
} }
return new ClientData(orgId, orgname, officeId, officeName, id, return new ClientData(orgId, orgname, officeId, officeName, id, firstname, lastname, externalId, joinedDate);
firstname, lastname, externalId, joinedDate);
} }
private String fromOfficeList(final List<OfficeData> officeList, private String fromOfficeList(final List<OfficeData> officeList,
@@ -220,11 +220,11 @@ public class ClientReadPlatformServiceImpl implements ClientReadPlatformService
@Override @Override
public ClientLoanAccountSummaryData mapRow(final ResultSet rs, final int rowNum) throws SQLException { 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"); String externalId = rs.getString("externalId");
Long productId = rs.getLong("productId"); Long productId = JdbcSupport.getLong(rs, "productId");
String loanProductName = rs.getString("productName"); String loanProductName = rs.getString("productName");
Integer loanStatusId = rs.getInt("statusId"); Integer loanStatusId = JdbcSupport.getInteger(rs, "statusId");
String lifeCycleStatusText = rs.getString("statusName"); String lifeCycleStatusText = rs.getString("statusName");
LoanStatusMapper statusMapper = new LoanStatusMapper(loanStatusId); LoanStatusMapper statusMapper = new LoanStatusMapper(loanStatusId);
@@ -297,20 +297,19 @@ public class ClientReadPlatformServiceImpl implements ClientReadPlatformService
public NoteData mapRow(final ResultSet rs, final int rowNum) public NoteData mapRow(final ResultSet rs, final int rowNum)
throws SQLException { throws SQLException {
Long id = rs.getLong("id"); Long id = JdbcSupport.getLong(rs, "id");
Long clientId = rs.getLong("clientId"); Long clientId = JdbcSupport.getLong(rs, "clientId");
Long loanId = rs.getLong("loanId"); Long loanId = JdbcSupport.getLong(rs, "loanId");
Long transactionId = rs.getLong("transactionId"); Long transactionId = JdbcSupport.getLong(rs, "transactionId");
Integer noteTypeId = rs.getInt("noteTypeEnum"); Integer noteTypeId = JdbcSupport.getInteger(rs, "noteTypeEnum");
String note = rs.getString("note"); String note = rs.getString("note");
DateTime createdDate = new DateTime(rs.getTimestamp("createdDate")); DateTime createdDate = JdbcSupport.getDateTime(rs, "createdDate");
Long createdById = rs.getLong("createdById"); Long createdById = JdbcSupport.getLong(rs, "createdById");
String createdByUsername = findUserById(createdById, allUsers); String createdByUsername = findUserById(createdById, allUsers);
DateTime lastModifiedDate = new DateTime( DateTime lastModifiedDate = JdbcSupport.getDateTime(rs, "lastModifiedDate");
rs.getTimestamp("lastModifiedDate")); Long lastModifiedById = JdbcSupport.getLong(rs, "lastModifiedById");
Long lastModifiedById = rs.getLong("lastModifiedById");
String updatedByUsername = findUserById(createdById, allUsers); String updatedByUsername = findUserById(createdById, allUsers);
return new NoteData(id, clientId, loanId, transactionId, return new NoteData(id, clientId, loanId, transactionId,
@@ -319,8 +318,7 @@ public class ClientReadPlatformServiceImpl implements ClientReadPlatformService
updatedByUsername); updatedByUsername);
} }
private String findUserById(Long createdById, private String findUserById(Long createdById, Collection<AppUserData> allUsers) {
Collection<AppUserData> allUsers) {
String username = ""; String username = "";
for (AppUserData appUserData : allUsers) { for (AppUserData appUserData : allUsers) {
if (appUserData.getId().equals(createdById)) { if (appUserData.getId().equals(createdById)) {
mifosng-provider/src/main/java/org/mifosng/platform/currency/service/CurrencyReadPlatformServiceImpl.java
+3 -3
View File
@@ -7,6 +7,7 @@ import java.util.List;
import javax.sql.DataSource; import javax.sql.DataSource;
import org.mifosng.data.CurrencyData; import org.mifosng.data.CurrencyData;
import org.mifosng.platform.infrastructure.JdbcSupport;
import org.mifosng.platform.security.PlatformSecurityContext; import org.mifosng.platform.security.PlatformSecurityContext;
import org.mifosng.platform.user.domain.AppUser; import org.mifosng.platform.user.domain.AppUser;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@@ -57,12 +58,11 @@ public class CurrencyReadPlatformServiceImpl implements CurrencyReadPlatformServ
String code = rs.getString("code"); String code = rs.getString("code");
String name = rs.getString("name"); String name = rs.getString("name");
int decimalPlaces = rs.getInt("decimalPlaces"); int decimalPlaces = JdbcSupport.getInteger(rs, "decimalPlaces");
String displaySymbol = rs.getString("displaySymbol"); String displaySymbol = rs.getString("displaySymbol");
String nameCode = rs.getString("nameCode"); String nameCode = rs.getString("nameCode");
return new CurrencyData(code, name, decimalPlaces, displaySymbol, return new CurrencyData(code, name, decimalPlaces, displaySymbol, nameCode);
nameCode);
} }
} }
} }
mifosng-provider/src/main/java/org/mifosng/platform/loanproduct/service/LoanDropdownReadPlatformService.java
+6 -6
View File
@@ -2,17 +2,17 @@ package org.mifosng.platform.loanproduct.service;
import java.util.List; import java.util.List;
import org.mifosng.data.EnumOptionReadModel; import org.mifosng.data.EnumOptionData;
public interface LoanDropdownReadPlatformService { public interface LoanDropdownReadPlatformService {
List<EnumOptionReadModel> retrieveLoanAmortizationMethodOptions(); List<EnumOptionData> retrieveLoanAmortizationMethodOptions();
List<EnumOptionReadModel> retrieveLoanInterestMethodOptions(); List<EnumOptionData> retrieveLoanInterestMethodOptions();
List<EnumOptionReadModel> retrieveLoanInterestRateCalculatedInPeriodOptions(); List<EnumOptionData> retrieveLoanInterestRateCalculatedInPeriodOptions();
List<EnumOptionReadModel> retrieveRepaymentFrequencyOptions(); List<EnumOptionData> retrieveRepaymentFrequencyOptions();
List<EnumOptionReadModel> retrieveInterestFrequencyOptions(); List<EnumOptionData> retrieveInterestFrequencyOptions();
} }
mifosng-provider/src/main/java/org/mifosng/platform/loanproduct/service/LoanDropdownReadPlatformServiceImpl.java
+22 -22
View File
@@ -5,7 +5,7 @@ import java.util.List;
import javax.sql.DataSource; 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.AmortizationMethod;
import org.mifosng.platform.loan.domain.PeriodFrequencyType; import org.mifosng.platform.loan.domain.PeriodFrequencyType;
import org.mifosng.platform.security.PlatformSecurityContext; import org.mifosng.platform.security.PlatformSecurityContext;
@@ -30,28 +30,28 @@ public class LoanDropdownReadPlatformServiceImpl implements LoanDropdownReadPlat
} }
@Override @Override
public List<EnumOptionReadModel> retrieveLoanAmortizationMethodOptions() { public List<EnumOptionData> retrieveLoanAmortizationMethodOptions() {
EnumOptionReadModel equalInstallments = new EnumOptionReadModel( EnumOptionData equalInstallments = new EnumOptionData(
"Equal installments", AmortizationMethod.EQUAL_INSTALLMENTS "Equal installments", AmortizationMethod.EQUAL_INSTALLMENTS
.getValue().longValue()); .getValue().longValue());
EnumOptionReadModel equalPrinciplePayments = new EnumOptionReadModel( EnumOptionData equalPrinciplePayments = new EnumOptionData(
"Equal principle payments", AmortizationMethod.EQUAL_PRINCIPAL "Equal principle payments", AmortizationMethod.EQUAL_PRINCIPAL
.getValue().longValue()); .getValue().longValue());
List<EnumOptionReadModel> allowedAmortizationMethods = Arrays.asList( List<EnumOptionData> allowedAmortizationMethods = Arrays.asList(
equalInstallments, equalPrinciplePayments); equalInstallments, equalPrinciplePayments);
return allowedAmortizationMethods; return allowedAmortizationMethods;
} }
@Override @Override
public List<EnumOptionReadModel> retrieveLoanInterestMethodOptions() { public List<EnumOptionData> retrieveLoanInterestMethodOptions() {
EnumOptionReadModel interestRateCalculationMethod2 = new EnumOptionReadModel( EnumOptionData interestRateCalculationMethod2 = new EnumOptionData(
"Declining Balance", Long.valueOf(0)); "Declining Balance", Long.valueOf(0));
EnumOptionReadModel interestRateCalculationMethod1 = new EnumOptionReadModel( EnumOptionData interestRateCalculationMethod1 = new EnumOptionData(
"Flat", Long.valueOf(1)); "Flat", Long.valueOf(1));
List<EnumOptionReadModel> allowedRepaymentScheduleCalculationMethods = Arrays List<EnumOptionData> allowedRepaymentScheduleCalculationMethods = Arrays
.asList(interestRateCalculationMethod2, .asList(interestRateCalculationMethod2,
interestRateCalculationMethod1); interestRateCalculationMethod1);
@@ -59,40 +59,40 @@ public class LoanDropdownReadPlatformServiceImpl implements LoanDropdownReadPlat
} }
@Override @Override
public List<EnumOptionReadModel> retrieveLoanInterestRateCalculatedInPeriodOptions() { public List<EnumOptionData> retrieveLoanInterestRateCalculatedInPeriodOptions() {
EnumOptionReadModel option1 = new EnumOptionReadModel("Daily", EnumOptionData option1 = new EnumOptionData("Daily",
Long.valueOf(0)); Long.valueOf(0));
EnumOptionReadModel option2 = new EnumOptionReadModel( EnumOptionData option2 = new EnumOptionData(
"Same as repayment period", Long.valueOf(1)); "Same as repayment period", Long.valueOf(1));
List<EnumOptionReadModel> allowedOptions = Arrays.asList(option1, List<EnumOptionData> allowedOptions = Arrays.asList(option1,
option2); option2);
return allowedOptions; return allowedOptions;
} }
@Override @Override
public List<EnumOptionReadModel> retrieveRepaymentFrequencyOptions() { public List<EnumOptionData> retrieveRepaymentFrequencyOptions() {
EnumOptionReadModel frequency1 = new EnumOptionReadModel("Days", EnumOptionData frequency1 = new EnumOptionData("Days",
Long.valueOf(0)); Long.valueOf(0));
EnumOptionReadModel frequency2 = new EnumOptionReadModel("Weeks", EnumOptionData frequency2 = new EnumOptionData("Weeks",
Long.valueOf(1)); Long.valueOf(1));
EnumOptionReadModel frequency3 = new EnumOptionReadModel("Months", EnumOptionData frequency3 = new EnumOptionData("Months",
Long.valueOf(2)); Long.valueOf(2));
List<EnumOptionReadModel> repaymentFrequencyOptions = Arrays.asList( List<EnumOptionData> repaymentFrequencyOptions = Arrays.asList(
frequency1, frequency2, frequency3); frequency1, frequency2, frequency3);
return repaymentFrequencyOptions; return repaymentFrequencyOptions;
} }
@Override @Override
public List<EnumOptionReadModel> retrieveInterestFrequencyOptions() { public List<EnumOptionData> retrieveInterestFrequencyOptions() {
// support for monthly and annual percentage rate (MPR) and (APR) // 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()); PeriodFrequencyType.MONTHS.getValue().longValue());
EnumOptionReadModel perYear = new EnumOptionReadModel("Per year", EnumOptionData perYear = new EnumOptionData("Per year",
PeriodFrequencyType.YEARS.getValue().longValue()); PeriodFrequencyType.YEARS.getValue().longValue());
List<EnumOptionReadModel> repaymentFrequencyOptions = Arrays.asList( List<EnumOptionData> repaymentFrequencyOptions = Arrays.asList(
perMonth, perYear); perMonth, perYear);
return repaymentFrequencyOptions; return repaymentFrequencyOptions;
} }
mifosng-provider/src/main/java/org/mifosng/platform/loanproduct/service/LoanProductReadPlatformServiceImpl.java
+6 -6
View File
@@ -10,7 +10,7 @@ import javax.sql.DataSource;
import org.joda.time.DateTime; import org.joda.time.DateTime;
import org.mifosng.data.CurrencyData; import org.mifosng.data.CurrencyData;
import org.mifosng.data.EnumOptionReadModel; import org.mifosng.data.EnumOptionData;
import org.mifosng.data.LoanProductData; import org.mifosng.data.LoanProductData;
import org.mifosng.data.MoneyData; import org.mifosng.data.MoneyData;
import org.mifosng.platform.currency.service.CurrencyReadPlatformService; import org.mifosng.platform.currency.service.CurrencyReadPlatformService;
@@ -180,11 +180,11 @@ public class LoanProductReadPlatformServiceImpl implements LoanProductReadPlatfo
List<CurrencyData> possibleCurrencies = currencyReadPlatformService.retrieveAllowedCurrencies(); List<CurrencyData> possibleCurrencies = currencyReadPlatformService.retrieveAllowedCurrencies();
List<EnumOptionReadModel> possibleAmortizationOptions = dropdownReadPlatformService.retrieveLoanAmortizationMethodOptions(); List<EnumOptionData> possibleAmortizationOptions = dropdownReadPlatformService.retrieveLoanAmortizationMethodOptions();
List<EnumOptionReadModel> possibleInterestOptions = dropdownReadPlatformService.retrieveLoanInterestMethodOptions(); List<EnumOptionData> possibleInterestOptions = dropdownReadPlatformService.retrieveLoanInterestMethodOptions();
List<EnumOptionReadModel> possibleInterestRateCalculatedInPeriodOptions = dropdownReadPlatformService.retrieveLoanInterestRateCalculatedInPeriodOptions(); List<EnumOptionData> possibleInterestRateCalculatedInPeriodOptions = dropdownReadPlatformService.retrieveLoanInterestRateCalculatedInPeriodOptions();
List<EnumOptionReadModel> repaymentFrequencyOptions = dropdownReadPlatformService.retrieveRepaymentFrequencyOptions(); List<EnumOptionData> repaymentFrequencyOptions = dropdownReadPlatformService.retrieveRepaymentFrequencyOptions();
List<EnumOptionReadModel> interestFrequencyOptions = dropdownReadPlatformService.retrieveInterestFrequencyOptions(); List<EnumOptionData> interestFrequencyOptions = dropdownReadPlatformService.retrieveInterestFrequencyOptions();
productData.setPossibleCurrencies(possibleCurrencies); productData.setPossibleCurrencies(possibleCurrencies);
productData.setPossibleAmortizationOptions(possibleAmortizationOptions); productData.setPossibleAmortizationOptions(possibleAmortizationOptions);
mifosng-provider/src/main/java/org/mifosng/platform/user/service/AppUserReadPlatformServiceImpl.java
+6 -5
View File
@@ -16,6 +16,7 @@ import org.mifosng.data.OfficeData;
import org.mifosng.data.OfficeLookup; import org.mifosng.data.OfficeLookup;
import org.mifosng.data.RoleData; import org.mifosng.data.RoleData;
import org.mifosng.platform.exceptions.PlatformResourceNotFoundException; import org.mifosng.platform.exceptions.PlatformResourceNotFoundException;
import org.mifosng.platform.infrastructure.JdbcSupport;
import org.mifosng.platform.organisation.service.OfficeReadPlatformService; import org.mifosng.platform.organisation.service.OfficeReadPlatformService;
import org.mifosng.platform.security.PlatformSecurityContext; import org.mifosng.platform.security.PlatformSecurityContext;
import org.mifosng.platform.user.domain.AppUser; import org.mifosng.platform.user.domain.AppUser;
@@ -143,13 +144,13 @@ public class AppUserReadPlatformServiceImpl implements AppUserReadPlatformServic
String firstname = rs.getString("firstname"); String firstname = rs.getString("firstname");
String lastname = rs.getString("lastname"); String lastname = rs.getString("lastname");
String email = rs.getString("email"); String email = rs.getString("email");
Long orgId = rs.getLong("orgId"); Long orgId = JdbcSupport.getLong(rs, "orgId");
Long officeId = rs.getLong("officeId"); 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); String officeName = fromOfficeList(this.offices, officeId);
AppUserData user = new AppUserData(id, username, email, orgId, AppUserData user = new AppUserData(id, username, email, orgId, officeId, officeName);
officeId, officeName);
user.setLastname(lastname); user.setLastname(lastname);
user.setFirstname(firstname); user.setFirstname(firstname);
mifosng-provider/src/main/java/org/mifosng/platform/user/service/PermissionReadPlatformServiceImpl.java
+4 -3
View File
@@ -7,6 +7,7 @@ import java.util.Collection;
import javax.sql.DataSource; import javax.sql.DataSource;
import org.mifosng.data.PermissionData; import org.mifosng.data.PermissionData;
import org.mifosng.platform.infrastructure.JdbcSupport;
import org.mifosng.platform.security.PlatformSecurityContext; import org.mifosng.platform.security.PlatformSecurityContext;
import org.mifosng.platform.user.domain.AppUser; import org.mifosng.platform.user.domain.AppUser;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@@ -43,12 +44,12 @@ public class PermissionReadPlatformServiceImpl implements PermissionReadPlatform
@Override @Override
public PermissionData mapRow(final ResultSet rs, final int rowNum) throws SQLException { public PermissionData mapRow(final ResultSet rs, final int rowNum) throws SQLException {
Long id = rs.getLong("id"); Long id = JdbcSupport.getLong(rs, "id");
Long orgId = rs.getLong("orgId"); Long orgId = JdbcSupport.getLong(rs, "orgId");
String name = rs.getString("name"); String name = rs.getString("name");
String description = rs.getString("description"); String description = rs.getString("description");
String code = rs.getString("code"); 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); return new PermissionData(id, orgId, name, description, code, groupType);
} }
mifosng-provider/src/main/java/org/mifosng/platform/user/service/RoleReadPlatformServiceImpl.java
+4 -4
View File
@@ -7,6 +7,7 @@ import java.util.Collection;
import javax.sql.DataSource; import javax.sql.DataSource;
import org.mifosng.data.RoleData; import org.mifosng.data.RoleData;
import org.mifosng.platform.infrastructure.JdbcSupport;
import org.mifosng.platform.security.PlatformSecurityContext; import org.mifosng.platform.security.PlatformSecurityContext;
import org.mifosng.platform.user.domain.AppUser; import org.mifosng.platform.user.domain.AppUser;
import org.mifosng.platform.user.domain.Role; import org.mifosng.platform.user.domain.Role;
@@ -37,8 +38,7 @@ public class RoleReadPlatformServiceImpl implements RoleReadPlatformService {
RoleMapper mapper = new RoleMapper(); RoleMapper mapper = new RoleMapper();
String sql = "select " + mapper.schema() + " where r.org_id = ?"; String sql = "select " + mapper.schema() + " where r.org_id = ?";
return this.jdbcTemplate.query(sql, mapper, new Object[] { currentUser return this.jdbcTemplate.query(sql, mapper, new Object[] {currentUser.getOrganisation().getId() });
.getOrganisation().getId() });
} }
// FIXME - does it make sense to use JDBC over repository for this? // 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) public RoleData mapRow(final ResultSet rs, final int rowNum)
throws SQLException { throws SQLException {
Long id = rs.getLong("id"); Long id = JdbcSupport.getLong(rs, "id");
Long orgId = rs.getLong("orgId"); Long orgId = JdbcSupport.getLong(rs, "orgId");
String name = rs.getString("name"); String name = rs.getString("name");
String description = rs.getString("description"); String description = rs.getString("description");