github
/
halo
mirror of https://github.com/halo-dev/halo
1
0
Fork 0
Code Issues Releases Wiki Activity

fix: child comments could not be deleted.

pull/489/head
ruibaby 2019-12-29 20:45:18 +08:00
parent 86e61036c6
commit b9c2daa49b
3 changed files with 88 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/run/halo/app/repository/base/BaseCommentRepository.java
View File

@ -123,7 +123,17 @@ public interface BaseCommentRepository<COMMENT extends BaseComment> extends Base
* @return a list of comment
*/
@NonNull
List<COMMENT> findAllByPostIdAndStatusAndParentId(Integer postId, CommentStatus status, Long parentId);
List<COMMENT> findAllByPostIdAndStatusAndParentId(@NonNull Integer postId, @NonNull CommentStatus status, @NonNull Long parentId);
/**
* Finds comments by post id and parent id.
*
* @param postId post id must not be null
* @param parentId comment parent id must not be null
* @return a list of comment
*/
@NonNull
List<COMMENT> findAllByPostIdAndParentId(@NonNull Integer postId, @NonNull Long parentId);
/**
* Finds all comments by status and parent id collection.
@ -135,6 +145,14 @@ public interface BaseCommentRepository<COMMENT extends BaseComment> extends Base
@NonNull
List<COMMENT> findAllByStatusAndParentIdIn(@NonNull CommentStatus status, @NonNull Collection<Long> parentIds);
/**
* Finds all comments by parent id collection.
*
* @param parentIds parent id collection must not be null
* @return a list of comment
*/
List<COMMENT> findAllByParentIdIn(@NonNull Collection<Long> parentIds);
/**
* Finds comments by post id, comment status and parent id.
*

11
src/main/java/run/halo/app/service/base/BaseCommentService.java
View File

@ -264,6 +264,17 @@ public interface BaseCommentService<COMMENT extends BaseComment> extends CrudSer
@NonNull
List<COMMENT> listChildrenBy(@NonNull Integer targetId, @NonNull Long commentParentId, @NonNull CommentStatus status, @NonNull Sort sort);
/**
* Lists children comments.
*
* @param targetId target id must not be null
* @param commentParentId comment parent id must not be null
* @param sort sort info must not be null
* @return a list of children comment
*/
@NonNull
List<COMMENT> listChildrenBy(@NonNull Integer targetId, @NonNull Long commentParentId, @NonNull Sort sort);
/**
* Filters comment ip address.
*

62
src/main/java/run/halo/app/service/impl/BaseCommentServiceImpl.java
View File

@ -48,6 +48,8 @@ import javax.persistence.criteria.Predicate;
import java.util.*;
import java.util.stream.Collectors;
import static org.springframework.data.domain.Sort.Direction.DESC;
/**
* Base comment service implementation.
*
@ -372,10 +374,12 @@ public abstract class BaseCommentServiceImpl<COMMENT extends BaseComment> extend
COMMENT comment = baseCommentRepository.findById(id).orElseThrow(() -> new NotFoundException("查询不到该评论的信息").setErrorData(id));
if (comment.getParentId() == 0) {
// Remove comment children.
List<COMMENT> comments = baseCommentRepository.deleteByParentId(id);
log.debug("Removed comment children: [{}]", comments);
List<COMMENT> children = listChildrenBy(comment.getPostId(), id, Sort.by(DESC, "createTime"));
if (children.size() > 0) {
children.forEach(child -> {
super.removeById(child.getId());
});
}
return super.removeById(id);
@ -537,6 +541,30 @@ public abstract class BaseCommentServiceImpl<COMMENT extends BaseComment> extend
return childrenList;
}
@Override
public List<COMMENT> listChildrenBy(Integer targetId, Long commentParentId, Sort sort) {
Assert.notNull(targetId, "Target id must not be null");
Assert.notNull(commentParentId, "Comment parent id must not be null");
Assert.notNull(sort, "Sort info must not be null");
// Get comments recursively
// Get direct children
List<COMMENT> directChildren = baseCommentRepository.findAllByPostIdAndParentId(targetId, commentParentId);
// Create result container
Set<COMMENT> children = new HashSet<>();
// Get children comments
getChildrenRecursively(directChildren, children);
// Sort children
List<COMMENT> childrenList = new ArrayList<>(children);
childrenList.sort(Comparator.comparing(BaseComment::getId));
return childrenList;
}
@Override
public <T extends BaseCommentDTO> T filterIpAddress(@NonNull T comment) {
Assert.notNull(comment, "Base comment dto must not be null");
@ -612,6 +640,32 @@ public abstract class BaseCommentServiceImpl<COMMENT extends BaseComment> extend
children.addAll(topComments);
}
/**
* Get children comments recursively.
*
* @param topComments top comment list
* @param children children result must not be null
*/
private void getChildrenRecursively(@Nullable List<COMMENT> topComments, @NonNull Set<COMMENT> children) {
Assert.notNull(children, "Children comment set must not be null");
if (CollectionUtils.isEmpty(topComments)) {
return;
}
// Convert comment id set
Set<Long> commentIds = ServiceUtils.fetchProperty(topComments, COMMENT::getId);
// Get direct children
List<COMMENT> directChildren = baseCommentRepository.findAllByParentIdIn(commentIds);
// Recursively invoke
getChildrenRecursively(directChildren, children);
// Add direct children to children result
children.addAll(topComments);
}
/**
* Concretes comment tree.
*