[TEST] friend service repository 테스트

backend/src/main/java/com/twtw/backend/domain/friend/repository/FriendQueryRepositoryImpl.java

@@ -30,20 +30,21 @@ public Optional<Friend> findByTwoMemberId(final UUID loginMemberId, final UUID m
                                 (friend.toMember
                                                 .id
                                                 .eq(loginMemberId)
-                                                .and(friend.fromMember.id.eq(memberId)))
+                                                .and(friend.fromMember.id.eq(memberId))
                                         .or(
                                                 friend.fromMember
                                                         .id
                                                         .eq(loginMemberId)
-                                                        .and(friend.toMember.id.eq(memberId))))
+                                                        .and(friend.toMember.id.eq(memberId)))))
                         .fetchFirst());
     }
 
     @Override
     public List<Friend> findByMember(final Member member) {
         return jpaQueryFactory
                 .selectFrom(friend)
-                .where(friend.toMember.eq(member).or(friend.fromMember.eq(member)))
+                .where((friend.toMember.eq(member).or(friend.fromMember.eq(member)))
+                        .and(friend.friendStatus.eq(FriendStatus.ACCEPTED)))
                 .fetch();
     }
 
@@ -62,12 +63,12 @@ public List<Friend> findByMemberAndFriendStatus(
     public List<Friend> findByMemberAndMemberNickname(final Member member, final String nickname) {
         return jpaQueryFactory
                 .selectFrom(friend)
-                .where(
-                        (friend.toMember.eq(member).and(friend.fromMember.nickname.eq(nickname)))
+                .where(friend.friendStatus.eq(FriendStatus.ACCEPTED)
+                        .and(friend.toMember.eq(member).and(friend.fromMember.nickname.eq(nickname))
                                 .or(
                                         friend.fromMember
                                                 .eq(member)
-                                                .and(friend.toMember.nickname.eq(nickname))))
+                                                .and(friend.toMember.nickname.eq(nickname)))))
                 .fetch();
     }
 }

backend/src/main/java/com/twtw/backend/domain/friend/service/FriendService.java

@@ -43,7 +43,7 @@ public void updateStatus(final FriendUpdateRequest friendUpdateRequest) {
 
     private Friend getFriendById(final UUID loginMemberId, final UUID memberId) {
         return friendRepository
-                .findByTwoMemberId(memberId, loginMemberId)
+                .findByTwoMemberId(loginMemberId, memberId)
                 .orElseThrow(EntityNotFoundException::new);
     }
 

backend/src/test/java/com/twtw/backend/domain/friend/repository/FriendRepositoryTest.java

@@ -0,0 +1,105 @@
+package com.twtw.backend.domain.friend.repository;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import com.twtw.backend.domain.friend.entity.Friend;
+import com.twtw.backend.domain.friend.entity.FriendStatus;
+import com.twtw.backend.domain.member.entity.AuthType;
+import com.twtw.backend.domain.member.entity.Member;
+import com.twtw.backend.domain.member.entity.OAuth2Info;
+import com.twtw.backend.domain.member.repository.MemberRepository;
+import com.twtw.backend.support.repository.RepositoryTest;
+import java.util.List;
+import java.util.UUID;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+@DisplayName("FriendRepository에")
+class FriendRepositoryTest extends RepositoryTest {
+
+    @Autowired private FriendRepository friendRepository;
+    @Autowired private MemberRepository memberRepository;
+
+    @Test
+    @DisplayName("저장이 수행되는가")
+    void save() {
+        // given
+        final Member from = memberRepository.save(new Member("1", "123", new OAuth2Info("321", AuthType.APPLE)));
+        final Member to = memberRepository.save(new Member("2", "1234", new OAuth2Info("123", AuthType.KAKAO)));
+        final Friend friend = new Friend(from, to);
+
+        // when
+        final UUID friendId = friendRepository.save(friend).getId();
+
+        // then
+        assertThat(friendId).isNotNull();
+    }
+
+    @Test
+    @DisplayName("두 멤버 pk로 조회가 수행되는가")
+    void findByTwoMemberId() {
+        // given
+        final Member from = memberRepository.save(new Member("1", "123", new OAuth2Info("321", AuthType.APPLE)));
+        final Member to = memberRepository.save(new Member("2", "1234", new OAuth2Info("123", AuthType.KAKAO)));
+        final Friend friend = new Friend(from, to);
+        final Friend expected = friendRepository.save(friend);
+
+        // when
+        final Friend result = friendRepository.findByTwoMemberId(from.getId(), to.getId()).orElseThrow();
+
+        // then
+        assertThat(result.getId()).isEqualTo(expected.getId());
+    }
+
+    @Test
+    @DisplayName("멤버를 통한 조회가 수행되는가")
+    void findByMember() {
+        // given
+        final Member from = memberRepository.save(new Member("1", "123", new OAuth2Info("321", AuthType.APPLE)));
+        final Member to = memberRepository.save(new Member("2", "1234", new OAuth2Info("123", AuthType.KAKAO)));
+        final Friend friend = new Friend(from, to);
+        final Friend expected = friendRepository.save(friend);
+        expected.updateStatus(FriendStatus.ACCEPTED);
+
+        // when
+        final List<Friend> result = friendRepository.findByMember(from);
+
+        // then
+        assertThat(result).hasSize(1);
+    }
+
+    @Test
+    @DisplayName("멤버와 친구 상태를 통한 조회가 수행되는가")
+    void findByMemberAndFriendStatus() {
+        // given
+        final Member from = memberRepository.save(new Member("1", "123", new OAuth2Info("321", AuthType.APPLE)));
+        final Member to = memberRepository.save(new Member("2", "1234", new OAuth2Info("123", AuthType.KAKAO)));
+        final Friend friend = new Friend(from, to);
+        friendRepository.save(friend);
+
+        // when
+        final List<Friend> result = friendRepository.findByMemberAndFriendStatus(from, friend.getFriendStatus());
+
+        // then
+        assertThat(result).hasSize(1);
+    }
+
+    @Test
+    @DisplayName("멤버와 닉네임을 통한 검색이 수행되는가")
+    void findByMemberAndMemberNickname() {
+        // given
+        final Member from = memberRepository.save(new Member("1", "123", new OAuth2Info("321", AuthType.APPLE)));
+        final String friendNickname = "2";
+        final Member to = memberRepository.save(new Member(friendNickname, "1234", new OAuth2Info("123", AuthType.KAKAO)));
+        final Friend friend = new Friend(from, to);
+        final Friend expected = friendRepository.save(friend);
+        expected.updateStatus(FriendStatus.ACCEPTED);
+
+        // when
+        final List<Friend> result = friendRepository.findByMemberAndMemberNickname(from, friendNickname);
+
+        // then
+        assertThat(result).hasSize(1);
+    }
+}

backend/src/test/java/com/twtw/backend/domain/friend/service/FriendServiceTest.java

@@ -0,0 +1,101 @@
+package com.twtw.backend.domain.friend.service;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import com.twtw.backend.domain.friend.dto.request.FriendRequest;
+import com.twtw.backend.domain.friend.dto.request.FriendUpdateRequest;
+import com.twtw.backend.domain.friend.dto.response.FriendResponse;
+import com.twtw.backend.domain.friend.entity.Friend;
+import com.twtw.backend.domain.friend.entity.FriendStatus;
+import com.twtw.backend.domain.friend.repository.FriendRepository;
+import com.twtw.backend.domain.member.entity.AuthType;
+import com.twtw.backend.domain.member.entity.Member;
+import com.twtw.backend.domain.member.entity.OAuth2Info;
+import com.twtw.backend.support.service.LoginTest;
+import java.util.List;
+import java.util.UUID;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+@DisplayName("FriendService의")
+class FriendServiceTest extends LoginTest {
+
+    @Autowired private FriendService friendService;
+    @Autowired private FriendRepository friendRepository;
+
+    @Test
+    @DisplayName("요청 추가가 수행되는가")
+    void addRequest() {
+        // given
+        final UUID id = memberRepository.save(new Member("1", "12", new OAuth2Info("123", AuthType.APPLE))).getId();
+
+        // when
+        friendService.addRequest(new FriendRequest(id));
+
+        // then
+        final List<Friend> result = friendRepository.findByMemberAndFriendStatus(loginUser, FriendStatus.REQUESTED);
+        assertThat(result).hasSize(1);
+    }
+
+    @Test
+    @DisplayName("상태 업데이트가 수행되는가")
+    void updateStatus() {
+        // given
+        final Member toMember = memberRepository.save(new Member("1", "12", new OAuth2Info("123", AuthType.APPLE)));
+        final Friend friend = friendRepository.save(new Friend(loginUser, toMember));
+
+        // when
+        final FriendStatus status = FriendStatus.ACCEPTED;
+        friendService.updateStatus(new FriendUpdateRequest(toMember.getId(), status));
+
+        // then
+        final Friend result = friendRepository.findById(friend.getId()).orElseThrow();
+        assertThat(result.getFriendStatus()).isEqualTo(status);
+    }
+
+    @Test
+    @DisplayName("친구 목록 조회가 수행되는가")
+    void getFriends() {
+        // given
+        final Member toMember = memberRepository.save(new Member("1", "12", new OAuth2Info("123", AuthType.APPLE)));
+        friendRepository.save(new Friend(loginUser, toMember));
+        friendService.updateStatus(new FriendUpdateRequest(toMember.getId(), FriendStatus.ACCEPTED));
+
+        // when
+        final List<FriendResponse> result = friendService.getFriends();
+
+        // then
+        assertThat(result).hasSize(1);
+    }
+
+    @Test
+    @DisplayName("상태를 통한 친구 조회가 수행되는가")
+    void getFriendsByStatus() {
+        // given
+        final Member toMember = memberRepository.save(new Member("1", "12", new OAuth2Info("123", AuthType.APPLE)));
+        friendRepository.save(new Friend(loginUser, toMember));
+
+        // when
+        final List<FriendResponse> result = friendService.getFriendsByStatus(FriendStatus.REQUESTED);
+
+        // then
+        assertThat(result).hasSize(1);
+    }
+
+    @Test
+    @DisplayName("닉네임을 통한 친구 조회가 수행되는가")
+    void getFriendByNickname() {
+        // given
+        final String nickname = "1";
+        final Member toMember = memberRepository.save(new Member(nickname, "12", new OAuth2Info("123", AuthType.APPLE)));
+        final Friend expected = friendRepository.save(new Friend(loginUser, toMember));
+        expected.updateStatus(FriendStatus.ACCEPTED);
+
+        // when
+        final List<FriendResponse> result = friendService.getFriendByNickname(nickname);
+
+        // then
+        assertThat(result).hasSize(1);
+    }
+}

backend/src/test/java/com/twtw/backend/domain/member/service/MemberServiceTest.java

@@ -9,12 +9,13 @@
 import com.twtw.backend.domain.member.repository.MemberRepository;
 import com.twtw.backend.fixture.member.MemberEntityFixture;
 
+import com.twtw.backend.support.service.LoginTest;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
 @DisplayName("MemberService의")
-public class MemberServiceTest {
+class MemberServiceTest extends LoginTest {
     @Autowired private MemberService memberService;
     @Autowired private MemberRepository memberRepository;
 

backend/src/test/java/com/twtw/backend/domain/plan/service/PlanServiceTest.java

@@ -19,14 +19,12 @@
 import com.twtw.backend.fixture.place.PlaceEntityFixture;
 import com.twtw.backend.fixture.plan.PlanEntityFixture;
 import com.twtw.backend.support.service.LoginTest;
-
+import java.util.Optional;
+import java.util.UUID;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import java.util.Optional;
-import java.util.UUID;
-
 @DisplayName("PlanService의")
 class PlanServiceTest extends LoginTest {
 
@@ -70,7 +68,7 @@ void savePlan() {
     void joinPlan() {
         // given
         final Member member = memberRepository.save(MemberEntityFixture.FIRST_MEMBER.toEntity());
-        final Plan plan = planRepository.save(PlanEntityFixture.FIRST_PLACE.toEntity(member));
+        final Plan plan = planRepository.save(new Plan(member, PlaceEntityFixture.FIRST_PLACE.toEntity(), GroupEntityFixture.BTS_GROUP.toEntity()));
         final UUID planId = plan.getId();
 
         // when

backend/src/test/java/com/twtw/backend/support/repository/EnableDataJpa.java

@@ -1,11 +1,19 @@
 package com.twtw.backend.support.repository;
 
-import com.twtw.backend.support.database.DatabaseTest;
-
+import com.twtw.backend.config.database.QuerydslConfig;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
 import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
+import org.springframework.context.annotation.Import;
+import org.springframework.test.context.ActiveProfiles;
 
 @DataJpaTest
-@DatabaseTest
+@ActiveProfiles("test")
+@Target(ElementType.TYPE)
+@Import(QuerydslConfig.class)
+@Retention(RetentionPolicy.RUNTIME)
 @AutoConfigureTestDatabase(replace = AutoConfigureTestDatabase.Replace.NONE)
 public @interface EnableDataJpa {}

backend/src/test/java/com/twtw/backend/support/repository/RepositoryTest.java

@@ -2,13 +2,5 @@
 
 import com.twtw.backend.support.exclude.ExcludeTest;
 
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
-import org.springframework.transaction.annotation.Transactional;
-
-@Transactional
 @EnableDataJpa
-@SpringBootTest
-@ExtendWith(SpringExtension.class)
 public abstract class RepositoryTest extends ExcludeTest {}