Revert "feat: add paginated notification endpoints"

This reverts commit cc525c1c27.

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

@@ -23,19 +23,9 @@ public class NotificationController {
     private final NotificationMapper notificationMapper;
 
     @GetMapping
-    public List<NotificationDto> list(@RequestParam(value = "page", defaultValue = "0") int page,
+    public List<NotificationDto> list(@RequestParam(value = "read", required = false) Boolean read,
-                                      @RequestParam(value = "size", defaultValue = "30") int size,
                                       Authentication auth) {
-        return notificationService.listNotifications(auth.getName(), null, page, size).stream()
+        return notificationService.listNotifications(auth.getName(), read).stream()
-                .map(notificationMapper::toDto)
-                .collect(Collectors.toList());
-    }
-
-    @GetMapping("/unread")
-    public List<NotificationDto> listUnread(@RequestParam(value = "page", defaultValue = "0") int page,
-                                            @RequestParam(value = "size", defaultValue = "30") int size,
-                                            Authentication auth) {
-        return notificationService.listNotifications(auth.getName(), false, page, size).stream()
                 .map(notificationMapper::toDto)
                 .collect(Collectors.toList());
     }

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

@@ -6,8 +6,6 @@ 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 java.util.List;
 
@@ -15,8 +13,6 @@ 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> findByUserOrderByCreatedAtDesc(User user, Pageable pageable);
-    Page<Notification> findByUserAndReadOrderByCreatedAtDesc(User user, boolean read, Pageable pageable);
     long countByUserAndRead(User user, boolean read);
     List<Notification> findByPost(Post post);
     List<Notification> findByComment(Comment comment);

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

@@ -180,18 +180,17 @@ public class NotificationService {
         userRepository.save(user);
     }
 
-    public List<Notification> listNotifications(String username, Boolean read, int page, int size) {
+    public List<Notification> listNotifications(String username, Boolean read) {
         User user = userRepository.findByUsername(username)
                 .orElseThrow(() -> new com.openisle.exception.NotFoundException("User not found"));
         Set<NotificationType> disabled = user.getDisabledNotificationTypes();
-        org.springframework.data.domain.Pageable pageable = org.springframework.data.domain.PageRequest.of(page, size);
+        List<Notification> list;
-        org.springframework.data.domain.Page<Notification> result;
         if (read == null) {
-            result = notificationRepository.findByUserOrderByCreatedAtDesc(user, pageable);
+            list = notificationRepository.findByUserOrderByCreatedAtDesc(user);
         } else {
-            result = notificationRepository.findByUserAndReadOrderByCreatedAtDesc(user, read, pageable);
+            list = notificationRepository.findByUserAndReadOrderByCreatedAtDesc(user, read);
         }
-        return result.stream().filter(n -> !disabled.contains(n.getType())).collect(Collectors.toList());
+        return list.stream().filter(n -> !disabled.contains(n.getType())).collect(Collectors.toList());
     }
 
     public void markRead(String username, List<Long> ids) {

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", null, 0, 30))
+        when(notificationService.listNotifications("alice", null))
                 .thenReturn(List.of(n));
 
         NotificationDto dto = new NotificationDto();
@@ -62,24 +62,6 @@ class NotificationControllerTest {
                 .andExpect(jsonPath("$[0].post.id").value(2));
     }
 
-    @Test
-    void listUnreadNotifications() throws Exception {
-        Notification n = new Notification();
-        n.setId(5L);
-        n.setType(NotificationType.POST_VIEWED);
-        when(notificationService.listNotifications("alice", false, 0, 30))
-                .thenReturn(List.of(n));
-
-        NotificationDto dto = new NotificationDto();
-        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(5));
-    }
-
     @Test
     void markReadEndpoint() throws Exception {
         mockMvc.perform(post("/api/notifications/read")

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

@@ -11,8 +11,6 @@ import org.mockito.Mockito;
 
 import java.util.List;
 import java.util.Optional;
-import org.springframework.data.domain.PageImpl;
-import org.springframework.data.domain.Pageable;
 
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.Mockito.*;
@@ -67,13 +65,12 @@ class NotificationServiceTest {
         when(uRepo.findByUsername("bob")).thenReturn(Optional.of(user));
 
         Notification n = new Notification();
-        when(nRepo.findByUserOrderByCreatedAtDesc(eq(user), any(Pageable.class)))
+        when(nRepo.findByUserOrderByCreatedAtDesc(user)).thenReturn(List.of(n));
-                .thenReturn(new PageImpl<>(List.of(n)));
 
-        List<Notification> list = service.listNotifications("bob", null, 0, 10);
+        List<Notification> list = service.listNotifications("bob", null);
 
         assertEquals(1, list.size());
-        verify(nRepo).findByUserOrderByCreatedAtDesc(eq(user), any(Pageable.class));
+        verify(nRepo).findByUserOrderByCreatedAtDesc(user);
     }
 
     @Test

frontend_nuxt/pages/message.vue

@@ -53,13 +53,13 @@
       </div>
 
       <BasePlaceholder
-        v-else-if="notifications.length === 0"
+        v-else-if="filteredNotifications.length === 0"
         text="暂时没有消息 :)"
         icon="fas fa-inbox"
       />
 
-      <div class="timeline-container" v-if="notifications.length > 0">
+      <div class="timeline-container" v-if="filteredNotifications.length > 0">
-        <BaseTimeline :items="notifications">
+        <BaseTimeline :items="filteredNotifications">
           <template #item="{ item }">
             <div class="notif-content" :class="{ read: item.read }">
               <span v-if="!item.read" class="unread-dot"></span>
@@ -505,18 +505,16 @@
             </div>
           </template>
         </BaseTimeline>
-        <InfiniteLoadMore :key="selectedTab" :on-load="loadMore" :pause="isLoadingMessage" />
       </div>
     </template>
   </div>
 </template>
 
 <script setup>
-import { ref, watch, onActivated } from 'vue'
+import { computed, onMounted, ref } from 'vue'
 import BasePlaceholder from '~/components/BasePlaceholder.vue'
 import BaseTimeline from '~/components/BaseTimeline.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,9 +525,6 @@ import {
   markRead,
   notifications,
   markAllRead,
-  hasMore,
-  fetchNotificationPreferences,
-  updateNotificationPreference,
 } from '~/utils/notification'
 import TimeManager from '~/utils/time'
 
@@ -540,25 +535,9 @@ const selectedTab = ref(
   ['all', 'unread', 'control'].includes(route.query.tab) ? route.query.tab : 'unread',
 )
 const notificationPrefs = ref([])
-const page = ref(0)
+const filteredNotifications = computed(() =>
-const pageSize = 30
+  selectedTab.value === 'all' ? notifications.value : notifications.value.filter((n) => !n.read),
-
+)
-const loadMore = async () => {
-  if (!hasMore.value) return true
-  page.value++
-  await fetchNotifications({
-    page: page.value,
-    size: pageSize,
-    unread: selectedTab.value === 'unread',
-    append: true,
-  })
-  return !hasMore.value
-}
-
-watch(selectedTab, async (tab) => {
-  page.value = 0
-  await fetchNotifications({ page: 0, size: pageSize, unread: tab === 'unread' })
-})
 
 const fetchPrefs = async () => {
   notificationPrefs.value = await fetchNotificationPreferences()
@@ -568,11 +547,7 @@ const togglePref = async (pref) => {
   const ok = await updateNotificationPreference(pref.type, !pref.enabled)
   if (ok) {
     pref.enabled = !pref.enabled
-    await fetchNotifications({
+    await fetchNotifications()
-      page: page.value,
-      size: pageSize,
-      unread: selectedTab.value === 'unread',
-    })
     await fetchUnreadCount()
   } else {
     toast.error('操作失败')
@@ -652,9 +627,8 @@ const formatType = (t) => {
   }
 }
 
-onActivated(async () => {
+onActivated(() => {
-  page.value = 0
+  fetchNotifications()
-  await fetchNotifications({ page: 0, size: pageSize, unread: selectedTab.value === 'unread' })
   fetchPrefs()
 })
 </script>

frontend_nuxt/utils/notification.js

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