v2.0.1 (#51)

v2.0.1
fun-eat · Apr 23, 2024 · 239b076 · 239b076
2 parents caf43c2 + e410c97
commit 239b076
Show file tree

Hide file tree

Showing 9 changed files with 401 additions and 54 deletions.
diff --git a/src/main/java/com/funeat/auth/util/AuthHandlerInterceptor.java b/src/main/java/com/funeat/auth/util/AuthHandlerInterceptor.java
@@ -8,13 +8,21 @@
 import jakarta.servlet.http.HttpSession;
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.HandlerInterceptor;
+import org.springframework.web.util.UriTemplate;
 
 @Component
 public class AuthHandlerInterceptor implements HandlerInterceptor {
 
+    private static final String GET = "GET";
+    private static final UriTemplate SORTING_REVIEW_URI_TEMPLATE = new UriTemplate("/api/products/{productId}/reviews");
+
     @Override
     public boolean preHandle(final HttpServletRequest request, final HttpServletResponse response,
                              final Object handler) {
+        if (GET.equals(request.getMethod()) && SORTING_REVIEW_URI_TEMPLATE.matches(request.getRequestURI())) {
+            return true;
+        }
+
         final HttpSession session = request.getSession(false);
 
         if (Objects.isNull(session)) {

diff --git a/src/main/java/com/funeat/member/domain/Member.java b/src/main/java/com/funeat/member/domain/Member.java
@@ -43,6 +43,10 @@ public Member(final String nickname, final String profileImage, final String pla
         this.platformId = platformId;
     }
 
+    public static Member createGuest() {
+        return new Member("Guest", "", "-1");
+    }
+
     public Long getId() {
         return id;
     }
@@ -81,4 +85,8 @@ public void modifyNickname(final String nickname) {
         }
         this.nickname = nickname;
     }
+
+    public boolean isGuest() {
+        return platformId.equals("-1");
+    }
 }
diff --git a/src/main/java/com/funeat/review/application/ReviewService.java b/src/main/java/com/funeat/review/application/ReviewService.java
@@ -60,7 +60,7 @@ public class ReviewService {
     private static final int START_INDEX = 0;
     private static final int ONE = 1;
     private static final String EMPTY_URL = "";
-    private static final int RANKING_SIZE = 3;
+    private static final int RANKING_SIZE = 2;
     private static final long RANKING_MINIMUM_FAVORITE_COUNT = 1L;
     private static final int REVIEW_PAGE_SIZE = 10;
 
@@ -156,12 +156,12 @@ public void updateProductImage(final Long productId) {
 
     public SortingReviewsResponse sortingReviews(final Long productId, final Long memberId,
                                                  final SortingReviewRequest request) {
-        final Member findMember = memberRepository.findById(memberId)
-                .orElseThrow(() -> new MemberNotFoundException(MEMBER_NOT_FOUND, memberId));
+        final Member guestOrFindMember = memberRepository.findById(memberId)
+                .orElse(Member.createGuest());
         final Product findProduct = productRepository.findById(productId)
                 .orElseThrow(() -> new ProductNotFoundException(PRODUCT_NOT_FOUND, productId));
 
-        final List<SortingReviewDto> sortingReviews = getSortingReviews(findMember, findProduct, request);
+        final List<SortingReviewDto> sortingReviews = getSortingReviews(guestOrFindMember, findProduct, request);
         final int resultSize = getResultSize(sortingReviews);
 
         final List<SortingReviewDto> resizeSortingReviews = sortingReviews.subList(START_INDEX, resultSize);
@@ -170,14 +170,13 @@ public SortingReviewsResponse sortingReviews(final Long productId, final Long me
         return SortingReviewsResponse.toResponse(resizeSortingReviews, hasNext);
     }
 
-    private List<SortingReviewDto> getSortingReviews(final Member member, final Product product,
-                                                    final SortingReviewRequest request) {
+    private List<SortingReviewDto> getSortingReviews(final Member guestOrFindMember, final Product product,
+                                                     final SortingReviewRequest request) {
         final Long lastReviewId = request.getLastReviewId();
         final String sortOption = request.getSort();
 
         final Specification<Review> specification = getSortingSpecification(product, sortOption, lastReviewId);
-        final List<SortingReviewDtoWithoutTag> sortingReviewDtoWithoutTags = reviewRepository.getSortingReview(member,
-                specification, sortOption);
+        final List<SortingReviewDtoWithoutTag> sortingReviewDtoWithoutTags = reviewRepository.getSortingReview(guestOrFindMember, specification, sortOption);
 
         return addTagsToSortingReviews(sortingReviewDtoWithoutTags);
     }

diff --git a/src/main/java/com/funeat/review/persistence/ReviewRepositoryImpl.java b/src/main/java/com/funeat/review/persistence/ReviewRepositoryImpl.java
@@ -26,7 +26,7 @@ public class ReviewRepositoryImpl implements ReviewCustomRepository {
     private EntityManager em;
 
     @Override
-    public List<SortingReviewDtoWithoutTag> getSortingReview(final Member loginMember,
+    public List<SortingReviewDtoWithoutTag> getSortingReview(final Member guestOrLoginMember,
                                                              final Specification<Review> specification,
                                                              final String sortOption) {
         final CriteriaBuilder cb = em.getCriteriaBuilder();
@@ -43,8 +43,11 @@ public List<SortingReviewDtoWithoutTag> getSortingReview(final Member loginMembe
 
         // left join
         final Join<Review, ReviewFavorite> leftJoinReviewFavorite = root.join("reviewFavorites", JoinType.LEFT);
-        final Predicate condition = cb.equal(leftJoinReviewFavorite.get("member"), loginMember);
-        leftJoinReviewFavorite.on(condition);
+        leftJoinReviewFavorite.on(cb.disjunction()); // 비로그인 좋아요 기본값은 false
+        if (!guestOrLoginMember.isGuest()) { // 로그인 좋아요는 사용자의 좋아요 유무에 따라 결정
+            final Predicate condition = cb.equal(leftJoinReviewFavorite.get("member"), guestOrLoginMember);
+            leftJoinReviewFavorite.on(condition);
+        }
 
         // select - from - where - order by
         cq.select(getConstruct(root, cb, joinMember, leftJoinReviewFavorite))