Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -127,4 +127,14 @@ public ApiResponse<UserBasedRecommendationResponseDto> getUserBasedRecommendatio
return ApiResponse.onSuccess(productService.getUserBasedRecommendation(user));
}

@GetMapping("/my-like")
@Operation(summary = "내가 좋아요 한 상품", description ="내가 좋아요한 상품 페이징")
public ApiResponse<PageResponseDto<ProductSearchResponseDto.ProductPrevDto>> getMyLikedProducts(@CurrentUser User user,
@RequestParam(defaultValue = "1") int page,
@RequestParam(defaultValue = "20") int size){
Pageable pageable = PageRequest.of(page - 1, size, Sort.by("createdAt").descending()); // 0-based

return ApiResponse.onSuccess(productService.getMyLikedProducts(user, pageable));
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@
@Builder
public class UserBasedRecommendationResponseDto {
private String message;
private ProductSearchResponseDto.SearchResultPrevDto standardProduct;
private ProductSearchResponseDto.ProductPrevDto standardProduct;
private List<ProductSearchResponseDto.ProductPrevDto> products;
}
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@ public class Product extends BaseEntity {
@OneToMany(mappedBy = "product", cascade = CascadeType.REMOVE, orphanRemoval = true)
private List<UserBehavior> userBehaviors = new ArrayList<>();

@OneToMany(mappedBy = "product", cascade = CascadeType.REMOVE, orphanRemoval = true)
private List<ProductLike> productLikes = new ArrayList<>();

/**
* 상품의 대표 이미지를 새로운 URL로 업데이트
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,7 @@ Slice<Product> findCompletedProductsByCursor(@Param("cursorId") Long cursorId,

@Query(value = "SELECT p.product_id FROM product p JOIN user_behavior ub ON p.product_id = ub.product_id WHERE ub.user_id = :userId AND ub.behavior = :behavior ORDER BY RAND() LIMIT 1", nativeQuery = true)
Optional<Long> findRandomProductIdByUserIdAndBehavior(@Param("userId") Long userId, @Param("behavior") Behavior behavior);

@Query("SELECT pl.product FROM ProductLike pl WHERE pl.user.id = :userId")
Page<Product> findLikedProductsByUserId(@Param("userId") Long userId, Pageable pageable);
}
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,16 @@ public PageResponseDto<ProductRegisterHistoryDto> getRegisterHistory(User user,
return new PageResponseDto<>(result);
}

public PageResponseDto<ProductSearchResponseDto.ProductPrevDto> getMyLikedProducts(User user, Pageable pageable) {

Long userId = user.getId();

Page<Product> pagedProducts = productRepository.findLikedProductsByUserId(userId, pageable);
Page<ProductSearchResponseDto.ProductPrevDto> result = pagedProducts.map(ProductConverter::toProductPrevDto);

return new PageResponseDto<>(result);
}

public List<ProductSearchResponseDto.ProductPrevDto> getProductBasedRecommendation(Long productId, int limit) {

ProductBasedRecommendationRequestDto request =
Expand Down Expand Up @@ -239,10 +249,10 @@ public UserBasedRecommendationResponseDto getUserBasedRecommendation(User user)
.orElseThrow(()-> new GeneralException(NO_USER_BEHAVIOR_EXISTED));
Product standardProduct = productRepository.findById(standardProductId).orElseThrow(()->new GeneralException(NO_RESULT));

List<ProductSearchResponseDto.ProductPrevDto> products = getProductBasedRecommendation(standardProductId, 5);
List<ProductSearchResponseDto.ProductPrevDto> products = getProductBasedRecommendation(standardProductId, 10);

return UserBasedRecommendationResponseDto.builder()
.standardProduct(ProductConverter.toSearchResultPrevDto(standardProduct))
.standardProduct(ProductConverter.toProductPrevDto(standardProduct))
.message(message)
.products(products)
.build();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
@NoArgsConstructor(access = AccessLevel.PROTECTED)
public class ImageReport extends ReportRecord {

@Column(name = "image_url")
@Column(name = "image_url",length = 2048)
private String imageUrl;

}
Loading