@ruiapp/rapid-core 0.1.32 → 0.1.34

package/dist/index.js

@@ -2056,9 +2056,15 @@ function findOneRelatedEntitiesViaIdPropertyCode(server, model, relationProperty
     });
     return dataAccessor.find(findEntityOptions);
 }
-async function createEntity(server, dataAccessor, options) {
+async function createEntity(server, dataAccessor, options, plugin) {
     const model = dataAccessor.getModel();
     const { entity } = options;
+    await server.beforeCreateEntity(model, options);
+    await server.emitEvent("entity.beforeCreate", {
+        namespace: model.namespace,
+        modelSingularCode: model.singularCode,
+        before: entity,
+    }, plugin);
     const oneRelationPropertiesToCreate = [];
     const manyRelationPropertiesToCreate = [];
     lodash.keys(entity).forEach((propertyCode) => {
@@ -2170,6 +2176,11 @@ async function createEntity(server, dataAccessor, options) {
             }
         }
     }
+    await server.emitEvent("entity.create", {
+        namespace: model.namespace,
+        modelSingularCode: model.singularCode,
+        after: newEntity,
+    }, plugin);
     return newEntity;
 }
 async function updateEntityById(server, dataAccessor, options, plugin) {
@@ -2188,6 +2199,12 @@ async function updateEntityById(server, dataAccessor, options, plugin) {
     }
     options.entityToSave = changes || {};
     await server.beforeUpdateEntity(model, options, entity);
+    await server.emitEvent("entity.beforeUpdate", {
+        namespace: model.namespace,
+        modelSingularCode: model.singularCode,
+        before: entity,
+        changes: options.entityToSave,
+    }, plugin);
     changes = options.entityToSave;
     const oneRelationPropertiesToUpdate = [];
     const manyRelationPropertiesToUpdate = [];
@@ -2295,7 +2312,7 @@ async function updateEntityById(server, dataAccessor, options, plugin) {
         }
         updatedEntity[property.code] = relatedEntities;
     }
-    server.emitEvent("entity.update", {
+    await server.emitEvent("entity.update", {
         namespace: model.namespace,
         modelSingularCode: model.singularCode,
         before: entity,
@@ -2324,14 +2341,8 @@ class EntityManager {
         return await findById(this.#server, this.#dataAccessor, id, keepNonPropertyFields);
     }
     async createEntity(options, plugin) {
-        const model = this.getModel();
-        await this.#server.beforeCreateEntity(model, options);
-        const newEntity = await createEntity(this.#server, this.#dataAccessor, options);
-        this.#server.emitEvent("entity.create", {
-            namespace: model.namespace,
-            modelSingularCode: model.singularCode,
-            after: newEntity,
-        }, plugin);
+        this.getModel();
+        const newEntity = await createEntity(this.#server, this.#dataAccessor, options, plugin);
         return newEntity;
     }
     async updateEntityById(options, plugin) {
@@ -2346,8 +2357,13 @@ class EntityManager {
         if (!entity) {
             return;
         }
+        await this.#server.emitEvent("entity.beforeDelete", {
+            namespace: model.namespace,
+            modelSingularCode: model.singularCode,
+            before: entity,
+        }, plugin);
         await this.#dataAccessor.deleteById(id);
-        this.#server.emitEvent("entity.delete", {
+        await this.#server.emitEvent("entity.delete", {
             namespace: model.namespace,
             modelSingularCode: model.singularCode,
             before: entity,
@@ -2381,7 +2397,7 @@ class EntityManager {
                 await server.queryDatabaseObject(command, params);
             }
         }
-        server.emitEvent("entity.addRelations", {
+        await server.emitEvent("entity.addRelations", {
             namespace: model.namespace,
             modelSingularCode: model.singularCode,
             entity,
@@ -2413,7 +2429,7 @@ class EntityManager {
                 await server.queryDatabaseObject(command, params);
             }
         }
-        server.emitEvent("entity.removeRelations", {
+        await server.emitEvent("entity.removeRelations", {
             namespace: model.namespace,
             modelSingularCode: model.singularCode,
             entity,
@@ -4981,12 +4997,14 @@ class CronJobPlugin {
     }
     async onApplicationReady(server, applicationConfig) {
         for (const job of this.#jobs) {
-            cron__namespace.CronJob.from({
+            const jobInstance = cron__namespace.CronJob.from({
                 cronTime: job.cronTime,
                 onTick: async () => {
+                    server.getLogger().info(`Executing cron job '${job.code}'...`);
                     await this.executeJob(server, job);
                 },
             });
+            jobInstance.start();
         }
     }
     getJobConfigurationByCode(code) {

package/dist/types.d.ts

@@ -50,17 +50,31 @@ export interface GetModelOptions {
     singularCode: string;
 }
 export type RpdServerEventTypes = {
+    "entity.beforeCreate": [RapidPlugin, RpdEntityBeforeCreateEventPayload];
     "entity.create": [RapidPlugin, RpdEntityCreateEventPayload];
+    "entity.beforeUpdate": [RapidPlugin, RpdEntityBeforeUpdateEventPayload];
     "entity.update": [RapidPlugin, RpdEntityUpdateEventPayload];
+    "entity.beforeDelete": [RapidPlugin, RpdEntityBeforeDeleteEventPayload];
     "entity.delete": [RapidPlugin, RpdEntityDeleteEventPayload];
     "entity.addRelations": [RapidPlugin, RpdEntityAddRelationsEventPayload];
     "entity.removeRelations": [RapidPlugin, RpdEntityRemoveRelationsEventPayload];
 };
+export interface RpdEntityBeforeCreateEventPayload {
+    namespace: string;
+    modelSingularCode: string;
+    before: any;
+}
 export interface RpdEntityCreateEventPayload {
     namespace: string;
     modelSingularCode: string;
     after: any;
 }
+export interface RpdEntityBeforeUpdateEventPayload {
+    namespace: string;
+    modelSingularCode: string;
+    before: any;
+    changes: any;
+}
 export interface RpdEntityUpdateEventPayload {
     namespace: string;
     modelSingularCode: string;
@@ -68,6 +82,11 @@ export interface RpdEntityUpdateEventPayload {
     after: any;
     changes: any;
 }
+export interface RpdEntityBeforeDeleteEventPayload {
+    namespace: string;
+    modelSingularCode: string;
+    before: any;
+}
 export interface RpdEntityDeleteEventPayload {
     namespace: string;
     modelSingularCode: string;

package/package.json

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

package/src/dataAccess/entityManager.ts

@@ -431,10 +431,23 @@ async function createEntity(
   server: IRpdServer,
   dataAccessor: IRpdDataAccessor,
   options: CreateEntityOptions,
+  plugin?: RapidPlugin
 ) {
   const model = dataAccessor.getModel();
   const { entity } = options;
 
+  await server.beforeCreateEntity(model, options);
+
+  await server.emitEvent(
+    "entity.beforeCreate",
+    {
+      namespace: model.namespace,
+      modelSingularCode: model.singularCode,
+      before: entity,
+    },
+    plugin,
+  );
+
   const oneRelationPropertiesToCreate: RpdDataModelProperty[] = [];
   const manyRelationPropertiesToCreate: RpdDataModelProperty[] = [];
   keys(entity).forEach((propertyCode) => {
@@ -553,6 +566,15 @@ async function createEntity(
     }
   }
 
+  await server.emitEvent(
+    "entity.create",
+    {
+      namespace: model.namespace,
+      modelSingularCode: model.singularCode,
+      after: newEntity,
+    },
+    plugin,
+  );
 
   return newEntity;
 }
@@ -581,6 +603,18 @@ async function updateEntityById(
 
   options.entityToSave = changes || {};
   await server.beforeUpdateEntity(model, options, entity);
+
+  await server.emitEvent(
+    "entity.beforeUpdate",
+    {
+      namespace: model.namespace,
+      modelSingularCode: model.singularCode,
+      before: entity,
+      changes: options.entityToSave,
+    },
+    plugin,
+  );
+
   changes = options.entityToSave;
 
   const oneRelationPropertiesToUpdate: RpdDataModelProperty[] = [];
@@ -695,7 +729,7 @@ async function updateEntityById(
     updatedEntity[property.code] = relatedEntities;
   }
 
-  server.emitEvent(
+  await server.emitEvent(
     "entity.update",
     {
       namespace: model.namespace,
@@ -737,19 +771,7 @@ export default class EntityManager<TEntity=any> {
   async createEntity(options: CreateEntityOptions, plugin?: RapidPlugin): Promise<TEntity> {
     const model = this.getModel();
 
-    await this.#server.beforeCreateEntity(model, options);
-
-    const newEntity = await createEntity(this.#server, this.#dataAccessor, options);
-
-    this.#server.emitEvent(
-      "entity.create",
-      {
-        namespace: model.namespace,
-        modelSingularCode: model.singularCode,
-        after: newEntity,
-      },
-      plugin,
-    );
+    const newEntity = await createEntity(this.#server, this.#dataAccessor, options, plugin);
 
     return newEntity;
   }
@@ -769,8 +791,19 @@ export default class EntityManager<TEntity=any> {
       return;
     }
 
+    await this.#server.emitEvent(
+      "entity.beforeDelete",
+      {
+        namespace: model.namespace,
+        modelSingularCode: model.singularCode,
+        before: entity,
+      },
+      plugin,
+    );
+
     await this.#dataAccessor.deleteById(id);
-    this.#server.emitEvent(
+
+    await this.#server.emitEvent(
       "entity.delete",
       {
         namespace: model.namespace,
@@ -813,7 +846,7 @@ export default class EntityManager<TEntity=any> {
       }
     }
 
-    server.emitEvent(
+    await server.emitEvent(
       "entity.addRelations",
       {
         namespace: model.namespace,
@@ -854,7 +887,7 @@ export default class EntityManager<TEntity=any> {
       }
     }
 
-    server.emitEvent(
+    await server.emitEvent(
       "entity.removeRelations",
       {
         namespace: model.namespace,

package/src/plugins/cronJob/CronJobPlugin.ts

@@ -76,9 +76,11 @@ class CronJobPlugin implements RapidPlugin {
       const jobInstance = cron.CronJob.from({
         cronTime: job.cronTime,
         onTick: async () => {
+          server.getLogger().info(`Executing cron job '${job.code}'...`);
           await this.executeJob(server, job);
         },
       });
+      jobInstance.start();
     }
   }
 

package/src/types.ts

@@ -62,19 +62,35 @@ export interface GetModelOptions {
 }
 
 export type RpdServerEventTypes = {
+  "entity.beforeCreate": [RapidPlugin, RpdEntityBeforeCreateEventPayload];
   "entity.create": [RapidPlugin, RpdEntityCreateEventPayload];
+  "entity.beforeUpdate": [RapidPlugin, RpdEntityBeforeUpdateEventPayload];
   "entity.update": [RapidPlugin, RpdEntityUpdateEventPayload];
+  "entity.beforeDelete": [RapidPlugin, RpdEntityBeforeDeleteEventPayload];
   "entity.delete": [RapidPlugin, RpdEntityDeleteEventPayload];
   "entity.addRelations": [RapidPlugin, RpdEntityAddRelationsEventPayload];
   "entity.removeRelations": [RapidPlugin, RpdEntityRemoveRelationsEventPayload];
 };
 
+export interface RpdEntityBeforeCreateEventPayload {
+  namespace: string;
+  modelSingularCode: string;
+  before: any;
+}
+
 export interface RpdEntityCreateEventPayload {
   namespace: string;
   modelSingularCode: string;
   after: any;
 }
 
+export interface RpdEntityBeforeUpdateEventPayload {
+  namespace: string;
+  modelSingularCode: string;
+  before: any;
+  changes: any;
+}
+
 export interface RpdEntityUpdateEventPayload {
   namespace: string;
   modelSingularCode: string;
@@ -83,6 +99,12 @@ export interface RpdEntityUpdateEventPayload {
   changes: any;
 }
 
+export interface RpdEntityBeforeDeleteEventPayload {
+  namespace: string;
+  modelSingularCode: string;
+  before: any;
+}
+
 export interface RpdEntityDeleteEventPayload {
   namespace: string;
   modelSingularCode: string;