From b664ddf2bec4a57ce4b70bfa3b82e5dcc9a60c4e Mon Sep 17 00:00:00 2001
From: jack ning <github@bytedesk.com>
Date: Tue, 29 Apr 2025 18:04:52 +0800
Subject: [PATCH] update modules/kbase: mod        3 files

---
 .../bytedesk/kbase/faq/FaqRestService.java    | 20 +++----------------
 .../faq_rating/FaqRatingRestService.java      |  5 +++--
 .../kbase/utils/KbaseConvertUtils.java        |  8 ++------
 3 files changed, 8 insertions(+), 25 deletions(-)

diff --git a/modules/kbase/src/main/java/com/bytedesk/kbase/faq/FaqRestService.java b/modules/kbase/src/main/java/com/bytedesk/kbase/faq/FaqRestService.java
index c7cc978fdd..1dbe589b47 100644
--- a/modules/kbase/src/main/java/com/bytedesk/kbase/faq/FaqRestService.java
+++ b/modules/kbase/src/main/java/com/bytedesk/kbase/faq/FaqRestService.java
@@ -2,7 +2,7 @@
  * @Author: jackning 270580156@qq.com
  * @Date: 2024-03-22 22:59:18
  * @LastEditors: jackning 270580156@qq.com
- * @LastEditTime: 2025-04-29 18:01:54
+ * @LastEditTime: 2025-04-29 18:04:06
  * @Description: bytedesk.com https://github.com/Bytedesk/bytedesk
  *   Please be aware of the BSL license restrictions before installing Bytedesk IM – 
  *  selling, reselling, or hosting Bytedesk IM as a service is a breach of the terms and automatically terminates your rights under the license.
@@ -17,7 +17,6 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
-import java.util.stream.Collectors;
 
 import org.modelmapper.ModelMapper;
 import org.springframework.cache.annotation.Cacheable;
@@ -56,6 +55,7 @@ import com.bytedesk.kbase.faq.event.FaqUpdateDocEvent;
 import com.bytedesk.kbase.faq_rating.FaqRatingRestService;
 import com.bytedesk.kbase.kbase.KbaseEntity;
 import com.bytedesk.kbase.kbase.KbaseRestService;
+import com.bytedesk.kbase.utils.KbaseConvertUtils;
 
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -470,21 +470,7 @@ public class FaqRestService extends BaseRestServiceWithExcel<FaqEntity, FaqReque
 
     @Override
     public FaqResponse convertToResponse(FaqEntity entity) {
-        FaqResponse response = modelMapper.map(entity, FaqResponse.class);
-
-        // 处理相关问题，避免循环依赖
-        if (entity.getRelatedFaqs() != null) {
-            List<FaqResponseSimple> simpleFaqs = entity.getRelatedFaqs().stream()
-                    .map(relatedFaq -> FaqResponseSimple.builder()
-                            .uid(relatedFaq.getUid())
-                            .question(relatedFaq.getQuestion())
-                            .answer(relatedFaq.getAnswer())
-                            .build())
-                    .collect(Collectors.toList());
-            response.setRelatedFaqs(simpleFaqs);
-        }
-
-        return response;
+        return KbaseConvertUtils.convertToFaqResponse(entity);
     }
 
     @Override
diff --git a/modules/kbase/src/main/java/com/bytedesk/kbase/faq_rating/FaqRatingRestService.java b/modules/kbase/src/main/java/com/bytedesk/kbase/faq_rating/FaqRatingRestService.java
index c75b198679..9a9443e278 100644
--- a/modules/kbase/src/main/java/com/bytedesk/kbase/faq_rating/FaqRatingRestService.java
+++ b/modules/kbase/src/main/java/com/bytedesk/kbase/faq_rating/FaqRatingRestService.java
@@ -2,7 +2,7 @@
  * @Author: jackning 270580156@qq.com
  * @Date: 2024-05-11 18:25:45
  * @LastEditors: jackning 270580156@qq.com
- * @LastEditTime: 2025-04-29 18:00:52
+ * @LastEditTime: 2025-04-29 18:04:43
  * @Description: bytedesk.com https://github.com/Bytedesk/bytedesk
  *   Please be aware of the BSL license restrictions before installing Bytedesk IM – 
  *  selling, reselling, or hosting Bytedesk IM as a service is a breach of the terms and automatically terminates your rights under the license.
@@ -161,7 +161,8 @@ public class FaqRatingRestService extends BaseRestService<FaqRatingEntity, FaqRa
     @Override
     public FaqRatingResponse convertToResponse(FaqRatingEntity entity) {
         FaqRatingResponse response = modelMapper.map(entity, FaqRatingResponse.class);
-        
+        response.setFaq(KbaseConvertUtils.convertToFaqResponseSimple(entity.getFaq()));
+
         return response;
     }
 
diff --git a/modules/kbase/src/main/java/com/bytedesk/kbase/utils/KbaseConvertUtils.java b/modules/kbase/src/main/java/com/bytedesk/kbase/utils/KbaseConvertUtils.java
index b02ac4839b..83299a7937 100644
--- a/modules/kbase/src/main/java/com/bytedesk/kbase/utils/KbaseConvertUtils.java
+++ b/modules/kbase/src/main/java/com/bytedesk/kbase/utils/KbaseConvertUtils.java
@@ -2,7 +2,7 @@
  * @Author: jackning 270580156@qq.com
  * @Date: 2025-02-25 21:13:58
  * @LastEditors: jackning 270580156@qq.com
- * @LastEditTime: 2025-04-29 18:02:26
+ * @LastEditTime: 2025-04-29 18:03:37
  * @Description: bytedesk.com https://github.com/Bytedesk/bytedesk
  *   Please be aware of the BSL license restrictions before installing Bytedesk IM – 
  *  selling, reselling, or hosting Bytedesk IM as a service is a breach of the terms and automatically terminates your rights under the license. 
@@ -57,11 +57,7 @@ public class KbaseConvertUtils {
         // 处理相关问题，避免循环依赖
         if (entity.getRelatedFaqs() != null) {
             List<FaqResponseSimple> simpleFaqs = entity.getRelatedFaqs().stream()
-                    .map(relatedFaq -> FaqResponseSimple.builder()
-                            .uid(relatedFaq.getUid())
-                            .question(relatedFaq.getQuestion())
-                            .answer(relatedFaq.getAnswer())
-                            .build())
+                    .map(relatedFaq -> convertToFaqResponseSimple(relatedFaq))
                     .collect(Collectors.toList());
             response.setRelatedFaqs(simpleFaqs);
         }