[fix] 알림 도메인 기능 추가 및 수정 (#134)

No-366 · web-flow · commit 236df698cf6b · 2025-12-18T10:13:22.000+09:00
* hotfix// 알림 도메인 기능 추가 및 수정
1. 대기열 만료 알림 구현
2. 알림 조회시 응답 메시지 수정
3. 알림 읽음 처리 컨트롤러 메서드 User 객체 추출 방법 수정
4. Notification 엔티티 컬럼이름 수정
5. api 경로 수정

* fix: NotificationController에서 유저ID 추출 방법 변경
(Long userId = httpRequestContext.getUserId(); 사용)
diff --git a/backend/src/main/java/com/back/api/notification/controller/NotificationApi.java b/backend/src/main/java/com/back/api/notification/controller/NotificationApi.java
@@ -22,15 +22,13 @@ public interface NotificationApi {
 		"NOTIFICATION_ACCESS_DENIED"
 	})
 	ApiResponse<List<NotificationResponseDto>> getNotifications(
-		@AuthenticationPrincipal SecurityUser securityUser
 	);
 
 	@Operation(summary = "읽지 않은 알림 개수 조회", description = "웹소켓이 연결된 직후 초기 데이터 로딩을 위해 이용됩니다")
 	@ApiErrorCode({
 		"NOTIFICATION_ACCESS_DENIED"
 	})
 	ApiResponse<UnreadCountResponseDto> getUnreadCount(
-		@AuthenticationPrincipal SecurityUser securityUser
 	);
 
 	@Operation(summary = "단일 알림 읽음 처리")
@@ -40,7 +38,6 @@ ApiResponse<UnreadCountResponseDto> getUnreadCount(
 		"NOTIFICATION_PROCESS_FAILED"
 	})
 	ApiResponse<Void> markAsRead(
-		@AuthenticationPrincipal SecurityUser securityUser,
 		@PathVariable Long notificationId
 	);
 
@@ -51,6 +48,5 @@ ApiResponse<Void> markAsRead(
 		"NOTIFICATION_PROCESS_FAILED"
 	})
 	ApiResponse<Void> markAllAsRead(
-		@AuthenticationPrincipal SecurityUser securityUser
 	);
 }
diff --git a/backend/src/main/java/com/back/api/notification/controller/NotificationController.java b/backend/src/main/java/com/back/api/notification/controller/NotificationController.java
@@ -2,7 +2,6 @@
 
 import java.util.List;
 
-import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PatchMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -12,29 +11,29 @@
 import com.back.api.notification.dto.NotificationResponseDto;
 import com.back.api.notification.dto.UnreadCountResponseDto;
 import com.back.api.notification.service.NotificationService;
+import com.back.global.http.HttpRequestContext;
 import com.back.global.response.ApiResponse;
-import com.back.global.security.SecurityUser;
 
 import lombok.RequiredArgsConstructor;
 
 @RestController
 @RequiredArgsConstructor
-@RequestMapping("/api/notifications")
+@RequestMapping("/api/v1/notifications")
 public class NotificationController implements NotificationApi {
 
 	private final NotificationService notificationService;
+	private final HttpRequestContext httpRequestContext;
 
 	@Override
 	@GetMapping
 	public ApiResponse<List<NotificationResponseDto>> getNotifications(
-		@AuthenticationPrincipal SecurityUser securityUser
 	) {
-		Long userId = securityUser.getId();
+		Long userId = httpRequestContext.getUserId();
 
 		List<NotificationResponseDto> notifications =
 			notificationService.getNotifications(userId);
 
-		return ApiResponse.ok(notifications);
+		return ApiResponse.ok("알림 목록을 불러왔습니다",notifications);
 	}
 
 	/**
@@ -43,10 +42,10 @@ public ApiResponse<List<NotificationResponseDto>> getNotifications(
 	@Override
 	@GetMapping("/unread-count")
 	public ApiResponse<UnreadCountResponseDto> getUnreadCount(
-		@AuthenticationPrincipal SecurityUser securityUser
 	) {
-		long count = notificationService.getUnreadCount(securityUser.getId());
-		return ApiResponse.ok(new UnreadCountResponseDto(count));
+		Long userId = httpRequestContext.getUserId();
+		long count = notificationService.getUnreadCount(userId);
+		return ApiResponse.ok("읽지 않은 알림수",new UnreadCountResponseDto(count));
 	}
 
 	/**
@@ -55,10 +54,10 @@ public ApiResponse<UnreadCountResponseDto> getUnreadCount(
 	@Override
 	@PatchMapping("/{notificationId}/read")
 	public ApiResponse<Void> markAsRead(
-		@AuthenticationPrincipal SecurityUser securityUser,
 		@PathVariable Long notificationId
 	) {
-		notificationService.markAsRead(notificationId, securityUser.getId());
+		Long userId = httpRequestContext.getUserId();
+		notificationService.markAsRead(notificationId, userId);
 
 		return ApiResponse.noContent("개별 알림을 읽음 처리 하였습니다.");
 	}
@@ -68,10 +67,9 @@ public ApiResponse<Void> markAsRead(
 	 */
 	@Override
 	@PatchMapping("/read-all")
-	public ApiResponse<Void> markAllAsRead(
-		@AuthenticationPrincipal SecurityUser securityUser
-	) {
-		notificationService.markAllAsRead(securityUser.getId());
+	public ApiResponse<Void> markAllAsRead() {
+		Long userId = httpRequestContext.getUserId();
+		notificationService.markAllAsRead(userId);
 		return ApiResponse.noContent("모든 알림을 읽음 처리 하였습니다.");
 	}
 }
diff --git a/backend/src/main/java/com/back/api/notification/listener/NotificationEventListener.java b/backend/src/main/java/com/back/api/notification/listener/NotificationEventListener.java
@@ -38,8 +38,8 @@ public void handleNotificationMessage(NotificationMessage message) {
 				)
 				.type(message.getNotificationType())
 				.typeDetail(message.getTypeDetail())
-				.fromWhere(message.getFromWhere())
-				.whereId(message.getWhereId())
+				.domainName(message.getFromWhere())
+				.domainId(message.getWhereId())
 				.title(message.getTitle())
 				.message(message.getMessage())
 				.isRead(false)
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
@@ -18,6 +18,7 @@
 import com.back.domain.event.entity.Event;
 import com.back.domain.event.repository.EventRepository;
 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;
@@ -171,7 +172,7 @@ public void expireEntry(Long eventId, Long userId) {
 		}
 
 		queueEntry.expire();
-		queueEntryRepository.save(queueEntry);
+		QueueEntry deque = queueEntryRepository.save(queueEntry);
 
 		try {
 			queueEntryRedisRepository.removeFromEnteredQueue(eventId, userId);
@@ -182,7 +183,15 @@ public void expireEntry(Long eventId, Long userId) {
 
 		publishExpiredEvent(queueEntry);  // 만료 처리 웹소켓 이벤트 발행
 
-		//TODO 알림 로직 구현 필요
+		eventPublisher.publishEvent(
+			new QueueExpiredMessage(
+				userId,
+				deque.getId(),
+				eventRepository.findById(eventId)
+					.map(Event::getTitle)
+					.orElse("제목 없음")
+			)
+		);
 	}
 
 	@Transactional
diff --git a/backend/src/main/java/com/back/domain/notification/entity/Notification.java b/backend/src/main/java/com/back/domain/notification/entity/Notification.java
@@ -59,10 +59,10 @@ public class Notification extends BaseEntity {
 
 	@Enumerated(EnumType.STRING)
 	@Column(nullable = false)
-	private DomainName fromWhere;
+	private DomainName domainName;
 
 	@Column(nullable = true)
-	private Long whereId;
+	private Long domainId;
 
 	//연관 필드
 	@ManyToOne(fetch = FetchType.LAZY) // -> 리팩토링 고민요소
diff --git a/backend/src/main/java/com/back/domain/notification/enums/NotificationTypeDetails.java b/backend/src/main/java/com/back/domain/notification/enums/NotificationTypeDetails.java
@@ -4,6 +4,7 @@
 public enum NotificationTypeDetails {
 	// QueueEntries
 	TICKETING_POSSIBLE,          // 대기열 순서 완료
+	TICKETING_EXPIRED, 			 // 대기열 만료
 
 	// PAYMENT
 	PAYMENT_SUCCESS,
diff --git a/backend/src/main/java/com/back/domain/notification/systemMessage/QueueEntriesMessage.java b/backend/src/main/java/com/back/domain/notification/systemMessage/QueueEntriesMessage.java
@@ -9,8 +9,8 @@
 public class QueueEntriesMessage extends NotificationMessage {
 	private final String eventName;
 
-	public QueueEntriesMessage(Long userId, Long whereId, String eventName) {
-		super(userId, DomainName.QUEUE_ENTRIES, whereId);
+	public QueueEntriesMessage(Long userId, Long domainId, String eventName) {
+		super(userId, DomainName.QUEUE_ENTRIES, domainId);
 		this.eventName = eventName;
 	}
 
diff --git a/backend/src/main/java/com/back/domain/notification/systemMessage/QueueExpiredMessage.java b/backend/src/main/java/com/back/domain/notification/systemMessage/QueueExpiredMessage.java
@@ -0,0 +1,36 @@
+package com.back.domain.notification.systemMessage;
+
+import static java.lang.String.*;
+
+import com.back.domain.notification.enums.DomainName;
+import com.back.domain.notification.enums.NotificationTypeDetails;
+import com.back.domain.notification.enums.NotificationTypes;
+
+public class QueueExpiredMessage extends NotificationMessage {
+	private final String eventName;
+
+	public QueueExpiredMessage(Long userId, Long domainId, String eventName) {
+		super(userId, DomainName.QUEUE_ENTRIES, domainId);
+		this.eventName = eventName;
+	}
+
+	@Override
+	public NotificationTypes getNotificationType() {
+		return NotificationTypes.QUEUE_ENTRIES;
+	}
+
+	@Override
+	public NotificationTypeDetails getTypeDetail() {
+		return NotificationTypeDetails.TICKETING_EXPIRED;
+	}
+
+	@Override
+	public String getTitle() {
+		return "티켓팅 종료";
+	}
+
+	@Override
+	public String getMessage() {
+		return format("[%s]\n아쉽게도 티켓팅 가능 시간이 초과되었습니다.\n다음 기회를 노려주세요..",this.eventName);
+	}
+}
diff --git a/backend/src/main/java/com/back/global/init/NotificationDataInit.java b/backend/src/main/java/com/back/global/init/NotificationDataInit.java
@@ -123,8 +123,8 @@ private Notification createNotificationFromMessage(User user, NotificationMessag
 			.user(user)
 			.type(message.getNotificationType())
 			.typeDetail(message.getTypeDetail())
-			.fromWhere(message.getFromWhere())
-			.whereId(message.getWhereId())
+			.domainName(message.getFromWhere())
+			.domainId(message.getWhereId())
 			.title(message.getTitle())
 			.message(message.getMessage())
 			.isRead(false)
diff --git a/backend/src/test/java/com/back/api/notification/listener/NotificationEventListenerTest.java b/backend/src/test/java/com/back/api/notification/listener/NotificationEventListenerTest.java
@@ -137,7 +137,7 @@ void publishOrdersSuccessMessage_UserOnline_SavesAndSendsWebSocket() {
 				Notification saved = notifications.get(0);
 				assertThat(saved.getType()).isEqualTo(NotificationTypes.PAYMENT);
 				assertThat(saved.getTypeDetail()).isEqualTo(NotificationTypeDetails.PAYMENT_SUCCESS);
-				assertThat(saved.getFromWhere()).isEqualTo(DomainName.ORDERS);
+				assertThat(saved.getDomainName()).isEqualTo(DomainName.ORDERS);
 				assertThat(saved.getTitle()).isEqualTo("주문 및 결제 완료");
 				assertThat(saved.getMessage()).contains("테스트 이벤트", "99000원");
 				assertThat(saved.isRead()).isFalse();
@@ -208,8 +208,8 @@ void publishOrdersSuccessMessage_VerifyNotificationTypeDetails() {
 				Notification saved = notifications.get(0);
 				assertThat(saved.getType()).isEqualTo(NotificationTypes.PAYMENT);
 				assertThat(saved.getTypeDetail()).isEqualTo(NotificationTypeDetails.PAYMENT_SUCCESS);
-				assertThat(saved.getFromWhere()).isEqualTo(DomainName.ORDERS);
-				assertThat(saved.getWhereId()).isEqualTo(1L);
+				assertThat(saved.getDomainName()).isEqualTo(DomainName.ORDERS);
+				assertThat(saved.getDomainId()).isEqualTo(1L);
 			});
 		}
 	}
@@ -278,7 +278,7 @@ void publishOrderFailedMessage_VerifyFailedType() {
 				Notification saved = notifications.get(0);
 				assertThat(saved.getType()).isEqualTo(NotificationTypes.PAYMENT);
 				assertThat(saved.getTypeDetail()).isEqualTo(NotificationTypeDetails.PAYMENT_FAILED);
-				assertThat(saved.getFromWhere()).isEqualTo(DomainName.ORDERS);
+				assertThat(saved.getDomainName()).isEqualTo(DomainName.ORDERS);
 			});
 		}
 	}
@@ -345,7 +345,7 @@ void publishPreRegisterDoneMessage_VerifyType() {
 				Notification saved = notifications.get(0);
 				assertThat(saved.getType()).isEqualTo(NotificationTypes.PRE_REGISTER);
 				assertThat(saved.getTypeDetail()).isEqualTo(NotificationTypeDetails.PRE_REGISTER_DONE);
-				assertThat(saved.getFromWhere()).isEqualTo(DomainName.PRE_REGISTER);
+				assertThat(saved.getDomainName()).isEqualTo(DomainName.PRE_REGISTER);
 			});
 		}
 	}
@@ -412,7 +412,7 @@ void publishQueueEntriesMessage_VerifyType() {
 				Notification saved = notifications.get(0);
 				assertThat(saved.getType()).isEqualTo(NotificationTypes.QUEUE_ENTRIES);
 				assertThat(saved.getTypeDetail()).isEqualTo(NotificationTypeDetails.TICKETING_POSSIBLE);
-				assertThat(saved.getFromWhere()).isEqualTo(DomainName.QUEUE_ENTRIES);
+				assertThat(saved.getDomainName()).isEqualTo(DomainName.QUEUE_ENTRIES);
 			});
 		}
 	}
diff --git a/backend/src/test/java/com/back/api/notification/service/NotificationServiceTest.java b/backend/src/test/java/com/back/api/notification/service/NotificationServiceTest.java
@@ -101,8 +101,8 @@ private Notification createNotification(Long id, String title, String message, b
 			.user(testUser)
 			.type(NotificationTypes.PAYMENT)
 			.typeDetail(NotificationTypeDetails.PAYMENT_SUCCESS)
-			.fromWhere(DomainName.ORDERS)
-			.whereId(1L)
+			.domainName(DomainName.ORDERS)
+			.domainId(1L)
 			.title(title)
 			.message(message)
 			.isRead(isRead)

Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,8 @@`
`9`	`9`	`public class QueueEntriesMessage extends NotificationMessage {`
`10`	`10`	`private final String eventName;`
`11`	`11`
`12`		`- public QueueEntriesMessage(Long userId, Long whereId, String eventName) {`
`13`		`- super(userId, DomainName.QUEUE_ENTRIES, whereId);`
	`12`	`+ public QueueEntriesMessage(Long userId, Long domainId, String eventName) {`
	`13`	`+ super(userId, DomainName.QUEUE_ENTRIES, domainId);`
`14`	`14`	`this.eventName = eventName;`
`15`	`15`	`}`
`16`	`16`
Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ void publishOrdersSuccessMessage_UserOnline_SavesAndSendsWebSocket() {`
`137`	`137`	`Notification saved = notifications.get(0);`
`138`	`138`	`assertThat(saved.getType()).isEqualTo(NotificationTypes.PAYMENT);`
`139`	`139`	`assertThat(saved.getTypeDetail()).isEqualTo(NotificationTypeDetails.PAYMENT_SUCCESS);`
`140`		`- assertThat(saved.getFromWhere()).isEqualTo(DomainName.ORDERS);`
	`140`	`+ assertThat(saved.getDomainName()).isEqualTo(DomainName.ORDERS);`
`141`	`141`	`assertThat(saved.getTitle()).isEqualTo("주문 및 결제 완료");`
`142`	`142`	`assertThat(saved.getMessage()).contains("테스트 이벤트", "99000원");`
`143`	`143`	`assertThat(saved.isRead()).isFalse();`
`@@ -208,8 +208,8 @@ void publishOrdersSuccessMessage_VerifyNotificationTypeDetails() {`
`208`	`208`	`Notification saved = notifications.get(0);`
`209`	`209`	`assertThat(saved.getType()).isEqualTo(NotificationTypes.PAYMENT);`
`210`	`210`	`assertThat(saved.getTypeDetail()).isEqualTo(NotificationTypeDetails.PAYMENT_SUCCESS);`
`211`		`- assertThat(saved.getFromWhere()).isEqualTo(DomainName.ORDERS);`
`212`		`- assertThat(saved.getWhereId()).isEqualTo(1L);`
	`211`	`+ assertThat(saved.getDomainName()).isEqualTo(DomainName.ORDERS);`
	`212`	`+ assertThat(saved.getDomainId()).isEqualTo(1L);`
`213`	`213`	`});`
`214`	`214`	`}`
`215`	`215`	`}`
`@@ -278,7 +278,7 @@ void publishOrderFailedMessage_VerifyFailedType() {`
`278`	`278`	`Notification saved = notifications.get(0);`
`279`	`279`	`assertThat(saved.getType()).isEqualTo(NotificationTypes.PAYMENT);`
`280`	`280`	`assertThat(saved.getTypeDetail()).isEqualTo(NotificationTypeDetails.PAYMENT_FAILED);`
`281`		`- assertThat(saved.getFromWhere()).isEqualTo(DomainName.ORDERS);`
	`281`	`+ assertThat(saved.getDomainName()).isEqualTo(DomainName.ORDERS);`
`282`	`282`	`});`
`283`	`283`	`}`
`284`	`284`	`}`
`@@ -345,7 +345,7 @@ void publishPreRegisterDoneMessage_VerifyType() {`
`345`	`345`	`Notification saved = notifications.get(0);`
`346`	`346`	`assertThat(saved.getType()).isEqualTo(NotificationTypes.PRE_REGISTER);`
`347`	`347`	`assertThat(saved.getTypeDetail()).isEqualTo(NotificationTypeDetails.PRE_REGISTER_DONE);`
`348`		`- assertThat(saved.getFromWhere()).isEqualTo(DomainName.PRE_REGISTER);`
	`348`	`+ assertThat(saved.getDomainName()).isEqualTo(DomainName.PRE_REGISTER);`
`349`	`349`	`});`
`350`	`350`	`}`
`351`	`351`	`}`
`@@ -412,7 +412,7 @@ void publishQueueEntriesMessage_VerifyType() {`
`412`	`412`	`Notification saved = notifications.get(0);`
`413`	`413`	`assertThat(saved.getType()).isEqualTo(NotificationTypes.QUEUE_ENTRIES);`
`414`	`414`	`assertThat(saved.getTypeDetail()).isEqualTo(NotificationTypeDetails.TICKETING_POSSIBLE);`
`415`		`- assertThat(saved.getFromWhere()).isEqualTo(DomainName.QUEUE_ENTRIES);`
	`415`	`+ assertThat(saved.getDomainName()).isEqualTo(DomainName.QUEUE_ENTRIES);`
`416`	`416`	`});`
`417`	`417`	`}`
`418`	`418`	`}`