Skip to content

Support of ExpandLevels #403

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
agoerler merged 3 commits into from
Nov 28, 2024
Merged

Support of ExpandLevels #403

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d379007
added support of ExpandLevels
etimr Nov 28, 2024
72b29d4
review fix
etimr Nov 28, 2024
f1b9943
small review fix
etimr Nov 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 21 additions & 2 deletions srv/src/main/java/my/bookshop/handlers/HierarchyHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,11 +169,13 @@ private void addIfNotNull(Set<Integer> ancestorIds, Row r, String key) {
}

private List<GenreHierarchy> topLevels(CqnTopLevelsTransformation topLevels, CqnPredicate filter) {
return topLevels.levels() < 0 || !(topLevels.expandLevels().isEmpty()) ? topLevelsAll(filter) : topLevelsLimit(topLevels.levels(), filter);
return topLevels.levels() < 0 ? topLevelsAll(filter) : topLevelsLimit(topLevels, filter);
}

private List<GenreHierarchy> topLevelsLimit(long limit, CqnPredicate filter) {
private List<GenreHierarchy> topLevelsLimit(CqnTopLevelsTransformation topLevels, CqnPredicate filter) {
long limit = topLevels.levels();
Map <Integer, GenreHierarchy> lookup = new HashMap<>();
Map<Object, Long> expandLevels = topLevels.expandLevels();

CqnSelect getRoots = Select.from(AdminService_.GENRE_HIERARCHY).where(gh -> gh.parent_id().eq(0).and(filter));
List<GenreHierarchy> roots = db.run(getRoots).listOf(GenreHierarchy.class);
Expand All @@ -197,6 +199,23 @@ private List<GenreHierarchy> topLevelsLimit(long limit, CqnPredicate filter) {
}
});

if (!expandLevels.isEmpty()) {
List<Integer> expandedIds = expandLevels.keySet().stream().map(key -> (Integer) key).toList();
CqnSelect expandedCQN = Select.from(AdminService_.GENRE_HIERARCHY).where(gh ->
CQL.and(filter,
CQL.or(gh.node_id().in(expandedIds), gh.parent_id().in(expandedIds))));

List<GenreHierarchy> expanded = db.run(expandedCQN).listOf(GenreHierarchy.class);
expanded.forEach(gh -> {
if (!lookup.keySet().contains(gh.getNodeId())) {
gh.setParent(lookup.get(gh.getParentId()));
gh.setDistanceFromRoot(distanceFromRoot(gh));
lookup.put(gh.getNodeId(), gh);
}
});

}

return lookup.values().stream().sorted(new Sorter()).toList();
}

Expand Down