Updated links for deeply nested documents

Author: bhunjadi

lib/query/hypernova/aggregateSearchFilters.js

@@ -9,10 +9,10 @@ function getIdsFromObject(object, field) {
 
     const rootValue = object[parts[0]];
     if (_.isArray(rootValue)) {
-        return rootValue.map(item => dot.pick(parts.slice(1).join(','), item));
+        return rootValue.map(item => dot.pick(parts.slice(1).join('.'), item));
     }
     else if (_.isObject(rootValue)) {
-        return [dot.pick(parts.slice(1).join(','), rootValue)];
+        return [dot.pick(parts.slice(1).join('.'), rootValue)];
     }
     return [];
 }

lib/query/hypernova/assembler.js

@@ -180,7 +180,8 @@ export function assembleOne(parentResult, {
                 resultsByKeyId[value],
                 { limit, skip }
             );
-            result[path.slice(1).join('.')] = data;
+            dot.set(path.slice(1).join('.'), data, result);
+            // result[path.slice(1).join('.')] = data;
         });
         return;
     }
@@ -206,7 +207,6 @@ export default (childCollectionNode, { limit, skip, metaFilters }) => {
     const linker = childCollectionNode.linker;
 
     const strategy = linker.strategy;
-    const isSingle = linker.isSingle();
     const isMeta = linker.isMeta();
     const fieldStorage = linker.linkStorageField;
 

lib/query/lib/createGraph.js

@@ -1,3 +1,4 @@
+import dot from 'dot-object';
 import CollectionNode from '../nodes/collectionNode.js';
 import FieldNode from '../nodes/fieldNode.js';
 import ReducerNode from '../nodes/reducerNode.js';
@@ -90,6 +91,32 @@ function isProjectionOperatorExpression(body) {
     return false;
 }
 
+function tryFindLink(root, dottizedPath) {
+    // This would be the link in form of {nestedDocument: {linkedCollection: {...fields...}}}
+    const parts = dottizedPath.split('.');
+    const firstPart = parts.slice(0, 2);
+    // Here we have a situation where we have link inside a nested document of a nested document
+    // {nestedDocument: {subnestedDocument: {linkedCollection: {...fields...}}}
+    const nestedParts = parts.slice(2);
+
+    const potentialLinks = nestedParts.reduce((acc, part) => {
+        return [
+            ...acc,
+            `${_.last(acc)}.${part}`,
+        ];
+    }, [firstPart.join('.')]);
+
+    // Trying to find topmost link
+    while (potentialLinks[0]) {
+        const linkerKey = potentialLinks.splice(0, 1);
+        const linker = root.collection.getLinker(linkerKey);
+        if (linker) {
+            return linker;
+        }
+    }
+}
+
+
 /**
  * @param body
  * @param fieldName
@@ -102,13 +129,13 @@ export function addFieldNode(body, fieldName, root) {
             let dotted = dotize.convert({[fieldName]: body});
             _.each(dotted, (value, key) => {
                 // check for link
-                const parts = key.split('.');
-                const linkerKey = parts.slice(0, 2).join('.');
+                const linker = tryFindLink(root, key);
 
-                const linker = root.collection.getLinker(linkerKey);
+                if (linker && !root.hasCollectionNode(linker.linkName)) {
+                    const path = linker.linkName.split('.').slice(1).join('.');
+                    const subrootBody = dot.pick(path, body);
 
-                if (linker && !root.hasCollectionNode(linkerKey)) {
-                    const subroot = new CollectionNode(linker.getLinkedCollection(), body[parts[1]], linkerKey);
+                    const subroot = new CollectionNode(linker.getLinkedCollection(), subrootBody, linker.linkName);
                     // must be before adding linker because _shouldCleanStorage method
                     createNodes(subroot);
                     root.add(subroot, linker);