@koalarx/nest 3.1.42 → 3.1.44

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

@@ -34,6 +34,8 @@ export declare abstract class RepositoryBase<TEntity extends EntityBase<TEntity>
     private loadEntityFromCache;
     private enrichEntityWithRelations;
     private persistRelations;
+    private setIdOnEntity;
+    private autofillCreatedId;
     protected context(transactionalClient?: TContext): TContext[TModelKey];
     protected findById(id: IComparableId): Promise<TEntity | null>;
     protected findFirst<T>(where: T): Promise<TEntity | null>;

package/core/database/repository.base.js

@@ -489,6 +489,29 @@ class RepositoryBase {
             ]);
         }
     }
+    setIdOnEntity(entityInstance, data) {
+        const idPropName = this.getIdPropName(entityInstance);
+        if (!Array.isArray(idPropName)) {
+            entityInstance[idPropName] = data[idPropName];
+            entityInstance._id = data[idPropName];
+        }
+        else {
+            idPropName.forEach((propName) => {
+                entityInstance[propName] = data[propName];
+            });
+            entityInstance._id = idPropName.map((name) => data[name]).join('-');
+        }
+        entityInstance._action = entity_base_1.EntityActionType.update;
+        entityInstance._hasUpdate = false;
+    }
+    autofillCreatedId(entity, response) {
+        this.setIdOnEntity(entity, response);
+        Object.keys(entity).forEach((key) => {
+            if (entity[key] instanceof entity_base_1.EntityBase && response[key]) {
+                this.setIdOnEntity(entity[key], response[key]);
+            }
+        });
+    }
     context(transactionalClient) {
         const modelName = this._modelName.name;
         if (!modelName)
@@ -556,18 +579,10 @@ class RepositoryBase {
             return this.withTransaction((client) => this.context(client)
                 .create({
                 data: prismaEntity,
-                include: this.getInclude(),
+                select: this.getSelectRootPrismaSchema(entity.constructor),
             })
                 .then((response) => {
-                const idPropName = this.getIdPropName(entity);
-                if (!Array.isArray(idPropName)) {
-                    entity[idPropName] = response[idPropName];
-                }
-                else {
-                    idPropName.forEach((propName) => {
-                        entity[propName] = response[propName];
-                    });
-                }
+                this.autofillCreatedId(entity, response);
                 return this.persistRelations(client, entity).then(() => entity);
             }));
         }
@@ -577,8 +592,12 @@ class RepositoryBase {
                 .update({
                 where,
                 data: prismaEntity,
+                select: this.getSelectRootPrismaSchema(entity.constructor),
             })
-                .then(() => this.persistRelations(client, entity))).then(() => this.findUnique(where));
+                .then((response) => {
+                this.autofillCreatedId(entity, response);
+                return this.persistRelations(client, entity);
+            })).then(() => this.findUnique(where));
         }
     }
     async saveMany(entities, updateWhere) {

package/package.json

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