From 598091b1b2c1feb44154625d280e91d21dfecd67 Mon Sep 17 00:00:00 2001 From: andrew-dzak Date: Fri, 21 Mar 2014 16:03:11 +0100 Subject: [PATCH] Mifosx-1013 done --- .../commands/data/AuditData.java | 6 ++++- .../service/AuditReadPlatformServiceImpl.java | 26 ++++++++----------- 2 files changed, 16 insertions(+), 16 deletions(-) mode change 100644 => 100755 mifosng-provider/src/main/java/org/mifosplatform/commands/data/AuditData.java mode change 100644 => 100755 mifosng-provider/src/main/java/org/mifosplatform/commands/service/AuditReadPlatformServiceImpl.java diff --git a/mifosng-provider/src/main/java/org/mifosplatform/commands/data/AuditData.java b/mifosng-provider/src/main/java/org/mifosplatform/commands/data/AuditData.java old mode 100644 new mode 100755 index fd6300f48..d134e2791 --- a/mifosng-provider/src/main/java/org/mifosplatform/commands/data/AuditData.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/commands/data/AuditData.java @@ -45,11 +45,13 @@ public final class AuditData { private final String loanAccountNo; @SuppressWarnings("unused") 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, 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 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.actionName = actionName; @@ -68,6 +70,8 @@ public final class AuditData { this.clientName = clientName; this.loanAccountNo = loanAccountNo; this.savingsAccountNo = savingsAccountNo; + this.clientId = clientId; + this.loanId = loanId; } public void setCommandAsJson(final String commandAsJson) { diff --git a/mifosng-provider/src/main/java/org/mifosplatform/commands/service/AuditReadPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/commands/service/AuditReadPlatformServiceImpl.java old mode 100644 new mode 100755 index fab9cffa7..db4aefd70 --- a/mifosng-provider/src/main/java/org/mifosplatform/commands/service/AuditReadPlatformServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/commands/service/AuditReadPlatformServiceImpl.java @@ -5,16 +5,9 @@ */ package org.mifosplatform.commands.service; -import java.lang.reflect.Type; -import java.sql.ResultSet; -import java.sql.SQLException; -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 com.google.common.reflect.TypeToken; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; import org.apache.commons.lang.StringUtils; import org.joda.time.DateTime; 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.stereotype.Service; -import com.google.common.reflect.TypeToken; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; +import java.lang.reflect.Type; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.*; @Service 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," - + " 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, " + "ck.username as checker, aud.checked_on_date as checkedOnDate, ev.enum_message_property as processingResult " + commandAsJsonString + ", " @@ -126,6 +120,8 @@ public class AuditReadPlatformServiceImpl implements AuditReadPlatformService { final String actionName = rs.getString("actionName"); final String entityName = rs.getString("entityName"); 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 String maker = rs.getString("maker"); final DateTime madeOnDate = JdbcSupport.getDateTime(rs, "madeOnDate"); @@ -148,7 +144,7 @@ public class AuditReadPlatformServiceImpl implements AuditReadPlatformService { final String savingsAccountNo = rs.getString("savingsAccountNo"); 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); } }