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

FIXED: MIFOSX-38 - retrieving client notes does not return as an array when only one client note exists.

Browse Source
This commit is contained in:
Keith Woodlock
2012-08-21 10:42:04 +01:00
parent 28cee2ab07
commit 432332c88e
3 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mifosng-provider/src/main/java/org/mifosng/platform/api/ClientsApiResource.java
+1 -1
View File
@@ -252,7 +252,7 @@ public class ClientsApiResource {
Collection<NoteData> notes = this.clientReadPlatformService.retrieveAllClientNotes(clientId);
return this.apiDataConversionService.convertNoteDataToJson(prettyPrint, responseParameters, notes.toArray(new NoteData[notes.size()]));
return this.apiDataConversionService.convertNoteDataToJson(prettyPrint, responseParameters, notes);
}
@POST
mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/ApiDataConversionService.java
+4 -1
View File
@@ -1,5 +1,6 @@
package org.mifosng.platform.api.infrastructure;
import java.util.Collection;
import java.util.Set;
import org.mifosng.platform.api.commands.AdjustLoanTransactionCommand;
@@ -63,7 +64,9 @@ public interface ApiDataConversionService {
String convertGroupDataToJson(boolean prettyPrint, Set<String> responseParameters, GroupData... groups);
String convertNoteDataToJson(boolean prettyPrint, Set<String> responseParameters, NoteData... notes);
String convertNoteDataToJson(boolean prettyPrint, Set<String> responseParameters, NoteData note);
String convertNoteDataToJson(boolean prettyPrint, Set<String> responseParameters, Collection<NoteData> notes);
String convertLoanProductDataToJson(boolean prettyPrint, Set<String> responseParameters, LoanProductData... products);
mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/ApiDataConversionServiceImpl.java
+14 -2
View File
@@ -8,6 +8,7 @@ import java.text.NumberFormat;
import java.text.ParseException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashSet;
import java.util.List;
import java.util.Locale;
@@ -275,7 +276,18 @@ public class ApiDataConversionServiceImpl implements ApiDataConversionService {
}
@Override
public String convertNoteDataToJson(final boolean prettyPrint, final Set<String> responseParameters, final NoteData... notes) {
public String convertNoteDataToJson(boolean prettyPrint, Set<String> responseParameters, Collection<NoteData> notes) {
final boolean returnAsArray = true;
return doConvertNoteDataToJson(prettyPrint, returnAsArray, responseParameters, notes.toArray(new NoteData[notes.size()]));
}
@Override
public String convertNoteDataToJson(final boolean prettyPrint, final Set<String> responseParameters, final NoteData note) {
final boolean returnAsArray = false;
return doConvertNoteDataToJson(prettyPrint, returnAsArray, responseParameters, note);
}
private String doConvertNoteDataToJson(final boolean prettyPrint, final boolean returnAsArray, final Set<String> responseParameters, final NoteData... notes) {
final Set<String> supportedParameters = new HashSet<String>(
Arrays.asList("id", "clientId", "loanId", "loanTransactionId", "noteType", "note", "createdById", "createdByUsername",
"createdOn", "updatedById", "updatedByUsername", "updatedOn")
@@ -303,7 +315,7 @@ public class ApiDataConversionServiceImpl implements ApiDataConversionService {
Gson gsonDeserializer = builder.create();
String json = "";
if (notes != null && notes.length == 1) {
if (notes != null && notes.length == 1 && !returnAsArray) {
json = gsonDeserializer.toJson(notes[0]);
} else {
json = gsonDeserializer.toJson(notes);