Merge pull request #28 from nagisa77/codex/update-usercontroller-for-user-data-retrieval

Add user posts and replies endpoints

src/main/java/com/openisle/controller/UserController.java

@@ -3,6 +3,8 @@ package com.openisle.controller;
 import com.openisle.model.User;
 import com.openisle.service.ImageUploader;
 import com.openisle.service.UserService;
+import com.openisle.service.PostService;
+import com.openisle.service.CommentService;
 import org.springframework.beans.factory.annotation.Value;
 import lombok.Data;
 import lombok.RequiredArgsConstructor;
@@ -20,6 +22,8 @@ import java.util.Map;
 public class UserController {
     private final UserService userService;
     private final ImageUploader imageUploader;
+    private final PostService postService;
+    private final CommentService commentService;
 
     @Value("${app.upload.check-type:true}")
     private boolean checkImageType;
@@ -27,6 +31,12 @@ public class UserController {
     @Value("${app.upload.max-size:5242880}")
     private long maxUploadSize;
 
+    @Value("${app.user.posts-limit:10}")
+    private int defaultPostsLimit;
+
+    @Value("${app.user.replies-limit:50}")
+    private int defaultRepliesLimit;
+
     @GetMapping("/me")
     public ResponseEntity<UserDto> me(Authentication auth) {
         User user = userService.findByUsername(auth.getName()).orElseThrow();
@@ -52,6 +62,30 @@ public class UserController {
         return ResponseEntity.ok(Map.of("url", url));
     }
 
+    @GetMapping("/{username}")
+    public ResponseEntity<UserDto> getUser(@PathVariable String username) {
+        User user = userService.findByUsername(username).orElseThrow();
+        return ResponseEntity.ok(toDto(user));
+    }
+
+    @GetMapping("/{username}/posts")
+    public java.util.List<PostMetaDto> userPosts(@PathVariable String username,
+                                                 @RequestParam(value = "limit", required = false) Integer limit) {
+        int l = limit != null ? limit : defaultPostsLimit;
+        return postService.getRecentPostsByUser(username, l).stream()
+                .map(this::toMetaDto)
+                .collect(java.util.stream.Collectors.toList());
+    }
+
+    @GetMapping("/{username}/replies")
+    public java.util.List<CommentInfoDto> userReplies(@PathVariable String username,
+                                                      @RequestParam(value = "limit", required = false) Integer limit) {
+        int l = limit != null ? limit : defaultRepliesLimit;
+        return commentService.getRecentCommentsByUser(username, l).stream()
+                .map(this::toCommentInfoDto)
+                .collect(java.util.stream.Collectors.toList());
+    }
+
     private UserDto toDto(User user) {
         UserDto dto = new UserDto();
         dto.setId(user.getId());
@@ -61,6 +95,25 @@ public class UserController {
         return dto;
     }
 
+    private PostMetaDto toMetaDto(com.openisle.model.Post post) {
+        PostMetaDto dto = new PostMetaDto();
+        dto.setId(post.getId());
+        dto.setTitle(post.getTitle());
+        dto.setCreatedAt(post.getCreatedAt());
+        dto.setCategory(post.getCategory().getName());
+        dto.setViews(post.getViews());
+        return dto;
+    }
+
+    private CommentInfoDto toCommentInfoDto(com.openisle.model.Comment comment) {
+        CommentInfoDto dto = new CommentInfoDto();
+        dto.setId(comment.getId());
+        dto.setContent(comment.getContent());
+        dto.setCreatedAt(comment.getCreatedAt());
+        dto.setPostId(comment.getPost().getId());
+        return dto;
+    }
+
     @Data
     private static class UserDto {
         private Long id;
@@ -68,4 +121,21 @@ public class UserController {
         private String email;
         private String avatar;
     }
+
+    @Data
+    private static class PostMetaDto {
+        private Long id;
+        private String title;
+        private java.time.LocalDateTime createdAt;
+        private String category;
+        private long views;
+    }
+
+    @Data
+    private static class CommentInfoDto {
+        private Long id;
+        private String content;
+        private java.time.LocalDateTime createdAt;
+        private Long postId;
+    }
 }

src/main/java/com/openisle/repository/CommentRepository.java

@@ -2,11 +2,14 @@ package com.openisle.repository;
 
 import com.openisle.model.Comment;
 import com.openisle.model.Post;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
+import com.openisle.model.User;
 
 import java.util.List;
 
 public interface CommentRepository extends JpaRepository<Comment, Long> {
     List<Comment> findByPostAndParentIsNullOrderByCreatedAtAsc(Post post);
     List<Comment> findByParentOrderByCreatedAtAsc(Comment parent);
+    List<Comment> findByAuthorOrderByCreatedAtDesc(User author, Pageable pageable);
 }

src/main/java/com/openisle/repository/PostRepository.java

@@ -2,10 +2,13 @@ package com.openisle.repository;
 
 import com.openisle.model.Post;
 import com.openisle.model.PostStatus;
+import com.openisle.model.User;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;
 
 public interface PostRepository extends JpaRepository<Post, Long> {
     List<Post> findByStatus(PostStatus status);
+    List<Post> findByAuthorAndStatusOrderByCreatedAtDesc(User author, PostStatus status, Pageable pageable);
 }

src/main/java/com/openisle/service/CommentService.java

@@ -10,6 +10,8 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
 
 @Service
 @RequiredArgsConstructor
@@ -54,4 +56,11 @@ public class CommentService {
                 .orElseThrow(() -> new IllegalArgumentException("Comment not found"));
         return commentRepository.findByParentOrderByCreatedAtAsc(parent);
     }
+
+    public List<Comment> getRecentCommentsByUser(String username, int limit) {
+        User user = userRepository.findByUsername(username)
+                .orElseThrow(() -> new IllegalArgumentException("User not found"));
+        Pageable pageable = PageRequest.of(0, limit);
+        return commentRepository.findByAuthorOrderByCreatedAtDesc(user, pageable);
+    }
 }

src/main/java/com/openisle/service/PostService.java

@@ -12,6 +12,8 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
 
 @Service
 public class PostService {
@@ -59,6 +61,13 @@ public class PostService {
         return postRepository.findByStatus(PostStatus.PUBLISHED);
     }
 
+    public List<Post> getRecentPostsByUser(String username, int limit) {
+        User user = userRepository.findByUsername(username)
+                .orElseThrow(() -> new IllegalArgumentException("User not found"));
+        Pageable pageable = PageRequest.of(0, limit);
+        return postRepository.findByAuthorAndStatusOrderByCreatedAtDesc(user, PostStatus.PUBLISHED, pageable);
+    }
+
     public List<Post> listPendingPosts() {
         return postRepository.findByStatus(PostStatus.PENDING);
     }

src/main/resources/application.properties

@@ -15,6 +15,10 @@ app.post.publish-mode=${POST_PUBLISH_MODE:DIRECT}
 app.upload.check-type=${UPLOAD_CHECK_TYPE:true}
 app.upload.max-size=${UPLOAD_MAX_SIZE:5242880}
 
+# Default list size for user posts and replies
+app.user.posts-limit=${USER_POSTS_LIMIT:10}
+app.user.replies-limit=${USER_REPLIES_LIMIT:50}
+
 # ========= Optional =========
 # for resend email send service, you can improve your service by yourself
 resend.api.key=${RESEND_API_KEY:}
@@ -27,4 +31,3 @@ cos.secret-key=${COS_SECRET_KEY:}
 cos.region=${COS_REGION:ap-guangzhou}
 cos.bucket-name=${COS_BUCKET_NAME:}
 # your image upload services: ...
-

src/test/java/com/openisle/controller/UserControllerTest.java

@@ -3,6 +3,8 @@ package com.openisle.controller;
 import com.openisle.model.User;
 import com.openisle.service.ImageUploader;
 import com.openisle.service.UserService;
+import com.openisle.service.PostService;
+import com.openisle.service.CommentService;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,6 +33,10 @@ class UserControllerTest {
     private UserService userService;
     @MockBean
     private ImageUploader imageUploader;
+    @MockBean
+    private PostService postService;
+    @MockBean
+    private CommentService commentService;
 
     @Test
     void getCurrentUser() throws Exception {
@@ -69,4 +75,54 @@ class UserControllerTest {
         Mockito.verify(imageUploader, Mockito.never()).upload(any(), any());
     }
 
+    @Test
+    void getUserByName() throws Exception {
+        User u = new User();
+        u.setId(2L);
+        u.setUsername("bob");
+        Mockito.when(userService.findByUsername("bob")).thenReturn(Optional.of(u));
+
+        mockMvc.perform(get("/api/users/bob"))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.id").value(2));
+    }
+
+    @Test
+    void listUserPosts() throws Exception {
+        User user = new User();
+        user.setUsername("bob");
+        com.openisle.model.Category cat = new com.openisle.model.Category();
+        cat.setName("tech");
+        com.openisle.model.Post post = new com.openisle.model.Post();
+        post.setId(3L);
+        post.setTitle("hello");
+        post.setCreatedAt(java.time.LocalDateTime.now());
+        post.setCategory(cat);
+        post.setAuthor(user);
+        Mockito.when(postService.getRecentPostsByUser("bob", 10)).thenReturn(java.util.List.of(post));
+
+        mockMvc.perform(get("/api/users/bob/posts"))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$[0].title").value("hello"));
+    }
+
+    @Test
+    void listUserReplies() throws Exception {
+        User user = new User();
+        user.setUsername("bob");
+        com.openisle.model.Post post = new com.openisle.model.Post();
+        post.setId(5L);
+        com.openisle.model.Comment comment = new com.openisle.model.Comment();
+        comment.setId(4L);
+        comment.setContent("hi");
+        comment.setCreatedAt(java.time.LocalDateTime.now());
+        comment.setAuthor(user);
+        comment.setPost(post);
+        Mockito.when(commentService.getRecentCommentsByUser("bob", 50)).thenReturn(java.util.List.of(comment));
+
+        mockMvc.perform(get("/api/users/bob/replies"))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$[0].id").value(4));
+    }
+
 }