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

Fix number of comment in detail of post and sheet and add it into detail of journal (#1503)

pull/1528/head
扶醉 2021-10-29 19:36:09 +08:00 committed by GitHub
parent 0a137136ce
commit 44d740b760
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 40 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/run/halo/app/controller/content/api/JournalController.java
View File

@ -71,7 +71,7 @@ public class JournalController {
@GetMapping("{journalId:\\d+}")
@ApiOperation("Gets a journal detail")
public JournalDTO getBy(@PathVariable("journalId") Integer journalId) {
public JournalWithCmtCountDTO getBy(@PathVariable("journalId") Integer journalId) {
Journal journal = journalService.getById(journalId);
return journalService.convertTo(journal);
}

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

@ -99,6 +99,15 @@ public interface BaseCommentRepository<COMMENT extends BaseComment>
*/
long countByPostId(@NonNull Integer postId);
/**
* Count comments by comment status and post id.
*
* @param status status must not be null
* @param postId post id must not be null.
* @return comments count
*/
long countByStatusAndPostId(@NonNull CommentStatus status, @NonNull Integer postId);
/**
* Counts by comment status.
*

6
src/main/java/run/halo/app/service/JournalService.java
View File

@ -68,13 +68,13 @@ public interface JournalService extends CrudService<Journal, Integer> {
Page<Journal> pageBy(@NonNull JournalType type, @NonNull Pageable pageable);
/**
* Converts to journal dto.
* Converts to journal with comment count dto.
*
* @param journal journal must not be null
* @return journal dto
* @return journal with comment count dto
*/
@NonNull
JournalDTO convertTo(@NonNull Journal journal);
JournalWithCmtCountDTO convertTo(@NonNull Journal journal);
/**
* Converts to journal with comment count dto list.

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

@ -144,6 +144,15 @@ public interface BaseCommentService<COMMENT extends BaseComment>
*/
long countByPostId(@NonNull Integer postId);
/**
* Count comments by comment status and post id.
*
* @param status status must not be null.
* @param postId post id must not be null.
* @return comments count
*/
long countByStatusAndPostId(@NonNull CommentStatus status, @NonNull Integer postId);
/**
* Counts by comment status.
*

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

@ -290,6 +290,12 @@ public abstract class BaseCommentServiceImpl<COMMENT extends BaseComment>
return baseCommentRepository.countByPostId(postId);
}
@Override
public long countByStatusAndPostId(@NonNull CommentStatus status, @NonNull Integer postId) {
Assert.notNull(postId, "Post id must not be null");
return baseCommentRepository.countByStatusAndPostId(status, postId);
}
@Override
public long countByStatus(@NonNull CommentStatus status) {
return baseCommentRepository.countByStatus(status);

10
src/main/java/run/halo/app/service/impl/JournalServiceImpl.java
View File

@ -107,10 +107,16 @@ public class JournalServiceImpl extends AbstractCrudService<Journal, Integer>
}
@Override
public JournalDTO convertTo(Journal journal) {
public JournalWithCmtCountDTO convertTo(Journal journal) {
Assert.notNull(journal, "Journal must not be null");
return new JournalDTO().convertFrom(journal);
JournalWithCmtCountDTO journalWithCmtCountDto = new JournalWithCmtCountDTO()
.convertFrom(journal);
journalWithCmtCountDto.setCommentCount(journalCommentService.countByStatusAndPostId(
CommentStatus.PUBLISHED, journal.getId()));
return journalWithCmtCountDto;
}
@Override

3
src/main/java/run/halo/app/service/impl/PostServiceImpl.java
View File

@ -787,7 +787,8 @@ public class PostServiceImpl extends BasePostServiceImpl<Post> implements PostSe
postDetailVO.setMetaIds(metaIds);
postDetailVO.setMetas(postMetaService.convertTo(postMetaList));
postDetailVO.setCommentCount(postCommentService.countByPostId(post.getId()));
postDetailVO.setCommentCount(postCommentService.countByStatusAndPostId(
CommentStatus.PUBLISHED, post.getId()));
postDetailVO.setFullPath(buildFullPath(post));

3
src/main/java/run/halo/app/service/impl/SheetServiceImpl.java
View File

@ -341,7 +341,8 @@ public class SheetServiceImpl extends BasePostServiceImpl<Sheet> implements Shee
sheetDetailVO.setSummary(generateSummary(sheet.getFormatContent()));
}
sheetDetailVO.setCommentCount(sheetCommentService.countByPostId(sheet.getId()));
sheetDetailVO.setCommentCount(sheetCommentService.countByStatusAndPostId(
CommentStatus.PUBLISHED, sheet.getId()));
sheetDetailVO.setFullPath(buildFullPath(sheet));