pangea-server 1.0.28 → 1.0.30

package/dist/database/db.class.js

@@ -19,6 +19,11 @@ class Db {
         if (typeof filters === 'number') {
             return scopedModel.findByPk(filters, { ...getIncludeAndWhere(model, include), ...baseOptions });
         }
+        console.log({
+            ...getIncludeAndWhere(model, include, filters),
+            order: getFinalOrder(order),
+            ...baseOptions,
+        });
         return scopedModel.findOne({
             ...getIncludeAndWhere(model, include, filters),
             order: getFinalOrder(order),
@@ -203,11 +208,11 @@ function convertWhereKeys(obj) {
     }
     return obj;
 }
-function getIncludeAndWhere(model, includeItems, where, relDepth = new Map(), parentKey = model.name) {
+function getIncludeAndWhere(model, includeItems, where, relDepth = new Map()) {
     const includeOptions = [];
     const cleanWhere = { ...where };
     for (const [relName, rel] of Object.entries(model.Relations)) {
-        const relKey = `${parentKey}->${relName}`;
+        const relKey = `${model.name}.${relName}`;
         const currentDepth = relDepth.get(relKey) || 0;
         const maxDepth = rel.joinDepth;
         if (currentDepth >= maxDepth)
@@ -220,14 +225,12 @@ function getIncludeAndWhere(model, includeItems, where, relDepth = new Map(), pa
         const newRelDepth = new Map(relDepth);
         newRelDepth.set(relKey, currentDepth + 1);
         const relModel = rel.getModelFn();
-        const nested = getIncludeAndWhere(relModel, nestedIncludeItems, relWhere, newRelDepth, relKey);
         includeOptions.push({
             model: relModel,
             as: relName,
             required: rel.required,
             paranoid: rel.paranoid,
-            include: nested.include,
-            ...(nested.where && { where: nested.where }),
+            ...getIncludeAndWhere(relModel, nestedIncludeItems, relWhere, newRelDepth),
         });
     }
     return {

package/package.json

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