jiazhizhong/OpenIsle
1
0
Fork 0
mirror of https://github.com/nagisa77/OpenIsle.git synced 2026-05-31 06:57:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Deduplicate post view notifications"

Browse Source 
This reverts commit 2fc22e7580.
This commit is contained in:
Tim
2025-08-01 11:49:40 +08:00
parent ba1432d945
commit e8e77b6467
3 changed files with 0 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/openisle/repository/NotificationRepository.java
View File

@@ -18,6 +18,4 @@ public interface NotificationRepository extends JpaRepository<Notification, Long
List<Notification> findByComment(Comment comment); List<Notification> findByComment(Comment comment);
void deleteByTypeAndFromUser(NotificationType type, User fromUser); void deleteByTypeAndFromUser(NotificationType type, User fromUser);
void deleteByUserAndTypeAndPostAndFromUser(User user, NotificationType type, Post post, User fromUser);
} }

3
src/main/java/com/openisle/service/NotificationService.java
View File

@@ -58,9 +58,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) {
notificationRepository.deleteByUserAndTypeAndPostAndFromUser(user, type, post, fromUser);
}
Notification n = new Notification(); Notification n = new Notification();
n.setUser(user); n.setUser(user);
n.setType(type); n.setType(type);

25
src/test/java/com/openisle/service/NotificationServiceTest.java
View File

@@ -168,29 +168,4 @@ class NotificationServiceTest {
verify(email).sendEmail("a@a.com", "有人回复了你", "https://ex.com/posts/1#comment-2"); verify(email).sendEmail("a@a.com", "有人回复了你", "https://ex.com/posts/1#comment-2");
verify(push).sendNotification(eq(user), contains("/posts/1#comment-2")); verify(push).sendNotification(eq(user), contains("/posts/1#comment-2"));
} }
@Test
void postViewedDeletesOldNotification() {
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);
User author = new User();
author.setId(1L);
User viewer = new User();
viewer.setId(2L);
Post post = new Post();
post.setId(3L);
when(nRepo.save(any(Notification.class))).thenAnswer(i -> i.getArgument(0));
service.createNotification(author, NotificationType.POST_VIEWED, post, null, null, viewer, null, null);
verify(nRepo).deleteByUserAndTypeAndPostAndFromUser(author, NotificationType.POST_VIEWED, post, viewer);
verify(nRepo).save(any(Notification.class));
}
} }