jiazhizhong/OpenIsle
1
0
Fork 0
mirror of https://github.com/nagisa77/OpenIsle.git synced 2026-02-18 04:50:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Reapply "feat: add paginated notification endpoints"

Browse Source 
This reverts commit e7a1e1d159.
This commit is contained in:
tim
2025-08-19 19:38:04 +08:00
parent 02be045f55
commit 805a8df7d3
7 changed files with 242 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
backend/src/main/java/com/openisle/service/NotificationService.java
View File

@@ -180,17 +180,18 @@ public class NotificationService {
userRepository.save(user);
}
public List<Notification> listNotifications(String username, Boolean read) {
public 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();
List<Notification> list;
org.springframework.data.domain.Pageable pageable = org.springframework.data.domain.PageRequest.of(page, size);
org.springframework.data.domain.Page<Notification> result;
if (read == null) {
list = notificationRepository.findByUserOrderByCreatedAtDesc(user);
result = notificationRepository.findByUserOrderByCreatedAtDesc(user, pageable);
} else {
list = notificationRepository.findByUserAndReadOrderByCreatedAtDesc(user, read);
result = notificationRepository.findByUserAndReadOrderByCreatedAtDesc(user, read, pageable);
}
return list.stream().filter(n -> !disabled.contains(n.getType())).collect(Collectors.toList());
return result.stream().filter(n -> !disabled.contains(n.getType())).collect(Collectors.toList());
}
public void markRead(String username, List<Long> ids) {