mirror of
https://github.com/nagisa77/OpenIsle.git
synced 2026-02-23 14:40:49 +08:00
Add category module and require post category
This commit is contained in:
@@ -2,6 +2,7 @@ package com.openisle.controller;
|
||||
|
||||
import com.openisle.model.Post;
|
||||
import com.openisle.model.User;
|
||||
import com.openisle.model.Category;
|
||||
import com.openisle.service.PostService;
|
||||
import com.openisle.service.CommentService;
|
||||
import com.openisle.service.ReactionService;
|
||||
@@ -41,18 +42,22 @@ class PostControllerTest {
|
||||
void createAndGetPost() throws Exception {
|
||||
User user = new User();
|
||||
user.setUsername("alice");
|
||||
Category cat = new Category();
|
||||
cat.setId(1L);
|
||||
cat.setName("tech");
|
||||
Post post = new Post();
|
||||
post.setId(1L);
|
||||
post.setTitle("t");
|
||||
post.setContent("c");
|
||||
post.setCreatedAt(LocalDateTime.now());
|
||||
post.setAuthor(user);
|
||||
Mockito.when(postService.createPost(eq("alice"), eq("t"), eq("c"))).thenReturn(post);
|
||||
post.setCategory(cat);
|
||||
Mockito.when(postService.createPost(eq("alice"), eq(1L), eq("t"), eq("c"))).thenReturn(post);
|
||||
Mockito.when(postService.getPost(1L)).thenReturn(post);
|
||||
|
||||
mockMvc.perform(post("/api/posts")
|
||||
.contentType("application/json")
|
||||
.content("{\"title\":\"t\",\"content\":\"c\"}")
|
||||
.content("{\"title\":\"t\",\"content\":\"c\",\"categoryId\":1}")
|
||||
.principal(new UsernamePasswordAuthenticationToken("alice", "p")))
|
||||
.andExpect(status().isOk())
|
||||
.andExpect(jsonPath("$.title").value("t"));
|
||||
@@ -66,12 +71,16 @@ class PostControllerTest {
|
||||
void listPosts() throws Exception {
|
||||
User user = new User();
|
||||
user.setUsername("bob");
|
||||
Category cat = new Category();
|
||||
cat.setId(1L);
|
||||
cat.setName("tech");
|
||||
Post post = new Post();
|
||||
post.setId(2L);
|
||||
post.setTitle("hello");
|
||||
post.setContent("world");
|
||||
post.setCreatedAt(LocalDateTime.now());
|
||||
post.setAuthor(user);
|
||||
post.setCategory(cat);
|
||||
Mockito.when(postService.listPosts()).thenReturn(List.of(post));
|
||||
|
||||
mockMvc.perform(get("/api/posts"))
|
||||
|
||||
@@ -1,7 +1,9 @@
|
||||
package com.openisle.integration;
|
||||
|
||||
import com.openisle.model.User;
|
||||
import com.openisle.model.Category;
|
||||
import com.openisle.repository.UserRepository;
|
||||
import com.openisle.repository.CategoryRepository;
|
||||
import com.openisle.service.EmailService;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
@@ -24,6 +26,9 @@ class ComplexFlowIntegrationTest {
|
||||
@Autowired
|
||||
private UserRepository users;
|
||||
|
||||
@Autowired
|
||||
private CategoryRepository categories;
|
||||
|
||||
@MockBean
|
||||
private EmailService emailService;
|
||||
|
||||
@@ -52,8 +57,12 @@ class ComplexFlowIntegrationTest {
|
||||
String t1 = registerAndLogin("alice", "a@example.com");
|
||||
String t2 = registerAndLogin("bob", "b@example.com");
|
||||
|
||||
Category cat = new Category();
|
||||
cat.setName("general");
|
||||
cat = categories.save(cat);
|
||||
|
||||
ResponseEntity<Map> postResp = postJson("/api/posts",
|
||||
Map.of("title", "Hello", "content", "World"), t1);
|
||||
Map.of("title", "Hello", "content", "World", "categoryId", cat.getId()), t1);
|
||||
Long postId = ((Number)postResp.getBody().get("id")).longValue();
|
||||
|
||||
ResponseEntity<Map> c1Resp = postJson("/api/posts/" + postId + "/comments",
|
||||
@@ -87,8 +96,12 @@ class ComplexFlowIntegrationTest {
|
||||
String t1 = registerAndLogin("carol", "c@example.com");
|
||||
String t2 = registerAndLogin("dave", "d@example.com");
|
||||
|
||||
Category cat = new Category();
|
||||
cat.setName("general");
|
||||
cat = categories.save(cat);
|
||||
|
||||
ResponseEntity<Map> postResp = postJson("/api/posts",
|
||||
Map.of("title", "React", "content", "Test"), t1);
|
||||
Map.of("title", "React", "content", "Test", "categoryId", cat.getId()), t1);
|
||||
Long postId = ((Number)postResp.getBody().get("id")).longValue();
|
||||
|
||||
postJson("/api/posts/" + postId + "/reactions",
|
||||
|
||||
Reference in New Issue
Block a user