베스트 빵집 및 베스트 리뷰 조회 시 버그 발생 해결

api/src/main/java/com/org/gunbbang/service/BakeryService.java

@@ -236,9 +236,9 @@ private List<Bakery> getOnlyRandomBakeries() {
   private boolean isFilterSelected(Member foundMember) {
     boolean isBreadTypeSelected = memberBreadTypeRepository.existsByMember(foundMember);
     boolean isNutrientTypeSelected = memberNutrientTypeRepository.existsByMember(foundMember);
-    boolean isMainPurposeNone = foundMember.getMainPurpose().equals(MainPurpose.NONE);
+    boolean isMainPurposeSelected = !foundMember.getMainPurpose().equals(MainPurpose.NONE);
 
-    return isBreadTypeSelected && isNutrientTypeSelected && isMainPurposeNone;
+    return isBreadTypeSelected && isNutrientTypeSelected && isMainPurposeSelected;
   }
 
   private void setAlreadyFoundBakeryIds(

api/src/main/java/com/org/gunbbang/service/ReviewService.java

@@ -32,7 +32,7 @@ public class ReviewService {
   private final MemberRepository memberRepository;
   private final RecommendKeywordRepository recommendKeywordRepository;
   private final MemberBreadTypeRepository memberBreadTypeRepository;
-  private final MemberBreadTypeRepository memberNutrientTypeRepository;
+  private final MemberNutrientTypeRepository memberNutrientTypeRepository;
   private final BakeryBreadTypeRepository bakeryBreadTypeRepository;
   private final int MAX_BEST_BAKERY_COUNT = 10;
 
@@ -256,9 +256,9 @@ private List<Review> getRandomReviews() {
   private boolean isFilterSelected(Member foundMember) {
     boolean isBreadTypeSelected = memberBreadTypeRepository.existsByMember(foundMember);
     boolean isNutrientTypeSelected = memberNutrientTypeRepository.existsByMember(foundMember);
-    boolean isMainPurposeNone = foundMember.getMainPurpose().equals(MainPurpose.NONE);
+    boolean isMainPurposeSelected = !foundMember.getMainPurpose().equals(MainPurpose.NONE);
 
-    return isBreadTypeSelected && isNutrientTypeSelected && isMainPurposeNone;
+    return isBreadTypeSelected && isNutrientTypeSelected && isMainPurposeSelected;
   }
 
   private void getRestReviewsRandomly(
@@ -280,7 +280,7 @@ private List<BestReviewDTO> getBestReviews(Member foundMember, List<BreadType> b
     PageRequest bestPageRequest = PageRequest.of(0, MAX_BEST_BAKERY_COUNT);
     List<BestReviewDTO> bestReviews =
         reviewRepository.findBestReviewDTOList(
-            breadTypes, foundMember.getMainPurpose(), bestPageRequest);
+            breadTypes, foundMember.getMainPurpose()); // , bestPageRequest);
     return bestReviews;
   }
 

storage/db-core/src/main/java/com/org/gunbbang/entity/BakeryBreadType.java

@@ -1,7 +1,9 @@
 package com.org.gunbbang.entity;
 
 import javax.persistence.*;
+import lombok.AccessLevel;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 
 @Entity
 @Getter
@@ -12,6 +14,7 @@
           name = "BAKERY_ID_BREAD_TYPE_ID_UNIQUE",
           columnNames = {"bakery_id", "bread_type_id"})
     })
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
 public class BakeryBreadType {
   @Id
   @GeneratedValue(strategy = GenerationType.IDENTITY)

storage/db-core/src/main/java/com/org/gunbbang/entity/BakeryNutrientType.java

@@ -1,10 +1,20 @@
 package com.org.gunbbang.entity;
 
 import javax.persistence.*;
+import lombok.AccessLevel;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 
 @Entity
 @Getter
+@Table(
+    name = "bakeryNutrientType",
+    uniqueConstraints = {
+      @UniqueConstraint(
+          name = "BAKERY_ID_NUTRIENT_TYPE_ID_UNIQUE",
+          columnNames = {"bakery_id", "nutrient_type_id"})
+    })
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
 public class BakeryNutrientType {
   @Id
   @GeneratedValue(strategy = GenerationType.IDENTITY)

storage/db-core/src/main/java/com/org/gunbbang/repository/BookMarkRepository.java

@@ -26,4 +26,6 @@ public interface BookMarkRepository extends JpaRepository<BookMark, Long> {
 
   @Query(value = "SELECT bm FROM BookMark bm WHERE bm.member.memberId = :memberId")
   List<BookMark> findAllByMemberId(Long memberId);
+
+  List<BookMark> findAllByBakery(Bakery bakery);
 }

storage/db-core/src/main/java/com/org/gunbbang/repository/ReviewRepository.java

@@ -40,16 +40,17 @@ public interface ReviewRepository extends JpaRepository<Review, Long> {
               + "r.createdAt) FROM Review r "
               + "INNER JOIN Bakery b ON b.bakeryId = r.bakery.bakeryId "
               + "INNER JOIN Member m ON r.member.memberId = m.memberId "
-              + "INNER JOIN MemberBreadType  mbt ON r.member.memberId = mbt.member.memberId "
+              + "INNER JOIN MemberBreadType mbt ON m.memberId = mbt.member.memberId "
               + "WHERE mbt.breadType in :currentMemberBreadType "
               + "AND r.isLike = true "
               + "AND r.member.mainPurpose = :currentMemberMainPurpose "
               + "AND r.reviewText IS NOT NULL AND r.reviewText != '' "
               + "ORDER BY r.createdAt desc")
   List<BestReviewDTO> findBestReviewDTOList(
       @Param("currentMemberBreadType") List<BreadType> currentMemberBreadType,
-      @Param("currentMemberMainPurpose") MainPurpose mainPurpose,
-      PageRequest bestPageRequest);
+      @Param("currentMemberMainPurpose") MainPurpose mainPurpose);
+
+  // PageRequest bestPageRequest);
 
   @Query(
       value =