feat(blog): 支持按分类及其子分类筛选文章

在文章查询参数中新增 IncludeSubCategory 选项，当指定分类ID且启用该选项时，会同时查询该分类及其所有子分类下的文章。这使博客分类筛选功能更灵活，便于组织层级分类结构。

- 在 PostQueryParameters 中添加 IncludeSubCategory 属性
- 在 BlogController 的查询中默认启用包含子分类
- 在 PostService 的查询逻辑中实现子分类包含功能
- 调整部分代码格式以提升可读性

Author: Deali-Axy

src/StarBlog.Web/Controllers/BlogController.cs

@@ -56,6 +56,7 @@ public async Task<IActionResult> List(int categoryId = 0, int page = 1, int page
 
         var posts = await _postService.GetPagedList(new PostQueryParameters {
             CategoryId = categoryId,
+            IncludeSubCategory = true,
             Page = page,
             PageSize = pageSize,
             SortBy = sortType == "desc" ? $"-{sortBy}" : sortBy

src/StarBlog.Web/Criteria/PostQueryParameters.cs

@@ -19,6 +19,11 @@ public class PostQueryParameters : QueryParameters {
     /// </summary>
     public int CategoryId { get; set; } = 0;
 
+    /// <summary>
+    /// 是否包含子分类
+    /// </summary>
+    public bool IncludeSubCategory { get; set; } = false;
+
     /// <summary>
     /// 排序字段
     /// </summary>

src/StarBlog.Web/Services/PostService.cs

@@ -29,7 +29,8 @@ public class PostService {
 
     private string Host => _conf["host"];
 
-    public PostService(IBaseRepository<Post> postRepo,
+    public PostService(
+        IBaseRepository<Post> postRepo,
         IBaseRepository<Category> categoryRepo,
         IWebHostEnvironment environment,
         IHttpContextAccessor accessor,
@@ -129,7 +130,7 @@ public async Task<string> UploadImage(Post post, IFormFile file) {
 
         // 直接生成唯一文件名，不保留原始文件名了。——2023-6-5 21:21:46
         var filename = GuidUtils.GuidTo16String() + Path.GetExtension(file.FileName);
-        var fileRelativePath = Path.Combine("media", "blog", post.Id, filename);
+        var fileRelativePath = Path.Combine("media",          "blog", post.Id, filename);
         var savePath = Path.Combine(_environment.WebRootPath, fileRelativePath);
 
         await using (var fs = new FileStream(savePath, FileMode.Create)) {
@@ -171,8 +172,17 @@ public async Task<IPagedList<Post>> GetPagedList(PostQueryParameters param, bool
         }
 
         // 分类过滤
+        // 支持包含子分类过滤
         if (param.CategoryId != 0) {
-            querySet = querySet.Where(a => a.CategoryId == param.CategoryId);
+            if (param.IncludeSubCategory) {
+                var subCategories = await _categoryRepo.Select.Where(e => e.ParentId == param.CategoryId).ToListAsync();
+                var targetCategoryIds = subCategories.Select(a => a.Id).ToList();
+                targetCategoryIds.Insert(0, param.CategoryId);
+                querySet = querySet.Where(e => targetCategoryIds.Contains(e.CategoryId));
+            }
+            else {
+                querySet = querySet.Where(a => a.CategoryId == param.CategoryId);
+            }
         }
 
         // 关键词过滤
@@ -248,9 +258,9 @@ public static string GetContentHtml(Post post) {
         // - 关于前端渲染 MarkDown 样式：https://blog.csdn.net/sprintline/article/details/122849907
         // - https://github.com/showdownjs/showdown
         var pipeline = new MarkdownPipelineBuilder()
-            .UseAdvancedExtensions()
-            .UseBootstrap5()
-            .Build();
+                       .UseAdvancedExtensions()
+                       .UseBootstrap5()
+                       .Build();
         return Markdown.ToHtml(post.Content ?? "", pipeline);
     }
 
@@ -280,7 +290,7 @@ private string MdImageLinkConvert(Post post, bool isAddPrefix = true) {
         var document = Markdown.Parse(post.Content);
 
         foreach (var node in document.AsEnumerable()) {
-            if (node is not ParagraphBlock { Inline: { } } paragraphBlock) continue;
+            if (node is not ParagraphBlock { Inline: {} } paragraphBlock) continue;
             foreach (var inline in paragraphBlock.Inline) {
                 if (inline is not LinkInline { IsImage: true } linkInline) continue;
 
@@ -315,7 +325,7 @@ private bool ContainsExternalImages(Post post) {
 
         var document = Markdown.Parse(post.Content);
         foreach (var node in document.AsEnumerable()) {
-            if (node is not ParagraphBlock { Inline: { } } paragraphBlock) continue;
+            if (node is not ParagraphBlock { Inline: {} } paragraphBlock) continue;
             foreach (var inline in paragraphBlock.Inline) {
                 if (inline is not LinkInline { IsImage: true } linkInline) continue;
 
@@ -346,7 +356,7 @@ private async Task<string> MdExternalUrlDownloadAsync(Post post) {
 
         var document = Markdown.Parse(post.Content);
         foreach (var node in document.AsEnumerable()) {
-            if (node is not ParagraphBlock { Inline: { } } paragraphBlock) continue;
+            if (node is not ParagraphBlock { Inline: {} } paragraphBlock) continue;
             foreach (var inline in paragraphBlock.Inline) {
                 if (inline is not LinkInline { IsImage: true } linkInline) continue;
 
@@ -383,14 +393,14 @@ public async Task<List<Post>> GetRelatedPosts(Post currentPost, int count = 5) {
         // 1. 优先推荐同分类的文章（随机顺序）
         if (currentPost.CategoryId > 0) {
             var sameCategoryPosts = await _postRepo
-                .Where(p => p.IsPublish && p.Id != currentPost.Id && p.CategoryId == currentPost.CategoryId)
-                .ToListAsync();
+                                          .Where(p => p.IsPublish && p.Id != currentPost.Id && p.CategoryId == currentPost.CategoryId)
+                                          .ToListAsync();
 
             // 随机打乱同分类文章
             var randomSameCategoryPosts = sameCategoryPosts
-                .OrderBy(x => Random.Shared.Next())
-                .Take(count)
-                .ToList();
+                                          .OrderBy(x => Random.Shared.Next())
+                                          .Take(count)
+                                          .ToList();
             relatedPosts.AddRange(randomSameCategoryPosts);
         }
 
@@ -401,14 +411,14 @@ public async Task<List<Post>> GetRelatedPosts(Post currentPost, int count = 5) {
             excludeIds.Add(currentPost.Id); // 排除当前文章
 
             var otherPosts = await _postRepo
-                .Where(p => p.IsPublish && !excludeIds.Contains(p.Id))
-                .ToListAsync();
+                                   .Where(p => p.IsPublish && !excludeIds.Contains(p.Id))
+                                   .ToListAsync();
 
             // 随机打乱其他文章
             var randomOtherPosts = otherPosts
-                .OrderBy(x => Random.Shared.Next())
-                .Take(remainingCount)
-                .ToList();
+                                   .OrderBy(x => Random.Shared.Next())
+                                   .Take(remainingCount)
+                                   .ToList();
             relatedPosts.AddRange(randomOtherPosts);
         }
 
@@ -420,20 +430,20 @@ public async Task<List<Post>> GetRelatedPosts(Post currentPost, int count = 5) {
     /// </summary>
     public async Task<List<Post>> GetPopularPosts(int count = 10) {
         return await _postRepo
-            .Where(p => p.IsPublish)
-            .OrderByDescending(p => p.LastUpdateTime)
-            .Take(count)
-            .ToListAsync();
+                     .Where(p => p.IsPublish)
+                     .OrderByDescending(p => p.LastUpdateTime)
+                     .Take(count)
+                     .ToListAsync();
     }
 
     /// <summary>
     /// 获取最新文章
     /// </summary>
     public async Task<List<Post>> GetLatestPosts(int count = 10) {
         return await _postRepo
-            .Where(p => p.IsPublish)
-            .OrderByDescending(p => p.CreationTime)
-            .Take(count)
-            .ToListAsync();
+                     .Where(p => p.IsPublish)
+                     .OrderByDescending(p => p.CreationTime)
+                     .Take(count)
+                     .ToListAsync();
     }
-}
+}