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

Mifosx-1013 done

Browse Source
This commit is contained in:
andrew-dzak
2014-03-25 23:19:23 -07:00
committed by Vishwas Babu A J
parent 33aff878f5
commit 598091b1b2
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mifosng-provider/src/main/java/org/mifosplatform/commands/data/AuditData.java
Regular → Executable
+5 -1
View File
@@ -45,11 +45,13 @@ public final class AuditData {
private final String loanAccountNo; private final String loanAccountNo;
@SuppressWarnings("unused") @SuppressWarnings("unused")
private final String savingsAccountNo; private final String savingsAccountNo;
private final Long clientId;
private final Long loanId;
public AuditData(final Long id, final String actionName, final String entityName, final Long resourceId, final Long subresourceId, public AuditData(final Long id, final String actionName, final String entityName, final Long resourceId, final Long subresourceId,
final String maker, final DateTime madeOnDate, final String checker, final DateTime checkedOnDate, final String maker, final DateTime madeOnDate, final String checker, final DateTime checkedOnDate,
final String processingResult, final String commandAsJson, final String officeName, final String groupLevelName, final String processingResult, final String commandAsJson, final String officeName, final String groupLevelName,
final String groupName, final String clientName, final String loanAccountNo, final String savingsAccountNo) { final String groupName, final String clientName, final String loanAccountNo, final String savingsAccountNo,final Long clientId, final Long loanId) {
this.id = id; this.id = id;
this.actionName = actionName; this.actionName = actionName;
@@ -68,6 +70,8 @@ public final class AuditData {
this.clientName = clientName; this.clientName = clientName;
this.loanAccountNo = loanAccountNo; this.loanAccountNo = loanAccountNo;
this.savingsAccountNo = savingsAccountNo; this.savingsAccountNo = savingsAccountNo;
this.clientId = clientId;
this.loanId = loanId;
} }
public void setCommandAsJson(final String commandAsJson) { public void setCommandAsJson(final String commandAsJson) {
mifosng-provider/src/main/java/org/mifosplatform/commands/service/AuditReadPlatformServiceImpl.java
Regular → Executable
+11 -15
View File
@@ -5,16 +5,9 @@
*/ */
package org.mifosplatform.commands.service; package org.mifosplatform.commands.service;
import java.lang.reflect.Type; import com.google.common.reflect.TypeToken;
import java.sql.ResultSet; import com.google.gson.JsonElement;
import java.sql.SQLException; import com.google.gson.JsonObject;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.joda.time.DateTime; import org.joda.time.DateTime;
import org.mifosplatform.commands.data.AuditData; import org.mifosplatform.commands.data.AuditData;
@@ -48,9 +41,10 @@ import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.core.RowMapper;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.google.common.reflect.TypeToken; import java.lang.reflect.Type;
import com.google.gson.JsonElement; import java.sql.ResultSet;
import com.google.gson.JsonObject; import java.sql.SQLException;
import java.util.*;
@Service @Service
public class AuditReadPlatformServiceImpl implements AuditReadPlatformService { public class AuditReadPlatformServiceImpl implements AuditReadPlatformService {
@@ -98,7 +92,7 @@ public class AuditReadPlatformServiceImpl implements AuditReadPlatformService {
} }
String partSql = " aud.id as id, aud.action_name as actionName, aud.entity_name as entityName," String partSql = " aud.id as id, aud.action_name as actionName, aud.entity_name as entityName,"
+ " aud.resource_id as resourceId, aud.subresource_id as subresourceId," + " aud.resource_id as resourceId, aud.subresource_id as subresourceId,aud.client_id as clientId, aud.loan_id as loanId,"
+ " mk.username as maker, aud.made_on_date as madeOnDate, " + " mk.username as maker, aud.made_on_date as madeOnDate, "
+ "ck.username as checker, aud.checked_on_date as checkedOnDate, ev.enum_message_property as processingResult " + "ck.username as checker, aud.checked_on_date as checkedOnDate, ev.enum_message_property as processingResult "
+ commandAsJsonString + ", " + commandAsJsonString + ", "
@@ -126,6 +120,8 @@ public class AuditReadPlatformServiceImpl implements AuditReadPlatformService {
final String actionName = rs.getString("actionName"); final String actionName = rs.getString("actionName");
final String entityName = rs.getString("entityName"); final String entityName = rs.getString("entityName");
final Long resourceId = JdbcSupport.getLong(rs, "resourceId"); final Long resourceId = JdbcSupport.getLong(rs, "resourceId");
final Long clientId = rs.getLong("clientId");
final Long loanId = rs.getLong("loanId");
final Long subresourceId = JdbcSupport.getLong(rs, "subresourceId"); final Long subresourceId = JdbcSupport.getLong(rs, "subresourceId");
final String maker = rs.getString("maker"); final String maker = rs.getString("maker");
final DateTime madeOnDate = JdbcSupport.getDateTime(rs, "madeOnDate"); final DateTime madeOnDate = JdbcSupport.getDateTime(rs, "madeOnDate");
@@ -148,7 +144,7 @@ public class AuditReadPlatformServiceImpl implements AuditReadPlatformService {
final String savingsAccountNo = rs.getString("savingsAccountNo"); final String savingsAccountNo = rs.getString("savingsAccountNo");
return new AuditData(id, actionName, entityName, resourceId, subresourceId, maker, madeOnDate, checker, checkedOnDate, return new AuditData(id, actionName, entityName, resourceId, subresourceId, maker, madeOnDate, checker, checkedOnDate,
processingResult, commandAsJson, officeName, groupLevelName, groupName, clientName, loanAccountNo, savingsAccountNo); processingResult, commandAsJson, officeName, groupLevelName, groupName, clientName, loanAccountNo, savingsAccountNo,clientId,loanId);
} }
} }