Skip to content

fix(Bookmark): 북마크 버그 수정 #188

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

Merged
Jjiggu merged 1 commit into from
Jul 29, 2025
Merged

fix(Bookmark): 북마크 버그 수정 #188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 13 additions & 6 deletions ...p-user-api/src/main/java/com/nowait/applicationuser/bookmark/service/BookmarkService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import com.nowait.applicationuser.store.dto.StorePageReadResponse;
import com.nowait.applicationuser.store.service.StoreService;
import com.nowait.domaincorerdb.store.entity.Store;
import com.nowait.domaincorerdb.store.exception.StoreNotFoundException;
import com.nowait.domaincorerdb.store.repository.StoreRepository;
import com.nowait.domaincorerdb.user.entity.User;
import com.nowait.domaincorerdb.user.exception.UserNotFoundException;
Expand All @@ -37,17 +38,18 @@ public BookmarkCreateResponse createBookmark(Long storeId, CustomOAuth2User cust

parameterValidation(storeId, customOAuth2User);
Store store = storeRepository.findById(storeId)
.orElseThrow(() -> new EntityNotFoundException(storeId + " store not found."));
.orElseThrow(StoreNotFoundException::new);
User user = userRepository.findById(customOAuth2User.getUserId())
.orElseThrow(() -> new EntityNotFoundException("User not found"));
.orElseThrow(UserNotFoundException::new);

Optional<Bookmark> isBookmark = bookmarkRepository.findRawByUserAndStoreAndDeletedFalse(user, store);
Optional<Bookmark> isBookmark = bookmarkRepository.findByUserAndStore(user, store);

if (isBookmark.isPresent()) {
Bookmark bookmark = isBookmark.get();
if (bookmark.isDeleted()) {
bookmark.restore();
return BookmarkCreateResponse.fromEntity(bookmarkRepository.save(bookmark));
Bookmark restored = bookmarkRepository.save(bookmark);
return BookmarkCreateResponse.fromEntity(bookmarkRepository.save(restored));
} else {
throw new IllegalArgumentException("already bookmarked");
}
Expand Down Expand Up @@ -81,8 +83,13 @@ public List<StorePageReadResponse> getBookmarks(CustomOAuth2User customOAuth2Use
@Transactional
public String deleteBookmark(Long storeId, CustomOAuth2User customOAuth2User) {
parameterValidation(storeId, customOAuth2User);
Bookmark bookmark = bookmarkRepository.findActiveByUserIdAndStoreId(storeId, customOAuth2User.getUserId())
.orElseThrow(() -> new EntityNotFoundException(storeId + " bookmark not found."));
User user = customOAuth2User.getUser();
Store store = storeRepository.findById(storeId)
.orElseThrow(StoreNotFoundException::new);

Bookmark bookmark = bookmarkRepository.findByUserAndStoreAndDeletedFalse(user, store)
.orElseThrow(() -> new EntityNotFoundException(storeId + " 활성화된 bookmark가 없습니다."));

if (!Objects.equals(bookmark.getUser().getId(), customOAuth2User.getUserId())) {
throw new IllegalArgumentException("you can only delete your own bookmark");
}
Expand Down
4 changes: 3 additions & 1 deletion ...er-rdb/src/main/java/com/nowait/domainuserrdb/bookmark/repository/BookmarkRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@
public interface BookmarkRepository extends JpaRepository<Bookmark,Long> {
boolean existsByUserAndStoreAndDeletedFalse(User user, Store store);

Optional<Bookmark> findRawByUserAndStoreAndDeletedFalse(User user, Store store);
Optional<Bookmark> findByUserAndStoreAndDeletedFalse(User user, Store store);

Optional<Bookmark> findByUserAndStore(User user, Store store);

Collection<Bookmark> findAllByUserAndDeletedFalse(User user);

Expand Down