@ruiapp/rapid-core 0.11.1 → 0.11.3

package/dist/index.js

@@ -2676,7 +2676,7 @@ function mapEntityToDbRow(server, model, entity) {
         return result;
     }
     const propertyNames = Object.keys(entity);
-    propertyNames.forEach((propertyName) => {
+    for (const propertyName of propertyNames) {
         let columnName = propertyName;
         const property = getEntityPropertyByCode(server, model, propertyName);
         if (property) {
@@ -2701,7 +2701,7 @@ function mapEntityToDbRow(server, model, entity) {
                 }
             }
         }
-    });
+    }
     return result;
 }
 
@@ -3516,6 +3516,13 @@ async function createEntity(server, dataAccessor, options, plugin) {
     if (createdAtProperty) {
         entity.createdAt = getNowStringWithTimezone();
     }
+    let baseModel;
+    if (model.base) {
+        baseModel = server.getModel({
+            singularCode: model.base,
+        });
+        entity[baseModel.derivedTypePropertyCode] = model.derivedType;
+    }
     await server.beforeCreateEntity(model, options);
     await server.emitEvent({
         eventName: "entity.beforeCreate",
@@ -4411,13 +4418,13 @@ class EntityManager {
     async addRelations(options, plugin) {
         const server = this.#server;
         const model = this.getModel();
-        const { id, property, relations, routeContext } = options;
+        const { id: selfId, property, relations, routeContext } = options;
         const entity = await this.findById({
-            id,
+            id: selfId,
             routeContext,
         });
         if (!entity) {
-            throw new Error(`${model.namespace}.${model.singularCode}  with id "${id}" was not found.`);
+            throw new Error(`${model.namespace}.${model.singularCode}  with id "${selfId}" was not found.`);
         }
         const relationProperty = getEntityPropertyByCode(server, model, property);
         if (!relationProperty) {
@@ -4438,10 +4445,21 @@ class EntityManager {
         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];
+                const targetId = relation[relationProperty.targetIdColumnName] || relation.id;
+                const params = [selfId, targetId];
                 await server.queryDatabaseObject(command, params, routeContext?.getDbTransactionClient());
             }
         }
+        else {
+            const targetEntityManager = server.getEntityManager(relationProperty.targetSingularCode);
+            for (const relation of relations) {
+                relation[relationProperty.selfIdColumnName] = selfId;
+                await targetEntityManager.createEntity({
+                    routeContext,
+                    entity: relation,
+                });
+            }
+        }
         await server.emitEvent({
             eventName: "entity.addRelations",
             payload: {

package/dist/types.d.ts

@@ -666,8 +666,8 @@ export interface RemoveEntityRelationsOptions {
         [k: string]: any;
     }[];
 }
-export type EntityWatcherType = EntityWatcher<"entity.create"> | EntityWatcher<"entity.update"> | EntityWatcher<"entity.delete"> | EntityWatcher<"entity.addRelations"> | EntityWatcher<"entity.removeRelations"> | EntityWatcher<any>;
-export interface EntityWatcher<TEventName extends keyof RpdServerEventTypes = any> {
+export type EntityWatcherType = EntityWatcher<"entity.beforeCreate"> | EntityWatcher<"entity.create"> | EntityWatcher<"entity.beforeUpdate"> | EntityWatcher<"entity.update"> | EntityWatcher<"entity.beforeDelete"> | EntityWatcher<"entity.delete"> | EntityWatcher<"entity.addRelations"> | EntityWatcher<"entity.removeRelations"> | EntityWatcher<"entity.beforeResponse"> | EntityWatcher<any>;
+export interface EntityWatcher<TEventName extends keyof RpdServerEventTypes> {
     eventName: TEventName;
     modelSingularCode: string;
     handler: EntityWatchHandler<TEventName>;

package/package.json

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

package/src/dataAccess/entityManager.ts

@@ -829,6 +829,14 @@ async function createEntity(server: IRpdServer, dataAccessor: IRpdDataAccessor,
     entity.createdAt = getNowStringWithTimezone();
   }
 
+  let baseModel: RpdDataModel | undefined;
+  if (model.base) {
+    baseModel = server.getModel({
+      singularCode: model.base,
+    });
+    entity[baseModel.derivedTypePropertyCode] = model.derivedType;
+  }
+
   await server.beforeCreateEntity(model, options);
 
   await server.emitEvent({
@@ -1871,13 +1879,13 @@ export default class EntityManager<TEntity = any> {
   async addRelations(options: AddEntityRelationsOptions, plugin?: RapidPlugin): Promise<void> {
     const server = this.#server;
     const model = this.getModel();
-    const { id, property, relations, routeContext } = options;
+    const { id: selfId, property, relations, routeContext } = options;
     const entity = await this.findById({
-      id,
+      id: selfId,
       routeContext,
     });
     if (!entity) {
-      throw new Error(`${model.namespace}.${model.singularCode}  with id "${id}" was not found.`);
+      throw new Error(`${model.namespace}.${model.singularCode}  with id "${selfId}" was not found.`);
     }
 
     const relationProperty = getEntityPropertyByCode(server, model, property);
@@ -1901,9 +1909,20 @@ export default class EntityManager<TEntity = any> {
         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];
+
+        const targetId = relation[relationProperty.targetIdColumnName!] || relation.id;
+        const params = [selfId, targetId];
         await server.queryDatabaseObject(command, params, routeContext?.getDbTransactionClient());
       }
+    } else {
+      const targetEntityManager = server.getEntityManager(relationProperty.targetSingularCode);
+      for (const relation of relations) {
+        relation[relationProperty.selfIdColumnName!] = selfId;
+        await targetEntityManager.createEntity({
+          routeContext,
+          entity: relation,
+        });
+      }
     }
 
     await server.emitEvent({

package/src/dataAccess/entityMapper.ts

@@ -83,7 +83,7 @@ export function mapEntityToDbRow(server: IRpdServer, model: RpdDataModel, entity
   }
 
   const propertyNames = Object.keys(entity);
-  propertyNames.forEach((propertyName) => {
+  for (const propertyName of propertyNames) {
     let columnName = propertyName;
     const property = getEntityPropertyByCode(server, model, propertyName);
     if (property) {
@@ -105,7 +105,7 @@ export function mapEntityToDbRow(server: IRpdServer, model: RpdDataModel, entity
         }
       }
     }
-  });
+  }
 
   return result;
 }

package/src/types.ts

@@ -844,14 +844,18 @@ export interface RemoveEntityRelationsOptions {
 }
 
 export type EntityWatcherType =
+  | EntityWatcher<"entity.beforeCreate">
   | EntityWatcher<"entity.create">
+  | EntityWatcher<"entity.beforeUpdate">
   | EntityWatcher<"entity.update">
+  | EntityWatcher<"entity.beforeDelete">
   | EntityWatcher<"entity.delete">
   | EntityWatcher<"entity.addRelations">
   | EntityWatcher<"entity.removeRelations">
+  | EntityWatcher<"entity.beforeResponse">
   | EntityWatcher<any>;
 
-export interface EntityWatcher<TEventName extends keyof RpdServerEventTypes = any> {
+export interface EntityWatcher<TEventName extends keyof RpdServerEventTypes> {
   eventName: TEventName;
   modelSingularCode: string;
   handler: EntityWatchHandler<TEventName>;