From 48f3b3d3742c32170861e91b7005b64f852223a3 Mon Sep 17 00:00:00 2001
From: Andrii Landiak <andriylandiak@gmail.com>
Date: Fri, 30 May 2025 12:59:48 +0300
Subject: [PATCH] Fix findTenantByName as tenant tile is not unique

---
 .../org/thingsboard/server/dao/sql/tenant/JpaTenantDao.java     | 2 +-
 .../org/thingsboard/server/dao/sql/tenant/TenantRepository.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/tenant/JpaTenantDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/tenant/JpaTenantDao.java
index c125de60a7..fb558dab0c 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/tenant/JpaTenantDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/tenant/JpaTenantDao.java
@@ -95,7 +95,7 @@ public class JpaTenantDao extends JpaAbstractDao<TenantEntity, Tenant> implement
 
     @Override
     public Tenant findTenantByName(TenantId tenantId, String name) {
-        return DaoUtil.getData(tenantRepository.findTenantByTitle(name));
+        return DaoUtil.getData(tenantRepository.findFirstByTitle(name));
     }
 
     @Override
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/tenant/TenantRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/tenant/TenantRepository.java
index 491257b318..08859d5f63 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/tenant/TenantRepository.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/tenant/TenantRepository.java
@@ -60,6 +60,6 @@ public interface TenantRepository extends JpaRepository<TenantEntity, UUID> {
             "t.additionalInfo, t.country, t.state, t.city, t.address, t.address2, t.zip, t.phone, t.email, t.region) FROM TenantEntity t WHERE t.id > :id ORDER BY t.id")
     List<TenantFields> findNextBatch(@Param("id") UUID id, Limit limit);
 
-    TenantEntity findTenantByTitle(String name);
+    TenantEntity findFirstByTitle(String name);
 
 }