Feat/search place by tag1

src/main/java/org/prography/kagongsillok/common/utils/CustomListUtils.java

@@ -35,6 +35,9 @@ public static <T> boolean isEmpty(final List<T> list) {
     }
 
     public static <T> String joiningToString(final List<T> list, final String delimiter) {
+        if (list.size() < 1) {
+            return null;
+        }
         return list.stream()
                 .map(Object::toString)
                 .collect(Collectors.joining(delimiter));

src/main/java/org/prography/kagongsillok/image/application/exception/NotFoundImageException.java

@@ -0,0 +1,13 @@
+package org.prography.kagongsillok.image.application.exception;
+
+import java.util.List;
+import org.prography.kagongsillok.common.exception.NotFoundException;
+import org.prography.kagongsillok.common.utils.CustomListUtils;
+
+public final class NotFoundImageException extends NotFoundException {
+
+    public NotFoundImageException(final List<Long> imageIds) {
+        super(String.format("존재하지 않는 이미지 id가 포함되어 있습니다. imageIds = %s",
+                CustomListUtils.joiningToString(imageIds, ",")));
+    }
+}

src/main/java/org/prography/kagongsillok/image/infrastructure/ImageRepositoryCustom.java

@@ -8,4 +8,6 @@ public interface ImageRepositoryCustom {
 
     Map<Long, Image> findByIdInToMap(List<Long> imageIds);
 
+    boolean isExistIdIn(final List<Long> imageIds);
+
 }

src/main/java/org/prography/kagongsillok/image/infrastructure/ImageRepositoryImpl.java

@@ -34,6 +34,24 @@ public Map<Long, Image> findByIdInToMap(final List<Long> imageIds) {
                 .collect(Collectors.toMap(Image::getId, Function.identity()));
     }
 
+    @Override
+    public boolean isExistIdIn(final List<Long> imageIds) {
+        List<Long> existImageIds = queryFactory
+                .selectFrom(image)
+                .where(
+                        isNotDeleted()
+                )
+                .fetch()
+                .stream()
+                .map(i -> i.getId())
+                .collect(Collectors.toList());
+
+        return imageIds.stream()
+                .map(imageId -> existImageIds.contains(imageId))
+                .collect(Collectors.toList())
+                .contains(Boolean.FALSE);
+    }
+
     private BooleanExpression idIn(final List<Long> ids) {
         return image.id.in(ids);
     }

src/main/java/org/prography/kagongsillok/member/infrastructure/MemberRepositoryImpl.java

@@ -6,6 +6,7 @@
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
 import org.prography.kagongsillok.member.domain.Member;
@@ -19,17 +20,14 @@ public class MemberRepositoryImpl implements MemberRepositoryCustom {
 
     @Override
     public Map<Long, Member> findByIdIn(final List<Long> memberIds) {
-        final List<Member> members = queryFactory
+        return queryFactory
                 .selectFrom(member)
                 .where(
                         idIn(memberIds),
                         isNotDeleted()
                 )
-                .fetch();
-
-        return members
                 .stream()
-                .collect(Collectors.toMap(Member::getId, m -> m));
+                .collect(Collectors.toMap(Member::getId, Function.identity()));
     }
 
     private BooleanExpression idIn(final List<Long> ids) {

src/main/java/org/prography/kagongsillok/place/application/PlaceService.java

@@ -1,8 +1,11 @@
 package org.prography.kagongsillok.place.application;
 
 import java.util.List;
+import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
-import org.prography.kagongsillok.common.utils.CustomListUtils;
+import org.prography.kagongsillok.image.application.exception.NotFoundImageException;
+import org.prography.kagongsillok.image.domain.Image;
+import org.prography.kagongsillok.image.domain.ImageRepository;
 import org.prography.kagongsillok.place.application.dto.PlaceCreateCommand;
 import org.prography.kagongsillok.place.application.dto.PlaceDto;
 import org.prography.kagongsillok.place.application.dto.PlaceLocationAroundSearchCondition;
@@ -11,6 +14,9 @@
 import org.prography.kagongsillok.place.domain.Location;
 import org.prography.kagongsillok.place.domain.Place;
 import org.prography.kagongsillok.place.domain.PlaceRepository;
+import org.prography.kagongsillok.review.domain.Review;
+import org.prography.kagongsillok.review.domain.ReviewRepository;
+import org.prography.kagongsillok.review.domain.ReviewTag;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -20,12 +26,15 @@
 public class PlaceService {
 
     private final PlaceRepository placeRepository;
+    private final ReviewRepository reviewRepository;
+    private final ImageRepository imageRepository;
 
     @Transactional
     public PlaceDto createPlace(final PlaceCreateCommand placeCreateCommand) {
+        checkExistImage(placeCreateCommand.getImageIds());
         final Place savedPlace = placeRepository.save(placeCreateCommand.toEntity());
 
-        return PlaceDto.from(savedPlace);
+        return PlaceDto.of(savedPlace, getImages(savedPlace));
     }
 
     public PlaceDto getPlace(final Long id) {
@@ -35,7 +44,18 @@ public PlaceDto getPlace(final Long id) {
             throw new NotFoundPlaceException(id);
         }
 
-        return PlaceDto.from(place);
+        return PlaceDto.of(place, getImages(place));
+    }
+
+    public PlaceDto getPlaceWithTags(final Long placeId) {
+        final Place place = placeRepository.findById(placeId)
+                .orElseThrow(() -> new NotFoundPlaceException(placeId));
+        if (place.getIsDeleted()) {
+            throw new NotFoundPlaceException(placeId);
+        }
+        final List<Review> reviews = reviewRepository.findAllByPlaceId(placeId);
+
+        return PlaceDto.of(place, getImages(place), getReviewTagsRelatedToPlace(reviews));
     }
 
     public List<PlaceDto> searchPlacesLocationAround(final PlaceLocationAroundSearchCondition searchCondition) {
@@ -45,24 +65,26 @@ public List<PlaceDto> searchPlacesLocationAround(final PlaceLocationAroundSearch
                 searchCondition.getLongitudeBound()
         );
 
-        return CustomListUtils.mapTo(places, PlaceDto::from);
+        return getPlaceDtos(places);
     }
 
     public List<PlaceDto> searchPlacesByName(final String name) {
         final List<Place> places = placeRepository.findByNameContains(name);
 
-        return CustomListUtils.mapTo(places, PlaceDto::from);
+        return getPlaceDtos(places);
     }
 
     @Transactional
     public PlaceDto updatePlace(final Long id, final PlaceUpdateCommand updateCommand) {
         final Place place = placeRepository.findById(id)
                 .orElseThrow(() -> new NotFoundPlaceException(id));
 
+        checkExistImage(updateCommand.getImageIds());
+
         final Place target = updateCommand.toEntity();
         place.update(target);
 
-        return PlaceDto.from(place);
+        return PlaceDto.of(place, getImages(place));
     }
 
     @Transactional
@@ -72,4 +94,56 @@ public void deletePlace(final Long id) {
 
         place.delete();
     }
+
+    public List<PlaceDto> searchPlacesByTags(final List<Long> reviewTagIds) {
+        final List<Review> reviews = reviewRepository.findByReviewTagIds(reviewTagIds);
+        final List<Long> placeIds = reviews.stream()
+                .map(review -> review.getPlaceId())
+                .collect(Collectors.toSet())
+                .stream()
+                .toList();
+
+        final List<Place> places = placeRepository.findByIdIn(placeIds);
+
+        return createPlaceDtos(places, reviews);
+    }
+    private List<PlaceDto> getPlaceDtos(final List<Place> places) {
+        final List<Long> placeIds = places.stream()
+                .map(place -> place.getId())
+                .collect(Collectors.toList());
+        final List<Review> reviews = reviewRepository.findByPlaceIds(placeIds);
+
+        return createPlaceDtos(places, reviews);
+    }
+
+    private List<PlaceDto> createPlaceDtos(final List<Place> places, final List<Review> reviews) {
+        return places.stream()
+                .map(place -> {
+                    List<Review> relatedReviews = reviews.stream()
+                            .filter(review -> review.getPlaceId().equals(place.getId()))
+                            .collect(Collectors.toList());
+                    return PlaceDto.of(place, getImages(place), getReviewTagsRelatedToPlace(relatedReviews));
+                })
+                .collect(Collectors.toList());
+    }
+
+    private List<ReviewTag> getReviewTagsRelatedToPlace(final List<Review> reviews) {
+        return reviews.stream()
+                .flatMap(review -> review.getTagMappings()
+                        .getValues()
+                        .stream()
+                        .map(reviewTagMapping -> reviewTagMapping.getReviewTag())
+                )
+                .collect(Collectors.toList());
+    }
+
+    private void checkExistImage(final List<Long> imageIds) {
+        if (imageRepository.isExistIdIn(imageIds)) {
+            throw new NotFoundImageException(imageIds);
+        }
+    }
+
+    private List<Image> getImages(final Place place) {
+        return imageRepository.findByIdIn(place.getImageIds());
+    }
 }

src/main/java/org/prography/kagongsillok/place/application/dto/PlaceDto.java

@@ -7,9 +7,11 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import org.prography.kagongsillok.common.utils.CustomListUtils;
+import org.prography.kagongsillok.image.domain.Image;
 import org.prography.kagongsillok.place.domain.BusinessHour;
 import org.prography.kagongsillok.place.domain.Link;
 import org.prography.kagongsillok.place.domain.Place;
+import org.prography.kagongsillok.review.domain.ReviewTag;
 
 @Getter
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
@@ -20,10 +22,11 @@ public class PlaceDto {
     private String address;
     private Double latitude;
     private Double longitude;
-    private List<Long> imageIds;
+    private List<Image> images;
     private String phone;
     private List<LinkDto> links;
     private List<BusinessHourDto> businessHours;
+    private List<ReviewTag> reviewTags;
 
     @Builder
     public PlaceDto(
@@ -32,20 +35,22 @@ public PlaceDto(
             final String address,
             final Double latitude,
             final Double longitude,
-            final List<Long> imageIds,
+            final List<Image> images,
             final String phone,
             final List<LinkDto> links,
-            final List<BusinessHourDto> businessHours
+            final List<BusinessHourDto> businessHours,
+            final List<ReviewTag> reviewTags
     ) {
         this.id = id;
         this.name = name;
         this.address = address;
         this.latitude = latitude;
         this.longitude = longitude;
-        this.imageIds = imageIds;
+        this.images = images;
         this.phone = phone;
         this.links = links;
         this.businessHours = businessHours;
+        this.reviewTags = reviewTags;
     }
 
     public static PlaceDto from(final Place place) {
@@ -55,13 +60,41 @@ public static PlaceDto from(final Place place) {
                 .address(place.getAddress())
                 .latitude(place.getLatitude())
                 .longitude(place.getLongitude())
-                .imageIds(place.getImageIds())
                 .phone(place.getPhone())
                 .links(CustomListUtils.mapTo(place.getLinks().getValues(), LinkDto::from))
                 .businessHours(CustomListUtils.mapTo(place.getBusinessHours().getValues(), BusinessHourDto::from))
                 .build();
     }
 
+    public static PlaceDto of(final Place place, final List<Image> images) {
+        return PlaceDto.builder()
+                .id(place.getId())
+                .name(place.getName())
+                .address(place.getAddress())
+                .latitude(place.getLatitude())
+                .longitude(place.getLongitude())
+                .images(images)
+                .phone(place.getPhone())
+                .links(CustomListUtils.mapTo(place.getLinks().getValues(), LinkDto::from))
+                .businessHours(CustomListUtils.mapTo(place.getBusinessHours().getValues(), BusinessHourDto::from))
+                .build();
+    }
+
+    public static PlaceDto of(final Place place,final List<Image> images, final List<ReviewTag> reviewTags) {
+        return PlaceDto.builder()
+                .id(place.getId())
+                .name(place.getName())
+                .address(place.getAddress())
+                .latitude(place.getLatitude())
+                .longitude(place.getLongitude())
+                .images(images)
+                .phone(place.getPhone())
+                .links(CustomListUtils.mapTo(place.getLinks().getValues(), LinkDto::from))
+                .businessHours(CustomListUtils.mapTo(place.getBusinessHours().getValues(), BusinessHourDto::from))
+                .reviewTags(reviewTags)
+                .build();
+    }
+
     @Getter
     @NoArgsConstructor(access = AccessLevel.PRIVATE)
     public static class LinkDto {

src/main/java/org/prography/kagongsillok/place/ui/PlaceV1Controller.java

@@ -12,6 +12,7 @@
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
@@ -29,6 +30,12 @@ public ResponseEntity<CommonResponse<PlaceResponse>> getPlace(@PathVariable("id"
         return CommonResponse.success(PlaceResponse.from(placeDto));
     }
 
+    @GetMapping("/with-tags/{placeId}")
+    public ResponseEntity<CommonResponse<PlaceResponse>> getPlaceWithTags(@PathVariable("placeId") final Long placeId) {
+        final PlaceDto placeDto = placeService.getPlaceWithTags(placeId);
+        return CommonResponse.success(PlaceResponse.from(placeDto));
+    }
+
     @GetMapping("/around")
     public ResponseEntity<CommonResponse<PlaceListResponse>> searchAroundPlace(
             @ModelAttribute final PlaceLocationAroundSearchRequest request
@@ -44,4 +51,13 @@ public ResponseEntity<CommonResponse<PlaceListResponse>> searchTitle(@RequestPar
 
         return CommonResponse.success(PlaceListResponse.of(placeDtos));
     }
+
+    @GetMapping("/tags")
+    public ResponseEntity<CommonResponse<PlaceListResponse>> searchTaggedPlace(
+            @RequestParam final List<Long> tagIds
+    ) {
+        final List<PlaceDto> placeDtos = placeService.searchPlacesByTags(tagIds);
+
+        return CommonResponse.success(PlaceListResponse.of(placeDtos));
+    }
 }