diff --git a/src/main/java/com/haejwo/tripcometrue/domain/triprecord/controller/TripRecordController.java b/src/main/java/com/haejwo/tripcometrue/domain/triprecord/controller/TripRecordController.java index 83e61f33..950f68ef 100644 --- a/src/main/java/com/haejwo/tripcometrue/domain/triprecord/controller/TripRecordController.java +++ b/src/main/java/com/haejwo/tripcometrue/domain/triprecord/controller/TripRecordController.java @@ -1,9 +1,9 @@ package com.haejwo.tripcometrue.domain.triprecord.controller; import com.haejwo.tripcometrue.domain.triprecord.dto.request.ModelAttribute.TripRecordListRequestAttribute; -import com.haejwo.tripcometrue.domain.triprecord.dto.response.TripRecordListResponseDto; import com.haejwo.tripcometrue.domain.triprecord.dto.response.triprecord.TopTripRecordResponseDto; import com.haejwo.tripcometrue.domain.triprecord.dto.response.triprecord.TripRecordDetailResponseDto; +import com.haejwo.tripcometrue.domain.triprecord.dto.response.triprecord.TripRecordListResponseDto; import com.haejwo.tripcometrue.domain.triprecord.service.TripRecordService; import com.haejwo.tripcometrue.global.springsecurity.PrincipalDetails; import com.haejwo.tripcometrue.global.util.ResponseDTO; diff --git a/src/main/java/com/haejwo/tripcometrue/domain/triprecord/repository/triprecord/TripRecordCustomRepository.java b/src/main/java/com/haejwo/tripcometrue/domain/triprecord/repository/triprecord/TripRecordCustomRepository.java index 24376a5e..425b2fee 100644 --- a/src/main/java/com/haejwo/tripcometrue/domain/triprecord/repository/triprecord/TripRecordCustomRepository.java +++ b/src/main/java/com/haejwo/tripcometrue/domain/triprecord/repository/triprecord/TripRecordCustomRepository.java @@ -1,7 +1,7 @@ package com.haejwo.tripcometrue.domain.triprecord.repository.triprecord; import com.haejwo.tripcometrue.domain.triprecord.dto.request.ModelAttribute.TripRecordListRequestAttribute; -import com.haejwo.tripcometrue.domain.triprecord.dto.response.TripRecordListResponseDto; +import com.haejwo.tripcometrue.domain.triprecord.dto.response.triprecord.TripRecordListResponseDto; import com.haejwo.tripcometrue.domain.triprecord.entity.TripRecord; import java.util.List; import org.springframework.data.domain.Pageable; diff --git a/src/main/java/com/haejwo/tripcometrue/domain/triprecord/repository/triprecord/TripRecordCustomRepositoryImpl.java b/src/main/java/com/haejwo/tripcometrue/domain/triprecord/repository/triprecord/TripRecordCustomRepositoryImpl.java index 819b4a56..86aa7542 100644 --- a/src/main/java/com/haejwo/tripcometrue/domain/triprecord/repository/triprecord/TripRecordCustomRepositoryImpl.java +++ b/src/main/java/com/haejwo/tripcometrue/domain/triprecord/repository/triprecord/TripRecordCustomRepositoryImpl.java @@ -2,8 +2,8 @@ import com.haejwo.tripcometrue.domain.member.entity.QMember; import com.haejwo.tripcometrue.domain.triprecord.dto.request.ModelAttribute.TripRecordListRequestAttribute; -import com.haejwo.tripcometrue.domain.triprecord.dto.response.TripRecordListResponseDto; import com.haejwo.tripcometrue.domain.triprecord.dto.response.member.TripRecordMemberResponseDto; +import com.haejwo.tripcometrue.domain.triprecord.dto.response.triprecord.TripRecordListResponseDto; import com.haejwo.tripcometrue.domain.triprecord.entity.QTripRecord; import com.haejwo.tripcometrue.domain.triprecord.entity.QTripRecordImage; import com.haejwo.tripcometrue.domain.triprecord.entity.QTripRecordSchedule; @@ -16,9 +16,8 @@ import com.querydsl.core.types.OrderSpecifier; import com.querydsl.core.types.Projections; import com.querydsl.jpa.JPAExpressions; -import java.util.List; - import com.querydsl.jpa.impl.JPAQueryFactory; +import java.util.List; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.support.QuerydslRepositorySupport; diff --git a/src/main/java/com/haejwo/tripcometrue/domain/triprecord/service/TripRecordService.java b/src/main/java/com/haejwo/tripcometrue/domain/triprecord/service/TripRecordService.java index 6985b85e..9b201df3 100644 --- a/src/main/java/com/haejwo/tripcometrue/domain/triprecord/service/TripRecordService.java +++ b/src/main/java/com/haejwo/tripcometrue/domain/triprecord/service/TripRecordService.java @@ -1,9 +1,7 @@ package com.haejwo.tripcometrue.domain.triprecord.service; -import com.haejwo.tripcometrue.domain.triprecord.dto.response.ModelAttribute.TripRecordListRequestAttribute; import com.haejwo.tripcometrue.domain.triprecord.dto.response.triprecord.TopTripRecordResponseDto; import com.haejwo.tripcometrue.domain.triprecord.dto.request.ModelAttribute.TripRecordListRequestAttribute; -import com.haejwo.tripcometrue.domain.triprecord.dto.response.TripRecordListResponseDto; import com.haejwo.tripcometrue.domain.triprecord.dto.response.triprecord.TripRecordDetailResponseDto; import com.haejwo.tripcometrue.domain.triprecord.dto.response.triprecord.TripRecordListResponseDto; import com.haejwo.tripcometrue.domain.triprecord.entity.TripRecord; @@ -47,7 +45,10 @@ public TripRecordDetailResponseDto findTripRecord(PrincipalDetails principalDeta if(memberId != findTripRecord.getMember().getId()) { findTripRecord.incrementViewCount(); } incrementViewCount(findTripRecord); - tripRecordViewHistoryService.addViewHistory(principalDetails, tripRecordId); + + if(principalDetails != null) { + tripRecordViewHistoryService.addViewHistory(principalDetails, tripRecordId); + } TripRecordDetailResponseDto responseDto = TripRecordDetailResponseDto.fromEntity(findTripRecord);