xinyin025/OpenIsle
1
0
Fork 0
mirror of https://github.com/nagisa77/OpenIsle.git synced 2026-08-17 00:31:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #126 from nagisa77/codex/-400

Browse Source 
Fix user lookup by id
This commit is contained in:
Tim
2025-07-09 14:13:48 +08:00
committed by GitHub
parent 178d25f13a a0c5b8c530
commit 6cd32e6782
2 changed files with 43 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/openisle/controller/UserController.java
+32 -26
View File
@@ -68,75 +68,81 @@ public class UserController {
return ResponseEntity.ok(toDto(user)); return ResponseEntity.ok(toDto(user));
} }
@GetMapping("/{username}") @GetMapping("/{identifier}")
public ResponseEntity<UserDto> getUser(@PathVariable String username) { public ResponseEntity<UserDto> getUser(@PathVariable("identifier") String identifier) {
User user = userService.findByUsername(username).orElseThrow(); User user = userService.findByIdentifier(identifier).orElseThrow();
return ResponseEntity.ok(toDto(user)); return ResponseEntity.ok(toDto(user));
} }
@GetMapping("/{username}/posts") @GetMapping("/{identifier}/posts")
public java.util.List<PostMetaDto> userPosts(@PathVariable String username, public java.util.List<PostMetaDto> userPosts(@PathVariable("identifier") String identifier,
@RequestParam(value = "limit", required = false) Integer limit) { @RequestParam(value = "limit", required = false) Integer limit) {
int l = limit != null ? limit : defaultPostsLimit; int l = limit != null ? limit : defaultPostsLimit;
return postService.getRecentPostsByUser(username, l).stream() User user = userService.findByIdentifier(identifier).orElseThrow();
return postService.getRecentPostsByUser(user.getUsername(), l).stream()
.map(this::toMetaDto) .map(this::toMetaDto)
.collect(java.util.stream.Collectors.toList()); .collect(java.util.stream.Collectors.toList());
} }
@GetMapping("/{username}/replies") @GetMapping("/{identifier}/replies")
public java.util.List<CommentInfoDto> userReplies(@PathVariable String username, public java.util.List<CommentInfoDto> userReplies(@PathVariable("identifier") String identifier,
@RequestParam(value = "limit", required = false) Integer limit) { @RequestParam(value = "limit", required = false) Integer limit) {
int l = limit != null ? limit : defaultRepliesLimit; int l = limit != null ? limit : defaultRepliesLimit;
return commentService.getRecentCommentsByUser(username, l).stream() User user = userService.findByIdentifier(identifier).orElseThrow();
return commentService.getRecentCommentsByUser(user.getUsername(), l).stream()
.map(this::toCommentInfoDto) .map(this::toCommentInfoDto)
.collect(java.util.stream.Collectors.toList()); .collect(java.util.stream.Collectors.toList());
} }
@GetMapping("/{username}/hot-posts") @GetMapping("/{identifier}/hot-posts")
public java.util.List<PostMetaDto> hotPosts(@PathVariable String username, public java.util.List<PostMetaDto> hotPosts(@PathVariable("identifier") String identifier,
@RequestParam(value = "limit", required = false) Integer limit) { @RequestParam(value = "limit", required = false) Integer limit) {
int l = limit != null ? limit : 10; int l = limit != null ? limit : 10;
java.util.List<Long> ids = reactionService.topPostIds(username, l); User user = userService.findByIdentifier(identifier).orElseThrow();
java.util.List<Long> ids = reactionService.topPostIds(user.getUsername(), l);
return postService.getPostsByIds(ids).stream() return postService.getPostsByIds(ids).stream()
.map(this::toMetaDto) .map(this::toMetaDto)
.collect(java.util.stream.Collectors.toList()); .collect(java.util.stream.Collectors.toList());
} }
@GetMapping("/{username}/hot-replies") @GetMapping("/{identifier}/hot-replies")
public java.util.List<CommentInfoDto> hotReplies(@PathVariable String username, public java.util.List<CommentInfoDto> hotReplies(@PathVariable("identifier") String identifier,
@RequestParam(value = "limit", required = false) Integer limit) { @RequestParam(value = "limit", required = false) Integer limit) {
int l = limit != null ? limit : 10; int l = limit != null ? limit : 10;
java.util.List<Long> ids = reactionService.topCommentIds(username, l); User user = userService.findByIdentifier(identifier).orElseThrow();
java.util.List<Long> ids = reactionService.topCommentIds(user.getUsername(), l);
return commentService.getCommentsByIds(ids).stream() return commentService.getCommentsByIds(ids).stream()
.map(this::toCommentInfoDto) .map(this::toCommentInfoDto)
.collect(java.util.stream.Collectors.toList()); .collect(java.util.stream.Collectors.toList());
} }
@GetMapping("/{username}/following") @GetMapping("/{identifier}/following")
public java.util.List<UserDto> following(@PathVariable String username) { public java.util.List<UserDto> following(@PathVariable("identifier") String identifier) {
return subscriptionService.getSubscribedUsers(username).stream() User user = userService.findByIdentifier(identifier).orElseThrow();
return subscriptionService.getSubscribedUsers(user.getUsername()).stream()
.map(this::toDto) .map(this::toDto)
.collect(java.util.stream.Collectors.toList()); .collect(java.util.stream.Collectors.toList());
} }
@GetMapping("/{username}/followers") @GetMapping("/{identifier}/followers")
public java.util.List<UserDto> followers(@PathVariable String username) { public java.util.List<UserDto> followers(@PathVariable("identifier") String identifier) {
return subscriptionService.getSubscribers(username).stream() User user = userService.findByIdentifier(identifier).orElseThrow();
return subscriptionService.getSubscribers(user.getUsername()).stream()
.map(this::toDto) .map(this::toDto)
.collect(java.util.stream.Collectors.toList()); .collect(java.util.stream.Collectors.toList());
} }
@GetMapping("/{username}/all") @GetMapping("/{identifier}/all")
public ResponseEntity<UserAggregateDto> userAggregate(@PathVariable String username, public ResponseEntity<UserAggregateDto> userAggregate(@PathVariable("identifier") String identifier,
@RequestParam(value = "postsLimit", required = false) Integer postsLimit, @RequestParam(value = "postsLimit", required = false) Integer postsLimit,
@RequestParam(value = "repliesLimit", required = false) Integer repliesLimit) { @RequestParam(value = "repliesLimit", required = false) Integer repliesLimit) {
User user = userService.findByUsername(username).orElseThrow(); User user = userService.findByIdentifier(identifier).orElseThrow();
int pLimit = postsLimit != null ? postsLimit : defaultPostsLimit; int pLimit = postsLimit != null ? postsLimit : defaultPostsLimit;
int rLimit = repliesLimit != null ? repliesLimit : defaultRepliesLimit; int rLimit = repliesLimit != null ? repliesLimit : defaultRepliesLimit;
java.util.List<PostMetaDto> posts = postService.getRecentPostsByUser(username, pLimit).stream() java.util.List<PostMetaDto> posts = postService.getRecentPostsByUser(user.getUsername(), pLimit).stream()
.map(this::toMetaDto) .map(this::toMetaDto)
.collect(java.util.stream.Collectors.toList()); .collect(java.util.stream.Collectors.toList());
java.util.List<CommentInfoDto> replies = commentService.getRecentCommentsByUser(username, rLimit).stream() java.util.List<CommentInfoDto> replies = commentService.getRecentCommentsByUser(user.getUsername(), rLimit).stream()
.map(this::toCommentInfoDto) .map(this::toCommentInfoDto)
.collect(java.util.stream.Collectors.toList()); .collect(java.util.stream.Collectors.toList());
UserAggregateDto dto = new UserAggregateDto(); UserAggregateDto dto = new UserAggregateDto();
src/main/java/com/openisle/service/UserService.java
+11
View File
@@ -91,6 +91,17 @@ public class UserService {
return userRepository.findByUsername(username); return userRepository.findByUsername(username);
} }
public Optional<User> findById(Long id) {
return userRepository.findById(id);
}
public Optional<User> findByIdentifier(String identifier) {
if (identifier.matches("\\d+")) {
return userRepository.findById(Long.parseLong(identifier));
}
return userRepository.findByUsername(identifier);
}
public User updateAvatar(String username, String avatarUrl) { public User updateAvatar(String username, String avatarUrl) {
User user = userRepository.findByUsername(username) User user = userRepository.findByUsername(username)
.orElseThrow(() -> new IllegalArgumentException("User not found")); .orElseThrow(() -> new IllegalArgumentException("User not found"));