Merge pull request #50 from Central-MakeUs/refactor/#49-terms-api-separate

약관 동의 API를 분리한다.

Author: strongmhk

src/main/java/akuma/whiplash/domains/member/application/dto/request/MemberPrivacyPolicyModifyRequest.java

@@ -0,0 +1,13 @@
+package akuma.whiplash.domains.member.application.dto.request;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+import lombok.Builder;
+
+@Builder
+public record MemberPrivacyPolicyModifyRequest(
+    @Schema(description = "개인정보 수집 동의 여부", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "개인정보 수집 동의 여부를 선택해주세요.")
+    Boolean privacyPolicy
+) {
+}

src/main/java/akuma/whiplash/domains/member/application/dto/request/MemberPushNotificationPolicyModifyRequest.java

@@ -0,0 +1,14 @@
+package akuma.whiplash.domains.member.application.dto.request;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+import lombok.Builder;
+
+@Builder
+public record MemberPushNotificationPolicyModifyRequest(
+    @Schema(description = "푸시 알림 수신 동의 여부", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "푸시 알림 수신 동의 여부를 선택해주세요.")
+    Boolean pushNotificationPolicy
+) {
+
+}

src/main/java/akuma/whiplash/domains/member/application/dto/request/MemberTermsModifyRequest.java

@@ -1,6 +1,8 @@
 package akuma.whiplash.domains.member.application.usecase;
 
-import akuma.whiplash.domains.member.application.dto.request.MemberTermsModifyRequest;
+import akuma.whiplash.domains.auth.application.dto.etc.MemberContext;
+import akuma.whiplash.domains.member.application.dto.request.MemberPrivacyPolicyModifyRequest;
+import akuma.whiplash.domains.member.application.dto.request.MemberPushNotificationPolicyModifyRequest;
 import akuma.whiplash.domains.member.domain.service.MemberCommandService;
 import akuma.whiplash.global.annotation.architecture.UseCase;
 import lombok.RequiredArgsConstructor;
@@ -12,11 +14,15 @@ public class MemberUseCase {
 
     private final MemberCommandService memberCommandService;
 
-    public void modifyMemberTermsInfo(Long memberId, MemberTermsModifyRequest request) {
-        memberCommandService.modifyMemberTermsInfo(memberId, request);
+    public void modifyMemberPrivacyPolicy(Long memberId, MemberPrivacyPolicyModifyRequest request) {
+        memberCommandService.modifyPrivacyPolicy(memberId, request.privacyPolicy());
     }
 
-    public void hardDeleteMember(Long memberId) {
-        memberCommandService.hardDeleteMember(memberId);
+    public void modifyMemberPushNotificationPolicy(Long memberId, MemberPushNotificationPolicyModifyRequest request) {
+        memberCommandService.modifyPushNotificationPolicy(memberId, request.pushNotificationPolicy());
+    }
+
+    public void hardDeleteMember(MemberContext memberContext) {
+        memberCommandService.hardDeleteMember(memberContext.memberId(), memberContext.deviceId());
     }
 }

src/main/java/akuma/whiplash/domains/member/application/usecase/MemberUseCase.java

@@ -1,8 +1,7 @@
 package akuma.whiplash.domains.member.domain.service;
 
-import akuma.whiplash.domains.member.application.dto.request.MemberTermsModifyRequest;
-
 public interface MemberCommandService {
-    void modifyMemberTermsInfo(Long memberId, MemberTermsModifyRequest request);
-    void hardDeleteMember(Long memberId);
+    void modifyPrivacyPolicy(Long memberId, boolean privacyPolicy);
+    void modifyPushNotificationPolicy(Long memberId, boolean pushNotificationPolicy);
+    void hardDeleteMember(Long memberId, String deviceId);
 }

src/main/java/akuma/whiplash/domains/member/domain/service/MemberCommandService.java

@@ -4,11 +4,12 @@
 import akuma.whiplash.domains.alarm.persistence.repository.AlarmOffLogRepository;
 import akuma.whiplash.domains.alarm.persistence.repository.AlarmRepository;
 import akuma.whiplash.domains.alarm.persistence.repository.AlarmRingingLogRepository;
-import akuma.whiplash.domains.member.application.dto.request.MemberTermsModifyRequest;
 import akuma.whiplash.domains.member.exception.MemberErrorCode;
 import akuma.whiplash.domains.member.persistence.entity.MemberEntity;
 import akuma.whiplash.domains.member.persistence.repository.MemberRepository;
+import akuma.whiplash.global.config.security.jwt.JwtUtils;
 import akuma.whiplash.global.exception.ApplicationException;
+import akuma.whiplash.infrastructure.redis.RedisService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -23,23 +24,31 @@ public class MemberCommandServiceImpl implements MemberCommandService {
     private final AlarmOccurrenceRepository alarmOccurrenceRepository;
     private final AlarmOffLogRepository alarmOffLogRepository;
     private final AlarmRingingLogRepository alarmRingingLogRepository;
+    private final JwtUtils jwtUtils;
+    private final RedisService redisService;
 
     @Override
-    public void modifyMemberTermsInfo(Long memberId, MemberTermsModifyRequest request) {
+    public void modifyPrivacyPolicy(Long memberId, boolean privacyPolicy) {
         MemberEntity member = memberRepository.findById(memberId)
             .orElseThrow(() -> ApplicationException.from(MemberErrorCode.MEMBER_NOT_FOUND));
 
-        if (request.privacyPolicy() != null) {
-            member.updatePrivacyPolicy(request.privacyPolicy());
+        if (member.isPrivacyPolicy() != privacyPolicy) {
+            member.updatePrivacyPolicy(privacyPolicy);
         }
+    }
+
+    @Override
+    public void modifyPushNotificationPolicy(Long memberId, boolean pushNotificationPolicy) {
+        MemberEntity member = memberRepository.findById(memberId)
+            .orElseThrow(() -> ApplicationException.from(MemberErrorCode.MEMBER_NOT_FOUND));
 
-        if (request.pushNotificationPolicy() != null) {
-            member.updatePushNotificationPolicy(request.pushNotificationPolicy());
+        if (member.isPushNotificationPolicy() != pushNotificationPolicy) {
+            member.updatePushNotificationPolicy(pushNotificationPolicy);
         }
     }
 
     @Override
-    public void hardDeleteMember(Long memberId) {
+    public void hardDeleteMember(Long memberId, String deviceId) {
         MemberEntity member = memberRepository.findById(memberId)
             .orElseThrow(() -> ApplicationException.from(MemberErrorCode.MEMBER_NOT_FOUND));
 
@@ -58,7 +67,8 @@ public void hardDeleteMember(Long memberId) {
         // 6. member 삭제
         memberRepository.delete(member);
 
-
-        // TODO: 리프레시 토큰, FCM 토큰 삭제
+        // 리프레시 토큰, FCM 토큰 삭제
+        jwtUtils.expireRefreshToken(memberId, deviceId);
+        redisService.removeFcmTokenForDevice(memberId, deviceId);
     }
 }

src/main/java/akuma/whiplash/domains/member/domain/service/MemberCommandServiceImpl.java

@@ -3,7 +3,8 @@
 import static akuma.whiplash.domains.member.exception.MemberErrorCode.*;
 
 import akuma.whiplash.domains.auth.application.dto.etc.MemberContext;
-import akuma.whiplash.domains.member.application.dto.request.MemberTermsModifyRequest;
+import akuma.whiplash.domains.member.application.dto.request.MemberPrivacyPolicyModifyRequest;
+import akuma.whiplash.domains.member.application.dto.request.MemberPushNotificationPolicyModifyRequest;
 import akuma.whiplash.domains.member.application.usecase.MemberUseCase;
 import akuma.whiplash.global.annotation.swagger.CustomErrorCodes;
 import akuma.whiplash.global.response.ApplicationResponse;
@@ -25,18 +26,26 @@ public class MemberController {
     private final MemberUseCase memberUseCase;
 
     @CustomErrorCodes(memberErrorCodes = {MEMBER_NOT_FOUND})
-    @Operation(summary = "회원 약관 동의 정보 변경", description = "개인정보 제공 동의, 푸시 알림 수신 동의 여부를 변경합니다.")
-    @PutMapping("/terms")
-    public ApplicationResponse<Void> modifyMemberTermsInfo(@AuthenticationPrincipal MemberContext memberContext, @RequestBody @Valid MemberTermsModifyRequest request) {
-        memberUseCase.modifyMemberTermsInfo(memberContext.memberId(), request);
+    @Operation(summary = "회원 개인정보 수집 동의 변경", description = "개인정보 수집 동의 여부를 변경합니다.")
+    @PutMapping("/terms/privacy")
+    public ApplicationResponse<Void> modifyPrivacyPolicy(@AuthenticationPrincipal MemberContext memberContext, @RequestBody @Valid MemberPrivacyPolicyModifyRequest request) {
+        memberUseCase.modifyMemberPrivacyPolicy(memberContext.memberId(), request);
         return ApplicationResponse.onSuccess();
     }
 
-    @CustomErrorCodes
+    @CustomErrorCodes(memberErrorCodes = {MEMBER_NOT_FOUND})
+    @Operation(summary = "회원 푸시 알림 수신 동의 변경", description = "푸시 알림 수신 동의 여부를 변경합니다.")
+    @PutMapping("/terms/push-notifications")
+    public ApplicationResponse<Void> modifyPushNotificationPolicy(@AuthenticationPrincipal MemberContext memberContext, @RequestBody @Valid MemberPushNotificationPolicyModifyRequest request) {
+        memberUseCase.modifyMemberPushNotificationPolicy(memberContext.memberId(), request);
+        return ApplicationResponse.onSuccess();
+    }
+
+    @CustomErrorCodes(memberErrorCodes = {MEMBER_NOT_FOUND})
     @Operation(summary = "회원 탈퇴", description = "회원 정보, 관련된 알람 정보를 hard delete 합니다.")
     @DeleteMapping
     public ApplicationResponse<Void> hardDeleteMember(@AuthenticationPrincipal MemberContext memberContext) {
-        memberUseCase.hardDeleteMember(memberContext.memberId());
+        memberUseCase.hardDeleteMember(memberContext);
         return ApplicationResponse.onSuccess();
     }
 }