diff --git a/src/main/java/com/haejwo/tripcometrue/domain/city/service/CityContentReadService.java b/src/main/java/com/haejwo/tripcometrue/domain/city/service/CityContentReadService.java index 10e6cacc..8b698139 100644 --- a/src/main/java/com/haejwo/tripcometrue/domain/city/service/CityContentReadService.java +++ b/src/main/java/com/haejwo/tripcometrue/domain/city/service/CityContentReadService.java @@ -88,7 +88,14 @@ public List getPlacesWithLatLong(Long cityId) { return places .stream() .map(place -> { - String imageUrl = imageMap.get(place.getId()).get(0).imageUrl(); + String imageUrl = Objects.isNull(imageMap.get(place.getId())) ? null : + imageMap.get(place.getId()) + .stream() + .filter(Objects::nonNull) + .findFirst() + .map(TripRecordScheduleImageWithPlaceIdQueryDto::imageUrl) + .orElse(null); + return CityPlaceWithLatLongResponseDto.fromEntity(place, imageUrl); }) .toList();