@koalarx/nest 3.1.13 → 3.1.14

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

@@ -28,6 +28,7 @@ export declare abstract class RepositoryBase<TEntity extends EntityBase<TEntity>
     private findManySchema;
     private createEntity;
     private orphanRemoval;
+    private getIdOnEntity;
     private loadRelationForEntity;
     private enrichEntityWithRelations;
     private persistRelations;

package/core/database/repository.base.js

@@ -22,18 +22,30 @@ class RepositoryBase {
         });
     }
     getIdPropName(entity) {
-        return (Reflect.getMetadata('entity:id', entity ? entity.constructor.prototype : this._modelName.prototype) ?? 'id');
+        const idConfig = Reflect.getMetadata('entity:id', entity ? entity.constructor.prototype : this._modelName.prototype);
+        if (idConfig) {
+            if (idConfig.single) {
+                return idConfig.single;
+            }
+            else if (idConfig.composite) {
+                return idConfig.composite;
+            }
+        }
+        return 'id';
     }
     getWhereByIdSchema(entity, value) {
         const propIdName = this.getIdPropName(entity);
         if (Array.isArray(propIdName)) {
             const whereSchema = {};
             propIdName.forEach((propName) => {
-                whereSchema[propName] = value[propName];
+                whereSchema[propName] =
+                    typeof value === 'object' ? value[propName] : value;
             });
             return whereSchema;
         }
-        return { [propIdName]: value[propIdName] };
+        return {
+            [propIdName]: typeof value === 'object' ? value[propIdName] : value,
+        };
     }
     getConnectPrismaSchemaForRelation(entity, data) {
         return {
@@ -74,14 +86,14 @@ class RepositoryBase {
             }
             if (instance instanceof entity_base_1.EntityBase) {
                 selectSchema[prop.name] = {
-                    select: this.getSelectRootPrismaSchema(instance),
+                    select: this.getWhereByIdSchema(instance, true),
                 };
             }
             else if (instance instanceof list_1.List) {
                 const list = new entity()[prop.name];
                 const entityInstance = list.entityType;
                 selectSchema[prop.name] = {
-                    select: this.getSelectRootPrismaSchema(new entityInstance()),
+                    select: this.getWhereByIdSchema(new entityInstance(), true),
                 };
             }
             else {
@@ -243,15 +255,28 @@ class RepositoryBase {
             .forEach((key) => (where[key] = entity[key]));
         return client[(0, KlString_1.toCamelCase)(entity.constructor.name)].delete({ where });
     }
-    async loadRelationForEntity(where, entity) {
+    getIdOnEntity(entity, data) {
+        const propIdName = this.getIdPropName(entity);
+        if (Array.isArray(propIdName)) {
+            const idValues = [];
+            propIdName.forEach((propName) => {
+                idValues.push(data[propName]);
+            });
+            return idValues.join('-');
+        }
+        return data[propIdName];
+    }
+    async loadRelationForEntity(where, entity, cache) {
         return this._context[(0, KlString_1.toCamelCase)((0, KlString_1.toCamelCase)(entity.name))]
-            .findUnique({
+            .findFirst({
             select: this.getSelectWithRelationsId(entity),
             where,
         })
-            .then((data) => this.enrichEntityWithRelations(entity, data));
+            .then((data) => this.enrichEntityWithRelations(entity, data, cache));
     }
-    async enrichEntityWithRelations(entity, data) {
+    async enrichEntityWithRelations(entity, data, cache = new Map()) {
+        if (!data)
+            return data;
         const relationQueries = [];
         const relationKeys = [];
         const allProps = auto_mapping_list_1.AutoMappingList.getAllProps(entity);
@@ -264,15 +289,27 @@ class RepositoryBase {
                 relationKeys.push(propName);
                 const items = [];
                 data[propName].forEach((item) => {
-                    items.push(this.loadRelationForEntity(item, entityInstance));
+                    const cacheKey = `${entity.constructor.name}-${propName}-${this.getIdOnEntity(new entityInstance(), item)}`;
+                    if (cache.has(cacheKey)) {
+                        items.push(Promise.resolve(cache.get(cacheKey)));
+                        return;
+                    }
+                    cache.set(cacheKey, item);
+                    items.push(this.loadRelationForEntity(item, entityInstance, cache));
                 });
                 relationQueries.push(Promise.all(items));
                 return;
             }
             const relationEntity = auto_mapping_list_1.AutoMappingList.getSourceByName(propDef?.type ?? '');
             if (relationEntity && data[propName]) {
+                const cacheKey = `${entity.constructor.name}-${propName}-${this.getIdOnEntity(new relationEntity(), data[propName])}`;
+                if (cache.has(cacheKey)) {
+                    data[propName] = cache.get(cacheKey);
+                    return;
+                }
+                cache.set(cacheKey, data[propName]);
                 relationKeys.push(propName);
-                relationQueries.push(this.loadRelationForEntity(this.getWhereByIdSchema(relationEntity, data[propName]), relationEntity));
+                relationQueries.push(this.loadRelationForEntity(this.getWhereByIdSchema(relationEntity, data[propName]), relationEntity, cache));
             }
         });
         if (relationQueries.length > 0) {
@@ -341,7 +378,7 @@ class RepositoryBase {
         });
         if (!data)
             return null;
-        const enrichedEntity = await this.enrichEntityWithRelations(this._modelName.prototype.constructor, data);
+        const enrichedEntity = await this.enrichEntityWithRelations(this._modelName.prototype.constructor, { ...data });
         return this.createEntity(enrichedEntity);
     }
     async findFirst(where) {
@@ -351,7 +388,7 @@ class RepositoryBase {
         });
         if (!data)
             return null;
-        const enrichedEntity = await this.enrichEntityWithRelations(this._modelName.prototype.constructor, data);
+        const enrichedEntity = await this.enrichEntityWithRelations(this._modelName.prototype.constructor, { ...data });
         return this.createEntity(enrichedEntity);
     }
     async findUnique(where) {
@@ -361,7 +398,7 @@ class RepositoryBase {
         });
         if (!data)
             return null;
-        const enrichedEntity = await this.enrichEntityWithRelations(this._modelName.prototype.constructor, data);
+        const enrichedEntity = await this.enrichEntityWithRelations(this._modelName.prototype.constructor, { ...data });
         return this.createEntity(enrichedEntity);
     }
     async findMany(where, pagination) {

package/package.json

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