@punks/backend-entity-manager 0.0.169 → 0.0.171

package/dist/cjs/index.js

@@ -347,9 +347,15 @@ class EntityCreateAction {
         this.logger.debug("Create action started", { input });
         const converter = this.services.resolveConverter();
         const createInput = converter?.createDtoToEntity(input) ?? input;
-        const entity = await this.services
+        const ref = await this.services
             .resolveCreateCommand()
             .execute(createInput);
+        const entity = await this.services
+            .resolveGetQuery()
+            .execute(ref.id);
+        if (!entity) {
+            throw new Error(`Newly created entity not found with id ${ref.id}`);
+        }
         const result = converter?.toEntityDto(entity) ?? entity;
         this.logger.debug("Create action completed", { input, result });
         return result;
@@ -469,9 +475,13 @@ class EntityUpdateAction {
         this.logger.debug("Update action started", { id, input });
         const converter = this.services.resolveConverter();
         const updateInput = converter?.updateDtoToEntity(input) ?? input;
-        const entity = await this.services
+        await this.services
             .resolveUpdateCommand()
             .execute(id, updateInput);
+        const entity = await this.services.resolveGetQuery().execute(id);
+        if (!entity) {
+            throw new Error(`Newly created entity not found with id ${id}`);
+        }
         const result = converter?.toEntityDto(entity) ?? entity;
         this.logger.debug("Update action started", { id, input, result });
         return result;
@@ -487,9 +497,13 @@ class EntityUpsertAction {
         this.logger.debug("Upsert action started", { id, input });
         const converter = this.services.resolveConverter();
         const updateInput = converter?.updateDtoToEntity(input) ?? input;
-        const entity = await this.services
+        await this.services
             .resolveUpsertCommand()
             .execute(id, updateInput);
+        const entity = await this.services.resolveGetQuery().execute(id);
+        if (!entity) {
+            throw new Error(`Newly created entity not found with id ${id}`);
+        }
         const result = converter?.toEntityDto(entity) ?? entity;
         this.logger.debug("Upsert action started", { id, input, result });
         return result;
@@ -522,11 +536,14 @@ class EntityCreateCommand {
         await this.authorize(entity);
         const createdItem = await this.services.resolveRepository().create(entity);
         // todo: parametrize id field
-        await this.versionEntity(createdItem.id, createdItem);
+        const id = createdItem.id;
+        await this.versionEntity(id, createdItem);
         await this.services
             .resolveEventsManager()
             .processEntityCreatedEvent(createdItem);
-        return createdItem;
+        return {
+            id,
+        };
     }
     adaptEntity(input) {
         const adapter = this.services.resolveAdapter();
@@ -794,7 +811,9 @@ class EntityUpdateCommand {
         await this.services
             .resolveEventsManager()
             .processEntityUpdatedEvent(updatedEntity);
-        return updatedEntity;
+        return {
+            id,
+        };
     }
     adaptEntity(input) {
         const adapter = this.services.resolveAdapter();
@@ -847,7 +866,9 @@ class EntityUpsertCommand {
         await this.services
             .resolveEventsManager()
             .processEntityUpdatedEvent(updatedEntity);
-        return updatedEntity;
+        return {
+            id,
+        };
     }
     async upsertEntity(id, entity) {
         return await this.services.resolveRepository().upsert(id, entity);
@@ -22239,6 +22260,9 @@ class TypeOrmQueryBuilder extends QueryBuilderBase {
         const facets = request.options?.includeFacets
             ? await this.calculateFacets(request, context)
             : undefined;
+        const childrenMap = request.options?.includeChildrenMap
+            ? await this.calculateChildrenMap(results)
+            : undefined;
         return {
             items: results,
             request,
@@ -22248,6 +22272,7 @@ class TypeOrmQueryBuilder extends QueryBuilderBase {
                 totResults: queryResults,
             }),
             facets,
+            childrenMap,
         };
     }
     async getFieldDistinctValues(field, request, context) {
@@ -22290,6 +22315,29 @@ class TypeOrmQueryBuilder extends QueryBuilderBase {
             value: typeorm.ILike(`%${request.query?.term}%`),
         }));
     }
+    calculateChildrenMap(items) {
+        return Promise.resolve({});
+    }
+    async queryChildrenMap({ nodeIds, idField, parentField, }) {
+        const result = await this.getRepository()
+            .getInnerRepository()
+            .createQueryBuilder("entity")
+            .where({
+            [parentField.toString()]: {
+                [idField.toString()]: typeorm.In(nodeIds),
+            },
+        })
+            .select(`entity.${parentField.toString()}.${idField.toString()}`, "parentId")
+            .addSelect(`COUNT(entity.${idField.toString()})`, "count")
+            .groupBy(`entity.${parentField.toString()}.${idField.toString()}`)
+            .getRawMany();
+        return result.reduce((acc, x) => {
+            acc[x.parentId] = {
+                count: parseInt(x.count),
+            };
+            return acc;
+        }, {});
+    }
     async calculateFacet(field, request, context, relations) {
         let query = this.getRepository()
             .getInnerRepository()