pangea-server 3.3.116 → 3.3.118

package/dist/database/db.class.js

@@ -304,31 +304,37 @@ function getFinalOrder(order, config = {}) {
     });
     return [...finalOrder, ...(!config.attributes ? [['createdAt', 'DESC']] : [])];
 }
-function processInstance(model, instance) {
+function processRelInstance(model, jsonInstance) {
     for (const [relName] of Object.entries(model.Relations)) {
-        console.log('relName: ', relName);
-        const relInstance = instance[relName];
-        console.log('relInstance');
+        const relInstance = jsonInstance[relName];
         if (!relInstance)
             continue;
         const relModel = model.Relations[relName].getModelFn();
         if (Array.isArray(relInstance)) {
-            console.log('Array.isArray(relInstance)');
-            relInstance.forEach((i) => processInstance(relModel, i));
+            jsonInstance[relName] = relInstance.map((relIns) => processRelInstance(relModel, relIns));
         }
         else {
-            console.log('!!! Array.isArray(relInstance)');
-            console.dir(relInstance.toJSON(), { depth: 1 });
-            processInstance(relModel, relInstance);
+            jsonInstance[relName] = processRelInstance(relModel, relInstance);
         }
     }
-    console.log(model.name);
+    model.InitInstance(jsonInstance);
+    return jsonInstance;
+}
+function processInstance(model, instance) {
     const jsonInstance = instance.toJSON();
-    console.log('jsonInstance');
-    console.dir(jsonInstance, { depth: 1 });
+    for (const [relName] of Object.entries(model.Relations)) {
+        const relInstance = jsonInstance[relName];
+        if (!relInstance)
+            continue;
+        const relModel = model.Relations[relName].getModelFn();
+        if (Array.isArray(relInstance)) {
+            jsonInstance[relName] = relInstance.map((relIns) => processRelInstance(relModel, relIns));
+        }
+        else {
+            jsonInstance[relName] = processRelInstance(relModel, relInstance);
+        }
+    }
     model.InitInstance(jsonInstance);
-    console.log('model.InitInstance()');
-    console.dir(jsonInstance, { depth: 1 });
     return jsonInstance;
 }
 function processInstances(model, instances) {

package/package.json

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