From b8924ed45e8592c7af32ca47acdd83291a9b21f3 Mon Sep 17 00:00:00 2001 From: jerryjzhang Date: Mon, 2 Dec 2024 09:33:33 +0800 Subject: [PATCH] [fix][common]Fix postgres schema, using varchar instead of char. --- .../chat/api/pojo/request/ChatMemoryUpdateReq.java | 4 ++-- .../supersonic/chat/server/rest/MemoryController.java | 5 +++-- .../chat/server/service/impl/MemoryServiceImpl.java | 6 ++++-- .../standalone/src/main/resources/db/schema-postgres.sql | 6 +++--- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/ChatMemoryUpdateReq.java b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/ChatMemoryUpdateReq.java index 7f70721bc..9b68c10e5 100644 --- a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/ChatMemoryUpdateReq.java +++ b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/ChatMemoryUpdateReq.java @@ -1,12 +1,12 @@ package com.tencent.supersonic.chat.api.pojo.request; +import javax.validation.constraints.NotNull; + import com.tencent.supersonic.chat.api.pojo.enums.MemoryReviewResult; import com.tencent.supersonic.chat.api.pojo.enums.MemoryStatus; import lombok.Builder; import lombok.Data; -import javax.validation.constraints.NotNull; - @Data @Builder public class ChatMemoryUpdateReq { diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/MemoryController.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/MemoryController.java index f8b13626a..ab9c19b6b 100644 --- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/MemoryController.java +++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/MemoryController.java @@ -1,5 +1,8 @@ package com.tencent.supersonic.chat.server.rest; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import com.github.pagehelper.PageInfo; import com.tencent.supersonic.auth.api.authentication.utils.UserHolder; import com.tencent.supersonic.chat.api.pojo.enums.MemoryReviewResult; @@ -16,8 +19,6 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import java.util.Date; @RestController diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/MemoryServiceImpl.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/MemoryServiceImpl.java index 7369d50dd..288cc5978 100644 --- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/MemoryServiceImpl.java +++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/MemoryServiceImpl.java @@ -55,7 +55,8 @@ public class MemoryServiceImpl implements MemoryService { @Override public void updateMemory(ChatMemoryUpdateReq chatMemoryUpdateReq, User user) { ChatMemoryDO chatMemoryDO = chatMemoryRepository.getMemory(chatMemoryUpdateReq.getId()); - boolean hadEnabled = MemoryStatus.ENABLED.toString().equals(chatMemoryDO.getStatus().trim()); + boolean hadEnabled = + MemoryStatus.ENABLED.toString().equals(chatMemoryDO.getStatus().trim()); chatMemoryDO.setUpdatedBy(user.getName()); chatMemoryDO.setUpdatedAt(new Date()); BeanMapper.mapper(chatMemoryUpdateReq, chatMemoryDO); @@ -154,7 +155,8 @@ public class MemoryServiceImpl implements MemoryService { BeanUtils.copyProperties(memoryDO, memory); memory.setStatus(MemoryStatus.valueOf(memoryDO.getStatus().trim())); if (Objects.nonNull(memoryDO.getHumanReviewRet())) { - memory.setHumanReviewRet(MemoryReviewResult.valueOf(memoryDO.getHumanReviewRet().trim())); + memory.setHumanReviewRet( + MemoryReviewResult.valueOf(memoryDO.getHumanReviewRet().trim())); } if (Objects.nonNull(memoryDO.getLlmReviewRet())) { memory.setLlmReviewRet(MemoryReviewResult.valueOf(memoryDO.getLlmReviewRet().trim())); diff --git a/launchers/standalone/src/main/resources/db/schema-postgres.sql b/launchers/standalone/src/main/resources/db/schema-postgres.sql index 730823a09..815224151 100644 --- a/launchers/standalone/src/main/resources/db/schema-postgres.sql +++ b/launchers/standalone/src/main/resources/db/schema-postgres.sql @@ -73,10 +73,10 @@ CREATE TABLE IF NOT EXISTS s2_chat_memory ( agent_id INTEGER, db_schema TEXT, s2_sql TEXT, - status char(10), - llm_review char(10), + status varchar(20), + llm_review varchar(20), llm_comment TEXT, - human_review char(10), + human_review varchar(20), human_comment TEXT, created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP, updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,