Merge pull request #66 from imdangg/feat/member_fix

[Fix] 로그인 보완

Author: lalabulla

member-service/member-domain/member-application-service/src/main/java/com/project/imdang/member/service/domain/handler/auth/OAuthLoginCommandHandler.java

@@ -40,16 +40,15 @@ public LoginResponse login(OAuthLoginCommand loginCommand) {
 
         // 1. 로그인
         // TODO - REVIEW
-        boolean isJoined = false;
         Optional<Member> optional = memberRepository.findByOAuthIdAndOAuthType(oAuthInfo.getId(), oAuthInfo.getOAuthType());
-        Member member;
-        if (optional.isEmpty()) {
-            member = memberDomainService.createMember(oAuthInfo.getId(), oAuthInfo.getOAuthType());
-            saveMember(member);
-        } else {
-            member = optional.get();
-            isJoined = (member.getNickname() != null);
-        }
+        // 지워지지 않은 사용자라면 가져오고, 아니라면 새로 생성
+        Member member = optional.filter(m -> m.getIsDeleted().equals(Boolean.FALSE))
+                .orElseGet(() -> {
+                    Member createdMember = memberDomainService.createMember(oAuthInfo.getId(), oAuthInfo.getOAuthType());
+                    saveMember(createdMember);
+                    return createdMember;
+                });
+        boolean isJoined = member.getNickname() != null;
 
         // 2. 토큰 생성
         TokenResponse tokenResponse = tokenRequestHandler.generate(member);