Skip to content

🚑 scrap 취소 버그 해결 #115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
foura1201 wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

🚑 scrap 취소 버그 해결 #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f3c7e3
Merge pull request #112 from official-GEMM/hotfix/GM-205-baggage
foura1201 Nov 21, 2024
6e76406
GM-206 fix: 스크랩 취소 버그 해결
foura1201 Nov 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/com/example/gemm_server/domain/repository/ScrapRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -11,7 +11,7 @@ public interface ScrapRepository extends JpaRepository<Scrap, Long> {

boolean existsByMemberIdAndMarketItemId(Long memberId, Long marketItemId);

Optional<Scrap> findByMemberIdAndMarketItemId(Long memberId, Long marketItemId);
List<Scrap> findByMemberIdAndMarketItemId(Long memberId, Long marketItemId);

@EntityGraph(attributePaths = {"marketItem"})
Page<Scrap> findWithMarketItemByMemberId(Long memberId, Pageable pageable);
Expand Down
11 changes: 6 additions & 5 deletions src/main/java/com/example/gemm_server/service/ScrapService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<Scrap> 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) {
Expand Down