Skip to content

Feat/#87 get liked histories #204

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
juuuuone merged 9 commits into from
Jan 5, 2026
Merged

Feat/#87 get liked histories #204

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
04604ef
feat : κ΅¬ν˜„μ€‘
juuuuone Nov 16, 2025
fa49c9e
fix : 좩돌 ν•΄κ²°
juuuuone Nov 16, 2025
01d5456
feat : μ’‹μ•„μš”ν•œ 기둝 쑰회 κ΅¬ν˜„
juuuuone Nov 16, 2025
0bb0fb1
refactor : νŽ˜μ΄μ§• 방식 λ¦¬νŒ©ν† λ§
juuuuone Dec 20, 2025
d00dd5c
fix : test μˆ˜μ •
juuuuone Dec 21, 2025
5449cac
Merge branch 'develop' of https://github.com/Clokey-dev/clokey-server…
juuuuone Jan 4, 2026
633bde5
fix : 좩돌 ν•΄κ²°
juuuuone Jan 4, 2026
85a4b8f
Merge branch 'develop' of https://github.com/Clokey-dev/clokey-server…
juuuuone Jan 5, 2026
42da011
t push origin feat/#87
juuuuone Jan 5, 2026
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
6 changes: 0 additions & 6 deletions clokey-api/src/main/java/org/clokey/domain/like/repository/MemberLikeRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,8 @@

public interface MemberLikeRepository extends JpaRepository<MemberLike, Long> {

<<<<<<< HEAD
=======
long countByHistoryId(Long historyId);

>>>>>>> 707263d5afbbd10030259d946f7748710380a71c
@Query(
"""
SELECT ml
Expand All @@ -24,8 +21,6 @@ public interface MemberLikeRepository extends JpaRepository<MemberLike, Long> {
""")
List<MemberLike> findLikedHistoriesByMemberId(
Long memberId, Long lastLikeId, Pageable pageable);
<<<<<<< HEAD
=======

@Query(
"""
Expand All @@ -38,5 +33,4 @@ List<MemberLike> findLikedHistoriesByMemberId(
List<MemberLike> findLikeMembersByHistoryId(Long historyId, Long lastLikeId, Pageable pageable);

Optional<MemberLike> findByMemberIdAndHistoryId(Long memberId, Long historyId);
>>>>>>> 707263d5afbbd10030259d946f7748710380a71c
}