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

feat: detailed reaction notifications

Browse Source
This commit is contained in:
Tim
2025-07-09 19:28:18 +08:00
parent 648a9d4a5c
commit 4a23bf5221
6 changed files with 72 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/openisle/controller/NotificationController.java
View File

@@ -2,6 +2,7 @@ package com.openisle.controller;
import com.openisle.model.Notification;
import com.openisle.model.NotificationType;
import com.openisle.model.ReactionType;
import com.openisle.model.Comment;
import com.openisle.model.Post;
import com.openisle.service.NotificationService;
@@ -56,6 +57,12 @@ public class NotificationController {
dto.setParentComment(toCommentDto(parent));
}
}
if (n.getFromUser() != null) {
dto.setFromUser(toAuthorDto(n.getFromUser()));
}
if (n.getReactionType() != null) {
dto.setReactionType(n.getReactionType());
}
dto.setApproved(n.getApproved());
dto.setRead(n.isRead());
dto.setCreatedAt(n.getCreatedAt());
@@ -98,6 +105,8 @@ public class NotificationController {
private PostDto post;
private CommentDto comment;
private CommentDto parentComment;
private AuthorDto fromUser;
private ReactionType reactionType;
private Boolean approved;
private boolean read;
private LocalDateTime createdAt;

8
src/main/java/com/openisle/model/Notification.java
View File

@@ -37,6 +37,14 @@ public class Notification {
@JoinColumn(name = "comment_id")
private Comment comment;
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "from_user_id")
private User fromUser;
@Enumerated(EnumType.STRING)
@Column(name = "reaction_type")
private ReactionType reactionType;
@Column
private Boolean approved;

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

@@ -16,12 +16,19 @@ public class NotificationService {
private final UserRepository userRepository;
public Notification createNotification(User user, NotificationType type, Post post, Comment comment, Boolean approved) {
return createNotification(user, type, post, comment, approved, null, null);
}
public Notification createNotification(User user, NotificationType type, Post post, Comment comment, Boolean approved,
User fromUser, ReactionType reactionType) {
Notification n = new Notification();
n.setUser(user);
n.setType(type);
n.setPost(post);
n.setComment(comment);
n.setApproved(approved);
n.setFromUser(fromUser);
n.setReactionType(reactionType);
return notificationRepository.save(n);
}

4
src/main/java/com/openisle/service/ReactionService.java
View File

@@ -34,7 +34,7 @@ public class ReactionService {
reaction.setType(type);
reaction = reactionRepository.save(reaction);
if (!user.getId().equals(post.getAuthor().getId())) {
notificationService.createNotification(post.getAuthor(), NotificationType.REACTION, post, null, null);
notificationService.createNotification(post.getAuthor(), NotificationType.REACTION, post, null, null, user, type);
}
return reaction;
}
@@ -51,7 +51,7 @@ public class ReactionService {
reaction.setType(type);
reaction = reactionRepository.save(reaction);
if (!user.getId().equals(comment.getAuthor().getId())) {
notificationService.createNotification(comment.getAuthor(), NotificationType.REACTION, null, comment, null);
notificationService.createNotification(comment.getAuthor(), NotificationType.REACTION, comment.getPost(), comment, null, user, type);
}
return reaction;
}