[BE] fix: 로그인 오류 수정 (#434)

fix: 로그인 오류 수정
woowacourse-teams · Sep 22, 2023 · b5a499c · b5a499c
1 parent 7ed0d74
commit b5a499c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/backend/src/main/java/org/donggle/backend/application/service/auth/AuthService.java b/backend/src/main/java/org/donggle/backend/application/service/auth/AuthService.java
@@ -5,6 +5,7 @@
 import org.donggle.backend.application.repository.MemberCredentialsRepository;
 import org.donggle.backend.application.repository.MemberRepository;
 import org.donggle.backend.application.repository.TokenRepository;
+import org.donggle.backend.application.repository.dto.MemberInfo;
 import org.donggle.backend.domain.auth.JwtTokenProvider;
 import org.donggle.backend.domain.auth.RefreshToken;
 import org.donggle.backend.domain.category.Category;
@@ -19,6 +20,8 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Optional;
+
 @Service
 @Transactional
 @RequiredArgsConstructor
@@ -31,10 +34,13 @@ public class AuthService {
 
 
     public TokenResponse login(final SocialUserInfo socialUserInfo) {
-        return memberRepository.findBySocialId(socialUserInfo.socialId())
-                .map(memberInfo -> new Member(memberInfo.id(), new MemberName(socialUserInfo.nickname()), memberInfo.socialId()))
-                .map(this::createTokens)
-                .orElse(createTokens(initializeMember(socialUserInfo)));
+        final Optional<MemberInfo> optionalMemberInfo = memberRepository.findBySocialId(socialUserInfo.socialId());
+        if (optionalMemberInfo.isPresent()) {
+            final MemberInfo memberInfo = optionalMemberInfo.get();
+            final Member member = new Member(memberInfo.id(), new MemberName(socialUserInfo.nickname()), memberInfo.socialId());
+            return createTokens(member);
+        }
+        return createTokens(initializeMember(socialUserInfo));
     }
 
     public void logout(final Long memberId) {

diff --git a/backend/src/main/java/org/donggle/backend/application/service/trash/TrashService.java b/backend/src/main/java/org/donggle/backend/application/service/trash/TrashService.java
@@ -27,7 +27,7 @@ public TrashResponse findTrashedWritingList(final Long memberId) {
     public void trashWritings(final Long memberId, final List<Long> writingIds) {
         writingIds.stream()
                 .map(writingId -> {
-                    final Writing findWriting = writingRepository.findById(writingId)
+                    final Writing findWriting = writingRepository.findByMemberIdAndWritingIdAndStatusIsNotDeleted(memberId, writingId)
                             .orElseThrow(() -> new DeleteWritingNotFoundException(writingId));
                     validateAuthorization(memberId, findWriting);
                     return findWriting;