Merge pull request #561 from TaskFlow-CLAP/CLAP-425

CLAP-425 활성 회원이 없을 시 승인 대기중인 회원을 찾도록 로직 수정

Author: joowojr

src/main/java/clap/server/adapter/outbound/persistense/MemberPersistenceAdapter.java

@@ -43,6 +43,12 @@ public Optional<Member> findActiveMemberByNickname(final String nickname) {
         return memberEntity.map(memberPersistenceMapper::toDomain);
     }
 
+    @Override
+    public Optional<Member> findApprovalMemberByNickname(String nickname) {
+        Optional<MemberEntity> memberEntity = memberRepository.findApprovalRequestMemberByNickname(nickname);
+        return memberEntity.map(memberPersistenceMapper::toDomain);
+    }
+
     @Override
     public List<Member> findReviewers() {
         List<MemberEntity> memberEntities = memberRepository.findByIsReviewerTrue();

src/main/java/clap/server/adapter/outbound/persistense/repository/member/MemberRepository.java

@@ -21,6 +21,9 @@ public interface MemberRepository extends JpaRepository<MemberEntity, Long>,  Me
     @Query("SELECT m FROM MemberEntity m WHERE m.nickname = :nickname AND m.status = 'ACTIVE'")
     Optional<MemberEntity> findActiveMemberByNickname(@Param("nickname") String nickname);
 
+    @Query("SELECT m FROM MemberEntity m WHERE m.nickname = :nickname AND m.status = 'APPROVAL_REQUEST'")
+    Optional<MemberEntity> findApprovalRequestMemberByNickname(@Param("nickname") String nickname);
+
     List<MemberEntity> findByIsReviewerTrue();
 
     List<MemberEntity> findAll(); // 전체 회원 조회

src/main/java/clap/server/application/port/outbound/member/LoadMemberPort.java

@@ -23,6 +23,8 @@ public interface LoadMemberPort {
 
     Optional<Member> findActiveMemberByNickname(String nickname);
 
+    Optional<Member> findApprovalMemberByNickname(String nickname);
+
     List<Member> findReviewers();
 
     Page<Member> findAllMembers(Pageable pageable);

src/main/java/clap/server/application/service/auth/AuthService.java

@@ -36,7 +36,6 @@ class AuthService implements LoginUsecase, LogoutUsecase {
     @Override
     public LoginResponse login(String nickname, String password, String clientIp) {
         Member member = getMember(nickname,clientIp);
-
         validatePassword(password, member.getPassword(), nickname, clientIp);
 
         if (member.getStatus().equals(MemberStatus.APPROVAL_REQUEST)) {
@@ -69,11 +68,12 @@ private void deleteAccessToken(Long memberId, String accessToken) {
     }
 
     private Member getMember(String inputNickname, String clientIp) {
-        return loadMemberPort.findActiveMemberByNickname(inputNickname).orElseThrow(() ->
-        {
-            loginAttemptService.recordFailedAttempt(inputNickname, clientIp);
-            return new AuthException(AuthErrorCode.LOGIN_REQUEST_FAILED);
-        });
+        return loadMemberPort.findActiveMemberByNickname(inputNickname)
+                .or(() -> loadMemberPort.findApprovalMemberByNickname(inputNickname))
+                .orElseThrow(() -> {
+                    loginAttemptService.recordFailedAttempt(inputNickname, clientIp);
+                    return new AuthException(AuthErrorCode.LOGIN_REQUEST_FAILED);
+                });
     }
 
     private void validatePassword(String inputPassword, String encodedPassword, String inputNickname, String clientIp) {