Skip to content

Commit

Permalink
refactor: query 수정 및 테스트 수정
Browse files Browse the repository at this point in the history
  • Loading branch information
@wugawuga
wugawuga committed Jun 3, 2024
1 parent 6d73823 commit 92e8320
Show file tree
Hide file tree
Showing 2 changed files with 101 additions and 32 deletions.
77 changes: 45 additions & 32 deletions src/main/java/com/funeat/product/persistence/ProductRepositoryImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,22 +18,27 @@ public class ProductRepositoryImpl implements ProductRepositoryCustom {

@Override
public List<Product> searchProductsByTopTagsFirst(final Long tagId, final Pageable pageable) {
final String jpql = "SELECT DISTINCT p FROM Product p " +
"WHERE p.id IN ( " +
" SELECT p2.id FROM Product p2 " +
" JOIN p2.reviews r2 " +
" JOIN r2.reviewTags rt2 " +
" WHERE rt2.tag.id = :tagId AND rt2.tag.id IN ( " +
" SELECT rt3.tag.id FROM Review r3 " +
" JOIN r3.reviewTags rt3 " +
" WHERE r3.product.id = p2.id " +
" GROUP BY rt3.tag.id " +
" ORDER BY COUNT(rt3.tag.id) DESC " +
" ) " +
" GROUP BY p2.id " +
" HAVING COUNT(DISTINCT rt2.tag.id) <= 3 " +
") " +
"ORDER BY p.id DESC";
final String jpql = """
SELECT DISTINCT p\s
FROM Product p
WHERE p.id IN (
SELECT p2.id\s
FROM Product p2\s
JOIN p2.reviews r2\s
JOIN r2.reviewTags rt2\s
WHERE rt2.tag.id = :tagId\s
AND rt2.tag.id IN (
SELECT rt3.tag.id\s
FROM Review r3\s
JOIN r3.reviewTags rt3\s
WHERE r3.product.id = p2.id\s
GROUP BY rt3.tag.id\s
ORDER BY COUNT(rt3.tag.id) DESC\s
LIMIT 3
)
)
ORDER BY p.id DESC
""";

final TypedQuery<Product> query = entityManager.createQuery(jpql, Product.class);
query.setParameter("tagId", tagId);
Expand All @@ -45,22 +50,30 @@ public List<Product> searchProductsByTopTagsFirst(final Long tagId, final Pageab

@Override
public List<Product> searchProductsByTopTags(final Long tagId, final Long lastProductId, final Pageable pageable) {
final String jpql = "SELECT DISTINCT p FROM Product p " +
"WHERE p.id < :lastProductId AND p.id IN ( " +
" SELECT p2.id FROM Product p2 " +
" JOIN p2.reviews r2 " +
" JOIN r2.reviewTags rt2 " +
" WHERE rt2.tag.id = :tagId AND rt2.tag.id IN ( " +
" SELECT rt3.tag.id FROM Review r3 " +
" JOIN r3.reviewTags rt3 " +
" WHERE r3.product.id = p2.id " +
" GROUP BY rt3.tag.id " +
" ORDER BY COUNT(rt3.tag.id) DESC " +
" ) " +
" GROUP BY p2.id " +
" HAVING COUNT(DISTINCT rt2.tag.id) <= 3 " +
") " +
"ORDER BY p.id DESC";
final String jpql = """
SELECT DISTINCT p\s
FROM Product p\s
WHERE p.id < :lastProductId\s
AND p.id IN (
SELECT p2.id\s
FROM Product p2\s
JOIN p2.reviews r2\s
JOIN r2.reviewTags rt2\s
WHERE rt2.tag.id = :tagId\s
AND rt2.tag.id IN (
SELECT rt3.tag.id\s
FROM Review r3\s
JOIN r3.reviewTags rt3\s
WHERE r3.product.id = p2.id\s
GROUP BY rt3.tag.id\s
ORDER BY COUNT(rt3.tag.id) DESC\s
LIMIT 3
)
GROUP BY p2.id\s
HAVING COUNT(DISTINCT rt2.tag.id) <= 3\s
)\s
ORDER BY p.id DESC
""";

final TypedQuery<Product> query = entityManager.createQuery(jpql, Product.class);
query.setParameter("tagId", tagId);
Expand Down
56 changes: 56 additions & 0 deletions src/test/java/com/funeat/product/persistence/ProductRepositoryTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import static com.funeat.fixture.TagFixture.태그_맛있어요_TASTE_생성;
import static com.funeat.fixture.TagFixture.태그_단짠단짠_TASTE_생성;
import static com.funeat.fixture.TagFixture.태그_갓성비_PRICE_생성;
import static com.funeat.fixture.TagFixture.태그_간식_ETC_생성;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.SoftAssertions.assertSoftly;

Expand Down Expand Up @@ -291,4 +292,59 @@ class findAllByTagFirst_성공_테스트 {
.isEqualTo(expected);
}
}

@Nested
class findAllByTagFirst_실패_테스트 {

@Test
void 간식_태그는_4위이므로_검색되지_말아야한다() {
// given
final var category = 카테고리_간편식사_생성();
단일_카테고리_저장(category);

final var 태그_맛있어요 = 태그_맛있어요_TASTE_생성();
final var 태그_단짠단짠 = 태그_맛있어요_TASTE_생성();
final var 태그_갓성비 = 태그_맛있어요_TASTE_생성();
final var 태그_간식 = 태그_간식_ETC_생성();

final var 태그1 = 단일_태그_저장(태그_맛있어요);
final var 태그2 = 단일_태그_저장(태그_단짠단짠);
final var 태그3 = 단일_태그_저장(태그_갓성비);
final var 태그4 = 단일_태그_저장(태그_간식);

final var product1 = 상품_애플망고_가격3000원_평점5점_생성(category);
final var product2 = 상품_망고빙수_가격5000원_평점4점_생성(category);
final var product3 = 상품_망고빙수_가격5000원_평점4점_생성(category);
final var product4 = 상품_망고빙수_가격5000원_평점4점_생성(category);
복수_상품_저장(product1, product2, product3, product4);

final var member1 = 멤버_멤버1_생성();
final var member2 = 멤버_멤버2_생성();
복수_멤버_저장(member1, member2);

final var review1_1 = 리뷰_이미지test1_평점1점_재구매X_생성(member1, product1, 0L);
final var review1_2 = 리뷰_이미지test5_평점5점_재구매O_생성(member2, product1, 0L);
final var review2_1 = 리뷰_이미지test3_평점3점_재구매O_생성(member1, product2, 0L);
복수_리뷰_저장(review1_1, review1_2, review2_1);

복수_리뷰_태그_저장(
리뷰태그_생성(review1_1, 태그_맛있어요),
리뷰태그_생성(review1_1, 태그_맛있어요),
리뷰태그_생성(review1_1, 태그_단짠단짠),
리뷰태그_생성(review1_1, 태그_단짠단짠),
리뷰태그_생성(review1_1, 태그_갓성비),
리뷰태그_생성(review1_1, 태그_갓성비),
리뷰태그_생성(review1_1, 태그_간식),
리뷰태그_생성(review1_1, 태그_맛있어요),
리뷰태그_생성(review1_2, 태그_단짠단짠),
리뷰태그_생성(review2_1, 태그_맛있어요)
);

// when
final var actual = productRepository.searchProductsByTopTagsFirst(태그4, PageRequest.of(0, 10));

// then
assertThat(actual).isEmpty();
}
}
}

0 comments on commit 92e8320

Please sign in to comment.