MIFOSX-329: refactor audit work for replacing ids of offices and clients for better display.

mifosng-provider/src/main/java/org/mifosplatform/commands/api/AuditsApiResource.java

@@ -38,12 +38,9 @@ import org.springframework.stereotype.Component;
 @Scope("singleton")
 public class AuditsApiResource {
 
-	private final Set<String> RESPONSE_DATA_PARAMETERS = new HashSet<String>(
+    private final Set<String> RESPONSE_DATA_PARAMETERS = new HashSet<String>(Arrays.asList("id", "actionName", "entityName", "resourceId",
-			Arrays.asList("id", "actionName", "entityName", "resourceId",
+            "subresourceId", "maker", "madeOnDate", "checker", "checkedOnDate", "processingResult", "commandAsJson", "officeName",
-					"subresourceId", "maker", "madeOnDate", "checker",
+            "groupLevelName", "groupName", "clientName", "loanAccountNo", "savingsAccountNo"));
-					"checkedOnDate", "processingResult", "commandAsJson",
-					"officeName", "groupLevelName", "groupName", "clientName",
-					"loanAccountNo", "savingsAccountNo"));
 
     private final String resourceNameForPermissions = "AUDIT";
 
@@ -54,11 +51,8 @@ public class AuditsApiResource {
     private final DefaultToApiJsonSerializer<AuditSearchData> toApiJsonSerializerSearchTemplate;
 
     @Autowired
-	public AuditsApiResource(
+    public AuditsApiResource(final PlatformSecurityContext context, final AuditReadPlatformService auditReadPlatformService,
-			final PlatformSecurityContext context,
+            final ApiRequestParameterHelper apiRequestParameterHelper, final DefaultToApiJsonSerializer<AuditData> toApiJsonSerializer,
-			final AuditReadPlatformService auditReadPlatformService,
-			final ApiRequestParameterHelper apiRequestParameterHelper,
-			final DefaultToApiJsonSerializer<AuditData> toApiJsonSerializer,
             final DefaultToApiJsonSerializer<AuditSearchData> toApiJsonSerializerSearchTemplate) {
         this.context = context;
         this.auditReadPlatformService = auditReadPlatformService;
@@ -70,60 +64,41 @@ public class AuditsApiResource {
     @GET
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-	public String retrieveAuditEntries(
+    public String retrieveAuditEntries(@Context final UriInfo uriInfo, @QueryParam("actionName") final String actionName,
-			@Context final UriInfo uriInfo,
+            @QueryParam("entityName") final String entityName, @QueryParam("resourceId") final Long resourceId,
-			@QueryParam("actionName") final String actionName,
+            @QueryParam("makerId") final Long makerId, @QueryParam("makerDateTimeFrom") final String makerDateTimeFrom,
-			@QueryParam("entityName") final String entityName,
+            @QueryParam("makerDateTimeTo") final String makerDateTimeTo, @QueryParam("checkerId") final Long checkerId,
-			@QueryParam("resourceId") final Long resourceId,
-			@QueryParam("makerId") final Long makerId,
-			@QueryParam("makerDateTimeFrom") final String makerDateTimeFrom,
-			@QueryParam("makerDateTimeTo") final String makerDateTimeTo,
-			@QueryParam("checkerId") final Long checkerId,
             @QueryParam("checkerDateTimeFrom") final String checkerDateTimeFrom,
             @QueryParam("checkerDateTimeTo") final String checkerDateTimeTo,
-			@QueryParam("processingResult") final Integer processingResult,
+            @QueryParam("processingResult") final Integer processingResult, @QueryParam("officeId") final Integer officeId,
-			@QueryParam("officeId") final Integer officeId,
+            @QueryParam("groupId") final Integer groupId, @QueryParam("clientId") final Integer clientId,
-			@QueryParam("groupId") final Integer groupId,
+            @QueryParam("loanid") final Integer loanId, @QueryParam("savingsAccountId") final Integer savingsAccountId) {
-			@QueryParam("clientId") final Integer clientId,
-			@QueryParam("loanid") final Integer loanId,
-			@QueryParam("savingsAccountId") final Integer savingsAccountId) {
 
-		context.authenticatedUser().validateHasReadPermission(
+        context.authenticatedUser().validateHasReadPermission(resourceNameForPermissions);
-				resourceNameForPermissions);
 
-		final String extraCriteria = getExtraCriteria(actionName, entityName,
+        final String extraCriteria = getExtraCriteria(actionName, entityName, resourceId, makerId, makerDateTimeFrom, makerDateTimeTo,
-				resourceId, makerId, makerDateTimeFrom, makerDateTimeTo,
+                checkerId, checkerDateTimeFrom, checkerDateTimeTo, processingResult, officeId, groupId, clientId, loanId, savingsAccountId);
-				checkerId, checkerDateTimeFrom, checkerDateTimeTo,
-				processingResult, officeId, groupId, clientId, loanId,
-				savingsAccountId);
 
-		final ApiRequestJsonSerializationSettings settings = apiRequestParameterHelper
+        final ApiRequestJsonSerializationSettings settings = apiRequestParameterHelper.process(uriInfo.getQueryParameters());
-				.process(uriInfo.getQueryParameters());
 
-		final Collection<AuditData> auditEntries = this.auditReadPlatformService
+        final Collection<AuditData> auditEntries = this.auditReadPlatformService.retrieveAuditEntries(extraCriteria,
-				.retrieveAuditEntries(extraCriteria, settings.isIncludeJson());
+                settings.isIncludeJson());
 
-		return this.toApiJsonSerializer.serialize(settings, auditEntries,
+        return this.toApiJsonSerializer.serialize(settings, auditEntries, RESPONSE_DATA_PARAMETERS);
-				RESPONSE_DATA_PARAMETERS);
     }
 
     @GET
     @Path("{auditId}")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-	public String retrieveAuditEntry(@PathParam("auditId") final Long auditId,
+    public String retrieveAuditEntry(@PathParam("auditId") final Long auditId, @Context final UriInfo uriInfo) {
-			@Context final UriInfo uriInfo) {
 
-		context.authenticatedUser().validateHasReadPermission(
+        context.authenticatedUser().validateHasReadPermission(resourceNameForPermissions);
-				resourceNameForPermissions);
 
-		final AuditData auditEntry = this.auditReadPlatformService
+        final AuditData auditEntry = this.auditReadPlatformService.retrieveAuditEntry(auditId);
-				.retrieveAuditEntry(auditId);
 
-		final ApiRequestJsonSerializationSettings settings = apiRequestParameterHelper
+        final ApiRequestJsonSerializationSettings settings = apiRequestParameterHelper.process(uriInfo.getQueryParameters());
-				.process(uriInfo.getQueryParameters());
+        return this.toApiJsonSerializer.serialize(settings, auditEntry, RESPONSE_DATA_PARAMETERS);
-		return this.toApiJsonSerializer.serialize(settings, auditEntry,
-				RESPONSE_DATA_PARAMETERS);
     }
 
     @GET
@@ -132,41 +107,30 @@ public class AuditsApiResource {
     @Produces({ MediaType.APPLICATION_JSON })
     public String retrieveAuditSearchTemplate(@Context final UriInfo uriInfo) {
 
-		context.authenticatedUser().validateHasReadPermission(
+        context.authenticatedUser().validateHasReadPermission(resourceNameForPermissions);
-				resourceNameForPermissions);
 
-		final ApiRequestJsonSerializationSettings settings = apiRequestParameterHelper
+        final ApiRequestJsonSerializationSettings settings = apiRequestParameterHelper.process(uriInfo.getQueryParameters());
-				.process(uriInfo.getQueryParameters());
 
-		final AuditSearchData auditSearchData = this.auditReadPlatformService
+        final AuditSearchData auditSearchData = this.auditReadPlatformService.retrieveSearchTemplate("audit");
-				.retrieveSearchTemplate("audit");
 
-		final Set<String> RESPONSE_DATA_PARAMETERS_SEARCH_TEMPLATE = new HashSet<String>(
+        final Set<String> RESPONSE_DATA_PARAMETERS_SEARCH_TEMPLATE = new HashSet<String>(Arrays.asList("appUsers", "actionNames",
-				Arrays.asList("appUsers", "actionNames", "entityNames",
+                "entityNames", "processingResults"));
-						"processingResults"));
 
-		return this.toApiJsonSerializerSearchTemplate.serialize(settings,
+        return this.toApiJsonSerializerSearchTemplate.serialize(settings, auditSearchData, RESPONSE_DATA_PARAMETERS_SEARCH_TEMPLATE);
-				auditSearchData, RESPONSE_DATA_PARAMETERS_SEARCH_TEMPLATE);
     }
 
-	private String getExtraCriteria(final String actionName,
+    private String getExtraCriteria(final String actionName, final String entityName, final Long resourceId, final Long makerId,
-			final String entityName, final Long resourceId, final Long makerId,
+            final String makerDateTimeFrom, final String makerDateTimeTo, final Long checkerId, final String checkerDateTimeFrom,
-			final String makerDateTimeFrom, final String makerDateTimeTo,
+            final String checkerDateTimeTo, final Integer processingResult, final Integer officeId, final Integer groupId,
-			final Long checkerId, final String checkerDateTimeFrom,
+            final Integer clientId, final Integer loanId, final Integer savingsAccountId) {
-			final String checkerDateTimeTo, final Integer processingResult,
-			final Integer officeId, final Integer groupId,
-			final Integer clientId, final Integer loanId,
-			final Integer savingsAccountId) {
 
         String extraCriteria = "";
 
         if (actionName != null) {
-			extraCriteria += " and aud.action_name = "
+            extraCriteria += " and aud.action_name = " + ApiParameterHelper.sqlEncodeString(actionName);
-					+ ApiParameterHelper.sqlEncodeString(actionName);
         }
         if (entityName != null) {
-			extraCriteria += " and aud.entity_name like "
+            extraCriteria += " and aud.entity_name like " + ApiParameterHelper.sqlEncodeString(entityName + "%");
-					+ ApiParameterHelper.sqlEncodeString(entityName + "%");
         }
 
         if (resourceId != null) {
@@ -179,25 +143,20 @@ public class AuditsApiResource {
             extraCriteria += " and aud.checker_id = " + checkerId;
         }
         if (makerDateTimeFrom != null) {
-			extraCriteria += " and aud.made_on_date >= "
+            extraCriteria += " and aud.made_on_date >= " + ApiParameterHelper.sqlEncodeString(makerDateTimeFrom);
-					+ ApiParameterHelper.sqlEncodeString(makerDateTimeFrom);
         }
         if (makerDateTimeTo != null) {
-			extraCriteria += " and aud.made_on_date <= "
+            extraCriteria += " and aud.made_on_date <= " + ApiParameterHelper.sqlEncodeString(makerDateTimeTo);
-					+ ApiParameterHelper.sqlEncodeString(makerDateTimeTo);
         }
         if (checkerDateTimeFrom != null) {
-			extraCriteria += " and aud.checked_on_date >= "
+            extraCriteria += " and aud.checked_on_date >= " + ApiParameterHelper.sqlEncodeString(checkerDateTimeFrom);
-					+ ApiParameterHelper.sqlEncodeString(checkerDateTimeFrom);
         }
         if (checkerDateTimeTo != null) {
-			extraCriteria += " and aud.checked_on_date <= "
+            extraCriteria += " and aud.checked_on_date <= " + ApiParameterHelper.sqlEncodeString(checkerDateTimeTo);
-					+ ApiParameterHelper.sqlEncodeString(checkerDateTimeTo);
         }
 
         if (processingResult != null) {
-			extraCriteria += " and aud.processing_result_enum = "
+            extraCriteria += " and aud.processing_result_enum = " + processingResult;
-					+ processingResult;
         }
 
         if (officeId != null) {

mifosng-provider/src/main/java/org/mifosplatform/commands/data/AuditData.java

@@ -47,15 +47,10 @@ public final class AuditData {
     @SuppressWarnings("unused")
     private final String savingsAccountNo;
 
-	public AuditData(final Long id, final String actionName,
+    public AuditData(final Long id, final String actionName, final String entityName, final Long resourceId, final Long subresourceId,
-			final String entityName, final Long resourceId,
+            final String maker, final DateTime madeOnDate, final String checker, final DateTime checkedOnDate,
-			final Long subresourceId, final String maker,
+            final String processingResult, final String commandAsJson, final String officeName, final String groupLevelName,
-			final DateTime madeOnDate, final String checker,
+            final String groupName, final String clientName, final String loanAccountNo, final String savingsAccountNo) {
-			final DateTime checkedOnDate, final String processingResult,
-			final String commandAsJson, final String officeName,
-			final String groupLevelName, final String groupName,
-			final String clientName, final String loanAccountNo,
-			final String savingsAccountNo) {
 
         this.id = id;
         this.actionName = actionName;
@@ -76,7 +71,7 @@ public final class AuditData {
         this.savingsAccountNo = savingsAccountNo;
     }
 
-	public void setCommandAsJson(String commandAsJson) {
+    public void setCommandAsJson(final String commandAsJson) {
         this.commandAsJson = commandAsJson;
     }
 

mifosng-provider/src/main/java/org/mifosplatform/commands/domain/CommandWrapper.java

@@ -59,8 +59,7 @@ public class CommandWrapper {
 
     public CommandWrapper(final Long officeId, final Long groupId, final Long clientId, final Long loanId, final Long savingsId,
             final String actionName, final String entityName, final Long entityId, final Long subentityId, final Long codeId,
-            final String supportedEntityType, final Long supportedEntityId, final String href, final String json, final String transactionId
+            final String supportedEntityType, final Long supportedEntityId, final String href, final String json, final String transactionId) {
-   ) {
         this.commandId = null;
         this.officeId = officeId;
         this.groupId = groupId;
@@ -129,7 +128,6 @@ public class CommandWrapper {
         return this.transactionId;
     }
 
-   
     public String getEntityName() {
         return this.entityName;
     }
@@ -499,11 +497,11 @@ public class CommandWrapper {
         return this.entityName.equalsIgnoreCase("REPORT");
     }
 
-    public boolean isAssociateClients(){
+    public boolean isAssociateClients() {
         return this.actionName.equalsIgnoreCase("ASSOCIATECLIENTS");
     }
 
-    public boolean isDisassociateClients(){
+    public boolean isDisassociateClients() {
         return this.actionName.equalsIgnoreCase("DISASSOCIATECLIENTS");
     }
 }

mifosng-provider/src/main/java/org/mifosplatform/commands/exception/CommandNotAwaitingApprovalException.java

@@ -12,7 +12,7 @@ import org.mifosplatform.infrastructure.core.exception.AbstractPlatformResourceN
  */
 public class CommandNotAwaitingApprovalException extends AbstractPlatformResourceNotFoundException {
 
-	public CommandNotAwaitingApprovalException(Long id) {
+    public CommandNotAwaitingApprovalException(final Long id) {
         super("error.msg.command.id.not.awaiting.approval", "Audit with identifier " + id + " is Not Awaiting Approval", id);
     }
 }

mifosng-provider/src/main/java/org/mifosplatform/commands/exception/CommandNotFoundException.java

@@ -12,7 +12,7 @@ import org.mifosplatform.infrastructure.core.exception.AbstractPlatformResourceN
  */
 public class CommandNotFoundException extends AbstractPlatformResourceNotFoundException {
 
-	public CommandNotFoundException(Long id) {
+    public CommandNotFoundException(final Long id) {
         super("error.msg.command.id.invalid", "Audit with identifier " + id + " does not exist", id);
     }
 }

mifosng-provider/src/main/java/org/mifosplatform/commands/exception/RollbackTransactionAsCommandIsNotApprovedByCheckerException.java

@@ -7,8 +7,7 @@ package org.mifosplatform.commands.exception;
 
 import org.mifosplatform.commands.domain.CommandSource;
 
-public class RollbackTransactionAsCommandIsNotApprovedByCheckerException extends
+public class RollbackTransactionAsCommandIsNotApprovedByCheckerException extends RuntimeException {
-		RuntimeException {
 
     /**
      * When maker-checker is configured globally and also for the current
@@ -23,8 +22,7 @@ public class RollbackTransactionAsCommandIsNotApprovedByCheckerException extends
      */
     private final CommandSource commandSourceResult;
 
-	public RollbackTransactionAsCommandIsNotApprovedByCheckerException(
+    public RollbackTransactionAsCommandIsNotApprovedByCheckerException(final CommandSource commandSourceResult) {
-			final CommandSource commandSourceResult) {
         this.commandSourceResult = commandSourceResult;
     }
 

mifosng-provider/src/main/java/org/mifosplatform/commands/service/AuditReadPlatformService.java

@@ -19,5 +19,4 @@ public interface AuditReadPlatformService {
     AuditData retrieveAuditEntry(Long auditId);
 
     AuditSearchData retrieveSearchTemplate(String useType);
-
 }

mifosng-provider/src/main/java/org/mifosplatform/commands/service/AuditReadPlatformServiceImpl.java

@@ -5,10 +5,10 @@
  */
 package org.mifosplatform.commands.service;
 
+import java.lang.reflect.Type;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.Collection;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -19,8 +19,13 @@ import org.mifosplatform.commands.data.AuditSearchData;
 import org.mifosplatform.commands.data.ProcessingResultLookup;
 import org.mifosplatform.infrastructure.core.domain.JdbcSupport;
 import org.mifosplatform.infrastructure.core.exception.PlatformDataIntegrityException;
+import org.mifosplatform.infrastructure.core.serialization.FromJsonHelper;
 import org.mifosplatform.infrastructure.core.service.TenantAwareRoutingDataSource;
 import org.mifosplatform.infrastructure.security.service.PlatformSecurityContext;
+import org.mifosplatform.organisation.office.data.OfficeData;
+import org.mifosplatform.organisation.office.service.OfficeReadPlatformService;
+import org.mifosplatform.portfolio.client.data.ClientData;
+import org.mifosplatform.portfolio.client.service.ClientReadPlatformService;
 import org.mifosplatform.useradministration.data.AppUserData;
 import org.mifosplatform.useradministration.domain.AppUser;
 import org.mifosplatform.useradministration.service.AppUserReadPlatformService;
@@ -31,22 +36,30 @@ import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.stereotype.Service;
 
-import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
 
 @Service
 public class AuditReadPlatformServiceImpl implements AuditReadPlatformService {
 
     private final static Logger logger = LoggerFactory.getLogger(AuditReadPlatformServiceImpl.class);
+
     private final JdbcTemplate jdbcTemplate;
     private final PlatformSecurityContext context;
+    private final FromJsonHelper fromApiJsonHelper;
     private final AppUserReadPlatformService appUserReadPlatformService;
+    private final OfficeReadPlatformService officeReadPlatformService;
+    private final ClientReadPlatformService clientReadPlatformService;
 
     @Autowired
     public AuditReadPlatformServiceImpl(final PlatformSecurityContext context, final TenantAwareRoutingDataSource dataSource,
-            final AppUserReadPlatformService appUserReadPlatformService) {
+            final FromJsonHelper fromApiJsonHelper, final AppUserReadPlatformService appUserReadPlatformService,
+            final OfficeReadPlatformService officeReadPlatformService, final ClientReadPlatformService clientReadPlatformService) {
         this.context = context;
         this.jdbcTemplate = new JdbcTemplate(dataSource);
+        this.fromApiJsonHelper = fromApiJsonHelper;
         this.appUserReadPlatformService = appUserReadPlatformService;
+        this.officeReadPlatformService = officeReadPlatformService;
+        this.clientReadPlatformService = clientReadPlatformService;
     }
 
     private static final class AuditMapper implements RowMapper<AuditData> {
@@ -166,7 +179,6 @@ public class AuditReadPlatformServiceImpl implements AuditReadPlatformService {
         return this.jdbcTemplate.query(sql, rm, new Object[] {});
     }
 
-    @SuppressWarnings("unchecked")
     @Override
     public AuditData retrieveAuditEntry(final Long auditId) {
 
@@ -175,49 +187,46 @@ public class AuditReadPlatformServiceImpl implements AuditReadPlatformService {
 
         final AuditMapper rm = new AuditMapper();
 
-        
         String sql = "select " + rm.schema(true, hierarchy);
         sql += " where aud.id = " + auditId;
 
         AuditData auditResult = this.jdbcTemplate.queryForObject(sql, rm, new Object[] {});
 
-        String commandAsJson = auditResult.getCommandAsJson();
+        String auditAsJson = auditResult.getCommandAsJson();
-        Map<String,Object> commandAsJsonMap = new HashMap<String,Object>();
+        final Type typeOfMap = new TypeToken<Map<String, Object>>() {}.getType();
-        commandAsJsonMap = new Gson().fromJson(commandAsJson, commandAsJsonMap.getClass());
+        final Map<String, Object> commandAsJsonMap = this.fromApiJsonHelper.extractObjectMap(typeOfMap, auditAsJson);
+
         if (commandAsJsonMap.containsKey("officeId")) {
 
-        	Object officeIdObj = commandAsJsonMap.get("officeId");
+            final Object officeIdObj = commandAsJsonMap.get("officeId");
-        	Integer officeId = -1;
+            if (officeIdObj != null && StringUtils.isNotBlank(officeIdObj.toString())) {
-        	if (officeIdObj instanceof Integer) {
+                final Long officeId = Long.valueOf(officeIdObj.toString());
-        		officeId = (Integer)officeIdObj;
+
-        	} else if (officeIdObj instanceof Double) {
+                OfficeData office = this.officeReadPlatformService.retrieveOffice(officeId);
-        		officeId = ((Double) officeIdObj).intValue();
+
-        	}
+                commandAsJsonMap.remove("officeId");
-        	if (officeId > -1) {
+                commandAsJsonMap.put("officeName", office.name());
-        		sql = " SELECT name FROM m_office WHERE id = " + officeId;
+
-            	String officeName = this.jdbcTemplate.queryForObject(sql, String.class);
+                auditAsJson = this.fromApiJsonHelper.toJson(commandAsJsonMap);
-            	String regex = "\"officeId\":\\s\\d+";
-            	commandAsJson = commandAsJson.replaceAll(regex, "\"officeName\": \""+officeName+"\"");
             }
         }
 
         if (commandAsJsonMap.containsKey("clientId")) {
 
-        	Object clientIdObj = commandAsJsonMap.get("clientId");
+            final Object clientIdObj = commandAsJsonMap.get("clientId");
-        	Integer clientId = -1;
+            if (clientIdObj != null && StringUtils.isNotBlank(clientIdObj.toString())) {
-        	if (clientIdObj instanceof Integer) {
+                final Long clientId = Long.valueOf(clientIdObj.toString());
-        		clientId = (Integer)clientIdObj;
+
-        	} else if (clientIdObj instanceof Double) {
+                ClientData client = this.clientReadPlatformService.retrieveOne(clientId);
-        		clientId = ((Double) clientIdObj).intValue();
+
-        	}
+                commandAsJsonMap.remove("clientId");
-        	if (clientId > -1) {
+                commandAsJsonMap.put("clientName", client.displayName());
-        		sql = " SELECT display_name FROM m_client WHERE id = " + clientId;
+
-            	String clientName = this.jdbcTemplate.queryForObject(sql, String.class);
+                auditAsJson = this.fromApiJsonHelper.toJson(commandAsJsonMap);
-            	String regex = "\"clientId\":\\s\\d+";
-            	commandAsJson = commandAsJson.replaceAll(regex, "\"clientName\": \""+clientName+"\"");
             }
         }
-        auditResult.setCommandAsJson(commandAsJson);
+
+        auditResult.setCommandAsJson(auditAsJson);
 
         return auditResult;
     }

mifosng-provider/src/main/java/org/mifosplatform/commands/service/CommandProcessingService.java

@@ -12,8 +12,7 @@ import org.mifosplatform.infrastructure.core.data.CommandProcessingResult;
 
 public interface CommandProcessingService {
 
-	CommandProcessingResult processAndLogCommand(CommandWrapper wrapper,
+    CommandProcessingResult processAndLogCommand(CommandWrapper wrapper, JsonCommand command, boolean isApprovedByChecker);
-			JsonCommand command, boolean isApprovedByChecker);
 
     CommandProcessingResult logCommand(CommandSource commandSourceResult);
 

mifosng-provider/src/main/java/org/mifosplatform/commands/service/CommandWrapperBuilder.java

@@ -28,7 +28,7 @@ public class CommandWrapperBuilder {
     public CommandWrapper build() {
         return new CommandWrapper(this.officeId, this.groupId, this.clientId, this.loanId, this.savingsId, this.actionName,
                 this.entityName, this.entityId, this.subentityId, this.codeId, this.supportedEntityType, this.supportedEntityId, this.href,
-                this.json, this.transactionId );
+                this.json, this.transactionId);
     }
 
     public CommandWrapperBuilder withLoanId(final Long withLoanId) {

mifosng-provider/src/main/java/org/mifosplatform/commands/service/PortfolioCommandSourceWritePlatformServiceImpl.java

@@ -22,8 +22,7 @@ import org.springframework.transaction.annotation.Transactional;
 import com.google.gson.JsonElement;
 
 @Service
-public class PortfolioCommandSourceWritePlatformServiceImpl implements
+public class PortfolioCommandSourceWritePlatformServiceImpl implements PortfolioCommandSourceWritePlatformService {
-		PortfolioCommandSourceWritePlatformService {
 
     private final PlatformSecurityContext context;
     private final CommandSourceRepository commandSourceRepository;
@@ -31,10 +30,8 @@ public class PortfolioCommandSourceWritePlatformServiceImpl implements
     private final CommandProcessingService processAndLogCommandService;
 
     @Autowired
-	public PortfolioCommandSourceWritePlatformServiceImpl(
+    public PortfolioCommandSourceWritePlatformServiceImpl(final PlatformSecurityContext context,
-			final PlatformSecurityContext context,
+            final CommandSourceRepository commandSourceRepository, final FromJsonHelper fromApiJsonHelper,
-			final CommandSourceRepository commandSourceRepository,
-			final FromJsonHelper fromApiJsonHelper,
             final CommandProcessingService processAndLogCommandService) {
         this.context = context;
         this.commandSourceRepository = commandSourceRepository;
@@ -47,8 +44,7 @@ public class PortfolioCommandSourceWritePlatformServiceImpl implements
 
         boolean isApprovedByChecker = false;
         // check if is update of own account details
-		if (wrapper.isUpdateOfOwnUserDetails(context.authenticatedUser()
+        if (wrapper.isUpdateOfOwnUserDetails(context.authenticatedUser().getId())) {
-				.getId())) {
             // then allow this operation to proceed.
             // maker checker doesnt mean anything here.
             isApprovedByChecker = true; // set to true in case permissions have
@@ -57,29 +53,22 @@ public class PortfolioCommandSourceWritePlatformServiceImpl implements
         } else {
             // if not user changing their own details - check user has
             // permission to perform specific task.
-			context.authenticatedUser().validateHasPermissionTo(
+            context.authenticatedUser().validateHasPermissionTo(wrapper.getTaskPermissionName());
-					wrapper.getTaskPermissionName());
         }
 
         final String json = wrapper.getJson();
         CommandProcessingResult result = null;
         try {
-			final JsonElement parsedCommand = this.fromApiJsonHelper
+            final JsonElement parsedCommand = this.fromApiJsonHelper.parse(json);
-					.parse(json);
+            final JsonCommand command = JsonCommand.from(json, parsedCommand, this.fromApiJsonHelper, wrapper.getEntityName(),
-			final JsonCommand command = JsonCommand.from(json, parsedCommand,
+                    wrapper.getEntityId(), wrapper.getSubentityId(), wrapper.getGroupId(), wrapper.getClientId(), wrapper.getLoanId(),
-					this.fromApiJsonHelper, wrapper.getEntityName(),
+                    wrapper.getSavingsId(), wrapper.getCodeId(), wrapper.getSupportedEntityType(), wrapper.getSupportedEntityId(),
-					wrapper.getEntityId(), wrapper.getSubentityId(),
+                    wrapper.getTransactionId());
-					wrapper.getGroupId(), wrapper.getClientId(),
-					wrapper.getLoanId(), wrapper.getSavingsId(),
-					wrapper.getCodeId(), wrapper.getSupportedEntityType(),
-					wrapper.getSupportedEntityId(), wrapper.getTransactionId());
 
-			result = this.processAndLogCommandService.processAndLogCommand(
+            result = this.processAndLogCommandService.processAndLogCommand(wrapper, command, isApprovedByChecker);
-					wrapper, command, isApprovedByChecker);
         } catch (RollbackTransactionAsCommandIsNotApprovedByCheckerException e) {
 
-			result = this.processAndLogCommandService.logCommand(e
+            result = this.processAndLogCommandService.logCommand(e.getCommandSourceResult());
-					.getCommandSourceResult());
         }
 
         return result;
@@ -90,24 +79,17 @@ public class PortfolioCommandSourceWritePlatformServiceImpl implements
 
         CommandSource commandSourceInput = validateMakerCheckerTransaction(makerCheckerId);
 
-		final CommandWrapper wrapper = CommandWrapper.fromExistingCommand(
+        final CommandWrapper wrapper = CommandWrapper.fromExistingCommand(makerCheckerId, commandSourceInput.getActionName(),
-				makerCheckerId, commandSourceInput.getActionName(),
+                commandSourceInput.getEntityName(), commandSourceInput.resourceId(), commandSourceInput.subresourceId(),
-				commandSourceInput.getEntityName(),
-				commandSourceInput.resourceId(),
-				commandSourceInput.subresourceId(),
                 commandSourceInput.getResourceGetUrl());
 
-		final JsonElement parsedCommand = this.fromApiJsonHelper
+        final JsonElement parsedCommand = this.fromApiJsonHelper.parse(commandSourceInput.json());
-				.parse(commandSourceInput.json());
+        final JsonCommand command = JsonCommand.fromExistingCommand(makerCheckerId, commandSourceInput.json(), parsedCommand,
-		final JsonCommand command = JsonCommand.fromExistingCommand(
+                this.fromApiJsonHelper, commandSourceInput.getEntityName(), commandSourceInput.resourceId(),
-				makerCheckerId, commandSourceInput.json(), parsedCommand,
-				this.fromApiJsonHelper, commandSourceInput.getEntityName(),
-				commandSourceInput.resourceId(),
                 commandSourceInput.subresourceId());
 
         final boolean makerCheckerApproval = true;
-		return this.processAndLogCommandService.processAndLogCommand(wrapper,
+        return this.processAndLogCommandService.processAndLogCommand(wrapper, command, makerCheckerApproval);
-				command, makerCheckerApproval);
     }
 
     @Transactional
@@ -121,20 +103,13 @@ public class PortfolioCommandSourceWritePlatformServiceImpl implements
         return makerCheckerId;
     }
 
-	private CommandSource validateMakerCheckerTransaction(
+    private CommandSource validateMakerCheckerTransaction(final Long makerCheckerId) {
-			final Long makerCheckerId) {
 
-		final CommandSource commandSourceInput = this.commandSourceRepository
+        final CommandSource commandSourceInput = this.commandSourceRepository.findOne(makerCheckerId);
-				.findOne(makerCheckerId);
+        if (commandSourceInput == null) { throw new CommandNotFoundException(makerCheckerId); }
-		if (commandSourceInput == null) {
+        if (!(commandSourceInput.isMarkedAsAwaitingApproval())) { throw new CommandNotAwaitingApprovalException(makerCheckerId); }
-			throw new CommandNotFoundException(makerCheckerId);
-		}
-		if (!(commandSourceInput.isMarkedAsAwaitingApproval())) {
-			throw new CommandNotAwaitingApprovalException(makerCheckerId);
-		}
 
-		context.authenticatedUser().validateHasCheckerPermissionTo(
+        context.authenticatedUser().validateHasCheckerPermissionTo(commandSourceInput.getPermissionCode());
-				commandSourceInput.getPermissionCode());
 
         return commandSourceInput;
     }

mifosng-provider/src/main/java/org/mifosplatform/commands/service/SynchronousCommandProcessingService.java

@@ -98,8 +98,8 @@ public class SynchronousCommandProcessingService implements CommandProcessingSer
         commandSourceResult.markAsAwaitingApproval();
         commandSourceRepository.save(commandSourceResult);
 
-        return new CommandProcessingResultBuilder().withCommandId(commandSourceResult.getId()).withEntityId(commandSourceResult.getResourceId())
+        return new CommandProcessingResultBuilder().withCommandId(commandSourceResult.getId())
-                .build();
+                .withEntityId(commandSourceResult.getResourceId()).build();
     }
 
     private NewCommandSourceHandler findCommandHandler(final CommandWrapper wrapper) {

mifosng-provider/src/main/java/org/mifosplatform/infrastructure/core/serialization/FromJsonHelper.java

@@ -48,6 +48,10 @@ public class FromJsonHelper {
         return this.gsonConverter.fromJson(json, typeOfMap);
     }
 
+    public Map<String, Object> extractObjectMap(final Type typeOfMap, final String json) {
+        return this.gsonConverter.fromJson(json, typeOfMap);
+    }
+
     public <T> T fromJson(final String json, final Class<T> classOfT) {
         return this.gsonConverter.fromJson(json, classOfT);
     }
@@ -56,6 +60,10 @@ public class FromJsonHelper {
         return this.gsonConverter.toJson(jsonElement);
     }
 
+    public String toJson(final Object object) {
+        return this.gsonConverter.toJson(object);
+    }
+
     public void checkForUnsupportedParameters(final Type typeOfMap, final String json, final Set<String> supportedParams) {
         if (StringUtils.isBlank(json)) { throw new InvalidJsonException(); }
 

mifosng-provider/src/main/java/org/mifosplatform/organisation/office/data/OfficeData.java

@@ -55,4 +55,8 @@ public class OfficeData {
     public boolean hasIdentifyOf(final Long officeId) {
         return this.id.equals(officeId);
     }
+
+    public String name() {
+        return this.name;
+    }
 }