[MODIFY] 유저 탈퇴시 이벤트 기반으로 삭제해야하는 데이터 삭제 처리 로직 추가

src/main/java/org/sopt/app/application/fortune/FortuneService.java

@@ -2,12 +2,14 @@
 
 import java.time.LocalDate;
 import lombok.RequiredArgsConstructor;
+import org.sopt.app.application.user.UserWithdrawEvent;
 import org.sopt.app.common.exception.BadRequestException;
 import org.sopt.app.common.response.ErrorCode;
 import org.sopt.app.domain.entity.fortune.UserFortune;
 import org.sopt.app.interfaces.postgres.fortune.FortuneCardRepository;
 import org.sopt.app.interfaces.postgres.fortune.FortuneWordRepository;
 import org.sopt.app.interfaces.postgres.fortune.UserFortuneRepository;
+import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -57,4 +59,9 @@ public FortuneCardInfo getTodayFortuneCardByUserId(final Long userId) {
                 .map(FortuneCardInfo::of)
                 .orElseThrow(() -> new BadRequestException(ErrorCode.FORTUNE_NOT_FOUND_FROM_USER));
     }
+
+    @EventListener(UserWithdrawEvent.class)
+    public void handleUserWithdrawEvent(final UserWithdrawEvent event) {
+        userFortuneRepository.deleteAllByUserIdInQuery(event.getUserId());
+    }
 }

src/main/java/org/sopt/app/application/friend/FriendService.java

@@ -5,12 +5,14 @@
 import java.util.Map.Entry;
 import org.jetbrains.annotations.NotNull;
 import org.sopt.app.application.poke.PokeInfo.Relationship;
+import org.sopt.app.application.user.UserWithdrawEvent;
 import org.sopt.app.common.exception.NotFoundException;
 import org.sopt.app.common.response.ErrorCode;
 import org.sopt.app.common.utils.AnonymousNameGenerator;
 import org.sopt.app.domain.entity.Friend;
 import org.sopt.app.domain.enums.Friendship;
 import org.sopt.app.interfaces.postgres.FriendRepository;
+import org.springframework.context.event.EventListener;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
@@ -169,4 +171,10 @@ public boolean getIsNewUser(Long userId) {
     public Set<Long> findAllFriendIdsByUserId(Long userId) {
         return friendRepository.findAllOfFriendIdsByUserId(userId);
     }
+
+    @EventListener(UserWithdrawEvent.class)
+    public void handleUserWithdrawEvent(final UserWithdrawEvent event) {
+        friendRepository.deleteAllByFriendUserIdInQuery(event.getUserId());
+        friendRepository.deleteAllByUserIdInQuery(event.getUserId());
+    }
 }

src/main/java/org/sopt/app/application/notification/NotificationService.java

@@ -5,6 +5,7 @@
 
 import lombok.RequiredArgsConstructor;
 import lombok.val;
+import org.sopt.app.application.user.UserWithdrawEvent;
 import org.sopt.app.common.exception.BadRequestException;
 import org.sopt.app.common.response.ErrorCode;
 import org.sopt.app.domain.entity.Notification;
@@ -13,6 +14,7 @@
 import org.sopt.app.interfaces.postgres.NotificationRepository;
 import org.sopt.app.interfaces.postgres.UserRepository;
 import org.sopt.app.presentation.notification.NotificationRequest.RegisterNotificationRequest;
+import org.springframework.context.event.EventListener;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -83,4 +85,9 @@ public boolean getNotificationConfirmStatus(Long userId) {
                 .toList();
         return unreadNotificationList.isEmpty();
     }
+
+    @EventListener(UserWithdrawEvent.class)
+    public void handleUserWithdrawEvent(final UserWithdrawEvent event) {
+        notificationRepository.deleteByUserIdInQuery(event.getUserId());
+    }
 }

src/main/java/org/sopt/app/application/notification/PushTokenService.java

@@ -2,15 +2,17 @@
 
 import lombok.RequiredArgsConstructor;
 import lombok.val;
+import org.sopt.app.application.user.UserWithdrawEvent;
 import org.sopt.app.common.exception.BadRequestException;
 import org.sopt.app.common.response.ErrorCode;
 import org.sopt.app.domain.entity.PushToken;
 import org.sopt.app.domain.entity.User;
 import org.sopt.app.domain.enums.PushTokenPlatform;
 import org.sopt.app.interfaces.postgres.PushTokenRepository;
-import org.sopt.app.presentation.notification.PushTokenRequest;
+import org.sopt.app.presentation.notification.PushTokenRequest.PushTokenManageRequest;
 import org.sopt.app.presentation.notification.PushTokenResponse;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.event.EventListener;
 import org.springframework.http.*;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -59,7 +61,7 @@ public PushTokenResponse.StatusResponse registerDeviceToken(User user, String pu
                     .platform(PushTokenPlatform.valueOf(platform))
                     .build();
             try {
-                val entity = new HttpEntity(
+                val entity = new HttpEntity<>(
                         createBodyFor(registerToken),
                         createHeadersFor(ACTION_REGISTER, platform)
                 );
@@ -80,37 +82,45 @@ public PushTokenResponse.StatusResponse registerDeviceToken(User user, String pu
                 .message("토큰 등록 성공")
                 .build();
     }
-
-
+
     // 유효하지 않은 토큰으로 인해 BadRequest가 발생하더라도 넘어가야함.(Local 에는 모든 토큰을 쌓아놓기 때문에)
     @Transactional
-    public PushTokenResponse.StatusResponse deleteDeviceToken(PushToken pushToken) {
+    public void deleteDeviceToken(PushToken pushToken) {
+        pushTokenRepository.delete(pushToken);
         try {
-            val entity = new HttpEntity(
+            val entity = new HttpEntity<>(
                     createBodyFor(pushToken),
                     createHeadersFor(ACTION_DELETE, pushToken.getPlatform().name())
             );
             val response = sendRequestToPushServer(entity);
-            pushTokenRepository.delete(pushToken);
-            return response.getBody();
+            response.getBody();
         } catch (BadRequestException e) {
-            return PushTokenResponse.StatusResponse.builder()
+            PushTokenResponse.StatusResponse.builder()
                     .status(e.getErrorCode().getHttpStatus().value())
                     .success(false)
                     .message(e.getErrorCode().getMessage())
                     .build();
         }
     }
 
-    @Transactional
-    public void deleteAllDeviceTokenOf(User user) {
-        // 기존에 저장되어 있던 Tokens -> 알림 서버에 삭제 요청
-        List<PushToken> userTokens = pushTokenRepository.findAllByUserId(user.getId());
+    private ResponseEntity<PushTokenResponse.StatusResponse> sendRequestToPushServer(
+            HttpEntity<PushTokenManageRequest> requestEntity
+    ) {
+        return restTemplate.exchange(
+                baseURI,
+                HttpMethod.POST,
+                requestEntity,
+                PushTokenResponse.StatusResponse.class
+        );
+    }
+
+    @EventListener(UserWithdrawEvent.class)
+    public void deleteAllDeviceTokenOf(final UserWithdrawEvent event) {
+        List<PushToken> userTokens = pushTokenRepository.findAllByUserId(event.getUserId());
         if (!userTokens.isEmpty()) {
             for (PushToken token : userTokens) {
-                deleteDeviceToken(token);
+                this.deleteDeviceToken(token);
             }
-            // 우선 서비스 DB에 있는 모든 토큰 지워버리기
             pushTokenRepository.deleteAll(userTokens);
         }
     }
@@ -126,18 +136,10 @@ private HttpHeaders createHeadersFor(String action, String platform) {
         return headers;
     }
 
-    private PushTokenRequest.PushTokenManageRequest createBodyFor(PushToken pushToken) {
-        return new PushTokenRequest.PushTokenManageRequest(
+    private PushTokenManageRequest createBodyFor(PushToken pushToken) {
+        return new PushTokenManageRequest(
                 List.of(String.valueOf(pushToken.getPlaygroundId())),
                 pushToken.getToken()
         );
     }
-    private ResponseEntity<PushTokenResponse.StatusResponse> sendRequestToPushServer(HttpEntity requestEntity) {
-        return restTemplate.exchange(
-                baseURI,
-                HttpMethod.POST,
-                requestEntity,
-                PushTokenResponse.StatusResponse.class
-        );
-    }
 }

src/main/java/org/sopt/app/application/poke/PokeHistoryService.java

@@ -1,16 +1,14 @@
 package org.sopt.app.application.poke;
 
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import lombok.RequiredArgsConstructor;
-import lombok.val;
+import java.util.*;
+import lombok.*;
 import org.sopt.app.application.poke.PokeInfo.PokeHistoryInfo;
+import org.sopt.app.application.user.UserWithdrawEvent;
 import org.sopt.app.common.exception.BadRequestException;
 import org.sopt.app.common.response.ErrorCode;
 import org.sopt.app.domain.entity.poke.PokeHistory;
 import org.sopt.app.interfaces.postgres.PokeHistoryRepository;
+import org.springframework.context.event.EventListener;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
@@ -80,4 +78,10 @@ public List<PokeHistoryInfo> getAllPokeHistoryByUsers(Long userId, Long friendUs
         val pokeHistories = pokeHistoryRepository.findAllPokeHistoryByUsers(userId, friendUserId);
         return pokeHistories.stream().map(PokeHistoryInfo::from).toList();
     }
+
+    @EventListener(UserWithdrawEvent.class)
+    public void handleUserWithdrawEvent(final UserWithdrawEvent event) {
+        pokeHistoryRepository.deleteAllByPokerIdInQuery(event.getUserId());
+        pokeHistoryRepository.deleteAllByPokedIdInQuery(event.getUserId());
+    }
 }

src/main/java/org/sopt/app/application/poke/PokeService.java

@@ -2,7 +2,7 @@
 
 import java.util.List;
 import lombok.RequiredArgsConstructor;
-import org.sopt.app.common.event.Events;
+import org.sopt.app.common.event.EventPublisher;
 import org.sopt.app.common.exception.NotFoundException;
 import org.sopt.app.common.response.ErrorCode;
 import org.sopt.app.domain.entity.poke.PokeHistory;
@@ -19,6 +19,7 @@ public class PokeService {
 
     private final UserRepository userRepository;
     private final PokeHistoryRepository historyRepository;
+    private final EventPublisher eventPublisher;
 
     @Transactional(readOnly = true)
     public PokeInfo.PokeDetail getPokeDetail(Long pokeHistoryId) {
@@ -39,7 +40,7 @@ public PokeHistory poke(Long pokerUserId, Long pokedUserId, String pokeMessage,
 
         PokeHistory pokeByApplyingReply = createPokeByApplyingReply(pokerUserId, pokedUserId, pokeMessage, isAnonymous);
 
-        Events.raise(PokeEvent.of(pokedUser.getPlaygroundId()));
+        eventPublisher.raise(PokeEvent.of(pokedUser.getPlaygroundId()));
         return pokeByApplyingReply;
     }
 

src/main/java/org/sopt/app/application/s3/S3Service.java

@@ -8,10 +8,11 @@
 import lombok.*;
 import org.joda.time.LocalDateTime;
 import org.slf4j.LoggerFactory;
+import org.sopt.app.application.stamp.StampDeletedEvent;
 import org.sopt.app.common.exception.BadRequestException;
 import org.sopt.app.common.response.ErrorCode;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.scheduling.annotation.Async;
+import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Service;
 
 @Service
@@ -49,8 +50,12 @@ public S3Info.PreSignedUrl getPreSignedUrl(String folderName) {
                 .build();
     }
 
-    @Async
-    public void deleteFiles(List<String> fileUrls, String folderName) {
+    @EventListener(StampDeletedEvent.class)
+    public void handleStampDeletedEvent(StampDeletedEvent event) {
+        this.deleteFiles(event.getFileUrls(), "stamp");
+    }
+
+    private void deleteFiles(List<String> fileUrls, String folderName) {
         val folderURI = bucket + "/mainpage/makers-app-img/" + folderName;
         val fileNameList = getFileNameList(fileUrls);
         fileNameList.forEach(file -> deleteFile(folderURI, file));

src/main/java/org/sopt/app/application/soptamp/SoptampUserService.java

@@ -7,11 +7,13 @@
 import lombok.*;
 import org.sopt.app.application.playground.dto.PlaygroundProfileInfo.ActivityCardinalInfo;
 import org.sopt.app.application.playground.dto.PlaygroundProfileInfo.PlaygroundProfile;
+import org.sopt.app.application.user.UserWithdrawEvent;
 import org.sopt.app.common.exception.BadRequestException;
 import org.sopt.app.common.response.ErrorCode;
 import org.sopt.app.domain.entity.soptamp.SoptampUser;
 import org.sopt.app.domain.enums.PlaygroundPart;
 import org.sopt.app.interfaces.postgres.SoptampUserRepository;
+import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -122,4 +124,9 @@ public void initAllSoptampUserPoints() {
         soptampUserList.forEach(SoptampUser::initTotalPoints);
         soptampUserRepository.saveAll(soptampUserList);
     }
+
+    @EventListener(UserWithdrawEvent.class)
+    public void handleUserWithdrawEvent(final UserWithdrawEvent event) {
+        soptampUserRepository.deleteByUserId(event.getUserId());
+    }
 }

src/main/java/org/sopt/app/application/stamp/StampDeletedEvent.java

@@ -2,15 +2,12 @@
 
 import java.util.List;
 import lombok.Getter;
+import lombok.RequiredArgsConstructor;
 import org.sopt.app.common.event.Event;
 
 @Getter
+@RequiredArgsConstructor
 public class StampDeletedEvent extends Event {
 
-    private List<String> fileUrls;
-
-    public StampDeletedEvent(List<String> fileUrls) {
-        super();
-        this.fileUrls = fileUrls;
-    }
+    private final List<String> fileUrls;
 }

src/main/java/org/sopt/app/application/stamp/StampService.java

@@ -6,13 +6,15 @@
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import lombok.val;
-import org.sopt.app.common.event.Events;
+import org.sopt.app.application.user.UserWithdrawEvent;
+import org.sopt.app.common.event.EventPublisher;
 import org.sopt.app.common.exception.BadRequestException;
 import org.sopt.app.common.response.ErrorCode;
 import org.sopt.app.domain.entity.soptamp.Stamp;
 import org.sopt.app.interfaces.postgres.StampRepository;
 import org.sopt.app.presentation.stamp.StampRequest;
 import org.sopt.app.presentation.stamp.StampRequest.RegisterStampRequest;
+import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
@@ -22,6 +24,7 @@
 public class StampService {
 
     private final StampRepository stampRepository;
+    private final EventPublisher eventPublisher;
 
     @Transactional(readOnly = true)
     public StampInfo.Stamp findStamp(Long missionId, Long userId) {
@@ -143,7 +146,7 @@ public void deleteStampById(Long stampId) {
                 .orElseThrow(() -> new BadRequestException(ErrorCode.STAMP_NOT_FOUND));
         stampRepository.deleteById(stampId);
 
-        Events.raise(new StampDeletedEvent(stamp.getImages()));
+        eventPublisher.raise(new StampDeletedEvent(stamp.getImages()));
     }
 
     @Transactional
@@ -152,7 +155,12 @@ public void deleteAllStamps(Long userId) {
 
         val imageUrls = stampRepository.findAllByUserId(userId).stream().map(Stamp::getImages)
                 .flatMap(Collection::stream).toList();
-        Events.raise(new StampDeletedEvent(imageUrls));
+        eventPublisher.raise(new StampDeletedEvent(imageUrls));
+    }
+
+    @EventListener(UserWithdrawEvent.class)
+    public void handleUserWithdrawEvent(final UserWithdrawEvent event) {
+        this.deleteAllStamps(event.getUserId());
     }
 
     private void validateStampInfo(Stamp entity) {