Refactor/#754 delete with outbox

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

@@ -3,8 +3,8 @@
 import static org.springframework.transaction.annotation.Propagation.REQUIRES_NEW;
 
 import hanglog.expense.domain.repository.ExpenseRepository;
-import hanglog.login.domain.repository.RefreshTokenRepository;
 import hanglog.member.domain.MemberDeleteEvent;
+import hanglog.outbox.domain.repository.OutBoxRepository;
 import hanglog.trip.domain.TripDeleteEvent;
 import hanglog.trip.domain.repository.CustomDayLogRepository;
 import hanglog.trip.domain.repository.CustomItemRepository;
@@ -35,7 +35,7 @@ public class DeleteEventListener {
     private final DayLogRepository dayLogRepository;
     private final TripCityRepository tripCityRepository;
     private final TripRepository tripRepository;
-    private final RefreshTokenRepository refreshTokenRepository;
+    private final OutBoxRepository outBoxRepository;
 
     @Async
     @Transactional(propagation = REQUIRES_NEW)
@@ -50,6 +50,7 @@ public void deleteMember(final MemberDeleteEvent event) {
 
         dayLogRepository.deleteByIds(dayLogIds);
         tripRepository.deleteByMemberId(event.getMemberId());
+        outBoxRepository.deleteByTargetId(event.getMemberId());
     }
 
     @Async
@@ -65,6 +66,7 @@ public void deleteTrip(final TripDeleteEvent event) {
 
         dayLogRepository.deleteByIds(dayLogIds);
         tripCityRepository.deleteAllByTripId(event.getTripId());
+        outBoxRepository.deleteByTargetId(event.getTripId());
     }
 
     private void deletePlaces(final List<ItemElement> itemElements) {

backend/src/main/java/hanglog/login/service/LoginService.java

@@ -17,8 +17,11 @@
 import hanglog.member.domain.Member;
 import hanglog.member.domain.MemberDeleteEvent;
 import hanglog.member.domain.repository.MemberRepository;
+import hanglog.outbox.domain.OutBox;
+import hanglog.outbox.domain.type.TargetType;
 import hanglog.trip.domain.repository.CustomTripRepository;
 import hanglog.trip.domain.repository.SharedTripRepository;
+import hanglog.outbox.domain.repository.OutBoxRepository;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.ApplicationEventPublisher;
@@ -41,6 +44,7 @@ public class LoginService {
     private final OauthProviders oauthProviders;
     private final JwtProvider jwtProvider;
     private final BearerAuthorizationExtractor bearerExtractor;
+    private final OutBoxRepository outBoxRepository;
     private final ApplicationEventPublisher publisher;
 
     public MemberTokens login(final String providerName, final String code) {
@@ -101,6 +105,7 @@ public void deleteAccount(final Long memberId) {
         publishedTripRepository.deleteByTripIds(tripIds);
         sharedTripRepository.deleteByTripIds(tripIds);
         memberRepository.deleteByMemberId(memberId);
+        outBoxRepository.save(new OutBox(memberId, TargetType.MEMBER));
         publisher.publishEvent(new MemberDeleteEvent(tripIds, memberId));
     }
 }

backend/src/main/java/hanglog/outbox/domain/OutBox.java

@@ -0,0 +1,51 @@
+package hanglog.outbox.domain;
+
+import static hanglog.outbox.domain.type.TargetType.MEMBER;
+import static hanglog.outbox.domain.type.TargetType.TRIP;
+import static jakarta.persistence.EnumType.STRING;
+import static jakarta.persistence.GenerationType.IDENTITY;
+import static lombok.AccessLevel.PROTECTED;
+
+import hanglog.global.BaseEntity;
+import hanglog.outbox.domain.type.TargetType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import org.hibernate.annotations.SQLDelete;
+import org.hibernate.annotations.Where;
+
+@Getter
+@Entity
+@NoArgsConstructor(access = PROTECTED)
+@SQLDelete(sql = "UPDATE trip_outbox SET status = 'DELETED' WHERE id = ?")
+@Where(clause = "status = 'USABLE'")
+public class OutBox extends BaseEntity {
+
+    @Id
+    @GeneratedValue(strategy = IDENTITY)
+    private Long id;
+
+    @Column(nullable = false)
+    private Long targetId;
+
+    @Column(nullable = false)
+    @Enumerated(value = STRING)
+    private TargetType targetType;
+
+    public OutBox(final Long targetId, final TargetType targetType) {
+        this.targetId = targetId;
+        this.targetType = targetType;
+    }
+
+    public boolean isMember() {
+        return this.targetType.equals(MEMBER);
+    }
+
+    public boolean isTrip() {
+        return this.targetType.equals(TRIP);
+    }
+}

backend/src/main/java/hanglog/outbox/domain/repository/OutBoxRepository.java

@@ -0,0 +1,18 @@
+package hanglog.outbox.domain.repository;
+
+import hanglog.outbox.domain.OutBox;
+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 OutBoxRepository extends JpaRepository<OutBox, Long> {
+
+    @Modifying
+    @Query("""
+            UPDATE OutBox  outBox
+            SET outBox.status = 'DELETED'
+            WHERE outBox.targetId = :targetId
+            """)
+    void deleteByTargetId(@Param("targetId") final Long targetId);
+}

backend/src/main/java/hanglog/outbox/domain/type/TargetType.java

@@ -0,0 +1,7 @@
+package hanglog.outbox.domain.type;
+
+public enum TargetType {
+
+    MEMBER,
+    TRIP
+}

backend/src/main/java/hanglog/outbox/service/OutBoxExecutor.java

@@ -0,0 +1,37 @@
+package hanglog.outbox.service;
+
+import hanglog.member.domain.MemberDeleteEvent;
+import hanglog.outbox.domain.OutBox;
+import hanglog.outbox.domain.repository.OutBoxRepository;
+import hanglog.trip.domain.TripDeleteEvent;
+import hanglog.trip.domain.repository.CustomTripRepository;
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@RequiredArgsConstructor
+@Transactional
+public class OutBoxExecutor {
+
+    private final OutBoxRepository outBoxRepository;
+    private final CustomTripRepository customTripRepository;
+    private final ApplicationEventPublisher publisher;
+
+    @Scheduled(cron = "*/2 * * * * *")
+    public void execute() {
+        final List<OutBox> outBoxes = outBoxRepository.findAll();
+        outBoxes.forEach(outBox -> {
+            if (outBox.isMember()) {
+                final List<Long> tripIds = customTripRepository.findTripIdsByMemberId(outBox.getTargetId());
+                publisher.publishEvent(new MemberDeleteEvent(tripIds, outBox.getTargetId()));
+            }
+            if (outBox.isTrip()) {
+                publisher.publishEvent(new TripDeleteEvent(outBox.getTargetId()));
+            }
+        });
+    }
+}

backend/src/main/java/hanglog/trip/service/TripService.java

@@ -12,6 +12,8 @@
 import hanglog.image.domain.S3ImageEvent;
 import hanglog.member.domain.Member;
 import hanglog.member.domain.repository.MemberRepository;
+import hanglog.outbox.domain.OutBox;
+import hanglog.outbox.domain.type.TargetType;
 import hanglog.trip.domain.DayLog;
 import hanglog.trip.domain.PublishDeleteEvent;
 import hanglog.trip.domain.PublishEvent;
@@ -22,6 +24,7 @@
 import hanglog.trip.domain.repository.CustomTripCityRepository;
 import hanglog.trip.domain.repository.SharedTripRepository;
 import hanglog.trip.domain.repository.TripCityRepository;
+import hanglog.outbox.domain.repository.OutBoxRepository;
 import hanglog.trip.domain.repository.TripRepository;
 import hanglog.trip.domain.type.PublishedStatusType;
 import hanglog.trip.dto.request.PublishedStatusRequest;
@@ -55,6 +58,7 @@ public class TripService {
     private final SharedTripRepository sharedTripRepository;
     private final CustomDayLogRepository customDayLogRepository;
     private final CustomTripCityRepository customTripCityRepository;
+    private final OutBoxRepository outBoxRepository;
     private final ApplicationEventPublisher publisher;
 
     public void validateTripByMember(final Long memberId, final Long tripId) {
@@ -107,7 +111,7 @@ private TripResponse getTripResponse(final Trip trip) {
         final List<City> cities = cityRepository.findCitiesByTripId(trip.getId());
         return TripResponse.of(trip, cities);
     }
-    
+
     @Transactional(readOnly = true)
     public TripDetailResponse getTripDetail(final Long tripId) {
         final Trip trip = tripRepository.findById(tripId)
@@ -194,6 +198,7 @@ public void delete(final Long tripId) {
         publisher.publishEvent(new PublishDeleteEvent(tripId));
         sharedTripRepository.deleteByTripId(tripId);
         tripRepository.deleteById(tripId);
+        outBoxRepository.save(new OutBox(tripId, TargetType.TRIP));
         publisher.publishEvent(new TripDeleteEvent(tripId));
     }
 

backend/src/test/java/hanglog/member/event/DeleteEventListenerTest.java

@@ -19,6 +19,7 @@
 import hanglog.trip.domain.repository.ItemRepository;
 import hanglog.trip.domain.repository.PlaceRepository;
 import hanglog.trip.domain.repository.TripCityRepository;
+import hanglog.outbox.domain.repository.OutBoxRepository;
 import hanglog.trip.domain.repository.TripRepository;
 import java.util.ArrayList;
 import java.util.List;
@@ -52,6 +53,8 @@ class DeleteEventListenerTest {
     private RefreshTokenRepository refreshTokenRepository;
     @Mock
     private TripCityRepository tripCityRepository;
+    @Mock
+    private OutBoxRepository outBoxRepository;
     @InjectMocks
     private DeleteEventListener listener;
 
@@ -98,6 +101,7 @@ void deleteTrip() {
         doNothing().when(itemRepository).deleteByIds(anyList());
         doNothing().when(dayLogRepository).deleteByIds(anyList());
         doNothing().when(tripCityRepository).deleteAllByTripId(anyLong());
+        doNothing().when(outBoxRepository).deleteByTargetId(anyLong());
 
         // when
         listener.deleteTrip(event);
@@ -111,5 +115,6 @@ void deleteTrip() {
         verify(itemRepository, times(1)).deleteByIds(anyList());
         verify(dayLogRepository, times(1)).deleteByIds(anyList());
         verify(tripCityRepository, times(1)).deleteAllByTripId(anyLong());
+        verify(outBoxRepository, times(1)).deleteByTargetId(anyLong());
     }
 }