@reldens/storage 0.10.0-beta.33 → 0.10.0-beta.37

package/lib/base-driver.js

@@ -162,7 +162,7 @@ class BaseDriver
             Logger.error('Custom query method not found in raw model.', methodName, this.rawModel);
             return false;
         }
-        return this.rawModel[methodName](methodOptions);
+        return this.rawModel[methodName](methodOptions, this);
     }
 
 }

package/lib/mikro-orm/mikro-orm-driver.js

@@ -54,7 +54,7 @@ class MikroOrmDriver extends BaseDriver
 
     async create(params)
     {
-        let newInstance = this.rawModel.factory.create(params);
+        let newInstance = this.rawModel.entity.createByProps(params);
         await this.repository.persist(newInstance).flush();
         return newInstance;
     }
@@ -132,7 +132,7 @@ class MikroOrmDriver extends BaseDriver
 
     async loadAllWithRelations(relations)
     {
-        let entities = await this.repository.find(filter, this.queryBuilder(true, true, true));
+        let entities = await this.loadAll();
         return await this.appendRelationsToCollection(entities, relations);
     }
 
@@ -232,8 +232,11 @@ class MikroOrmDriver extends BaseDriver
     async appendRelationsToCollection(entitiesCollection, relations)
     {
         // @TODO - BETA - Refactor. I would like to use populate but it may not work if the driver is not Mongo DB.
+        if(typeof this.rawModel.entity.relationsMappings !== 'function'){
+            return entitiesCollection;
+        }
         if(!sc.isArray(relations) || 0 === relations.length){
-            relations = Object.keys(this.rawModel.relationsMappings || {});
+            relations = Object.keys(this.rawModel.entity.relationsMappings() || {});
         }
         if(0 === relations.length){
             return entitiesCollection;
@@ -247,8 +250,12 @@ class MikroOrmDriver extends BaseDriver
     async appendRelatedEntities(entity, relations)
     {
         // @TODO - BETA - Refactor and improve.
+        if(typeof this.rawModel.entity.relationsMappings !== 'function'){
+            return entity;
+        }
+        let relationsMappings = this.rawModel.entity.relationsMappings();
         for(let i of relations){
-            let relation = this.rawModel.relationsMappings[i];
+            let relation = relationsMappings[i];
             let relationRepository = this.server.getEntity(relation.entityName);
             let isManyToOne = 'm:1' === relation.reference;
             let isOneToMany = '1:m' === relation.reference;
@@ -259,18 +266,20 @@ class MikroOrmDriver extends BaseDriver
                 entity[i] = await relationRepository.loadBy(relation.join.to, entity[relation.join.from]);
             }
         }
+        return entity;
     }
 
     async createNested(newInstance, params)
     {
-        if(!sc.hasOwn(this.rawModel, 'relationsMappings')){
+        if(typeof this.rawModel.entity.relationsMappings !== 'function'){
             return false;
         }
-        for(let i of Object.keys(this.rawModel.relationsMappings)){
+        let relationsMappings = this.rawModel.entity.relationsMappings();
+        for(let i of Object.keys(relationsMappings)){
             // @TODO - BETA - Refactor and improve.
-            let relationData = this.rawModel.relationsMappings[i];
-            let relationFactory = this.server.entityManager.get(relationData.entityName).rawModel.factory;
-            if(!relationFactory){
+            let relationData = relationsMappings[i];
+            let relationEntity = this.server.entityManager.get(relationData.entityName).rawModel.entity;
+            if(!relationEntity){
                 Logger.warning('Factory not found for relation definition:', relationData);
                 continue;
             }
@@ -280,30 +289,30 @@ class MikroOrmDriver extends BaseDriver
                 if(!sc.hasOwn(params, relationData.join.from) || !params[relationData.join.from]){
                     continue;
                 }
-                await this.createOne(params, i, relationFactory, newInstance, relationData);
+                await this.createOne(params, i, relationEntity, newInstance, relationData);
                 continue;
             }
             if(isOneToMany){
-                await this.createMany(params, i, relationFactory, newInstance, relationData);
+                await this.createMany(params, i, relationEntity, newInstance, relationData);
             }
         }
     }
 
-    async createOne(params, i, relationFactory, newInstance, relationData)
+    async createOne(params, i, relationEntity, newInstance, relationData)
     {
         params[i] = newInstance[relationData.join.from];
-        let nestedObject = relationFactory.create(params[i]);
+        let nestedObject = relationEntity.createByProps(params[i]);
         await this.repository.persist(nestedObject).flush();
         await this.orm.em.flush();
         newInstance[i] = nestedObject;
     }
 
-    async createMany(params, i, relationFactory, newInstance, relationData)
+    async createMany(params, i, relationEntity, newInstance, relationData)
     {
         let nestedArray = [];
         for(let objectData of params[i]){
             objectData[relationData.join.to] = newInstance[relationData.join.from];
-            let nestedObject = relationFactory.create(objectData);
+            let nestedObject = relationEntity.createByProps(objectData);
             await this.repository.persist(nestedObject).flush();
             await this.orm.em.flush();
             nestedArray.push(nestedObject);

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@reldens/storage",
     "scope": "@reldens",
-    "version": "0.10.0-beta.33",
+    "version": "0.10.0-beta.37",
     "description": "Reldens - Storage",
     "author": "Damian A. Pastorini",
     "license": "MIT",
@@ -44,8 +44,8 @@
         "url": "https://github.com/damian-pastorini/reldens-storage/issues"
     },
     "dependencies": {
-        "@mikro-orm/core": "^5.0.0",
-        "@mikro-orm/mongodb": "^5.0.0",
+        "@mikro-orm/core": "^5.0.1",
+        "@mikro-orm/mongodb": "^5.0.1",
         "@reldens/utils": "^0.10.0-beta.4",
         "knex": "^1.0.3",
         "mysql": "^2.18.1",