[refactor] 사전등록 및 티켓팅한 사용자 회원탈퇴 로직 보완

LeeMinwoo115 · web-flow · commit 4a174c3cbb70 · 2025-12-30T20:02:55.000+09:00
diff --git a/backend/src/main/java/com/back/api/queue/service/QueueEntryProcessService.java b/backend/src/main/java/com/back/api/queue/service/QueueEntryProcessService.java
@@ -342,6 +342,39 @@ public void expireEntry(Long eventId, Long userId) {
 		);
 	}
 
+	@Transactional
+	public void expireWaitingAndEnteredEntry(Long eventId, Long userId) {
+		QueueEntry queueEntry = queueEntryRepository.findByEvent_IdAndUser_Id(eventId, userId)
+			.orElseThrow(() -> new ErrorException(QueueEntryErrorCode.NOT_FOUND_QUEUE_ENTRY));
+
+		if (queueEntry.getQueueEntryStatus() == QueueEntryStatus.EXPIRED
+			|| queueEntry.getQueueEntryStatus() == QueueEntryStatus.COMPLETED) {
+			return;
+		}
+
+		queueEntry.expire();
+		QueueEntry deque = queueEntryRepository.save(queueEntry);
+
+		try {
+			queueEntryRedisRepository.removeFromWaitingAndEnteredQueue(eventId, userId);
+			log.debug("eventId {} - Redis 만료 처리 성공", eventId);
+		} catch (Exception e) {
+			log.error("eventId {} - Redis 만료 처리 실패", eventId);
+		}
+
+		publishExpiredEvent(queueEntry);  // 만료 처리 웹소켓 이벤트 발행
+
+		eventPublisher.publishEvent(
+			new QueueExpiredMessage(
+				userId,
+				deque.getId(),
+				eventRepository.findById(eventId)
+					.map(Event::getTitle)
+					.orElse("제목 없음")
+			)
+		);
+	}
+
 	@Transactional
 	public void expireBatchEntries(List<QueueEntry> entries) {
 
diff --git a/backend/src/main/java/com/back/api/queue/service/QueueEntryReadService.java b/backend/src/main/java/com/back/api/queue/service/QueueEntryReadService.java
@@ -1,5 +1,7 @@
 package com.back.api.queue.service;
 
+import java.util.List;
+
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
@@ -42,16 +44,29 @@ public class QueueEntryReadService {
 
 	public QueueEntryStatusResponse getMyQueueStatus(Long eventId, Long userId) {
 		QueueEntry entry = queueEntryRepository.findByEvent_IdAndUser_Id(eventId, userId)
-			.orElseThrow(()-> new ErrorException(QueueEntryErrorCode.NOT_FOUND_QUEUE_ENTRY));
+			.orElseThrow(() -> new ErrorException(QueueEntryErrorCode.NOT_FOUND_QUEUE_ENTRY));
 
-		return switch(entry.getQueueEntryStatus()) {
+		return switch (entry.getQueueEntryStatus()) {
 			case WAITING -> buildWaitingQueueResponse(eventId, entry);
-			case ENTERED  -> buildEnteredQueueResponse(entry);
-			case EXPIRED  -> buildExpiredQueueResponse(entry);
+			case ENTERED -> buildEnteredQueueResponse(entry);
+			case EXPIRED -> buildExpiredQueueResponse(entry);
 			case COMPLETED -> buildCompletedQueueResponse(entry);
 		};
 	}
 
+	public List<QueueEntry> getMyAllQueues(Long userId) {
+		return queueEntryRepository.findAllByUserId(userId);
+	}
+
+	public List<QueueEntry> getWaitingOrEnteredQueues(Long userId) {
+		return getMyAllQueues(userId)
+			.stream()
+			.filter(queue ->
+				queue.getQueueEntryStatus().equals(QueueEntryStatus.WAITING)
+					|| queue.getQueueEntryStatus().equals(QueueEntryStatus.ENTERED))
+			.toList();
+	}
+
 	//Redis 조회 + 계산
 	//단일 사용자 조회 (API에서 사용 예정)
 	public WaitingQueueResponse buildWaitingQueueResponseForUser(Long eventId, Long userId) {
@@ -90,7 +105,7 @@ public WaitingQueueResponse buildWaitingQueueResponseFromRank(
 		} else {
 			estimatedWaitTime = waitingAhead * 3;
 			progress = totalWaitingCount > 0
-				? (int) (((totalWaitingCount - waitingAhead) * 100) / totalWaitingCount)
+				? (int)(((totalWaitingCount - waitingAhead) * 100) / totalWaitingCount)
 				: 0;
 		}
 
@@ -151,7 +166,6 @@ public QueueStatisticsResponse getQueueStatistics(Long eventId) {
 			throw new ErrorException(QueueEntryErrorCode.NOT_FOUND_QUEUE_ENTRY);
 		}
 
-
 		long waitingCount = queueEntryRepository.countByEvent_IdAndQueueEntryStatus(
 			eventId,
 			QueueEntryStatus.WAITING
@@ -217,8 +231,8 @@ private WaitingQueueResponse buildWaitingQueueResponseFromDB(Long eventId, Queue
 			entry.getUserId(),
 			entry.getEventId(),
 			entry.getQueueRank(),
-			(int) waitingAheadCount,
-			(int) totalWaitingCount
+			(int)waitingAheadCount,
+			(int)totalWaitingCount
 		);
 	}
 
diff --git a/backend/src/main/java/com/back/api/ticket/service/TicketService.java b/backend/src/main/java/com/back/api/ticket/service/TicketService.java
@@ -1,5 +1,6 @@
 package com.back.api.ticket.service;
 
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Optional;
 
@@ -173,6 +174,10 @@ public List<TicketResponse> getMyTickets(Long userId) {
 		return ticketRepository.findMyTicketDto(userId);
 	}
 
+	public List<Ticket> getMyIssuedOrPaidTicketsBeforeEvent(Long userId) {
+		return ticketRepository.findIssuedOrPaidBeforeEvent(userId, LocalDateTime.now());
+	}
+
 	/**
 	 * 티켓 상세 조회
 	 */
diff --git a/backend/src/main/java/com/back/api/user/service/UserService.java b/backend/src/main/java/com/back/api/user/service/UserService.java
@@ -1,14 +1,20 @@
 package com.back.api.user.service;
 
 import java.time.LocalDate;
+import java.util.List;
 
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import com.back.api.queue.service.QueueEntryProcessService;
+import com.back.api.queue.service.QueueEntryReadService;
+import com.back.api.ticket.service.TicketService;
 import com.back.api.auth.service.ActiveSessionCache;
 import com.back.api.user.dto.request.UpdateProfileRequest;
 import com.back.api.user.dto.response.UserProfileResponse;
 import com.back.domain.auth.repository.RefreshTokenRepository;
+import com.back.domain.queue.entity.QueueEntry;
+import com.back.domain.ticket.entity.Ticket;
 import com.back.domain.user.entity.User;
 import com.back.domain.user.repository.UserRepository;
 import com.back.global.error.code.AuthErrorCode;
@@ -17,16 +23,22 @@
 import com.back.global.http.HttpRequestContext;
 
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 
 @Service
 @RequiredArgsConstructor
+@Slf4j
 public class UserService {
 
 	private final UserRepository userRepository;
 	private final RefreshTokenRepository refreshTokenRepository;
 	private final ActiveSessionCache activeSessionCache;
 	private final HttpRequestContext requestContext;
+	private final QueueEntryReadService queueEntryReadService;
+	private final QueueEntryProcessService queueEntryProcessService;
+	private final TicketService ticketService;
 
+	@Transactional
 	public UserProfileResponse getUser(Long userId) {
 		User user = userRepository.findById(userId)
 			.orElseThrow(() -> new ErrorException(UserErrorCode.NOT_FOUND));
@@ -59,6 +71,8 @@ public void deleteUser(long userId) {
 		User user = userRepository.findById(userId)
 			.orElseThrow(() -> new ErrorException(UserErrorCode.NOT_FOUND));
 
+		handleDeleteUserQueue(userId);
+
 		// 모든 기기의 refreshToken 무효화 (전 기기 로그아웃 효과)
 		refreshTokenRepository.revokeAllByUserId(userId);
 
@@ -70,4 +84,32 @@ public void deleteUser(long userId) {
 
 		user.softDelete();
 	}
+
+	private void handleDeleteUserQueue(long userId) {
+		// 1. 사전등록 인원: 랜덤 큐 스케줄러 동작 전까지 회원탈퇴 가능
+		List<QueueEntry> waitingOrEnteredQueues = queueEntryReadService.getWaitingOrEnteredQueues(userId);
+
+		// 2. 티켓을 구매한 상태면 행사 오픈날짜가 지나고 회원탈퇴 할 수 있도록 하기
+		List<Ticket> tickets = ticketService.getMyIssuedOrPaidTicketsBeforeEvent(userId);
+
+		if (waitingOrEnteredQueues.isEmpty() && tickets.isEmpty()) {
+			return;
+		}
+
+		// 랜덤 큐에 배정된 이후회원 탈퇴를 시도하면, 사용자 삭제: 배정된 랜덤큐에서 해당 사옹자 제거
+		if (!waitingOrEnteredQueues.isEmpty() && tickets.isEmpty()) {
+			removeUserInQueues(waitingOrEnteredQueues, userId);
+			log.info("Success remove WAITING|ENTERED queues for deleted userId: {}", userId);
+			return;
+		}
+
+		log.error("Can't delete user for userId: {}", userId);
+		throw new ErrorException(UserErrorCode.CAN_NOT_DELETE_USER);
+	}
+
+	private void removeUserInQueues(List<QueueEntry> queues, long userId) {
+		for (QueueEntry queue : queues) {
+			queueEntryProcessService.expireWaitingAndEnteredEntry(queue.getEventId(), userId);
+		}
+	}
 }
diff --git a/backend/src/main/java/com/back/domain/queue/repository/QueueEntryRedisRepository.java b/backend/src/main/java/com/back/domain/queue/repository/QueueEntryRedisRepository.java
@@ -92,13 +92,25 @@ public void removeFromEnteredQueue(Long eventId, Long userId) {
 		log.info("Removed user from entered queue - eventId: {}, userId: {}", eventId, userId);
 	}
 
+	public void removeFromWaitingAndEnteredQueue(Long eventId, Long userId) {
+		// WAITING 제거
+		String waitingKey = String.format(WAITING_KEY, eventId);
+		redisTemplate.opsForZSet().remove(waitingKey, userId.toString());
+
+		// ENTERED 제거
+		String enteredKey = String.format(ENTERED_KEY, eventId);
+		redisTemplate.opsForSet().remove(enteredKey, userId.toString());
+
+		log.info("Removed user from waiting & entered queue - eventId: {}, userId: {}", eventId, userId);
+	}
+
 	public Long getTotalEnteredCount(Long eventId) {
 		String key = String.format(ENTERED_KEY, eventId);
 		Long size = redisTemplate.opsForSet().size(key);
 		return size != null ? size : 0L;
 	}
 
-	public boolean  isInEnteredQueue(Long eventId, Long userId) {
+	public boolean isInEnteredQueue(Long eventId, Long userId) {
 		String key = String.format(ENTERED_KEY, eventId);
 		Boolean isMember = redisTemplate.opsForSet().isMember(key, userId.toString());
 		return isMember != null && isMember;
@@ -116,7 +128,6 @@ public Long getEnteredCount(Long eventId) {
 		return count != null ? (Long)count : 0L;
 	}
 
-
 	/* ==================== 임시 데이터 추가용 ==================== */
 	public void addToEnteredQueueDirectly(Long eventId, Long userId) {
 		String key = String.format(ENTERED_KEY, eventId);
diff --git a/backend/src/main/java/com/back/domain/queue/repository/QueueEntryRepository.java b/backend/src/main/java/com/back/domain/queue/repository/QueueEntryRepository.java
@@ -52,6 +52,9 @@ Optional<Long> findMaxRankInQueue(
 		@Param("eventId") Long eventId
 	);
 
+	@Query("SELECT q FROM QueueEntry q WHERE q.user.id = :userId")
+	List<QueueEntry> findAllByUserId(@Param("userId") Long userId);
+
 	@Query("SELECT q FROM QueueEntry q "
 		+ "JOIN FETCH q.user u "
 		+ "JOIN FETCH q.event e "
diff --git a/backend/src/main/java/com/back/domain/ticket/repository/TicketRepositoryCustom.java b/backend/src/main/java/com/back/domain/ticket/repository/TicketRepositoryCustom.java
@@ -1,11 +1,14 @@
 package com.back.domain.ticket.repository;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 import com.back.api.ticket.dto.response.TicketResponse;
+import com.back.domain.ticket.entity.Ticket;
 
 public interface TicketRepositoryCustom {
 
 	List<TicketResponse> findMyTicketDto(Long userId);
 
-}
+	List<Ticket> findIssuedOrPaidBeforeEvent(Long userId, LocalDateTime now);
+}
diff --git a/backend/src/main/java/com/back/domain/ticket/repository/TicketRepositoryImpl.java b/backend/src/main/java/com/back/domain/ticket/repository/TicketRepositoryImpl.java
@@ -4,11 +4,13 @@
 import static com.back.domain.seat.entity.QSeat.*;
 import static com.back.domain.ticket.entity.QTicket.*;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 import org.springframework.stereotype.Repository;
 
 import com.back.api.ticket.dto.response.TicketResponse;
+import com.back.domain.ticket.entity.Ticket;
 import com.back.domain.ticket.entity.TicketStatus;
 import com.querydsl.core.types.Projections;
 import com.querydsl.jpa.impl.JPAQueryFactory;
@@ -52,4 +54,17 @@ public List<TicketResponse> findMyTicketDto(Long userId) {
 			.fetch();
 
 	}
+
+	@Override
+	public List<Ticket> findIssuedOrPaidBeforeEvent(Long userId, LocalDateTime now) {
+		return jpaQueryFactory
+			.selectFrom(ticket)
+			.join(ticket.event, event).fetchJoin()
+			.where(
+				ticket.owner.id.eq(userId),
+				ticket.ticketStatus.in(TicketStatus.ISSUED, TicketStatus.PAID),
+				event.eventDate.after(now)
+			)
+			.fetch();
+	}
 }
diff --git a/backend/src/main/java/com/back/global/error/code/UserErrorCode.java b/backend/src/main/java/com/back/global/error/code/UserErrorCode.java
@@ -8,7 +8,8 @@
 @Getter
 @AllArgsConstructor
 public enum UserErrorCode implements ErrorCode {
-	NOT_FOUND(HttpStatus.NOT_FOUND, "사용자를 찾을 수 없습니다.");
+	NOT_FOUND(HttpStatus.NOT_FOUND, "사용자를 찾을 수 없습니다."),
+	CAN_NOT_DELETE_USER(HttpStatus.BAD_REQUEST, "신청하신 행사가 종료된 후에 탈퇴 할 수 있습니다.");
 
 	private final HttpStatus httpStatus;
 	private final String message;
diff --git a/backend/src/test/java/com/back/api/user/controller/UserControllerTest.java b/backend/src/test/java/com/back/api/user/controller/UserControllerTest.java
diff --git a/backend/src/test/java/com/back/support/factory/EventFactory.java b/backend/src/test/java/com/back/support/factory/EventFactory.java
diff --git a/backend/src/test/java/com/back/support/helper/EventHelper.java b/backend/src/test/java/com/back/support/helper/EventHelper.java
