WIP associations parameter

mifosng-provider/src/main/java/org/mifosng/platform/api/LoansApiResource.java

@@ -26,8 +26,8 @@ import org.mifosng.platform.api.commands.SubmitLoanApplicationCommand;
 import org.mifosng.platform.api.commands.UndoStateTransitionCommand;
 import org.mifosng.platform.api.data.EntityIdentifier;
 import org.mifosng.platform.api.data.LoanAccountData;
-import org.mifosng.platform.api.data.LoanTransactionData;
 import org.mifosng.platform.api.data.LoanSchedule;
+import org.mifosng.platform.api.data.LoanTransactionData;
 import org.mifosng.platform.api.data.NewLoanData;
 import org.mifosng.platform.api.infrastructure.ApiDataConversionService;
 import org.mifosng.platform.api.infrastructure.ApiJSONFormattingService;
@@ -69,8 +69,8 @@ public class LoansApiResource {
 
 	@GET
 	@Path("template")
-	@Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+	@Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
-	@Produces({ MediaType.APPLICATION_JSON})
+	@Produces({ MediaType.APPLICATION_JSON })
 	public String retrieveDetailsForNewLoanApplicationStepOne(
 			@QueryParam("clientId") final Long clientId,
 			@QueryParam("productId") final Long productId,
@@ -87,8 +87,8 @@ public class LoansApiResource {
 
 	@GET
 	@Path("{loanId}")
-	@Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+	@Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
-	@Produces({ MediaType.APPLICATION_JSON})
+	@Produces({ MediaType.APPLICATION_JSON })
 	public String retrieveLoanAccountDetails(
 			@PathParam("loanId") final Long loanId, @Context UriInfo uriInfo) {
 
@@ -103,40 +103,47 @@ public class LoansApiResource {
 	}
 
 	@POST
-	@Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+	@Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
-	@Produces({ MediaType.APPLICATION_JSON})
+	@Produces({ MediaType.APPLICATION_JSON })
 	public Response calculateLoanSchedule(
 			@QueryParam("command") final String commandParam,
 			final SubmitLoanApplicationCommand command) {
 
 		LocalDate expectedDisbursementLocalDate = apiDataConversionService
 				.convertFrom(command.getExpectedDisbursementDate(),
-						"expectedDisbursementDate",
+						"expectedDisbursementDate", command.getDateFormat());
-						command.getDateFormat());
 		LocalDate repaymentsStartingFromLocalDate = apiDataConversionService
 				.convertFrom(command.getRepaymentsStartingFromDate(),
-						"repaymentsStartingFromDate",
+						"repaymentsStartingFromDate", command.getDateFormat());
-						command.getDateFormat());
 		LocalDate interestChargedFromLocalDate = apiDataConversionService
 				.convertFrom(command.getInterestChargedFromDate(),
-						"interestChargedFromDate",
+						"interestChargedFromDate", command.getDateFormat());
-						command.getDateFormat());
 		LocalDate submittedOnLocalDate = apiDataConversionService.convertFrom(
-				command.getSubmittedOnDate(),
+				command.getSubmittedOnDate(), "submittedOnDate",
-				"submittedOnDate", command.getDateFormat());
+				command.getDateFormat());
 
 		command.setExpectedDisbursementLocalDate(expectedDisbursementLocalDate);
 		command.setRepaymentsStartingFromLocalDate(repaymentsStartingFromLocalDate);
 		command.setInterestChargedFromLocalDate(interestChargedFromLocalDate);
 		command.setSubmittedOnLocalDate(submittedOnLocalDate);
 
-		Locale clientApplicationLocale = this.apiDataConversionService.localeFromString(command.getLocale());
+		Locale clientApplicationLocale = this.apiDataConversionService
-		BigDecimal principalValue = this.apiDataConversionService.convertFrom(command.getPrincipal(), "principal", clientApplicationLocale);
+				.localeFromString(command.getLocale());
-		BigDecimal inArrearsToleranceValue = this.apiDataConversionService.convertFrom(command.getInArrearsTolerance(), "inArrearsTolerance", clientApplicationLocale);
+		BigDecimal principalValue = this.apiDataConversionService.convertFrom(
-		BigDecimal interestRatePerPeriodValue = this.apiDataConversionService.convertFrom(command.getInterestRatePerPeriod(),"interestRatePerPeriod", clientApplicationLocale);
+				command.getPrincipal(), "principal", clientApplicationLocale);
+		BigDecimal inArrearsToleranceValue = this.apiDataConversionService
+				.convertFrom(command.getInArrearsTolerance(),
+						"inArrearsTolerance", clientApplicationLocale);
+		BigDecimal interestRatePerPeriodValue = this.apiDataConversionService
+				.convertFrom(command.getInterestRatePerPeriod(),
+						"interestRatePerPeriod", clientApplicationLocale);
 
-		Integer repaymentEveryValue = this.apiDataConversionService.convertToInteger(command.getRepaymentEvery(), "repaymentEvery", clientApplicationLocale);
+		Integer repaymentEveryValue = this.apiDataConversionService
-		Integer numberOfRepaymentsValue = this.apiDataConversionService.convertToInteger(command.getNumberOfRepayments(), "numberOfRepayments", clientApplicationLocale);
+				.convertToInteger(command.getRepaymentEvery(),
+						"repaymentEvery", clientApplicationLocale);
+		Integer numberOfRepaymentsValue = this.apiDataConversionService
+				.convertToInteger(command.getNumberOfRepayments(),
+						"numberOfRepayments", clientApplicationLocale);
 
 		command.setPrincipalValue(principalValue);
 		command.setInArrearsToleranceValue(inArrearsToleranceValue);
@@ -168,8 +175,8 @@ public class LoansApiResource {
 
 	@DELETE
 	@Path("{loanId}")
-	@Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+	@Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
-	@Produces({ MediaType.APPLICATION_JSON})
+	@Produces({ MediaType.APPLICATION_JSON })
 	public Response deleteLoanApplication(@PathParam("loanId") final Long loanId) {
 
 		EntityIdentifier identifier = this.loanWritePlatformService
@@ -180,14 +187,14 @@ public class LoansApiResource {
 
 	@POST
 	@Path("{loanId}")
-	@Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+	@Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
-	@Produces({ MediaType.APPLICATION_JSON})
+	@Produces({ MediaType.APPLICATION_JSON })
-	public Response stateTransitions(@PathParam("loanId") final Long loanId, @QueryParam("command") final String commandParam,
+	public Response stateTransitions(@PathParam("loanId") final Long loanId,
+			@QueryParam("command") final String commandParam,
 			final LoanStateTransitionCommand command) {
 
 		LocalDate eventLocalDate = this.apiDataConversionService.convertFrom(
-				command.getEventDate(), "eventDate",
+				command.getEventDate(), "eventDate", command.getDateFormat());
-				command.getDateFormat());
 
 		command.setLoanId(loanId);
 		command.setEventLocalDate(eventLocalDate);
@@ -195,25 +202,32 @@ public class LoansApiResource {
 		Response response = null;
 
 		if (is(commandParam, "reject")) {
-			EntityIdentifier identifier = this.loanWritePlatformService.rejectLoan(command);
+			EntityIdentifier identifier = this.loanWritePlatformService
+					.rejectLoan(command);
 			response = Response.ok().entity(identifier).build();
 		} else if (is(commandParam, "withdrewbyclient")) {
-			EntityIdentifier identifier = this.loanWritePlatformService.withdrawLoan(command);
+			EntityIdentifier identifier = this.loanWritePlatformService
+					.withdrawLoan(command);
 			response = Response.ok().entity(identifier).build();
 		} else if (is(commandParam, "approve")) {
-			EntityIdentifier identifier = this.loanWritePlatformService.approveLoanApplication(command);
+			EntityIdentifier identifier = this.loanWritePlatformService
+					.approveLoanApplication(command);
 			response = Response.ok().entity(identifier).build();
 		} else if (is(commandParam, "disburse")) {
-			EntityIdentifier identifier = this.loanWritePlatformService.disburseLoan(command);
+			EntityIdentifier identifier = this.loanWritePlatformService
+					.disburseLoan(command);
 			response = Response.ok().entity(identifier).build();
 		}
 
-		UndoStateTransitionCommand undoCommand = new UndoStateTransitionCommand(loanId, command.getNote());
+		UndoStateTransitionCommand undoCommand = new UndoStateTransitionCommand(
+				loanId, command.getNote());
 		if (is(commandParam, "undoapproval")) {
-			EntityIdentifier identifier = this.loanWritePlatformService.undoLoanApproval(undoCommand);
+			EntityIdentifier identifier = this.loanWritePlatformService
+					.undoLoanApproval(undoCommand);
 			response = Response.ok().entity(identifier).build();
 		} else if (is(commandParam, "undodisbursal")) {
-			EntityIdentifier identifier = this.loanWritePlatformService.undoLoanDisbursal(undoCommand);
+			EntityIdentifier identifier = this.loanWritePlatformService
+					.undoLoanDisbursal(undoCommand);
 			response = Response.ok().entity(identifier).build();
 		}
 
@@ -225,13 +239,14 @@ public class LoansApiResource {
 	}
 
 	private boolean is(final String commandParam, final String commandValue) {
-		return StringUtils.isNotBlank(commandParam) && commandParam.trim().equalsIgnoreCase(commandValue);
+		return StringUtils.isNotBlank(commandParam)
+				&& commandParam.trim().equalsIgnoreCase(commandValue);
 	}
 
 	@POST
 	@Path("{loanId}/transactions")
-	@Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+	@Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
-	@Produces({ MediaType.APPLICATION_JSON})
+	@Produces({ MediaType.APPLICATION_JSON })
 	public Response executeLoanTransaction(
 			@PathParam("loanId") final Long loanId,
 			@QueryParam("command") final String commandParam,
@@ -240,23 +255,26 @@ public class LoansApiResource {
 		Response response = null;
 		command.setLoanId(loanId);
 
-		Locale clientLocale = this.apiDataConversionService.localeFromString(command.getLocale());
+		Locale clientLocale = this.apiDataConversionService
+				.localeFromString(command.getLocale());
 
 		LocalDate transactionLocalDate = apiDataConversionService.convertFrom(
-				command.getTransactionDate(),
+				command.getTransactionDate(), "transactionDate",
-				"transactionDate", command.getDateFormat());
+				command.getDateFormat());
 		command.setTransactionLocalDate(transactionLocalDate);
 
-		BigDecimal transactionAmountValue = apiDataConversionService.convertFrom(
+		BigDecimal transactionAmountValue = apiDataConversionService
-				command.getTransactionAmount(),
+				.convertFrom(command.getTransactionAmount(),
-				"transactionAmount", clientLocale);
+						"transactionAmount", clientLocale);
 		command.setTransactionAmountValue(transactionAmountValue);
 
 		if (is(commandParam, "repayment")) {
-			EntityIdentifier identifier = this.loanWritePlatformService.makeLoanRepayment(command);
+			EntityIdentifier identifier = this.loanWritePlatformService
+					.makeLoanRepayment(command);
 			response = Response.ok().entity(identifier).build();
 		} else if (is(commandParam, "waiver")) {
-			EntityIdentifier identifier = this.loanWritePlatformService.waiveLoanAmount(command);
+			EntityIdentifier identifier = this.loanWritePlatformService
+					.waiveLoanAmount(command);
 			response = Response.ok().entity(identifier).build();
 		}
 
@@ -269,8 +287,8 @@ public class LoansApiResource {
 
 	@GET
 	@Path("{loanId}/transactions/template")
-	@Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+	@Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
-	@Produces({ MediaType.APPLICATION_JSON})
+	@Produces({ MediaType.APPLICATION_JSON })
 	public String retrieveNewRepaymentDetails(
 			@PathParam("loanId") final Long loanId,
 			@QueryParam("command") final String commandParam,
@@ -282,14 +300,14 @@ public class LoansApiResource {
 			LoanTransactionData loanRepaymentData = this.loanReadPlatformService
 					.retrieveNewLoanRepaymentDetails(loanId);
 			json = this.jsonFormattingService.convertRequest(loanRepaymentData,
-					loanRepaymentFilterName, loanRepaymentAllowedFieldList, selectedFields,
+					loanRepaymentFilterName, loanRepaymentAllowedFieldList,
-					uriInfo.getQueryParameters());
+					selectedFields, uriInfo.getQueryParameters());
 		} else if (is(commandParam, "waiver")) {
 			LoanTransactionData loanWaiverData = this.loanReadPlatformService
 					.retrieveNewLoanWaiverDetails(loanId);
 			json = this.jsonFormattingService.convertRequest(loanWaiverData,
-					loanRepaymentFilterName, loanRepaymentAllowedFieldList, selectedFields,
+					loanRepaymentFilterName, loanRepaymentAllowedFieldList,
-					uriInfo.getQueryParameters());
+					selectedFields, uriInfo.getQueryParameters());
 		}
 
 		if (StringUtils.isBlank(json)) {
@@ -301,10 +319,9 @@ public class LoansApiResource {
 
 	@GET
 	@Path("{loanId}/transactions/{transactionId}")
-	@Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+	@Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
-	@Produces({ MediaType.APPLICATION_JSON})
+	@Produces({ MediaType.APPLICATION_JSON })
-	public String retrieveTransaction(
+	public String retrieveTransaction(@PathParam("loanId") final Long loanId,
-			@PathParam("loanId") final Long loanId,
 			@PathParam("transactionId") final Long transactionId,
 			@Context UriInfo uriInfo) {
 
@@ -313,14 +330,14 @@ public class LoansApiResource {
 
 		String selectedFields = loanRepaymentDefaultFieldList;
 		return this.jsonFormattingService.convertRequest(loanRepaymentData,
-				loanRepaymentFilterName, loanRepaymentAllowedFieldList, selectedFields,
+				loanRepaymentFilterName, loanRepaymentAllowedFieldList,
-				uriInfo.getQueryParameters());
+				selectedFields, uriInfo.getQueryParameters());
 	}
 
 	@POST
 	@Path("{loanId}/transactions/{transactionId}")
-	@Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+	@Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
-	@Produces({ MediaType.APPLICATION_JSON})
+	@Produces({ MediaType.APPLICATION_JSON })
 	public Response adjustLoanTransaction(
 			@PathParam("loanId") final Long loanId,
 			@PathParam("transactionId") final Long transactionId,
@@ -329,19 +346,21 @@ public class LoansApiResource {
 		command.setLoanId(loanId);
 		command.setTransactionId(transactionId);
 
-		Locale clientLocale = this.apiDataConversionService.localeFromString(command.getLocale());
+		Locale clientLocale = this.apiDataConversionService
+				.localeFromString(command.getLocale());
 
 		LocalDate transactionLocalDate = apiDataConversionService.convertFrom(
-				command.getTransactionDate(),
+				command.getTransactionDate(), "transactionDate",
-				"transactionDate", command.getDateFormat());
+				command.getDateFormat());
 		command.setTransactionLocalDate(transactionLocalDate);
 
-		BigDecimal transactionAmountValue = apiDataConversionService.convertFrom(
+		BigDecimal transactionAmountValue = apiDataConversionService
-				command.getTransactionAmount(),
+				.convertFrom(command.getTransactionAmount(),
-				"transactionAmount", clientLocale);
+						"transactionAmount", clientLocale);
 		command.setTransactionAmountValue(transactionAmountValue);
 
-		EntityIdentifier identifier = this.loanWritePlatformService.adjustLoanTransaction(command);
+		EntityIdentifier identifier = this.loanWritePlatformService
+				.adjustLoanTransaction(command);
 
 		return Response.ok().entity(identifier).build();
 	}

mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/ApiJSONFormattingServiceImpl.java

@@ -14,12 +14,18 @@ import org.codehaus.jackson.map.ObjectWriter;
 import org.codehaus.jackson.map.ser.FilterProvider;
 import org.codehaus.jackson.map.ser.impl.SimpleBeanPropertyFilter;
 import org.codehaus.jackson.map.ser.impl.SimpleFilterProvider;
+import org.mifosng.platform.api.LoansApiResource;
 import org.mifosng.platform.exceptions.PlatformInternalServerException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
 @Service
 public class ApiJSONFormattingServiceImpl implements ApiJSONFormattingService {
 
+	private final static Logger logger = LoggerFactory
+			.getLogger(ApiJSONFormattingServiceImpl.class);
+	
 	@Override
 	public String convertRequest(Object dataObject, String filterName,
 			String allowedFieldList, String selectedFields,
@@ -36,6 +42,7 @@ public class ApiJSONFormattingServiceImpl implements ApiJSONFormattingService {
 			String allowedFieldList, String selectedFields,
 			String associationFields, MultivaluedMap<String, String> queryParams) {
 
+		logger.info("in Loan Date Convert Request: " + associationFields);
 		return convertRequestCommon(dataObject, filterName, allowedFieldList,
 				selectedFields, associationFields, queryParams);
 
@@ -99,11 +106,16 @@ public class ApiJSONFormattingServiceImpl implements ApiJSONFormattingService {
 				fieldList = allowedFieldList;
 		}
 
-		if (isTrue(queryParams.getFirst("associations"))) {
+		if (isPassed(queryParams.getFirst("associations"))) {
+			logger.info("is associations");
 			// assume ALL for moment
 			if (filterType.equals("I"))
 				fieldList += "," + associationFields;
+			
+			
 		} else {
+
+			logger.info("no associations");
 			if (filterType.equals("E")) {
 				if (fieldList.equals(""))
 					fieldList = associationFields;
@@ -112,6 +124,9 @@ public class ApiJSONFormattingServiceImpl implements ApiJSONFormattingService {
 			}
 		}
 		
+
+		logger.info("fieldList to be process is: " + fieldList + "   filter type is: " + filterType);
+
 		return convertDataObjectJSON(dataObject, filterName, filterType,
 				fieldList, isTrue(queryParams.getFirst("pretty")));
 	}