fix: withdrawal error

Author: do-dop

src/main/java/ttakkeun/ttakkeun_server/dto/auth/apple/AppleRevokeRequest.java

@@ -10,6 +10,6 @@
 public class AppleRevokeRequest {
     private String client_id;
     private String client_secret;
-    private String refresh_token;
-    private String token_type;
+    private String token;
+    private String token_type_hint;
 }

src/main/java/ttakkeun/ttakkeun_server/dto/auth/apple/AppleTokenRequest.java

@@ -10,6 +10,6 @@
 public class AppleTokenRequest {
     private String client_id;
     private String client_secret;
-    private String authorization_code;
+    private String code;
     private String grant_type;
 }

src/main/java/ttakkeun/ttakkeun_server/entity/Member.java

@@ -6,6 +6,7 @@
 import org.springframework.security.core.userdetails.UserDetails;
 import ttakkeun.ttakkeun_server.entity.common.BaseEntity;
 import ttakkeun.ttakkeun_server.entity.enums.LoginType;
+import ttakkeun.ttakkeun_server.entity.enums.MemberStatus;
 
 import java.time.LocalDateTime;
 import java.util.Collection;
@@ -43,6 +44,11 @@ public class Member extends BaseEntity implements UserDetails {
     @Column(nullable = false)
     private LocalDateTime refreshTokenExpiresAt;    //토큰 만료 일자
 
+    @Enumerated(EnumType.STRING)
+    @Column(nullable = false)
+    @Builder.Default // Set default value for builder
+    private MemberStatus status = MemberStatus.ACTIVE;
+
     // refreshToken 재발급
     public void updateRefreshToken(String refreshToken) {
         this.refreshToken = refreshToken;
@@ -61,6 +67,15 @@ public void changeUsername(String newUsername) {
         this.username = newUsername;
     }
 
+    //탈퇴
+    public void withdraw() {
+        this.status = MemberStatus.WITHDRAWN;
+        this.appleSub = null;
+        this.kakaoUserId = null;
+        this.refreshToken = "WITHDRAWN"; // Refresh token 무효화
+        this.refreshTokenExpiresAt = LocalDateTime.now();
+    }
+
     @Override
     public Collection<? extends GrantedAuthority> getAuthorities() {
         return List.of();

src/main/java/ttakkeun/ttakkeun_server/entity/enums/MemberStatus.java

@@ -0,0 +1,6 @@
+package ttakkeun.ttakkeun_server.entity.enums;
+
+public enum MemberStatus {
+    ACTIVE,     // 활성 회원 (기본값)
+    WITHDRAWN   // 탈퇴한 회원
+}

src/main/java/ttakkeun/ttakkeun_server/repository/InquiryRepository.java

@@ -12,4 +12,6 @@
 @Repository
 public interface InquiryRepository extends JpaRepository<Inquiry, Long> {
     List<Inquiry> findByMember(Member member);
+
+    void deleteAllByMember(Member member);
 }

src/main/java/ttakkeun/ttakkeun_server/repository/ReportTipRepository.java

@@ -2,7 +2,9 @@
 
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import ttakkeun.ttakkeun_server.entity.Member;
 import ttakkeun.ttakkeun_server.entity.ReportTip;
 
 public interface ReportTipRepository extends JpaRepository<ReportTip, Long> {
+    void deleteAllByMember(Member member);
 }

src/main/java/ttakkeun/ttakkeun_server/service/MemberService.java

@@ -20,7 +20,9 @@
 public class MemberService {
     private final MemberRepository memberRepository;
     private final PetRepository petRepository;
-
+    private final PointRepository pointRepository;
+    private final InquiryRepository inquiryRepository;
+    private final ReportTipRepository reportTipRepository;
     private final PetService petService;
     private final LikeTipService likeTipService;
     private final LikeService likeService;
@@ -42,9 +44,16 @@ public void deleteMember(Member member) {
         removeTipAuthor(member);
         //스크랩한 팁 삭제
         deleteScrapTip(member);
+        //포인트 삭제
+        deletePoint(member);
+        //문의하기 삭제
+        deleteInquiry(member);
+        //팁 신고하기 삭제
+        deleteReportTip(member);
 
-        //멤버 삭제
-        memberRepository.deleteById(member.getMemberId());
+        //멤버 탈퇴 처리
+        member.withdraw();
+        memberRepository.save(member);
     }
 
     public void deletePet(Member member) {
@@ -74,6 +83,18 @@ public void deleteLikeProduct(Member member) {
         likeService.deleteAllByMember(member);
     }
 
+    public void deletePoint(Member member) {
+        pointRepository.deleteByMember(member);
+    }
+
+    public void deleteInquiry(Member member) {
+        inquiryRepository.deleteAllByMember(member);
+    }
+
+    public void deleteReportTip(Member member) {
+        reportTipRepository.deleteAllByMember(member);
+    }
+
     public Member getMemberInfo(Long memberId) {
         return memberRepository.findByMemberId(memberId)
                 .orElseThrow(() -> new IllegalArgumentException("존재하지 않는 사용자입니다."));

src/main/java/ttakkeun/ttakkeun_server/service/auth/OAuthService.java

@@ -171,22 +171,18 @@ public LoginResponseDto appleSignUp(AppleSignUpRequestDto appleSignUpRequestDto)
     public void appleDelete(Member member, String code, WithdrawalRequestDto withdrawalDto) {
         try {
             String clientSecret = appleClientSecretGenerator.createClientSecret();
+            log.info("appleDelete client secret: {}", clientSecret);
+//
             String refreshToken = appleOAuthProvider.getAppleRefreshToken(code, clientSecret);
-            String idToken = appleOAuthProvider.getAppleIdToken(code, clientSecret);
-            Claims claims = validateAndGetClaims(idToken);
-            String sub = claims.getSubject();
-
-            // 회원 정보 일치 검사
-            if (!sub.equals(member.getAppleSub())) {
-                throw new MemberHandler(MEMBER_NOT_MATCH);
-            }
+            log.info("appleDelete refresh token: {}", refreshToken);
 
             AppleRevokeRequest appleRevokeRequest = AppleRevokeRequest.builder()
                     .client_id(clientId)
-                    .refresh_token(refreshToken)
+                    .token(refreshToken)
                     .client_secret(clientSecret)
-                    .token_type("REFRESH_TOKEN")
+                    .token_type_hint("refresh_token")
                     .build();
+            log.info("appleDelete apple revoke request: {}", appleRevokeRequest);
             appleAuthClient.revoke(appleRevokeRequest);
         } catch (HttpClientErrorException e) {
             throw new RuntimeException("Apple Revoke Error");

src/main/java/ttakkeun/ttakkeun_server/utils/AppleOAuthProvider.java

@@ -1,11 +1,14 @@
 package ttakkeun.ttakkeun_server.utils;
 
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import ttakkeun.ttakkeun_server.dto.auth.apple.AppleAuthClient;
 import ttakkeun.ttakkeun_server.dto.auth.apple.AppleTokenRequest;
+import ttakkeun.ttakkeun_server.dto.auth.apple.AppleTokenResponse;
 
+@Slf4j
 @Component
 @RequiredArgsConstructor
 public class AppleOAuthProvider {
@@ -18,19 +21,18 @@ public String getAppleRefreshToken(String code, String clientSecret) {
         AppleTokenRequest appleTokenRequest = AppleTokenRequest.builder()
                 .client_id(clientId)
                 .client_secret(clientSecret)
-                .authorization_code(code)
-                .grant_type("AUTHORIZATION_CODE")
+                .code(code)
+                .grant_type("authorization_code")
                 .build();
-
         return appleAuthClient.findAppleToken(appleTokenRequest).refreshToken();
     }
 
     public String getAppleIdToken(String code, String clientSecret) {
         AppleTokenRequest appleTokenRequest = AppleTokenRequest.builder()
                 .client_id(clientId)
                 .client_secret(clientSecret)
-                .authorization_code(code)
-                .grant_type("AUTHORIZATION_CODE")
+                .code(code)
+                .grant_type("authorization_code")
                 .build();
 
         return appleAuthClient.findAppleToken(appleTokenRequest).idToken();