[�REFACTOR] �유저 테이블에 알맞게 알림 로직 수정 (#347)

m-a-king · web-flow · commit 7c6de349e093 · 2025-02-03T16:16:42.000+09:00
* refactor: userId 어노테이션 수정

* feat(notification): repository 계층에서 read, unread 구분하지 않기

* feat(notification): 복수형 정적 팩토리 메서드

* test(notification): 변경 로직에 따라서 테스트 수정

* test(notification): 알림 쿼리 서비스 세분화

* test(notification): 쿼리 서비스 의존성 주입
diff --git a/src/main/java/com/somemore/domains/notification/controller/NotificationCommandController.java b/src/main/java/com/somemore/domains/notification/controller/NotificationCommandController.java
@@ -2,7 +2,7 @@
 
 import com.somemore.domains.notification.dto.NotificationIdsRequestDto;
 import com.somemore.domains.notification.usecase.NotificationCommandUseCase;
-import com.somemore.global.auth.annotation.CurrentUser;
+import com.somemore.global.auth.annotation.UserId;
 import com.somemore.global.common.response.ApiResponse;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -29,7 +29,7 @@ public class NotificationCommandController {
     @Operation(summary = "알림(1개) 읽음 처리", description = "알림 1개를 읽음 처리합니다.")
     @PatchMapping("/read/{notificationId}")
     public ApiResponse<String> markSingleNotification(
-            @CurrentUser UUID userId,
+            @UserId UUID userId,
             @PathVariable Long notificationId
     ) {
         notificationCommandUseCase.markSingleNotificationAsRead(userId, notificationId);
@@ -40,7 +40,7 @@ public ApiResponse<String> markSingleNotification(
     @Operation(summary = "알림(N개) 읽음 처리", description = "알림 N개를 읽음 처리합니다.")
     @PostMapping("/read/multiple")
     public ApiResponse<String> markMultipleNotifications(
-            @CurrentUser UUID userId,
+            @UserId UUID userId,
             @RequestBody NotificationIdsRequestDto notificationIds
     ) {
         notificationCommandUseCase.markMultipleNotificationsAsRead(userId, notificationIds);
diff --git a/src/main/java/com/somemore/domains/notification/dto/NotificationResponseDto.java b/src/main/java/com/somemore/domains/notification/dto/NotificationResponseDto.java
@@ -7,6 +7,7 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 @JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
 @Schema(description = "알림 응답 DTO")
@@ -34,4 +35,10 @@ public static NotificationResponseDto from(Notification notification) {
                 notification.getCreatedAt()
         );
     }
+
+    public static List<NotificationResponseDto> from(List<Notification> notifications) {
+        return notifications.stream()
+                .map(NotificationResponseDto::from)
+                .toList();
+    }
 }
diff --git a/src/main/java/com/somemore/domains/notification/repository/NotificationJpaRepository.java b/src/main/java/com/somemore/domains/notification/repository/NotificationJpaRepository.java
@@ -3,5 +3,9 @@
 import com.somemore.domains.notification.domain.Notification;
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import java.util.List;
+import java.util.UUID;
+
 public interface NotificationJpaRepository extends JpaRepository<Notification, Long> {
+    List<Notification> findAllByReceiverId(UUID receiverId);
 }
diff --git a/src/main/java/com/somemore/domains/notification/repository/NotificationRepository.java b/src/main/java/com/somemore/domains/notification/repository/NotificationRepository.java
@@ -16,9 +16,7 @@ public interface NotificationRepository {
 
     List<Notification> findAllByIds(List<Long> ids);
 
-    List<Notification> findByReceiverIdAndUnread(UUID userId);
-
-    List<Notification> findByReceiverIdAndRead(UUID userId);
+    List<Notification> findAllByUserId(UUID userId);
 
     void deleteAllInBatch();
 }
diff --git a/src/main/java/com/somemore/domains/notification/repository/NotificationRepositoryImpl.java b/src/main/java/com/somemore/domains/notification/repository/NotificationRepositoryImpl.java
@@ -1,9 +1,6 @@
 package com.somemore.domains.notification.repository;
 
-import com.querydsl.core.types.dsl.BooleanExpression;
-import com.querydsl.jpa.impl.JPAQueryFactory;
 import com.somemore.domains.notification.domain.Notification;
-import com.somemore.domains.notification.domain.QNotification;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Repository;
 
@@ -16,9 +13,6 @@
 public class NotificationRepositoryImpl implements NotificationRepository {
 
     private final NotificationJpaRepository notificationJpaRepository;
-    private final JPAQueryFactory queryFactory;
-
-    private static final QNotification notification = QNotification.notification;
 
     @Override
     public Notification save(Notification notification) {
@@ -36,35 +30,12 @@ public List<Notification> findAllByIds(List<Long> ids) {
     }
 
     @Override
-    public List<Notification> findByReceiverIdAndUnread(UUID receiverId) {
-        return queryFactory.selectFrom(notification)
-                .where(eqReceiverId(receiverId),
-                        isUnread())
-                .fetch();
-    }
-
-    @Override
-    public List<Notification> findByReceiverIdAndRead(UUID receiverId) {
-        return queryFactory.selectFrom(notification)
-                .where(eqReceiverId(receiverId),
-                        isRead())
-                .fetch();
+    public List<Notification> findAllByUserId(UUID receiverId) {
+        return notificationJpaRepository.findAllByReceiverId(receiverId);
     }
 
     @Override
     public void deleteAllInBatch() {
         notificationJpaRepository.deleteAllInBatch();
     }
-
-    private static BooleanExpression eqReceiverId(UUID userId) {
-        return notification.receiverId.eq(userId);
-    }
-
-    private static BooleanExpression isUnread() {
-        return notification.read.eq(false);
-    }
-
-    private static BooleanExpression isRead() {
-        return notification.read.eq(true);
-    }
 }
diff --git a/src/main/java/com/somemore/domains/notification/service/NotificationCommandService.java b/src/main/java/com/somemore/domains/notification/service/NotificationCommandService.java
@@ -2,8 +2,8 @@
 
 import com.somemore.domains.notification.domain.Notification;
 import com.somemore.domains.notification.dto.NotificationIdsRequestDto;
-import com.somemore.domains.notification.repository.NotificationRepository;
 import com.somemore.domains.notification.usecase.NotificationCommandUseCase;
+import com.somemore.domains.notification.usecase.NotificationQueryUseCase;
 import com.somemore.global.exception.BadRequestException;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -13,7 +13,6 @@
 import java.util.List;
 import java.util.UUID;
 
-import static com.somemore.global.exception.ExceptionMessage.NOT_EXISTS_NOTIFICATION;
 import static com.somemore.global.exception.ExceptionMessage.UNAUTHORIZED_NOTIFICATION;
 
 @Slf4j
@@ -22,12 +21,11 @@
 @Transactional
 public class NotificationCommandService implements NotificationCommandUseCase {
 
-    private final NotificationRepository notificationRepository;
+    private final NotificationQueryUseCase notificationQueryUseCase;
 
     @Override
     public void markSingleNotificationAsRead(UUID userId, Long notificationId) {
-        Notification notification = notificationRepository.findById(notificationId)
-                .orElseThrow(() -> new BadRequestException(NOT_EXISTS_NOTIFICATION));
+        Notification notification = notificationQueryUseCase.getNotification(notificationId);
 
         validateNotificationOwnership(userId, notification.getReceiverId());
 
@@ -36,7 +34,7 @@ public void markSingleNotificationAsRead(UUID userId, Long notificationId) {
 
     @Override
     public void markMultipleNotificationsAsRead(UUID userId, NotificationIdsRequestDto notificationIds) {
-        List<Notification> notifications = notificationRepository.findAllByIds(notificationIds.ids());
+        List<Notification> notifications = notificationQueryUseCase.getNotifications(notificationIds.ids());
 
         notifications.forEach(notification ->
                 validateNotificationOwnership(userId, notification.getReceiverId()));
diff --git a/src/main/java/com/somemore/domains/notification/service/NotificationQueryService.java b/src/main/java/com/somemore/domains/notification/service/NotificationQueryService.java
@@ -4,13 +4,16 @@
 import com.somemore.domains.notification.dto.NotificationResponseDto;
 import com.somemore.domains.notification.repository.NotificationRepository;
 import com.somemore.domains.notification.usecase.NotificationQueryUseCase;
+import com.somemore.global.exception.ExceptionMessage;
+import com.somemore.global.exception.NoSuchElementException;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 import java.util.UUID;
+import java.util.function.Predicate;
 
 @Slf4j
 @Service
@@ -21,20 +24,34 @@ public class NotificationQueryService implements NotificationQueryUseCase {
     private final NotificationRepository notificationRepository;
 
     @Override
-    public List<NotificationResponseDto> getUnreadNotifications(UUID userId) {
-        List<Notification> notifications = notificationRepository.findByReceiverIdAndUnread(userId);
-        return dtoFrom(notifications);
+    public Notification getNotification(Long id) {
+        return notificationRepository.findById(id)
+                .orElseThrow(() -> new NoSuchElementException(ExceptionMessage.NOT_EXISTS_NOTIFICATION));
     }
 
     @Override
-    public List<NotificationResponseDto> getReadNotifications(UUID userId) {
-        List<Notification> notifications = notificationRepository.findByReceiverIdAndRead(userId);
-        return dtoFrom(notifications);
+    public List<Notification> getNotifications(UUID userId) {
+        return notificationRepository.findAllByUserId(userId);
+    }
+
+    @Override
+    public List<Notification> getNotifications(List<Long> ids) {
+        return notificationRepository.findAllByIds(ids);
+    }
+
+    @Override
+    public List<NotificationResponseDto> getUnreadNotifications(UUID userId) {
+        List<Notification> notifications = getNotifications(userId).stream()
+                .filter(Predicate.not(Notification::isRead))
+                .toList();
+        return NotificationResponseDto.from(notifications);
     }
 
-    private static List<NotificationResponseDto> dtoFrom(List<Notification> notifications) {
-        return notifications.stream()
-                .map(NotificationResponseDto::from)
+    @Override
+    public List<NotificationResponseDto> getReadNotifications(UUID userId) {
+        List<Notification> notifications = getNotifications(userId).stream()
+                .filter(Notification::isRead)
                 .toList();
+        return NotificationResponseDto.from(notifications);
     }
 }
diff --git a/src/main/java/com/somemore/domains/notification/usecase/NotificationQueryUseCase.java b/src/main/java/com/somemore/domains/notification/usecase/NotificationQueryUseCase.java
@@ -1,12 +1,19 @@
 package com.somemore.domains.notification.usecase;
 
+import com.somemore.domains.notification.domain.Notification;
 import com.somemore.domains.notification.dto.NotificationResponseDto;
 
 import java.util.List;
 import java.util.UUID;
 
 public interface NotificationQueryUseCase {
 
+    Notification getNotification(Long id);
+
+    List<Notification> getNotifications(UUID userId);
+
+    List<Notification> getNotifications(List<Long> ids);
+
     List<NotificationResponseDto> getUnreadNotifications(UUID userId);
 
     List<NotificationResponseDto> getReadNotifications(UUID userId);
diff --git a/src/test/java/com/somemore/domains/notification/handler/NotificationHandlerTest.java b/src/test/java/com/somemore/domains/notification/handler/NotificationHandlerTest.java
@@ -53,7 +53,7 @@ void handle() {
         notificationHandler.handle(notification);
 
         // then
-        List<Notification> notifications = notificationRepository.findByReceiverIdAndUnread(receiverId);
+        List<Notification> notifications = notificationRepository.findAllByUserId(receiverId);
         assertThat(notifications).hasSize(1);
 
         Notification savedNotification = notifications.getFirst();
diff --git a/src/test/java/com/somemore/domains/notification/repository/NotificationRepositoryTest.java b/src/test/java/com/somemore/domains/notification/repository/NotificationRepositoryTest.java
@@ -42,36 +42,14 @@ void setup() {
         }
     }
 
-    @DisplayName("사용자의 읽지 않은 알림을 조회한다.")
-    @Test
-    void findByReceiverIdAndUnread() {
-        // when
-        List<Notification> notifications = notificationRepository.findByReceiverIdAndUnread(receiverId);
-
-        // then
-        assertThat(notifications).hasSize(10);
-        assertThat(notifications.getFirst().isRead()).isFalse();
-    }
-
-    @DisplayName("사용자의 읽은 알림을 조회한다.")
-    @Test
-    void findByReceiverIdAndRead() {
-        // when
-        List<Notification> notifications = notificationRepository.findByReceiverIdAndRead(receiverId);
-
-        // then
-        assertThat(notifications).hasSize(10);
-        assertThat(notifications.getFirst().isRead()).isTrue();
-    }
-
     @DisplayName("알림이 없는 사용자의 읽지 않은 알림을 조회하면 빈 리스트를 반환한다.")
     @Test
     void findByReceiverIdAndUnread_noNotifications() {
         // given
         UUID unknownReceiverId = UUID.randomUUID();
 
         // when
-        List<Notification> notifications = notificationRepository.findByReceiverIdAndUnread(unknownReceiverId);
+        List<Notification> notifications = notificationRepository.findAllByUserId(unknownReceiverId);
 
         // then
         assertThat(notifications).isEmpty();
diff --git a/src/test/java/com/somemore/domains/notification/service/NotificationCommandServiceTest.java b/src/test/java/com/somemore/domains/notification/service/NotificationCommandServiceTest.java
@@ -5,6 +5,7 @@
 import com.somemore.domains.notification.dto.NotificationIdsRequestDto;
 import com.somemore.domains.notification.repository.NotificationRepository;
 import com.somemore.global.exception.BadRequestException;
+import com.somemore.global.exception.NoSuchElementException;
 import com.somemore.support.IntegrationTestSupport;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
@@ -53,7 +54,7 @@ void markSingleNotificationAsReadWhenNotificationNotExists() {
 
         // when / then
         assertThatThrownBy(() -> notificationCommandService.markSingleNotificationAsRead(receiverId, nonExistentNotificationId))
-                .isInstanceOf(BadRequestException.class)
+                .isInstanceOf(NoSuchElementException.class)
                 .hasMessageContaining(NOT_EXISTS_NOTIFICATION.getMessage());
     }
 

Original file line number	Diff line number	Diff line change
`@@ -3,5 +3,9 @@`
`3`	`3`	`import com.somemore.domains.notification.domain.Notification;`
`4`	`4`	`import org.springframework.data.jpa.repository.JpaRepository;`
`5`	`5`
	`6`	`+import java.util.List;`
	`7`	`+import java.util.UUID;`
	`8`	`+`
`6`	`9`	`public interface NotificationJpaRepository extends JpaRepository<Notification, Long> {`
	`10`	`+ List<Notification> findAllByReceiverId(UUID receiverId);`
`7`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,9 +16,7 @@ public interface NotificationRepository {`
`16`	`16`
`17`	`17`	`List<Notification> findAllByIds(List<Long> ids);`
`18`	`18`
`19`		`- List<Notification> findByReceiverIdAndUnread(UUID userId);`
`20`		`-`
`21`		`- List<Notification> findByReceiverIdAndRead(UUID userId);`
	`19`	`+ List<Notification> findAllByUserId(UUID userId);`
`22`	`20`
`23`	`21`	`void deleteAllInBatch();`
`24`	`22`	`}`