fix: 리베이스 오류 해결

Author: m-a-king

src/main/java/com/somemore/domains/notification/service/NotificationCommandService.java

@@ -38,6 +38,7 @@ public void markMultipleNotificationsAsRead(UUID userId, NotificationIdsRequestD
 
         notifications.forEach(notification ->
                 validateNotificationOwnership(userId, notification.getReceiverId()));
+
         notifications.forEach(Notification::markAsRead);
     }
 

src/main/java/com/somemore/domains/notification/service/NotificationQueryService.java

@@ -54,4 +54,4 @@ public List<NotificationResponseDto> getReadNotifications(UUID userId) {
                 .toList();
         return NotificationResponseDto.from(notifications);
     }
-}
+}

src/main/java/com/somemore/domains/notification/usecase/NotificationQueryUseCase.java

@@ -17,4 +17,4 @@ public interface NotificationQueryUseCase {
     List<NotificationResponseDto> getUnreadNotifications(UUID userId);
 
     List<NotificationResponseDto> getReadNotifications(UUID userId);
-}
+}

src/test/java/com/somemore/domains/notification/handler/NotificationHandlerTest.java

@@ -83,7 +83,7 @@ void handle() {
         notificationHandler.handle(notification);
 
         // then
-        List<Notification> notifications = notificationRepository.findByReceiverIdAndUnread(volunteerUser.getId());
+        List<Notification> notifications = notificationRepository.findAllByUserId(volunteerUser.getId());
         assertThat(notifications).hasSize(1);
 
         Notification savedNotification = notifications.getFirst();

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();

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());
     }