Skip to content

Commit

Permalink
[MERGE] Merge pull request #296 from GEON-PPANG/fix/#294
Browse files Browse the repository at this point in the history
[FIX] 건빵집 리스트에서 사용되는 쿼리에서 left 조인을 inner 조인으로 변경
  • Loading branch information
sung-silver authored Feb 25, 2024
2 parents cd9727b + 4aa848c commit 30d7c11
Showing 1 changed file with 8 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,11 @@ List<Bakery> findRestBakeriesRandomly(
@Query(
value =
"SELECT distinct b FROM Bakery b "
+ "LEFT JOIN BakeryBreadType bbt ON b.bakeryId = bbt.bakery.bakeryId AND bbt.breadType IN :breadTypeList "
+ "LEFT JOIN BakeryCategory bc ON b.bakeryId = bc.bakery.bakeryId AND bc.category IN :categoryList "
+ "LEFT JOIN BakeryNutrientType bnt ON b.bakeryId = bnt.bakery.bakeryId AND bnt.nutrientType = :bakeryNutrientType "
+ "INNER JOIN BakeryBreadType bbt ON b.bakeryId = bbt.bakery.bakeryId AND bbt.breadType IN :breadTypeList "
+ "INNER JOIN BakeryCategory bc ON b.bakeryId = bc.bakery.bakeryId AND bc.category IN :categoryList "
+ "INNER JOIN BakeryNutrientType bnt ON b.bakeryId = bnt.bakery.bakeryId AND bnt.nutrientType = :bakeryNutrientType "
+ "GROUP BY b.bakeryId "
+ "ORDER BY COUNT(bc.bakery.bakeryId) DESC, COUNT(bbt.bakery.bakeryId) DESC")
+ "ORDER BY COUNT(bbt.bakery.bakeryId) DESC, COUNT(bc.bakery.bakeryId) DESC")
Page<Bakery> findFilteredBakeries(
@Param("categoryList") List<Category> categoryList,
@Param("breadTypeList") List<BreadType> breadTypeList,
Expand All @@ -80,11 +80,11 @@ Page<Bakery> findFilteredBakeries(
@Query(
value =
"SELECT distinct b FROM Bakery b "
+ "LEFT JOIN BakeryBreadType bbt ON b.bakeryId = bbt.bakery.bakeryId AND bbt.breadType IN :breadTypeList "
+ "LEFT JOIN BakeryCategory bc ON b.bakeryId = bc.bakery.bakeryId AND bc.category IN :categoryList "
+ "LEFT JOIN BakeryNutrientType bnt ON b.bakeryId = bnt.bakery.bakeryId AND bnt.nutrientType = :bakeryNutrientType "
+ "INNER JOIN BakeryBreadType bbt ON b.bakeryId = bbt.bakery.bakeryId AND bbt.breadType IN :breadTypeList "
+ "INNER JOIN BakeryCategory bc ON b.bakeryId = bc.bakery.bakeryId AND bc.category IN :categoryList "
+ "INNER JOIN BakeryNutrientType bnt ON b.bakeryId = bnt.bakery.bakeryId AND bnt.nutrientType = :bakeryNutrientType "
+ "GROUP BY b.bakeryId "
+ "ORDER BY b.reviewCount DESC, COUNT(bc.bakery.bakeryId) DESC, COUNT(bbt.bakery.bakeryId) DESC")
+ "ORDER BY b.reviewCount DESC, COUNT(bbt.bakery.bakeryId) DESC, COUNT(bc.bakery.bakeryId) DESC")
Page<Bakery> findFilteredBakeriesSortByReview(
@Param("categoryList") List<Category> categoryList,
@Param("breadTypeList") List<BreadType> breadTypeList,
Expand Down

0 comments on commit 30d7c11

Please sign in to comment.