diff --git a/src/main/java/com/haejwo/tripcometrue/domain/triprecord/dto/request/TripRecordScheduleRequestDto.java b/src/main/java/com/haejwo/tripcometrue/domain/triprecord/dto/request/TripRecordScheduleRequestDto.java index 1fac852e..838bb7e7 100644 --- a/src/main/java/com/haejwo/tripcometrue/domain/triprecord/dto/request/TripRecordScheduleRequestDto.java +++ b/src/main/java/com/haejwo/tripcometrue/domain/triprecord/dto/request/TripRecordScheduleRequestDto.java @@ -1,6 +1,7 @@ package com.haejwo.tripcometrue.domain.triprecord.dto.request; import com.haejwo.tripcometrue.domain.member.entity.Member; +import com.haejwo.tripcometrue.domain.place.entity.Place; import com.haejwo.tripcometrue.domain.triprecord.entity.TripRecord; import com.haejwo.tripcometrue.domain.triprecord.entity.TripRecordSchedule; import com.haejwo.tripcometrue.domain.triprecord.entity.type.ExternalLinkTagType; @@ -22,12 +23,12 @@ public record TripRecordScheduleRequestDto( String tagUrl ) { - public TripRecordSchedule toEntity(TripRecord tripRecord, Member member) { + public TripRecordSchedule toEntity(TripRecord tripRecord, Member member, Place place) { return TripRecordSchedule.builder() .dayNumber(this.dayNumber) .ordering(this.orderNumber) .content(this.content) - .placeId(this.placeId) + .place(place) .tripRecord(tripRecord) .tagType(this.tagType) .tagUrl(this.tagUrl) diff --git a/src/main/java/com/haejwo/tripcometrue/domain/triprecord/dto/response/triprecord_schedule/TripRecordScheduleDetailResponseDto.java b/src/main/java/com/haejwo/tripcometrue/domain/triprecord/dto/response/triprecord_schedule/TripRecordScheduleDetailResponseDto.java index 877c3bcc..11310627 100644 --- a/src/main/java/com/haejwo/tripcometrue/domain/triprecord/dto/response/triprecord_schedule/TripRecordScheduleDetailResponseDto.java +++ b/src/main/java/com/haejwo/tripcometrue/domain/triprecord/dto/response/triprecord_schedule/TripRecordScheduleDetailResponseDto.java @@ -51,7 +51,7 @@ public static TripRecordScheduleDetailResponseDto fromEntity(TripRecordSchedule .dayNumber(entity.getDayNumber()) .ordering(entity.getOrdering()) .content(entity.getContent()) - .placeId(entity.getPlaceId()) + .placeId(entity.getPlace().getId()) .tripRecordId(entity.getTripRecord() != null ? entity.getTripRecord().getId() : null) .images(imageDtos) .videos(videoDtos) diff --git a/src/main/java/com/haejwo/tripcometrue/domain/triprecord/repository/TripRecordCustomRepositoryImpl.java b/src/main/java/com/haejwo/tripcometrue/domain/triprecord/repository/TripRecordCustomRepositoryImpl.java index 18f7be5e..5362c7b3 100644 --- a/src/main/java/com/haejwo/tripcometrue/domain/triprecord/repository/TripRecordCustomRepositoryImpl.java +++ b/src/main/java/com/haejwo/tripcometrue/domain/triprecord/repository/TripRecordCustomRepositoryImpl.java @@ -35,7 +35,7 @@ public List finTripRecordWithFilter( } // placeId if(request.placeId() != null) { - booleanBuilder.and(qTripRecordSchedule.placeId.eq(request.placeId())); + booleanBuilder.and(qTripRecordSchedule.place.id.eq(request.placeId())); } // expenseRangeType diff --git a/src/main/java/com/haejwo/tripcometrue/domain/triprecord/service/TripRecordEditService.java b/src/main/java/com/haejwo/tripcometrue/domain/triprecord/service/TripRecordEditService.java index af69d691..8ecd903b 100644 --- a/src/main/java/com/haejwo/tripcometrue/domain/triprecord/service/TripRecordEditService.java +++ b/src/main/java/com/haejwo/tripcometrue/domain/triprecord/service/TripRecordEditService.java @@ -2,6 +2,8 @@ import com.haejwo.tripcometrue.domain.city.repository.CityRepository; import com.haejwo.tripcometrue.domain.member.entity.Member; +import com.haejwo.tripcometrue.domain.place.entity.Place; +import com.haejwo.tripcometrue.domain.place.exception.PlaceNotFoundException; import com.haejwo.tripcometrue.domain.place.repositroy.PlaceRepository; import com.haejwo.tripcometrue.domain.triprecord.dto.request.CreateSchedulePlaceRequestDto; import com.haejwo.tripcometrue.domain.triprecord.dto.request.TripRecordRequestDto; @@ -70,8 +72,11 @@ private void saveHashTags(TripRecordRequestDto requestDto, TripRecord requestTri private void saveTripRecordSchedules(TripRecordRequestDto requestDto, TripRecord requestTripRecord, Member member) { requestDto.tripRecordSchedules().forEach(tripRecordScheduleRequestDto -> { + Place place = placeRepository.findById(tripRecordScheduleRequestDto.placeId()) + .orElseThrow(PlaceNotFoundException::new); + TripRecordSchedule tripRecordSchedule = tripRecordScheduleRequestDto.toEntity( - requestTripRecord, member); + requestTripRecord, member, place); tripRecordScheduleRepository.save(tripRecordSchedule); saveTripRecordScheduleImages(tripRecordScheduleRequestDto, tripRecordSchedule);