Merge Commit으로 인한 develop branch 재설정 작업

backend/src/main/java/hanglog/HangLogApplication.java

@@ -3,8 +3,10 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
+import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
+@EnableAsync
 @EnableJpaAuditing
 @EnableScheduling
 @SpringBootApplication

backend/src/main/java/hanglog/auth/domain/repository/RefreshTokenRepository.java

@@ -3,12 +3,20 @@
 import hanglog.auth.domain.RefreshToken;
 import java.util.Optional;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
 public interface RefreshTokenRepository extends JpaRepository<RefreshToken, String> {
 
     Optional<RefreshToken> findByToken(final String token);
 
     boolean existsByToken(final String token);
 
-    void deleteByMemberId(final Long memberId);
+    @Modifying
+    @Query("""
+            DELETE FROM RefreshToken refreshToken
+            WHERE refreshToken.memberId = :memberId
+            """)
+    void deleteByMemberId(@Param("memberId") final Long memberId);
 }

backend/src/main/java/hanglog/auth/service/AuthService.java

@@ -14,9 +14,14 @@
 import hanglog.auth.domain.repository.RefreshTokenRepository;
 import hanglog.global.exception.AuthException;
 import hanglog.member.domain.Member;
+import hanglog.member.domain.MemberDeleteEvent;
 import hanglog.member.domain.repository.MemberRepository;
-import hanglog.trip.domain.repository.TripRepository;
+import hanglog.share.domain.repository.SharedTripRepository;
+import hanglog.trip.domain.repository.CustomTripRepository;
+import hanglog.trip.domain.repository.PublishedTripRepository;
+import java.util.List;
 import lombok.RequiredArgsConstructor;
+import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -28,12 +33,15 @@ public class AuthService {
     private static final int MAX_TRY_COUNT = 5;
     private static final int FOUR_DIGIT_RANGE = 10000;
 
+    private final RefreshTokenRepository refreshTokenRepository;
+    private final PublishedTripRepository publishedTripRepository;
     private final MemberRepository memberRepository;
+    private final CustomTripRepository customTripRepository;
+    private final SharedTripRepository sharedTripRepository;
     private final OauthProviders oauthProviders;
-    private final RefreshTokenRepository refreshTokenRepository;
-    private final TripRepository tripRepository;
     private final JwtProvider jwtProvider;
     private final BearerAuthorizationExtractor bearerExtractor;
+    private final ApplicationEventPublisher publisher;
 
     public MemberTokens login(final String providerName, final String code) {
         final OauthProvider provider = oauthProviders.mapping(providerName);
@@ -89,8 +97,10 @@ public void removeRefreshToken(final String refreshToken) {
     }
 
     public void deleteAccount(final Long memberId) {
-        refreshTokenRepository.deleteByMemberId(memberId);
-        tripRepository.deleteAllByMemberId(memberId);
-        memberRepository.deleteById(memberId);
+        final List<Long> tripIds = customTripRepository.findTripIdsByMemberId(memberId);
+        publishedTripRepository.deleteByTripIds(tripIds);
+        sharedTripRepository.deleteByTripIds(tripIds);
+        memberRepository.deleteByMemberId(memberId);
+        publisher.publishEvent(new MemberDeleteEvent(tripIds, memberId));
     }
 }

backend/src/main/java/hanglog/community/dto/response/CommunityTripResponse.java

@@ -5,7 +5,7 @@
 
 import hanglog.city.domain.City;
 import hanglog.city.dto.response.CityResponse;
-import hanglog.share.dto.response.WriterResponse;
+import hanglog.member.dto.response.WriterResponse;
 import hanglog.trip.domain.Trip;
 import java.time.LocalDate;
 import java.util.List;

backend/src/main/java/hanglog/community/service/CommunityService.java

@@ -1,8 +1,8 @@
 package hanglog.community.service;
 
 import static hanglog.community.domain.recommendstrategy.RecommendType.LIKE;
-import static hanglog.community.domain.type.PublishedStatusType.PUBLISHED;
 import static hanglog.global.exception.ExceptionCode.NOT_FOUND_TRIP_ID;
+import static hanglog.trip.domain.type.PublishedStatusType.PUBLISHED;
 
 import hanglog.auth.domain.Accessor;
 import hanglog.city.domain.City;

backend/src/main/java/hanglog/expense/domain/repository/ExpenseRepository.java

@@ -1,7 +1,19 @@
 package hanglog.expense.domain.repository;
 
 import hanglog.expense.domain.Expense;
+import java.util.List;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
 public interface ExpenseRepository extends JpaRepository<Expense, Long> {
+
+    @Modifying
+    @Query("""
+                UPDATE Expense expense
+                SET expense.status = 'DELETED'
+                WHERE expense.id IN :expenseIds
+            """)
+    void deleteByIds(@Param("expenseIds") final List<Long> expenseIds);
 }

backend/src/main/java/hanglog/expense/service/ExpenseService.java

@@ -56,7 +56,7 @@ public TripExpenseResponse getAllExpenses(final Long tripId) {
 
         final List<CategoryExpense> categoryExpenses = categoryAmounts.entrySet().stream()
                 .map(entry -> new CategoryExpense(entry.getKey(), entry.getValue(), totalAmount))
-                .sorted((o1,o2) -> o2.getAmount().compareTo(o1.getAmount()))
+                .sorted((o1, o2) -> o2.getAmount().compareTo(o1.getAmount()))
                 .toList();
 
         final List<DayLogExpense> dayLogExpenses = dayLogAmounts.entrySet().stream()

backend/src/main/java/hanglog/image/domain/repository/ImageRepository.java

@@ -1,7 +1,19 @@
 package hanglog.image.domain.repository;
 
 import hanglog.image.domain.Image;
+import java.util.List;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
 public interface ImageRepository extends JpaRepository<Image, Long> {
+
+    @Modifying
+    @Query("""
+                UPDATE Image image
+                SET image.status = 'DELETED'
+                WHERE image.item.id IN :itemIds
+            """)
+    void deleteByItemIds(@Param("itemIds") final List<Long> itemIds);
 }

backend/src/main/java/hanglog/listener/MemberDeleteEventListener.java

@@ -0,0 +1,76 @@
+package hanglog.listener;
+
+import hanglog.auth.domain.repository.RefreshTokenRepository;
+import hanglog.expense.domain.repository.ExpenseRepository;
+import hanglog.image.domain.repository.ImageRepository;
+import hanglog.member.domain.MemberDeleteEvent;
+import hanglog.trip.domain.repository.CustomDayLogRepository;
+import hanglog.trip.domain.repository.CustomItemRepository;
+import hanglog.trip.domain.repository.DayLogRepository;
+import hanglog.trip.domain.repository.ItemRepository;
+import hanglog.trip.domain.repository.PlaceRepository;
+import hanglog.trip.domain.repository.TripRepository;
+import hanglog.trip.dto.ItemElement;
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.event.TransactionalEventListener;
+
+@Component
+@RequiredArgsConstructor
+public class MemberDeleteEventListener {
+
+    private final CustomDayLogRepository customDayLogRepository;
+    private final CustomItemRepository customItemRepository;
+    private final PlaceRepository placeRepository;
+    private final ExpenseRepository expenseRepository;
+    private final ImageRepository imageRepository;
+    private final ItemRepository itemRepository;
+    private final DayLogRepository dayLogRepository;
+    private final TripRepository tripRepository;
+    private final RefreshTokenRepository refreshTokenRepository;
+
+    @Async
+    @Transactional(propagation = Propagation.REQUIRES_NEW)
+    @TransactionalEventListener(fallbackExecution = true)
+    public void delete(final MemberDeleteEvent event) {
+        final List<Long> dayLogIds = customDayLogRepository.findDayLogIdsByTripIds(event.getTripIds());
+        final List<ItemElement> itemElements = customItemRepository.findItemIdsByDayLogIds(dayLogIds);
+
+        deletePlaces(itemElements);
+        deleteExpenses(itemElements);
+        deleteImageAndItems(itemElements);
+
+        dayLogRepository.deleteByIds(dayLogIds);
+        tripRepository.deleteByMemberId(event.getMemberId());
+        refreshTokenRepository.deleteByMemberId(event.getMemberId());
+    }
+
+    private void deletePlaces(final List<ItemElement> itemElements) {
+        final List<Long> placeIds = itemElements.stream()
+                .map(ItemElement::getPlaceId)
+                .toList();
+
+        placeRepository.deleteByIds(placeIds);
+    }
+
+    private void deleteExpenses(final List<ItemElement> itemElements) {
+        final List<Long> expenseIds = itemElements.stream()
+                .map(ItemElement::getExpenseId)
+                .toList();
+
+        expenseRepository.deleteByIds(expenseIds);
+    }
+
+    private void deleteImageAndItems(final List<ItemElement> itemElements) {
+        final List<Long> itemIds = itemElements.stream()
+                .map(ItemElement::getItemId)
+                .toList();
+
+        imageRepository.deleteByItemIds(itemIds);
+        itemRepository.deleteByIds(itemIds);
+    }
+}

backend/src/main/java/hanglog/member/domain/MemberDeleteEvent.java

@@ -0,0 +1,13 @@
+package hanglog.member.domain;
+
+import java.util.List;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@Getter
+@RequiredArgsConstructor
+public class MemberDeleteEvent {
+
+    private final List<Long> tripIds;
+    private final Long memberId;
+}

backend/src/main/java/hanglog/member/domain/repository/MemberRepository.java

@@ -3,10 +3,21 @@
 import hanglog.member.domain.Member;
 import java.util.Optional;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
 public interface MemberRepository extends JpaRepository<Member, Long> {
 
     Optional<Member> findBySocialLoginId(String socialLoginId);
 
     boolean existsByNickname(String nickname);
+
+    @Modifying
+    @Query("""
+            UPDATE Member member
+            SET member.status = 'DELETED'
+            WHERE member.id = :memberId
+            """)
+    void deleteByMemberId(@Param("memberId") final Long memberId);
 }

backend/src/main/java/hanglog/share/dto/response/WriterResponse.java → backend/src/main/java/hanglog/member/dto/response/WriterResponse.java

@@ -1,4 +1,4 @@
-package hanglog.share.dto.response;
+package hanglog.member.dto.response;
 
 import static lombok.AccessLevel.PRIVATE;
 

backend/src/main/java/hanglog/share/domain/repository/SharedTripRepository.java

@@ -1,10 +1,22 @@
 package hanglog.share.domain.repository;
 
 import hanglog.share.domain.SharedTrip;
+import java.util.List;
 import java.util.Optional;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
 public interface SharedTripRepository extends JpaRepository<SharedTrip, Long> {
 
     Optional<SharedTrip> findBySharedCode(final String sharedCode);
+
+    @Modifying
+    @Query("""
+            UPDATE SharedTrip sharedTrip
+            SET sharedTrip.status = 'DELETED'
+            WHERE sharedTrip.trip.id IN :tripIds
+            """)
+    void deleteByTripIds(@Param("tripIds") final List<Long> tripIds);
 }

backend/src/main/java/hanglog/trip/domain/Trip.java

@@ -10,11 +10,11 @@
 import static jakarta.persistence.GenerationType.IDENTITY;
 import static lombok.AccessLevel.PROTECTED;
 
-import hanglog.community.domain.type.PublishedStatusType;
 import hanglog.global.BaseEntity;
 import hanglog.member.domain.Member;
 import hanglog.share.domain.SharedTrip;
-import hanglog.share.domain.type.SharedStatusType;
+import hanglog.trip.domain.type.PublishedStatusType;
+import hanglog.trip.domain.type.SharedStatusType;
 import hanglog.trip.dto.request.TripUpdateRequest;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;

backend/src/main/java/hanglog/trip/domain/repository/CustomDayLogRepository.java

@@ -6,4 +6,6 @@
 public interface CustomDayLogRepository {
 
     void saveAll(final List<DayLog> dayLogs);
+
+    List<Long> findDayLogIdsByTripIds(final List<Long> tripIds);
 }

backend/src/main/java/hanglog/trip/domain/repository/CustomItemRepository.java

@@ -0,0 +1,9 @@
+package hanglog.trip.domain.repository;
+
+import hanglog.trip.dto.ItemElement;
+import java.util.List;
+
+public interface CustomItemRepository {
+
+    List<ItemElement> findItemIdsByDayLogIds(final List<Long> dayLogIds);
+}

backend/src/main/java/hanglog/trip/domain/repository/CustomTripRepository.java

@@ -0,0 +1,8 @@
+package hanglog.trip.domain.repository;
+
+import java.util.List;
+
+public interface CustomTripRepository {
+
+    List<Long> findTripIdsByMemberId(final Long memberId);
+}

backend/src/main/java/hanglog/trip/domain/repository/DayLogRepository.java

@@ -1,7 +1,19 @@
 package hanglog.trip.domain.repository;
 
 import hanglog.trip.domain.DayLog;
+import java.util.List;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
 public interface DayLogRepository extends JpaRepository<DayLog, Long> {
+
+    @Modifying
+    @Query("""
+                UPDATE DayLog dayLog
+                SET dayLog.status = 'DELETED'
+                WHERE dayLog.id IN :dayLogIds
+            """)
+    void deleteByIds(@Param("dayLogIds") final List<Long> dayLogIds);
 }

backend/src/main/java/hanglog/trip/domain/repository/ItemRepository.java

@@ -1,7 +1,19 @@
 package hanglog.trip.domain.repository;
 
 import hanglog.trip.domain.Item;
+import java.util.List;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
 public interface ItemRepository extends JpaRepository<Item, Long> {
+
+    @Modifying
+    @Query("""
+            UPDATE Item item
+            SET item.status = 'DELETED'
+            WHERE item.id IN :itemIds
+            """)
+    void deleteByIds(@Param("itemIds") final List<Long> itemIds);
 }

backend/src/main/java/hanglog/trip/domain/repository/PlaceRepository.java

@@ -1,7 +1,19 @@
 package hanglog.trip.domain.repository;
 
 import hanglog.trip.domain.Place;
+import java.util.List;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
 public interface PlaceRepository extends JpaRepository<Place, Long> {
+
+    @Modifying
+    @Query("""
+                UPDATE Place place
+                SET place.status = 'DELETED'
+                WHERE place.id IN :placeIds
+            """)
+    void deleteByIds(@Param("placeIds") final List<Long> placeIds);
 }