pangea-server 1.0.20 → 1.0.21

package/dist/database/db.class.js

@@ -206,12 +206,9 @@ function convertWhereKeys(obj) {
 function getIncludeAndWhere(model, includeItems, where, relDepth = new Map(), parentKey = model.name) {
     const includeOptions = [];
     const cleanWhere = { ...where };
-    console.log(`----- Model: ${model.name} -----`);
     for (const [relName, rel] of Object.entries(model.Relations)) {
         const relKey = `${parentKey}->${relName}`;
-        console.log(`----- relKey: ${relKey} -----`);
         const currentDepth = relDepth.get(relKey) || 0;
-        console.log(`----- currentDepth: ${currentDepth} -----`);
         const maxDepth = rel.joinDepth;
         if (currentDepth >= maxDepth)
             continue;
@@ -223,14 +220,14 @@ function getIncludeAndWhere(model, includeItems, where, relDepth = new Map(), pa
         const newRelDepth = new Map(relDepth);
         newRelDepth.set(relKey, currentDepth + 1);
         const relModel = rel.getModelFn();
-        console.log(`----- relModel: ${relModel.name} -----`);
+        const nestedResult = getIncludeAndWhere(relModel, nestedIncludeItems, relWhere, newRelDepth, relKey);
         includeOptions.push({
             model: relModel,
             as: relName,
             required: rel.required,
             paranoid: rel.paranoid,
-            subQuery: false,
-            ...getIncludeAndWhere(relModel, nestedIncludeItems, relWhere, newRelDepth, relKey),
+            include: nestedResult.include,
+            ...(nestedResult.where && { where: nestedResult.where }),
         });
     }
     return {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "pangea-server",
   "description": "",
-  "version": "1.0.20",
+  "version": "1.0.21",
   "files": [
     "dist"
   ],