mirror of
https://github.com/nagisa77/OpenIsle.git
synced 2026-03-15 08:30:45 +08:00
Merge pull request #136 from nagisa77/agsk8n-codex
Allow multiple reactions per user
This commit is contained in:
@@ -12,11 +12,7 @@ import lombok.Setter;
|
|||||||
@Getter
|
@Getter
|
||||||
@Setter
|
@Setter
|
||||||
@NoArgsConstructor
|
@NoArgsConstructor
|
||||||
@Table(name = "reactions",
|
@Table(name = "reactions")
|
||||||
uniqueConstraints = {
|
|
||||||
@UniqueConstraint(columnNames = {"user_id", "post_id", "type"}),
|
|
||||||
@UniqueConstraint(columnNames = {"user_id", "comment_id", "type"})
|
|
||||||
})
|
|
||||||
public class Reaction {
|
public class Reaction {
|
||||||
@Id
|
@Id
|
||||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||||
|
|||||||
@@ -28,11 +28,6 @@ public class ReactionService {
|
|||||||
.orElseThrow(() -> new IllegalArgumentException("User not found"));
|
.orElseThrow(() -> new IllegalArgumentException("User not found"));
|
||||||
Post post = postRepository.findById(postId)
|
Post post = postRepository.findById(postId)
|
||||||
.orElseThrow(() -> new IllegalArgumentException("Post not found"));
|
.orElseThrow(() -> new IllegalArgumentException("Post not found"));
|
||||||
java.util.Optional<Reaction> existing = reactionRepository.findByUserAndPostAndType(user, post, type);
|
|
||||||
if (existing.isPresent()) {
|
|
||||||
reactionRepository.delete(existing.get());
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
Reaction reaction = new Reaction();
|
Reaction reaction = new Reaction();
|
||||||
reaction.setUser(user);
|
reaction.setUser(user);
|
||||||
reaction.setPost(post);
|
reaction.setPost(post);
|
||||||
@@ -49,11 +44,6 @@ public class ReactionService {
|
|||||||
.orElseThrow(() -> new IllegalArgumentException("User not found"));
|
.orElseThrow(() -> new IllegalArgumentException("User not found"));
|
||||||
Comment comment = commentRepository.findById(commentId)
|
Comment comment = commentRepository.findById(commentId)
|
||||||
.orElseThrow(() -> new IllegalArgumentException("Comment not found"));
|
.orElseThrow(() -> new IllegalArgumentException("Comment not found"));
|
||||||
java.util.Optional<Reaction> existing = reactionRepository.findByUserAndCommentAndType(user, comment, type);
|
|
||||||
if (existing.isPresent()) {
|
|
||||||
reactionRepository.delete(existing.get());
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
Reaction reaction = new Reaction();
|
Reaction reaction = new Reaction();
|
||||||
reaction.setUser(user);
|
reaction.setUser(user);
|
||||||
reaction.setComment(comment);
|
reaction.setComment(comment);
|
||||||
|
|||||||
Reference in New Issue
Block a user