Skip to content

최근 활동 조회 API: 금일 활동만 보여주도록 수정 #109

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
merged 2 commits into from
Mar 2, 2025
Merged

최근 활동 조회 API: 금일 활동만 보여주도록 수정 #109

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
4732bb1
[FIX] 최근 활동 API 금일 활동만 보여주도록 수정
seop-h Mar 2, 2025
13582e5
Merge branch 'V1' into hwang
seop-h Mar 2, 2025
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: 1 addition & 1 deletion src/main/java/com/podofarm/dev/api/study/repository/CustomStudyRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ public interface CustomStudyRepository {

List<ProblemInfoDto> searchSolvedProblemInfo(LocalDate date, String memberId);

List<RecentActivityInfoDto> searchRecentActivityInfo(String studyId);
List<RecentActivityInfoDto> searchTodayActivityInfo(String studyId);
}

8 changes: 5 additions & 3 deletions src/main/java/com/podofarm/dev/api/study/repository/CustomStudyRepositoryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,9 @@ public List<ProblemInfoDto> searchSolvedProblemInfo(LocalDate date, String membe
}

@Override
public List<RecentActivityInfoDto> searchRecentActivityInfo(String studyId) {
public List<RecentActivityInfoDto> searchTodayActivityInfo(String studyId) {
Timestamp startOfToday = Timestamp.valueOf(LocalDate.now().atStartOfDay());

return query
.select(new QRecentActivityInfoDto(
memberEntity.memberId,
Expand All @@ -165,10 +167,10 @@ public List<RecentActivityInfoDto> searchRecentActivityInfo(String studyId) {
.join(codeEntity.memberEntity, memberEntity)
.where(
memberEntity.studyEntity.studyId.eq(studyId),
codeEntity.codeStatus.isTrue()
codeEntity.codeStatus.isTrue(),
codeEntity.codeSolvedDate.goe(startOfToday)
)
.orderBy(codeEntity.codeSolvedDate.desc())
.limit(20)
.fetch();
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/podofarm/dev/api/study/service/StudyService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ public LogResDto getLog(String memberId, String studyId) {
checkValidMemberAndStudy(memberId, studyId);

//2. 해당 스터디의 최근 활동 정보 조회
List<RecentActivityInfoDto> repoDto = studyRepository.searchRecentActivityInfo(studyId);
List<RecentActivityInfoDto> repoDto = studyRepository.searchTodayActivityInfo(studyId);
return LogResDto.fromRepoDto(repoDto, LocalDateTime.now());
}

Expand Down