Feature/copy

src/main/java/shop/hooking/hooking/controller/BrandController.java

@@ -37,23 +37,25 @@ public ResponseEntity<HttpRes<List<BrandRes.BrandDto>>> showAllBrand(){
     }
 
     @CrossOrigin(origins = "https://hooking.shop, https://hooking-dev.netlify.app/, https://hooking.netlify.app/, http://localhost:3000/, http://localhost:3001/")
-    @PostMapping("/{brand_id}/{index}")
-    public ResponseEntity<HttpRes<BrandRes.BrandDetailDto>> showOneBrand(HttpServletRequest httpRequest, @PathVariable Long brand_id, @PathVariable int index){
+    @GetMapping("/{brand_id}/{index}")
+    public ResponseEntity<HttpRes<BrandRes.BrandDetailDto>> getOneBrand(HttpServletRequest httpRequest, @PathVariable Long brand_id, @PathVariable int index){
+        User user = jwtTokenProvider.getUserInfoByToken(httpRequest);
         BrandRes.BrandDetailDto brandDetailDto = brandService.getOneBrand(brand_id);
 
 
         List<BrandRes.cardDto> cards = brandDetailDto.getCard();
+
         int startIndex = index * 30;
         List<BrandRes.cardDto> resultCards = brandService.getLimitedCardsByIndex(cards, startIndex);
 
 
         if (resultCards.isEmpty()) {
-            String errorMessage = "카드가 없습니다.";
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new HttpRes<>(HttpStatus.BAD_REQUEST.value(), errorMessage));
+            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new HttpRes<>(HttpStatus.BAD_REQUEST.value(), "카드가 없습니다."));
         }
 
         brandDetailDto.setCard(resultCards);
         brandService.setScrapCntWhenTokenNotProvided(httpRequest, resultCards);
+        brandService.setIsScrapWithUser(user, resultCards);
 
         return ResponseEntity.ok(new HttpRes<>(brandDetailDto));
     }

src/main/java/shop/hooking/hooking/controller/CopyController.java

@@ -86,6 +86,7 @@ public ResponseEntity<HttpRes<List<CopyRes>>> copyScrapList(HttpServletRequest h
         for(CopyRes copyRes1 : resultCopyRes){
             Scrap scrap = scrapRepository.findByUserAndCardId(user, copyRes1.getId());
             copyRes1.setScrapTime(scrap.getCreatedAt());
+
         }
 
         Collections.sort(resultCopyRes);

src/main/java/shop/hooking/hooking/dto/response/BrandRes.java

@@ -49,6 +49,7 @@ public static class cardDto{
         private String text;
         private Integer scrapCnt;
         private LocalDateTime createdAt;
+        private Integer isScrap;
     }
 
 }

src/main/java/shop/hooking/hooking/dto/response/CopyRes.java

@@ -22,9 +22,7 @@ public class CopyRes implements Comparable<CopyRes>{
     private String text;
     private Integer scrapCnt;
     private LocalDateTime createdAt;
-
     private List<Integer> index;
-
     private LocalDateTime scrapTime;
 
     @Builder
@@ -35,6 +33,7 @@ public CopyRes(Long id, Brand brand, String text, Integer scrapCnt,LocalDateTime
         this.text = text;
         this.scrapCnt = scrapCnt;
         this.createdAt = createdAt;
+
     }
 
     public CopyRes(Long id, Brand brand, String text, LocalDateTime createdAt) {
@@ -43,6 +42,7 @@ public CopyRes(Long id, Brand brand, String text, LocalDateTime createdAt) {
         this.text = text;
         this.scrapCnt = 0;
         this.createdAt = createdAt;
+
     }
 
     //왜안됨..?

src/main/java/shop/hooking/hooking/service/BrandService.java

@@ -112,6 +112,16 @@ public List<BrandRes.cardDto> getLimitedCardsByIndex(List<BrandRes.cardDto> card
         return cards.subList(startIndex, endIndex);
     }
 
+    public void setIsScrapWithUser(User user, List<BrandRes.cardDto> cardList) {
+        List<Scrap> scraps = scrapRepository.findScrapByUser(user);
+
+        // cardList의 id와 scraps의 card_id를 비교하여 isScrap 값을 설정
+        for (BrandRes.cardDto cardDto : cardList) {
+            long cardId = cardDto.getId();
+            boolean isScrapFound = scraps.stream().anyMatch(scrap -> scrap.getCard().getId() == cardId);
+            cardDto.setIsScrap(isScrapFound ? 1 : 0);
+        }
+    }
 
 
     public void setScrapCntWhenTokenNotProvided(HttpServletRequest httpRequest, List<BrandRes.cardDto> cardList) {

src/main/java/shop/hooking/hooking/service/CopyService.java

@@ -268,12 +268,6 @@ public String checkKeyword(String q) {
         return q;
     }
 
-    public ResponseEntity<CopySearchRes> getBadRequestResponseEntity(CopySearchRes response, List<CopySearchResult> results) {
-        response.setCode(HttpStatus.BAD_REQUEST.value());
-        response.setMessage("검색 결과를 찾을 수 없습니다.");
-        response.setData(results);
-        return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response);
-    }
 
     @Transactional
     public CopyRes createScrapRes(Scrap scrap) {