From deab7b3bf23f493c8436858aed174f2724980d98 Mon Sep 17 00:00:00 2001 From: JeonHaeseung <414catherine@gmail.com> Date: Sat, 6 Jul 2024 12:06:17 +0900 Subject: [PATCH 1/2] =?UTF-8?q?[feat]=20=EC=97=94=ED=8B=B0=ED=8B=B0=20?= =?UTF-8?q?=EB=B0=8F=20DTO=EC=97=90=20=EB=A9=94=ED=83=80=EB=8D=B0=EC=9D=B4?= =?UTF-8?q?=ED=84=B0=20=ED=95=84=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Ness/Backend/domain/chat/dto/response/GetChatDto.java | 6 +++++- .../domain/chat/dto/response/PostFastApiAiChatDto.java | 3 +++ src/main/java/Ness/Backend/domain/chat/entity/Chat.java | 5 ++++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/main/java/Ness/Backend/domain/chat/dto/response/GetChatDto.java b/src/main/java/Ness/Backend/domain/chat/dto/response/GetChatDto.java index 0693c51..eb29e08 100644 --- a/src/main/java/Ness/Backend/domain/chat/dto/response/GetChatDto.java +++ b/src/main/java/Ness/Backend/domain/chat/dto/response/GetChatDto.java @@ -18,6 +18,9 @@ public class GetChatDto { @Schema(description = "채팅 내용", example = "오늘 내가 공부한 내역을 보여줘.") private String text; + @Schema(description = "채팅 메타데이터", example = "일정에 대한 JSON 구조") + private String metadata; + @Schema(description = "발화자 구분", example = "AI") private String chatType; @@ -25,11 +28,12 @@ public class GetChatDto { private int caseNumber; @Builder - public GetChatDto(Long id, String createdDate, String text, String chatType, int caseNumber){ + public GetChatDto(Long id, String createdDate, String text, String chatType, int caseNumber, String metadata){ this.id = id; this.createdDate = createdDate; this.text = text; this.chatType = chatType; this.caseNumber = caseNumber; + this.metadata = metadata; } } diff --git a/src/main/java/Ness/Backend/domain/chat/dto/response/PostFastApiAiChatDto.java b/src/main/java/Ness/Backend/domain/chat/dto/response/PostFastApiAiChatDto.java index 09fc5f1..3631342 100644 --- a/src/main/java/Ness/Backend/domain/chat/dto/response/PostFastApiAiChatDto.java +++ b/src/main/java/Ness/Backend/domain/chat/dto/response/PostFastApiAiChatDto.java @@ -17,4 +17,7 @@ public class PostFastApiAiChatDto { @JsonProperty("case") private int caseNumber; + + @JsonProperty("metadata") + private String metadata; } diff --git a/src/main/java/Ness/Backend/domain/chat/entity/Chat.java b/src/main/java/Ness/Backend/domain/chat/entity/Chat.java index 67f42d4..40e82ce 100644 --- a/src/main/java/Ness/Backend/domain/chat/entity/Chat.java +++ b/src/main/java/Ness/Backend/domain/chat/entity/Chat.java @@ -24,6 +24,8 @@ public class Chat { private String text; + private String metadata; + private int caseNumber; //AI 발화인지, USER 발화인지 구분해주는 타입 값 @@ -39,12 +41,13 @@ public class Chat { @Builder public Chat(Long id, ZonedDateTime createdDate, String text, ChatType chatType, - int caseNumber, Member member) { + int caseNumber, Member member, String metadata) { this.id = id; this.createdDate = createdDate; this.text = text; this.chatType = chatType; this.caseNumber = caseNumber; this.member = member; + this.metadata = metadata; } } From 5a6c718d4893eda54a34ed79e2a469d771116de5 Mon Sep 17 00:00:00 2001 From: JeonHaeseung <414catherine@gmail.com> Date: Sat, 6 Jul 2024 12:06:57 +0900 Subject: [PATCH 2/2] =?UTF-8?q?[feat]=20AI=EC=97=90=EA=B2=8C=EC=84=9C=20?= =?UTF-8?q?=EB=A9=94=ED=83=80=EB=8D=B0=EC=9D=B4=ED=84=B0=20=ED=95=84?= =?UTF-8?q?=EB=93=9C=20=EB=B0=9B=EC=95=84=EC=84=9C=20=EB=B0=98=ED=99=98?= =?UTF-8?q?=ED=95=98=EB=8A=94=20=EB=A1=9C=EC=A7=81=EC=9C=BC=EB=A1=9C=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/Ness/Backend/domain/chat/ChatService.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/Ness/Backend/domain/chat/ChatService.java b/src/main/java/Ness/Backend/domain/chat/ChatService.java index 9b41960..ed03112 100644 --- a/src/main/java/Ness/Backend/domain/chat/ChatService.java +++ b/src/main/java/Ness/Backend/domain/chat/ChatService.java @@ -58,6 +58,7 @@ public GetChatListDto getOneWeekUserChat(Long memberId){ .text(chat.getText()) .caseNumber(chat.getCaseNumber()) .chatType(chat.getChatType().toString()) + .metadata(chat.getMetadata()) .build()) .toList(); return new GetChatListDto(getChatDtos); @@ -87,6 +88,7 @@ public GetChatListDto postNewUserChat(Long memberId, PostUserChatDto postUserCha .text(AiDto.getAnswer()) .chatType(ChatType.AI) .caseNumber(AiDto.getCaseNumber()) //AI는 받아온 값으로 저장 + .metadata(AiDto.getMetadata()) .member(memberEntity) .build();