refactor : 유저 삭제시 로그인 조건 수정

AdultOfNineteen · May 17, 2024 · c7b8491 · c7b8491
1 parent f26a917
commit c7b8491
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/...PI/src/main/java/com/example/wineyapi/user/service/strategy/AppleSocialLoginStrategy.java b/...PI/src/main/java/com/example/wineyapi/user/service/strategy/AppleSocialLoginStrategy.java
@@ -2,6 +2,7 @@
 
 import com.example.wineyapi.user.converter.UserConverter;
 import com.example.wineyapi.user.dto.UserRequest;
+import com.example.wineydomain.common.model.Status;
 import com.example.wineydomain.user.entity.SocialType;
 import com.example.wineydomain.user.entity.User;
 import com.example.wineydomain.user.repository.UserRepository;
@@ -19,7 +20,7 @@ public class AppleSocialLoginStrategy implements SocialLoginStrategy {
  public User login(UserRequest.LoginUserDTO request) {
  String identityToken = request.getAccessToken();
  AppleMember appleMember = appleOAuthUserProvider.getApplePlatformMember(identityToken);
- return userRepository.findBySocialIdAndSocialType(appleMember.getSocialId(), SocialType.APPLE)
+ return userRepository.findBySocialIdAndSocialTypeAndStatus(appleMember.getSocialId(), SocialType.APPLE, Status.ACTIVE)
  .orElseGet(() -> UserConverter.toUser(appleMember));
  }
 }
diff --git a/...I/src/main/java/com/example/wineyapi/user/service/strategy/GoogleSocialLoginStrategy.java b/...I/src/main/java/com/example/wineyapi/user/service/strategy/GoogleSocialLoginStrategy.java
@@ -2,6 +2,7 @@
 
 import com.example.wineyapi.user.converter.UserConverter;
 import com.example.wineyapi.user.dto.UserRequest;
+import com.example.wineydomain.common.model.Status;
 import com.example.wineydomain.user.entity.SocialType;
 import com.example.wineydomain.user.entity.User;
 import com.example.wineydomain.user.repository.UserRepository;
@@ -19,7 +20,7 @@ public class GoogleSocialLoginStrategy implements SocialLoginStrategy {
  public User login(UserRequest.LoginUserDTO request) {
  String identityToken = request.getAccessToken();
  GoogleUserInfo googleUserInfo = googleOauth2Client.verifyToken(identityToken);
- return userRepository.findBySocialIdAndSocialType(googleUserInfo.getSub(), SocialType.GOOGLE)
+ return userRepository.findBySocialIdAndSocialTypeAndStatus(googleUserInfo.getSub(), SocialType.GOOGLE, Status.ACTIVE)
  .orElseGet(() -> UserConverter.toUser(googleUserInfo));
  }
 }
diff --git a/...PI/src/main/java/com/example/wineyapi/user/service/strategy/KakaoSocialLoginStrategy.java b/...PI/src/main/java/com/example/wineyapi/user/service/strategy/KakaoSocialLoginStrategy.java
@@ -1,5 +1,7 @@
 package com.example.wineyapi.user.service.strategy;
 
+import static com.example.wineydomain.common.model.Status.*;
+
 import com.example.wineyapi.user.converter.UserConverter;
 import com.example.wineyapi.user.dto.UserRequest;
 import com.example.wineydomain.user.entity.SocialType;
@@ -19,7 +21,7 @@ public class KakaoSocialLoginStrategy implements SocialLoginStrategy{
  public User login(UserRequest.LoginUserDTO request) {
  String accessTokenWithBearerPrefix = "Bearer " + request.getAccessToken();
  KakaoUserInfoDto kakaoUserInfoDto = kakaoFeignClient.getInfo(accessTokenWithBearerPrefix);
- return userRepository.findBySocialIdAndSocialType(kakaoUserInfoDto.getId(), SocialType.KAKAO)
+ return userRepository.findBySocialIdAndSocialTypeAndStatus(kakaoUserInfoDto.getId(), SocialType.KAKAO, ACTIVE)
  .orElseGet(() -> UserConverter.toUser(kakaoUserInfoDto));
  }
 }
diff --git a/Winey-Domain/src/main/java/com/example/wineydomain/user/repository/UserRepository.java b/Winey-Domain/src/main/java/com/example/wineydomain/user/repository/UserRepository.java
@@ -1,5 +1,6 @@
 package com.example.wineydomain.user.repository;
 
+import com.example.wineydomain.common.model.Status;
 import com.example.wineydomain.user.entity.SocialType;
 import com.example.wineydomain.user.entity.User;
 import org.springframework.data.jpa.repository.JpaRepository;
@@ -11,4 +12,6 @@ public interface UserRepository extends JpaRepository<User,Long>, UserCustomRepo
  Optional<User> findBySocialIdAndSocialType(String socialId, SocialType socialType);
 
  Optional<User> findByPhoneNumber(String phoneNumber);
+
+ Optional<User> findBySocialIdAndSocialTypeAndStatus(String id, SocialType socialType, Status status);
 }