Thibaut/ffsaf-site
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

dev #92

Merged
Thibaut merged 3 commits from dev into master 2026-01-02 15:00:08 +00:00
Conversation 0 Commits 3 Files Changed 4 +8 -5
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6a7af8aea9 - Show all commits

13
src/main/java/fr/titionfire/ffsaf/domain/service/ResultService.java
View File

@ -229,11 +229,14 @@ public class ResultService {
private void getTree(List<TreeModel> treeModels, MembreModel membreModel, ResultCategoryData out) { private void getTree(List<TreeModel> treeModels, MembreModel membreModel, ResultCategoryData out) {
ArrayList<TreeNode<ResultCategoryData.TreeData>> trees = new ArrayList<>(); ArrayList<TreeNode<ResultCategoryData.TreeData>> trees = new ArrayList<>();
treeModels.stream().filter(t -> t.getLevel() != 0).forEach(treeModel -> { treeModels.stream()
TreeNode<ResultCategoryData.TreeData> root = new TreeNode<>(); .filter(t -> t.getLevel() != 0)
convertTree(treeModel, root, membreModel, ResultPrivacy.REGISTERED_ONLY_NO_DETAILS); .sorted(Comparator.comparing(TreeModel::getLevel))
trees.add(root); .forEach(treeModel -> {
}); TreeNode<ResultCategoryData.TreeData> root = new TreeNode<>();
convertTree(treeModel, root, membreModel, ResultPrivacy.REGISTERED_ONLY_NO_DETAILS);
trees.add(root);
});
out.setTrees(trees); out.setTrees(trees);
} }