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
6 changes: 4 additions & 2 deletions src/main/java/com/retrip/trip/application/in/TripService.java
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,11 @@ public TripUpdateVisibilityResponse updateTripVisibility(UUID tripId, TripUpdate
@Transactional(readOnly = true)
@Override
public Page<TripResponse> getTrips(Pageable page) {
List<Trip> trips = tripQueryRepository.findTrips(page);
Page<Trip> tripsPage = tripQueryRepository.findTrips(page);
List<Trip> trips = tripsPage.getContent();
List<TripHashTag> hashTags = tripQueryRepository.findHashTags(trips);
return new PageImpl<>(TripResponse.of(trips, hashTags), page, trips.size());

return new PageImpl<>(TripResponse.of(trips, hashTags), page, tripsPage.getTotalElements());
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,17 @@

import com.retrip.trip.application.in.response.MyTripResponse;
import com.retrip.trip.domain.entity.Trip;

import com.retrip.trip.domain.entity.TripHashTag;

import com.retrip.trip.domain.vo.TripStatus;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;

import java.util.List;
import java.util.Optional;

import java.util.UUID;

import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;

public interface TripQueryRepository {
List<Trip> findTrips(Pageable page);
Page<Trip> findTrips(Pageable page);

Page<MyTripResponse> findMyTrips(UUID memberId, TripStatus tripStatus, Pageable page);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,18 @@
import com.querydsl.core.types.Projections;
import com.querydsl.core.types.dsl.BooleanExpression;
import com.querydsl.core.types.dsl.Expressions;
import com.querydsl.jpa.impl.JPAQuery;
import com.querydsl.jpa.impl.JPAQueryFactory;
import com.retrip.trip.application.in.response.MyTripResponse;
import com.retrip.trip.application.out.repository.TripQueryRepository;
import com.retrip.trip.domain.entity.QTrip;
import com.retrip.trip.domain.entity.QTripParticipant;
import com.retrip.trip.domain.entity.Trip;
import com.retrip.trip.domain.entity.TripHashTag;
import com.retrip.trip.domain.vo.TripStatus;
import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.support.PageableExecutionUtils;
import org.springframework.stereotype.Repository;

import java.util.List;
Expand All @@ -33,13 +34,19 @@ public class TripQuerydslRepository implements TripQueryRepository {
private final JPAQueryFactory query;

@Override
public List<Trip> findTrips(Pageable page) {
return query
public Page<Trip> findTrips(Pageable page) {
List<Trip> content = query
.selectFrom(trip)
.offset(page.getOffset())
.limit(page.getPageSize())
.orderBy(trip.createdAt.desc())
.fetch();

JPAQuery<Long> countQuery = query
.select(trip.count())
.from(trip);

return PageableExecutionUtils.getPage(content, page, countQuery::fetchOne);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ private Trip createProgressTrip(UUID leaderId) {

@Test
void 여행_목록을_조회한다() {
// TripFixture 호출 시 status 파라미터 관련 문제 해결을 위해 createTestTrip 헬퍼 메서드 사용 (위에서 수정함)
tripRepository.save(createTestTrip("속초 여행 맴버 구함", "속초 여행은 이렇게이렇게 갈겁니다~", TripCategory.DOMESTIC, TripStatus.RECRUITING));
tripRepository.save(createTestTrip("대구 여행 멤버 구함", "대구 여행은 이렇게이렇게 갈겁니다~", TripCategory.DOMESTIC, TripStatus.RECRUITING));
tripRepository.save(createTestTrip("부산 여행 멤버 구함", "부산 여행은 이렇게이렇게 갈겁니다~", TripCategory.DOMESTIC, TripStatus.RECRUITING));
Expand Down