Merge pull request #44 from koview/moon

Moon

Author: loading1031

koview-server/src/main/java/com/koview/koview_server/config/SecurityConfig.java

@@ -30,8 +30,7 @@ public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Excepti
                 .sessionManagement(session -> session.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
                 .authorizeHttpRequests(auth -> auth
                         .requestMatchers("/swagger-ui/**","/v3/api-docs/**", "/member/**", "/image/**",
-                                "/shops", "/reviews", "/reviews/detail", "/queries", "/queries/{queryId}","/review/search", "/comments",
-                                "/products/**", "/categories", "/home").permitAll()
+                                "/shops", "/products", "/categories", "/home",  "/comments").permitAll()
                         .anyRequest().authenticated()
                 )
 

koview-server/src/main/java/com/koview/koview_server/home/dto/HomeResponseDTO.java

@@ -1,6 +1,7 @@
 package com.koview.koview_server.home.dto;
 
 import com.koview.koview_server.product.domain.dto.ProductResponseDTO;
+import com.koview.koview_server.query.domain.dto.QueryResponseDTO;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
@@ -13,5 +14,6 @@
 public class HomeResponseDTO {
     private List<ProductResponseDTO.NameWithImage> famousFourProducts;
     private List<ProductResponseDTO.NameWithImage> restrictedFourProducts;
+    private List<QueryResponseDTO.Single> lastFourQueries;
     //TODO: 질의 4개 리스트 추가
 }

koview-server/src/main/java/com/koview/koview_server/home/facade/HomeFacade.java

@@ -3,6 +3,8 @@
 import com.koview.koview_server.home.dto.HomeResponseDTO;
 import com.koview.koview_server.product.domain.dto.ProductResponseDTO;
 import com.koview.koview_server.product.service.ProductQueryService;
+import com.koview.koview_server.query.domain.dto.QueryResponseDTO;
+import com.koview.koview_server.query.service.QueryQueryService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
@@ -14,14 +16,17 @@
 @RequiredArgsConstructor
 public class HomeFacade {
     private final ProductQueryService productQueryService;
+    private final QueryQueryService queryService;
 
     public HomeResponseDTO getHomeV1(){
         List<ProductResponseDTO.NameWithImage> fourRestrictedProducts = productQueryService.getFourRestrictedProducts();
         List<ProductResponseDTO.NameWithImage> fourFamousProducts = productQueryService.getFourBestFamousProducts();
+        List<QueryResponseDTO.Single> fourQueries = queryService.getFourQueries();
 
         return HomeResponseDTO.builder()
                 .restrictedFourProducts(fourRestrictedProducts)
                 .famousFourProducts(fourFamousProducts)
+                .lastFourQueries(fourQueries)
                 //TODO: 질문 기능 개발시 추가
                 .build();
 

koview-server/src/main/java/com/koview/koview_server/like/repository/LikeRepository.java

@@ -1,11 +1,14 @@
 package com.koview.koview_server.like.repository;
 
 import com.koview.koview_server.like.domain.Like;
+import com.koview.koview_server.member.domain.Member;
+import com.koview.koview_server.review.domain.Review;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.Optional;
 
 public interface LikeRepository extends JpaRepository<Like, Long> {
     Optional<Like> findByReviewId(Long reviewId);
     Like findByReviewIdAndMemberId(Long reviewId, Long memberId);
+    Boolean existsByMemberAndReview(Member member, Review review);
 }

koview-server/src/main/java/com/koview/koview_server/like/service/LikeServiceImpl.java

@@ -38,7 +38,6 @@ public LikeResponseDTO createLikes(Long reviewId) {
         review.increaseTotalLikesCount();
         reviewRepository.save(review);
 
-        currentMember.isCurrentMemberLikedTrue();
         memberRepository.save(currentMember);
 
         return new LikeResponseDTO(newLike);
@@ -57,7 +56,6 @@ public LikeResponseDTO cancelLikes(Long reviewId) {
         likesRepository.delete(like);
 
         Member currentMember = validateMember();
-        currentMember.isCurrentMemberLikedFalse();
         memberRepository.save(currentMember);
 
         return new LikeResponseDTO(like);

koview-server/src/main/java/com/koview/koview_server/member/domain/Member.java

@@ -59,9 +59,6 @@ public class Member extends BaseTimeEntity {
     @Column(nullable = false, length = 30)
     private RoleType role; // 권한
 
-    private Boolean isCurrentMemberLiked = false;
-    private Boolean isCurrentMemberWithQuery = false;
-
     @OneToMany(mappedBy = "member", cascade = CascadeType.ALL, orphanRemoval = true)
     private List<Review> reviewList = new ArrayList<>();
 
@@ -107,20 +104,4 @@ public void addMemberLikedShops(List<Shop> shops) {
     public void addProfileImage(ProfileImage profileImage) {
         this.profileImage = profileImage;
     }
-
-    public void isCurrentMemberLikedTrue() {
-        this.isCurrentMemberLiked = true;
-    }
-
-    public void isCurrentMemberLikedFalse() {
-        this.isCurrentMemberLiked = false;
-    }
-
-    public void isCurrentMemberWithQueryTrue() {
-        this.isCurrentMemberWithQuery = true;
-    }
-
-    public void isCurrentMemberWithQueryFalse() {
-        this.isCurrentMemberWithQuery = false;
-    }
 }

koview-server/src/main/java/com/koview/koview_server/mypage/service/MyPageServiceImpl.java

@@ -3,6 +3,7 @@
 import com.koview.koview_server.global.apiPayload.code.status.ErrorStatus;
 import com.koview.koview_server.global.apiPayload.exception.MemberException;
 import com.koview.koview_server.global.security.util.SecurityUtil;
+import com.koview.koview_server.like.repository.LikeRepository;
 import com.koview.koview_server.member.domain.Member;
 import com.koview.koview_server.member.repository.MemberRepository;
 import com.koview.koview_server.mypage.domain.ProfileImage;
@@ -31,6 +32,7 @@ public class MyPageServiceImpl implements MypageService {
     private final MemberRepository memberRepository;
     private final ReviewRepository reviewRepository;
     private final ReviewPurchaseLinkRepository reviewPurchaseLinkRepository;
+    private final LikeRepository likeRepository;
 
     @Override
     public LimitedReviewResponseDTO.ReviewSlice findAllByMemberWithLimitedImages(Pageable pageable) {
@@ -85,19 +87,27 @@ private Member validateMember() {
     }
 
     private LimitedReviewResponseDTO.ReviewSlice getLimitedImageReviewSlice(Slice<Review> reviewSlice) {
-        List<LimitedReviewResponseDTO.Single> reviewList = reviewSlice.stream().map(ReviewConverter::toLimitedSingleDto).toList();
+        Member member = validateMember();
+
+        List<LimitedReviewResponseDTO.Single> reviewList = reviewSlice.stream().map(review -> {
+            Boolean isLiked = likeRepository.existsByMemberAndReview(member, review);
+            return ReviewConverter.toLimitedSingleDto(review, isLiked);
+        }).toList();
 
         return ReviewConverter.toLimitedSliceDto(reviewSlice, reviewList);
     }
 
     //TODO: ReviewQuerySerivce에서 메소드 재활용하기.
     private ReviewResponseDTO.ReviewSlice getReviewSlice(Slice<Review> reviewSlice) {
+        Member member = validateMember();
         List<ReviewResponseDTO.Single> reviewList = reviewSlice.stream().map(review ->{
+
             List<PurchaseLinkResponseDTO> purchaseLinkList =
                     reviewPurchaseLinkRepository.findPurchaseLinksByReviewId(review.getId()).stream()
                             .map(PurchaseLinkResponseDTO::new).toList();
+            Boolean isLiked = likeRepository.existsByMemberAndReview(member, review);
 
-            return ReviewConverter.toSingleDTO(review, purchaseLinkList);
+            return ReviewConverter.toSingleDTO(review, isLiked ,purchaseLinkList);
         }).toList();
 
         return ReviewConverter.toSliceDTO(reviewSlice, reviewList);

koview-server/src/main/java/com/koview/koview_server/product/domain/dto/ProductConverter.java

@@ -31,7 +31,7 @@ public static ProductResponseDTO.ProductSlice toSliceDTO(Slice<Product> productS
                                                              List<ProductResponseDTO.Single> productList){
         return ProductResponseDTO.ProductSlice.builder()
                 .productList(productList)
-                .getNumber(productSlice.getNumber())
+                .getNumber(productSlice.getNumber()+1)
                 .hasNext(productSlice.hasNext())
                 .hasPrevious(productSlice.hasPrevious())
                 .build();

koview-server/src/main/java/com/koview/koview_server/product/service/ProductServiceImpl.java

@@ -2,7 +2,12 @@
 
 import com.koview.koview_server.global.apiPayload.code.status.ErrorStatus;
 import com.koview.koview_server.global.apiPayload.exception.GeneralException;
+import com.koview.koview_server.global.apiPayload.exception.MemberException;
 import com.koview.koview_server.global.common.image.ImageResponseDTO;
+import com.koview.koview_server.global.security.util.SecurityUtil;
+import com.koview.koview_server.like.repository.LikeRepository;
+import com.koview.koview_server.member.domain.Member;
+import com.koview.koview_server.member.repository.MemberRepository;
 import com.koview.koview_server.product.domain.CategoryType;
 import com.koview.koview_server.purchaseLink.repository.PurchaseLinkRepository;
 import com.koview.koview_server.purchaseLink.domain.dto.PurchaseLinkResponseDTO;
@@ -38,6 +43,8 @@ public class ProductServiceImpl implements ProductService {
     private final PurchaseLinkRepository purchaseLinkRepository;
     private final CategoryRepository categoryRepository;
     private final ReviewRepository reviewRepository;
+    private final LikeRepository likeRepository;
+    private final MemberRepository memberRepository;
 
     @Override
     public ProductResponseDTO.ProductSlice getProductsByStatusTypeAndCategory(Long categoryId, StatusType status,
@@ -63,6 +70,7 @@ public List<Category> getCategories() {
 
     @Override
     public ProductResponseDTO.Detail getProductDetail(Long productId, Pageable pageable) {
+        Member member = validateMember();
         Product product = getProduct(productId);
         List<ImageResponseDTO> imagePaths =
                 productImageRepository.findAllByProduct(product).stream().map(ProductConverter::toImageDTO).toList();
@@ -71,17 +79,26 @@ public ProductResponseDTO.Detail getProductDetail(Long productId, Pageable pagea
         Page<Review> reviewPage = reviewRepository.findAllByProductPurchaseLink(productId,pageable);
 
         ProductResponseDTO.Single detail = ProductConverter.toSingleDTO(product, reviewPage.getTotalElements(), imagePaths, purchaseLinkList);
-        List<LimitedReviewResponseDTO.Single> reviewList = reviewPage.stream().map(ReviewConverter::toLimitedSingleDto).toList();
+        List<LimitedReviewResponseDTO.Single> reviewList = reviewPage.stream().map(review -> {
+            Boolean isLiked = likeRepository.existsByMemberAndReview(member, review);
+            return ReviewConverter.toLimitedSingleDto(review, isLiked);
+        }).toList();
+
         LimitedReviewResponseDTO.ReviewPaging reviewPaging = ReviewConverter.toLimitedPagingDTO(reviewPage,reviewList);
 
         return ProductConverter.toDetailDTO(detail,reviewPaging);
     }
 
     @Override
     public LimitedReviewResponseDTO.ReviewPaging getReviewsByProductId(Long productId, Pageable pageable) {
+        Member member = validateMember();
         Page<Review> reviewPage = reviewRepository.findAllByProductPurchaseLink(productId,pageable);
 
-        List<LimitedReviewResponseDTO.Single> reviewList = reviewPage.stream().map(ReviewConverter::toLimitedSingleDto).toList();
+        List<LimitedReviewResponseDTO.Single> reviewList = reviewPage.stream().map(review -> {
+            Boolean isLiked = likeRepository.existsByMemberAndReview(member, review);
+            return ReviewConverter.toLimitedSingleDto(review, isLiked);
+        }).toList();
+
         return ReviewConverter.toLimitedPagingDTO(reviewPage,reviewList);
     }
     @Transactional
@@ -113,5 +130,10 @@ private Product getProduct(Long productId){
         return productRepository.findById(productId).orElseThrow(()->new GeneralException(ErrorStatus.PRODUCT_NOT_FOUND));
     }
 
+    private Member validateMember() {
+        return memberRepository.findByEmail(SecurityUtil.getEmail()).orElseThrow(
+                () -> new MemberException(ErrorStatus.MEMBER_NOT_FOUND));
+    }
+
 
 }

koview-server/src/main/java/com/koview/koview_server/purchaseLink/domain/QueryPurchaseLink.java

@@ -0,0 +1,33 @@
+package com.koview.koview_server.purchaseLink.domain;
+
+import com.koview.koview_server.query.domain.Query;
+import jakarta.persistence.*;
+import lombok.*;
+
+@Entity
+@Getter
+@Setter
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+public class QueryPurchaseLink {
+    @Id
+    @Column(name = "query_purchase_link_id")
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @ManyToOne
+    @JoinColumn(name = "purchase_link_id", nullable = true)
+    private PurchaseLink purchaseLink;
+
+    @ManyToOne
+    @JoinColumn(name = "query_id", nullable = false)
+    private Query query;
+
+    public void setQuery(Query query){
+        if(this.query != null)
+            this.query.getQueryPurchaseLinkList().remove(this);
+        this.query=query;
+        this.query.getQueryPurchaseLinkList().add(this);
+    }
+}