From 6e76406fe0709d7645197aa5e95dcf7fa6ef9267 Mon Sep 17 00:00:00 2001 From: foura1210 Date: Fri, 22 Nov 2024 05:35:04 +0900 Subject: [PATCH] =?UTF-8?q?GM-206=20fix:=20=EC=8A=A4=ED=81=AC=EB=9E=A9=20?= =?UTF-8?q?=EC=B7=A8=EC=86=8C=20=EB=B2=84=EA=B7=B8=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/repository/ScrapRepository.java | 4 ++-- .../com/example/gemm_server/service/ScrapService.java | 11 ++++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/example/gemm_server/domain/repository/ScrapRepository.java b/src/main/java/com/example/gemm_server/domain/repository/ScrapRepository.java index dcde729e..ed7b4f4b 100644 --- a/src/main/java/com/example/gemm_server/domain/repository/ScrapRepository.java +++ b/src/main/java/com/example/gemm_server/domain/repository/ScrapRepository.java @@ -1,7 +1,7 @@ package com.example.gemm_server.domain.repository; import com.example.gemm_server.domain.entity.Scrap; -import java.util.Optional; +import java.util.List; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.EntityGraph; @@ -11,7 +11,7 @@ public interface ScrapRepository extends JpaRepository { boolean existsByMemberIdAndMarketItemId(Long memberId, Long marketItemId); - Optional findByMemberIdAndMarketItemId(Long memberId, Long marketItemId); + List findByMemberIdAndMarketItemId(Long memberId, Long marketItemId); @EntityGraph(attributePaths = {"marketItem"}) Page findWithMarketItemByMemberId(Long memberId, Pageable pageable); diff --git a/src/main/java/com/example/gemm_server/service/ScrapService.java b/src/main/java/com/example/gemm_server/service/ScrapService.java index 780335f0..03f90970 100644 --- a/src/main/java/com/example/gemm_server/service/ScrapService.java +++ b/src/main/java/com/example/gemm_server/service/ScrapService.java @@ -32,11 +32,12 @@ public boolean isScrapped(Long memberId, Long marketItemId) { return scrapRepository.existsByMemberIdAndMarketItemId(memberId, marketItemId); } - public Scrap delete(Long memberId, Long marketItemId) { - Scrap scrap = scrapRepository.findByMemberIdAndMarketItemId(memberId, marketItemId) - .orElseThrow(() -> new ScrapException(SCRAP_NOT_FOUND_FOR_USER)); - scrapRepository.delete(scrap); - return scrap; + public void delete(Long memberId, Long marketItemId) { + List scraps = scrapRepository.findByMemberIdAndMarketItemId(memberId, marketItemId); + if (scraps.isEmpty()) { + throw new ScrapException(SCRAP_NOT_FOUND_FOR_USER); + } + scrapRepository.deleteAll(scraps); } public Scrap scrap(Long memberId, Long marketItemId) {