Merge pull request #65 from Kusitms-29th-Kobaco-A/fix/top-view-ad

fix : 최근 인기있는 영상 정렬을 조회수 기반으로 변경

Author: tlarbals824

kobaco/kobaco/src/main/java/core/kobaco/application/advertise/service/AdvertiseService.java

@@ -76,12 +76,8 @@ public Page<AdvertiseSimpleResponse> getSaveAdvertiseList(Pageable pageable) {
     }
 
     public Page<AdvertiseSimpleResponse> getLikeAdvertiseList(Pageable pageable, List<String> keywordList) {
-        List<AdvertiseSimpleResponse> advertiseSimpleResponses =
-            advertiseLikeReader.getLikeAdvertiseIdList(pageable, keywordList).stream()
-                .map(advertiseReader::getAdvertise)
-                .map(this::convertSimpleResponse)
-                .toList();
-        return new PageImpl<>(advertiseSimpleResponses, pageable, advertiseSimpleResponses.size());
+        return advertiseReader.getAllTopViewAdvertiseList(pageable, keywordList)
+            .map(this::convertSimpleResponse);
     }
 
     public Page<AdvertiseSimpleResponse> getAdvertiseList(Pageable pageable, List<String> keywordList, OrderType orderType) {
@@ -117,7 +113,6 @@ public void trendAdvertise(Long advertiseId, AdvertiseTrendCreateRequest request
 
     private AdvertiseSimpleResponse convertSimpleResponse(Advertisement advertise) {
         List<String> advertiseKeywordList = getKeywordList(advertise);
-
         return AdvertiseSimpleResponse.of(advertise, advertiseKeywordList);
     }
 

kobaco/kobaco/src/main/java/core/kobaco/domain/advertise/AdvertisementRepository.java

@@ -22,4 +22,6 @@ public interface AdvertisementRepository {
     Page<Advertisement> findAllByMakerCompanyAndAdvertiseId(Pageable pageable, String makerCompany, Long advertiseId);
 
     void upViewCount(Long advertiseId);
+
+    Page<Advertisement> findAllOrderByViewCount(Pageable pageable, List<String> keywordList);
 }

kobaco/kobaco/src/main/java/core/kobaco/domain/advertise/service/AdvertiseReader.java

@@ -38,6 +38,10 @@ public Page<Advertisement> getAllAdvertiseList(Pageable pageable,
         return advertisementRepository.findAllWithKeyword(pageable, keywordList, orderType);
     }
 
+    public Page<Advertisement> getAllTopViewAdvertiseList(Pageable pageable, List<String> keywordList) {
+        return advertisementRepository.findAllOrderByViewCount(pageable, keywordList);
+    }
+
     public Page<Advertisement> getSaveAdvertiseList(Long requestUserId, Pageable pageable) {
         return advertisementRepository.findSavedAllByUserId(pageable, requestUserId);
     }

kobaco/kobaco/src/main/java/core/kobaco/infra/jpa/advertisement/AdvertisementRepositoryImpl.java

@@ -85,4 +85,14 @@ public Page<Advertisement> findAllByMakerCompanyAndAdvertiseId(Pageable pageable
     public void upViewCount(Long advertiseId) {
         advertisementJpaRepository.updateViewCount(advertiseId);
     }
+
+    @Override
+    public Page<Advertisement> findAllOrderByViewCount(Pageable pageable, List<String> keywordList) {
+        if(Objects.isNull(keywordList)||keywordList.isEmpty()){
+            return advertisementJpaRepository.findAllOrderByViewCount(pageable)
+                .map(advertiseMapper::toDomain);
+        }
+        return advertisementJpaRepository.findAllWithKeywordOrderByViewCount(pageable, keywordList, (long) keywordList.size())
+            .map(advertiseMapper::toDomain);
+    }
 }