Skip to content

refactor: 여행 회고 응답 DTO에 StudyLogId 목록 추가(#101) #102

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
chaiminwoo0223 merged 1 commit into from
Oct 17, 2025
Merged

refactor: 여행 회고 응답 DTO에 StudyLogId 목록 추가(#101) #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions src/main/java/com/ject/studytrip/studylog/application/service/StudyLogQueryService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,8 @@ public Slice<StudyLog> getStudyLogsSliceByTripReportId(Long tripReportId, int pa
return studyLogQueryRepository.findSliceByTripReportIdOrderByCreatedAtDesc(
tripReportId, PageRequest.of(page, size));
}

public List<Long> getStudyLogIdsByTripId(Long tripId) {
return studyLogQueryRepository.findAllIdsByTripIdOrderByCreatedDesc(tripId);
}
}
3 changes: 3 additions & 0 deletions src/main/java/com/ject/studytrip/studylog/domain/repository/StudyLogQueryRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.ject.studytrip.studylog.domain.repository;

import com.ject.studytrip.studylog.domain.model.StudyLog;
import java.util.List;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Slice;

Expand All @@ -19,4 +20,6 @@ public interface StudyLogQueryRepository {

Slice<StudyLog> findSliceByTripReportIdOrderByCreatedAtDesc(
Long tripReportId, Pageable pageable);

List<Long> findAllIdsByTripIdOrderByCreatedDesc(Long tripId);
}
14 changes: 14 additions & 0 deletions src/main/java/com/ject/studytrip/studylog/infra/querydsl/StudyLogQueryRepositoryAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,20 @@ public Slice<StudyLog> findSliceByTripReportIdOrderByCreatedAtDesc(
return new SliceImpl<>(result, pageable, hasNext);
}

@Override
public List<Long> findAllIdsByTripIdOrderByCreatedDesc(Long tripId) {
return queryFactory
.select(studyLog.id)
.from(studyLog)
.join(studyLog.dailyGoal, dailyGoal)
.where(
dailyGoal.trip.id.eq(tripId),
studyLog.deletedAt.isNull(),
dailyGoal.deletedAt.isNull())
.orderBy(studyLog.createdAt.desc())
.fetch();
}

private OrderSpecifier<?>[] orderSpecifiers(String order) {
return (order.equalsIgnoreCase("OLDEST"))
? new OrderSpecifier<?>[] {studyLog.createdAt.asc(), studyLog.id.asc()}
Expand Down
9 changes: 6 additions & 3 deletions src/main/java/com/ject/studytrip/trip/application/dto/TripRetrospectSummary.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
package com.ject.studytrip.trip.application.dto;

import java.util.List;

public record TripRetrospectSummary(
long studyLogCount, // 학습 로그 개수
long totalFocusHours, // 총 집중 시간(시간 단위)
long studyDays // 학습한 일수(중복 날짜 제거)
long studyDays, // 학습한 일수(중복 날짜 제거)
List<Long> studyLogIds // 학습 로그 ID 목록
) {
public static TripRetrospectSummary of(
long studyLogCount, long totalFocusHours, long studyDays) {
return new TripRetrospectSummary(studyLogCount, totalFocusHours, studyDays);
long studyLogCount, long totalFocusHours, long studyDays, List<Long> studyLogIds) {
return new TripRetrospectSummary(studyLogCount, totalFocusHours, studyDays, studyLogIds);
}
}
3 changes: 2 additions & 1 deletion src/main/java/com/ject/studytrip/trip/application/facade/TripReportFacade.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,10 @@ public TripRetrospectDetail getTripRetrospect(Long memberId, Long tripId, int pa
0,
ChronoUnit.DAYS.between(trip.getStartDate(), trip.getEndDate()) + 1)
: 0L;
List<Long> studyLogIds = studyLogQueryService.getStudyLogIdsByTripId(trip.getId());

TripRetrospectSummary summary =
TripRetrospectSummary.of(studyLogCount, totalFocusHours, studyDays);
TripRetrospectSummary.of(studyLogCount, totalFocusHours, studyDays, studyLogIds);
TripInfo tripInfo = TripInfo.from(trip, 0, 100);
StudyLogSliceInfo studyLogDetailSlice = buildStudyLogDetailsSlice(studyLogSlice);

Expand Down
3 changes: 3 additions & 0 deletions ...a/com/ject/studytrip/trip/presentation/dto/response/LoadTripRetrospectDetailResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import com.ject.studytrip.trip.application.dto.TripInfo;
import com.ject.studytrip.trip.application.dto.TripRetrospectSummary;
import io.swagger.v3.oas.annotations.media.Schema;
import java.util.List;

public record LoadTripRetrospectDetailResponse(
@Schema(description = "여행 이름") String name,
Expand All @@ -13,6 +14,7 @@ public record LoadTripRetrospectDetailResponse(
@Schema(description = "총 학습 시간") long totalFocusHours,
@Schema(description = "학습 로그 개수 (세션 성공)") long studyLogCount,
@Schema(description = "연속 학습일") long studyDays,
@Schema(description = "학습 로그 ID 목록") List<Long> studyLogIds,
@Schema(description = "학습 로그 히스토리") LoadStudyLogsSliceResponse history) {
public static LoadTripRetrospectDetailResponse of(
TripRetrospectSummary tripRetrospectSummary,
Expand All @@ -25,6 +27,7 @@ public static LoadTripRetrospectDetailResponse of(
tripRetrospectSummary.totalFocusHours(),
tripRetrospectSummary.studyLogCount(),
tripRetrospectSummary.studyDays(),
tripRetrospectSummary.studyLogIds(),
LoadStudyLogsSliceResponse.of(
studyLogDetailSlice.studyLogDetails(), studyLogDetailSlice.hasNext()));
}
Expand Down
41 changes: 41 additions & 0 deletions src/test/java/com/ject/studytrip/studylog/application/service/StudyLogQueryServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,4 +278,45 @@ void shouldReturnStudyLogsByTripReportIdWithSlice() {
assertThat(result.getContent().get(1)).isEqualTo(studyLog2);
}
}

@Nested
@DisplayName("getStudyLogIdsByTripId 메서드는")
class GetStudyLogIdsByTripId {

@Test
@DisplayName("학습 로그가 존재하지 않으면 빈 리스트를 반환한다.")
void shouldReturnEmptyListWhenStudyLogDoesNotExist() {
// given
Long tripId = courseTrip.getId();
studyLog1.updateDeletedAt();
studyLog2.updateDeletedAt();
given(studyLogQueryRepository.findAllIdsByTripIdOrderByCreatedDesc(tripId))
.willReturn(List.of());

// when
List<Long> result = studyLogQueryService.getStudyLogIdsByTripId(tripId);

// then
assertThat(result).isEmpty();
}

@Test
@DisplayName("학습 로그가 하나라도 존재하면 학습 로그 ID 목록을 반환한다.")
void shouldReturnStudyLogIdsWhenStudyLogExists() {
// given
Long tripId = courseTrip.getId();
Long studyLogId1 = studyLog1.getId();
Long studyLogId2 = studyLog2.getId();
given(studyLogQueryRepository.findAllIdsByTripIdOrderByCreatedDesc(tripId))
.willReturn(List.of(studyLogId1, studyLogId2));

// when
List<Long> result = studyLogQueryService.getStudyLogIdsByTripId(tripId);

// then
assertThat(result).hasSize(2);
assertThat(result.get(0)).isEqualTo(studyLogId1);
assertThat(result.get(1)).isEqualTo(studyLogId2);
}
}
}
1 change: 1 addition & 0 deletions .../com/ject/studytrip/trip/presentation/controller/TripReportControllerIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,7 @@ void shouldReturnTripRetrospectWhenTripIdIsValid() throws Exception {
.andExpect(jsonPath("$.data.name").isString())
.andExpect(jsonPath("$.data.totalFocusHours").isNumber())
.andExpect(jsonPath("$.data.studyLogCount").isNumber())
.andExpect(jsonPath("$.data.studyLogIds").isArray())
.andExpect(jsonPath("$.data.studyDays").isNumber())
.andExpect(jsonPath("$.data.history").isNotEmpty());
}
Expand Down