Merge pull request #128 from studio-recoding/dev

[🚀feat] 18차 배포
studio-recoding · Jul 6, 2024 · 473de20 · 473de20
2 parents 3fbecd4 + b10fde4
commit 473de20
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git 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();
 

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
@@ -18,18 +18,22 @@ public class GetChatDto {
     @Schema(description = "채팅 내용", example = "오늘 내가 공부한 내역을 보여줘.")
     private String text;
 
+    @Schema(description = "채팅 메타데이터", example = "일정에 대한 JSON 구조")
+    private String metadata;
+
     @Schema(description = "발화자 구분", example = "AI")
     private String chatType;
 
     @JsonProperty("case")
     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
@@ -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
@@ -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;
     }
 }