Merge pull request #117 from JA-yeong-eop-JA-moeu-JA/feat/#116-notifications-page

✨ Feat: 알림 목록 조회 API 페이징 추가

Author: Yunji-Yun

src/main/java/com/jajaja/domain/notification/controller/NotificationController.java

@@ -1,12 +1,14 @@
 package com.jajaja.domain.notification.controller;
 
-import com.jajaja.domain.notification.dto.NotificationResponseDto;
-import com.jajaja.domain.notification.dto.UnreadCountResponseDto;
+import com.jajaja.domain.notification.dto.response.NotificationResponseDto;
+import com.jajaja.domain.notification.dto.response.PagingNotificationResponseDto;
+import com.jajaja.domain.notification.dto.response.UnreadCountResponseDto;
 import com.jajaja.domain.notification.repository.NotificationSseEmitterRepository;
 import com.jajaja.domain.notification.service.NotificationService;
 import com.jajaja.global.apiPayload.ApiResponse;
 import com.jajaja.global.security.annotation.Auth;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
@@ -33,11 +35,19 @@ public SseEmitter subscribe(@Auth Long memberId) {
 
     @Operation(
             summary = "알림 목록 조회 API | by 구름/윤윤지",
-            description = "사용자의 알림 목록을 조회합니다."
+            description = "사용자의 알림 목록을 페이징 처리하여 조회합니다."
     )
     @GetMapping
-    public ApiResponse<List<NotificationResponseDto>> getNotifications(@Auth Long memberId) {
-        return ApiResponse.onSuccess(notificationService.getNotifications(memberId));
+    public ApiResponse<PagingNotificationResponseDto> getNotifications(
+            @Auth Long memberId,
+
+            @Parameter(description = "페이지 번호 (0부터 시작)", example = "0")
+            @RequestParam(defaultValue = "0") int page,
+
+            @Parameter(description = "페이지 크기", example = "10")
+            @RequestParam(defaultValue = "10") int size
+    ) {
+        return ApiResponse.onSuccess(notificationService.getNotifications(memberId, page, size));
     }
 
     @Operation(

…on/dto/NotificationCreateRequestDto.java …equest/NotificationCreateRequestDto.javasrc/main/java/com/jajaja/domain/notification/dto/NotificationCreateRequestDto.java renamed to src/main/java/com/jajaja/domain/notification/dto/request/NotificationCreateRequestDto.java src/main/java/com/jajaja/domain/notification/dto/NotificationCreateRequestDto.java renamed to src/main/java/com/jajaja/domain/notification/dto/request/NotificationCreateRequestDto.java

@@ -1,4 +1,4 @@
-package com.jajaja.domain.notification.dto;
+package com.jajaja.domain.notification.dto.request;
 
 import com.jajaja.domain.notification.entity.enums.NotificationType;
 

…ication/dto/NotificationResponseDto.java …to/response/NotificationResponseDto.javasrc/main/java/com/jajaja/domain/notification/dto/NotificationResponseDto.java renamed to src/main/java/com/jajaja/domain/notification/dto/response/NotificationResponseDto.java src/main/java/com/jajaja/domain/notification/dto/NotificationResponseDto.java renamed to src/main/java/com/jajaja/domain/notification/dto/response/NotificationResponseDto.java

@@ -1,4 +1,4 @@
-package com.jajaja.domain.notification.dto;
+package com.jajaja.domain.notification.dto.response;
 
 import com.jajaja.domain.notification.entity.Notification;
 import com.jajaja.domain.notification.entity.enums.NotificationType;

src/main/java/com/jajaja/domain/notification/dto/response/PagingNotificationResponseDto.java

@@ -0,0 +1,20 @@
+package com.jajaja.domain.notification.dto.response;
+
+import com.jajaja.global.apiPayload.PageResponse;
+import lombok.Builder;
+import org.springframework.data.domain.Page;
+
+import java.util.List;
+
+@Builder
+public record PagingNotificationResponseDto(
+        PageResponse page,
+        List<NotificationResponseDto> notifications
+) {
+    public static PagingNotificationResponseDto of(Page<?> page, List<NotificationResponseDto> notificationDtos) {
+        return PagingNotificationResponseDto.builder()
+                .page(PageResponse.from(page))
+                .notifications(notificationDtos)
+                .build();
+    }
+}

…fication/dto/UnreadCountResponseDto.java …dto/response/UnreadCountResponseDto.javasrc/main/java/com/jajaja/domain/notification/dto/UnreadCountResponseDto.java renamed to src/main/java/com/jajaja/domain/notification/dto/response/UnreadCountResponseDto.java src/main/java/com/jajaja/domain/notification/dto/UnreadCountResponseDto.java renamed to src/main/java/com/jajaja/domain/notification/dto/response/UnreadCountResponseDto.java

@@ -1,4 +1,4 @@
-package com.jajaja.domain.notification.dto;
+package com.jajaja.domain.notification.dto.response;
 
 public record UnreadCountResponseDto(int unreadCount) {
 }

src/main/java/com/jajaja/domain/notification/repository/NotificationRepositoryCustom.java

@@ -1,11 +1,12 @@
 package com.jajaja.domain.notification.repository;
 
 import com.jajaja.domain.notification.entity.Notification;
+import org.springframework.data.domain.Page;
 
 import java.util.List;
 
 public interface NotificationRepositoryCustom {
-    List<Notification> findNotificationsByMemberId(Long memberId);
+    Page<Notification> findPageByMemberId(Long memberId, int page, int size);
     int markAllAsReadByMemberId(Long memberId);
     int countUnreadByMemberId(Long memberId);
 }

src/main/java/com/jajaja/domain/notification/repository/NotificationRepositoryImpl.java

@@ -4,9 +4,13 @@
 import com.jajaja.domain.notification.entity.QNotification;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Repository;
+import org.springframework.data.domain.Page;
 
 import java.util.List;
+import java.util.Optional;
 
 @Repository
 @RequiredArgsConstructor
@@ -15,14 +19,28 @@ public class NotificationRepositoryImpl implements NotificationRepositoryCustom
     private final JPAQueryFactory queryFactory;
 
     @Override
-    public List<Notification> findNotificationsByMemberId(Long memberId) {
+    public Page<Notification> findPageByMemberId(Long memberId, int page, int size) {
         QNotification n = QNotification.notification;
-        return queryFactory.selectFrom(n)
+
+        List<Notification> content = queryFactory
+                .selectFrom(n)
                 .where(n.member.id.eq(memberId))
-                .orderBy(n.id.desc())
+                .orderBy(n.createdAt.desc())
+                .offset((long) page * size)
+                .limit(size)
                 .fetch();
+
+        long total = Optional.ofNullable(
+                queryFactory.select(n.count())
+                        .from(n)
+                        .where(n.member.id.eq(memberId))
+                        .fetchOne()
+        ).orElse(0L);
+
+        return new PageImpl<>(content, PageRequest.of(page, size), total);
     }
 
+
     @Override
     public int markAllAsReadByMemberId(Long memberId) {
         QNotification n = QNotification.notification;

src/main/java/com/jajaja/domain/notification/service/NotificationService.java

@@ -1,14 +1,14 @@
 package com.jajaja.domain.notification.service;
 
-import com.jajaja.domain.notification.dto.NotificationCreateRequestDto;
-import com.jajaja.domain.notification.dto.NotificationResponseDto;
-import com.jajaja.domain.notification.dto.UnreadCountResponseDto;
+import com.jajaja.domain.notification.dto.request.NotificationCreateRequestDto;
+import com.jajaja.domain.notification.dto.response.PagingNotificationResponseDto;
+import com.jajaja.domain.notification.dto.response.UnreadCountResponseDto;
 
 import java.util.List;
 
 public interface NotificationService {
     Long createNotification(NotificationCreateRequestDto requestDto);
-    List<NotificationResponseDto> getNotifications(Long memberId);
+    PagingNotificationResponseDto getNotifications(Long memberId, int page, int size);
     void markAsRead(Long notificationId, Long memberId);
     void markAllAsRead(Long memberId);
     UnreadCountResponseDto getUnreadCount(Long memberId);

src/main/java/com/jajaja/domain/notification/service/NotificationServiceImpl.java

@@ -2,15 +2,17 @@
 
 import com.jajaja.domain.member.entity.Member;
 import com.jajaja.domain.member.repository.MemberRepository;
-import com.jajaja.domain.notification.dto.NotificationCreateRequestDto;
-import com.jajaja.domain.notification.dto.NotificationResponseDto;
-import com.jajaja.domain.notification.dto.UnreadCountResponseDto;
+import com.jajaja.domain.notification.dto.request.NotificationCreateRequestDto;
+import com.jajaja.domain.notification.dto.response.NotificationResponseDto;
+import com.jajaja.domain.notification.dto.response.PagingNotificationResponseDto;
+import com.jajaja.domain.notification.dto.response.UnreadCountResponseDto;
 import com.jajaja.domain.notification.entity.Notification;
 import com.jajaja.domain.notification.repository.NotificationRepository;
 import com.jajaja.domain.notification.repository.NotificationSseEmitterRepository;
 import com.jajaja.global.apiPayload.code.status.ErrorStatus;
 import com.jajaja.global.apiPayload.exception.custom.BadRequestException;
 import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.Page;
 import org.springframework.security.access.AccessDeniedException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -47,12 +49,15 @@ public Long createNotification(NotificationCreateRequestDto requestDto) {
     }
 
     @Override
-    public List<NotificationResponseDto> getNotifications(Long memberId) {
-        return notificationRepository.findNotificationsByMemberId(memberId).stream()
+    public PagingNotificationResponseDto getNotifications(Long memberId, int page, int size) {
+        Page<Notification> notificationPage = notificationRepository.findPageByMemberId(memberId, page, size);
+        List<NotificationResponseDto> dtos = notificationPage.getContent().stream()
                 .map(NotificationResponseDto::from)
                 .collect(Collectors.toList());
+        return PagingNotificationResponseDto.of(notificationPage, dtos);
     }
 
+
     @Override
     @Transactional
     public void markAllAsRead(Long memberId) {

src/main/java/com/jajaja/domain/team/service/TeamCommonService.java

@@ -1,6 +1,6 @@
 package com.jajaja.domain.team.service;
 
-import com.jajaja.domain.notification.dto.NotificationCreateRequestDto;
+import com.jajaja.domain.notification.dto.request.NotificationCreateRequestDto;
 import com.jajaja.domain.notification.entity.enums.NotificationType;
 import com.jajaja.domain.notification.service.NotificationService;
 import com.jajaja.domain.team.entity.Team;