[refactor] isScrap 처리

Hooking-CEOS · Jul 29, 2023 · 94c40e1 · 94c40e1
1 parent 2c8be5d
commit 94c40e1
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/src/main/java/shop/hooking/hooking/controller/CopyController.java b/src/main/java/shop/hooking/hooking/controller/CopyController.java
@@ -52,9 +52,10 @@ public class CopyController {
     // 페이지네이션
     @GetMapping("/{index}")
     public ResponseEntity<HttpRes<List<CopyRes>>> copyList(HttpServletRequest httpRequest, @PathVariable int index) {
-
+        User user = jwtTokenProvider.getUserInfoByToken(httpRequest);
         int limit = 30;
         List<CopyRes> resultCopyRes = copyService.getCopyListFromBrandsAndSetScrapCnt(httpRequest,index,limit);
+        copyService.setIsScrapWithUser(user, resultCopyRes);
         return ResponseEntity.ok(new HttpRes<>(resultCopyRes));
 
     }
@@ -65,7 +66,13 @@ public ResponseEntity<HttpRes<List<CopyRes>>> copyList(HttpServletRequest httpRe
     public ResponseEntity<CopySearchRes> copySearchList(HttpServletRequest httpRequest,
                                                         @RequestParam(name = "keyword") String q,
                                                         @PathVariable int index) {
+        User user = jwtTokenProvider.getUserInfoByToken(httpRequest);
         CopySearchRes response = copyService.copySearchList(httpRequest, q, index);
+        List<CopySearchResult> copySearchResults = response.getData();
+        for(CopySearchResult copySearchResult : copySearchResults){
+            List<CopyRes> copyRes = copySearchResult.getData();
+            copyService.setIsScrapWithUser(user, copyRes);
+        }
         if (response.getCode() == HttpStatus.BAD_REQUEST.value()) {
             return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response);
         } else {
@@ -126,10 +133,12 @@ public ResponseEntity<HttpRes<String>> saveCrawling(@RequestBody CrawlingReq cra
     // 카피라이팅 필터링
     @GetMapping("/filter/{index}")
     public ResponseEntity<List<CopyRes>> searchFilterCard(HttpServletRequest httpRequest, @PathVariable int index, CardSearchCondition condition) {
+        User user = jwtTokenProvider.getUserInfoByToken(httpRequest);
         List<CopyRes> resultCopyRes = copyService.searchFilterCard(httpRequest, index, condition);
         if (resultCopyRes.isEmpty()) {
             return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(null);
         }
+        copyService.setIsScrapWithUser(user,resultCopyRes);
         return ResponseEntity.status(HttpStatus.OK).body(resultCopyRes);
     }
 

diff --git a/src/main/java/shop/hooking/hooking/dto/response/CopyRes.java b/src/main/java/shop/hooking/hooking/dto/response/CopyRes.java
@@ -24,6 +24,7 @@ public class CopyRes implements Comparable<CopyRes>{
     private LocalDateTime createdAt;
     private List<Integer> index;
     private LocalDateTime scrapTime;
+    private Integer isScrap;
 
     @Builder
     @QueryProjection
@@ -42,7 +43,6 @@ public CopyRes(Long id, Brand brand, String text, LocalDateTime createdAt) {
         this.text = text;
         this.scrapCnt = 0;
         this.createdAt = createdAt;
-
     }
 
     //왜안됨..?

diff --git a/src/main/java/shop/hooking/hooking/service/CopyService.java b/src/main/java/shop/hooking/hooking/service/CopyService.java
@@ -53,7 +53,16 @@ public List<CopyRes> getCopyList(Long brandId) {
         return copyResList;
     }
 
+    public void setIsScrapWithUser(User user, List<CopyRes> copyResList) {
+        List<Scrap> scraps = scrapRepository.findScrapByUser(user);
 
+        // cardList의 id와 scraps의 card_id를 비교하여 isScrap 값을 설정
+        for (CopyRes copyRes : copyResList) {
+            long cardId = copyRes.getId();
+            boolean isScrapFound = scraps.stream().anyMatch(scrap -> scrap.getCard().getId() == cardId);
+            copyRes.setIsScrap(isScrapFound ? 1 : 0);
+        }
+    }
     @Transactional
 
     public void saveCrawlingData(List<CrawlingData> dataList) {