updated code
This commit is contained in:
@@ -55,7 +55,7 @@ public class LoggingUtil {
|
||||
}
|
||||
userAction.setActionType(userActionRequest.getActionType().getValue());
|
||||
userAction.setUserId(userId);
|
||||
userAction.setActionContext(userActionRequest.getActionContext());
|
||||
userAction.setActionContext(userActionRequest.getActionContext().getValue());
|
||||
userAction.setMethodType(userActionRequest.getRequest().getMethod());
|
||||
userAction.setHubId(userEntity.getHub().getId());
|
||||
userAction.setUrl(userActionRequest.getRequest().getRequestURI());
|
||||
@@ -100,7 +100,7 @@ public class LoggingUtil {
|
||||
// return userAction;
|
||||
// }
|
||||
|
||||
public void logVersionHistory(VersionHistoryRequest versionHistoryRequest) {
|
||||
public void logVersionHistory(VersionHistoryRequest versionHistoryRequest, Long recordId, Long userActionId, String tableName) {
|
||||
try {
|
||||
VersionHistoryEntity history = new VersionHistoryEntity();
|
||||
String token = tokenProvider.extractTokenFromRequest(versionHistoryRequest.getRequest());
|
||||
@@ -108,12 +108,12 @@ public class LoggingUtil {
|
||||
Long userId = claims.get(GepafinConstant.USER_ID, Long.class);
|
||||
String oldData = Utils.convertEntityToJsonForLogging(versionHistoryRequest.getOldData());
|
||||
String newData = Utils.convertEntityToJsonForLogging(versionHistoryRequest.getNewData());
|
||||
history.setUserActionId(versionHistoryRequest.getUserActionId());
|
||||
history.setUserActionId(userActionId);
|
||||
history.setActionType(versionHistoryRequest.getActionType().getValue());
|
||||
history.setOldData(oldData);
|
||||
history.setNewData(newData);
|
||||
history.setRecordId(versionHistoryRequest.getRecordId());
|
||||
history.setTableName(versionHistoryRequest.getTableName());
|
||||
history.setRecordId(recordId);
|
||||
history.setTableName(tableName);
|
||||
history.setUserId(userId);
|
||||
versionHistoryRepository.save(history);
|
||||
} catch (Exception e) {
|
||||
@@ -138,10 +138,7 @@ public class LoggingUtil {
|
||||
Long userActionId = (Long) versionHistoryRequest.getRequest().getAttribute(GepafinConstant.USER_ACTION_ID);
|
||||
Long recordId = versionHistoryRequest.getNewData().getId();
|
||||
String tableName = getTableName(versionHistoryRequest.getNewData().getClass());
|
||||
versionHistoryRequest.setRecordId(recordId);
|
||||
versionHistoryRequest.setUserActionId(userActionId);
|
||||
versionHistoryRequest.setTableName(tableName);
|
||||
logVersionHistory(versionHistoryRequest);
|
||||
logVersionHistory(versionHistoryRequest, recordId, userActionId, tableName);
|
||||
} catch (Exception e) {
|
||||
log.error("Error adding version history: {}", e.getMessage(), e);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user