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

feat: relocate remaining dtos

Browse Source
This commit is contained in:
Tim
2025-08-04 20:51:33 +08:00
parent a22967fc0c
commit 2db998a9d9
51 changed files with 532 additions and 543 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
backend/src/main/java/com/openisle/controller/NotificationController.java
View File

@@ -1,12 +1,14 @@
package com.openisle.controller;
import com.openisle.model.Notification;
import com.openisle.model.NotificationType;
import com.openisle.model.ReactionType;
import com.openisle.dto.AuthorDto;
import com.openisle.dto.CommentDto;
import com.openisle.dto.NotificationDto;
import com.openisle.dto.NotificationMarkReadRequest;
import com.openisle.dto.NotificationUnreadCountDto;
import com.openisle.dto.PostSummaryDto;
import com.openisle.model.Comment;
import com.openisle.model.Post;
import com.openisle.model.Notification;
import com.openisle.service.NotificationService;
import lombok.Data;
import lombok.RequiredArgsConstructor;
import org.springframework.security.core.Authentication;
import org.springframework.web.bind.annotation.*;
@@ -31,15 +33,15 @@ public class NotificationController {
}
@GetMapping("/unread-count")
public UnreadCount unreadCount(Authentication auth) {
public NotificationUnreadCountDto unreadCount(Authentication auth) {
long count = notificationService.countUnread(auth.getName());
UnreadCount uc = new UnreadCount();
NotificationUnreadCountDto uc = new NotificationUnreadCountDto();
uc.setCount(count);
return uc;
}
@PostMapping("/read")
public void markRead(@RequestBody MarkReadRequest req, Authentication auth) {
public void markRead(@RequestBody NotificationMarkReadRequest req, Authentication auth) {
notificationService.markRead(auth.getName(), req.getIds());
}
@@ -48,7 +50,10 @@ public class NotificationController {
dto.setId(n.getId());
dto.setType(n.getType());
if (n.getPost() != null) {
dto.setPost(toPostDto(n.getPost()));
PostSummaryDto postDto = new PostSummaryDto();
postDto.setId(n.getPost().getId());
postDto.setTitle(n.getPost().getTitle());
dto.setPost(postDto);
}
if (n.getComment() != null) {
dto.setComment(toCommentDto(n.getComment()));
@@ -58,7 +63,11 @@ public class NotificationController {
}
}
if (n.getFromUser() != null) {
dto.setFromUser(toAuthorDto(n.getFromUser()));
AuthorDto author = new AuthorDto();
author.setId(n.getFromUser().getId());
author.setUsername(n.getFromUser().getUsername());
author.setAvatar(n.getFromUser().getAvatar());
dto.setFromUser(author);
}
if (n.getReactionType() != null) {
dto.setReactionType(n.getReactionType());
@@ -70,73 +79,16 @@ public class NotificationController {
return dto;
}
private PostDto toPostDto(Post post) {
PostDto dto = new PostDto();
dto.setId(post.getId());
dto.setTitle(post.getTitle());
return dto;
}
private CommentDto toCommentDto(Comment comment) {
CommentDto dto = new CommentDto();
dto.setId(comment.getId());
dto.setContent(comment.getContent());
dto.setCreatedAt(comment.getCreatedAt());
dto.setAuthor(toAuthorDto(comment.getAuthor()));
AuthorDto author = new AuthorDto();
author.setId(comment.getAuthor().getId());
author.setUsername(comment.getAuthor().getUsername());
author.setAvatar(comment.getAuthor().getAvatar());
dto.setAuthor(author);
return dto;
}
private AuthorDto toAuthorDto(com.openisle.model.User user) {
AuthorDto dto = new AuthorDto();
dto.setId(user.getId());
dto.setUsername(user.getUsername());
dto.setAvatar(user.getAvatar());
return dto;
}
@Data
private static class MarkReadRequest {
private List<Long> ids;
}
@Data
private static class NotificationDto {
private Long id;
private NotificationType type;
private PostDto post;
private CommentDto comment;
private CommentDto parentComment;
private AuthorDto fromUser;
private ReactionType reactionType;
private String content;
private Boolean approved;
private boolean read;
private LocalDateTime createdAt;
}
@Data
private static class PostDto {
private Long id;
private String title;
}
@Data
private static class CommentDto {
private Long id;
private String content;
private LocalDateTime createdAt;
private AuthorDto author;
}
@Data
private static class AuthorDto {
private Long id;
private String username;
private String avatar;
}
@Data
private static class UnreadCount {
private long count;
}
}