From 0383683ac0711baa621a5a12fea28e4afaecb732 Mon Sep 17 00:00:00 2001
From: lexluo09 <39718951+lexluo09@users.noreply.github.com>
Date: Tue, 29 Oct 2024 16:01:02 +0800
Subject: [PATCH] [improvement][chat] In the search interface, modelId and
 modelName are changed to dataSetId and dataSetName (#1855)

---
 .../headless/api/pojo/response/SearchResult.java          | 8 ++++----
 .../headless/server/service/impl/RetrieveServiceImpl.java | 7 ++++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/SearchResult.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/SearchResult.java
index c80008df2..6129158dd 100644
--- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/SearchResult.java
+++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/SearchResult.java
@@ -18,9 +18,9 @@ public class SearchResult {
 
     private String subRecommend;
 
-    private String modelName;
+    private Long dataSetId;
 
-    private Long modelId;
+    private String dataSetName;
 
     private SchemaElementType schemaElementType;
 
@@ -36,11 +36,11 @@ public class SearchResult {
         }
         SearchResult searchResult1 = (SearchResult) o;
         return Objects.equals(recommend, searchResult1.recommend)
-                && Objects.equals(modelName, searchResult1.modelName);
+                && Objects.equals(dataSetName, searchResult1.dataSetName);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(recommend, modelName);
+        return Objects.hash(recommend, dataSetName);
     }
 }
diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/RetrieveServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/RetrieveServiceImpl.java
index 016705f3a..ae8a63c0b 100644
--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/RetrieveServiceImpl.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/RetrieveServiceImpl.java
@@ -181,7 +181,8 @@ public class RetrieveServiceImpl implements RetrieveService {
 
     private SearchResult createBaseSearchResult(Long dataSetId, Map<Long, String> dataSetIdToName,
             MatchText matchText, String wordName, SchemaElementType schemaElementType) {
-        return SearchResult.builder().modelId(dataSetId).modelName(dataSetIdToName.get(dataSetId))
+        return SearchResult.builder().dataSetId(dataSetId)
+                .dataSetName(dataSetIdToName.get(dataSetId))
                 .recommend(matchText.getRegText() + wordName).schemaElementType(schemaElementType)
                 .subRecommend(wordName).build();
     }
@@ -206,7 +207,7 @@ public class RetrieveServiceImpl implements RetrieveService {
 
     private SearchResult createMetricSearchResult(Long modelId, Map<Long, String> modelToName,
             MatchText matchText, String wordName, String metric) {
-        return SearchResult.builder().modelId(modelId).modelName(modelToName.get(modelId))
+        return SearchResult.builder().dataSetId(modelId).dataSetName(modelToName.get(modelId))
                 .recommend(matchText.getRegText() + wordName + DictWordType.SPACE + metric)
                 .subRecommend(wordName + DictWordType.SPACE + metric).isComplete(false).build();
     }
@@ -281,7 +282,7 @@ public class RetrieveServiceImpl implements RetrieveService {
                 String subRecommendText = hanlpMapResult.getName();
 
                 SearchResult searchResult =
-                        SearchResult.builder().modelId(dataSetId).modelName(modelName)
+                        SearchResult.builder().dataSetId(dataSetId).dataSetName(modelName)
                                 .recommend(recommendText).subRecommend(subRecommendText)
                                 .schemaElementType(schemaElementType).build();