Skip to content

Commit 435eff3

Browse files
authored
Feat/#87 get liked histories (#204)
* feat : 구현중 * feat : 좋아요한 기록 조회 구현 * refactor : 페이징 방식 리팩토링 * fix : test 수정 * fix : 충돌 해결 * t push origin feat/#87
1 parent 8e86d9b commit 435eff3

1 file changed

Lines changed: 0 additions & 6 deletions

File tree

clokey-api/src/main/java/org/clokey/domain/like/repository/MemberLikeRepository.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,8 @@
99

1010
public interface MemberLikeRepository extends JpaRepository<MemberLike, Long> {
1111

12-
<<<<<<< HEAD
13-
=======
1412
long countByHistoryId(Long historyId);
1513

16-
>>>>>>> 707263d5afbbd10030259d946f7748710380a71c
1714
@Query(
1815
"""
1916
SELECT ml
@@ -24,8 +21,6 @@ public interface MemberLikeRepository extends JpaRepository<MemberLike, Long> {
2421
""")
2522
List<MemberLike> findLikedHistoriesByMemberId(
2623
Long memberId, Long lastLikeId, Pageable pageable);
27-
<<<<<<< HEAD
28-
=======
2924

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

4035
Optional<MemberLike> findByMemberIdAndHistoryId(Long memberId, Long historyId);
41-
>>>>>>> 707263d5afbbd10030259d946f7748710380a71c
4236
}

0 commit comments

Comments
 (0)