Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/main/java/Spring/MindStone/service/DummyService.java
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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))); // 없으면 생성


//여기서 감정들에 추가되는 수치만큼 더해줌.
Expand All @@ -37,17 +37,17 @@ 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);
}

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;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand All @@ -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);
}

Expand Down