From 3b1e4eba01e978a941863dad9952522e94726d50 Mon Sep 17 00:00:00 2001 From: yeojin Date: Wed, 4 Dec 2024 16:08:50 +0900 Subject: [PATCH] =?UTF-8?q?Fix=20Diary:=20=EC=9D=BC=EA=B8=B0=20=EC=A4=91?= =?UTF-8?q?=EB=B3=B5=20=EC=83=9D=EC=84=B1=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../example/aneukbeserver/controller/DiaryController.java | 2 +- .../com/example/aneukbeserver/service/DiaryService.java | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/example/aneukbeserver/controller/DiaryController.java b/src/main/java/com/example/aneukbeserver/controller/DiaryController.java index 550ec64..bbec826 100644 --- a/src/main/java/com/example/aneukbeserver/controller/DiaryController.java +++ b/src/main/java/com/example/aneukbeserver/controller/DiaryController.java @@ -84,7 +84,7 @@ public class DiaryController { }) @PostMapping("/emotion/list") - public ResponseEntity sendInitMessage(@Parameter(hidden = true) @RequestHeader("Authorization") final String accessToken, @RequestParam("chatId") Long chatId) { + public ResponseEntity sendInitDiary(@Parameter(hidden = true) @RequestHeader("Authorization") final String accessToken, @RequestParam("chatId") Long chatId) { String userEmail = jwtUtil.getEmail(accessToken.substring(7)); Optional member = memberService.findByEmail(userEmail); Optional chat = chatService.getChatById(chatId); diff --git a/src/main/java/com/example/aneukbeserver/service/DiaryService.java b/src/main/java/com/example/aneukbeserver/service/DiaryService.java index e68941a..d75bc10 100644 --- a/src/main/java/com/example/aneukbeserver/service/DiaryService.java +++ b/src/main/java/com/example/aneukbeserver/service/DiaryService.java @@ -10,6 +10,8 @@ import com.example.aneukbeserver.domain.member.Member; import com.example.aneukbeserver.domain.selectedEmotion.SelectedEmotion; import jakarta.persistence.EntityNotFoundException; +import lombok.extern.slf4j.Slf4j; +import org.joda.time.LocalDateTime; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.stereotype.Service; @@ -19,6 +21,7 @@ import java.util.*; import java.util.stream.Collectors; +@Slf4j @Service public class DiaryService { @Autowired @@ -28,7 +31,7 @@ public class DiaryService { private ChatRepository chatRepository; public void saveDiary(Chat chat, Member member) { - Diary diary = new Diary(); + Diary diary = chat.getDiary(); diary.setChat(chat); diary.setMember(member); diary.setChat(chat); @@ -112,7 +115,7 @@ public DiaryDTO getDateDiary(Member member, String date) { if (diaries.isEmpty()) { throw new EntityNotFoundException("Diary not found for member and date"); } - Diary diary = diaries.get(0); + Diary diary = diaries.get(diaries.size()-1); // Diary diary = diaryRepository.findByMemberAndCreatedDate(member, localDate); List emotionList = diary.getParagraphs().stream()