Skip to content

develop -> main #88

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
Yyang-YE merged 2 commits into from
Jun 23, 2025
Merged

develop -> main #88

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
4e58a83
fix: 중복 검사 로직 수정
Yyang-YE Jun 23, 2025
ae0c128
Merge pull request #87 from U-plait/fix/bookmark
Yyang-YE Jun 23, 2025
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: 3 additions & 1 deletion src/main/java/com/ureca/uplait/domain/user/repository/BookmarkRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,14 @@
import com.ureca.uplait.domain.plan.entity.Plan;
import com.ureca.uplait.domain.user.entity.Bookmark;
import java.util.Optional;

import com.ureca.uplait.domain.user.entity.User;
import org.springframework.data.jpa.repository.JpaRepository;

public interface BookmarkRepository extends JpaRepository<Bookmark, Long>,
CustomBookmarkRepository {

boolean existsBookmarkByPlanId(Long planId);
boolean existsBookmarkByPlanIdAndUser(Long planId, User user);

Optional<Bookmark> findByUserIdAndPlanId(Long userId, Long planId);

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/ureca/uplait/domain/user/service/BookmarkService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public BookmarkListResponse getBookmarks(User user, PlanType planType, int size,

@Transactional
public CreateBookmarkResponse createBookmark(User user, Long planId) {
if (bookmarkRepository.existsBookmarkByPlanId(planId)) {
if (bookmarkRepository.existsBookmarkByPlanIdAndUser(planId, user)) {
throw new GlobalException(DUPLICATED_BOOKMARK);
}

Expand Down
Loading