카페 이미지 Outer Join -> Inner Join (카페 이미지 최소 1개 이상 포함시키기)

server/build.gradle

@@ -51,6 +51,26 @@ dependencies {
     //Flyway
     implementation 'org.flywaydb:flyway-core'
     implementation 'org.flywaydb:flyway-mysql'
+
+    //QueryDsl
+    implementation 'com.querydsl:querydsl-jpa:5.0.0:jakarta'
+    annotationProcessor "com.querydsl:querydsl-apt:${dependencyManagement.importedProperties['querydsl.version']}:jakarta"
+    annotationProcessor "jakarta.annotation:jakarta.annotation-api"
+    annotationProcessor "jakarta.persistence:jakarta.persistence-api"
+}
+
+def generatedQueryDsl = 'build/generated/querydsl'
+
+sourceSets {
+    main.java.srcDirs += [generatedQueryDsl]
+}
+
+tasks.withType(JavaCompile).configureEach {
+    options.getGeneratedSourceOutputDirectory().set(file(generatedQueryDsl))
+}
+
+clean.doLast {
+    file(generatedQueryDsl).deleteDir()
 }
 
 ext {

server/src/main/java/com/project/yozmcafe/config/QueryDslConfig.java

@@ -0,0 +1,19 @@
+package com.project.yozmcafe.config;
+
+import com.querydsl.jpa.impl.JPAQueryFactory;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class QueryDslConfig {
+
+    @PersistenceContext
+    private EntityManager entityManager;
+
+    @Bean
+    public JPAQueryFactory jpaQueryFactory() {
+        return new JPAQueryFactory(entityManager);
+    }
+}

server/src/main/java/com/project/yozmcafe/controller/CafeController.java

@@ -2,6 +2,8 @@
 
 import com.project.yozmcafe.controller.dto.cafe.CafeRankResponse;
 import com.project.yozmcafe.controller.dto.cafe.CafeResponse;
+import com.project.yozmcafe.controller.dto.cafe.CafeSearchRequest;
+import com.project.yozmcafe.controller.dto.cafe.CafeSearchResponse;
 import com.project.yozmcafe.service.CafeService;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.web.PageableDefault;
@@ -17,8 +19,7 @@
 @RequestMapping("/cafes")
 public class CafeController {
 
-    private static final int PAGE_SIZE = 5;
-    private static final int RANKING_PAGE_SIZE = 10;
+    private static final int CAFE_PAGE_SIZE = 5;
 
     private final CafeService cafeService;
 
@@ -28,27 +29,34 @@ public CafeController(final CafeService cafeService) {
 
     @GetMapping
     public ResponseEntity<List<CafeResponse>> getCafesForLoggedInMember(@LoginUser final String memberId) {
-        List<CafeResponse> cafeResponses = cafeService.getCafesForLoginMember(memberId, PAGE_SIZE);
+        final List<CafeResponse> cafeResponses = cafeService.getCafesForLoginMember(memberId, CAFE_PAGE_SIZE);
         return ResponseEntity.ok(cafeResponses);
     }
 
     @GetMapping("/guest")
-    public ResponseEntity<List<CafeResponse>> getCafesForUnLoggedInMember(@PageableDefault(size = PAGE_SIZE) final Pageable pageable) {
-        List<CafeResponse> cafeResponses = cafeService.getCafesForUnLoginMember(pageable);
+    public ResponseEntity<List<CafeResponse>> getCafesForUnLoggedInMember(
+            @PageableDefault(size = CAFE_PAGE_SIZE) final Pageable pageable) {
+        final List<CafeResponse> cafeResponses = cafeService.getCafesForUnLoginMember(pageable);
         return ResponseEntity.ok(cafeResponses);
     }
 
     @GetMapping("/ranks")
-    public ResponseEntity<List<CafeRankResponse>> getCafesOrderByLikeCount(@PageableDefault(size = RANKING_PAGE_SIZE) final Pageable pageable) {
+    public ResponseEntity<List<CafeRankResponse>> getCafesOrderByLikeCount(@PageableDefault final Pageable pageable) {
         final List<CafeRankResponse> cafeRankResponses = cafeService.getCafesOrderByLikeCount(pageable);
         return ResponseEntity.ok(cafeRankResponses);
     }
 
     @GetMapping("/{cafeId}")
     public ResponseEntity<CafeResponse> getCafeById(@PathVariable("cafeId") final long cafeId) {
-        CafeResponse cafeResponse = cafeService.getCafeById(cafeId);
+        final CafeResponse cafeResponse = cafeService.getCafeByIdOrThrow(cafeId);
         return ResponseEntity.ok(cafeResponse);
     }
+
+    @GetMapping("/search")
+    public ResponseEntity<List<CafeSearchResponse>> getCafeBySearch(final CafeSearchRequest cafeSearchRequest) {
+        final List<CafeSearchResponse> cafeSearchResponses = cafeService.getCafesBySearch(cafeSearchRequest);
+        return ResponseEntity.ok(cafeSearchResponses);
+    }
 }
 
 

server/src/main/java/com/project/yozmcafe/controller/LikedCafeController.java

@@ -1,7 +1,7 @@
 package com.project.yozmcafe.controller;
 
+import com.project.yozmcafe.controller.dto.cafe.CafeThumbnailResponse;
 import com.project.yozmcafe.controller.dto.cafe.LikedCafeResponse;
-import com.project.yozmcafe.controller.dto.cafe.LikedCafeThumbnailResponse;
 import com.project.yozmcafe.service.LikedCafeService;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.web.PageableDefault;
@@ -26,9 +26,9 @@ public LikedCafeController(final LikedCafeService likedCafeService) {
     }
 
     @GetMapping("/members/{memberId}/liked-cafes")
-    public ResponseEntity<List<LikedCafeThumbnailResponse>> getLikedCafeThumbnails(@PathVariable("memberId") final String memberId,
-                                                                                   @PageableDefault(size = PAGE_SIZE) final Pageable pageable) {
-        final List<LikedCafeThumbnailResponse> likedCafes = likedCafeService.findLikedCafeThumbnailsByMemberId(memberId, pageable);
+    public ResponseEntity<List<CafeThumbnailResponse>> getLikedCafeThumbnails(@PathVariable("memberId") final String memberId,
+                                                                              @PageableDefault(size = PAGE_SIZE) final Pageable pageable) {
+        final List<CafeThumbnailResponse> likedCafes = likedCafeService.findLikedCafeThumbnailsByMemberId(memberId, pageable);
 
         return ResponseEntity.ok(likedCafes);
     }

server/src/main/java/com/project/yozmcafe/controller/dto/cafe/CafeSearchRequest.java

@@ -0,0 +1,4 @@
+package com.project.yozmcafe.controller.dto.cafe;
+
+public record CafeSearchRequest(String cafeName, String menu, String address) {
+}

server/src/main/java/com/project/yozmcafe/controller/dto/cafe/CafeSearchResponse.java

@@ -0,0 +1,15 @@
+package com.project.yozmcafe.controller.dto.cafe;
+
+import com.project.yozmcafe.domain.cafe.Cafe;
+
+public record CafeSearchResponse(Long id, String name, String address, String image, int likeCount) {
+    public static CafeSearchResponse from(final Cafe cafe) {
+        return new CafeSearchResponse(
+                cafe.getId(),
+                cafe.getName(),
+                cafe.getAddress(),
+                cafe.getRepresentativeImage(),
+                cafe.getLikeCount()
+        );
+    }
+}

server/src/main/java/com/project/yozmcafe/controller/dto/cafe/CafeThumbnailResponse.java

@@ -0,0 +1,10 @@
+package com.project.yozmcafe.controller.dto.cafe;
+
+import com.project.yozmcafe.domain.cafe.Cafe;
+
+public record CafeThumbnailResponse(Long cafeId, String imageUrl) {
+
+    public static CafeThumbnailResponse from(final Cafe cafe) {
+        return new CafeThumbnailResponse(cafe.getId(), cafe.getRepresentativeImage());
+    }
+}

server/src/main/java/com/project/yozmcafe/domain/cafe/Cafe.java

@@ -1,7 +1,12 @@
 package com.project.yozmcafe.domain.cafe;
 
 import com.project.yozmcafe.exception.BadRequestException;
-import jakarta.persistence.*;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embedded;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
 
 import java.util.Objects;
 
@@ -71,7 +76,7 @@ private void validate(final String name, final String address, final Images imag
         }
     }
 
-    public Cafe(String name, String address, Images images, Detail detail) {
+    public Cafe(final String name, final String address, final Images images, final Detail detail) {
         this(null, name, address, images, detail, 0);
     }
 

server/src/main/java/com/project/yozmcafe/domain/cafe/CafeCustomRepository.java

@@ -0,0 +1,10 @@
+package com.project.yozmcafe.domain.cafe;
+
+import java.util.List;
+
+public interface CafeCustomRepository {
+
+    List<Cafe> findAllBy(final String cafeName, final String menu, final String address);
+
+    List<Cafe> findAllBy(final String cafeName, final String address);
+}

server/src/main/java/com/project/yozmcafe/domain/cafe/CafeCustomRepositoryImpl.java

@@ -0,0 +1,52 @@
+package com.project.yozmcafe.domain.cafe;
+
+import com.querydsl.core.types.dsl.BooleanExpression;
+import com.querydsl.core.types.dsl.StringPath;
+import org.springframework.data.jpa.repository.support.QuerydslRepositorySupport;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+import static com.project.yozmcafe.domain.cafe.QCafe.cafe;
+import static com.project.yozmcafe.domain.menu.QMenu.menu;
+import static com.querydsl.core.types.dsl.Expressions.numberTemplate;
+import static io.micrometer.common.util.StringUtils.isBlank;
+
+@Repository
+public class CafeCustomRepositoryImpl extends QuerydslRepositorySupport implements CafeCustomRepository {
+
+    private static final double MATCH_THRESHOLD = 0.0;
+
+    public CafeCustomRepositoryImpl() {
+        super(Cafe.class);
+    }
+
+    public List<Cafe> findAllBy(final String cafeNameWord, final String menuWord, final String addressWord) {
+        return from(cafe)
+                .innerJoin(menu).on(menu.cafe.eq(cafe))
+                .where(
+                        contains(cafe.name, cafeNameWord),
+                        contains(menu.name, menuWord),
+                        contains(cafe.address, addressWord))
+                .fetch();
+    }
+
+    public List<Cafe> findAllBy(final String cafeNameWord, final String addressWord) {
+        return from(cafe)
+                .where(
+                        contains(cafe.name, cafeNameWord),
+                        contains(cafe.address, addressWord))
+                .fetch();
+    }
+
+    private BooleanExpression contains(final StringPath target, final String searchWord) {
+        if (isBlank(searchWord)) {
+            return null;
+        }
+
+        final String formattedSearchWord = "\"" + searchWord + "\"";
+        return numberTemplate(Double.class, "function('match_against', {0}, {1})",
+                target, formattedSearchWord)
+                .gt(MATCH_THRESHOLD);
+    }
+}

server/src/main/java/com/project/yozmcafe/domain/cafe/CafeRepository.java

@@ -9,30 +9,30 @@
 import java.util.List;
 import java.util.Optional;
 
-public interface CafeRepository extends JpaRepository<Cafe, Long> {
+public interface CafeRepository extends JpaRepository<Cafe, Long>, CafeCustomRepository {
 
     Slice<Cafe> findSliceBy(Pageable pageable);
 
     @Override
     @Query("""
-            select c 
-            from Cafe c 
-            left join fetch c.images.urls 
-            where c.id = :cafeId
+            SELECT c
+            FROM Cafe c
+            JOIN FETCH c.images.urls
+            WHERE c.id = :cafeId
             """)
     Optional<Cafe> findById(@Param("cafeId") Long cafeId);
 
     @Override
     @Query("""
-            select c 
-            from Cafe c 
-            left join fetch c.images.urls
+            SELECT c
+            FROM Cafe c
+            JOIN FETCH c.images.urls
             """)
     List<Cafe> findAll();
 
     @Query("""
-            SELECT c.id 
-            FROM Cafe c 
+            SELECT c.id
+            FROM Cafe c
             ORDER BY c.likeCount DESC
             """)
     List<Long> findCafeIdsOrderByLikeCount(Pageable pageable);

server/src/main/java/com/project/yozmcafe/domain/cafe/CustomFunctionContributor.java

@@ -0,0 +1,19 @@
+package com.project.yozmcafe.domain.cafe;
+
+import org.hibernate.boot.model.FunctionContributions;
+import org.hibernate.boot.model.FunctionContributor;
+
+import static org.hibernate.type.StandardBasicTypes.DOUBLE;
+
+public class CustomFunctionContributor implements FunctionContributor {
+
+    private static final String FUNCTION_NAME = "match_against";
+    private static final String FUNCTION_PATTERN = "match (?1) against (?2 in boolean mode)";
+
+    @Override
+    public void contributeFunctions(final FunctionContributions functionContributions) {
+        functionContributions.getFunctionRegistry()
+                .registerPattern(FUNCTION_NAME, FUNCTION_PATTERN,
+                        functionContributions.getTypeConfiguration().getBasicTypeRegistry().resolve(DOUBLE));
+    }
+}

server/src/main/java/com/project/yozmcafe/domain/cafe/Detail.java

@@ -6,8 +6,8 @@
 import jakarta.persistence.Column;
 import jakarta.persistence.ElementCollection;
 import jakarta.persistence.Embeddable;
-import jakarta.persistence.FetchType;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import static com.project.yozmcafe.exception.ErrorCode.DUPLICATED_CAFE_AVAILABLE_TIMES;
@@ -21,8 +21,8 @@ public class Detail {
     public static final int MAP_URL_MAX_LENGTH = 512;
     public static final int PHONE_MAX_LENGTH = 20;
 
-    @ElementCollection(fetch = FetchType.LAZY)
-    private List<AvailableTime> availableTimes;
+    @ElementCollection
+    private List<AvailableTime> availableTimes = new ArrayList<>();
     @Column(nullable = false)
     private String mapUrl;
     @Column(columnDefinition = "text")