Merge branch 'main' into dev

MONEYMONG · May 26, 2024 · 10955b2 · 10955b2
2 parents d2f5dfb + 2a8641f
commit 10955b2
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/src/main/java/com/moneymong/domain/user/entity/AppleUser.java b/src/main/java/com/moneymong/domain/user/entity/AppleUser.java
@@ -6,6 +6,7 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
+
 import static lombok.AccessLevel.PROTECTED;
 
 @Table(name = "apple_users")

diff --git a/src/main/java/com/moneymong/domain/user/service/UserFacadeService.java b/src/main/java/com/moneymong/domain/user/service/UserFacadeService.java
@@ -45,4 +45,10 @@ public void delete(Long userId) {
         userUniversityService.delete(userId);
         agencyUserService.deleteAll(userId);
     }
+
+    @Transactional
+    public void revoke(UserDeleteRequest deleteRequest, Long userId) {
+        oAuthService.revoke(deleteRequest);
+        delete(userId);
+    }
 }
diff --git a/src/main/java/com/moneymong/domain/user/service/UserService.java b/src/main/java/com/moneymong/domain/user/service/UserService.java
@@ -55,9 +55,6 @@ public User registerUser(OAuthUserInfo oauthUserInfo) {
 		);
 		newUser = save(newUser);
 
-		log.info("[UserService] registerUserId = {}", newUser.getId());
-		log.info("[UserService] refreshToken = {}", oauthUserInfo.getAppleRefreshToken());
-
 		if (oauthUserInfo.getAppleRefreshToken() != null) {
 			appleUserRepository.save(
 					AppleUser.of(

diff --git a/src/main/java/com/moneymong/global/security/service/OAuthService.java b/src/main/java/com/moneymong/global/security/service/OAuthService.java
@@ -2,14 +2,12 @@
 
 import com.moneymong.domain.user.api.request.LoginRequest;
 import com.moneymong.domain.user.api.request.UserDeleteRequest;
+
 import com.moneymong.domain.user.entity.User;
 import com.moneymong.domain.user.repository.UserRepository;
 import com.moneymong.global.exception.custom.NotFoundException;
 import com.moneymong.global.exception.enums.ErrorCode;
-import com.moneymong.global.security.oauth.dto.OAuthUserDataRequest;
-import com.moneymong.global.security.oauth.dto.OAuthUserDataResponse;
-import com.moneymong.global.security.oauth.handler.OAuthAuthenticationHandler;
-import jakarta.persistence.EntityNotFoundException;
+
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -55,5 +53,4 @@ public void revoke(Long userId) {
         OAuthAuthenticationHandler oAuthHandler = this.oAuthAuthenticationHandlers.get(oAuthProvider);
 
         oAuthHandler.unlink(userId);
-    }
 }