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 @@ -166,12 +166,18 @@ public PannelResponseDTO getPannelData(User user) {
LocalDateTime startOfDay = LocalDate.now().atStartOfDay();
LocalDateTime endOfDay = LocalDate.now().atTime(23, 59, 59);

Diary diary = diaryService.findMyDiaries(user).get(0);
Diary diary =
diaryRepository.findTodayDiaryByUser(user, startOfDay, endOfDay).stream()
.findFirst()
.orElse(null);

if (diary != null && diary.getCreatedAt().isAfter(LocalDate.now().atStartOfDay())) {
isDiaryCompleted = true;
}
UserQuiz userQuiz =
userQuizRepository.findAllTodayUserQuizByUser(user, startOfDay, endOfDay).get(0);
userQuizRepository.findAllTodayUserQuizByUser(user, startOfDay, endOfDay).stream()
.findFirst()
.orElse(null);
if (userQuiz != null && userQuiz.getIsCompleted()) { // 오늘의 퀴즈 성공시
isQuizCompleted = true;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.example.cp_main_be.domain.member.user.domain.User;
import com.example.cp_main_be.domain.mission.diary.domain.Diary;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Optional;
import org.springframework.data.domain.Pageable;
Expand Down Expand Up @@ -29,4 +30,12 @@ List<Diary> findByUserInAndIsPublicIsTrueAndUser_IdNotIn(
+ "LEFT JOIN FETCH c.writer cw " // 댓글 작성자 fetch
+ "WHERE d.id = :diaryId")
Optional<Diary> findByIdWithDetails(@Param("diaryId") Long diaryId);

@Query(
"SELECT d FROM Diary d "
+ "WHERE d.user = :user AND d.createdAt BETWEEN :startDate AND :endDate")
List<Diary> findTodayDiaryByUser(
@Param("user") User user,
@Param("startDate") LocalDateTime startDate,
@Param("endDate") LocalDateTime endDate);
}