@koalarx/nest 3.1.8 → 3.1.10

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

@@ -13,7 +13,7 @@ export declare abstract class RepositoryBase<TEntity extends EntityBase<TEntity>
     protected _context: TContext;
     private readonly _modelName;
     private readonly _includeFindMany?;
-    constructor({ context, modelName, }: RepositoryInitProps<TEntity, TContext>);
+    constructor({ context, modelName }: RepositoryInitProps<TEntity, TContext>);
     private getConnectPrismaSchemaForRelation;
     private getSelectRootPrismaSchema;
     private getPropNameFromEntitySource;

package/core/database/repository.base.js

@@ -12,7 +12,7 @@ class RepositoryBase {
     _context;
     _modelName;
     _includeFindMany;
-    constructor({ context, modelName, }) {
+    constructor({ context, modelName }) {
         this._context = context;
         this._modelName = modelName;
         this._includeFindMany = (0, generate_prisma_include_schema_1.generateIncludeSchema)({
@@ -207,11 +207,13 @@ class RepositoryBase {
     async enrichEntityWithRelations(entity) {
         const relationQueries = [];
         const relationKeys = [];
-        Object.keys(entity).forEach((key) => {
-            const propDef = auto_mapping_list_1.AutoMappingList.getPropDefinitions(this._modelName.prototype, key);
+        const allProps = auto_mapping_list_1.AutoMappingList.getAllProps(this._modelName);
+        allProps.forEach((prop) => {
+            const propName = prop.name;
+            const propDef = auto_mapping_list_1.AutoMappingList.getPropDefinitions(this._modelName.prototype, propName);
             if (propDef) {
-                relationKeys.push(key);
-                relationQueries.push(this.loadRelationForEntity(entity[this.getIdPropName()], key));
+                relationKeys.push(propName);
+                relationQueries.push(this.loadRelationForEntity(entity[this.getIdPropName()], propName));
             }
         });
         if (relationQueries.length > 0) {
@@ -289,30 +291,22 @@ class RepositoryBase {
         return this.createEntity(enrichedEntity);
     }
     async findFirst(where) {
-        return this.context()
-            .findFirst({
-            include: this.getInclude(),
+        const entity = await this.context().findFirst({
             where,
-        })
-            .then((response) => {
-            if (response) {
-                return this.createEntity(response);
-            }
-            return null;
         });
+        if (!entity)
+            return null;
+        const enrichedEntity = await this.enrichEntityWithRelations(entity);
+        return this.createEntity(enrichedEntity);
     }
     async findUnique(where) {
-        return this.context()
-            .findUnique({
-            include: this.getInclude(),
+        const entity = await this.context().findUnique({
             where,
-        })
-            .then((response) => {
-            if (response) {
-                return this.createEntity(response);
-            }
-            return null;
         });
+        if (!entity)
+            return null;
+        const enrichedEntity = await this.enrichEntityWithRelations(entity);
+        return this.createEntity(enrichedEntity);
     }
     async findMany(where, pagination) {
         return this.context()

package/core/mapping/auto-mapping-list.d.ts

@@ -20,6 +20,7 @@ export declare class AutoMappingList {
         compositionType?: () => Type<any> | ArrayConstructor;
         compositionAction?: "onlySet" | "addTo";
     } | undefined;
+    static getAllProps(source: Type<any>): import("./auto-mapping-class-context").AutoMappingClassProp[];
     static getTargets(source: Type<any>): Type<any>[];
     static addMappedProp(source: Type<any>, propName: string): void;
     static addExtendedPropsIntoSubClass(source: Type<any>): void;

package/core/mapping/auto-mapping-list.js

@@ -50,6 +50,11 @@ class AutoMappingList {
             type: (0, get_type_by_prop_1.getTypeByProp)(prop),
         };
     }
+    static getAllProps(source) {
+        this.initializeLists();
+        const mappedClass = this._mappedPropList.find((mp) => mp.source.name === source.name);
+        return mappedClass?.props.toArray() ?? [];
+    }
     static getTargets(source) {
         this.initializeLists();
         return this._mappingProfileList.filter((mp) => mp.source.name === source.name ||

package/package.json

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