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

Fix random list problem of tags and categories (#3261) 

<!--  Thanks for sending a pull request!  Here are some tips for you:
1. 如果这是你的第一次，请阅读我们的贡献指南：<https://github.com/halo-dev/halo/blob/master/CONTRIBUTING.md>。
1. If this is your first time, please read our contributor guidelines: <https://github.com/halo-dev/halo/blob/master/CONTRIBUTING.md>.
2. 请根据你解决问题的类型为 Pull Request 添加合适的标签。
2. Please label this pull request according to what type of issue you are addressing, especially if this is a release targeted pull request.
3. 请确保你已经添加并运行了适当的测试。
3. Ensure you have added or ran the appropriate tests for your PR.
-->

#### What type of PR is this?
/kind bug

<!--
添加其中一个类别：
Add one of the following kinds:

/kind bug
/kind cleanup
/kind documentation
/kind feature
/kind improvement

适当添加其中一个或多个类别（可选）：
Optionally add one or more of the following kinds if applicable:

/kind api-change
/kind deprecation
/kind failing-test
/kind flake
/kind regression
-->

#### What this PR does / why we need it:
replaced flatMap with flatMapSequential to ensure that the list of tags and categories shown in console post order is not random

#### Which issue(s) this PR fixes:

<!--
PR 合并时自动关闭 issue。
Automatically closes linked issue when PR is merged.

用法：`Fixes #<issue 号>`，或者 `Fixes (粘贴 issue 完整链接)`
Usage: `Fixes #<issue number>`, or `Fixes (paste link of issue)`.
-->
Fixes #3139

#### Special notes for your reviewer:
/cherrypick release-2.0
/cherrypick release-2.1

#### Does this PR introduce a user-facing change?

<!--
如果当前 Pull Request 的修改不会造成用户侧的任何变更，在 `release-note` 代码块儿中填写 `NONE`。
否则请填写用户侧能够理解的 Release Note。如果当前 Pull Request 包含破坏性更新（Break Change），
Release Note 需要以 `action required` 开头。
If no, just write "NONE" in the release-note block below.
If yes, a release note is required:
Enter your extended release note in the block below. If the PR requires additional action from users switching to the new release, include the string "action required".
-->

```release-note
修复控制台文章列表中，标签和分类顺序随机的问题
```
pull/3256/head^2
findwinds 2023-02-09 12:24:13 +08:00 committed by GitHub
parent 7453b93b1d
commit 56aa7de85a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/run/halo/app/content/impl/PostServiceImpl.java
View File

@ -208,7 +208,7 @@ public class PostServiceImpl extends AbstractContentService implements PostServi
return Flux.empty(); return Flux.empty();
} }
return Flux.fromIterable(tagNames) return Flux.fromIterable(tagNames)
.flatMap(tagName -> client.fetch(Tag.class, tagName)); .flatMapSequential(tagName -> client.fetch(Tag.class, tagName));
} }
private Flux<Category> listCategories(List<String> categoryNames) { private Flux<Category> listCategories(List<String> categoryNames) {
@ -216,7 +216,7 @@ public class PostServiceImpl extends AbstractContentService implements PostServi
return Flux.empty(); return Flux.empty();
} }
return Flux.fromIterable(categoryNames) return Flux.fromIterable(categoryNames)
.flatMap(categoryName -> client.fetch(Category.class, categoryName)); .flatMapSequential(categoryName -> client.fetch(Category.class, categoryName));
} }
private Flux<Contributor> listContributors(List<String> usernames) { private Flux<Contributor> listContributors(List<String> usernames) {