BIGTOP-4235: Fix update in SQLBuilder (#79)

apache · Sep 26, 2024 · 31858b9 · 31858b9
1 parent d9c317f
commit 31858b9
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 9 deletions.
diff --git a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/sql/SQLBuilder.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/sql/SQLBuilder.java
@@ -219,6 +219,9 @@ public static <Entity> String update(
                     }
                     Field field = ReflectionUtils.findField(entityClass, entry.getKey());
                     if (field != null) {
+                        if (checkBaseField(field)) {
+                            continue;
+                        }
                         Column column = field.getAnnotation(Column.class);
                         if (column != null && !column.nullable() && value == null) {
                             continue;
@@ -248,6 +251,9 @@ public static <Entity> String update(
                     }
                     Field field = ReflectionUtils.findField(entityClass, entry.getKey());
                     if (field != null) {
+                        if (checkBaseField(field)) {
+                            continue;
+                        }
                         Column column = field.getAnnotation(Column.class);
                         if (column != null && !column.nullable() && value == null) {
                             continue;
@@ -291,7 +297,10 @@ public static <Entity> String updateList(
                         primaryKey = keywordsFormat(entry.getValue(), DBType.MYSQL);
                         continue;
                     }
-
+                    Field field = ReflectionUtils.findField(entityClass, entry.getKey());
+                    if (field == null || checkBaseField(field)) {
+                        continue;
+                    }
                     StringBuilder caseClause = new StringBuilder();
                     caseClause
                             .append(keywordsFormat(entry.getValue(), DBType.MYSQL))
@@ -301,10 +310,6 @@ public static <Entity> String updateList(
                         if (ps == null || ps.getReadMethod() == null) {
                             continue;
                         }
-                        Field field = ReflectionUtils.findField(entityClass, entry.getKey());
-                        if (field == null || checkBaseField(field)) {
-                            continue;
-                        }
                         Object value = ReflectionUtils.invokeMethod(ps.getReadMethod(), entity);
                         PropertyDescriptor pkPs =
                                 BeanUtils.getPropertyDescriptor(entityClass, tableMetaData.getPkProperty());
@@ -335,8 +340,12 @@ public static <Entity> String updateList(
                                     .append("' THEN NULL ");
                         }
                     }
+                    if (caseClause.toString().endsWith("CASE ")) {
+                        caseClause.append("WHEN TRUE THEN ");
+                    } else {
+                        caseClause.append("ELSE ");
+                    }
                     caseClause
-                            .append("ELSE ")
                             .append(keywordsFormat(entry.getValue(), DBType.MYSQL))
                             .append(" ");
                     caseClause.append("END");

diff --git a/...erver/src/main/java/org/apache/bigtop/manager/server/service/impl/ChatbotServiceImpl.java b/...erver/src/main/java/org/apache/bigtop/manager/server/service/impl/ChatbotServiceImpl.java
@@ -81,7 +81,7 @@ public class ChatbotServiceImpl implements ChatbotService {
 
     private AIAssistantFactory aiAssistantFactory;
 
-    public AIAssistantFactory getAiAssistantFactory() {
+    public AIAssistantFactory getAIAssistantFactory() {
         if (aiAssistantFactory == null) {
             aiAssistantFactory =
                     new GeneralAssistantFactory(new PersistentChatMemoryStore(chatThreadDao, chatMessageDao));
@@ -105,15 +105,15 @@ private PlatformType getPlatformType(String platformName) {
 
     private AIAssistant buildAIAssistant(
             PlatformAuthorizedDTO platformAuthorizedDTO, Long threadId, Map<String, String> configs) {
-        return getAiAssistantFactory()
+        return getAIAssistantFactory()
                 .create(
                         getPlatformType(platformAuthorizedDTO.getPlatformName()),
                         getAIAssistantConfig(platformAuthorizedDTO, configs),
                         threadId);
     }
 
     private Boolean testAuthorization(PlatformAuthorizedDTO platformAuthorizedDTO) {
-        AIAssistant aiAssistant = getAiAssistantFactory()
+        AIAssistant aiAssistant = getAIAssistantFactory()
                 .create(
                         getPlatformType(platformAuthorizedDTO.getPlatformName()),
                         getAIAssistantConfig(platformAuthorizedDTO, null));
@@ -215,10 +215,16 @@ public boolean deleteAuthorizedPlatform(Long platformId) {
                 authorizedPlatformPO.setIsDeleted(true);
                 platformAuthorizedDao.partialUpdateById(authorizedPlatformPO);
                 List<ChatThreadPO> chatThreadPOS = chatThreadDao.findAllByPlatformId(authorizedPlatformPO.getId());
+                if (chatThreadPOS.isEmpty()) {
+                    return true;
+                }
                 chatThreadPOS.forEach(chatThread -> chatThread.setIsDeleted(true));
                 chatThreadDao.partialUpdateByIds(chatThreadPOS);
                 for (ChatThreadPO chatThreadPO : chatThreadPOS) {
                     List<ChatMessagePO> chatMessagePOS = chatMessageDao.findAllByThreadId(chatThreadPO.getId());
+                    if (chatMessagePOS.isEmpty()) {
+                        return true;
+                    }
                     chatMessagePOS.forEach(chatMessage -> chatMessage.setIsDeleted(true));
                     chatMessageDao.partialUpdateByIds(chatMessagePOS);
                 }
@@ -265,6 +271,9 @@ public boolean deleteChatThreads(Long platformId, Long threadId) {
                 chatThreadPO.setIsDeleted(true);
                 chatThreadDao.partialUpdateById(chatThreadPO);
                 List<ChatMessagePO> chatMessagePOS = chatMessageDao.findAllByThreadId(threadId);
+                if (chatMessagePOS.isEmpty()) {
+                    return true;
+                }
                 chatMessagePOS.forEach(chatMessage -> chatMessage.setIsDeleted(true));
                 chatMessageDao.partialUpdateByIds(chatMessagePOS);
                 return true;