From 85b29ddea9d98eb92b37857446b2705fff616482 Mon Sep 17 00:00:00 2001 From: wslee6704 Date: Fri, 21 Feb 2025 14:27:26 +0900 Subject: [PATCH] =?UTF-8?q?feat=20:=20dummydata=EA=B8=B0=EB=8A=A5=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix : habit이랑 habithistory랑 서로 id가 바뀜 --- .../java/Spring/MindStone/service/DummyService.java | 2 ++ .../diaryService/DailyEmotionStatisticService.java | 12 ++++++------ .../emotionNoteService/EmotionNoteService.java | 12 ++++++------ 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/main/java/Spring/MindStone/service/DummyService.java b/src/main/java/Spring/MindStone/service/DummyService.java index f0f9532..c47eb53 100644 --- a/src/main/java/Spring/MindStone/service/DummyService.java +++ b/src/main/java/Spring/MindStone/service/DummyService.java @@ -31,6 +31,8 @@ public void dummyStatistic(Long memberId, DummyEmotionStatistic request) { .sadFigure(request.getSadFigure()) .thrillFigure(request.getThrillFigure()) .happinessFigure(request.getHappinessFigure()) + .actionRecommandCount(10) + .diaryAutoCreationCount(10) .build(); dailyEmotionStatisticRepository.save(dailyEmotionStatistic); diff --git a/src/main/java/Spring/MindStone/service/diaryService/DailyEmotionStatisticService.java b/src/main/java/Spring/MindStone/service/diaryService/DailyEmotionStatisticService.java index aedd6f3..b655afc 100644 --- a/src/main/java/Spring/MindStone/service/diaryService/DailyEmotionStatisticService.java +++ b/src/main/java/Spring/MindStone/service/diaryService/DailyEmotionStatisticService.java @@ -24,8 +24,8 @@ public class DailyEmotionStatisticService { public DailyEmotionStatistic saveStatistics(MemberInfo memberInfo,LocalDate localDate , EmotionList emotion, int figure) { - DailyEmotionStatistic statistics = dailyEmotionStatisticRepository.findFirstByDateAndMemberInfo(localDate,memberInfo) - .orElseGet(() -> new DailyEmotionStatistic(memberInfo, localDate)); // 없으면 생성 + DailyEmotionStatistic statistics = dailyEmotionStatisticRepository.findFirstByDateAndMemberInfo(LocalDate.of(2025, 2, 21),memberInfo) + .orElseGet(() -> new DailyEmotionStatistic(memberInfo, LocalDate.of(2025, 2, 21))); // 없으면 생성 //여기서 감정들에 추가되는 수치만큼 더해줌. @@ -37,8 +37,8 @@ public DailyEmotionStatistic saveStatistics(MemberInfo memberInfo,LocalDate loca public SimpleEmotionStatisticDto getStatistic(Long memberId) { LocalDate today = Instant.now().atZone(ZoneId.of("Asia/Seoul")).toLocalDate(); MemberInfo memberInfo = memberInfoService.findMemberById(memberId); - DailyEmotionStatistic statistics = dailyEmotionStatisticRepository.findFirstByDateAndMemberInfo(today,memberInfo) - .orElseGet(() ->dailyEmotionStatisticRepository.save(new DailyEmotionStatistic(memberInfo, today)) ); + DailyEmotionStatistic statistics = dailyEmotionStatisticRepository.findFirstByDateAndMemberInfo(LocalDate.of(2025, 2, 21),memberInfo) + .orElseGet(() ->dailyEmotionStatisticRepository.save(new DailyEmotionStatistic(memberInfo, LocalDate.of(2025, 2, 21))) ); return new SimpleEmotionStatisticDto(statistics); } @@ -46,8 +46,8 @@ public SimpleEmotionStatisticDto getStatistic(Long memberId) { public DailyEmotionStatistic getStatisticEntity(Long memberId) { LocalDate today = Instant.now().atZone(ZoneId.of("Asia/Seoul")).toLocalDate(); MemberInfo memberInfo = memberInfoService.findMemberById(memberId); - DailyEmotionStatistic statistics = dailyEmotionStatisticRepository.findFirstByDateAndMemberInfo(today,memberInfo) - .orElseGet(() ->dailyEmotionStatisticRepository.save(new DailyEmotionStatistic(memberInfo, today)) ); + DailyEmotionStatistic statistics = dailyEmotionStatisticRepository.findFirstByDateAndMemberInfo(LocalDate.of(2025, 2, 21),memberInfo) + .orElseGet(() ->dailyEmotionStatisticRepository.save(new DailyEmotionStatistic(memberInfo, LocalDate.of(2025, 2, 21))) ); return statistics; } diff --git a/src/main/java/Spring/MindStone/service/emotionNoteService/EmotionNoteService.java b/src/main/java/Spring/MindStone/service/emotionNoteService/EmotionNoteService.java index 689ec8e..29a7f04 100644 --- a/src/main/java/Spring/MindStone/service/emotionNoteService/EmotionNoteService.java +++ b/src/main/java/Spring/MindStone/service/emotionNoteService/EmotionNoteService.java @@ -44,12 +44,12 @@ public SimpleEmotionNoteDTO saveEmotionNote(EmotionNoteSaveDTO note, Long member .emotion(EmotionList.fromString(note.getEmotion())) .content(note.getContent()).build(); - + emotionNoteRepository.save(emotionNote); //호출해서 감정이 저장될때마다 감정통계 엔티티를 추가로 업데이트 시킴. - dailyEmotionStatisticService.saveStatistics(memberInfo,emotionNote.getCreatedAt().toLocalDate() + dailyEmotionStatisticService.saveStatistics(memberInfo,LocalDate.now() ,EmotionList.fromString(note.getEmotion()),note.getEmotionFigure()); - emotionNoteRepository.save(emotionNote); + return new SimpleEmotionNoteDTO(emotionNote); } @@ -64,11 +64,11 @@ public SimpleEmotionNoteDTO saveStressEmotionNote(EmotionNoteStressSaveDTO reque .content(request.getContent()) .stressNote(emotionNote) .build(); - - dailyEmotionStatisticService.saveStatistics(memberInfo,stressEmotionNote.getCreatedAt().toLocalDate() + stressEmotionNoteRepository.save(stressEmotionNote); + dailyEmotionStatisticService.saveStatistics(memberInfo,LocalDate.now() ,EmotionList.fromString(request.getEmotion()),request.getEmotionFigure()); - stressEmotionNoteRepository.save(stressEmotionNote); + return new SimpleEmotionNoteDTO(stressEmotionNote); }