jiazhizhong/OpenIsle
1
0
Fork 0
mirror of https://github.com/nagisa77/OpenIsle.git synced 2026-02-24 15:10:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: add paginated tag loading

Browse Source
This commit is contained in:
Tim
2025-09-12 17:54:28 +08:00
parent c3758cafe8
commit 5e6c8a5e87
7 changed files with 125 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
backend/src/main/java/com/openisle/controller/TagController.java
View File

@@ -80,7 +80,18 @@ public class TagController {
@ApiResponse(responseCode = "200", description = "List of tags",
content = @Content(array = @ArraySchema(schema = @Schema(implementation = TagDto.class))))
public List<TagDto> list(@RequestParam(value = "keyword", required = false) String keyword,
@RequestParam(value = "limit", required = false) Integer limit) {
@RequestParam(value = "limit", required = false) Integer limit,
@RequestParam(value = "page", required = false) Integer page,
@RequestParam(value = "pageSize", required = false) Integer pageSize) {
if (page != null && pageSize != null) {
var tagPage = tagService.searchTags(keyword, page, pageSize);
List<Tag> tags = tagPage.getContent();
List<Long> tagIds = tags.stream().map(Tag::getId).toList();
Map<Long, Long> postCntByTagIds = postService.countPostsByTagIds(tagIds);
return tags.stream()
.map(t -> tagMapper.toDto(t, postCntByTagIds.getOrDefault(t.getId(), 0L)))
.collect(Collectors.toList());
}
List<Tag> tags = tagService.searchTags(keyword);
List<Long> tagIds = tags.stream().map(Tag::getId).toList();
Map<Long, Long> postCntByTagIds = postService.countPostsByTagIds(tagIds);

4
backend/src/main/java/com/openisle/repository/TagRepository.java
View File

@@ -3,6 +3,7 @@ package com.openisle.repository;
import com.openisle.model.Tag;
import com.openisle.model.User;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import java.util.List;
@@ -14,6 +15,9 @@ public interface TagRepository extends JpaRepository<Tag, Long> {
List<Tag> findByApprovedTrue();
List<Tag> findByNameContainingIgnoreCaseAndApprovedTrue(String keyword);
Page<Tag> findByApprovedTrue(Pageable pageable);
Page<Tag> findByNameContainingIgnoreCaseAndApprovedTrue(String keyword, Pageable pageable);
List<Tag> findByCreatorOrderByCreatedAtDesc(User creator, Pageable pageable);
List<Tag> findByCreator(User creator);

8
backend/src/main/java/com/openisle/service/TagService.java
View File

@@ -108,6 +108,14 @@ public class TagService {
return tagRepository.findByNameContainingIgnoreCaseAndApprovedTrue(keyword);
}
public org.springframework.data.domain.Page<Tag> searchTags(String keyword, int page, int pageSize) {
Pageable pageable = PageRequest.of(page, pageSize);
if (keyword == null || keyword.isBlank()) {
return tagRepository.findByApprovedTrue(pageable);
}
return tagRepository.findByNameContainingIgnoreCaseAndApprovedTrue(keyword, pageable);
}
public List<Tag> getRecentTagsByUser(String username, int limit) {
User user = userRepository.findByUsername(username)
.orElseThrow(() -> new com.openisle.exception.NotFoundException("User not found"));

17
backend/src/test/java/com/openisle/controller/TagControllerTest.java
View File

@@ -18,6 +18,8 @@ import org.springframework.test.web.servlet.MockMvc;
import java.util.List;
import org.springframework.data.domain.PageImpl;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.isNull;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
@@ -86,6 +88,21 @@ class TagControllerTest {
.andExpect(jsonPath("$[0].smallIcon").value("s2"));
}
@Test
void listTagsWithPagination() throws Exception {
Tag t = new Tag();
t.setId(4L);
t.setName("tag4");
t.setDescription("d4");
t.setIcon("i4");
t.setSmallIcon("s4");
Mockito.when(tagService.searchTags(null, 0, 1)).thenReturn(new PageImpl<>(List.of(t)));
mockMvc.perform(get("/api/tags?page=0&pageSize=1"))
.andExpect(status().isOk())
.andExpect(jsonPath("$[0].name").value("tag4"));
}
@Test
void updateTag() throws Exception {
Tag t = new Tag();