Fix notification pagination after filtering disabled types

This reverts commit e7a1e1d159.

backend/src/main/java/com/openisle/controller/NotificationController.java

@@ -26,7 +26,7 @@ public class NotificationController {
     public List<NotificationDto> list(@RequestParam(value = "page", defaultValue = "0") int page,
                                       @RequestParam(value = "size", defaultValue = "30") int size,
                                       Authentication auth) {
-        return notificationService.listNotifications(auth.getName(), page, size).stream()
+        return notificationService.listNotifications(auth.getName(), null, page, size).stream()
                 .map(notificationMapper::toDto)
                 .collect(Collectors.toList());
     }
@@ -35,7 +35,7 @@ public class NotificationController {
     public List<NotificationDto> listUnread(@RequestParam(value = "page", defaultValue = "0") int page,
                                             @RequestParam(value = "size", defaultValue = "30") int size,
                                             Authentication auth) {
-        return notificationService.listUnreadNotifications(auth.getName(), page, size).stream()
+        return notificationService.listNotifications(auth.getName(), false, page, size).stream()
                 .map(notificationMapper::toDto)
                 .collect(Collectors.toList());
     }

backend/src/main/java/com/openisle/repository/NotificationRepository.java

@@ -5,9 +5,9 @@ import com.openisle.model.User;
 import com.openisle.model.Post;
 import com.openisle.model.Comment;
 import com.openisle.model.NotificationType;
+import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
-import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;
 
@@ -15,9 +15,12 @@ import java.util.List;
 public interface NotificationRepository extends JpaRepository<Notification, Long> {
     List<Notification> findByUserOrderByCreatedAtDesc(User user);
     List<Notification> findByUserAndReadOrderByCreatedAtDesc(User user, boolean read);
-    Page<Notification> findByUser(User user, Pageable pageable);
+    Page<Notification> findByUserOrderByCreatedAtDesc(User user, Pageable pageable);
-    Page<Notification> findByUserAndRead(User user, boolean read, Pageable pageable);
+    Page<Notification> findByUserAndReadOrderByCreatedAtDesc(User user, boolean read, Pageable pageable);
+    Page<Notification> findByUserAndTypeNotInOrderByCreatedAtDesc(User user, java.util.Collection<NotificationType> types, Pageable pageable);
+    Page<Notification> findByUserAndReadAndTypeNotInOrderByCreatedAtDesc(User user, boolean read, java.util.Collection<NotificationType> types, Pageable pageable);
     long countByUserAndRead(User user, boolean read);
+    long countByUserAndReadAndTypeNotIn(User user, boolean read, java.util.Collection<NotificationType> types);
     List<Notification> findByPost(Post post);
     List<Notification> findByComment(Comment comment);
 

backend/src/main/java/com/openisle/service/NotificationService.java

@@ -23,11 +23,6 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.concurrent.Executor;
-import java.util.stream.Collectors;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
 
 /** Service for creating and retrieving notifications. */
 @Service
@@ -184,26 +179,26 @@ public class NotificationService {
         userRepository.save(user);
     }
 
-    public List<Notification> listNotifications(String username, int page, int size) {
+    public List<Notification> listNotifications(String username, Boolean read, int page, int size) {
-        return listNotifications(username, null, page, size);
-    }
-
-    public List<Notification> listUnreadNotifications(String username, int page, int size) {
-        return listNotifications(username, false, page, size);
-    }
-
-    private List<Notification> listNotifications(String username, Boolean read, int page, int size) {
         User user = userRepository.findByUsername(username)
                 .orElseThrow(() -> new com.openisle.exception.NotFoundException("User not found"));
         Set<NotificationType> disabled = user.getDisabledNotificationTypes();
-        Pageable pageable = PageRequest.of(page, size, Sort.by(Sort.Direction.DESC, "createdAt"));
+        org.springframework.data.domain.Pageable pageable = org.springframework.data.domain.PageRequest.of(page, size);
-        Page<Notification> list;
+        org.springframework.data.domain.Page<Notification> result;
         if (read == null) {
-            list = notificationRepository.findByUser(user, pageable);
+            if (disabled.isEmpty()) {
+                result = notificationRepository.findByUserOrderByCreatedAtDesc(user, pageable);
+            } else {
+                result = notificationRepository.findByUserAndTypeNotInOrderByCreatedAtDesc(user, disabled, pageable);
+            }
         } else {
-            list = notificationRepository.findByUserAndRead(user, read, pageable);
+            if (disabled.isEmpty()) {
+                result = notificationRepository.findByUserAndReadOrderByCreatedAtDesc(user, read, pageable);
+            } else {
+                result = notificationRepository.findByUserAndReadAndTypeNotInOrderByCreatedAtDesc(user, read, disabled, pageable);
+            }
         }
-        return list.stream().filter(n -> !disabled.contains(n.getType())).collect(Collectors.toList());
+        return result.getContent();
     }
 
     public void markRead(String username, List<Long> ids) {
@@ -222,8 +217,10 @@ public class NotificationService {
         User user = userRepository.findByUsername(username)
                 .orElseThrow(() -> new com.openisle.exception.NotFoundException("User not found"));
         Set<NotificationType> disabled = user.getDisabledNotificationTypes();
-        return notificationRepository.findByUserAndReadOrderByCreatedAtDesc(user, false).stream()
+        if (disabled.isEmpty()) {
-                .filter(n -> !disabled.contains(n.getType())).count();
+            return notificationRepository.countByUserAndRead(user, false);
+        }
+        return notificationRepository.countByUserAndReadAndTypeNotIn(user, false, disabled);
     }
 
     public void notifyMentions(String content, User fromUser, Post post, Comment comment) {

backend/src/test/java/com/openisle/controller/NotificationControllerTest.java

@@ -45,7 +45,7 @@ class NotificationControllerTest {
         p.setId(2L);
         n.setPost(p);
         n.setCreatedAt(LocalDateTime.now());
-        when(notificationService.listNotifications("alice", 0, 30))
+        when(notificationService.listNotifications("alice", null, 0, 30))
                 .thenReturn(List.of(n));
 
         NotificationDto dto = new NotificationDto();
@@ -65,18 +65,19 @@ class NotificationControllerTest {
     @Test
     void listUnreadNotifications() throws Exception {
         Notification n = new Notification();
-        n.setId(1L);
+        n.setId(5L);
-        when(notificationService.listUnreadNotifications("alice", 0, 30))
+        n.setType(NotificationType.POST_VIEWED);
+        when(notificationService.listNotifications("alice", false, 0, 30))
                 .thenReturn(List.of(n));
 
         NotificationDto dto = new NotificationDto();
-        dto.setId(1L);
+        dto.setId(5L);
         when(notificationMapper.toDto(n)).thenReturn(dto);
 
         mockMvc.perform(get("/api/notifications/unread")
                         .principal(new UsernamePasswordAuthenticationToken("alice","p")))
                 .andExpect(status().isOk())
-                .andExpect(jsonPath("$[0].id").value(1));
+                .andExpect(jsonPath("$[0].id").value(5));
     }
 
     @Test

backend/src/test/java/com/openisle/service/NotificationServiceTest.java

@@ -11,6 +11,8 @@ import org.mockito.Mockito;
 
 import java.util.List;
 import java.util.Optional;
+import java.util.HashSet;
+import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
 
 import static org.junit.jupiter.api.Assertions.*;
@@ -63,15 +65,17 @@ class NotificationServiceTest {
         User user = new User();
         user.setId(2L);
         user.setUsername("bob");
+        user.setDisabledNotificationTypes(new HashSet<>());
         when(uRepo.findByUsername("bob")).thenReturn(Optional.of(user));
 
         Notification n = new Notification();
-        when(nRepo.findByUser(eq(user), any(Pageable.class))).thenReturn(new org.springframework.data.domain.PageImpl<>(List.of(n)));
+        when(nRepo.findByUserOrderByCreatedAtDesc(eq(user), any(Pageable.class)))
+                .thenReturn(new PageImpl<>(List.of(n)));
 
-        List<Notification> list = service.listNotifications("bob", 0, 30);
+        List<Notification> list = service.listNotifications("bob", null, 0, 10);
 
         assertEquals(1, list.size());
-        verify(nRepo).findByUser(eq(user), any(Pageable.class));
+        verify(nRepo).findByUserOrderByCreatedAtDesc(eq(user), any(Pageable.class));
     }
 
     @Test
@@ -88,6 +92,7 @@ class NotificationServiceTest {
         User user = new User();
         user.setId(3L);
         user.setUsername("carl");
+        user.setDisabledNotificationTypes(new HashSet<>());
         when(uRepo.findByUsername("carl")).thenReturn(Optional.of(user));
         when(nRepo.countByUserAndRead(user, false)).thenReturn(5L);
 
@@ -97,6 +102,56 @@ class NotificationServiceTest {
         verify(nRepo).countByUserAndRead(user, false);
     }
 
+    @Test
+    void listNotificationsFiltersDisabledTypes() {
+        NotificationRepository nRepo = mock(NotificationRepository.class);
+        UserRepository uRepo = mock(UserRepository.class);
+        ReactionRepository rRepo = mock(ReactionRepository.class);
+        EmailSender email = mock(EmailSender.class);
+        PushNotificationService push = mock(PushNotificationService.class);
+        Executor executor = Runnable::run;
+        NotificationService service = new NotificationService(nRepo, uRepo, email, push, rRepo, executor);
+        org.springframework.test.util.ReflectionTestUtils.setField(service, "websiteUrl", "https://ex.com");
+
+        User user = new User();
+        user.setId(4L);
+        user.setUsername("dana");
+        when(uRepo.findByUsername("dana")).thenReturn(Optional.of(user));
+
+        Notification n = new Notification();
+        when(nRepo.findByUserAndTypeNotInOrderByCreatedAtDesc(eq(user), eq(user.getDisabledNotificationTypes()), any(Pageable.class)))
+                .thenReturn(new PageImpl<>(List.of(n)));
+
+        List<Notification> list = service.listNotifications("dana", null, 0, 10);
+
+        assertEquals(1, list.size());
+        verify(nRepo).findByUserAndTypeNotInOrderByCreatedAtDesc(eq(user), eq(user.getDisabledNotificationTypes()), any(Pageable.class));
+    }
+
+    @Test
+    void countUnreadFiltersDisabledTypes() {
+        NotificationRepository nRepo = mock(NotificationRepository.class);
+        UserRepository uRepo = mock(UserRepository.class);
+        ReactionRepository rRepo = mock(ReactionRepository.class);
+        EmailSender email = mock(EmailSender.class);
+        PushNotificationService push = mock(PushNotificationService.class);
+        Executor executor = Runnable::run;
+        NotificationService service = new NotificationService(nRepo, uRepo, email, push, rRepo, executor);
+        org.springframework.test.util.ReflectionTestUtils.setField(service, "websiteUrl", "https://ex.com");
+
+        User user = new User();
+        user.setId(5L);
+        user.setUsername("erin");
+        when(uRepo.findByUsername("erin")).thenReturn(Optional.of(user));
+        when(nRepo.countByUserAndReadAndTypeNotIn(eq(user), eq(false), eq(user.getDisabledNotificationTypes())))
+                .thenReturn(2L);
+
+        long count = service.countUnread("erin");
+
+        assertEquals(2L, count);
+        verify(nRepo).countByUserAndReadAndTypeNotIn(eq(user), eq(false), eq(user.getDisabledNotificationTypes()));
+    }
+
     @Test
     void createRegisterRequestNotificationsDeletesOldOnes() {
         NotificationRepository nRepo = mock(NotificationRepository.class);

frontend_nuxt/pages/message.vue

@@ -505,7 +505,7 @@
             </div>
           </template>
         </BaseTimeline>
-        <InfiniteLoadMore :key="selectedTab" :on-load="fetchMore" :pause="isLoadingMessage" />
+        <InfiniteLoadMore :key="selectedTab" :on-load="loadMore" :pause="isLoadingMessage" />
       </div>
     </template>
   </div>
@@ -515,8 +515,8 @@
 import { ref, watch, onActivated } from 'vue'
 import BasePlaceholder from '~/components/BasePlaceholder.vue'
 import BaseTimeline from '~/components/BaseTimeline.vue'
-import InfiniteLoadMore from '~/components/InfiniteLoadMore.vue'
 import NotificationContainer from '~/components/NotificationContainer.vue'
+import InfiniteLoadMore from '~/components/InfiniteLoadMore.vue'
 import { toast } from '~/main'
 import { authState, getToken } from '~/utils/auth'
 import { stripMarkdownLength } from '~/utils/markdown'
@@ -527,6 +527,7 @@ import {
   markRead,
   notifications,
   markAllRead,
+  hasMore,
   fetchNotificationPreferences,
   updateNotificationPreference,
 } from '~/utils/notification'
@@ -539,15 +540,24 @@ const selectedTab = ref(
   ['all', 'unread', 'control'].includes(route.query.tab) ? route.query.tab : 'unread',
 )
 const notificationPrefs = ref([])
+const page = ref(0)
+const pageSize = 30
 
-const fetchMore = () => fetchNotifications()
+const loadMore = async () => {
-
+  if (!hasMore.value) return true
-const loadInitial = async () => {
+  page.value++
-  await fetchNotifications({ reset: true, read: selectedTab.value === 'unread' ? false : null })
+  await fetchNotifications({
+    page: page.value,
+    size: pageSize,
+    unread: selectedTab.value === 'unread',
+    append: true,
+  })
+  return !hasMore.value
 }
 
-watch(selectedTab, async (t) => {
+watch(selectedTab, async (tab) => {
-  await fetchNotifications({ reset: true, read: t === 'unread' ? false : null })
+  page.value = 0
+  await fetchNotifications({ page: 0, size: pageSize, unread: tab === 'unread' })
 })
 
 const fetchPrefs = async () => {
@@ -558,7 +568,11 @@ const togglePref = async (pref) => {
   const ok = await updateNotificationPreference(pref.type, !pref.enabled)
   if (ok) {
     pref.enabled = !pref.enabled
-    await fetchNotifications({ reset: true, read: selectedTab.value === 'unread' ? false : null })
+    await fetchNotifications({
+      page: page.value,
+      size: pageSize,
+      unread: selectedTab.value === 'unread',
+    })
     await fetchUnreadCount()
   } else {
     toast.error('操作失败')
@@ -638,8 +652,9 @@ const formatType = (t) => {
   }
 }
 
-onActivated(() => {
+onActivated(async () => {
-  loadInitial()
+  page.value = 0
+  await fetchNotifications({ page: 0, size: pageSize, unread: selectedTab.value === 'unread' })
   fetchPrefs()
 })
 </script>

frontend_nuxt/utils/notification.js

@@ -118,43 +118,43 @@ export async function updateNotificationPreference(type, enabled) {
 function createFetchNotifications() {
   const notifications = ref([])
   const isLoadingMessage = ref(false)
-  const page = ref(0)
+  const hasMore = ref(true)
-  const pageSize = 30
+
-  const readFilter = ref(null)
+  const fetchNotifications = async ({
-  const fetchNotifications = async ({ reset = false, read = null } = {}) => {
+    page = 0,
+    size = 30,
+    unread = false,
+    append = false,
+  } = {}) => {
     const config = useRuntimeConfig()
     const API_BASE_URL = config.public.apiBaseUrl
-    if (isLoadingMessage.value) return false
     try {
       const token = getToken()
       if (!token) {
         toast.error('请先登录')
-        return true
+        return
-      }
-      if (reset) {
-        notifications.value = []
-        page.value = 0
-        readFilter.value = read
       }
+      if (!append) notifications.value = []
       isLoadingMessage.value = true
-      let url = `${API_BASE_URL}/api/notifications`
+      const res = await fetch(
-      if (readFilter.value === false) url += '/unread'
+        `${API_BASE_URL}/api/notifications${unread ? '/unread' : ''}?page=${page}&size=${size}`,
-      url += `?page=${page.value}&size=${pageSize}`
+        {
-      const res = await fetch(url, {
+          headers: {
-        headers: {
+            Authorization: `Bearer ${token}`,
-          Authorization: `Bearer ${token}`,
+          },
         },
-      })
+      )
       isLoadingMessage.value = false
       if (!res.ok) {
         toast.error('获取通知失败')
-        return true
+        return
       }
       const data = await res.json()
+      const arr = []
 
       for (const n of data) {
         if (n.type === 'COMMENT_REPLY') {
-          notifications.value.push({
+          arr.push({
             ...n,
             src: n.comment.author.avatar,
             iconClick: () => {
@@ -163,7 +163,7 @@ function createFetchNotifications() {
             },
           })
         } else if (n.type === 'REACTION') {
-          notifications.value.push({
+          arr.push({
             ...n,
             emoji: reactionEmojiMap[n.reactionType],
             iconClick: () => {
@@ -174,7 +174,7 @@ function createFetchNotifications() {
             },
           })
         } else if (n.type === 'POST_VIEWED') {
-          notifications.value.push({
+          arr.push({
             ...n,
             src: n.fromUser ? n.fromUser.avatar : null,
             icon: n.fromUser ? undefined : iconMap[n.type],
@@ -185,39 +185,19 @@ function createFetchNotifications() {
               }
             },
           })
-        } else if (n.type === 'LOTTERY_WIN') {
+        } else if (n.type === 'LOTTERY_WIN' || n.type === 'LOTTERY_DRAW') {
-          notifications.value.push({
+          arr.push({
             ...n,
             icon: iconMap[n.type],
             iconClick: () => {
               if (n.post) {
                 markRead(n.id)
-                router.push(`/posts/${n.post.id}`)
+                navigateTo(`/posts/${n.post.id}`)
               }
             },
           })
-        } else if (n.type === 'LOTTERY_DRAW') {
+        } else if (n.type === 'POST_UPDATED' || n.type === 'USER_ACTIVITY') {
-          notifications.value.push({
+          arr.push({
-            ...n,
-            icon: iconMap[n.type],
-            iconClick: () => {
-              if (n.post) {
-                markRead(n.id)
-                router.push(`/posts/${n.post.id}`)
-              }
-            },
-          })
-        } else if (n.type === 'POST_UPDATED') {
-          notifications.value.push({
-            ...n,
-            src: n.comment.author.avatar,
-            iconClick: () => {
-              markRead(n.id)
-              navigateTo(`/users/${n.comment.author.id}`, { replace: true })
-            },
-          })
-        } else if (n.type === 'USER_ACTIVITY') {
-          notifications.value.push({
             ...n,
             src: n.comment.author.avatar,
             iconClick: () => {
@@ -226,7 +206,7 @@ function createFetchNotifications() {
             },
           })
         } else if (n.type === 'MENTION') {
-          notifications.value.push({
+          arr.push({
             ...n,
             icon: iconMap[n.type],
             iconClick: () => {
@@ -237,7 +217,7 @@ function createFetchNotifications() {
             },
           })
         } else if (n.type === 'USER_FOLLOWED' || n.type === 'USER_UNFOLLOWED') {
-          notifications.value.push({
+          arr.push({
             ...n,
             icon: iconMap[n.type],
             iconClick: () => {
@@ -247,19 +227,12 @@ function createFetchNotifications() {
               }
             },
           })
-        } else if (n.type === 'FOLLOWED_POST') {
+        } else if (
-          notifications.value.push({
+          n.type === 'FOLLOWED_POST' ||
-            ...n,
+          n.type === 'POST_SUBSCRIBED' ||
-            icon: iconMap[n.type],
+          n.type === 'POST_UNSUBSCRIBED'
-            iconClick: () => {
+        ) {
-              if (n.post) {
+          arr.push({
-                markRead(n.id)
-                navigateTo(`/posts/${n.post.id}`, { replace: true })
-              }
-            },
-          })
-        } else if (n.type === 'POST_SUBSCRIBED' || n.type === 'POST_UNSUBSCRIBED') {
-          notifications.value.push({
             ...n,
             icon: iconMap[n.type],
             iconClick: () => {
@@ -270,7 +243,7 @@ function createFetchNotifications() {
             },
           })
         } else if (n.type === 'POST_REVIEW_REQUEST') {
-          notifications.value.push({
+          arr.push({
             ...n,
             src: n.fromUser ? n.fromUser.avatar : null,
             icon: n.fromUser ? undefined : iconMap[n.type],
@@ -282,25 +255,25 @@ function createFetchNotifications() {
             },
           })
         } else if (n.type === 'REGISTER_REQUEST') {
-          notifications.value.push({
+          arr.push({
             ...n,
             icon: iconMap[n.type],
             iconClick: () => {},
           })
         } else {
-          notifications.value.push({
+          arr.push({
             ...n,
             icon: iconMap[n.type],
           })
         }
       }
-      const done = data.length < pageSize
+
-      if (!done) page.value++
+      if (append) notifications.value.push(...arr)
-      return done
+      else notifications.value = arr
+      hasMore.value = data.length === size
     } catch (e) {
       console.error(e)
       isLoadingMessage.value = false
-      return true
     }
   }
 
@@ -350,8 +323,15 @@ function createFetchNotifications() {
     notifications,
     isLoadingMessage,
     markAllRead,
+    hasMore,
   }
 }
 
-export const { fetchNotifications, markRead, notifications, isLoadingMessage, markAllRead } =
+export const {
-  createFetchNotifications()
+  fetchNotifications,
+  markRead,
+  notifications,
+  isLoadingMessage,
+  markAllRead,
+  hasMore,
+} = createFetchNotifications()