Merge pull request #63 from Hooking-CEOS/feature/brand

[feat] 카피 전체 조회시 브랜드별 최신 5개
Hooking-CEOS · Jul 22, 2023 · 45c76f7 · 45c76f7
2 parents bc8849b + a33a6e7
commit 45c76f7
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/src/main/java/shop/hooking/hooking/controller/CopyController.java b/src/main/java/shop/hooking/hooking/controller/CopyController.java
@@ -46,8 +46,14 @@ public class CopyController {
     // 전체 카피라이팅 조회
     @GetMapping("")
     public HttpRes<List<CopyRes>> copyList() {
-        List<CopyRes> copyRes = copyService.getCopyList();
-        List<CopyRes> limitedCopyRes = getLimitedCopyRes(copyRes,30);
+        Long[] brandIds = {2L, 17L, 4L, 28L, 3L, 21L, 25L, 24L, 15L};
+
+        List<CopyRes> limitedCopyRes = new ArrayList<>();
+
+        for (Long brandId : brandIds) {
+            List<CopyRes> copyRes = copyService.getCopyList(brandId);
+            limitedCopyRes.addAll(getLimitedCopyRes(copyRes, 30));
+        }
 
         return new HttpRes<>(limitedCopyRes);
     }

diff --git a/src/main/java/shop/hooking/hooking/repository/CardRepository.java b/src/main/java/shop/hooking/hooking/repository/CardRepository.java
@@ -1,6 +1,7 @@
 package shop.hooking.hooking.repository;
 
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 import shop.hooking.hooking.entity.Brand;
 import shop.hooking.hooking.entity.Card;
@@ -11,6 +12,8 @@
 @Repository
 public interface CardRepository extends JpaRepository<Card, Long>{
 
+    List<Card> findTop5ByBrandIdOrderByCreatedAtDesc(Long brandId);
+
 
     Card findCardByBrandId(Long brandId); //  브랜드 아이디로 카피라이팅 카드 찾기
 

diff --git a/src/main/java/shop/hooking/hooking/service/CopyService.java b/src/main/java/shop/hooking/hooking/service/CopyService.java
@@ -30,13 +30,13 @@ public class CopyService {
 
 
     @Transactional
-    public List<CopyRes> getCopyList() {
-        List<Card> cards = cardRepository.findAll(); //카피 다가져옴
+    public List<CopyRes> getCopyList(Long brandId) {
+        List<Card> cards = cardRepository.findTop5ByBrandIdOrderByCreatedAtDesc(brandId);
         List<CopyRes> copyResList = new ArrayList<>();
 
         for (Card card : cards) {
-            CopyRes copyRes = createCopyRes(card); //하나씩 card 객체 생성
-            copyResList.add(copyRes); //하나씩 cardRes를 List에 add
+            CopyRes copyRes = createCopyRes(card);
+            copyResList.add(copyRes);
         }
 
         return copyResList;