Feature/kariskan step3

src/main/java/org/c4marathon/assignment/domain/consumer/service/ConsumerService.java

@@ -107,10 +107,18 @@ public void confirmOrder(Long orderId, Consumer consumer) {
 		order.updateOrderStatus(CONFIRM);
 		List<OrderProduct> orderProducts = orderProductReadService.findByOrderJoinFetchProductAndSeller(orderId);
 		addSellerBalance(orderProducts);
+		addOrderCount(orderProducts);
 
 		savePointLog(consumer, order, true);
 	}
 
+	/**
+	 * 주문 시 product에 대한 구매 횟수를 증가함
+	 */
+	private void addOrderCount(List<OrderProduct> orderProducts) {
+		orderProducts.forEach(orderProduct -> orderProduct.getProduct().increaseOrderCount());
+	}
+
 	private void saveOrderInfo(PurchaseProductRequest request, Consumer consumer, Order order,
 		List<OrderProduct> orderProducts, long totalAmount) {
 		orderProductJdbcRepository.saveAllBatch(orderProducts);

src/main/java/org/c4marathon/assignment/domain/deliverycompany/service/DeliveryCompanyService.java

@@ -54,7 +54,7 @@ private void validateRequest(UpdateDeliveryStatusRequest request, Delivery deliv
 	 */
 	private boolean isInvalidChangeStatus(DeliveryStatus future, DeliveryStatus current) {
 		return future.isPending()
-			|| (future.isDelivering() && !current.isPending())
-			|| (future.isDelivered() && !current.isDelivering());
+			   || (future.isDelivering() && !current.isPending())
+			   || (future.isDelivered() && !current.isDelivering());
 	}
 }

src/main/java/org/c4marathon/assignment/domain/orderproduct/repository/OrderProductRepository.java

@@ -14,4 +14,15 @@ public interface OrderProductRepository extends JpaRepository<OrderProduct, Long
 
 	@Query("select op from OrderProduct op join fetch op.product join fetch op.product.seller where op.order.id = :id")
 	List<OrderProduct> findByOrderJoinFetchProductAndSeller(@Param("id") Long orderId);
+
+	@Query(value = "select order_id from order_product_tbl op where op.product_id = :product_id", nativeQuery = true)
+	List<Long> findOrderIdByProductId(@Param("product_id") Long id);
+
+	@Query(value = """
+		select count(*)
+		from order_tbl o
+		where consumer_id = :consumer_id
+		  and order_id in (:ids)
+		""", nativeQuery = true)
+	Long countByIdsAndConsumerId(@Param("ids") List<Long> ids, @Param("consumer_id") Long consumerId);
 }

src/main/java/org/c4marathon/assignment/domain/orderproduct/service/OrderProductReadService.java

@@ -30,4 +30,13 @@ public List<OrderProduct> findByOrderJoinFetchProduct(Long orderId) {
 	public List<OrderProduct> findByOrderJoinFetchProductAndSeller(Long orderId) {
 		return orderProductRepository.findByOrderJoinFetchProductAndSeller(orderId);
 	}
+
+	/**
+	 * consumer id와 product id로 구매 이력 조회
+	 */
+	@Transactional(readOnly = true)
+	public boolean existsByConsumerIdAndProductId(Long consumerId, Long productId) {
+		List<Long> orderIds = orderProductRepository.findOrderIdByProductId(productId);
+		return orderProductRepository.countByIdsAndConsumerId(orderIds, consumerId) > 0;
+	}
 }

src/main/java/org/c4marathon/assignment/domain/product/controller/ProductController.java

@@ -0,0 +1,27 @@
+package org.c4marathon.assignment.domain.product.controller;
+
+import org.c4marathon.assignment.domain.product.dto.request.ProductSearchRequest;
+import org.c4marathon.assignment.domain.product.dto.response.ProductSearchResponse;
+import org.c4marathon.assignment.domain.product.service.ProductReadService;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/products")
+public class ProductController {
+
+	private final ProductReadService productReadService;
+
+	@GetMapping
+	public ProductSearchResponse searchProduct(
+		@Valid @ModelAttribute ProductSearchRequest request
+	) {
+		return productReadService.searchProduct(request);
+	}
+}

src/main/java/org/c4marathon/assignment/domain/product/dto/request/ProductSearchRequest.java

@@ -0,0 +1,50 @@
+package org.c4marathon.assignment.domain.product.dto.request;
+
+import java.time.LocalDateTime;
+
+import org.c4marathon.assignment.global.constant.SortType;
+
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+import lombok.Builder;
+
+public record ProductSearchRequest(
+	@NotNull @Size(min = 2, message = "keyword length less than 2") String keyword,
+	@NotNull SortType sortType,
+	LocalDateTime createdAt,
+	Long productId,
+	Long amount,
+	Long orderCount,
+	Double score,
+	int pageSize
+) {
+
+	@Builder
+	public ProductSearchRequest(
+		String keyword,
+		SortType sortType,
+		LocalDateTime createdAt,
+		Long productId,
+		Long amount,
+		Long orderCount,
+		Double score,
+		int pageSize
+	) {
+		this.keyword = keyword;
+		this.sortType = sortType;
+		this.createdAt = setDefaultValue(createdAt, LocalDateTime.now());
+		this.productId = setDefaultValue(productId, Long.MIN_VALUE);
+		this.amount = setDefaultValue(amount, getDefaultAmount(sortType));
+		this.orderCount = setDefaultValue(orderCount, Long.MAX_VALUE);
+		this.score = setDefaultValue(score, Double.MAX_VALUE);
+		this.pageSize = pageSize;
+	}
+
+	private <T> T setDefaultValue(T value, T defaultValue) {
+		return value != null ? value : defaultValue;
+	}
+
+	private Long getDefaultAmount(SortType sortType) {
+		return sortType == SortType.PRICE_ASC ? Long.MIN_VALUE : Long.MAX_VALUE;
+	}
+}

src/main/java/org/c4marathon/assignment/domain/product/dto/response/ProductSearchEntry.java

@@ -0,0 +1,15 @@
+package org.c4marathon.assignment.domain.product.dto.response;
+
+import java.time.LocalDateTime;
+
+public record ProductSearchEntry(
+	long id,
+	String name,
+	String description,
+	long amount,
+	int stock,
+	LocalDateTime createdAt,
+	Long orderCount,
+	Double avgScore
+) {
+}

src/main/java/org/c4marathon/assignment/domain/product/dto/response/ProductSearchResponse.java

@@ -0,0 +1,23 @@
+package org.c4marathon.assignment.domain.product.dto.response;
+
+import java.util.List;
+
+import org.c4marathon.assignment.domain.product.entity.Product;
+
+public record ProductSearchResponse(
+	List<ProductSearchEntry> productSearchEntries
+) {
+	public static ProductSearchResponse of(List<Product> products) {
+		return new ProductSearchResponse(products.stream()
+			.map(product -> new ProductSearchEntry(
+				product.getId(),
+				product.getName(),
+				product.getDescription(),
+				product.getAmount(),
+				product.getStock(),
+				product.getCreatedAt(),
+				product.getOrderCount(),
+				product.getAvgScore()))
+			.toList());
+	}
+}

src/main/java/org/c4marathon/assignment/domain/product/entity/Product.java

@@ -28,7 +28,12 @@
 @Table(
 	name = "product_tbl",
 	indexes = {
-		@Index(name = "product_name_seller_id_idx", columnList = "name,seller_id")
+		@Index(name = "product_name_seller_id_idx", columnList = "name,seller_id"),
+		@Index(name = "amount_product_id_idx", columnList = "amount, product_id"),
+		@Index(name = "amount_desc_product_id_idx", columnList = "amount desc, product_id"),
+		@Index(name = "created_at_product_id_idx", columnList = "created_at desc, product_id"),
+		@Index(name = "avg_score_desc_product_id_idx", columnList = "avg_score desc, product_id asc"),
+		@Index(name = "order_count_desc_product_id_idx", columnList = "order_count desc, product_id")
 	}
 )
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
@@ -64,6 +69,14 @@ public class Product extends BaseEntity {
 	@Column(name = "status", columnDefinition = "VARCHAR(20)")
 	private ProductStatus productStatus;
 
+	@NotNull
+	@Column(name = "avg_score", columnDefinition = "DECIMAL(5, 4) DEFAULT 0.0000")
+	private Double avgScore;
+
+	@NotNull
+	@Column(name = "order_count", columnDefinition = "BIGINT DEFAULT 0")
+	private Long orderCount;
+
 	@Builder
 	public Product(
 		String name,
@@ -78,6 +91,8 @@ public Product(
 		this.stock = stock;
 		this.seller = seller;
 		this.productStatus = IN_STOCK;
+		this.orderCount = 0L;
+		this.avgScore = (double)0;
 	}
 
 	public void decreaseStock(Integer quantity) {
@@ -90,4 +105,12 @@ public void decreaseStock(Integer quantity) {
 	public boolean isSoldOut() {
 		return this.productStatus == OUT_OF_STOCK;
 	}
+
+	public void increaseOrderCount() {
+		this.orderCount++;
+	}
+
+	public void updateAvgScore(Double avgScore) {
+		this.avgScore = avgScore;
+	}
 }

src/main/java/org/c4marathon/assignment/domain/product/repository/ProductRepository.java

@@ -1,5 +1,7 @@
 package org.c4marathon.assignment.domain.product.repository;
 
+import java.time.LocalDateTime;
+import java.util.List;
 import java.util.Optional;
 
 import org.c4marathon.assignment.domain.product.entity.Product;
@@ -18,4 +20,88 @@ public interface ProductRepository extends JpaRepository<Product, Long> {
 	@Lock(LockModeType.PESSIMISTIC_WRITE)
 	@Query("select p from Product p join fetch p.seller where p.id = :id")
 	Optional<Product> findByIdJoinFetch(@Param("id") Long id);
+
+	@Query(value = """
+		select count(*)
+		from product_tbl p
+		where p.product_id = :product_id
+		""", nativeQuery = true)
+	Long findReviewCount(@Param("product_id") Long id);
+
+	@Query(value = """
+		select *
+		from product_tbl p
+		where name like :keyword
+		  and (p.created_at < :createdAt or (p.created_at = :createdAt and p.product_id > :id))
+		order by p.created_at desc, p.product_id
+		limit :pageSize
+		""", nativeQuery = true)
+	List<Product> findByNewest(
+		@Param("keyword") String keyword,
+		@Param("createdAt") LocalDateTime createdAt,
+		@Param("id") Long id,
+		@Param("pageSize") int pageSize
+	);
+
+	@Query(value = """
+		select *
+		from product_tbl p
+		where name like :keyword
+		  and (p.amount > :amount or (p.amount = :amount and p.product_id > :id))
+		order by p.amount, p.product_id
+		limit :pageSize
+		""", nativeQuery = true)
+	List<Product> findByPriceAsc(
+		@Param("keyword") String keyword,
+		@Param("amount") Long amount,
+		@Param("id") Long id,
+		@Param("pageSize") int pageSize
+	);
+
+	@Query(value = """
+		select *
+		from product_tbl p
+		where (p.amount < :amount or (p.amount = :amount and p.product_id > :id))
+		  and name like :keyword
+		order by p.amount desc, p.product_id
+		limit :pageSize
+		""", nativeQuery = true)
+	List<Product> findByPriceDesc(
+		@Param("keyword") String keyword,
+		@Param("amount") Long amount,
+		@Param("id") Long id,
+		@Param("pageSize") int pageSize
+	);
+
+	@Query(value = """
+		select *
+		from product_tbl
+		where name like :keyword
+		    and order_count <= :order_count
+		   or (order_count = :order_count and product_id > :product_id)
+		order by order_count desc, product_id
+		limit :pageSize
+		""", nativeQuery = true)
+	List<Product> findByPopularity(
+		@Param("keyword") String keyword,
+		@Param("order_count") Long orderCount,
+		@Param("product_id") Long id,
+		@Param("pageSize") int pageSize
+	);
+
+	@Query(value = """
+		select *
+		from product_tbl
+		where name like :keyword
+		    and avg_score <= :avgScore
+		   or (avg_score = :avgScore and product_id > :product_id)
+		order by avg_score desc, product_id
+		limit :pageSize
+		""", nativeQuery = true)
+	List<Product> findByTopRated(
+		@Param("keyword") String keyword,
+		@Param("avgScore") Double avgScore,
+		@Param("product_id") Long id,
+		@Param("pageSize") int pageSize
+	);
 }

src/main/java/org/c4marathon/assignment/domain/product/service/ProductReadService.java

@@ -1,5 +1,9 @@
 package org.c4marathon.assignment.domain.product.service;
 
+import java.util.List;
+
+import org.c4marathon.assignment.domain.product.dto.request.ProductSearchRequest;
+import org.c4marathon.assignment.domain.product.dto.response.ProductSearchResponse;
 import org.c4marathon.assignment.domain.product.entity.Product;
 import org.c4marathon.assignment.domain.product.repository.ProductRepository;
 import org.c4marathon.assignment.domain.seller.entity.Seller;
@@ -31,4 +35,37 @@ public Product findById(Long id) {
 		return productRepository.findByIdJoinFetch(id)
 			.orElseThrow(() -> ErrorCode.PRODUCT_NOT_FOUND.baseException("id: %d", id));
 	}
+
+	@Transactional(readOnly = true)
+	public Long findReviewCount(Long productId) {
+		return productRepository.findReviewCount(productId);
+	}
+
+	/**
+	 * sortType에 해당하는 조건으로 pagination
+	 * Newest: 최신순, created_at desc, product_id asc
+	 * PriceAsc: 가격 낮은 순, amount asc, product_id asc
+	 * PriceDesc: 가격 높은 순, amount desc, product_id asc
+	 * Popularity: 인기 순(주문 많은 순), order_count desc, product_id asc
+	 * TopRated: 평점 높은 순(review score), avg_score desc, product_id asc
+	 */
+	@Transactional(readOnly = true)
+	public ProductSearchResponse searchProduct(ProductSearchRequest request) {
+		String keyword = toQueryKeyword(request.keyword());
+		Long productId = request.productId();
+		int pageSize = request.pageSize();
+
+		List<Product> products = switch (request.sortType()) {
+			case NEWEST -> productRepository.findByNewest(keyword, request.createdAt(), productId, pageSize);
+			case PRICE_ASC -> productRepository.findByPriceAsc(keyword, request.amount(), productId, pageSize);
+			case PRICE_DESC -> productRepository.findByPriceDesc(keyword, request.amount(), productId, pageSize);
+			case POPULARITY -> productRepository.findByPopularity(keyword, request.orderCount(), productId, pageSize);
+			case TOP_RATED -> productRepository.findByTopRated(keyword, request.score(), productId, pageSize);
+		};
+		return ProductSearchResponse.of(products);
+	}
+
+	private String toQueryKeyword(String keyword) {
+		return "%" + keyword + "%";
+	}
 }