diff --git a/src/main/java/today/seasoning/seasoning/article/service/FindMyFriendsArticlesService.java b/src/main/java/today/seasoning/seasoning/article/service/FindMyFriendsArticlesService.java index 2cf7ecf..6d4469a 100644 --- a/src/main/java/today/seasoning/seasoning/article/service/FindMyFriendsArticlesService.java +++ b/src/main/java/today/seasoning/seasoning/article/service/FindMyFriendsArticlesService.java @@ -22,15 +22,7 @@ public class FindMyFriendsArticlesService { private final EntityManager entityManager; private final String SQL = "SELECT a FROM Article a " + - "INNER JOIN Friendship f ON a.user.id = f.friend.id " + - "WHERE f.user.id = :userId " + - "AND f.valid = true " + - "AND EXISTS (" + - " SELECT 1 FROM Friendship f2 " + - " WHERE f2.user.id = a.user.id " + - " AND f2.friend.id = :userId " + - " AND f2.valid = true" + - ") " + + "INNER JOIN Friendship f ON a.user.id = f.user.id AND f.friend.id = :userId " + "AND a.published = true " + "AND a.id < :articleId " + "ORDER BY a.id DESC"; diff --git a/src/main/java/today/seasoning/seasoning/friendship/domain/Friendship.java b/src/main/java/today/seasoning/seasoning/friendship/domain/Friendship.java index a76cb09..76d1f75 100644 --- a/src/main/java/today/seasoning/seasoning/friendship/domain/Friendship.java +++ b/src/main/java/today/seasoning/seasoning/friendship/domain/Friendship.java @@ -1,6 +1,5 @@ package today.seasoning.seasoning.friendship.domain; -import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.FetchType; import javax.persistence.Id; @@ -28,21 +27,9 @@ public class Friendship extends BaseTimeEntity { @JoinColumn(name = "friend_id") private User friend; - @Column(nullable = false) - private boolean valid; - - public Friendship(User user, User friend, boolean valid) { + public Friendship(User user, User friend) { this.id = TsidUtil.createLong(); this.user = user; this.friend = friend; - this.valid = valid; - } - - public boolean isValid() { - return valid; - } - - public void setValid() { - this.valid = true; } } diff --git a/src/main/java/today/seasoning/seasoning/friendship/service/AcceptFriendRequestService.java b/src/main/java/today/seasoning/seasoning/friendship/service/AcceptFriendRequestService.java index 2cc7a03..aee6489 100644 --- a/src/main/java/today/seasoning/seasoning/friendship/service/AcceptFriendRequestService.java +++ b/src/main/java/today/seasoning/seasoning/friendship/service/AcceptFriendRequestService.java @@ -39,8 +39,8 @@ public void doService(Long userId, String requesterAccountId) { } // 친구 관계 설정 - friendshipRepository.save(new Friendship(user, requester, true)); - friendshipRepository.save(new Friendship(requester, user, true)); + friendshipRepository.save(new Friendship(user, requester)); + friendshipRepository.save(new Friendship(requester, user)); // 친구 요청 내역 삭제 friendRequestRepository.deleteByFromUserIdAndToUserId(requester.getId(), user.getId()); diff --git a/src/test/java/today/seasoning/seasoning/friendship/service/UnfriendServiceTest.java b/src/test/java/today/seasoning/seasoning/friendship/service/UnfriendServiceTest.java index 47a103f..6313c3e 100644 --- a/src/test/java/today/seasoning/seasoning/friendship/service/UnfriendServiceTest.java +++ b/src/test/java/today/seasoning/seasoning/friendship/service/UnfriendServiceTest.java @@ -36,8 +36,8 @@ class UnfriendServiceTest { User user = new User("user", "https://test/user.jpg", "user@email.com", LoginType.KAKAO); User friend = new User("friend", "https://test/friend.jpg", "friend@email.com", LoginType.KAKAO); - Friendship userToFriendFriendship = new Friendship(user, friend, true); - Friendship friendToUserFriendship = new Friendship(friend, user, true); + Friendship userToFriendFriendship = new Friendship(user, friend); + Friendship friendToUserFriendship = new Friendship(friend, user); @Test @DisplayName("성공")