diff --git a/src/main/java/com/ject/studytrip/mission/application/service/MissionQueryService.java b/src/main/java/com/ject/studytrip/mission/application/service/MissionQueryService.java index bbbf1d5..d7c7bec 100644 --- a/src/main/java/com/ject/studytrip/mission/application/service/MissionQueryService.java +++ b/src/main/java/com/ject/studytrip/mission/application/service/MissionQueryService.java @@ -44,8 +44,4 @@ public List getValidMissionsWithStamp(List missionIds) { return missions; } - - public long countCompletedMissionsByTripId(Long tripId) { - return missionQueryRepository.countCompletedMissionsByTripId(tripId); - } } diff --git a/src/main/java/com/ject/studytrip/mission/domain/repository/MissionQueryRepository.java b/src/main/java/com/ject/studytrip/mission/domain/repository/MissionQueryRepository.java index e31e577..93da4aa 100644 --- a/src/main/java/com/ject/studytrip/mission/domain/repository/MissionQueryRepository.java +++ b/src/main/java/com/ject/studytrip/mission/domain/repository/MissionQueryRepository.java @@ -11,6 +11,4 @@ public interface MissionQueryRepository { long deleteAllByDeletedAtIsNotNull(); long deleteAllByDeletedStampOwner(); - - long countCompletedMissionsByTripId(Long tripId); } diff --git a/src/main/java/com/ject/studytrip/mission/infra/querydsl/MissionQueryRepositoryAdapter.java b/src/main/java/com/ject/studytrip/mission/infra/querydsl/MissionQueryRepositoryAdapter.java index 0371a89..ac51eec 100644 --- a/src/main/java/com/ject/studytrip/mission/infra/querydsl/MissionQueryRepositoryAdapter.java +++ b/src/main/java/com/ject/studytrip/mission/infra/querydsl/MissionQueryRepositoryAdapter.java @@ -4,7 +4,6 @@ import com.ject.studytrip.mission.domain.model.QMission; import com.ject.studytrip.mission.domain.repository.MissionQueryRepository; import com.ject.studytrip.stamp.domain.model.QStamp; -import com.ject.studytrip.trip.domain.model.QTrip; import com.querydsl.jpa.JPAExpressions; import com.querydsl.jpa.impl.JPAQueryFactory; import java.util.List; @@ -17,7 +16,6 @@ public class MissionQueryRepositoryAdapter implements MissionQueryRepository { private final JPAQueryFactory queryFactory; private final QMission mission = QMission.mission; private final QStamp stamp = QStamp.stamp; - private final QTrip trip = QTrip.trip; @Override public List findAllByIdsInFetchJoinStamp(List ids) { @@ -60,50 +58,4 @@ public long deleteAllByDeletedStampOwner() { .where(stamp.deletedAt.isNotNull()))) .execute(); } - - @Override - public long countCompletedMissionsByTripId(Long tripId) { - Long count = - queryFactory - .select(mission.id.count()) - .from(mission) - .join(mission.stamp, stamp) - .join(stamp.trip, trip) - .where( - trip.id.eq(tripId), - mission.completed.isTrue(), - mission.deletedAt.isNull(), - stamp.deletedAt.isNull(), - trip.deletedAt.isNull()) - .fetchOne(); - - return count != null ? count : 0L; - } - - // @Override - // public long countByStampIdAndDeletedAtIsNull(Long stampId) { - // Long count = - // queryFactory - // .select(mission.count()) - // .from(mission) - // .where(mission.stamp.id.eq(stampId), mission.deletedAt.isNull()) - // .fetchOne(); - // - // return Optional.ofNullable(count).orElse(0L); - // } - // - // @Override - // public long countByStampIdAndCompletedIsTrueAndDeletedAtIsNull(Long stampId) { - // Long count = - // queryFactory - // .select(mission.count()) - // .from(mission) - // .where( - // mission.stamp.id.eq(stampId), - // mission.completed.isTrue(), - // mission.deletedAt.isNull()) - // .fetchOne(); - // - // return Optional.ofNullable(count).orElse(0L); - // } } diff --git a/src/main/java/com/ject/studytrip/studylog/application/service/StudyLogQueryService.java b/src/main/java/com/ject/studytrip/studylog/application/service/StudyLogQueryService.java index 42fb7f7..58dcb14 100644 --- a/src/main/java/com/ject/studytrip/studylog/application/service/StudyLogQueryService.java +++ b/src/main/java/com/ject/studytrip/studylog/application/service/StudyLogQueryService.java @@ -48,6 +48,10 @@ public List getValidStudyLogs(List studyLogIds) { return studyLogs; } + public long getStudyLogCountByTripId(Long tripId) { + return studyLogQueryRepository.countStudyLogsByTripId(tripId); + } + public Slice getStudyLogsSliceByTripReportId(Long tripReportId, int page, int size) { return studyLogQueryRepository.findSliceByTripReportIdOrderByCreatedAtDesc( tripReportId, PageRequest.of(page, size)); diff --git a/src/main/java/com/ject/studytrip/studylog/domain/repository/StudyLogQueryRepository.java b/src/main/java/com/ject/studytrip/studylog/domain/repository/StudyLogQueryRepository.java index bfd47c2..c579c27 100644 --- a/src/main/java/com/ject/studytrip/studylog/domain/repository/StudyLogQueryRepository.java +++ b/src/main/java/com/ject/studytrip/studylog/domain/repository/StudyLogQueryRepository.java @@ -15,6 +15,8 @@ public interface StudyLogQueryRepository { long deleteAllByDeletedDailyGoalOwner(); + long countStudyLogsByTripId(Long tripId); + Slice findSliceByTripReportIdOrderByCreatedAtDesc( Long tripReportId, Pageable pageable); } diff --git a/src/main/java/com/ject/studytrip/studylog/infra/querydsl/StudyLogQueryRepositoryAdapter.java b/src/main/java/com/ject/studytrip/studylog/infra/querydsl/StudyLogQueryRepositoryAdapter.java index 5d465bc..b59eb07 100644 --- a/src/main/java/com/ject/studytrip/studylog/infra/querydsl/StudyLogQueryRepositoryAdapter.java +++ b/src/main/java/com/ject/studytrip/studylog/infra/querydsl/StudyLogQueryRepositoryAdapter.java @@ -87,6 +87,22 @@ public long deleteAllByDeletedDailyGoalOwner() { .execute(); } + @Override + public long countStudyLogsByTripId(Long tripId) { + Long count = + queryFactory + .select(studyLog.count()) + .from(studyLog) + .join(studyLog.dailyGoal, dailyGoal) + .where( + dailyGoal.trip.id.eq(tripId), + studyLog.deletedAt.isNull(), + dailyGoal.deletedAt.isNull()) + .fetchOne(); + + return count == null ? 0L : count; + } + @Override public Slice findSliceByTripReportIdOrderByCreatedAtDesc( Long tripReportId, Pageable pageable) { diff --git a/src/main/java/com/ject/studytrip/trip/application/dto/TripReportInfo.java b/src/main/java/com/ject/studytrip/trip/application/dto/TripReportInfo.java index acaa90e..cfdba43 100644 --- a/src/main/java/com/ject/studytrip/trip/application/dto/TripReportInfo.java +++ b/src/main/java/com/ject/studytrip/trip/application/dto/TripReportInfo.java @@ -9,7 +9,7 @@ public record TripReportInfo( String content, String startDate, String endDate, - long completedMissionCount, + long studyLogCount, long totalFocusHours, long studyDays, String imageTitle, @@ -24,7 +24,7 @@ public static TripReportInfo from(TripReport tripReport) { tripReport.getContent(), tripReport.getStartDate(), tripReport.getEndDate(), - tripReport.getCompletedMissionCount(), + tripReport.getStudyLogCount(), tripReport.getTotalFocusHours(), tripReport.getStudyDays(), tripReport.getImageTitle(), diff --git a/src/main/java/com/ject/studytrip/trip/application/dto/TripRetrospectSummary.java b/src/main/java/com/ject/studytrip/trip/application/dto/TripRetrospectSummary.java index 4376b0e..e5943e4 100644 --- a/src/main/java/com/ject/studytrip/trip/application/dto/TripRetrospectSummary.java +++ b/src/main/java/com/ject/studytrip/trip/application/dto/TripRetrospectSummary.java @@ -1,12 +1,12 @@ package com.ject.studytrip.trip.application.dto; public record TripRetrospectSummary( - long completedMissionCount, // 완료 미션 수 + long studyLogCount, // 학습 로그 개수 long totalFocusHours, // 총 집중 시간(시간 단위) long studyDays // 학습한 일수(중복 날짜 제거) ) { public static TripRetrospectSummary of( - long completedMissionCount, long totalFocusHours, long studyDays) { - return new TripRetrospectSummary(completedMissionCount, totalFocusHours, studyDays); + long studyLogCount, long totalFocusHours, long studyDays) { + return new TripRetrospectSummary(studyLogCount, totalFocusHours, studyDays); } } diff --git a/src/main/java/com/ject/studytrip/trip/application/facade/TripReportFacade.java b/src/main/java/com/ject/studytrip/trip/application/facade/TripReportFacade.java index 6d2b8da..ccb95f2 100644 --- a/src/main/java/com/ject/studytrip/trip/application/facade/TripReportFacade.java +++ b/src/main/java/com/ject/studytrip/trip/application/facade/TripReportFacade.java @@ -4,7 +4,6 @@ import com.ject.studytrip.image.application.service.ImageService; import com.ject.studytrip.member.application.service.MemberQueryService; import com.ject.studytrip.member.domain.model.Member; -import com.ject.studytrip.mission.application.service.MissionQueryService; import com.ject.studytrip.pomodoro.application.service.PomodoroQueryService; import com.ject.studytrip.studylog.application.dto.StudyLogDetail; import com.ject.studytrip.studylog.application.dto.StudyLogSliceInfo; @@ -37,7 +36,6 @@ public class TripReportFacade { private final MemberQueryService memberQueryService; private final TripQueryService tripQueryService; - private final MissionQueryService missionQueryService; private final StudyLogQueryService studyLogQueryService; private final StudyLogDailyMissionQueryService studyLogDailyMissionQueryService; private final PomodoroQueryService pomodoroQueryService; @@ -55,8 +53,7 @@ public TripRetrospectDetail getTripRetrospect(Long memberId, Long tripId, int pa Slice studyLogSlice = studyLogQueryService.getStudyLogsSliceByTripId(trip.getId(), page, size); - long completedMissionCount = - missionQueryService.countCompletedMissionsByTripId(trip.getId()); + long studyLogCount = studyLogQueryService.getStudyLogCountByTripId(trip.getId()); long totalFocusHours = pomodoroQueryService.getTotalFocusHoursByTripId(trip.getId()); long studyDays = trip.getEndDate() != null @@ -66,7 +63,7 @@ public TripRetrospectDetail getTripRetrospect(Long memberId, Long tripId, int pa : 0L; TripRetrospectSummary summary = - TripRetrospectSummary.of(completedMissionCount, totalFocusHours, studyDays); + TripRetrospectSummary.of(studyLogCount, totalFocusHours, studyDays); TripInfo tripInfo = TripInfo.from(trip, 0, 100); StudyLogSliceInfo studyLogDetailSlice = buildStudyLogDetailsSlice(studyLogSlice); diff --git a/src/main/java/com/ject/studytrip/trip/application/service/TripReportCommandService.java b/src/main/java/com/ject/studytrip/trip/application/service/TripReportCommandService.java index 973da01..0c4fc7b 100644 --- a/src/main/java/com/ject/studytrip/trip/application/service/TripReportCommandService.java +++ b/src/main/java/com/ject/studytrip/trip/application/service/TripReportCommandService.java @@ -23,7 +23,7 @@ public TripReport createTripReport(Member member, CreateTripReportRequest reques request.content(), request.startDate(), request.endDate(), - request.completedMissionCount(), + request.studyLogCount(), request.totalFocusHours(), request.studyDays(), request.imageTitle()); diff --git a/src/main/java/com/ject/studytrip/trip/domain/factory/TripReportFactory.java b/src/main/java/com/ject/studytrip/trip/domain/factory/TripReportFactory.java index ebe4940..b7e5c8b 100644 --- a/src/main/java/com/ject/studytrip/trip/domain/factory/TripReportFactory.java +++ b/src/main/java/com/ject/studytrip/trip/domain/factory/TripReportFactory.java @@ -13,7 +13,7 @@ public static TripReport create( String content, String startDate, String endDate, - long completedMissionCount, + long studyLogCount, long totalFocusHours, long studyDays, String imageTitle) { @@ -23,7 +23,7 @@ public static TripReport create( content, startDate, endDate, - completedMissionCount, + studyLogCount, totalFocusHours, studyDays, imageTitle); diff --git a/src/main/java/com/ject/studytrip/trip/domain/model/TripReport.java b/src/main/java/com/ject/studytrip/trip/domain/model/TripReport.java index 7724da7..b479e7e 100644 --- a/src/main/java/com/ject/studytrip/trip/domain/model/TripReport.java +++ b/src/main/java/com/ject/studytrip/trip/domain/model/TripReport.java @@ -29,7 +29,7 @@ public class TripReport extends BaseTimeEntity { private String endDate; @Column(nullable = false) - private long completedMissionCount; + private long studyLogCount; @Column(nullable = false) private long totalFocusHours; @@ -51,7 +51,7 @@ public static TripReport of( String content, String startDate, String endDate, - long completedMissionCount, + long studyLogCount, long totalFocusHours, long studyDays, String imageTitle) { @@ -60,7 +60,7 @@ public static TripReport of( .content(content) .startDate(startDate) .endDate(endDate) - .completedMissionCount(completedMissionCount) + .studyLogCount(studyLogCount) .totalFocusHours(totalFocusHours) .studyDays(studyDays) .imageTitle(imageTitle) diff --git a/src/main/java/com/ject/studytrip/trip/presentation/controller/TripReportController.java b/src/main/java/com/ject/studytrip/trip/presentation/controller/TripReportController.java index 69f97ca..63a14f6 100644 --- a/src/main/java/com/ject/studytrip/trip/presentation/controller/TripReportController.java +++ b/src/main/java/com/ject/studytrip/trip/presentation/controller/TripReportController.java @@ -119,6 +119,7 @@ public ResponseEntity presigned( @RequestBody @Valid PresignTripReportImageRequest request) { PresignedTripReportImageInfo info = tripReportFacade.issuePresignedUrl(tripReportId, request); + return ResponseEntity.ok() .body( StandardResponse.success( @@ -165,6 +166,7 @@ public ResponseEntity confirm( @PathVariable @NotNull(message = "여행 리포트 ID는 필수 요청 파라미터입니다.") Long tripReportId, @RequestBody @Valid ConfirmTripReportImageRequest request) { tripReportFacade.confirmImage(tripReportId, request); + return ResponseEntity.ok().body(StandardResponse.success(HttpStatus.OK.value(), null)); } } diff --git a/src/main/java/com/ject/studytrip/trip/presentation/dto/request/CreateTripReportRequest.java b/src/main/java/com/ject/studytrip/trip/presentation/dto/request/CreateTripReportRequest.java index b8fe3a5..412b078 100644 --- a/src/main/java/com/ject/studytrip/trip/presentation/dto/request/CreateTripReportRequest.java +++ b/src/main/java/com/ject/studytrip/trip/presentation/dto/request/CreateTripReportRequest.java @@ -12,8 +12,8 @@ public record CreateTripReportRequest( String content, @Schema(description = "여행 시작일") @NotEmpty(message = "여행 시작일은 필수 요청 값입니다.") String startDate, @Schema(description = "여행 종료일") String endDate, - @Schema(description = "완료된 미션 수 (세션 성공)") @NotNull(message = "완료된 미션 수는 필수 요청 값입니다.") - long completedMissionCount, + @Schema(description = "학습 로그 개수 (세션 성공)") @NotNull(message = "학습 로그 개수는 필수 요청 값입니다.") + long studyLogCount, @Schema(description = "총 학습 시간") @NotNull(message = "총 학습 시간은 필수 요청 값입니다.") long totalFocusHours, @Schema(description = "연속 학습일") @NotNull(message = "연속 학습일은 필수 요청 값입니다.") long studyDays, diff --git a/src/main/java/com/ject/studytrip/trip/presentation/dto/response/LoadTripReportDetailResponse.java b/src/main/java/com/ject/studytrip/trip/presentation/dto/response/LoadTripReportDetailResponse.java index 0de73a7..3dff5d4 100644 --- a/src/main/java/com/ject/studytrip/trip/presentation/dto/response/LoadTripReportDetailResponse.java +++ b/src/main/java/com/ject/studytrip/trip/presentation/dto/response/LoadTripReportDetailResponse.java @@ -12,7 +12,7 @@ public record LoadTripReportDetailResponse( @Schema(description = "여행 시작일 (여행 회고)") String startDate, @Schema(description = "여행 종료일 (여행 회고)") String endDate, @Schema(description = "총 학습 시간") long totalFocusHours, - @Schema(description = "완료된 미션 수 (세션 성공)") long completedMissionCount, + @Schema(description = "학습 로그 개수 (세션 성공)") long studyLogCount, @Schema(description = "연속 학습일") long studyDays, @Schema(description = "여행 리포트 이미지 제목") String imageTitle, @Schema(description = "여행 리포트 이미지 URL") String imageUrl, @@ -26,7 +26,7 @@ public static LoadTripReportDetailResponse of( tripReportInfo.startDate(), tripReportInfo.endDate(), tripReportInfo.totalFocusHours(), - tripReportInfo.completedMissionCount(), + tripReportInfo.studyLogCount(), tripReportInfo.studyDays(), tripReportInfo.imageTitle(), tripReportInfo.imageUrl(), diff --git a/src/main/java/com/ject/studytrip/trip/presentation/dto/response/LoadTripRetrospectDetailResponse.java b/src/main/java/com/ject/studytrip/trip/presentation/dto/response/LoadTripRetrospectDetailResponse.java index 124ce6e..2a4bc4d 100644 --- a/src/main/java/com/ject/studytrip/trip/presentation/dto/response/LoadTripRetrospectDetailResponse.java +++ b/src/main/java/com/ject/studytrip/trip/presentation/dto/response/LoadTripRetrospectDetailResponse.java @@ -11,7 +11,7 @@ public record LoadTripRetrospectDetailResponse( @Schema(description = "여행 시작일") String startDate, @Schema(description = "여행 종료일") String endDate, @Schema(description = "총 학습 시간") long totalFocusHours, - @Schema(description = "완료된 미션 수 (세션 성공)") long completedMissionCount, + @Schema(description = "학습 로그 개수 (세션 성공)") long studyLogCount, @Schema(description = "연속 학습일") long studyDays, @Schema(description = "학습 로그 히스토리") LoadStudyLogsSliceResponse history) { public static LoadTripRetrospectDetailResponse of( @@ -23,7 +23,7 @@ public static LoadTripRetrospectDetailResponse of( tripInfo.startDate(), tripInfo.endDate(), tripRetrospectSummary.totalFocusHours(), - tripRetrospectSummary.completedMissionCount(), + tripRetrospectSummary.studyLogCount(), tripRetrospectSummary.studyDays(), LoadStudyLogsSliceResponse.of( studyLogDetailSlice.studyLogDetails(), studyLogDetailSlice.hasNext())); diff --git a/src/main/resources/db/migration/V7__rename_completed_mission_count_to_study_log_count.sql b/src/main/resources/db/migration/V7__rename_completed_mission_count_to_study_log_count.sql new file mode 100644 index 0000000..872d105 --- /dev/null +++ b/src/main/resources/db/migration/V7__rename_completed_mission_count_to_study_log_count.sql @@ -0,0 +1,2 @@ +ALTER TABLE trip_report + CHANGE COLUMN completed_mission_count study_log_count BIGINT NOT NULL; diff --git a/src/test/java/com/ject/studytrip/mission/application/service/MissionQueryServiceTest.java b/src/test/java/com/ject/studytrip/mission/application/service/MissionQueryServiceTest.java index cd50464..d8b036c 100644 --- a/src/test/java/com/ject/studytrip/mission/application/service/MissionQueryServiceTest.java +++ b/src/test/java/com/ject/studytrip/mission/application/service/MissionQueryServiceTest.java @@ -34,7 +34,6 @@ class MissionQueryServiceTest extends BaseUnitTest { @Mock private MissionRepository missionRepository; @Mock private MissionQueryRepository missionQueryRepository; - private Trip exploreTrip; private Stamp courseStamp; private Stamp exploreStamp; private Mission courseMission; @@ -45,7 +44,7 @@ class MissionQueryServiceTest extends BaseUnitTest { void setUp() { Member member = MemberFixture.createMemberFromKakao(); Trip courseTrip = TripFixture.createTripWithId(1L, member, TripCategory.COURSE); - exploreTrip = TripFixture.createTripWithId(2L, member, TripCategory.EXPLORE); + Trip exploreTrip = TripFixture.createTripWithId(2L, member, TripCategory.EXPLORE); courseStamp = StampFixture.createStampWithId(1L, courseTrip, 1); exploreStamp = StampFixture.createStampWithId(2L, exploreTrip, 0); courseMission = MissionFixture.createMissionWithId(1L, courseStamp); @@ -198,40 +197,4 @@ void shouldReturnValidMissions() { assertThat(result).containsExactly(courseMission); } } - - @Nested - @DisplayName("countCompletedMissionsByTripId 메서드는") - class CountCompletedMissionsByTripId { - - @Test - @DisplayName("유효하지 않은 여행 ID가 들어오면 0을 반환한다.") - void shouldReturnZeroWhenTripIdIsInvalid() { - // given - Long invalidTripId = -1L; - given(missionQueryRepository.countCompletedMissionsByTripId(invalidTripId)) - .willReturn(0L); - - // when - long result = missionQueryService.countCompletedMissionsByTripId(invalidTripId); - - // then - assertThat(result).isEqualTo(0L); - } - - @Test - @DisplayName("유효한 여행 ID가 들어오면 완료된 미션들의 개수를 반환한다.") - void shouldReturnCompletedMissionCountWhenTripIdIsValid() { - // given - Long tripId = exploreTrip.getId(); - exploreMission1.updateCompleted(); - exploreMission2.updateCompleted(); - given(missionQueryRepository.countCompletedMissionsByTripId(tripId)).willReturn(2L); - - // when - long result = missionQueryService.countCompletedMissionsByTripId(tripId); - - // then - assertThat(result).isEqualTo(2L); - } - } } diff --git a/src/test/java/com/ject/studytrip/studylog/application/service/StudyLogQueryServiceTest.java b/src/test/java/com/ject/studytrip/studylog/application/service/StudyLogQueryServiceTest.java index 001bc16..6a942d8 100644 --- a/src/test/java/com/ject/studytrip/studylog/application/service/StudyLogQueryServiceTest.java +++ b/src/test/java/com/ject/studytrip/studylog/application/service/StudyLogQueryServiceTest.java @@ -167,6 +167,56 @@ void shouldReturnStudyLogWhenIdIsValid() { } } + @Nested + @DisplayName("getStudyLogCountByTripId 메서드는") + class GetStudyLogCountByTripId { + + @Test + @DisplayName("해당 여행의 학습 로그가 존재하지 않으면 0을 반환한다.") + void shouldReturnZeroWhenStudyLogDoesNotExistForTrip() { + // given + Long tripId = courseTrip.getId(); + studyLog1.updateDeletedAt(); + studyLog2.updateDeletedAt(); + given(studyLogQueryRepository.countStudyLogsByTripId(tripId)).willReturn(0L); + + // when + long result = studyLogQueryService.getStudyLogCountByTripId(tripId); + + // then + assertThat(result).isZero(); + } + + @Test + @DisplayName("해당 여행의 데일리 목표가 존재하지 않으면 0을 반환한다.") + void shouldReturnZeroWhenDailyGoalDoesNotExistForTrip() { + // given + Long tripId = courseTrip.getId(); + dailyGoal.updateDeletedAt(); + given(studyLogQueryRepository.countStudyLogsByTripId(tripId)).willReturn(0L); + + // when + long result = studyLogQueryService.getStudyLogCountByTripId(tripId); + + // then + assertThat(result).isZero(); + } + + @Test + @DisplayName("해당 여행의 학습 로그가 존재하면 그 개수를 반환한다.") + void shouldReturnCountWhenStudyLogExistsForTrip() { + // given + Long tripId = courseTrip.getId(); + given(studyLogQueryRepository.countStudyLogsByTripId(tripId)).willReturn(2L); + + // when + long result = studyLogQueryService.getStudyLogCountByTripId(tripId); + + // then + assertThat(result).isEqualTo(2L); + } + } + @Nested @DisplayName("getStudyLogsSliceByTripId 메서드는") class GetStudyLogsSliceByTripReportId { diff --git a/src/test/java/com/ject/studytrip/trip/fixture/CreateTripReportRequestFixture.java b/src/test/java/com/ject/studytrip/trip/fixture/CreateTripReportRequestFixture.java index f3a13f7..35d01d1 100644 --- a/src/test/java/com/ject/studytrip/trip/fixture/CreateTripReportRequestFixture.java +++ b/src/test/java/com/ject/studytrip/trip/fixture/CreateTripReportRequestFixture.java @@ -8,7 +8,7 @@ public class CreateTripReportRequestFixture { private static final String TRIP_REPORT_CONTENT = "TEST CONTENT"; private static final String TRIP_START_DATE = "2018.01.01"; private static final String TRIP_END_DATE = "2018.01.31"; - private static final long TRIP_REPORT_COMPLETED_MISSION_COUNT = 10L; + private static final long STUDY_LOG_COUNT = 10L; private static final long TRIP_REPORT_TOTAL_FOCUS_HOURS = 100L; private static final long TRIP_REPORT_STUDY_DAYS = 10L; private static final String TRIP_REPORT_IMAGE_TITLE = "TEST IMAGE TITLE"; @@ -26,7 +26,7 @@ public CreateTripReportRequest build() { TRIP_REPORT_CONTENT, TRIP_START_DATE, TRIP_END_DATE, - TRIP_REPORT_COMPLETED_MISSION_COUNT, + STUDY_LOG_COUNT, TRIP_REPORT_TOTAL_FOCUS_HOURS, TRIP_REPORT_STUDY_DAYS, TRIP_REPORT_IMAGE_TITLE, diff --git a/src/test/java/com/ject/studytrip/trip/fixture/TripReportFixture.java b/src/test/java/com/ject/studytrip/trip/fixture/TripReportFixture.java index d10573f..e436a12 100644 --- a/src/test/java/com/ject/studytrip/trip/fixture/TripReportFixture.java +++ b/src/test/java/com/ject/studytrip/trip/fixture/TripReportFixture.java @@ -10,7 +10,7 @@ public class TripReportFixture { private static final String TRIP_REPORT_CONTENT = "TEST CONTENT"; private static final String TRIP_START_DATE = "2018.01.01"; private static final String TRIP_END_DATE = "2018.01.31"; - private static final long TRIP_REPORT_COMPLETED_MISSION_COUNT = 10L; + private static final long STUDY_LOG_COUNT = 10L; private static final long TRIP_REPORT_TOTAL_FOCUS_HOURS = 100L; private static final long TRIP_REPORT_STUDY_DAYS = 10L; private static final String TRIP_REPORT_IMAGE_TITLE = "TEST IMAGE TITLE"; @@ -22,7 +22,7 @@ public static TripReport createTripReport(Member member) { TRIP_REPORT_CONTENT, TRIP_START_DATE, TRIP_END_DATE, - TRIP_REPORT_COMPLETED_MISSION_COUNT, + STUDY_LOG_COUNT, TRIP_REPORT_TOTAL_FOCUS_HOURS, TRIP_REPORT_STUDY_DAYS, TRIP_REPORT_IMAGE_TITLE); @@ -36,7 +36,7 @@ public static TripReport createTripReportWithId(Long id, Member member) { TRIP_REPORT_CONTENT, TRIP_START_DATE, TRIP_END_DATE, - TRIP_REPORT_COMPLETED_MISSION_COUNT, + STUDY_LOG_COUNT, TRIP_REPORT_TOTAL_FOCUS_HOURS, TRIP_REPORT_STUDY_DAYS, TRIP_REPORT_IMAGE_TITLE); diff --git a/src/test/java/com/ject/studytrip/trip/presentation/controller/TripReportControllerIntegrationTest.java b/src/test/java/com/ject/studytrip/trip/presentation/controller/TripReportControllerIntegrationTest.java index a29f8bd..6cdb77e 100644 --- a/src/test/java/com/ject/studytrip/trip/presentation/controller/TripReportControllerIntegrationTest.java +++ b/src/test/java/com/ject/studytrip/trip/presentation/controller/TripReportControllerIntegrationTest.java @@ -302,7 +302,7 @@ void shouldReturnTripRetrospectWhenTripIdIsValid() throws Exception { .andExpect(jsonPath("$.data").isNotEmpty()) .andExpect(jsonPath("$.data.name").isString()) .andExpect(jsonPath("$.data.totalFocusHours").isNumber()) - .andExpect(jsonPath("$.data.completedMissionCount").isNumber()) + .andExpect(jsonPath("$.data.studyLogCount").isNumber()) .andExpect(jsonPath("$.data.studyDays").isNumber()) .andExpect(jsonPath("$.data.history").isNotEmpty()); } @@ -521,8 +521,7 @@ void shouldReturnTripReportWhenTripReportIdIsValid() throws Exception { jsonPath("$.data.totalFocusHours") .value(tripReport.getTotalFocusHours())) .andExpect( - jsonPath("$.data.completedMissionCount") - .value(tripReport.getCompletedMissionCount())) + jsonPath("$.data.studyLogCount").value(tripReport.getStudyLogCount())) .andExpect(jsonPath("$.data.studyDays").value(tripReport.getStudyDays())) .andExpect(jsonPath("$.data.imageTitle").value(tripReport.getImageTitle())) .andExpect(jsonPath("$.data.imageUrl").value(tripReport.getImageUrl()))