From cdcb80ef769af20bb69ca30af73923f4d43b215b Mon Sep 17 00:00:00 2001
From: Dmytro Skarzhynets <dskarzhynets@thingsboard.io>
Date: Wed, 2 Jul 2025 20:37:47 +0300
Subject: [PATCH] AI rule node: fix text search

---
 .../server/dao/model/sql/AiModelSettingsEntity.java           | 2 +-
 .../server/dao/sql/ai/AiModelSettingsRepository.java          | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AiModelSettingsEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AiModelSettingsEntity.java
index 2a866c8620..25aa7a0018 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AiModelSettingsEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AiModelSettingsEntity.java
@@ -48,7 +48,7 @@ public class AiModelSettingsEntity extends BaseVersionedEntity<AiModelSettings>
 
     public static final Map<String, String> COLUMN_MAP = Map.of(
             "createdTime", "created_time",
-            "provider", "(configuration -> 'providerConfig' ->> 'provider')",
+            "provider", "(configuration ->> 'provider')",
             "modelId", "(configuration -> 'modelConfig' ->> 'modelId')"
     );
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/ai/AiModelSettingsRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/ai/AiModelSettingsRepository.java
index aae01a3b41..6be7d97f33 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/ai/AiModelSettingsRepository.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/ai/AiModelSettingsRepository.java
@@ -42,7 +42,7 @@ interface AiModelSettingsRepository extends JpaRepository<AiModelSettingsEntity,
                     WHERE ai_model.tenant_id = :tenantId
                       AND (:textSearch IS NULL
                         OR ai_model.name ILIKE '%' || :textSearch || '%'
-                        OR (ai_model.configuration -> 'providerConfig' ->> 'provider') ILIKE '%' || :textSearch || '%'
+                        OR (ai_model.configuration ->> 'provider') ILIKE '%' || :textSearch || '%'
                         OR (ai_model.configuration -> 'modelConfig' ->> 'modelId') ILIKE '%' || :textSearch || '%')
                     """,
             countQuery = """
@@ -51,7 +51,7 @@ interface AiModelSettingsRepository extends JpaRepository<AiModelSettingsEntity,
                     WHERE ai_model.tenant_id = :tenantId
                       AND (:textSearch IS NULL
                         OR ai_model.name ILIKE '%' || :textSearch || '%'
-                        OR (ai_model.configuration -> 'providerConfig' ->> 'provider') ILIKE '%' || :textSearch || '%'
+                        OR (ai_model.configuration ->> 'provider') ILIKE '%' || :textSearch || '%'
                         OR (ai_model.configuration -> 'modelConfig'  ->> 'modelId') ILIKE '%' || :textSearch || '%')
                     """,
             nativeQuery = true