From ed1639663f915b04287f05b59e82084958fee6f5 Mon Sep 17 00:00:00 2001
From: Yevhenii <uman980124@gmail.com>
Date: Fri, 23 May 2025 18:10:33 +0300
Subject: [PATCH] Add validation for DefaultEdgeRuleChain in DeviceProfile

- reverted changes
---
 .../dao/service/validator/DeviceProfileDataValidator.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dao/src/main/java/org/thingsboard/server/dao/service/validator/DeviceProfileDataValidator.java b/dao/src/main/java/org/thingsboard/server/dao/service/validator/DeviceProfileDataValidator.java
index ca312608d7..dfd0ee82bc 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/service/validator/DeviceProfileDataValidator.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/service/validator/DeviceProfileDataValidator.java
@@ -189,11 +189,11 @@ public class DeviceProfileDataValidator extends AbstractHasOtaPackageValidator<D
         }
 
         if (deviceProfile.getDefaultRuleChainId() != null) {
-            validateRuleChain(tenantId, deviceProfile.getDefaultRuleChainId());
+            validateRuleChain(tenantId, deviceProfile.getTenantId(), deviceProfile.getDefaultRuleChainId());
         }
 
         if (deviceProfile.getDefaultEdgeRuleChainId() != null) {
-            validateRuleChain(tenantId, deviceProfile.getDefaultEdgeRuleChainId());
+            validateRuleChain(tenantId, deviceProfile.getTenantId(), deviceProfile.getDefaultEdgeRuleChainId());
         }
 
         if (deviceProfile.getDefaultDashboardId() != null) {
@@ -209,12 +209,12 @@ public class DeviceProfileDataValidator extends AbstractHasOtaPackageValidator<D
         validateOtaPackage(tenantId, deviceProfile, deviceProfile.getId());
     }
 
-    private void validateRuleChain(TenantId tenantId, RuleChainId ruleChainId) {
+    private void validateRuleChain(TenantId tenantId, TenantId deviceProfileTenantId, RuleChainId ruleChainId) {
         RuleChain ruleChain = ruleChainService.findRuleChainById(tenantId, ruleChainId);
         if (ruleChain == null) {
             throw new DataValidationException("Can't assign non-existent rule chain!");
         }
-        if (!ruleChain.getTenantId().equals(tenantId)) {
+        if (!ruleChain.getTenantId().equals(deviceProfileTenantId)) {
             throw new DataValidationException("Can't assign rule chain from different tenant!");
         }
     }