boiii/traxxx
1
0
Fork 0
forked from DebaucheryLibrarian/traxxx
Code Issues Pull Requests Projects Releases Wiki Activity

Including all children of included networks, separated included children into dedicated property.

Browse Source
This commit is contained in:
DebaucheryLibrarian
2020-11-26 04:26:52 +01:00
parent 1b407254a7
commit 4e559f63e3
4 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/entities.js
View File

@@ -39,14 +39,11 @@ function curateEntity(entity, includeParameters = false) {
}, includeParameters));
}
if (entity.siblings) {
curatedEntity.parent = {
...curatedEntity.parent,
children: entity.siblings.map(sibling => curateEntity({
...sibling,
parent: curatedEntity.parent,
}, includeParameters)),
};
if (entity.included_children) {
curatedEntity.includedChildren = entity.included_children.map(child => curateEntity({
...child,
parent: curatedEntity.id ? curatedEntity : null,
}, includeParameters));
}
if (entity.tags) {
@@ -119,7 +116,11 @@ async function fetchIncludedEntities() {
)
/* select recursive channels as children of networks */
SELECT
parents.*, json_agg(included_entities ORDER BY included_entities.id) as children
parents.*,
json_agg(included_entities ORDER BY included_entities.id) included_children,
(SELECT json_agg(children)
FROM entities AS children
WHERE children.parent_id = parents.id) children
FROM
included_entities
LEFT JOIN
@@ -130,9 +131,6 @@ async function fetchIncludedEntities() {
parents.id;
`, include);
// console.log(rawNetworks.rows[0]);
// console.log(rawNetworks.toString());
const curatedNetworks = rawNetworks.rows.map(entity => curateEntity(entity, true));
return curatedNetworks;