Skip to content

main 반영 #92

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Juhye0k merged 2 commits into from
May 8, 2026
Merged

main 반영 #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
556cbd8
refactor : 공부 시작시 시작 시간 추가
Juhye0k May 3, 2026
71bff6d
Merge pull request #91 from Geumpumta/time
Juhye0k May 3, 2026
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
8 changes: 5 additions & 3 deletions src/main/java/com/gpt/geumpumtabackend/study/dto/response/StudySessionResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
package com.gpt.geumpumtabackend.study.dto.response;

public record StudySessionResponse(Long totalStudySession, boolean isStudying) {
import java.time.LocalDateTime;

public static StudySessionResponse of(Long totalStudySession, boolean isStudying) {
return new StudySessionResponse(totalStudySession, isStudying);
public record StudySessionResponse(Long totalStudySession, boolean isStudying, LocalDateTime startTime) {

public static StudySessionResponse of(Long totalStudySession, boolean isStudying, LocalDateTime startTime) {
return new StudySessionResponse(totalStudySession, isStudying, startTime);
}
}
7 changes: 5 additions & 2 deletions src/main/java/com/gpt/geumpumtabackend/study/service/StudySessionService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,12 @@ public class StudySessionService {
public StudySessionResponse getTodayStudySession(Long userId) {
LocalDateTime startOfDay = LocalDate.now().atStartOfDay();
LocalDateTime now = LocalDateTime.now();
boolean isStudying = studySessionRepository.findByUser_IdAndStatus(userId, StudyStatus.STARTED).isPresent();
StudySession activeSession = studySessionRepository.findByUser_IdAndStatus(userId, StudyStatus.STARTED)
.orElse(null);
boolean isStudying = activeSession != null;
LocalDateTime startTime = isStudying ? activeSession.getStartTime() : null;
Long totalStudySession = studySessionRepository.sumCompletedStudySessionByUserId(userId, startOfDay, now);
return StudySessionResponse.of(totalStudySession,isStudying);
return StudySessionResponse.of(totalStudySession, isStudying, startTime);
}

/*
Expand Down
Loading