fix: 리베이스 오류 해결

Author: m-a-king

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

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

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

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

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,11 +34,10 @@ 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()));
-
         notifications.forEach(Notification::markAsRead);
     }
 

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

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

@@ -1,13 +1,20 @@
 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);
-}
+}