From 9aa4150767d6be025700c751ff604b06612052d5 Mon Sep 17 00:00:00 2001 From: koreanair777 Date: Fri, 16 Feb 2024 16:17:02 +0900 Subject: [PATCH] =?UTF-8?q?:recycle:=20[Refactor]:=20=EC=9D=BC=EA=B8=B0=20?= =?UTF-8?q?=EB=93=B1=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/beyondB/beyondB/converter/DiaryConverter.java | 1 + .../beyondB/beyondB/service/impl/DiaryServiceImpl.java | 10 +++------- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/beyondB/beyondB/converter/DiaryConverter.java b/src/main/java/com/beyondB/beyondB/converter/DiaryConverter.java index 20cab65..3fdb1f3 100644 --- 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 index c77c30b..39995e1 100644 --- a/src/main/java/com/beyondB/beyondB/service/impl/DiaryServiceImpl.java +++ b/src/main/java/com/beyondB/beyondB/service/impl/DiaryServiceImpl.java @@ -37,6 +37,8 @@ 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()) @@ -44,15 +46,9 @@ public Diary createDiary(DiaryRequestDTO.CreateDiaryDTO request, User user) { .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; }