Merge pull request #57 from Beyond-B/fix/55-diary-create

♻️ [Refactor]: 일기 등록 수정
Beyond-B · Feb 16, 2024 · ddff264 · ddff264
2 parents 3c6e042 + 9aa4150
commit ddff264
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/src/main/java/com/beyondB/beyondB/converter/DiaryConverter.java b/src/main/java/com/beyondB/beyondB/converter/DiaryConverter.java
@@ -17,6 +17,7 @@ public static DiaryResponseDTO.DiaryContentDTO toDiaryContentDTO(Diary diary) {
                 .emotionSpecific(diary.getEmotionSpecific())
                 .behavior(diary.getBehavior())
                 .result(diary.getResult())
+                .feeling(diary.getFeeling().getEmotion())
                 .build();
     }
     public static DiaryResponseDTO.MonthlyDiaryDTO toMonthlyDiaryDTO(

diff --git a/src/main/java/com/beyondB/beyondB/service/impl/DiaryServiceImpl.java b/src/main/java/com/beyondB/beyondB/service/impl/DiaryServiceImpl.java
@@ -37,22 +37,18 @@ public Diary updateDiary(DiaryRequestDTO.UpdateDiaryDTO request){
 
     @Transactional
     public Diary createDiary(DiaryRequestDTO.CreateDiaryDTO request, User user) {
+        Feeling feeling = feelingRepository.findByEmotion(request.getEmotion());
+
         Diary diary = Diary.builder().user(user)
                 .behavior(request.getBehavior())
                 .result(request.getResult())
                 .thought(request.getThought())
                 .event(request.getEvent())
                 .date(request.getDate())
                 .emotionSpecific(request.getEmotionSpecific())
-
+                .feeling(feeling)
                 .build();
 
-        Emotion emotion = request.getEmotion();
-        Feeling feeling = feelingRepository.findByEmotion(emotion);
-
-        diary.setFeeling(feeling);
-
-
         diaryRepository.save(diary);
         return diary;
     }