탈퇴 기능 추가

backend/ddang/src/main/java/com/ddang/ddang/authentication/application/AuthenticationService.java

@@ -1,23 +1,26 @@
 package com.ddang.ddang.authentication.application;
 
 import com.ddang.ddang.authentication.application.dto.TokenDto;
-import com.ddang.ddang.authentication.domain.exception.InvalidTokenException;
+import com.ddang.ddang.authentication.application.exception.InaccessibleWithdrawalException;
+import com.ddang.ddang.authentication.application.util.RandomNameGenerator;
 import com.ddang.ddang.authentication.domain.Oauth2UserInformationProviderComposite;
-import com.ddang.ddang.authentication.infrastructure.jwt.PrivateClaims;
 import com.ddang.ddang.authentication.domain.TokenDecoder;
 import com.ddang.ddang.authentication.domain.TokenEncoder;
 import com.ddang.ddang.authentication.domain.TokenType;
 import com.ddang.ddang.authentication.domain.dto.UserInformationDto;
+import com.ddang.ddang.authentication.domain.exception.InvalidTokenException;
+import com.ddang.ddang.authentication.infrastructure.jwt.PrivateClaims;
 import com.ddang.ddang.authentication.infrastructure.oauth2.OAuth2UserInformationProvider;
 import com.ddang.ddang.authentication.infrastructure.oauth2.Oauth2Type;
 import com.ddang.ddang.user.domain.User;
 import com.ddang.ddang.user.infrastructure.persistence.JpaUserRepository;
-import java.time.LocalDateTime;
-import java.util.Map;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDateTime;
+import java.util.Map;
+
 @Service
 @Transactional(readOnly = true)
 @RequiredArgsConstructor
@@ -31,7 +34,7 @@ public class AuthenticationService {
     private final TokenDecoder tokenDecoder;
 
     @Transactional
-    public TokenDto login(final Oauth2Type oauth2Type, final String oauth2AccessToken) {
+    public TokenDto login(final Oauth2Type oauth2Type, final String oauth2AccessToken){
         final OAuth2UserInformationProvider provider = providerComposite.findProvider(oauth2Type);
         final UserInformationDto userInformationDto = provider.findUserInformation(oauth2AccessToken);
         final User persistUser = findOrPersistUser(oauth2Type, userInformationDto);
@@ -40,10 +43,10 @@ public TokenDto login(final Oauth2Type oauth2Type, final String oauth2AccessToke
     }
 
     private User findOrPersistUser(final Oauth2Type oauth2Type, final UserInformationDto userInformationDto) {
-        return userRepository.findByOauthId(userInformationDto.findUserId())
+        return userRepository.findByOauthIdAndDeletedIsFalse(userInformationDto.findUserId())
                              .orElseGet(() -> {
                                  final User user = User.builder()
-                                                       .name(oauth2Type.calculateNickname(userInformationDto))
+                                                       .name(oauth2Type.calculateNickname(calculateRandomNumber()))
                                                        .profileImage(null)
                                                        .reliability(0.0d)
                                                        .oauthId(userInformationDto.findUserId())
@@ -53,6 +56,20 @@ private User findOrPersistUser(final Oauth2Type oauth2Type, final UserInformatio
                              });
     }
 
+    private String calculateRandomNumber() {
+        String name;
+
+        do {
+            name = RandomNameGenerator.generate();
+        } while (isAlreadyExist(name));
+
+        return name;
+    }
+
+    private boolean isAlreadyExist(final String name) {
+        return userRepository.existsByNameEndingWith(name);
+    }
+
     private TokenDto convertTokenDto(final User persistUser) {
         final String accessToken = tokenEncoder.encode(
                 LocalDateTime.now(),
@@ -86,4 +103,18 @@ public boolean validateToken(final String accessToken) {
         return tokenDecoder.decode(TokenType.ACCESS, accessToken)
                            .isPresent();
     }
+
+    @Transactional
+    public void withdrawal(
+            final Oauth2Type oauth2Type,
+            final String oauth2AccessToken
+    ) throws InaccessibleWithdrawalException {
+        final OAuth2UserInformationProvider provider = providerComposite.findProvider(oauth2Type);
+        final UserInformationDto userInformationDto = provider.findUserInformation(oauth2AccessToken);
+        final User user = userRepository.findByOauthIdAndDeletedIsFalse(userInformationDto.findUserId())
+                                        .orElseThrow(() -> new InaccessibleWithdrawalException("탈퇴에 대한 권한 없습니다."));
+
+        provider.unlinkUserBy(oauth2AccessToken, user.getOauthId());
+        user.withdrawal();
+    }
 }

backend/ddang/src/main/java/com/ddang/ddang/authentication/application/exception/InaccessibleWithdrawalException.java

@@ -0,0 +1,8 @@
+package com.ddang.ddang.authentication.application.exception;
+
+public class InaccessibleWithdrawalException extends IllegalArgumentException {
+
+    public InaccessibleWithdrawalException(final String message) {
+        super(message);
+    }
+}

backend/ddang/src/main/java/com/ddang/ddang/authentication/application/util/RandomNameGenerator.java

@@ -0,0 +1,24 @@
+package com.ddang.ddang.authentication.application.util;
+
+import java.util.Random;
+
+public class RandomNameGenerator {
+
+    private static final int NAME_LENGTH = 10;
+
+    private static final Random random = new Random();
+
+    private RandomNameGenerator() {
+    }
+
+    public static String generate() {
+        StringBuilder name = new StringBuilder();
+
+        for (int i = 0; i < NAME_LENGTH; i++) {
+            int digit = random.nextInt(10);
+            name.append(digit);
+        }
+
+        return name.toString();
+    }
+}

backend/ddang/src/main/java/com/ddang/ddang/authentication/configuration/KakaoProvidersConfigurationProperties.java

@@ -3,5 +3,5 @@
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
 @ConfigurationProperties("oauth2.client.providers.kakao")
-public record KakaoProvidersConfigurationProperties(String userInfoUri) {
+public record KakaoProvidersConfigurationProperties(String userInfoUri, String userUnlinkUri) {
 }

backend/ddang/src/main/java/com/ddang/ddang/authentication/infrastructure/oauth2/OAuth2UserInformationProvider.java

@@ -7,4 +7,6 @@ public interface OAuth2UserInformationProvider {
     Oauth2Type supportsOauth2Type();
 
     UserInformationDto findUserInformation(final String accessToken);
+
+    UserInformationDto unlinkUserBy(final String accessToken, final String oauthId);
 }

backend/ddang/src/main/java/com/ddang/ddang/authentication/infrastructure/oauth2/Oauth2Type.java

@@ -1,7 +1,7 @@
 package com.ddang.ddang.authentication.infrastructure.oauth2;
 
-import com.ddang.ddang.authentication.domain.dto.UserInformationDto;
 import com.ddang.ddang.authentication.domain.exception.UnsupportedSocialLoginException;
+
 import java.util.Locale;
 
 public enum Oauth2Type {
@@ -16,9 +16,9 @@ public static Oauth2Type from(final String typeName) {
         }
     }
 
-    public String calculateNickname(final UserInformationDto dto) {
+    public String calculateNickname(final String name) {
         return this.name()
                    .toLowerCase(Locale.ENGLISH)
-                   .concat(String.valueOf(dto.id()));
+                   .concat(name);
     }
 }

backend/ddang/src/main/java/com/ddang/ddang/authentication/infrastructure/oauth2/kakao/KakaoUserInformationProvider.java

@@ -12,6 +12,8 @@
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
 import org.springframework.web.client.HttpClientErrorException;
 import org.springframework.web.client.RestTemplate;
 
@@ -54,4 +56,32 @@ public UserInformationDto findUserInformation(final String accessToken) {
             throw new InvalidTokenException(message, ex);
         }
     }
+
+    @Override
+    public UserInformationDto unlinkUserBy(final String accessToken, final String oauthId) {
+        final HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_JSON);
+        headers.set(HttpHeaders.AUTHORIZATION, TOKEN_TYPE + accessToken);
+
+        final MultiValueMap<String, String> parameters = new LinkedMultiValueMap<>();
+        parameters.add("target_id_type", "user_id");
+        parameters.add("target_id", oauthId);
+
+        final HttpEntity<MultiValueMap<String, String>> request = new HttpEntity<>(parameters, headers);
+
+        try {
+            final ResponseEntity<UserInformationDto> response = restTemplate.exchange(
+                    providersConfigurationProperties.userUnlinkUri(),
+                    HttpMethod.POST,
+                    request,
+                    UserInformationDto.class
+            );
+
+            return response.getBody();
+        } catch (final HttpClientErrorException ex) {
+            final String message = ex.getMessage().split(REST_TEMPLATE_MESSAGE_SEPARATOR)[MESSAGE_INDEX];
+
+            throw new InvalidTokenException(message, ex);
+        }
+    }
 }

backend/ddang/src/main/java/com/ddang/ddang/user/application/UserService.java

@@ -21,12 +21,4 @@ public ReadUserDto readById(final Long userId) {
 
         return ReadUserDto.from(user);
     }
-
-    @Transactional
-    public void deleteById(final Long userId) {
-        final User user = userRepository.findByIdAndDeletedIsFalse(userId)
-                                        .orElseThrow(() -> new UserNotFoundException("사용자 정보를 사용할 수 없습니다."));
-
-        user.withdrawal();
-    }
 }

backend/ddang/src/main/java/com/ddang/ddang/user/domain/User.java

@@ -23,6 +23,7 @@
 public class User extends BaseTimeEntity {
 
     private static final boolean DELETED_STATUS = true;
+    private static final String UNKOWN_NAME = "알 수 없음";
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -35,7 +36,6 @@ public class User extends BaseTimeEntity {
 
     private double reliability;
 
-    @Column(unique = true)
     private String oauthId;
 
     @Column(name = "is_deleted")
@@ -57,4 +57,14 @@ private User(
     public void withdrawal() {
         this.deleted = DELETED_STATUS;
     }
+
+    // TODO: 2023/09/15 [고민] getName() 메서드를 통해 가져오게 된다면 헷갈릴까요?
+    // TODO: 2023/09/15 [고민] 출력을 위한 로직이 여기 있다면 어색할까요? 사실 귀찮아서 여기 두긴 했습니다.
+    public String getName() {
+        if (isDeleted()) {
+            return UNKOWN_NAME;
+        }
+
+        return name;
+    }
 }

backend/ddang/src/main/java/com/ddang/ddang/user/infrastructure/persistence/JpaUserRepository.java

@@ -7,9 +7,11 @@
 
 public interface JpaUserRepository extends JpaRepository<User, Long> {
 
-    Optional<User> findByOauthId(final String oauthId);
+    Optional<User> findByOauthIdAndDeletedIsFalse(final String oauthId);
 
     Optional<User> findByIdAndDeletedIsFalse(final Long id);
 
     boolean existsByIdAndDeletedIsTrue(final Long id);
+
+    boolean existsByNameEndingWith(final String name);
 }

backend/ddang/src/main/java/com/ddang/ddang/user/presentation/UserController.java

@@ -7,7 +7,6 @@
 import com.ddang.ddang.user.presentation.dto.ReadUserResponse;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -26,12 +25,4 @@ public ResponseEntity<ReadUserResponse> readById(@AuthenticateUser final Authent
 
         return ResponseEntity.ok(response);
     }
-
-    @DeleteMapping("/withdrawal")
-    public ResponseEntity<Void> delete(@AuthenticateUser final AuthenticationUserInfo userInfo) {
-        userService.deleteById(userInfo.userId());
-
-        return ResponseEntity.noContent()
-                             .build();
-    }
 }

backend/ddang/src/main/resources/application-local.yml

@@ -50,3 +50,4 @@ oauth2:
     providers:
       kakao:
         user-info-uri: https://kapi.kakao.com/v2/user/me
+        user-unlink-uri: https://kapi.kakao.com/v1/user/unlink

backend/ddang/src/main/resources/db/migration/V10__alter_user_tables.sql

@@ -0,0 +1 @@
+ALTER TABLE users DROP INDEX uq_oauth_id;