xinyin025/OpenIsle
1
0
Fork 0
mirror of https://github.com/nagisa77/OpenIsle.git synced 2026-07-24 13:36:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: 处理重复阅读问题

Browse Source
This commit is contained in:
Tim
2025-08-01 12:01:44 +08:00
parent db31b5d6c1
commit 14bd9d86c0
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/openisle/service/NotificationService.java
+2 -3
View File
@@ -9,6 +9,8 @@ import com.openisle.service.EmailSender;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import org.springframework.transaction.annotation.Transactional;
import java.util.Map; import java.util.Map;
import java.util.regex.Pattern; import java.util.regex.Pattern;
@@ -58,9 +60,6 @@ public class NotificationService {
public Notification createNotification(User user, NotificationType type, Post post, Comment comment, Boolean approved, public Notification createNotification(User user, NotificationType type, Post post, Comment comment, Boolean approved,
User fromUser, ReactionType reactionType, String content) { User fromUser, ReactionType reactionType, String content) {
if (type == NotificationType.POST_VIEWED && post != null && fromUser != null) {
notificationRepository.deleteByTypeAndFromUserAndPost(type, fromUser, post);
}
Notification n = new Notification(); Notification n = new Notification();
n.setUser(user); n.setUser(user);
n.setType(type); n.setType(type);
src/main/java/com/openisle/service/PostService.java
+3 -2
View File
@@ -26,6 +26,7 @@ import java.util.List;
import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort; import org.springframework.data.domain.Sort;
import org.springframework.transaction.annotation.Transactional;
@Service @Service
public class PostService { public class PostService {
@@ -143,6 +144,7 @@ public class PostService {
return post; return post;
} }
@Transactional
public Post viewPost(Long id, String viewer) { public Post viewPost(Long id, String viewer) {
Post post = postRepository.findById(id) Post post = postRepository.findById(id)
.orElseThrow(() -> new com.openisle.exception.NotFoundException("Post not found")); .orElseThrow(() -> new com.openisle.exception.NotFoundException("Post not found"));
@@ -164,9 +166,8 @@ public class PostService {
if (viewer != null && !viewer.equals(post.getAuthor().getUsername())) { if (viewer != null && !viewer.equals(post.getAuthor().getUsername())) {
User viewerUser = userRepository.findByUsername(viewer).orElse(null); User viewerUser = userRepository.findByUsername(viewer).orElse(null);
if (viewerUser != null) { if (viewerUser != null) {
notificationRepository.deleteByTypeAndFromUserAndPost(NotificationType.POST_VIEWED, viewerUser, post);
notificationService.createNotification(post.getAuthor(), NotificationType.POST_VIEWED, post, null, null, viewerUser, null, null); notificationService.createNotification(post.getAuthor(), NotificationType.POST_VIEWED, post, null, null, viewerUser, null, null);
} else {
notificationService.createNotification(post.getAuthor(), NotificationType.POST_VIEWED, post, null, null, null, null, null);
} }
} }
return post; return post;