Merge branch 'master' of github.com:thingsboard/thingsboard

rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbAbstractGetEntityDetailsNode.java

@@ -83,11 +83,8 @@ public abstract class TbAbstractGetEntityDetailsNode<C extends TbAbstractGetEnti
 
     protected ListenableFuture<TbMsg> getTbMsgListenableFuture(TbContext ctx, TbMsg msg, MessageData messageData, String prefix) {
         if (!this.config.getDetailsList().isEmpty()) {
-            ListenableFuture<JsonElement> resultObject = null;
             ListenableFuture<ContactBased> contactBasedListenableFuture = getContactBasedListenableFuture(ctx, msg);
-            for (EntityDetails entityDetails : this.config.getDetailsList()) {
-                resultObject = addContactProperties(messageData.getData(), contactBasedListenableFuture, entityDetails, prefix);
-            }
+            ListenableFuture<JsonElement> resultObject = addContactProperties(messageData.getData(), contactBasedListenableFuture, prefix);
             return transformMsg(ctx, msg, resultObject, messageData);
         } else {
             return Futures.immediateFuture(msg);
@@ -109,10 +106,14 @@ public abstract class TbAbstractGetEntityDetailsNode<C extends TbAbstractGetEnti
         }, MoreExecutors.directExecutor());
     }
 
-    private ListenableFuture<JsonElement> addContactProperties(JsonElement data, ListenableFuture<ContactBased> entityFuture, EntityDetails entityDetails, String prefix) {
+    private ListenableFuture<JsonElement> addContactProperties(JsonElement data, ListenableFuture<ContactBased> entityFuture, String prefix) {
         return Futures.transformAsync(entityFuture, contactBased -> {
             if (contactBased != null) {
-                return Futures.immediateFuture(setProperties(contactBased, data, entityDetails, prefix));
+                JsonElement jsonElement = null;
+                for (EntityDetails entityDetails : this.config.getDetailsList()) {
+                    jsonElement = setProperties(contactBased, data, entityDetails, prefix);
+                }
+                return Futures.immediateFuture(jsonElement);
             } else {
                 return Futures.immediateFuture(null);
             }

rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetCustomerDetailsNode.java

@@ -29,6 +29,7 @@ import org.thingsboard.server.common.data.Customer;
 import org.thingsboard.server.common.data.id.AssetId;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.EntityViewId;
+import org.thingsboard.server.common.data.id.UserId;
 import org.thingsboard.server.common.data.plugin.ComponentType;
 import org.thingsboard.server.common.msg.TbMsg;
 
@@ -105,6 +106,18 @@ public class TbGetCustomerDetailsNode extends TbAbstractGetEntityDetailsNode<TbG
                         return Futures.immediateFuture(null);
                     }
                 }, MoreExecutors.directExecutor());
+            case USER:
+                return Futures.transformAsync(ctx.getUserService().findUserByIdAsync(ctx.getTenantId(), new UserId(msg.getOriginator().getId())), user -> {
+                    if (user != null) {
+                        if (!user.getCustomerId().isNullUid()) {
+                            return ctx.getCustomerService().findCustomerByIdAsync(ctx.getTenantId(), user.getCustomerId());
+                        } else {
+                            throw new RuntimeException("User with name '" + user.getName() + "' is not assigned to Customer.");
+                        }
+                    } else {
+                        return Futures.immediateFuture(null);
+                    }
+                }, MoreExecutors.directExecutor());
             default:
                 throw new RuntimeException("Entity with entityType '" + msg.getOriginator().getEntityType() + "' is not supported.");
         }