Merge pull request #263 from codesquad-members-2023-team6/dev

join 반환 예외 수정
codesquad-members-2023-team6 · Jun 1, 2023 · c967ba5 · c967ba5
2 parents 09ef1d1 + d83406e
commit c967ba5
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 1 deletion.
diff --git a/backend/src/main/java/com/team6/issue_tracker/domain/member/repository/MemberRepository.java b/backend/src/main/java/com/team6/issue_tracker/domain/member/repository/MemberRepository.java
@@ -4,8 +4,12 @@
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.stereotype.Repository;
 
+import java.util.Optional;
+
 @Repository
 public interface MemberRepository extends CrudRepository<Member, Long> {
      boolean existsById (String member);
 
+     Optional<Member> findMemberById(String id);
+
 }
diff --git a/backend/src/main/java/com/team6/issue_tracker/domain/member/service/MemberService.java b/backend/src/main/java/com/team6/issue_tracker/domain/member/service/MemberService.java
@@ -26,7 +26,7 @@ public Member join(Member member) throws LoginException {
         if (!memberRepository.existsById(member.getId())) {
             return memberRepository.save(member);
         }
-        throw new LoginException("로그인에 실패하였습니다.");
+        return memberRepository.findMemberById(member.getId()).orElseThrow();
     }
 
     public Member findById(Long index) {

diff --git a/backend/src/test/java/com/team6/issue_tracker/domain/member/MemberRepositoryTest.java b/backend/src/test/java/com/team6/issue_tracker/domain/member/MemberRepositoryTest.java
@@ -3,6 +3,7 @@
 import com.team6.issue_tracker.domain.member.domain.Member;
 import com.team6.issue_tracker.domain.member.repository.MemberRepository;
 import lombok.extern.slf4j.Slf4j;
+import org.assertj.core.api.SoftAssertions;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -67,4 +68,19 @@ void notExistsById() throws Exception {
         Member testMember = Member.newMember("testId", "테스트맨", "www.goo.com");
         assertThat(memberRepository.existsById(testMember.getId())).isFalse();
     }
+
+    @Test
+    @DisplayName("멤버 아이디로 멤버를 조회할 수 있다.")
+    public void findByMemberId() throws Exception{
+        //given
+        Member member = memberRepository.findMemberById("new-pow").orElseThrow();
+
+        //when
+
+        //then
+        SoftAssertions.assertSoftly(softAssertions -> {
+            softAssertions.assertThat(member).isNotNull();
+            softAssertions.assertThat(member.getName()).isEqualTo("이린");
+        });
+    }
 }