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
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
.requestMatchers("/swagger-ui/**", "/v3/api-docs/**").permitAll() // 스웨거 api
.requestMatchers("/api/test/auth/**", "/api/diary/**", "/api/members/**", "/api/habits/**",
"/api/members/survey", "/api/auth/logout", "/api/emotionWay/**", "/api/emotionnote/**",
"/api/habit-calendar/**", "/api/habit-report", "/api/emotion-report").hasRole("USER")
"/api/habit-calendar/**", "/api/habit-report", "/api/emotion-report", "/api/dummy").hasRole("USER")
.anyRequest().authenticated()
)
.addFilterBefore(jwtRequestFilter, UsernamePasswordAuthenticationFilter.class) // JWT 필터
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,9 @@ public class DailyEmotionStatisticService {
private final MemberInfoService memberInfoService;


public DailyEmotionStatistic saveStatistics(MemberInfo memberInfo, EmotionList emotion, int figure) {
LocalDate today = Instant.now().atZone(ZoneId.of("Asia/Seoul")).toLocalDate();
DailyEmotionStatistic statistics = dailyEmotionStatisticRepository.findFirstByDateAndMemberInfo(today,memberInfo)
.orElseGet(() -> new DailyEmotionStatistic(memberInfo, today)); // 없으면 생성
public DailyEmotionStatistic saveStatistics(MemberInfo memberInfo,LocalDate localDate , EmotionList emotion, int figure) {
DailyEmotionStatistic statistics = dailyEmotionStatisticRepository.findFirstByDateAndMemberInfo(localDate,memberInfo)
.orElseGet(() -> new DailyEmotionStatistic(memberInfo, localDate)); // 없으면 생성


//여기서 감정들에 추가되는 수치만큼 더해줌.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,9 @@ public SimpleEmotionNoteDTO saveEmotionNote(EmotionNoteSaveDTO note, Long member
.emotion(EmotionList.fromString(note.getEmotion()))
.content(note.getContent()).build();


//호출해서 감정이 저장될때마다 감정통계 엔티티를 추가로 업데이트 시킴.
dailyEmotionStatisticService.saveStatistics(memberInfo
dailyEmotionStatisticService.saveStatistics(memberInfo,emotionNote.getCreatedAt().toLocalDate()
,EmotionList.fromString(note.getEmotion()),note.getEmotionFigure());

emotionNoteRepository.save(emotionNote);
Expand All @@ -64,7 +65,7 @@ public SimpleEmotionNoteDTO saveStressEmotionNote(EmotionNoteStressSaveDTO reque
.stressNote(emotionNote)
.build();

dailyEmotionStatisticService.saveStatistics(memberInfo
dailyEmotionStatisticService.saveStatistics(memberInfo,stressEmotionNote.getCreatedAt().toLocalDate()
,EmotionList.fromString(request.getEmotion()),request.getEmotionFigure());

stressEmotionNoteRepository.save(stressEmotionNote);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public class DummyDataController {

private final DummyService dummyService;

@PostMapping("/api/emotionStatistic")
@PostMapping("/emotionStatistic")
@Operation(summary = "감정 통계 날짜로 만들기")
ApiResponse<Long> makeDummyEmotionStatistic(
@Valid @RequestBody DummyEmotionStatistic dummyEmotionStatistic,
Expand Down