From ead30d700bd84ceffbbb5764ec5f39bf78681265 Mon Sep 17 00:00:00 2001
From: Volodymyr Babak <volodymyr.babak@gmail.com>
Date: Mon, 12 Feb 2018 19:12:08 +0200
Subject: [PATCH] Fixed user ID for JPA impl

---
 .../server/dao/model/sql/AuditLogEntity.java          | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AuditLogEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AuditLogEntity.java
index 0f7109106b..6dd70b23f4 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AuditLogEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AuditLogEntity.java
@@ -25,10 +25,7 @@ import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.audit.ActionStatus;
 import org.thingsboard.server.common.data.audit.ActionType;
 import org.thingsboard.server.common.data.audit.AuditLog;
-import org.thingsboard.server.common.data.id.AuditLogId;
-import org.thingsboard.server.common.data.id.CustomerId;
-import org.thingsboard.server.common.data.id.EntityIdFactory;
-import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.id.*;
 import org.thingsboard.server.dao.model.BaseEntity;
 import org.thingsboard.server.dao.model.BaseSqlEntity;
 import org.thingsboard.server.dao.model.ModelConstants;
@@ -100,6 +97,9 @@ public class AuditLogEntity extends BaseSqlEntity<AuditLog> implements BaseEntit
             this.entityId = toString(auditLog.getEntityId().getId());
             this.entityType = auditLog.getEntityId().getEntityType();
         }
+        if (auditLog.getUserId() != null) {
+            this.userId = toString(auditLog.getUserId().getId());
+        }
         this.entityName = auditLog.getEntityName();
         this.userName = auditLog.getUserName();
         this.actionType = auditLog.getActionType();
@@ -121,6 +121,9 @@ public class AuditLogEntity extends BaseSqlEntity<AuditLog> implements BaseEntit
         if (entityId != null) {
             auditLog.setEntityId(EntityIdFactory.getByTypeAndId(entityType.name(), toUUID(entityId).toString()));
         }
+        if (userId != null) {
+            auditLog.setUserId(new UserId(toUUID(entityId)));
+        }
         auditLog.setEntityName(this.entityName);
         auditLog.setUserName(this.userName);
         auditLog.setActionType(this.actionType);