Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

구글 회원가입 문제 해결 #790

Merged
merged 6 commits into from
Oct 25, 2024
Merged

구글 회원가입 문제 해결 #790

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1fa2fdf
Merge pull request #781 from woowacourse-teams/develop-backend
ay-eonii Oct 24, 2024
b8b7df3
Merge pull request #783 from woowacourse-teams/develop-backend
ksk0605 Oct 24, 2024
b237153
fix: 사용하는 ChatNotificationEvent 클래스 변경
ay-eonii Oct 25, 2024
52ae9de
Merge branch 'develop' into develop-backend
ay-eonii Oct 25, 2024
cc3686e
Merge branch 'develop-backend' into fix/#788
ay-eonii Oct 25, 2024
60fbf26
fix: 회원가입 해결
ay-eonii Oct 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions backend/src/main/java/mouda/backend/auth/business/GoogleAuthService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package mouda.backend.auth.business;

import java.util.Optional;

import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

Expand Down Expand Up @@ -28,9 +30,10 @@ public class GoogleAuthService {
public LoginResponse login(GoogleLoginRequest request) {
String name = userInfoProvider.getName(request.idToken());
String identifier = userInfoProvider.getIdentifier(request.idToken());
Member member = memberFinder.findActiveOrDeletedByIdentifier(identifier);
Optional<Member> optionalMember = memberFinder.findOptionalActiveOrDeletedByIdentifier(identifier);

if (member != null) {
if (optionalMember.isPresent()) {
Member member = optionalMember.get();
joinManager.rejoin(member);
memberWriter.updateName(member.getId(), name);
return new LoginResponse(accessTokenProvider.provide(member), member.isConverted());
Expand Down
15 changes: 0 additions & 15 deletions backend/src/main/java/mouda/backend/chat/domain/ChatNotificationEvent.java
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion ...src/main/java/mouda/backend/chat/implement/notification/ChatNotificationEventHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
import mouda.backend.bet.domain.Bet;
import mouda.backend.bet.implement.BetFinder;
import mouda.backend.chat.domain.Chat;
import mouda.backend.chat.domain.ChatNotificationEvent;
import mouda.backend.chat.domain.ChatRoom;
import mouda.backend.chat.domain.ChatRoomType;
import mouda.backend.chat.entity.ChatType;
Expand Down
4 changes: 4 additions & 0 deletions backend/src/main/java/mouda/backend/member/implement/MemberFinder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ public Member findActiveOrDeletedByIdentifier(String identifier) {
.orElseThrow(() -> new AuthException(HttpStatus.NOT_FOUND, AuthErrorMessage.MEMBER_NOT_FOUND));
}

public Optional<Member> findOptionalActiveOrDeletedByIdentifier(String identifier) {
return memberRepository.findActiveOrDeletedByIdentifier(identifier);
}

public Member findByMemberId(long memberId) {
return memberRepository.findById(memberId)
.orElseThrow(() -> new AuthException(HttpStatus.NOT_FOUND, AuthErrorMessage.MEMBER_NOT_FOUND));
Expand Down