[feat] 충돌 해결

Hooking-CEOS · Jul 29, 2023 · 6db0444 · 6db0444
2 parents c5e28a7 + bb47a25
commit 6db0444
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/main/java/shop/hooking/hooking/dto/response/CopyRes.java b/src/main/java/shop/hooking/hooking/dto/response/CopyRes.java
@@ -52,4 +52,3 @@ public int compareTo(CopyRes other) {
 
 
 }
-
diff --git a/src/main/java/shop/hooking/hooking/repository/ScrapRepository.java b/src/main/java/shop/hooking/hooking/repository/ScrapRepository.java
@@ -16,12 +16,14 @@ public interface ScrapRepository extends JpaRepository<Scrap, Long> {
 
     List<Scrap> findScrapByUser(User user); //여기서 최신순으로 가져오게
 
+
     List<Scrap> findByCardId(Long id);
 
+    Scrap findByUserAndCardId(User user, Long cardId);
+
     boolean existsByUserAndCard(User user, Card card);
 
     Scrap findByUserAndCard(User user, Card card);
 
-    Scrap findByUserAndCardId(User user, Long cardId);
 
 }