Merge pull request #35 from NewMillenniumWorkout/dev/statistics

[FIX] 일기 중복 생성 수정
NewMillenniumWorkout · Dec 4, 2024 · 28db6b6 · 28db6b6
2 parents 32c3821 + d7f8ab4
commit 28db6b6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git 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<StatusResponseDto> sendInitMessage(@Parameter(hidden = true) @RequestHeader("Authorization") final String accessToken, @RequestParam("chatId") Long chatId) {
+    public ResponseEntity<StatusResponseDto> sendInitDiary(@Parameter(hidden = true) @RequestHeader("Authorization") final String accessToken, @RequestParam("chatId") Long chatId) {
         String userEmail = jwtUtil.getEmail(accessToken.substring(7));
         Optional<Member> member = memberService.findByEmail(userEmail);
         Optional<Chat> 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
@@ -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,6 +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(diaries.size() - 1);
 //        Diary diary = diaryRepository.findByMemberAndCreatedDate(member, localDate);