@ruiapp/rapid-core 0.11.6 → 0.11.8

package/dist/core/pluginManager.d.ts

@@ -40,6 +40,8 @@ declare class PluginManager {
     beforeRunRouteActions(handlerContext: ActionHandlerContext): Promise<void>;
     /** 在执行 action hanlder 前调用。 */
     beforeRunActionHandler(handlerContext: ActionHandlerContext, actionConfig: RpdRouteActionConfig): Promise<void>;
+    /** 在执行 action handler 后调用。 */
+    afterRunActionHandler(handlerContext: ActionHandlerContext, actionConfig: RpdRouteActionConfig, error?: Error): Promise<void>;
     /** 在创建实体前调用。 */
     beforeCreateEntity(model: RpdDataModel, options: CreateEntityOptions): Promise<void>;
     /** 在更新实体前调用。 */

package/dist/core/server.d.ts

@@ -34,6 +34,7 @@ export interface IRpdServer {
     runActionHandlers(handlerContext: ActionHandlerContext, actions: RpdRouteActionConfig[]): Promise<void>;
     beforeRunRouteActions(handlerContext: ActionHandlerContext): Promise<void>;
     beforeRunActionHandler(handlerContext: ActionHandlerContext, actionConfig: RpdRouteActionConfig): Promise<void>;
+    afterRunActionHandler(handlerContext: ActionHandlerContext, actionConfig: RpdRouteActionConfig, error?: Error): Promise<void>;
     beforeCreateEntity(model: RpdDataModel, options: CreateEntityOptions): Promise<void>;
     beforeUpdateEntity(model: RpdDataModel, options: UpdateEntityByIdOptions, currentEntity: any): Promise<void>;
     registerCronJob(job: CronJobConfiguration): void;
@@ -112,6 +113,8 @@ export interface RapidPlugin {
     beforeRunRouteActions?: (server: IRpdServer, handlerContext: ActionHandlerContext) => Promise<any>;
     /** 在执行 action hanlder 前调用。 */
     beforeRunActionHandler?: (server: IRpdServer, handlerContext: ActionHandlerContext, actionConfig: RpdRouteActionConfig) => Promise<any>;
+    /** 在执行 action handler 后调用。 */
+    afterRunActionHandler?: (server: IRpdServer, handlerContext: ActionHandlerContext, actionConfig: RpdRouteActionConfig, error?: Error) => Promise<any>;
     /** 在创建实体前调用。 */
     beforeCreateEntity?: (server: IRpdServer, model: RpdDataModel, options: CreateEntityOptions) => Promise<any>;
     /** 在更新实体前调用。 */

package/dist/dataAccess/entityManager.d.ts

@@ -33,7 +33,7 @@ export default class EntityManager<TEntity = any> {
     createEntity(options: CreateEntityOptions, plugin?: RapidPlugin): Promise<TEntity>;
     updateEntityById(options: UpdateEntityByIdOptions, plugin?: RapidPlugin): Promise<TEntity>;
     count(options: CountEntityOptions): Promise<number>;
-    deleteById(options: DeleteEntityByIdOptions | string | number, plugin?: RapidPlugin): Promise<void>;
-    addRelations(options: AddEntityRelationsOptions, plugin?: RapidPlugin): Promise<void>;
-    removeRelations(options: RemoveEntityRelationsOptions, plugin?: RapidPlugin): Promise<void>;
+    deleteById(options: DeleteEntityByIdOptions | string | number, plugin?: RapidPlugin): Promise<TEntity>;
+    addRelations(options: AddEntityRelationsOptions, plugin?: RapidPlugin): Promise<any>;
+    removeRelations(options: RemoveEntityRelationsOptions, plugin?: RapidPlugin): Promise<any>;
 }

package/dist/index.js

@@ -936,6 +936,14 @@ class PluginManager {
             }
         }
     }
+    /** 在执行 action handler 后调用。 */
+    async afterRunActionHandler(handlerContext, actionConfig, error) {
+        for (const plugin of this.#plugins) {
+            if (plugin.afterRunActionHandler) {
+                await plugin.afterRunActionHandler(this.#server, handlerContext, actionConfig, error);
+            }
+        }
+    }
     /** 在创建实体前调用。 */
     async beforeCreateEntity(model, options) {
         for (const plugin of this.#plugins) {
@@ -1044,9 +1052,19 @@ async function executeHandlerOfActions(server, routeConfig, handlerContext) {
                 throw new Error("Unknown handler: " + actionCode);
             }
             await server.beforeRunActionHandler(handlerContext, actionConfig);
-            const result = handler(handlerContext, actionConfig.config);
-            if (result instanceof Promise) {
-                await result;
+            let err;
+            try {
+                const result = handler(handlerContext, actionConfig.config);
+                if (result instanceof Promise) {
+                    await result;
+                }
+            }
+            catch (error) {
+                err = error;
+                throw error;
+            }
+            finally {
+                await server.afterRunActionHandler(handlerContext, actionConfig, err);
             }
         }
     }
@@ -2957,6 +2975,17 @@ async function findEntities(server, dataAccessor, options) {
     else {
         propertiesToSelect = getEntityPropertiesIncludingBase(server, model).filter((property) => options.properties.includes(property.code) || relationPropertyCodes.includes(property.code));
     }
+    const isEntitySoftDeleteEnabled = baseModel ? baseModel.softDelete || model.softDelete : model.softDelete;
+    if (options.includingSoftDeleted && isEntitySoftDeleteEnabled) {
+        const deletedAtProp = getEntityPropertyByCode(server, model, "deletedAt");
+        if (deletedAtProp && !lodash.find(propertiesToSelect, (p) => p.code === "deletedAt")) {
+            propertiesToSelect.push(deletedAtProp);
+        }
+        const deletedByProp = getEntityPropertyByCode(server, model, "deletedBy");
+        if (deletedByProp && !lodash.find(propertiesToSelect, (p) => p.code === "deletedBy")) {
+            propertiesToSelect.push(deletedByProp);
+        }
+    }
     const columnsToSelect = [];
     const relationPropertiesToSelect = [];
     lodash.forEach(propertiesToSelect, (property) => {
@@ -3174,7 +3203,7 @@ const UNDELETED_ENTITY_FILTER_OPTIONS = {
     field: "deletedAt",
 };
 function tryAddUndeletedEntityFilter(model, baseModel, filters) {
-    let isEntitySoftDeleteEnabled = baseModel ? (baseModel.softDelete || model.softDelete) : model.softDelete;
+    let isEntitySoftDeleteEnabled = baseModel ? baseModel.softDelete || model.softDelete : model.softDelete;
     if (!isEntitySoftDeleteEnabled) {
         return filters;
     }
@@ -3426,6 +3455,7 @@ async function findManyRelationLinksViaLinkTable(options) {
             },
         ],
         keepNonPropertyFields: true,
+        includingSoftDeleted: true,
     };
     if (selectRelationOptions) {
         if (typeof selectRelationOptions !== "boolean") {
@@ -3479,6 +3509,7 @@ async function findManyRelatedEntitiesViaIdPropertyCode(options) {
         ],
         extraColumnsToSelect: [relationProperty.selfIdColumnName],
         keepNonPropertyFields: true,
+        includingSoftDeleted: true,
     };
     if (selectRelationOptions) {
         if (typeof selectRelationOptions !== "boolean") {
@@ -3522,6 +3553,7 @@ async function findOneRelatedEntitiesViaIdPropertyCode(options) {
             },
         ],
         keepNonPropertyFields: true,
+        includingSoftDeleted: true,
     };
     if (selectRelationOptions) {
         if (typeof selectRelationOptions !== "boolean") {
@@ -4298,7 +4330,7 @@ async function deleteEntityById(server, dataAccessor, options, plugin) {
     if (!entity) {
         return;
     }
-    const isEntitySoftDeleteEnabled = model.base ? (baseModel.softDelete || model.softDelete) : model.softDelete;
+    const isEntitySoftDeleteEnabled = model.base ? baseModel.softDelete || model.softDelete : model.softDelete;
     if (isEntitySoftDeleteEnabled) {
         if (entity.deletedAt) {
             return;
@@ -4423,6 +4455,7 @@ async function deleteEntityById(server, dataAccessor, options, plugin) {
         sender: plugin,
         routeContext,
     });
+    return entity;
 }
 class EntityManager {
     #server;
@@ -4491,6 +4524,8 @@ class EntityManager {
             throw new Error(`Operation 'addRelations' is only supported on property of 'many' relation`);
         }
         const { queryBuilder } = server;
+        const targetEntityManager = server.getEntityManager(relationProperty.targetSingularCode);
+        const relationTargetEntities = [];
         if (relationProperty.linkTableName) {
             for (const relation of relations) {
                 const command = `INSERT INTO ${queryBuilder.quoteTable({
@@ -4504,17 +4539,24 @@ class EntityManager {
       )`;
                 const targetId = relation[relationProperty.targetIdColumnName] || relation.id;
                 const params = [selfId, targetId];
-                await server.queryDatabaseObject(command, params, routeContext?.getDbTransactionClient());
+                const result = await server.queryDatabaseObject(command, params, routeContext?.getDbTransactionClient());
+                if (result?.length > 0) {
+                    const targetEntity = await targetEntityManager.findById({
+                        routeContext,
+                        id: targetId,
+                    });
+                    relationTargetEntities.push(targetEntity);
+                }
             }
         }
         else {
-            const targetEntityManager = server.getEntityManager(relationProperty.targetSingularCode);
             for (const relation of relations) {
                 relation[relationProperty.selfIdColumnName] = selfId;
-                await targetEntityManager.createEntity({
+                const targetEntity = await targetEntityManager.createEntity({
                     routeContext,
                     entity: relation,
                 });
+                relationTargetEntities.push(targetEntity);
             }
         }
         await server.emitEvent({
@@ -4525,10 +4567,17 @@ class EntityManager {
                 entity,
                 property,
                 relations,
+                relationTargetEntities,
             },
             sender: plugin,
             routeContext: options.routeContext,
         });
+        return {
+            entity,
+            property,
+            relations,
+            relationTargetEntities,
+        };
     }
     async removeRelations(options, plugin) {
         const server = this.#server;
@@ -4549,12 +4598,21 @@ class EntityManager {
             throw new Error(`Operation 'removeRelations' is only supported on property of 'many' relation`);
         }
         const { queryBuilder } = server;
+        const targetEntityManager = server.getEntityManager(relationProperty.targetSingularCode);
+        const relationTargetEntities = [];
         if (relationProperty.linkTableName) {
             for (const relation of relations) {
                 const command = `DELETE FROM ${queryBuilder.quoteTable({ schema: relationProperty.linkSchema, tableName: relationProperty.linkTableName })}
     WHERE ${queryBuilder.quoteObject(relationProperty.selfIdColumnName)}=$1 AND ${queryBuilder.quoteObject(relationProperty.targetIdColumnName)}=$2;`;
                 const params = [id, relation.id];
-                await server.queryDatabaseObject(command, params, routeContext?.getDbTransactionClient());
+                const result = await server.queryDatabaseObject(command, params, routeContext?.getDbTransactionClient());
+                if (result?.length > 0) {
+                    const targetEntity = await targetEntityManager.findById({
+                        routeContext,
+                        id: relation.id,
+                    });
+                    relationTargetEntities.push(targetEntity);
+                }
             }
         }
         await server.emitEvent({
@@ -4565,10 +4623,17 @@ class EntityManager {
                 entity,
                 property,
                 relations,
+                relationTargetEntities,
             },
             sender: plugin,
             routeContext: options.routeContext,
         });
+        return {
+            entity,
+            property,
+            relations,
+            relationTargetEntities,
+        };
     }
 }
 
@@ -5017,7 +5082,15 @@ class RapidServer {
                 throw new Error("Unknown handler: " + actionCode);
             }
             await this.beforeRunActionHandler(handlerContext, action);
-            await handler(handlerContext, action.config);
+            try {
+                await handler(handlerContext, action.config);
+            }
+            catch (error) {
+                throw error;
+            }
+            finally {
+                await this.afterRunActionHandler(handlerContext, action);
+            }
         }
     }
     async beforeRunRouteActions(handlerContext) {
@@ -5026,6 +5099,9 @@ class RapidServer {
     async beforeRunActionHandler(handlerContext, actionConfig) {
         await this.#pluginManager.beforeRunActionHandler(handlerContext, actionConfig);
     }
+    async afterRunActionHandler(handlerContext, actionConfig, error) {
+        await this.#pluginManager.afterRunActionHandler(handlerContext, actionConfig, error);
+    }
     async beforeCreateEntity(model, options) {
         await this.#pluginManager.beforeCreateEntity(model, options);
     }
@@ -6449,13 +6525,15 @@ async function handler$o(plugin, ctx, options) {
             routeContext: routeContext,
             filters,
         });
+        const outputs = [];
         for (const entity of entities) {
-            await entityManager.deleteById({
+            const output = await entityManager.deleteById({
                 routeContext,
                 id: entity.id,
             }, plugin);
+            outputs.push(output);
         }
-        return {};
+        return outputs;
     });
 }
 
@@ -6469,11 +6547,11 @@ const code$n = "deleteCollectionEntityById";
 async function handler$n(plugin, ctx, options) {
     await runCollectionEntityActionHandler(ctx, options, code$n, true, true, async (entityManager, input) => {
         const { routerContext: routeContext } = ctx;
-        await entityManager.deleteById({
+        const output = await entityManager.deleteById({
             id: input.id,
             routeContext,
         }, plugin);
-        return {};
+        return output;
     });
 }
 
@@ -6488,8 +6566,8 @@ async function handler$m(plugin, ctx, options) {
     await runCollectionEntityActionHandler(ctx, options, code$m, true, true, async (entityManager, input) => {
         const { routerContext: routeContext } = ctx;
         input.routeContext = routeContext;
-        await entityManager.addRelations(input, plugin);
-        return {};
+        const result = await entityManager.addRelations(input, plugin);
+        return result;
     });
 }
 
@@ -6504,8 +6582,8 @@ async function handler$l(plugin, ctx, options) {
     await runCollectionEntityActionHandler(ctx, options, code$l, true, true, async (entityManager, input) => {
         const { routerContext: routeContext } = ctx;
         input.routeContext = routeContext;
-        await entityManager.removeRelations(input, plugin);
-        return {};
+        const result = await entityManager.removeRelations(input, plugin);
+        return result;
     });
 }
 

package/dist/server.d.ts

@@ -60,6 +60,7 @@ export declare class RapidServer implements IRpdServer {
     runActionHandlers(handlerContext: ActionHandlerContext, actions: RpdRouteActionConfig[]): Promise<void>;
     beforeRunRouteActions(handlerContext: ActionHandlerContext): Promise<void>;
     beforeRunActionHandler(handlerContext: ActionHandlerContext, actionConfig: RpdRouteActionConfig): Promise<void>;
+    afterRunActionHandler(handlerContext: ActionHandlerContext, actionConfig: RpdRouteActionConfig, error?: Error): Promise<void>;
     beforeCreateEntity(model: RpdDataModel, options: CreateEntityOptions): Promise<void>;
     beforeUpdateEntity(model: RpdDataModel, options: UpdateEntityByIdOptions, currentEntity: any): Promise<void>;
 }

package/dist/types.d.ts

@@ -147,6 +147,7 @@ export interface RpdEntityAddRelationsEventPayload {
     entity: any;
     property: string;
     relations: any[];
+    relationTargetEntities: any[];
 }
 export interface RpdEntityRemoveRelationsEventPayload {
     namespace: string;
@@ -155,6 +156,7 @@ export interface RpdEntityRemoveRelationsEventPayload {
     entity: any;
     property: string;
     relations: any[];
+    relationTargetEntities: any[];
 }
 export interface RpdEntityBeforeResponseEventPayload {
     namespace: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ruiapp/rapid-core",
-  "version": "0.11.6",
+  "version": "0.11.8",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/core/pluginManager.ts

@@ -171,6 +171,15 @@ class PluginManager {
     }
   }
 
+  /** 在执行 action handler 后调用。 */
+  async afterRunActionHandler(handlerContext: ActionHandlerContext, actionConfig: RpdRouteActionConfig, error?: Error) {
+    for (const plugin of this.#plugins) {
+      if (plugin.afterRunActionHandler) {
+        await plugin.afterRunActionHandler(this.#server, handlerContext, actionConfig, error);
+      }
+    }
+  }
+
   /** 在创建实体前调用。 */
   async beforeCreateEntity(model: RpdDataModel, options: CreateEntityOptions) {
     for (const plugin of this.#plugins) {

package/src/core/routesBuilder.ts

@@ -32,10 +32,17 @@ async function executeHandlerOfActions(server: IRpdServer, routeConfig: RpdRoute
       }
 
       await server.beforeRunActionHandler(handlerContext, actionConfig);
-
-      const result = handler(handlerContext, actionConfig.config);
-      if (result instanceof Promise) {
-        await result;
+      let err: any;
+      try {
+        const result = handler(handlerContext, actionConfig.config);
+        if (result instanceof Promise) {
+          await result;
+        }
+      } catch (error) {
+        err = error;
+        throw error;
+      } finally {
+        await server.afterRunActionHandler(handlerContext, actionConfig, err);
       }
     }
   }

package/src/core/server.ts

@@ -57,6 +57,7 @@ export interface IRpdServer {
   runActionHandlers(handlerContext: ActionHandlerContext, actions: RpdRouteActionConfig[]): Promise<void>;
   beforeRunRouteActions(handlerContext: ActionHandlerContext): Promise<void>;
   beforeRunActionHandler(handlerContext: ActionHandlerContext, actionConfig: RpdRouteActionConfig): Promise<void>;
+  afterRunActionHandler(handlerContext: ActionHandlerContext, actionConfig: RpdRouteActionConfig, error?: Error): Promise<void>;
   beforeCreateEntity(model: RpdDataModel, options: CreateEntityOptions): Promise<void>;
   beforeUpdateEntity(model: RpdDataModel, options: UpdateEntityByIdOptions, currentEntity: any): Promise<void>;
 
@@ -151,6 +152,8 @@ export interface RapidPlugin {
   beforeRunRouteActions?: (server: IRpdServer, handlerContext: ActionHandlerContext) => Promise<any>;
   /** 在执行 action hanlder 前调用。 */
   beforeRunActionHandler?: (server: IRpdServer, handlerContext: ActionHandlerContext, actionConfig: RpdRouteActionConfig) => Promise<any>;
+  /** 在执行 action handler 后调用。 */
+  afterRunActionHandler?: (server: IRpdServer, handlerContext: ActionHandlerContext, actionConfig: RpdRouteActionConfig, error?: Error) => Promise<any>;
   /** 在创建实体前调用。 */
   beforeCreateEntity?: (server: IRpdServer, model: RpdDataModel, options: CreateEntityOptions) => Promise<any>;
   /** 在更新实体前调用。 */

package/src/dataAccess/entityManager.ts

@@ -170,6 +170,18 @@ async function findEntities(server: IRpdServer, dataAccessor: IRpdDataAccessor,
     );
   }
 
+  const isEntitySoftDeleteEnabled = baseModel ? baseModel.softDelete || model.softDelete : model.softDelete;
+  if (options.includingSoftDeleted && isEntitySoftDeleteEnabled) {
+    const deletedAtProp = getEntityPropertyByCode(server, model, "deletedAt");
+    if (deletedAtProp && !find(propertiesToSelect, (p) => p.code === "deletedAt")) {
+      propertiesToSelect.push(deletedAtProp);
+    }
+    const deletedByProp = getEntityPropertyByCode(server, model, "deletedBy");
+    if (deletedByProp && !find(propertiesToSelect, (p) => p.code === "deletedBy")) {
+      propertiesToSelect.push(deletedByProp);
+    }
+  }
+
   const columnsToSelect: ColumnSelectOptions[] = [];
 
   const relationPropertiesToSelect: RpdDataModelProperty[] = [];
@@ -401,7 +413,7 @@ const UNDELETED_ENTITY_FILTER_OPTIONS: EntityFilterOptions = {
 };
 
 function tryAddUndeletedEntityFilter(model: RpdDataModel, baseModel: RpdDataModel, filters: EntityFilterOptions[] | undefined) {
-  let isEntitySoftDeleteEnabled = baseModel ? (baseModel.softDelete || model.softDelete) : model.softDelete;
+  let isEntitySoftDeleteEnabled = baseModel ? baseModel.softDelete || model.softDelete : model.softDelete;
   if (!isEntitySoftDeleteEnabled) {
     return filters;
   }
@@ -678,6 +690,7 @@ async function findManyRelationLinksViaLinkTable(options: FindManyRelationEntiti
       },
     ],
     keepNonPropertyFields: true,
+    includingSoftDeleted: true,
   };
 
   if (selectRelationOptions) {
@@ -737,6 +750,7 @@ async function findManyRelatedEntitiesViaIdPropertyCode(options: FindManyRelatio
     ],
     extraColumnsToSelect: [relationProperty.selfIdColumnName],
     keepNonPropertyFields: true,
+    includingSoftDeleted: true,
   };
 
   if (selectRelationOptions) {
@@ -785,6 +799,7 @@ async function findOneRelatedEntitiesViaIdPropertyCode(options: FindOneRelationE
       },
     ],
     keepNonPropertyFields: true,
+    includingSoftDeleted: true,
   };
 
   if (selectRelationOptions) {
@@ -1630,7 +1645,7 @@ async function deleteEntityById(
   dataAccessor: IRpdDataAccessor,
   options: DeleteEntityByIdOptions | string | number,
   plugin?: RapidPlugin,
-): Promise<void> {
+): Promise<any> {
   // options is id
   if (!isObject(options)) {
     options = {
@@ -1662,7 +1677,7 @@ async function deleteEntityById(
     return;
   }
 
-  const isEntitySoftDeleteEnabled = model.base ? (baseModel.softDelete || model.softDelete) : model.softDelete;
+  const isEntitySoftDeleteEnabled = model.base ? baseModel.softDelete || model.softDelete : model.softDelete;
   if (isEntitySoftDeleteEnabled) {
     if (entity.deletedAt) {
       return;
@@ -1826,6 +1841,7 @@ async function deleteEntityById(
     sender: plugin,
     routeContext,
   });
+  return entity;
 }
 
 export default class EntityManager<TEntity = any> {
@@ -1882,11 +1898,11 @@ export default class EntityManager<TEntity = any> {
     return await this.#dataAccessor.count(countRowOptions, routeContext?.getDbTransactionClient());
   }
 
-  async deleteById(options: DeleteEntityByIdOptions | string | number, plugin?: RapidPlugin): Promise<void> {
+  async deleteById(options: DeleteEntityByIdOptions | string | number, plugin?: RapidPlugin): Promise<TEntity> {
     return await deleteEntityById(this.#server, this.#dataAccessor, options, plugin);
   }
 
-  async addRelations(options: AddEntityRelationsOptions, plugin?: RapidPlugin): Promise<void> {
+  async addRelations(options: AddEntityRelationsOptions, plugin?: RapidPlugin): Promise<any> {
     const server = this.#server;
     const model = this.getModel();
     const { id: selfId, property, relations, routeContext } = options;
@@ -1908,6 +1924,8 @@ export default class EntityManager<TEntity = any> {
     }
 
     const { queryBuilder } = server;
+    const targetEntityManager = server.getEntityManager(relationProperty.targetSingularCode);
+    const relationTargetEntities = [];
     if (relationProperty.linkTableName) {
       for (const relation of relations) {
         const command = `INSERT INTO ${queryBuilder.quoteTable({
@@ -1922,16 +1940,23 @@ export default class EntityManager<TEntity = any> {
 
         const targetId = relation[relationProperty.targetIdColumnName!] || relation.id;
         const params = [selfId, targetId];
-        await server.queryDatabaseObject(command, params, routeContext?.getDbTransactionClient());
+        const result = await server.queryDatabaseObject(command, params, routeContext?.getDbTransactionClient());
+        if (result?.length > 0) {
+          const targetEntity = await targetEntityManager.findById({
+            routeContext,
+            id: targetId,
+          });
+          relationTargetEntities.push(targetEntity);
+        }
       }
     } else {
-      const targetEntityManager = server.getEntityManager(relationProperty.targetSingularCode);
       for (const relation of relations) {
         relation[relationProperty.selfIdColumnName!] = selfId;
-        await targetEntityManager.createEntity({
+        const targetEntity = await targetEntityManager.createEntity({
           routeContext,
           entity: relation,
         });
+        relationTargetEntities.push(targetEntity);
       }
     }
 
@@ -1943,13 +1968,21 @@ export default class EntityManager<TEntity = any> {
         entity,
         property,
         relations,
+        relationTargetEntities,
       },
       sender: plugin,
       routeContext: options.routeContext,
     });
+
+    return {
+      entity,
+      property,
+      relations,
+      relationTargetEntities,
+    };
   }
 
-  async removeRelations(options: RemoveEntityRelationsOptions, plugin?: RapidPlugin): Promise<void> {
+  async removeRelations(options: RemoveEntityRelationsOptions, plugin?: RapidPlugin): Promise<any> {
     const server = this.#server;
     const model = this.getModel();
     const { id, property, relations, routeContext } = options;
@@ -1971,12 +2004,21 @@ export default class EntityManager<TEntity = any> {
     }
 
     const { queryBuilder } = server;
+    const targetEntityManager = server.getEntityManager(relationProperty.targetSingularCode);
+    const relationTargetEntities = [];
     if (relationProperty.linkTableName) {
       for (const relation of relations) {
         const command = `DELETE FROM ${queryBuilder.quoteTable({ schema: relationProperty.linkSchema, tableName: relationProperty.linkTableName })}
     WHERE ${queryBuilder.quoteObject(relationProperty.selfIdColumnName!)}=$1 AND ${queryBuilder.quoteObject(relationProperty.targetIdColumnName!)}=$2;`;
         const params = [id, relation.id];
-        await server.queryDatabaseObject(command, params, routeContext?.getDbTransactionClient());
+        const result = await server.queryDatabaseObject(command, params, routeContext?.getDbTransactionClient());
+        if (result?.length > 0) {
+          const targetEntity = await targetEntityManager.findById({
+            routeContext,
+            id: relation.id,
+          });
+          relationTargetEntities.push(targetEntity);
+        }
       }
     }
 
@@ -1988,9 +2030,17 @@ export default class EntityManager<TEntity = any> {
         entity,
         property,
         relations,
+        relationTargetEntities,
       },
       sender: plugin,
       routeContext: options.routeContext,
     });
+
+    return {
+      entity,
+      property,
+      relations,
+      relationTargetEntities,
+    };
   }
 }

package/src/plugins/dataManage/actionHandlers/addEntityRelations.ts

@@ -9,7 +9,7 @@ export async function handler(plugin: RapidPlugin, ctx: ActionHandlerContext, op
   await runCollectionEntityActionHandler(ctx, options, code, true, true, async (entityManager, input: AddEntityRelationsOptions): Promise<any> => {
     const { routerContext: routeContext } = ctx;
     input.routeContext = routeContext;
-    await entityManager.addRelations(input, plugin);
-    return {};
+    const result = await entityManager.addRelations(input, plugin);
+    return result;
   });
 }

package/src/plugins/dataManage/actionHandlers/deleteCollectionEntities.ts

@@ -30,16 +30,18 @@ export async function handler(plugin: RapidPlugin, ctx: ActionHandlerContext, op
         routeContext: routeContext,
         filters,
       });
+      const outputs = [];
       for (const entity of entities) {
-        await entityManager.deleteById(
+        const output = await entityManager.deleteById(
           {
             routeContext,
             id: entity.id,
           },
           plugin,
         );
+        outputs.push(output);
       }
-      return {};
+      return outputs;
     },
   );
 }

package/src/plugins/dataManage/actionHandlers/deleteCollectionEntityById.ts

@@ -8,13 +8,13 @@ export const code = "deleteCollectionEntityById";
 export async function handler(plugin: RapidPlugin, ctx: ActionHandlerContext, options: RunEntityActionHandlerOptions) {
   await runCollectionEntityActionHandler(ctx, options, code, true, true, async (entityManager, input: any): Promise<any> => {
     const { routerContext: routeContext } = ctx;
-    await entityManager.deleteById(
+    const output = await entityManager.deleteById(
       {
         id: input.id,
         routeContext,
       },
       plugin,
     );
-    return {};
+    return output;
   });
 }

package/src/plugins/dataManage/actionHandlers/removeEntityRelations.ts

@@ -9,7 +9,7 @@ export async function handler(plugin: RapidPlugin, ctx: ActionHandlerContext, op
   await runCollectionEntityActionHandler(ctx, options, code, true, true, async (entityManager, input: any): Promise<any> => {
     const { routerContext: routeContext } = ctx;
     input.routeContext = routeContext;
-    await entityManager.removeRelations(input, plugin);
-    return {};
+    const result = await entityManager.removeRelations(input, plugin);
+    return result;
   });
 }

package/src/server.ts

@@ -494,9 +494,16 @@ export class RapidServer implements IRpdServer {
       if (!handler) {
         throw new Error("Unknown handler: " + actionCode);
       }
-
+      let err: any;
       await this.beforeRunActionHandler(handlerContext, action);
-      await handler(handlerContext, action.config);
+      try {
+        await handler(handlerContext, action.config);
+      } catch (error) {
+        err = error;
+        throw error;
+      } finally {
+        await this.afterRunActionHandler(handlerContext, action);
+      }
     }
   }
 
@@ -508,6 +515,10 @@ export class RapidServer implements IRpdServer {
     await this.#pluginManager.beforeRunActionHandler(handlerContext, actionConfig);
   }
 
+  async afterRunActionHandler(handlerContext: ActionHandlerContext, actionConfig: RpdRouteActionConfig, error?: Error) {
+    await this.#pluginManager.afterRunActionHandler(handlerContext, actionConfig, error);
+  }
+
   async beforeCreateEntity(model: RpdDataModel, options: CreateEntityOptions) {
     await this.#pluginManager.beforeCreateEntity(model, options);
   }

package/src/types.ts

@@ -172,6 +172,7 @@ export interface RpdEntityAddRelationsEventPayload {
   entity: any;
   property: string;
   relations: any[];
+  relationTargetEntities: any[];
 }
 
 export interface RpdEntityRemoveRelationsEventPayload {
@@ -181,6 +182,7 @@ export interface RpdEntityRemoveRelationsEventPayload {
   entity: any;
   property: string;
   relations: any[];
+  relationTargetEntities: any[];
 }
 
 export interface RpdEntityBeforeResponseEventPayload {