From f7b185b41d9a608c2cfc1854abe0db8373007a82 Mon Sep 17 00:00:00 2001
From: Chanhyeok Seo <popcorn@g.hongik.ac.kr>
Date: Wed, 18 Sep 2024 16:20:20 +0900
Subject: [PATCH] fix: bug on like API (#158)

---
 .../repository/ProductRepositoryCustom.java   |  2 -
 .../repository/ProductRepositoryImpl.java     | 42 +++----------------
 2 files changed, 6 insertions(+), 38 deletions(-)

diff --git a/src/main/java/com/example/repick/domain/product/repository/ProductRepositoryCustom.java b/src/main/java/com/example/repick/domain/product/repository/ProductRepositoryCustom.java
index 2c4183b5..3d906951 100644
--- a/src/main/java/com/example/repick/domain/product/repository/ProductRepositoryCustom.java
+++ b/src/main/java/com/example/repick/domain/product/repository/ProductRepositoryCustom.java
@@ -44,8 +44,6 @@ Page<GetProductThumbnail> findHighestDiscountProducts(
 
     List<GetProductByClothingSalesDto> findProductDtoByClothingSalesId(long clothingSalesId);
 
-    List<Product> findByProductSellingStateType(ProductStateType productStateType);
-
     List<GetBrandList> getBrandList();
 
     List<Product> findRecommendation(Long userId);
diff --git a/src/main/java/com/example/repick/domain/product/repository/ProductRepositoryImpl.java b/src/main/java/com/example/repick/domain/product/repository/ProductRepositoryImpl.java
index 32750794..241c43b8 100644
--- a/src/main/java/com/example/repick/domain/product/repository/ProductRepositoryImpl.java
+++ b/src/main/java/com/example/repick/domain/product/repository/ProductRepositoryImpl.java
@@ -12,7 +12,6 @@
 import com.querydsl.core.types.Projections;
 import com.querydsl.core.types.dsl.BooleanExpression;
 import com.querydsl.core.types.dsl.CaseBuilder;
-import com.querydsl.core.types.dsl.Expressions;
 import com.querydsl.core.types.dsl.StringExpression;
 import com.querydsl.jpa.JPAExpressions;
 import com.querydsl.jpa.impl.JPAQuery;
@@ -69,8 +68,6 @@ private Page<GetProductThumbnail> findProducts(
                 .on(product.id.eq(productCategory.product.id))
                 .leftJoin(productMaterial)
                 .on(product.id.eq(productMaterial.product.id))
-                .leftJoin(productState)
-                .on(product.id.eq(productState.productId))
                 .where(
                         keywordFilter(productFilter.keyword()),
                         genderFilter(productFilter.gender()),
@@ -82,7 +79,7 @@ private Page<GetProductThumbnail> findProducts(
                         sizesFilter(productFilter.sizes()),
                         materialsFilter(productFilter.materials()),
                         deletedFilter(),
-                        sellingStateFilter(ProductStateType.SELLING))
+                        sellingStateFilter())
                 .distinct()
                 .orderBy(orderBy);
 
@@ -138,7 +135,8 @@ public Page<GetProductThumbnail> findLikedProducts(String category, Long userId,
                 .where(
                         likeFilter(userId),
                         categoryFilter(category, false),
-                        deletedFilter())
+                        deletedFilter(),
+                        sellingStateFilter())
                 .distinct()
                 .orderBy(productLike.id.desc());
         long total = query.stream().count();
@@ -257,24 +255,8 @@ private BooleanExpression deletedFilter() {
         return product.isDeleted.eq(false);
     }
 
-    private BooleanExpression sellingStateFilter(ProductStateType productStateType) {
-        if (productStateType == null) {
-            return null;
-        }
-
-        QProductState subProductState = new QProductState("subProductState");
-
-        return productState.id.in(
-                JPAExpressions
-                        .select(subProductState.id)
-                        .from(subProductState)
-                        .where(subProductState.id.in(
-                                JPAExpressions
-                                        .select(productState.id.max())
-                                        .from(productState)
-                                        .groupBy(productState.productId)
-                        ).and(subProductState.productStateType.eq(ProductStateType.SELLING)))
-        );
+    private BooleanExpression sellingStateFilter() {
+        return product.productState.eq(ProductStateType.SELLING);
     }
 
     private BooleanExpression stylesFilter(List<String> styles) {
@@ -311,13 +293,11 @@ public Page<GetProductThumbnail> findMainPageRecommendation(Pageable pageable, L
                 .on(product.id.eq(productStyle.product.id))
                 .leftJoin(productCategory)
                 .on(product.id.eq(productCategory.product.id))
-                .leftJoin(productState)
-                .on(product.id.eq(productState.productId))
                 .where(
                     genderFilter(gender),
                     subCategoryFilter(subCategories),
                     deletedFilter(),
-                    sellingStateFilter(ProductStateType.SELLING))
+                    sellingStateFilter())
                 .distinct()
                 .orderBy(product.id.desc());
         long total = query.stream().count();
@@ -348,16 +328,6 @@ public List<GetProductByClothingSalesDto> findProductDtoByClothingSalesId(long c
                 .fetch();
     }
 
-    @Override
-    public List<Product> findByProductSellingStateType(ProductStateType productStateType) {
-        return jpaQueryFactory
-                .selectFrom(product)
-                .leftJoin(productState)
-                .on(product.id.eq(productState.productId))
-                .where(sellingStateFilter(productStateType))
-                .fetch();
-    }
-
     @Override
     public List<GetBrandList> getBrandList() {
         return jpaQueryFactory