#28 송금 요청 만료 기능

src/main/java/com/donggi/sendzy/account/domain/AccountService.java

@@ -38,7 +38,8 @@ public void transfer(final Account sender, final Account receiver, final long am
     }
 
     @Transactional
-    public void update(final Account account) {
+    public void cancelWithdraw(final Account account, final long amount) {
+        account.cancelWithdraw(amount);
         accountRepository.update(account);
     }
 }

src/main/java/com/donggi/sendzy/common/exception/ClientErrorControllerAdvice.java

@@ -3,6 +3,7 @@
 import com.donggi.sendzy.account.exception.InvalidWithdrawalException;
 import com.donggi.sendzy.member.exception.EmailDuplicatedException;
 import com.donggi.sendzy.member.exception.InvalidPasswordException;
+import com.donggi.sendzy.remittance.exception.ExpiredRemittanceRequestException;
 import com.donggi.sendzy.remittance.exception.InvalidRemittanceRequestStatusException;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ProblemDetail;
@@ -93,4 +94,12 @@ public ProblemDetail handleBadRequestException(final BadRequestException e) {
     public ProblemDetail handleInvalidRemittanceRequestStatusException(final InvalidRemittanceRequestStatusException e) {
         return ProblemDetail.forStatusAndDetail(HttpStatus.CONFLICT, e.getMessage());
     }
+
+    /**
+     * 송금 요청이 만료된 경우
+     */
+    @ExceptionHandler(ExpiredRemittanceRequestException.class)
+    public ProblemDetail handleExpiredRemittanceRequestException(final ExpiredRemittanceRequestException e) {
+        return ProblemDetail.forStatusAndDetail(HttpStatus.CONFLICT, e.getMessage());
+    }
 }

src/main/java/com/donggi/sendzy/remittance/application/RemittanceExpirationService.java

@@ -0,0 +1,64 @@
+package com.donggi.sendzy.remittance.application;
+
+import com.donggi.sendzy.account.application.AccountLockingService;
+import com.donggi.sendzy.account.domain.AccountService;
+import com.donggi.sendzy.remittance.domain.RemittanceRequest;
+import com.donggi.sendzy.remittance.domain.RemittanceRequestStatus;
+import com.donggi.sendzy.remittance.domain.RemittanceStatusHistory;
+import com.donggi.sendzy.remittance.domain.service.RemittanceRequestService;
+import com.donggi.sendzy.remittance.domain.service.RemittanceStatusHistoryService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+@RequiredArgsConstructor
+@Service
+public class RemittanceExpirationService {
+
+    private final RemittanceRequestService remittanceRequestService;
+    private final RemittanceStatusHistoryService remittanceStatusHistoryService;
+    private final AccountLockingService accountLockingService;
+    private final AccountService accountService;
+
+    /**
+     * 송금 요청 만료 처리 (REQUIRES_NEW 트랜잭션)
+     * <p>
+     * 송금 요청 수락/거절 흐름 중 만료 상태로 전환해야 하는 경우,
+     * 예외 발생 여부와 관계없이 만료 처리와 히스토리 기록이 DB에 반영되어야 하므로
+     * 별도의 트랜잭션으로 분리해 처리합니다.
+     * <p>
+     * - 기존 트랜잭션이 롤백되더라도, 해당 메서드는 독립적으로 커밋됩니다.
+     * - Propagation.REQUIRES_NEW 설정을 통해 트랜잭션을 분리합니다.
+     *
+     * @param remittanceRequest 만료 처리할 송금 요청
+     */
+    @Transactional(propagation = Propagation.REQUIRES_NEW)
+    public void expireRequest(final RemittanceRequest remittanceRequest) {
+        // 송금 요청 상태 변경 → EXPIRED
+        remittanceRequestService.expire(remittanceRequest);
+
+        // 송금자 계좌 롤백 처리
+        rollbackHoldAmount(remittanceRequest.getSenderId(), remittanceRequest.getAmount());
+
+        // 히스토리 저장
+        recordStatusHistory(remittanceRequest);
+    }
+
+    private void recordStatusHistory(final RemittanceRequest request) {
+        remittanceStatusHistoryService.recordStatusHistory(
+            new RemittanceStatusHistory(
+                request.getId(),
+                request.getSenderId(),
+                request.getReceiverId(),
+                request.getAmount(),
+                RemittanceRequestStatus.EXPIRED
+            )
+        );
+    }
+
+    private void rollbackHoldAmount(final long senderId, final long amount) {
+        final var senderAccount = accountLockingService.getByMemberIdForUpdate(senderId);
+        accountService.cancelWithdraw(senderAccount, amount);
+    }
+}

src/main/java/com/donggi/sendzy/remittance/application/RemittanceRequestApplicationService.java

@@ -14,6 +14,7 @@
 import com.donggi.sendzy.remittance.domain.service.RemittanceHistoryService;
 import com.donggi.sendzy.remittance.domain.service.RemittanceRequestService;
 import com.donggi.sendzy.remittance.domain.service.RemittanceStatusHistoryService;
+import com.donggi.sendzy.remittance.infrastructure.expiration.ExpirationQueueManager;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -22,11 +23,12 @@
 @RequiredArgsConstructor
 public class RemittanceRequestApplicationService {
 
-    private final AccountService accountService;
-    private final AccountLockingService accountLockingService;
-    private final RemittanceHistoryService remittanceHistoryService;
     private final RemittanceRequestService remittanceRequestService;
+    private final RemittanceHistoryService remittanceHistoryService;
     private final RemittanceStatusHistoryService remittanceStatusHistoryService;
+    private final ExpirationQueueManager expirationQueueManager;
+    private final AccountService accountService;
+    private final AccountLockingService accountLockingService;
     private final MemberService memberService;
 
     /**
@@ -80,18 +82,13 @@ private void recordRemittanceStatusHistory(final Member sender, final Member rec
         ));
     }
 
-    private Long recordRemittanceRequest(final Member sender, final Member receiver, final Long amount) {
-        return remittanceRequestService.recordRequestAndGetId(
-            new RemittanceRequest(
-                sender.getId(),
-                receiver.getId(),
-                RemittanceRequestStatus.PENDING,
-                amount
-            )
-        );
+    private long recordRemittanceRequest(final Member sender, final Member receiver, final Long amount) {
+        final var request = new RemittanceRequest(sender.getId(), receiver.getId(), RemittanceRequestStatus.PENDING, amount);
+        expirationQueueManager.register(request);
+        return remittanceRequestService.recordRequestAndGetId(request);
     }
 
-    private Long recordRemittanceHistory(final Member sender, final Account senderAccount, final Long amount) {
+    private long recordRemittanceHistory(final Member sender, final Account senderAccount, final Long amount) {
         return remittanceHistoryService.recordHistoryAndGetId(
             new RemittanceHistory(
                 null,

src/main/java/com/donggi/sendzy/remittance/application/RemittanceRequestProcessor.java

@@ -8,19 +8,23 @@
 import com.donggi.sendzy.remittance.domain.RemittanceStatusHistory;
 import com.donggi.sendzy.remittance.domain.service.RemittanceRequestService;
 import com.donggi.sendzy.remittance.domain.service.RemittanceStatusHistoryService;
+import com.donggi.sendzy.remittance.exception.ExpiredRemittanceRequestException;
 import com.donggi.sendzy.remittance.exception.InvalidRemittanceRequestStatusException;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.access.AccessDeniedException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDateTime;
+
 @RequiredArgsConstructor
 @Service
 public class RemittanceRequestProcessor {
 
     private final RemittanceRequestService remittanceRequestService;
-    private final AccountLockingService accountLockingService;
     private final RemittanceStatusHistoryService remittanceStatusHistoryService;
+    private final RemittanceExpirationService remittanceExpirationService;
+    private final AccountLockingService accountLockingService;
     private final AccountService accountService;
 
     @Transactional
@@ -41,7 +45,7 @@ public void handleAcceptance(final long requestId, final long receiverId) {
         remittanceRequestService.accept(remittanceRequest);
 
         // 상태 변경 히스토리 저장
-        recordStatus(remittanceRequest, RemittanceRequestStatus.ACCEPTED);
+        recordStatusHistory(remittanceRequest, RemittanceRequestStatus.ACCEPTED);
     }
 
     @Transactional
@@ -53,28 +57,46 @@ public void handleRejection(final long requestId, final long receiverId) {
         validateReceiverAuthorityAndStatus(remittanceRequest, receiverId);
 
         // 송금자 계좌 롤백 처리
-        final var senderAccount = accountLockingService.getByMemberIdForUpdate(remittanceRequest.getSenderId());
-        senderAccount.cancelWithdraw(remittanceRequest.getAmount());
-        accountService.update(senderAccount);
+        rollbackHoldAmount(remittanceRequest.getSenderId(), remittanceRequest.getAmount());
 
         // 송금 요청 상태 변경 → REJECTED
         remittanceRequestService.reject(remittanceRequest);
 
         // 상태 변경 히스토리 저장
-        recordStatus(remittanceRequest, RemittanceRequestStatus.REJECTED);
+        recordStatusHistory(remittanceRequest, RemittanceRequestStatus.REJECTED);
+    }
+
+    private void rollbackHoldAmount(final long senderId, final long amount) {
+        final var senderAccount = accountLockingService.getByMemberIdForUpdate(senderId);
+        accountService.cancelWithdraw(senderAccount, amount);
     }
 
     private void validateReceiverAuthorityAndStatus(final RemittanceRequest remittanceRequest, final long receiverId) {
+        validateReceiverAuthority(remittanceRequest, receiverId);
+        validateStatus(remittanceRequest);
+        checkExpiration(remittanceRequest);
+    }
+
+    private void validateReceiverAuthority(final RemittanceRequest remittanceRequest, final long receiverId) {
         if (!remittanceRequest.getReceiverId().equals(receiverId)) {
             throw new AccessDeniedException("해당 송금 요청의 수신자만 처리할 수 있습니다.");
         }
+    }
 
+    private void validateStatus(final RemittanceRequest remittanceRequest) {
         if (!remittanceRequest.isPending()) {
             throw new InvalidRemittanceRequestStatusException(remittanceRequest.getStatus());
         }
     }
 
-    private void recordStatus(RemittanceRequest request, RemittanceRequestStatus status) {
+    private void checkExpiration(final RemittanceRequest remittanceRequest) {
+        if (remittanceRequest.isExpired(LocalDateTime.now())) {
+            remittanceExpirationService.expireRequest(remittanceRequest);
+            throw new ExpiredRemittanceRequestException();
+        }
+    }
+
+    private void recordStatusHistory(final RemittanceRequest request, final RemittanceRequestStatus status) {
         remittanceStatusHistoryService.recordStatusHistory(
             new RemittanceStatusHistory(
                 request.getId(),

src/main/java/com/donggi/sendzy/remittance/domain/RemittanceRequest.java

@@ -14,12 +14,15 @@
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 public class RemittanceRequest {
 
+    private static final long EXPIRATION_DAYS = 3;
+
     private Long id;
     private Long senderId;
     private Long receiverId;
     private RemittanceRequestStatus status;
     private Long amount;
     private LocalDateTime createdAt;
+    private transient LocalDateTime expiredAt;
 
     public RemittanceRequest(
         final Long senderId,
@@ -34,15 +37,48 @@ public RemittanceRequest(
         this.createdAt = LocalDateTime.now();
     }
 
+    /**
+     * 테스트용 생성자입니다.
+     * 접근제어자를 package-private 으로 설정하여 외부에서 직접 생성할 수 없도록 합니다.
+     */
+    RemittanceRequest(
+        final Long senderId,
+        final Long receiverId,
+        final RemittanceRequestStatus status,
+        final Long amount,
+        final LocalDateTime createdAt
+    ) {
+        this.senderId = senderId;
+        this.receiverId = receiverId;
+        this.status = status;
+        this.amount = amount;
+        this.createdAt = createdAt;
+    }
+
     public boolean isPending() {
         return this.status == RemittanceRequestStatus.PENDING;
     }
 
+    public boolean isExpired(final LocalDateTime now) {
+        return createdAt.plusDays(EXPIRATION_DAYS).isBefore(now);
+    }
+
     public void accept() {
         status = this.status.accept();
     }
 
     public void reject() {
         status = this.status.reject();
     }
+
+    public void expire() {
+        status = this.status.expire();
+    }
+
+    public LocalDateTime getExpiredAt() {
+        if (expiredAt == null) {
+            expiredAt = createdAt.plusDays(EXPIRATION_DAYS);
+        }
+        return expiredAt;
+    }
 }

src/main/java/com/donggi/sendzy/remittance/domain/RemittanceRequestStatus.java

@@ -11,6 +11,11 @@ public RemittanceRequestStatus accept() {
         public RemittanceRequestStatus reject() {
             return REJECTED;
         }
+
+        @Override
+        public RemittanceRequestStatus expire() {
+            return EXPIRED;
+        }
     },
     ACCEPTED,
     REJECTED,
@@ -25,4 +30,8 @@ public RemittanceRequestStatus accept() {
     public RemittanceRequestStatus reject() {
         throw new UnsupportedOperationException("현재 송금 상태에서는 거절할 수 없습니다: " + this);
     }
+
+    public RemittanceRequestStatus expire() {
+        throw new UnsupportedOperationException("현재 송금 상태에서는 만료할 수 없습니다: " + this);
+    }
 }

src/main/java/com/donggi/sendzy/remittance/domain/repository/RemittanceRequestRepository.java

@@ -2,6 +2,7 @@
 
 import com.donggi.sendzy.remittance.domain.RemittanceRequest;
 
+import java.util.List;
 import java.util.Optional;
 
 public interface RemittanceRequestRepository {
@@ -32,4 +33,10 @@ public interface RemittanceRequestRepository {
      * @param remittanceRequest 업데이트할 송금 요청 정보
      */
     void update(final RemittanceRequest remittanceRequest);
+
+    /**
+     * PENDING 상태의 요청 목록을 조회합니다.
+     * @return 조회된 송금 요청 목록
+     */
+    List<RemittanceRequest> findPendingRequests();
 }

src/main/java/com/donggi/sendzy/remittance/domain/service/RemittanceRequestService.java

@@ -31,6 +31,12 @@ public void reject(final RemittanceRequest remittanceRequest) {
         remittanceRequestRepository.update(remittanceRequest);
     }
 
+    @Transactional
+    public void expire(final RemittanceRequest remittanceRequest) {
+        remittanceRequest.expire();
+        remittanceRequestRepository.update(remittanceRequest);
+    }
+
     @Transactional(readOnly = true)
     public RemittanceRequest getById(final long requestId) {
         return remittanceRequestRepository.findById(requestId)

src/main/java/com/donggi/sendzy/remittance/exception/ExpiredRemittanceRequestException.java

@@ -0,0 +1,8 @@
+package com.donggi.sendzy.remittance.exception;
+
+public class ExpiredRemittanceRequestException extends RuntimeException {
+
+    public ExpiredRemittanceRequestException() {
+        super("송금 요청이 만료되었습니다.");
+    }
+}

src/main/java/com/donggi/sendzy/remittance/infrastructure/RemittanceRequestMapper.java

@@ -5,6 +5,7 @@
 import com.donggi.sendzy.remittance.domain.repository.TestRemittanceRequestRepository;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
 import java.util.Optional;
 
 @Mapper
@@ -17,4 +18,6 @@ public interface RemittanceRequestMapper extends RemittanceRequestRepository, Te
     Optional<RemittanceRequest> findByIdForUpdate(final long requestId);
 
     void deleteAll();
+
+    List<RemittanceRequest> findPendingRequests();
 }

src/main/java/com/donggi/sendzy/remittance/infrastructure/expiration/ExpirationQueueInterruptedException.java

@@ -0,0 +1,8 @@
+package com.donggi.sendzy.remittance.infrastructure.expiration;
+
+public class ExpirationQueueInterruptedException extends RuntimeException {
+
+    public ExpirationQueueInterruptedException() {
+        super("만료 큐에서 요청을 가져오는 도중 인터럽트되었습니다.");
+    }
+}