@koalarx/nest 1.18.14 → 1.18.16

package/core/database/repository.base.d.ts

@@ -27,6 +27,7 @@ export declare abstract class RepositoryBase<TEntity extends EntityBase<TEntity>
     private orphanRemoval;
     private getIdPropName;
     private getInclude;
+    private getPropNameFromEntitySource;
     private persistRelations;
     protected context(transactionalClient?: TContext): TContext[TModelKey];
     protected findById(id: IComparableId): Promise<TEntity | null>;

package/core/database/repository.base.js

@@ -6,6 +6,7 @@ const pagination_dto_1 = require("../dtos/pagination.dto");
 const koala_global_vars_1 = require("../koala-global-vars");
 const list_1 = require("../utils/list");
 const entity_base_1 = require("./entity.base");
+const auto_mapping_list_1 = require("../mapping/auto-mapping-list");
 class RepositoryBase {
     _context;
     _modelName;
@@ -43,12 +44,14 @@ class RepositoryBase {
         Object.keys(entity).forEach((key) => {
             if (entity[key] instanceof list_1.List) {
                 const list = entity[key];
-                const modelName = list.entityType?.name;
+                const entityInstance = list.entityType;
+                const modelName = entityInstance.name;
                 const parentModelName = entity.constructor.name;
                 if (modelName) {
                     list.toArray('removed').forEach((item) => {
                         relationDeletes.push({
                             modelName: (0, KlString_1.toCamelCase)(modelName),
+                            entityInstance,
                             schema: { where: { id: item._id } },
                             relations: [],
                         });
@@ -56,6 +59,7 @@ class RepositoryBase {
                     list.toArray('added').forEach((item) => {
                         relationCreates.push({
                             modelName: (0, KlString_1.toCamelCase)(modelName),
+                            entityInstance,
                             schema: {
                                 data: {
                                     ...this.entityToPrisma(item),
@@ -72,6 +76,7 @@ class RepositoryBase {
                     list.toArray('updated').forEach((item) => {
                         relationUpdates.push({
                             modelName: (0, KlString_1.toCamelCase)(modelName),
+                            entityInstance,
                             schema: {
                                 where: { id: item._id },
                                 data: this.entityToPrisma(item),
@@ -129,8 +134,8 @@ class RepositoryBase {
             take: (pagination?.limit ?? 0) > 0 ? pagination?.limit : undefined,
         };
     }
-    createEntity(data) {
-        const entity = new this._modelName();
+    createEntity(data, entityClass) {
+        const entity = new (entityClass || this._modelName)();
         entity._action = entity_base_1.EntityActionType.update;
         entity.automap(data);
         return entity;
@@ -160,6 +165,21 @@ class RepositoryBase {
         });
         return result;
     }
+    getPropNameFromEntitySource(source, entity) {
+        return Object.keys(source).find((key) => {
+            const propDefinitions = auto_mapping_list_1.AutoMappingList.getPropDefinitions(source, key);
+            if (propDefinitions) {
+                if (propDefinitions.type === entity.constructor.name) {
+                    return true;
+                }
+                else if (source[key] instanceof list_1.List) {
+                    const list = source[key];
+                    return list.entityType?.name === entity.constructor.name;
+                }
+            }
+            return false;
+        });
+    }
     persistRelations(transaction, entity) {
         const { relationCreates, relationUpdates, relationDeletes } = this.listToRelationActionList(entity);
         return Promise.all([
@@ -167,10 +187,12 @@ class RepositoryBase {
                 .create(relationCreate.schema)
                 .then((response) => {
                 return Promise.all(relationCreate.relations.map((relation) => {
-                    const relationEntity = entity[(0, KlString_1.toCamelCase)(relation.constructor.name)];
-                    relationEntity[this.getIdPropName(relationEntity)] =
-                        response[this.getIdPropName(relationEntity)];
-                    return this.persistRelations(transaction, relationEntity);
+                    const relationPropName = this.getPropNameFromEntitySource(relation, relationCreate.entityInstance);
+                    if (!relationPropName) {
+                        throw new Error(`Propname not found for relation entity ${relation.constructor.name} on entity ${relationCreate.entityInstance.constructor.name}`);
+                    }
+                    relation[relationPropName] = this.createEntity(response, relationCreate.entityInstance);
+                    return this.persistRelations(transaction, relation);
                 }));
             })),
             ...relationUpdates.map((relation) => transaction[relation.modelName].update(relation.schema)),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@koalarx/nest",
-  "version": "1.18.14",
+  "version": "1.18.16",
   "description": "",
   "repository": {
     "type": "git",