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

WIP restructure of extradata api

Browse Source
This commit is contained in:
John Woodlock
2012-05-10 13:19:24 +10:00
parent 008ec86c9a
commit a6cf21dd42
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mifosng-data/src/main/java/org/mifosng/data/ExtraDatasets.java
+7 -7
View File
@@ -8,22 +8,22 @@ import javax.xml.bind.annotation.XmlRootElement;
@XmlRootElement @XmlRootElement
public class ExtraDatasets { public class ExtraDatasets {
private List<String> names = new ArrayList<String>(); private List<ExtraDatasetRow> extraDatasetRow = new ArrayList<ExtraDatasetRow>();
protected ExtraDatasets() { protected ExtraDatasets() {
// //
} }
public ExtraDatasets(final List<String> names) { public ExtraDatasets(final List<ExtraDatasetRow> extraDatasetRow) {
this.names = names; this.extraDatasetRow = extraDatasetRow;
} }
public List<String> getNames() { public List<ExtraDatasetRow> getExtraDatasetRow() {
return names; return extraDatasetRow;
} }
public void setNames(List<String> names) { public void setExtraDatasetRow(List<ExtraDatasetRow> extraDatasetRow) {
this.names = names; this.extraDatasetRow = extraDatasetRow;
} }
} }
mifosng-provider/src/main/java/org/mifosng/platform/ReadPlatformServiceImpl.java
+6 -6
View File
@@ -33,6 +33,8 @@ import org.mifosng.data.ClientDataWithAccountsData;
import org.mifosng.data.CurrencyData; import org.mifosng.data.CurrencyData;
import org.mifosng.data.DerivedLoanData; import org.mifosng.data.DerivedLoanData;
import org.mifosng.data.EnumOptionReadModel; import org.mifosng.data.EnumOptionReadModel;
import org.mifosng.data.ErrorResponse;
import org.mifosng.data.ExtraDatasetRow;
import org.mifosng.data.ExtraDatasets; import org.mifosng.data.ExtraDatasets;
import org.mifosng.data.LoanAccountData; import org.mifosng.data.LoanAccountData;
import org.mifosng.data.LoanProductData; import org.mifosng.data.LoanProductData;
@@ -1277,7 +1279,7 @@ public class ReadPlatformServiceImpl implements ReadPlatformService {
@Override @Override
public ExtraDatasets retrieveExtraDatasetNames(String type) { public ExtraDatasets retrieveExtraDatasetNames(String type) {
List<String> names = new ArrayList<String>(); List<ExtraDatasetRow> extraDatasetRows = new ArrayList<ExtraDatasetRow>();
Connection db_connection; Connection db_connection;
try { try {
db_connection = dataSource.getConnection(); db_connection = dataSource.getConnection();
@@ -1289,15 +1291,13 @@ public class ReadPlatformServiceImpl implements ReadPlatformService {
} else { } else {
whereClause = "where t.`name` = '" + type + "'"; whereClause = "where t.`name` = '" + type + "'";
} }
String sql = "select d.`name` as datasetName from stretchydata_dataset d join stretchydata_datasettype t on t.id = d.datasettype_id " String sql = "select d.id, d.`name` as datasetName, t.`name` as datasetType from stretchydata_dataset d join stretchydata_datasettype t on t.id = d.datasettype_id "
+ whereClause + " order by d.`name`"; + whereClause + " order by d.`name`";
//logger.info("extra tables sql: " + sql);
ResultSet rs = db_statement.executeQuery(sql); ResultSet rs = db_statement.executeQuery(sql);
while (rs.next()) { while (rs.next()) {
//logger.info("datasetName: " + rs.getString("datasetName")); extraDatasetRows.add(new ExtraDatasetRow(rs.getInt("id"), rs.getString("datasetName"), rs.getString("datasetType")));
names.add(rs.getString("datasetName"));
} }
db_statement.close(); db_statement.close();
@@ -1310,7 +1310,7 @@ public class ReadPlatformServiceImpl implements ReadPlatformService {
.status(Status.BAD_REQUEST).entity(e.getMessage()).build()); .status(Status.BAD_REQUEST).entity(e.getMessage()).build());
} }
return new ExtraDatasets(names); return new ExtraDatasets(extraDatasetRows);
} }
@Override @Override