mirror of
https://github.com/nagisa77/OpenIsle.git
synced 2026-02-11 09:30:56 +08:00
Compare commits
25 Commits
codex/upda
...
codex/add-
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f22ca9cdcd | ||
|
|
d26b96ebd1 | ||
|
|
13cc981421 | ||
|
|
efc8589ca0 | ||
|
|
940690889c | ||
|
|
d46420ef81 | ||
|
|
b36b5b59dc | ||
|
|
cf96806f80 | ||
|
|
3d0d0496b6 | ||
|
|
f67e220894 | ||
|
|
9306e35b84 | ||
|
|
d2268a1944 | ||
|
|
6baa4d4233 | ||
|
|
ef9d90455f | ||
|
|
5d499956d7 | ||
|
|
9101ed336c | ||
|
|
28e3ebb911 | ||
|
|
e93e33fe43 | ||
|
|
0ebeccf21e | ||
|
|
89842b82e9 | ||
|
|
58594229f2 | ||
|
|
b4a811ff4e | ||
|
|
7067630bcc | ||
|
|
b28e8d4bc9 | ||
|
|
1a21ba8935 |
3
backend/.prettierrc
Normal file
3
backend/.prettierrc
Normal file
@@ -0,0 +1,3 @@
|
||||
{
|
||||
"plugins": ["prettier-plugin-java"]
|
||||
}
|
||||
@@ -97,8 +97,10 @@ public class CachingConfig {
|
||||
// 个别缓存单独设置 TTL 时间
|
||||
Map<String, RedisCacheConfiguration> cacheConfigs = new HashMap<>();
|
||||
RedisCacheConfiguration oneHourConfig = config.entryTtl(Duration.ofHours(1));
|
||||
RedisCacheConfiguration tenMinutesConfig = config.entryTtl(Duration.ofMinutes(10));
|
||||
cacheConfigs.put(TAG_CACHE_NAME, oneHourConfig);
|
||||
cacheConfigs.put(CATEGORY_CACHE_NAME, oneHourConfig);
|
||||
cacheConfigs.put(POST_CACHE_NAME, tenMinutesConfig);
|
||||
|
||||
return RedisCacheManager.builder(connectionFactory)
|
||||
.cacheDefaults(config)
|
||||
|
||||
@@ -67,7 +67,6 @@ public class PostMapper {
|
||||
dto.setCategory(categoryMapper.toDto(post.getCategory()));
|
||||
dto.setTags(post.getTags().stream().map(tagMapper::toDto).collect(Collectors.toList()));
|
||||
dto.setViews(post.getViews());
|
||||
dto.setCommentCount(commentService.countComments(post.getId()));
|
||||
dto.setStatus(post.getStatus());
|
||||
dto.setPinnedAt(post.getPinnedAt());
|
||||
dto.setRssExcluded(post.getRssExcluded() == null || post.getRssExcluded());
|
||||
@@ -82,8 +81,12 @@ public class PostMapper {
|
||||
List<User> participants = commentService.getParticipants(post.getId(), 5);
|
||||
dto.setParticipants(participants.stream().map(userMapper::toAuthorDto).collect(Collectors.toList()));
|
||||
|
||||
LocalDateTime last = commentService.getLastCommentTime(post.getId());
|
||||
dto.setLastReplyAt(last != null ? last : post.getCreatedAt());
|
||||
LocalDateTime last = post.getLastReplyAt();
|
||||
if (last == null) {
|
||||
commentService.updatePostCommentStats(post);
|
||||
}
|
||||
dto.setCommentCount(post.getCommentCount());
|
||||
dto.setLastReplyAt(post.getLastReplyAt());
|
||||
dto.setReward(0);
|
||||
dto.setSubscribed(false);
|
||||
dto.setType(post.getType());
|
||||
|
||||
@@ -72,4 +72,10 @@ public class Post {
|
||||
|
||||
@Column(nullable = true)
|
||||
private Boolean rssExcluded = true;
|
||||
|
||||
@Column(nullable = false)
|
||||
private long commentCount = 0;
|
||||
|
||||
@Column(nullable = true)
|
||||
private LocalDateTime lastReplyAt;
|
||||
}
|
||||
|
||||
@@ -1,8 +1,9 @@
|
||||
package com.openisle.repository;
|
||||
|
||||
import com.openisle.model.PointHistory;
|
||||
import com.openisle.model.User;
|
||||
import com.openisle.model.Comment;
|
||||
import com.openisle.model.PointHistory;
|
||||
import com.openisle.model.Post;
|
||||
import com.openisle.model.User;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
@@ -14,6 +15,8 @@ public interface PointHistoryRepository extends JpaRepository<PointHistory, Long
|
||||
long countByUser(User user);
|
||||
|
||||
List<PointHistory> findByUserAndCreatedAtAfterOrderByCreatedAtDesc(User user, LocalDateTime createdAt);
|
||||
|
||||
|
||||
List<PointHistory> findByComment(Comment comment);
|
||||
|
||||
List<PointHistory> findByPost(Post post);
|
||||
}
|
||||
|
||||
@@ -8,4 +8,6 @@ import java.util.List;
|
||||
|
||||
public interface PostChangeLogRepository extends JpaRepository<PostChangeLog, Long> {
|
||||
List<PostChangeLog> findByPostOrderByCreatedAtAsc(Post post);
|
||||
|
||||
void deleteByPost(Post post);
|
||||
}
|
||||
|
||||
@@ -76,6 +76,10 @@ public class CommentService {
|
||||
comment.setContent(content);
|
||||
comment = commentRepository.save(comment);
|
||||
log.debug("Comment {} saved for post {}", comment.getId(), postId);
|
||||
|
||||
// Update post comment statistics
|
||||
updatePostCommentStats(post);
|
||||
|
||||
imageUploader.addReferences(imageUploader.extractUrls(content));
|
||||
if (!author.getId().equals(post.getAuthor().getId())) {
|
||||
notificationService.createNotification(post.getAuthor(), NotificationType.COMMENT_REPLY, post, comment,
|
||||
@@ -129,6 +133,10 @@ public class CommentService {
|
||||
comment.setContent(content);
|
||||
comment = commentRepository.save(comment);
|
||||
log.debug("Reply {} saved for parent {}", comment.getId(), parentId);
|
||||
|
||||
// Update post comment statistics
|
||||
updatePostCommentStats(parent.getPost());
|
||||
|
||||
imageUploader.addReferences(imageUploader.extractUrls(content));
|
||||
if (!author.getId().equals(parent.getAuthor().getId())) {
|
||||
notificationService.createNotification(parent.getAuthor(), NotificationType.COMMENT_REPLY, parent.getPost(),
|
||||
@@ -282,9 +290,13 @@ public class CommentService {
|
||||
imageUploader.removeReferences(imageUploader.extractUrls(comment.getContent()));
|
||||
|
||||
// 逻辑删除评论
|
||||
Post post = comment.getPost();
|
||||
commentRepository.delete(comment);
|
||||
// 删除积分历史
|
||||
pointHistoryRepository.deleteAll(pointHistories);
|
||||
|
||||
// Update post comment statistics
|
||||
updatePostCommentStats(post);
|
||||
|
||||
// 重新计算受影响用户的积分
|
||||
if (!usersToRecalculate.isEmpty()) {
|
||||
@@ -330,4 +342,23 @@ public class CommentService {
|
||||
int replies = commentRepository.findByParentOrderByCreatedAtAsc(comment).size();
|
||||
return reactions + replies;
|
||||
}
|
||||
|
||||
/**
|
||||
* Update post comment statistics (comment count and last reply time)
|
||||
*/
|
||||
public void updatePostCommentStats(Post post) {
|
||||
long commentCount = commentRepository.countByPostId(post.getId());
|
||||
post.setCommentCount(commentCount);
|
||||
|
||||
LocalDateTime lastReplyAt = commentRepository.findLastCommentTime(post);
|
||||
if (lastReplyAt == null) {
|
||||
post.setLastReplyAt(post.getCreatedAt());
|
||||
} else {
|
||||
post.setLastReplyAt(lastReplyAt);
|
||||
}
|
||||
postRepository.save(post);
|
||||
|
||||
log.debug("Updated post {} stats: commentCount={}, lastReplyAt={}",
|
||||
post.getId(), commentCount, lastReplyAt);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -109,6 +109,10 @@ public class PostChangeLogService {
|
||||
logRepository.save(log);
|
||||
}
|
||||
|
||||
public void deleteLogsForPost(Post post) {
|
||||
logRepository.deleteByPost(post);
|
||||
}
|
||||
|
||||
public List<PostChangeLog> listLogs(Long postId) {
|
||||
Post post = postRepository.findById(postId)
|
||||
.orElseThrow(() -> new com.openisle.exception.NotFoundException("Post not found"));
|
||||
|
||||
@@ -9,14 +9,12 @@ import com.openisle.repository.PollPostRepository;
|
||||
import com.openisle.repository.UserRepository;
|
||||
import com.openisle.repository.CategoryRepository;
|
||||
import com.openisle.repository.TagRepository;
|
||||
import com.openisle.service.SubscriptionService;
|
||||
import com.openisle.service.CommentService;
|
||||
import com.openisle.service.PostChangeLogService;
|
||||
import com.openisle.repository.CommentRepository;
|
||||
import com.openisle.repository.ReactionRepository;
|
||||
import com.openisle.repository.PostSubscriptionRepository;
|
||||
import com.openisle.repository.NotificationRepository;
|
||||
import com.openisle.repository.PollVoteRepository;
|
||||
import com.openisle.repository.PointHistoryRepository;
|
||||
import com.openisle.exception.RateLimitException;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
@@ -74,6 +72,7 @@ public class PostService {
|
||||
private final ApplicationContext applicationContext;
|
||||
private final PointService pointService;
|
||||
private final PostChangeLogService postChangeLogService;
|
||||
private final PointHistoryRepository pointHistoryRepository;
|
||||
private final ConcurrentMap<Long, ScheduledFuture<?>> scheduledFinalizations = new ConcurrentHashMap<>();
|
||||
@Value("${app.website-url:https://www.open-isle.com}")
|
||||
private String websiteUrl;
|
||||
@@ -102,6 +101,7 @@ public class PostService {
|
||||
ApplicationContext applicationContext,
|
||||
PointService pointService,
|
||||
PostChangeLogService postChangeLogService,
|
||||
PointHistoryRepository pointHistoryRepository,
|
||||
@Value("${app.post.publish-mode:DIRECT}") PublishMode publishMode,
|
||||
RedisTemplate redisTemplate) {
|
||||
this.postRepository = postRepository;
|
||||
@@ -125,6 +125,7 @@ public class PostService {
|
||||
this.applicationContext = applicationContext;
|
||||
this.pointService = pointService;
|
||||
this.postChangeLogService = postChangeLogService;
|
||||
this.pointHistoryRepository = pointHistoryRepository;
|
||||
this.publishMode = publishMode;
|
||||
|
||||
this.redisTemplate = redisTemplate;
|
||||
@@ -190,7 +191,7 @@ public class PostService {
|
||||
return saved;
|
||||
}
|
||||
@CacheEvict(
|
||||
value = CachingConfig.POST_CACHE_NAME, allEntries = true
|
||||
value = CachingConfig.POST_CACHE_NAME, allEntries = true
|
||||
)
|
||||
public Post createPost(String username,
|
||||
Long categoryId,
|
||||
@@ -861,6 +862,25 @@ public class PostService {
|
||||
notificationRepository.deleteAll(notificationRepository.findByPost(post));
|
||||
postReadService.deleteByPost(post);
|
||||
imageUploader.removeReferences(imageUploader.extractUrls(post.getContent()));
|
||||
List<PointHistory> pointHistories = pointHistoryRepository.findByPost(post);
|
||||
Set<User> usersToRecalculate = pointHistories.stream()
|
||||
.map(PointHistory::getUser)
|
||||
.collect(Collectors.toSet());
|
||||
if (!pointHistories.isEmpty()) {
|
||||
LocalDateTime deletedAt = LocalDateTime.now();
|
||||
for (PointHistory history : pointHistories) {
|
||||
history.setDeletedAt(deletedAt);
|
||||
history.setPost(null);
|
||||
}
|
||||
pointHistoryRepository.saveAll(pointHistories);
|
||||
}
|
||||
if (!usersToRecalculate.isEmpty()) {
|
||||
for (User affected : usersToRecalculate) {
|
||||
int newPoints = pointService.recalculateUserPoints(affected);
|
||||
affected.setPoint(newPoints);
|
||||
}
|
||||
userRepository.saveAll(usersToRecalculate);
|
||||
}
|
||||
if (post instanceof LotteryPost lp) {
|
||||
ScheduledFuture<?> future = scheduledFinalizations.remove(lp.getId());
|
||||
if (future != null) {
|
||||
@@ -868,6 +888,7 @@ public class PostService {
|
||||
}
|
||||
}
|
||||
String title = post.getTitle();
|
||||
postChangeLogService.deleteLogsForPost(post);
|
||||
postRepository.delete(post);
|
||||
if (adminDeleting) {
|
||||
notificationService.createNotification(author, NotificationType.POST_DELETED,
|
||||
|
||||
@@ -100,7 +100,7 @@ public class UserService {
|
||||
* @param user
|
||||
*/
|
||||
public void sendVerifyMail(User user, VerifyType verifyType){
|
||||
//缓存验证码
|
||||
// 缓存验证码
|
||||
String code = genCode();
|
||||
String key;
|
||||
String subject;
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
-- Add comment count and last reply time fields to posts table for performance optimization
|
||||
ALTER TABLE posts ADD COLUMN comment_count BIGINT NOT NULL DEFAULT 0;
|
||||
ALTER TABLE posts ADD COLUMN last_reply_at DATETIME(6) NULL;
|
||||
|
||||
-- Add index on last_reply_at for sorting by latest reply
|
||||
CREATE INDEX idx_posts_last_reply_at ON posts(last_reply_at);
|
||||
|
||||
-- Initialize comment_count and last_reply_at with existing data
|
||||
UPDATE posts p SET
|
||||
comment_count = (
|
||||
SELECT COUNT(*)
|
||||
FROM comments c
|
||||
WHERE c.post_id = p.id AND c.deleted_at IS NULL
|
||||
),
|
||||
last_reply_at = (
|
||||
SELECT MAX(c.created_at)
|
||||
FROM comments c
|
||||
WHERE c.post_id = p.id AND c.deleted_at IS NULL
|
||||
);
|
||||
@@ -55,6 +55,10 @@ class PostControllerTest {
|
||||
private UserVisitService userVisitService;
|
||||
@MockBean
|
||||
private PostReadService postReadService;
|
||||
@MockBean
|
||||
private MedalService medalService;
|
||||
@MockBean
|
||||
private com.openisle.repository.PollVoteRepository pollVoteRepository;
|
||||
|
||||
@Test
|
||||
void createAndGetPost() throws Exception {
|
||||
@@ -63,9 +67,13 @@ class PostControllerTest {
|
||||
Category cat = new Category();
|
||||
cat.setId(1L);
|
||||
cat.setName("tech");
|
||||
cat.setDescription("Technology category");
|
||||
cat.setIcon("tech-icon");
|
||||
Tag tag = new Tag();
|
||||
tag.setId(1L);
|
||||
tag.setName("java");
|
||||
tag.setDescription("Java programming language");
|
||||
tag.setIcon("java-icon");
|
||||
Post post = new Post();
|
||||
post.setId(1L);
|
||||
post.setTitle("t");
|
||||
@@ -111,9 +119,13 @@ class PostControllerTest {
|
||||
Category cat = new Category();
|
||||
cat.setId(1L);
|
||||
cat.setName("tech");
|
||||
cat.setDescription("Technology category");
|
||||
cat.setIcon("tech-icon");
|
||||
Tag tag = new Tag();
|
||||
tag.setId(1L);
|
||||
tag.setName("java");
|
||||
tag.setDescription("Java programming language");
|
||||
tag.setIcon("java-icon");
|
||||
Post post = new Post();
|
||||
post.setId(1L);
|
||||
post.setTitle("t2");
|
||||
@@ -147,9 +159,13 @@ class PostControllerTest {
|
||||
Category cat = new Category();
|
||||
cat.setId(1L);
|
||||
cat.setName("tech");
|
||||
cat.setDescription("Technology category");
|
||||
cat.setIcon("tech-icon");
|
||||
Tag tag = new Tag();
|
||||
tag.setId(1L);
|
||||
tag.setName("java");
|
||||
tag.setDescription("Java programming language");
|
||||
tag.setIcon("java-icon");
|
||||
Post post = new Post();
|
||||
post.setId(2L);
|
||||
post.setTitle("hello");
|
||||
@@ -197,9 +213,13 @@ class PostControllerTest {
|
||||
Category cat = new Category();
|
||||
cat.setId(1L);
|
||||
cat.setName("tech");
|
||||
cat.setDescription("Technology category");
|
||||
cat.setIcon("tech-icon");
|
||||
Tag tag = new Tag();
|
||||
tag.setId(1L);
|
||||
tag.setName("java");
|
||||
tag.setDescription("Java programming language");
|
||||
tag.setIcon("java-icon");
|
||||
Post post = new Post();
|
||||
post.setId(1L);
|
||||
post.setTitle("t");
|
||||
@@ -262,6 +282,8 @@ class PostControllerTest {
|
||||
Category cat = new Category();
|
||||
cat.setId(1L);
|
||||
cat.setName("tech");
|
||||
cat.setDescription("Technology category");
|
||||
cat.setIcon("tech-icon");
|
||||
Post post = new Post();
|
||||
post.setId(1L);
|
||||
post.setTitle("t");
|
||||
|
||||
@@ -0,0 +1,90 @@
|
||||
package com.openisle.service;
|
||||
|
||||
import com.openisle.model.*;
|
||||
import com.openisle.repository.*;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.boot.test.context.SpringBootTest;
|
||||
import org.springframework.test.context.TestPropertySource;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.*;
|
||||
|
||||
@SpringBootTest
|
||||
@TestPropertySource(locations = "classpath:application.properties")
|
||||
@Transactional
|
||||
public class PostCommentStatsTest {
|
||||
|
||||
@Autowired
|
||||
private PostRepository postRepository;
|
||||
|
||||
@Autowired
|
||||
private UserRepository userRepository;
|
||||
|
||||
@Autowired
|
||||
private CategoryRepository categoryRepository;
|
||||
|
||||
@Autowired
|
||||
private TagRepository tagRepository;
|
||||
|
||||
@Autowired
|
||||
private CommentService commentService;
|
||||
|
||||
@Test
|
||||
public void testPostCommentStatsUpdate() {
|
||||
// Create test user
|
||||
User user = new User();
|
||||
user.setUsername("testuser");
|
||||
user.setEmail("test@example.com");
|
||||
user.setPassword("hash");
|
||||
user = userRepository.save(user);
|
||||
|
||||
// Create test category
|
||||
Category category = new Category();
|
||||
category.setName("Test Category");
|
||||
category.setDescription("Test Category Description");
|
||||
category.setIcon("test-icon");
|
||||
category = categoryRepository.save(category);
|
||||
|
||||
// Create test tag
|
||||
Tag tag = new Tag();
|
||||
tag.setName("Test Tag");
|
||||
tag.setDescription("Test Tag Description");
|
||||
tag.setIcon("test-tag-icon");
|
||||
tag = tagRepository.save(tag);
|
||||
|
||||
// Create test post
|
||||
Post post = new Post();
|
||||
post.setTitle("Test Post");
|
||||
post.setContent("Test content");
|
||||
post.setAuthor(user);
|
||||
post.setCategory(category);
|
||||
post.getTags().add(tag);
|
||||
post.setStatus(PostStatus.PUBLISHED);
|
||||
post.setCommentCount(0L);
|
||||
post = postRepository.save(post);
|
||||
|
||||
// Verify initial state
|
||||
assertEquals(0L, post.getCommentCount());
|
||||
assertNull(post.getLastReplyAt());
|
||||
|
||||
// Add a comment
|
||||
commentService.addComment("testuser", post.getId(), "Test comment");
|
||||
|
||||
// Refresh post from database
|
||||
post = postRepository.findById(post.getId()).orElseThrow();
|
||||
|
||||
// Verify comment count and last reply time are updated
|
||||
assertEquals(1L, post.getCommentCount());
|
||||
assertNotNull(post.getLastReplyAt());
|
||||
|
||||
// Add another comment
|
||||
commentService.addComment("testuser", post.getId(), "Another comment");
|
||||
|
||||
// Refresh post again
|
||||
post = postRepository.findById(post.getId()).orElseThrow();
|
||||
|
||||
// Verify comment count is updated
|
||||
assertEquals(2L, post.getCommentCount());
|
||||
}
|
||||
}
|
||||
@@ -10,8 +10,11 @@ import org.springframework.data.redis.core.RedisTemplate;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.*;
|
||||
|
||||
import java.util.Optional;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
|
||||
import org.mockito.ArgumentCaptor;
|
||||
|
||||
import static org.mockito.Mockito.*;
|
||||
|
||||
@@ -39,12 +42,14 @@ class PostServiceTest {
|
||||
ApplicationContext context = mock(ApplicationContext.class);
|
||||
PointService pointService = mock(PointService.class);
|
||||
PostChangeLogService postChangeLogService = mock(PostChangeLogService.class);
|
||||
PointHistoryRepository pointHistoryRepository = mock(PointHistoryRepository.class);
|
||||
RedisTemplate redisTemplate = mock(RedisTemplate.class);
|
||||
|
||||
PostService service = new PostService(postRepo, userRepo, catRepo, tagRepo, lotteryRepo,
|
||||
pollPostRepo, pollVoteRepo, notifService, subService, commentService, commentRepo,
|
||||
reactionRepo, subRepo, notificationRepo, postReadService,
|
||||
imageUploader, taskScheduler, emailSender, context, pointService, postChangeLogService, PublishMode.DIRECT, redisTemplate);
|
||||
imageUploader, taskScheduler, emailSender, context, pointService, postChangeLogService,
|
||||
pointHistoryRepository, PublishMode.DIRECT, redisTemplate);
|
||||
when(context.getBean(PostService.class)).thenReturn(service);
|
||||
|
||||
Post post = new Post();
|
||||
@@ -60,11 +65,13 @@ class PostServiceTest {
|
||||
when(reactionRepo.findByPost(post)).thenReturn(List.of());
|
||||
when(subRepo.findByPost(post)).thenReturn(List.of());
|
||||
when(notificationRepo.findByPost(post)).thenReturn(List.of());
|
||||
when(pointHistoryRepository.findByPost(post)).thenReturn(List.of());
|
||||
|
||||
service.deletePost(1L, "alice");
|
||||
|
||||
verify(postReadService).deleteByPost(post);
|
||||
verify(postRepo).delete(post);
|
||||
verify(postChangeLogService).deleteLogsForPost(post);
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -90,12 +97,14 @@ class PostServiceTest {
|
||||
ApplicationContext context = mock(ApplicationContext.class);
|
||||
PointService pointService = mock(PointService.class);
|
||||
PostChangeLogService postChangeLogService = mock(PostChangeLogService.class);
|
||||
PointHistoryRepository pointHistoryRepository = mock(PointHistoryRepository.class);
|
||||
RedisTemplate redisTemplate = mock(RedisTemplate.class);
|
||||
|
||||
PostService service = new PostService(postRepo, userRepo, catRepo, tagRepo, lotteryRepo,
|
||||
pollPostRepo, pollVoteRepo, notifService, subService, commentService, commentRepo,
|
||||
reactionRepo, subRepo, notificationRepo, postReadService,
|
||||
imageUploader, taskScheduler, emailSender, context, pointService, postChangeLogService, PublishMode.DIRECT, redisTemplate);
|
||||
imageUploader, taskScheduler, emailSender, context, pointService, postChangeLogService,
|
||||
pointHistoryRepository, PublishMode.DIRECT, redisTemplate);
|
||||
when(context.getBean(PostService.class)).thenReturn(service);
|
||||
|
||||
Post post = new Post();
|
||||
@@ -117,6 +126,7 @@ class PostServiceTest {
|
||||
when(reactionRepo.findByPost(post)).thenReturn(List.of());
|
||||
when(subRepo.findByPost(post)).thenReturn(List.of());
|
||||
when(notificationRepo.findByPost(post)).thenReturn(List.of());
|
||||
when(pointHistoryRepository.findByPost(post)).thenReturn(List.of());
|
||||
|
||||
service.deletePost(1L, "admin");
|
||||
|
||||
@@ -147,12 +157,14 @@ class PostServiceTest {
|
||||
ApplicationContext context = mock(ApplicationContext.class);
|
||||
PointService pointService = mock(PointService.class);
|
||||
PostChangeLogService postChangeLogService = mock(PostChangeLogService.class);
|
||||
PointHistoryRepository pointHistoryRepository = mock(PointHistoryRepository.class);
|
||||
RedisTemplate redisTemplate = mock(RedisTemplate.class);
|
||||
|
||||
PostService service = new PostService(postRepo, userRepo, catRepo, tagRepo, lotteryRepo,
|
||||
pollPostRepo, pollVoteRepo, notifService, subService, commentService, commentRepo,
|
||||
reactionRepo, subRepo, notificationRepo, postReadService,
|
||||
imageUploader, taskScheduler, emailSender, context, pointService, postChangeLogService, PublishMode.DIRECT, redisTemplate);
|
||||
imageUploader, taskScheduler, emailSender, context, pointService, postChangeLogService,
|
||||
pointHistoryRepository, PublishMode.DIRECT, redisTemplate);
|
||||
when(context.getBean(PostService.class)).thenReturn(service);
|
||||
|
||||
when(postRepo.countByAuthorAfter(eq("alice"), any())).thenReturn(1L);
|
||||
@@ -162,6 +174,77 @@ class PostServiceTest {
|
||||
null, null, null, null, null, null, null, null, null));
|
||||
}
|
||||
|
||||
@Test
|
||||
void deletePostRemovesPointHistoriesAndRecalculatesPoints() {
|
||||
PostRepository postRepo = mock(PostRepository.class);
|
||||
UserRepository userRepo = mock(UserRepository.class);
|
||||
CategoryRepository catRepo = mock(CategoryRepository.class);
|
||||
TagRepository tagRepo = mock(TagRepository.class);
|
||||
LotteryPostRepository lotteryRepo = mock(LotteryPostRepository.class);
|
||||
PollPostRepository pollPostRepo = mock(PollPostRepository.class);
|
||||
PollVoteRepository pollVoteRepo = mock(PollVoteRepository.class);
|
||||
NotificationService notifService = mock(NotificationService.class);
|
||||
SubscriptionService subService = mock(SubscriptionService.class);
|
||||
CommentService commentService = mock(CommentService.class);
|
||||
CommentRepository commentRepo = mock(CommentRepository.class);
|
||||
ReactionRepository reactionRepo = mock(ReactionRepository.class);
|
||||
PostSubscriptionRepository subRepo = mock(PostSubscriptionRepository.class);
|
||||
NotificationRepository notificationRepo = mock(NotificationRepository.class);
|
||||
PostReadService postReadService = mock(PostReadService.class);
|
||||
ImageUploader imageUploader = mock(ImageUploader.class);
|
||||
TaskScheduler taskScheduler = mock(TaskScheduler.class);
|
||||
EmailSender emailSender = mock(EmailSender.class);
|
||||
ApplicationContext context = mock(ApplicationContext.class);
|
||||
PointService pointService = mock(PointService.class);
|
||||
PostChangeLogService postChangeLogService = mock(PostChangeLogService.class);
|
||||
PointHistoryRepository pointHistoryRepository = mock(PointHistoryRepository.class);
|
||||
RedisTemplate redisTemplate = mock(RedisTemplate.class);
|
||||
|
||||
PostService service = new PostService(postRepo, userRepo, catRepo, tagRepo, lotteryRepo,
|
||||
pollPostRepo, pollVoteRepo, notifService, subService, commentService, commentRepo,
|
||||
reactionRepo, subRepo, notificationRepo, postReadService,
|
||||
imageUploader, taskScheduler, emailSender, context, pointService, postChangeLogService,
|
||||
pointHistoryRepository, PublishMode.DIRECT, redisTemplate);
|
||||
when(context.getBean(PostService.class)).thenReturn(service);
|
||||
|
||||
Post post = new Post();
|
||||
post.setId(10L);
|
||||
User author = new User();
|
||||
author.setId(20L);
|
||||
author.setRole(Role.USER);
|
||||
post.setAuthor(author);
|
||||
|
||||
User historyUser = new User();
|
||||
historyUser.setId(30L);
|
||||
|
||||
PointHistory history = new PointHistory();
|
||||
history.setUser(historyUser);
|
||||
history.setPost(post);
|
||||
|
||||
when(postRepo.findById(10L)).thenReturn(Optional.of(post));
|
||||
when(userRepo.findByUsername("author")).thenReturn(Optional.of(author));
|
||||
when(commentRepo.findByPostAndParentIsNullOrderByCreatedAtAsc(post)).thenReturn(List.of());
|
||||
when(reactionRepo.findByPost(post)).thenReturn(List.of());
|
||||
when(subRepo.findByPost(post)).thenReturn(List.of());
|
||||
when(notificationRepo.findByPost(post)).thenReturn(List.of());
|
||||
when(pointHistoryRepository.findByPost(post)).thenReturn(List.of(history));
|
||||
when(pointService.recalculateUserPoints(historyUser)).thenReturn(0);
|
||||
|
||||
service.deletePost(10L, "author");
|
||||
|
||||
ArgumentCaptor<List<PointHistory>> captor = ArgumentCaptor.forClass(List.class);
|
||||
verify(pointHistoryRepository).saveAll(captor.capture());
|
||||
List<PointHistory> savedHistories = captor.getValue();
|
||||
assertEquals(1, savedHistories.size());
|
||||
PointHistory savedHistory = savedHistories.get(0);
|
||||
assertNull(savedHistory.getPost());
|
||||
assertNotNull(savedHistory.getDeletedAt());
|
||||
assertTrue(savedHistory.getDeletedAt().isBefore(LocalDateTime.now().plusSeconds(1)));
|
||||
|
||||
verify(pointService).recalculateUserPoints(historyUser);
|
||||
verify(userRepo).saveAll(any());
|
||||
}
|
||||
|
||||
@Test
|
||||
void finalizeLotteryNotifiesAuthor() {
|
||||
PostRepository postRepo = mock(PostRepository.class);
|
||||
@@ -185,12 +268,14 @@ class PostServiceTest {
|
||||
ApplicationContext context = mock(ApplicationContext.class);
|
||||
PointService pointService = mock(PointService.class);
|
||||
PostChangeLogService postChangeLogService = mock(PostChangeLogService.class);
|
||||
PointHistoryRepository pointHistoryRepository = mock(PointHistoryRepository.class);
|
||||
RedisTemplate redisTemplate = mock(RedisTemplate.class);
|
||||
|
||||
PostService service = new PostService(postRepo, userRepo, catRepo, tagRepo, lotteryRepo,
|
||||
pollPostRepo, pollVoteRepo, notifService, subService, commentService, commentRepo,
|
||||
reactionRepo, subRepo, notificationRepo, postReadService,
|
||||
imageUploader, taskScheduler, emailSender, context, pointService, postChangeLogService, PublishMode.DIRECT, redisTemplate);
|
||||
imageUploader, taskScheduler, emailSender, context, pointService, postChangeLogService,
|
||||
pointHistoryRepository, PublishMode.DIRECT, redisTemplate);
|
||||
when(context.getBean(PostService.class)).thenReturn(service);
|
||||
|
||||
User author = new User();
|
||||
|
||||
@@ -4,7 +4,18 @@ spring.datasource.username=sa
|
||||
spring.datasource.password=
|
||||
spring.jpa.hibernate.ddl-auto=create-drop
|
||||
|
||||
springdoc.info.title=openisle
|
||||
springdoc.info.description=Test API documentation
|
||||
springdoc.info.version=1.0.0
|
||||
springdoc.info.scheme=Bearer
|
||||
springdoc.info.header=Authorization
|
||||
|
||||
|
||||
rabbitmq.queue.durable=true
|
||||
rabbitmq.sharding.enabled=true
|
||||
|
||||
resend.api.key=dummy
|
||||
resend.from.email=dummy@example.com
|
||||
cos.base-url=http://test.example.com
|
||||
cos.secret-id=dummy
|
||||
cos.secret-key=dummy
|
||||
@@ -18,6 +29,7 @@ app.upload.max-size=1048576
|
||||
app.jwt.secret=TestSecret
|
||||
app.jwt.reason-secret=TestReasonSecret
|
||||
app.jwt.reset-secret=TestResetSecret
|
||||
app.jwt.invite-secret=TestInviteSecret
|
||||
app.jwt.expiration=3600000
|
||||
|
||||
# Default publish mode for tests
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
--primary-color-hover: rgb(9, 95, 105);
|
||||
--primary-color: rgb(10, 110, 120);
|
||||
--primary-color-disabled: rgba(93, 152, 156, 0.5);
|
||||
--secondary-color:rgb(255, 255, 255);
|
||||
--secondary-color-hover:rgba(165, 255, 255, 0.447);
|
||||
--secondary-color: rgb(255, 255, 255);
|
||||
--secondary-color-hover: rgba(10, 111, 120, 0.184);
|
||||
--new-post-icon-color: rgba(10, 111, 120, 0.598);
|
||||
--header-height: 60px;
|
||||
--header-background-color: white;
|
||||
|
||||
@@ -107,14 +107,52 @@ const likeCount = computed(() => counts.value['LIKE'] || 0)
|
||||
const userReacted = (type) =>
|
||||
reactions.value.some((r) => r.type === type && r.user === authState.username)
|
||||
|
||||
const displayedReactions = computed(() => {
|
||||
return Object.entries(counts.value)
|
||||
.sort((a, b) => b[1] - a[1])
|
||||
.slice(0, 3)
|
||||
.map(([type]) => ({ type }))
|
||||
const baseReactionOrder = computed(() => {
|
||||
if (reactionTypes.value.length) return [...reactionTypes.value]
|
||||
|
||||
const order = []
|
||||
const seen = new Set()
|
||||
for (const reaction of reactions.value) {
|
||||
if (!seen.has(reaction.type)) {
|
||||
seen.add(reaction.type)
|
||||
order.push(reaction.type)
|
||||
}
|
||||
}
|
||||
return order
|
||||
})
|
||||
|
||||
const panelTypes = computed(() => reactionTypes.value.filter((t) => t !== 'LIKE'))
|
||||
const sortedReactionTypes = computed(() => {
|
||||
const baseOrder = [...baseReactionOrder.value]
|
||||
for (const type of Object.keys(counts.value)) {
|
||||
if (!baseOrder.includes(type)) baseOrder.push(type)
|
||||
}
|
||||
|
||||
const withMetadata = baseOrder.map((type, index) => ({
|
||||
type,
|
||||
count: counts.value[type] || 0,
|
||||
index,
|
||||
}))
|
||||
|
||||
const nonZero = withMetadata
|
||||
.filter((item) => item.count > 0)
|
||||
.sort((a, b) => {
|
||||
if (b.count !== a.count) return b.count - a.count
|
||||
return a.index - b.index
|
||||
})
|
||||
|
||||
const zero = withMetadata.filter((item) => item.count === 0)
|
||||
|
||||
return [...nonZero, ...zero].map((item) => item.type)
|
||||
})
|
||||
|
||||
const displayedReactions = computed(() => {
|
||||
return sortedReactionTypes.value
|
||||
.filter((type) => counts.value[type] > 0)
|
||||
.slice(0, 3)
|
||||
.map((type) => ({ type }))
|
||||
})
|
||||
|
||||
const panelTypes = computed(() => sortedReactionTypes.value.filter((t) => t !== 'LIKE'))
|
||||
|
||||
const panelVisible = ref(false)
|
||||
let hideTimer = null
|
||||
|
||||
@@ -122,7 +122,8 @@
|
||||
<l-hatch size="28" stroke="4" speed="3.5" color="var(--primary-color)"></l-hatch>
|
||||
</div>
|
||||
<div v-else class="comments-container">
|
||||
<BaseTimeline :items="timelineItems">
|
||||
<BasePlaceholder v-if="timelineItems.length === 0" text="暂无评论" icon="inbox" />
|
||||
<BaseTimeline v-else :items="timelineItems">
|
||||
<template #item="{ item }">
|
||||
<CommentItem
|
||||
v-if="item.kind === 'comment'"
|
||||
@@ -184,6 +185,7 @@ import { useRoute } from 'vue-router'
|
||||
import CommentItem from '~/components/CommentItem.vue'
|
||||
import CommentEditor from '~/components/CommentEditor.vue'
|
||||
import BaseTimeline from '~/components/BaseTimeline.vue'
|
||||
import BasePlaceholder from '~/components/BasePlaceholder.vue'
|
||||
import PostChangeLogItem from '~/components/PostChangeLogItem.vue'
|
||||
import ArticleTags from '~/components/ArticleTags.vue'
|
||||
import ArticleCategory from '~/components/ArticleCategory.vue'
|
||||
@@ -813,9 +815,7 @@ const fetchCommentsAndChangeLog = async () => {
|
||||
|
||||
for (const item of data) {
|
||||
const mappedPayload =
|
||||
item.kind === 'comment'
|
||||
? mapComment(item.payload)
|
||||
: mapChangeLog(item.payload)
|
||||
item.kind === 'comment' ? mapComment(item.payload) : mapChangeLog(item.payload)
|
||||
newTimelineItemList.push(mappedPayload)
|
||||
|
||||
if (item.kind === 'comment') {
|
||||
|
||||
@@ -712,13 +712,13 @@ watch(selectedTab, async (val) => {
|
||||
border-radius: 8px;
|
||||
padding: 5px 10px;
|
||||
color: var(--primary-color);
|
||||
background-color: var(--secondary-color);
|
||||
border: 1px solid var(--primary-color);
|
||||
margin-top: 15px;
|
||||
width: fit-content;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.profile-page-header-unsubscribe-button:hover,
|
||||
.profile-page-header-send-mail-button:hover {
|
||||
background-color: var(--secondary-color-hover);
|
||||
}
|
||||
|
||||
114
package-lock.json
generated
114
package-lock.json
generated
@@ -11,9 +11,54 @@
|
||||
"devDependencies": {
|
||||
"husky": "^9.1.7",
|
||||
"lint-staged": "^16.1.5",
|
||||
"prettier": "^3.6.2"
|
||||
"prettier": "^3.6.2",
|
||||
"prettier-plugin-java": "^2.6.3"
|
||||
}
|
||||
},
|
||||
"node_modules/@chevrotain/cst-dts-gen": {
|
||||
"version": "11.0.3",
|
||||
"resolved": "https://registry.npmjs.org/@chevrotain/cst-dts-gen/-/cst-dts-gen-11.0.3.tgz",
|
||||
"integrity": "sha512-BvIKpRLeS/8UbfxXxgC33xOumsacaeCKAjAeLyOn7Pcp95HiRbrpl14S+9vaZLolnbssPIUuiUd8IvgkRyt6NQ==",
|
||||
"dev": true,
|
||||
"license": "Apache-2.0",
|
||||
"dependencies": {
|
||||
"@chevrotain/gast": "11.0.3",
|
||||
"@chevrotain/types": "11.0.3",
|
||||
"lodash-es": "4.17.21"
|
||||
}
|
||||
},
|
||||
"node_modules/@chevrotain/gast": {
|
||||
"version": "11.0.3",
|
||||
"resolved": "https://registry.npmjs.org/@chevrotain/gast/-/gast-11.0.3.tgz",
|
||||
"integrity": "sha512-+qNfcoNk70PyS/uxmj3li5NiECO+2YKZZQMbmjTqRI3Qchu8Hig/Q9vgkHpI3alNjr7M+a2St5pw5w5F6NL5/Q==",
|
||||
"dev": true,
|
||||
"license": "Apache-2.0",
|
||||
"dependencies": {
|
||||
"@chevrotain/types": "11.0.3",
|
||||
"lodash-es": "4.17.21"
|
||||
}
|
||||
},
|
||||
"node_modules/@chevrotain/regexp-to-ast": {
|
||||
"version": "11.0.3",
|
||||
"resolved": "https://registry.npmjs.org/@chevrotain/regexp-to-ast/-/regexp-to-ast-11.0.3.tgz",
|
||||
"integrity": "sha512-1fMHaBZxLFvWI067AVbGJav1eRY7N8DDvYCTwGBiE/ytKBgP8azTdgyrKyWZ9Mfh09eHWb5PgTSO8wi7U824RA==",
|
||||
"dev": true,
|
||||
"license": "Apache-2.0"
|
||||
},
|
||||
"node_modules/@chevrotain/types": {
|
||||
"version": "11.0.3",
|
||||
"resolved": "https://registry.npmjs.org/@chevrotain/types/-/types-11.0.3.tgz",
|
||||
"integrity": "sha512-gsiM3G8b58kZC2HaWR50gu6Y1440cHiJ+i3JUvcp/35JchYejb2+5MVeJK0iKThYpAa/P2PYFV4hoi44HD+aHQ==",
|
||||
"dev": true,
|
||||
"license": "Apache-2.0"
|
||||
},
|
||||
"node_modules/@chevrotain/utils": {
|
||||
"version": "11.0.3",
|
||||
"resolved": "https://registry.npmjs.org/@chevrotain/utils/-/utils-11.0.3.tgz",
|
||||
"integrity": "sha512-YslZMgtJUyuMbZ+aKvfF3x1f5liK4mWNxghFRv7jqRR9C3R3fAOGTTKvxXDa2Y1s9zSbcpuO0cAxDYsc9SrXoQ==",
|
||||
"dev": true,
|
||||
"license": "Apache-2.0"
|
||||
},
|
||||
"node_modules/ansi-escapes": {
|
||||
"version": "7.0.0",
|
||||
"resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-7.0.0.tgz",
|
||||
@@ -82,6 +127,34 @@
|
||||
"url": "https://github.com/chalk/chalk?sponsor=1"
|
||||
}
|
||||
},
|
||||
"node_modules/chevrotain": {
|
||||
"version": "11.0.3",
|
||||
"resolved": "https://registry.npmjs.org/chevrotain/-/chevrotain-11.0.3.tgz",
|
||||
"integrity": "sha512-ci2iJH6LeIkvP9eJW6gpueU8cnZhv85ELY8w8WiFtNjMHA5ad6pQLaJo9mEly/9qUyCpvqX8/POVUTf18/HFdw==",
|
||||
"dev": true,
|
||||
"license": "Apache-2.0",
|
||||
"dependencies": {
|
||||
"@chevrotain/cst-dts-gen": "11.0.3",
|
||||
"@chevrotain/gast": "11.0.3",
|
||||
"@chevrotain/regexp-to-ast": "11.0.3",
|
||||
"@chevrotain/types": "11.0.3",
|
||||
"@chevrotain/utils": "11.0.3",
|
||||
"lodash-es": "4.17.21"
|
||||
}
|
||||
},
|
||||
"node_modules/chevrotain-allstar": {
|
||||
"version": "0.3.1",
|
||||
"resolved": "https://registry.npmjs.org/chevrotain-allstar/-/chevrotain-allstar-0.3.1.tgz",
|
||||
"integrity": "sha512-b7g+y9A0v4mxCW1qUhf3BSVPg+/NvGErk/dOkrDaHA0nQIQGAtrOjlX//9OQtRlSCy+x9rfB5N8yC71lH1nvMw==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"lodash-es": "^4.17.21"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"chevrotain": "^11.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/cli-cursor": {
|
||||
"version": "5.0.0",
|
||||
"resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-5.0.0.tgz",
|
||||
@@ -242,6 +315,18 @@
|
||||
"node": ">=0.12.0"
|
||||
}
|
||||
},
|
||||
"node_modules/java-parser": {
|
||||
"version": "3.0.1",
|
||||
"resolved": "https://registry.npmjs.org/java-parser/-/java-parser-3.0.1.tgz",
|
||||
"integrity": "sha512-sDIR7u9b7O2JViNUxiZRhnRz7URII/eE7g2B+BmGxDeS6Ex3OYAcCyz5oh0H4LQ+hL/BS8OJTz8apMy9xtGmrQ==",
|
||||
"dev": true,
|
||||
"license": "Apache-2.0",
|
||||
"dependencies": {
|
||||
"chevrotain": "11.0.3",
|
||||
"chevrotain-allstar": "0.3.1",
|
||||
"lodash": "4.17.21"
|
||||
}
|
||||
},
|
||||
"node_modules/lilconfig": {
|
||||
"version": "3.1.3",
|
||||
"resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.3.tgz",
|
||||
@@ -301,6 +386,20 @@
|
||||
"node": ">=20.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/lodash": {
|
||||
"version": "4.17.21",
|
||||
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
|
||||
"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/lodash-es": {
|
||||
"version": "4.17.21",
|
||||
"resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz",
|
||||
"integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==",
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/log-update": {
|
||||
"version": "6.1.0",
|
||||
"resolved": "https://registry.npmjs.org/log-update/-/log-update-6.1.0.tgz",
|
||||
@@ -459,6 +558,19 @@
|
||||
"url": "https://github.com/prettier/prettier?sponsor=1"
|
||||
}
|
||||
},
|
||||
"node_modules/prettier-plugin-java": {
|
||||
"version": "2.7.5",
|
||||
"resolved": "https://registry.npmjs.org/prettier-plugin-java/-/prettier-plugin-java-2.7.5.tgz",
|
||||
"integrity": "sha512-LH5PKX+cjKOcjnnLXn3/cT8u7vxXxm68r5zsBPI3QQfkfyA/Sx8TTnhbwZdqwQXca431RquBG2ZtmyqmBwBKEw==",
|
||||
"dev": true,
|
||||
"license": "Apache-2.0",
|
||||
"dependencies": {
|
||||
"java-parser": "3.0.1"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"prettier": "^3.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/restore-cursor": {
|
||||
"version": "5.1.0",
|
||||
"resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-5.1.0.tgz",
|
||||
|
||||
@@ -20,9 +20,11 @@
|
||||
"devDependencies": {
|
||||
"husky": "^9.1.7",
|
||||
"lint-staged": "^16.1.5",
|
||||
"prettier": "^3.6.2"
|
||||
"prettier": "^3.6.2",
|
||||
"prettier-plugin-java": "^2.6.3"
|
||||
},
|
||||
"lint-staged": {
|
||||
"frontend_nuxt/**/*": "prettier --write --cache --ignore-unknown"
|
||||
"frontend_nuxt/**/*": "prettier --write --cache --ignore-unknown",
|
||||
"backend/src/**/*.java": "prettier --write --cache --ignore-unknown"
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user