Revert "feat: #364 탈퇴 기능 추가 (#378)"

This reverts commit add6f8b.

backend/ddang/src/docs/asciidoc/docs.adoc

@@ -75,19 +75,6 @@ include::{snippets}/authentication-controller-test/access-token과_refresh-token
 
 include::{snippets}/authentication-controller-test/access-token과_refresh-token을_전달하면_로그아웃한다/http-response.adoc[]
 
-=== 탈퇴
-
-==== 요청
-
-include::{snippets}/authentication-controller-test/ouath2-type과_access-token과_refresh-token을_전달하면_탈퇴한다/http-request.adoc[]
-include::{snippets}/authentication-controller-test/ouath2-type과_access-token과_refresh-token을_전달하면_탈퇴한다/path-parameters.adoc[]
-include::{snippets}/authentication-controller-test/ouath2-type과_access-token과_refresh-token을_전달하면_탈퇴한다/request-headers.adoc[]
-include::{snippets}/authentication-controller-test/ouath2-type과_access-token과_refresh-token을_전달하면_탈퇴한다/request-fields.adoc[]
-
-==== 응답
-
-include::{snippets}/authentication-controller-test/ouath2-type과_access-token과_refresh-token을_전달하면_탈퇴한다/http-response.adoc[]
-
 == 사용자 정보 API
 === 사용자 정보 조회
 

backend/ddang/src/main/java/com/ddang/ddang/auction/application/dto/ReadAuctionDto.java

@@ -2,7 +2,6 @@
 
 import com.ddang.ddang.auction.domain.Auction;
 import com.ddang.ddang.bid.domain.Bid;
-import com.ddang.ddang.image.application.util.ImageIdProcessor;
 import com.ddang.ddang.image.domain.AuctionImage;
 
 import java.time.LocalDateTime;
@@ -26,8 +25,7 @@ public record ReadAuctionDto(
         Long sellerId,
         Long sellerProfileId,
         String sellerName,
-        double sellerReliability,
-        boolean isSellerDeleted
+        double sellerReliability
 ) {
 
     public static ReadAuctionDto from(final Auction auction) {
@@ -47,10 +45,9 @@ public static ReadAuctionDto from(final Auction auction) {
                 auction.getSubCategory().getMainCategory().getName(),
                 auction.getSubCategory().getName(),
                 auction.getSeller().getId(),
-                ImageIdProcessor.process(auction.getSeller().getProfileImage()),
+                auction.getSeller().getProfileImage().getId(),
                 auction.getSeller().getName(),
-                auction.getSeller().getReliability(),
-                auction.getSeller().isDeleted()
+                auction.getSeller().getReliability()
         );
     }
 

backend/ddang/src/main/java/com/ddang/ddang/auction/presentation/dto/response/ChatRoomInAuctionResponse.java

@@ -5,6 +5,7 @@
 public record ChatRoomInAuctionResponse(Long id, boolean isChatParticipant) {
 
     public static ChatRoomInAuctionResponse from(final ReadChatRoomDto readChatRoomDto) {
+
         return new ChatRoomInAuctionResponse(readChatRoomDto.id(), readChatRoomDto.isChatParticipant());
     }
 }

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

@@ -1,8 +1,6 @@
 package com.ddang.ddang.authentication.application;
 
 import com.ddang.ddang.authentication.application.dto.TokenDto;
-import com.ddang.ddang.authentication.application.exception.InvalidWithdrawalException;
-import com.ddang.ddang.authentication.application.util.RandomNameGenerator;
 import com.ddang.ddang.authentication.domain.Oauth2UserInformationProviderComposite;
 import com.ddang.ddang.authentication.domain.TokenDecoder;
 import com.ddang.ddang.authentication.domain.TokenEncoder;
@@ -35,7 +33,6 @@ public class AuthenticationService {
     private final JpaUserRepository userRepository;
     private final TokenEncoder tokenEncoder;
     private final TokenDecoder tokenDecoder;
-    private final BlackListTokenService blackListTokenService;
 
     @Transactional
     public TokenDto login(final Oauth2Type oauth2Type, final String oauth2AccessToken, final String deviceToken) {
@@ -54,10 +51,10 @@ private void updateOrPersistDeviceToken(final String deviceToken, final User per
     }
 
     private User findOrPersistUser(final Oauth2Type oauth2Type, final UserInformationDto userInformationDto) {
-        return userRepository.findByOauthIdAndDeletedIsFalse(userInformationDto.findUserId())
+        return userRepository.findByOauthId(userInformationDto.findUserId())
                              .orElseGet(() -> {
                                  final User user = User.builder()
-                                                       .name(oauth2Type.calculateNickname(calculateRandomNumber()))
+                                                       .name(oauth2Type.calculateNickname(userInformationDto))
                                                        .profileImage(null)
                                                        .reliability(0.0d)
                                                        .oauthId(userInformationDto.findUserId())
@@ -67,20 +64,6 @@ private User findOrPersistUser(final Oauth2Type oauth2Type, final UserInformatio
                              });
     }
 
-    private String calculateRandomNumber() {
-        String name = RandomNameGenerator.generate();
-
-        while (isAlreadyExist(name)) {
-            name = RandomNameGenerator.generate();
-        }
-
-        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(),
@@ -114,20 +97,4 @@ public boolean validateToken(final String accessToken) {
         return tokenDecoder.decode(TokenType.ACCESS, accessToken)
                            .isPresent();
     }
-
-    @Transactional
-    public void withdrawal(
-            final Oauth2Type oauth2Type,
-            final String oauth2AccessToken,
-            final String refreshToken
-    ) throws InvalidWithdrawalException {
-        final OAuth2UserInformationProvider provider = providerComposite.findProvider(oauth2Type);
-        final UserInformationDto userInformationDto = provider.findUserInformation(oauth2AccessToken);
-        final User user = userRepository.findByOauthIdAndDeletedIsFalse(userInformationDto.findUserId())
-                                        .orElseThrow(() -> new InvalidWithdrawalException("탈퇴에 대한 권한 없습니다."));
-
-        user.withdrawal();
-        blackListTokenService.registerBlackListToken(oauth2AccessToken, refreshToken);
-        provider.unlinkUserBy(oauth2AccessToken, user.getOauthId());
-    }
 }

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, String userUnlinkUri) {
+public record KakaoProvidersConfigurationProperties(String userInfoUri) {
 }

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

@@ -7,6 +7,4 @@ 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 String name) {
+    public String calculateNickname(final UserInformationDto dto) {
         return this.name()
                    .toLowerCase(Locale.ENGLISH)
-                   .concat(name);
+                   .concat(String.valueOf(dto.id()));
     }
 }

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

@@ -12,8 +12,6 @@
 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;
 
@@ -56,32 +54,4 @@ 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/authentication/presentation/AuthenticationController.java

@@ -7,14 +7,12 @@
 import com.ddang.ddang.authentication.presentation.dto.request.LoginTokenRequest;
 import com.ddang.ddang.authentication.presentation.dto.request.LogoutRequest;
 import com.ddang.ddang.authentication.presentation.dto.request.RefreshTokenRequest;
-import com.ddang.ddang.authentication.presentation.dto.request.WithdrawalRequest;
 import com.ddang.ddang.authentication.presentation.dto.response.TokenResponse;
 import com.ddang.ddang.authentication.presentation.dto.response.ValidatedTokenResponse;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpHeaders;
 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.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -67,16 +65,4 @@ public ResponseEntity<Void> logout(
         return ResponseEntity.noContent()
                              .build();
     }
-
-    @DeleteMapping("/withdrawal/{oauth2Type}")
-    public ResponseEntity<Void> withdrawal(
-            @PathVariable final Oauth2Type oauth2Type,
-            @RequestHeader(HttpHeaders.AUTHORIZATION) final String accessToken,
-            @RequestBody @Valid final WithdrawalRequest request
-    ) {
-        authenticationService.withdrawal(oauth2Type, accessToken, request.refreshToken());
-
-        return ResponseEntity.noContent()
-                             .build();
-    }
 }

backend/ddang/src/main/java/com/ddang/ddang/bid/application/dto/ReadBidDto.java

@@ -1,15 +1,13 @@
 package com.ddang.ddang.bid.application.dto;
 
 import com.ddang.ddang.bid.domain.Bid;
-import com.ddang.ddang.image.application.util.ImageIdProcessor;
 import com.ddang.ddang.user.domain.User;
 
 import java.time.LocalDateTime;
 
 public record ReadBidDto(
         String name,
         Long profileImageId,
-        boolean isDeletedUser,
         int price,
         LocalDateTime bidTime
 ) {
@@ -19,8 +17,7 @@ public static ReadBidDto from(final Bid bid) {
 
         return new ReadBidDto(
                 bidder.getName(),
-                ImageIdProcessor.process(bidder.getProfileImage()),
-                bidder.isDeleted(),
+                bidder.getProfileImage().getId(),
                 bid.getPrice().getValue(),
                 bid.getCreatedTime()
         );

backend/ddang/src/main/java/com/ddang/ddang/bid/presentation/dto/response/ReadBidResponse.java

@@ -3,7 +3,6 @@
 import com.ddang.ddang.bid.application.dto.ReadBidDto;
 import com.ddang.ddang.image.presentation.util.ImageBaseUrl;
 import com.ddang.ddang.image.presentation.util.ImageUrlCalculator;
-import com.ddang.ddang.user.presentation.util.NameProcessor;
 import com.fasterxml.jackson.annotation.JsonFormat;
 
 import java.time.LocalDateTime;
@@ -20,8 +19,7 @@ public record ReadBidResponse(
 ) {
 
     public static ReadBidResponse from(final ReadBidDto dto) {
-        final String name = NameProcessor.process(dto.isDeletedUser(), dto.name());
-        return new ReadBidResponse(name, convertImageUrl(dto.profileImageId()), dto.price(), dto.bidTime());
+        return new ReadBidResponse(dto.name(), convertImageUrl(dto.profileImageId()), dto.price(), dto.bidTime());
     }
 
     private static String convertImageUrl(final Long id) {

backend/ddang/src/main/java/com/ddang/ddang/chat/application/MessageService.java

@@ -10,7 +10,7 @@
 import com.ddang.ddang.chat.infrastructure.persistence.JpaChatRoomRepository;
 import com.ddang.ddang.chat.infrastructure.persistence.JpaMessageRepository;
 import com.ddang.ddang.chat.presentation.dto.request.ReadMessageRequest;
-import com.ddang.ddang.image.application.util.ImageIdProcessor;
+import com.ddang.ddang.image.application.ImageService;
 import com.ddang.ddang.notification.application.NotificationService;
 import com.ddang.ddang.notification.application.dto.CreateNotificationDto;
 import com.ddang.ddang.notification.domain.NotificationType;
@@ -30,6 +30,7 @@
 public class MessageService {
 
     private final NotificationService notificationService;
+    private final ImageService imageService;
     private final JpaMessageRepository messageRepository;
     private final JpaChatRoomRepository chatRoomRepository;
     private final JpaUserRepository userRepository;
@@ -60,7 +61,7 @@ public Long create(final CreateMessageDto dto, final String baseUrl) {
     }
 
     private void sendNotification(final Message message, final String baseUrl)  {
-        final Long profileImageId = ImageIdProcessor.process(message.getWriter().getProfileImage());
+        final Long profileImageId = message.getWriter().getProfileImage().getId();
         final String profileImageUrl = baseUrl.concat(String.valueOf(profileImageId));
 
         final CreateNotificationDto dto = new CreateNotificationDto(

backend/ddang/src/main/java/com/ddang/ddang/chat/application/dto/ReadUserInChatRoomDto.java

@@ -1,17 +1,15 @@
 package com.ddang.ddang.chat.application.dto;
 
-import com.ddang.ddang.image.application.util.ImageIdProcessor;
 import com.ddang.ddang.user.domain.User;
 
-public record ReadUserInChatRoomDto(Long id, String name, Long profileImageId, double reliability, boolean isDeleted) {
+public record ReadUserInChatRoomDto(Long id, String name, Long profileImageId, double reliability) {
 
     public static ReadUserInChatRoomDto from(final User user) {
         return new ReadUserInChatRoomDto(
                 user.getId(),
                 user.getName(),
-                ImageIdProcessor.process(user.getProfileImage()),
-                user.getReliability(),
-                user.isDeleted()
+                user.getProfileImage().getId(),
+                user.getReliability()
         );
     }
 }

backend/ddang/src/main/java/com/ddang/ddang/chat/presentation/dto/response/ReadChatPartnerResponse.java

@@ -3,14 +3,11 @@
 import com.ddang.ddang.chat.application.dto.ReadUserInChatRoomDto;
 import com.ddang.ddang.image.presentation.util.ImageBaseUrl;
 import com.ddang.ddang.image.presentation.util.ImageUrlCalculator;
-import com.ddang.ddang.user.presentation.util.NameProcessor;
 
 public record ReadChatPartnerResponse(Long id, String name, String profileImage) {
 
     public static ReadChatPartnerResponse from(final ReadUserInChatRoomDto dto) {
-        final String name = NameProcessor.process(dto.isDeleted(), dto.name());
-
-        return new ReadChatPartnerResponse(dto.id(), name, convertImageUrl(dto.profileImageId()));
+        return new ReadChatPartnerResponse(dto.id(), dto.name(), convertImageUrl(dto.profileImageId()));
     }
 
     private static String convertImageUrl(final Long id) {

backend/ddang/src/main/java/com/ddang/ddang/common/helper/QuerydslSliceHelper.java

@@ -5,7 +5,7 @@
 import org.springframework.data.domain.Slice;
 import org.springframework.data.domain.SliceImpl;
 
-public final class QuerydslSliceHelper {
+public class QuerydslSliceHelper {
 
     private QuerydslSliceHelper() {
     }