Skip to content

[REFACTOR] 모집 중 스터디 조회 시, 응답 DTO 내 페이지 갯수와 실제 데이터 불일치 해결 #429

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

[REFACTOR] 모집 중 스터디 조회 시, 응답 DTO 내 페이지 갯수와 실제 데이터 불일치 해결 #429

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
3d88ba9
[SPOT-290][REFACTOR] 모집 중 스터디 조회 시, 응답 DTO 내 페이지 갯수와 실제 데이터 불일치 해결
msk226 Jun 14, 2025
c30c63a
[SPOT-290][REFACTOR] 변경 사항 테스트 코드 반영
msk226 Jun 14, 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
1 change: 1 addition & 0 deletions src/main/java/com/example/spot/repository/querydsl/StudyRepositoryCustom.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ long countStudyByConditionsAndThemeTypesAndNotInIds(
long countStudyByConditionsAndRegionStudiesAndNotInIds(
Map<String, Object> search, List<RegionStudy> regionStudies, StudySortBy sortBy, List<Long> studyIds);
long countStudyByConditions(Map<String, Object> search, StudySortBy sortBy);
long countRecruitingStudyByConditions(Map<String, Object> search, StudySortBy sortBy);
long countStudyByStudyTheme(List<StudyTheme> studyThemes, StudySortBy sortBy);

long countAllByTitleContaining(String title, StudySortBy sortBy);
Expand Down
22 changes: 17 additions & 5 deletions src/main/java/com/example/spot/repository/querydsl/impl/StudyRepositoryCustomImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import org.springframework.data.domain.PageImpl;
import org.springframework.data.domain.Pageable;

import static com.example.spot.domain.enums.StudyState.RECRUITING;
import static com.example.spot.domain.mapping.QMemberStudy.memberStudy;
import static com.example.spot.domain.study.QStudy.study;
@RequiredArgsConstructor
Expand Down Expand Up @@ -109,7 +110,7 @@ public List<Study> findRecruitingStudyByConditions(Map<String, Object> search, S
Pageable pageable) {
BooleanBuilder builder = new BooleanBuilder();
getConditions(search, study, builder);
builder.and(study.studyState.eq(StudyState.RECRUITING));
builder.and(study.studyState.eq(RECRUITING));

JPAQuery<Study> query = queryFactory.selectFrom(study)
.where(builder)
Expand Down Expand Up @@ -148,7 +149,7 @@ public List<Study> findStudyByConditionsAndThemeTypesAndNotInIds(Map<String, Obj
if (sortBy != null) {
switch (sortBy) {
case RECRUITING:
builder.and(study.studyState.eq(StudyState.RECRUITING));
builder.and(study.studyState.eq(RECRUITING));
break;
case COMPLETED:
builder.and(study.studyState.eq(StudyState.COMPLETED));
Expand Down Expand Up @@ -181,7 +182,7 @@ public List<Study> findStudyByConditionsAndRegionStudiesAndNotInIds(Map<String,
if (sortBy != null) {
switch (sortBy) {
case RECRUITING:
builder.and(study.studyState.eq(StudyState.RECRUITING));
builder.and(study.studyState.eq(RECRUITING));
break;
case COMPLETED:
builder.and(study.studyState.eq(StudyState.COMPLETED));
Expand Down Expand Up @@ -277,7 +278,7 @@ public List<Study> findRecruitingStudiesByMemberStudy(List<MemberStudy> memberSt
QStudy study = QStudy.study;
return queryFactory.selectFrom(study)
.where(study.memberStudies.any().in(memberStudy))
.where(study.studyState.eq(StudyState.RECRUITING))
.where(study.studyState.eq(RECRUITING))
.offset(pageable.getOffset())
.limit(pageable.getPageSize())
.fetch();
Expand Down Expand Up @@ -316,6 +317,17 @@ public long countStudyByConditions(Map<String, Object> search, StudySortBy sortB
.fetchCount();
}

@Override
public long countRecruitingStudyByConditions(Map<String, Object> search, StudySortBy sortBy) {
BooleanBuilder builder = new BooleanBuilder();
getConditions(search, study, builder);
getStudyState(sortBy, builder, study);
return queryFactory.selectFrom(study)
.where(builder)
.where(study.studyState.eq(RECRUITING))
.fetchCount();
}

@Override
public long countStudyByStudyTheme(List<StudyTheme> studyThemes, StudySortBy sortBy) {
BooleanBuilder builder = new BooleanBuilder();
Expand Down Expand Up @@ -356,7 +368,7 @@ public long countByMemberStudiesAndStatusAndIsOwned(List<MemberStudy> memberStud

private static void getStudyState(StudySortBy sortBy, BooleanBuilder builder, QStudy study) {
if (sortBy != null && sortBy.equals(StudySortBy.RECRUITING))
builder.and(study.studyState.eq((StudyState.RECRUITING)));
builder.and(study.studyState.eq((RECRUITING)));
if (sortBy != null && sortBy.equals(StudySortBy.COMPLETED))
builder.and(study.studyState.eq((StudyState.COMPLETED)));
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/example/spot/service/study/StudyQueryServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -619,7 +619,7 @@ public StudyPreviewDTO findRecruitingStudiesByConditions(
throw new StudyHandler(ErrorStatus._STUDY_IS_NOT_MATCH);

// 전체 스터디 수
long totalElements = studyRepository.countStudyByConditions(conditions, sortBy);
long totalElements = studyRepository.countRecruitingStudyByConditions(conditions, sortBy);
return getDTOs(studies, pageable, totalElements, SecurityUtils.getCurrentUserId());
}

Expand Down
4 changes: 2 additions & 2 deletions src/test/java/com/example/spot/service/study/StudyQueryServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1479,7 +1479,7 @@ void findRecruitingStudiesByConditions() {

when(studyRepository.findRecruitingStudyByConditions(searchConditions, sortBy, pageable))
.thenReturn(List.of(study1, study2));
when(studyRepository.countStudyByConditions(searchConditions, sortBy))
when(studyRepository.countRecruitingStudyByConditions(searchConditions, sortBy))
.thenReturn(2L);

// SecurityContext와 Authentication을 모킹
Expand All @@ -1499,7 +1499,7 @@ void findRecruitingStudiesByConditions() {
assertNotNull(result);
assertEquals(2, result.getTotalElements()); // Verify the count of elements
verify(studyRepository).findRecruitingStudyByConditions(searchConditions, sortBy, pageable);
verify(studyRepository).countStudyByConditions(searchConditions, sortBy);
verify(studyRepository).countRecruitingStudyByConditions(searchConditions, sortBy);
}

@Test
Expand Down