@koalarx/nest 3.1.19 → 3.1.21

package/core/database/repository.base.js

@@ -108,19 +108,26 @@ class RepositoryBase {
         return selectSchema;
     }
     getPropNameFromEntitySource(source, entity) {
-        return Object.keys(source).find((key) => {
-            const propDefinitions = auto_mapping_list_1.AutoMappingList.getPropDefinitions(source.constructor, key);
-            if (propDefinitions) {
-                if (propDefinitions.type === entity.name) {
+        const entityProps = auto_mapping_list_1.AutoMappingList.getAllProps(source);
+        return entityProps.find((prop) => {
+            let instance;
+            try {
+                instance = new (prop.type())();
+            }
+            catch {
+                instance = null;
+            }
+            if (instance) {
+                if (instance.constructor.name === entity.name) {
                     return true;
                 }
-                else if (source[key] instanceof list_1.List) {
-                    const list = source[key];
+                else if (source[prop.name] instanceof list_1.List) {
+                    const list = source[prop.name];
                     return list.entityType?.name === entity.name;
                 }
             }
             return false;
-        });
+        })?.name;
     }
     listRelationEntities(entity, fromList = false) {
         const relationEntities = [];
@@ -150,13 +157,13 @@ class RepositoryBase {
                 const entityInstance = list.entityType;
                 const modelName = entityInstance.name;
                 const parentModelName = entity.constructor.name;
-                const parentPropName = this.getPropNameFromEntitySource(new entityInstance(), entity.constructor) ?? (0, KlString_1.toCamelCase)(parentModelName);
+                const parentPropName = this.getPropNameFromEntitySource(entityInstance, entity.constructor) ?? (0, KlString_1.toCamelCase)(parentModelName);
                 if (modelName) {
                     list.toArray('removed').forEach((item) => {
                         relationDeletes.push({
                             modelName: (0, KlString_1.toCamelCase)(modelName),
                             entityInstance,
-                            schema: { id: item._id },
+                            schema: this.getWhereByIdSchema(item, item),
                             relations: [],
                         });
                     });
@@ -179,7 +186,7 @@ class RepositoryBase {
                             modelName: (0, KlString_1.toCamelCase)(modelName),
                             entityInstance,
                             schema: {
-                                where: { id: item._id },
+                                where: this.getWhereByIdSchema(item, item),
                                 data: this.entityToPrisma(item),
                                 select: this.getSelectRootPrismaSchema(item.constructor),
                             },
@@ -375,9 +382,9 @@ class RepositoryBase {
                         return this.persistRelations(transaction, relation);
                     });
                 }));
-            })),
-            ...relationUpdates.map((relation) => transaction[relation.modelName].update(relation.schema)),
-            ...relationDeletes.map((relation) => transaction[relation.modelName].deleteMany({ where: relation.schema })),
+            }), ...relationUpdates.map((relation) => transaction[relation.modelName].update(relation.schema)), ...relationDeletes.map((relation) => transaction[relation.modelName].deleteMany({
+                where: relation.schema,
+            }))),
         ]);
     }
     context(transactionalClient) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@koalarx/nest",
-  "version": "3.1.19",
+  "version": "3.1.21",
   "description": "",
   "author": "Igor D. Rangel",
   "license": "MIT",