Revert "[refactor] 알림 도메인 전면 수정 (#331)"

This reverts commit 420b227.

Author: gksdud1109

backend/src/main/java/com/back/api/auth/service/AuthService.java

@@ -3,7 +3,6 @@
 import java.time.LocalDate;
 
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -23,7 +22,6 @@
 import com.back.domain.auth.entity.RefreshToken;
 import com.back.domain.auth.repository.ActiveSessionRepository;
 import com.back.domain.auth.repository.RefreshTokenRepository;
-import com.back.domain.notification.systemMessage.NotificationMessage;
 import com.back.domain.store.entity.Store;
 import com.back.domain.user.entity.User;
 import com.back.domain.user.entity.UserActiveStatus;
@@ -51,7 +49,6 @@ public class AuthService {
 	private final ActiveSessionRepository activeSessionRepository;
 	private final AuthStore authStore;
 	private final StoreService storeService;
-	private final ApplicationEventPublisher eventPublisher;
 	private final OAuthExchangeCodeStore codeStore;
 
 	@Transactional
@@ -92,14 +89,6 @@ public AuthResponse signup(SignupRequest request) {
 
 		JwtDto tokens = loginAsSingleDevice(savedUser);
 
-		// 알림 메시지 발행
-		eventPublisher.publishEvent(
-			NotificationMessage.signUp(
-				savedUser.getId(),
-				savedUser.getNickname()
-			)
-		);
-
 		return buildAuthResponse(savedUser, tokens);
 	}
 

backend/src/main/java/com/back/api/notification/controller/NotificationApi.java

@@ -47,5 +47,4 @@ ApiResponse<Void> markAsRead(
 	})
 	ApiResponse<Void> markAllAsRead(
 	);
-
 }

backend/src/main/java/com/back/api/notification/controller/NotificationController.java

@@ -18,14 +18,14 @@
 
 @RestController
 @RequiredArgsConstructor
-@RequestMapping("/api")
+@RequestMapping("/api/v1/notifications")
 public class NotificationController implements NotificationApi {
 
 	private final NotificationService notificationService;
 	private final HttpRequestContext httpRequestContext;
 
 	@Override
-	@GetMapping("/v2/notifications")
+	@GetMapping
 	public ApiResponse<List<NotificationResponseDto>> getNotifications(
 	) {
 		Long userId = httpRequestContext.getUserId();
@@ -39,7 +39,8 @@ public ApiResponse<List<NotificationResponseDto>> getNotifications(
 	/**
 	 * 읽지 않은 알림 개수 조회
 	 */
-	@GetMapping("/v2/notifications/unread-count")
+	@Override
+	@GetMapping("/unread-count")
 	public ApiResponse<UnreadCountResponseDto> getUnreadCount(
 	) {
 		Long userId = httpRequestContext.getUserId();
@@ -50,7 +51,8 @@ public ApiResponse<UnreadCountResponseDto> getUnreadCount(
 	/**
 	 * 개별 알림 읽음 처리
 	 */
-	@PatchMapping("/v2/notifications/{notificationId}/read")
+	@Override
+	@PatchMapping("/{notificationId}/read")
 	public ApiResponse<Void> markAsRead(
 		@PathVariable Long notificationId
 	) {
@@ -63,7 +65,8 @@ public ApiResponse<Void> markAsRead(
 	/**
 	 * 전체 알림 읽음 처리
 	 */
-	@PatchMapping("/v2/notifications/read-all")
+	@Override
+	@PatchMapping("/read-all")
 	public ApiResponse<Void> markAllAsRead() {
 		Long userId = httpRequestContext.getUserId();
 		notificationService.markAllAsRead(userId);

backend/src/main/java/com/back/api/notification/dto/NotificationResponseDto.java

@@ -4,24 +4,28 @@
 
 import com.back.domain.notification.entity.Notification;
 
+import io.swagger.v3.oas.annotations.media.Schema;
+
+@Schema(description = "알림 조회 응답용 DTO")
 public record NotificationResponseDto(
 	Long id,
-	String type,
+	String type,          // enum name
+	String typeDetail,
 	String title,
-	String content,
+	String message,
+	boolean isRead,
 	LocalDateTime createdAt,
-	Boolean isRead,
 	LocalDateTime readAt
 ) {
 	public static NotificationResponseDto from(Notification notification) {
-
 		return new NotificationResponseDto(
 			notification.getId(),
-			notification.getType().getFrontType().name(),
+			notification.getType().name(),
+			notification.getTypeDetail().name(),
 			notification.getTitle(),
-			notification.getContent(),
-			notification.getCreateAt(),
+			notification.getMessage(),
 			notification.isRead(),
+			notification.getCreateAt(),
 			notification.getReadAt()
 		);
 	}

backend/src/main/java/com/back/api/notification/listener/NotificationEventListener.java

@@ -37,17 +37,19 @@ public void handleNotificationMessage(NotificationMessage message) {
 						.orElseThrow(
 							() -> new NoSuchElementException("ID " + message.getUserId() + "에 해당하는 사용자가 존재하지 않습니다."))
 				)
-				.type(message.getNotificationVar())
+				.type(message.getNotificationType())
+				.typeDetail(message.getTypeDetail())
 				.domainName(message.getDomainName())
-				.title(message.getNotificationVar().getTitle())
-				.content(message.getNotificationVar().formatMessage(message.getContext()))
+				.domainId(message.getDomainId())
+				.title(message.getTitle())
+				.message(message.getMessage())
 				.isRead(false)
 				.build();
 
 			notificationRepository.save(notification);
 
 			// 웹소켓으로 실시간 알림 전송
-			v2_sendNotificationViaWebSocket(message.getUserId(), notification);
+			sendNotificationViaWebSocket(message.getUserId(), notification);
 
 		} catch (Exception e) {
 		}
@@ -59,7 +61,7 @@ public void handleNotificationMessage(NotificationMessage message) {
 	 * @param userId 대상 사용자 ID
 	 * @param notification 전송할 알림 엔티티
 	 */
-	private void v2_sendNotificationViaWebSocket(Long userId, Notification notification) {
+	private void sendNotificationViaWebSocket(Long userId, Notification notification) {
 
 		boolean isOnline = sessionManager.isUserOnline(userId);
 

backend/src/main/java/com/back/api/payment/payment/service/PaymentService.java

@@ -8,6 +8,7 @@
 
 import com.back.api.payment.order.service.OrderService;
 import com.back.api.payment.payment.client.PaymentClient;
+import com.back.domain.payment.order.entity.V2_Order;
 import com.back.api.payment.payment.dto.request.PaymentConfirmCommand;
 import com.back.api.payment.payment.dto.request.V2_PaymentConfirmRequest;
 import com.back.api.payment.payment.dto.response.PaymentConfirmResult;
@@ -16,9 +17,8 @@
 import com.back.api.payment.payment.dto.response.V2_PaymentConfirmResponse;
 import com.back.api.queue.service.QueueEntryProcessService;
 import com.back.api.ticket.service.TicketService;
-import com.back.domain.notification.systemMessage.NotificationMessage;
+import com.back.domain.notification.systemMessage.OrderSuccessMessage;
 import com.back.domain.payment.order.entity.Order;
-import com.back.domain.payment.order.entity.V2_Order;
 import com.back.domain.payment.payment.entity.ApproveStatus;
 import com.back.domain.ticket.entity.Ticket;
 import com.back.global.error.code.PaymentErrorCode;
@@ -96,10 +96,11 @@ public PaymentReceiptResponse confirmPayment(
 
 		// 알림 메시지 발행
 		eventPublisher.publishEvent(
-			NotificationMessage.paymentSuccess(
+			new OrderSuccessMessage(
 				userId,
-				eventTitle,
-				order.getAmount()
+				orderId,
+				order.getAmount(),
+				eventTitle
 			)
 		);
 

backend/src/main/java/com/back/api/payment/payment/service/PaymentTransactionService.java

@@ -8,7 +8,7 @@
 import com.back.api.payment.payment.dto.response.V2_PaymentConfirmResponse;
 import com.back.api.queue.service.QueueEntryProcessService;
 import com.back.api.ticket.service.TicketService;
-import com.back.domain.notification.systemMessage.NotificationMessage;
+import com.back.domain.notification.systemMessage.OrderSuccessV2Message;
 import com.back.domain.payment.order.entity.OrderStatus;
 import com.back.domain.payment.order.entity.V2_Order;
 import com.back.domain.payment.order.repository.V2_OrderRepository;
@@ -109,12 +109,13 @@ public V2_PaymentConfirmResponse handleSuccess(
 			userId
 		);
 
-		// 알림 메시지 발행
+		// 알림 발행
 		eventPublisher.publishEvent(
-			NotificationMessage.paymentSuccess(
+			new OrderSuccessV2Message(
 				userId,
-				ticket.getEvent().getTitle(),
-				order.getAmount()
+				orderId,
+				order.getAmount(),
+				ticket.getEvent().getTitle()
 			)
 		);
 

backend/src/main/java/com/back/api/preregister/service/PreRegisterService.java

@@ -15,7 +15,7 @@
 import com.back.api.s3.service.S3PresignedService;
 import com.back.domain.event.entity.Event;
 import com.back.domain.event.repository.EventRepository;
-import com.back.domain.notification.systemMessage.NotificationMessage;
+import com.back.domain.notification.systemMessage.PreRegisterDoneMessage;
 import com.back.domain.preregister.entity.PreRegister;
 import com.back.domain.preregister.entity.PreRegisterStatus;
 import com.back.domain.preregister.repository.PreRegisterRepository;
@@ -121,8 +121,9 @@ public PreRegisterResponse register(Long eventId, Long userId, PreRegisterCreate
 			deleteSmsVerificationFlag(request.phoneNumber());
 
 			eventPublisher.publishEvent(
-				NotificationMessage.preRegisterDone(
+				new PreRegisterDoneMessage(
 					userId,
+					savedPreRegister.getId(),
 					event.getTitle()
 				)
 			);
@@ -157,15 +158,6 @@ public void cancel(Long eventId, Long userId) {
 		}
 
 		preRegister.cancel();
-
-		eventPublisher.publishEvent(
-				NotificationMessage.preRegisterCancel(
-						userId,
-						eventRepository.findById(eventId)
-								.map(Event::getTitle)
-								.orElse("제목 없음")
-				)
-		);
 	}
 
 	public boolean isRegistered(Long eventId, Long userId) {
@@ -180,7 +172,7 @@ public List<PreRegisterResponse> getMyPreRegister(Long userId) {
 			.map(preRegister -> {
 				Event event = preRegister.getEvent();
 				String imageUrl = null;
-				if (event.getImageUrl() != null && !event.getImageUrl().isBlank()) {
+				if(event.getImageUrl() != null && !event.getImageUrl().isBlank()) {
 					imageUrl = s3PresignedService.issueDownloadUrl(event.getImageUrl());
 				}
 

backend/src/main/java/com/back/api/queue/service/QueueEntryProcessService.java

@@ -20,7 +20,8 @@
 import com.back.api.ticket.service.TicketService;
 import com.back.domain.event.entity.Event;
 import com.back.domain.event.repository.EventRepository;
-import com.back.domain.notification.systemMessage.NotificationMessage;
+import com.back.domain.notification.systemMessage.QueueEntriesMessage;
+import com.back.domain.notification.systemMessage.QueueExpiredMessage;
 import com.back.domain.queue.entity.QueueEntry;
 import com.back.domain.queue.entity.QueueEntryStatus;
 import com.back.domain.queue.repository.QueueEntryRedisRepository;
@@ -71,8 +72,9 @@ public void processEntry(Long eventId, Long userId) {
 		publishEnteredEvent(queueEntry); // 입장 처리 웹소켓 이벤트 발행
 
 		eventPublisher.publishEvent(
-			NotificationMessage.queueEntered(
+			new QueueEntriesMessage(
 				userId,
+				enqueue.getId(),
 				eventRepository.findById(eventId)
 					.map(Event::getTitle)
 					.orElse("제목 없음")
@@ -318,7 +320,7 @@ public void expireEntry(Long eventId, Long userId) {
 		}
 
 		queueEntry.expire();
-		QueueEntry expired = queueEntryRepository.save(queueEntry);
+		QueueEntry deque = queueEntryRepository.save(queueEntry);
 
 		try {
 			queueEntryRedisRepository.removeFromEnteredQueue(eventId, userId);
@@ -330,8 +332,9 @@ public void expireEntry(Long eventId, Long userId) {
 		publishExpiredEvent(queueEntry);  // 만료 처리 웹소켓 이벤트 발행
 
 		eventPublisher.publishEvent(
-			NotificationMessage.queueExpired(
+			new QueueExpiredMessage(
 				userId,
+				deque.getId(),
 				eventRepository.findById(eventId)
 					.map(Event::getTitle)
 					.orElse("제목 없음")
@@ -361,6 +364,15 @@ public void expireWaitingAndEnteredEntry(Long eventId, Long userId) {
 
 		publishExpiredEvent(queueEntry);  // 만료 처리 웹소켓 이벤트 발행
 
+		eventPublisher.publishEvent(
+			new QueueExpiredMessage(
+				userId,
+				deque.getId(),
+				eventRepository.findById(eventId)
+					.map(Event::getTitle)
+					.orElse("제목 없음")
+			)
+		);
 	}
 
 	@Transactional

backend/src/main/java/com/back/api/queue/service/QueueShuffleService.java

@@ -12,7 +12,6 @@
 import com.back.api.event.service.EventService;
 import com.back.domain.event.entity.Event;
 import com.back.domain.event.entity.EventStatus;
-import com.back.domain.notification.systemMessage.NotificationMessage;
 import com.back.domain.queue.entity.QueueEntry;
 import com.back.domain.queue.entity.QueueEntryStatus;
 import com.back.domain.queue.repository.QueueEntryRedisRepository;
@@ -21,7 +20,6 @@
 import com.back.domain.user.repository.UserRepository;
 import com.back.global.error.code.QueueEntryErrorCode;
 import com.back.global.error.exception.ErrorException;
-import com.back.global.event.EventPublisher;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -32,7 +30,6 @@
  * 자동으로 섞기 + 관리자 전용 수동 섞기
  * 공정한 대기열 생성 로직 논의 필요 -> 현재는 SecureRandom 이용한 랜덤 섞기 로직으로 구현
  */
-
 @Service
 @RequiredArgsConstructor
 @Slf4j
@@ -42,7 +39,6 @@ public class QueueShuffleService {
 	private final QueueEntryRedisRepository queueEntryRedisRepository;
 	private final UserRepository userRepository;
 	private final EventService eventService;
-	private final EventPublisher eventPublisher;
 
 	@Transactional
 	public void shuffleQueue(Long eventId, List<Long> preRegisteredUserIds) {
@@ -61,8 +57,6 @@ public void shuffleQueue(Long eventId, List<Long> preRegisteredUserIds) {
 		saveToRedis(eventId, shuffledUserIds);
 		saveToDatabase(event, users, shuffledUserIds);
 
-		publishQueueWaitingNotifications(event, shuffledUserIds);
-
 		event.changeStatus(EventStatus.QUEUE_READY);
 
 	}
@@ -132,17 +126,4 @@ private void saveToDatabase(Event event, List<User> users, List<Long> shuffledUs
 		}
 		queueEntryRepository.saveAll(entries);
 	}
-
-	private void publishQueueWaitingNotifications(Event event, List<Long> shuffledUserIds) {
-		for (int i = 0; i < shuffledUserIds.size(); i++) {
-			Long userId = shuffledUserIds.get(i);
-			Long rank = (long)(i + 1);
-
-			eventPublisher.publishEvent(
-				NotificationMessage.queueWaiting(userId, event.getTitle(), rank)
-			);
-		}
-	}
-
 }
-