From db27f429cdb21ccec066eb69a044eef0cd79a818 Mon Sep 17 00:00:00 2001
From: John Woodlock <john.woodlock@gmail.com>
Date: Thu, 7 Jun 2012 17:38:52 +1000
Subject: [PATCH] WIP associations parameter

---
 .../ApiJSONFormattingServiceImpl.java              | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/ApiJSONFormattingServiceImpl.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/ApiJSONFormattingServiceImpl.java
index db20b5abd..fbca317a4 100644
--- a/mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/ApiJSONFormattingServiceImpl.java
+++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/ApiJSONFormattingServiceImpl.java
@@ -107,9 +107,9 @@ public class ApiJSONFormattingServiceImpl implements ApiJSONFormattingService {
 			return fieldList;
 		}
 
-		//No template query param provided
+		// No template query param provided
 		if (filterType.equals("E")) {
-			fieldList = allowedFieldList; //exclude
+			fieldList = allowedFieldList; // exclude
 		}
 
 		return fieldList;
@@ -122,12 +122,16 @@ public class ApiJSONFormattingServiceImpl implements ApiJSONFormattingService {
 		if (isPassed(param)) {
 			logger.info("is associations");
 			if (param.equalsIgnoreCase("ALL")) {
+				logger.info("is ALL");
 				if (filterType.equals("I")) {
+					logger.info("is Include");
 					return fieldList + "," + associationFields;
 				}
+				logger.info("is Exclude");
 				return fieldList;
 			}
 
+			logger.info("Not ALL");
 			Set<String> fullAssociationsSet = createSetFromString(associationFields);
 			Set<String> paramAssociationsSet = createSetFromString(param);
 
@@ -135,11 +139,15 @@ public class ApiJSONFormattingServiceImpl implements ApiJSONFormattingService {
 
 				String selectedAssociationFields = createIncludedInStringList(
 						paramAssociationsSet, fullAssociationsSet);
+				logger.info("is Include - selected fields are :"
+						+ selectedAssociationFields);
 				return fieldList + "," + selectedAssociationFields;
 			}
 
 			String unSelectedAssociationFields = createNotIncludedInStringList(
-					paramAssociationsSet, fullAssociationsSet);
+					fullAssociationsSet, paramAssociationsSet);
+			logger.info("is Exclude - unselected fields are :"
+					+ unSelectedAssociationFields);
 
 			if (fieldList.equals("")) {
 				return unSelectedAssociationFields;