From 7e495da108e8d995dab389e32170d4e917f61441 Mon Sep 17 00:00:00 2001
From: devaskim <dev.devaskim@gmail.com>
Date: Mon, 3 Oct 2022 22:47:30 +0500
Subject: [PATCH] Details rule node returns entity's ID as well.

---
 .../rule/engine/metadata/TbAbstractGetEntityDetailsNode.java   | 3 +++
 .../java/org/thingsboard/rule/engine/util/EntityDetails.java   | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbAbstractGetEntityDetailsNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbAbstractGetEntityDetailsNode.java
index 490a42a72c..e90b3ead76 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbAbstractGetEntityDetailsNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbAbstractGetEntityDetailsNode.java
@@ -119,6 +119,9 @@ public abstract class TbAbstractGetEntityDetailsNode<C extends TbAbstractGetEnti
     private JsonElement setProperties(ContactBased entity, JsonElement data, EntityDetails entityDetails, String prefix) {
         JsonObject dataAsObject = data.getAsJsonObject();
         switch (entityDetails) {
+            case ID:
+                dataAsObject.addProperty(prefix + "id", entity.getId().toString());
+                break;
             case TITLE:
                 dataAsObject.addProperty(prefix + "title", entity.getName());
                 break;
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/util/EntityDetails.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/util/EntityDetails.java
index c97848e05f..a1dc21f8dd 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/util/EntityDetails.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/util/EntityDetails.java
@@ -17,6 +17,6 @@ package org.thingsboard.rule.engine.util;
 
 public enum EntityDetails {
 
-    TITLE, COUNTRY, CITY, STATE, ZIP, ADDRESS, ADDRESS2, PHONE, EMAIL, ADDITIONAL_INFO
+    ID, TITLE, COUNTRY, CITY, STATE, ZIP, ADDRESS, ADDRESS2, PHONE, EMAIL, ADDITIONAL_INFO
 
 }