@ruiapp/rapid-core 0.1.54 → 0.1.55

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

@@ -9,7 +9,7 @@ export const code = "findCollectionEntities";
 export async function handler(plugin: RapidPlugin, ctx: ActionHandlerContext, options: RunEntityActionHandlerOptions) {
   await runCollectionEntityActionHandler(ctx, options, code, async (entityManager, input: FindEntityOptions) => {
     input.filters = removeFiltersWithNullValue(input.filters);
-    input.routerContext = ctx.routerContext;
+    input.routeContext = ctx.routerContext;
     const entities = await entityManager.findEntities(input);
     const result: {
       list: any;

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

@@ -10,7 +10,10 @@ export async function handler(plugin: RapidPlugin, ctx: ActionHandlerContext, op
   const { id } = input;
 
   const entityManager = server.getEntityManager(options.singularCode);
-  const entity = await entityManager.findById(id);
+  const entity = await entityManager.findById({
+    id,
+    routeContext: ctx.routerContext,
+  });
   if (!entity) {
     throw new Error(`${options.namespace}.${options.singularCode} with id "${id}" was not found.`);
   }

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

@@ -1,4 +1,4 @@
-import { RunEntityActionHandlerOptions } from "~/types";
+import { RemoveEntityRelationsOptions, RunEntityActionHandlerOptions } from "~/types";
 import { mergeInput } from "~/helpers/inputHelper";
 import { ActionHandlerContext } from "~/core/actionHandler";
 import { RapidPlugin } from "~/core/server";
@@ -9,8 +9,9 @@ export async function handler(plugin: RapidPlugin, ctx: ActionHandlerContext, op
   const { logger, server, input } = ctx;
   const { defaultInput, fixedInput } = options;
 
-  const mergedInput = mergeInput(defaultInput, input, fixedInput);
+  const mergedInput: RemoveEntityRelationsOptions = mergeInput(defaultInput, input, fixedInput);
   logger.debug(`Running ${code} handler...`, { defaultInput, fixedInput, mergedInput });
+  mergedInput.routeContext = ctx.routerContext;
 
   const entityManager = server.getEntityManager(options.singularCode);
   await entityManager.removeRelations(mergedInput, plugin);

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

@@ -1,4 +1,4 @@
-import { RunEntityActionHandlerOptions } from "~/types";
+import { RunEntityActionHandlerOptions, UpdateEntityByIdOptions } from "~/types";
 import { mergeInput } from "~/helpers/inputHelper";
 import { ActionHandlerContext } from "~/core/actionHandler";
 import { RapidPlugin } from "~/core/server";
@@ -22,7 +22,14 @@ export async function handler(plugin: RapidPlugin, ctx: ActionHandlerContext, op
     delete mergedInput.$stateProperties;
   }
 
+  const updateEntityByIdOptions: UpdateEntityByIdOptions = {
+    id: mergedInput.id,
+    entityToSave: mergedInput,
+    operation,
+    stateProperties,
+    routeContext: ctx.routerContext,
+  };
   const entityManager = server.getEntityManager(options.singularCode);
-  const output = await entityManager.updateEntityById({ id: mergedInput.id, entityToSave: mergedInput, operation, stateProperties }, plugin);
+  const output = await entityManager.updateEntityById(updateEntityByIdOptions, plugin);
   ctx.output = output;
 }

package/src/plugins/metaManage/MetaManagePlugin.ts

@@ -161,6 +161,13 @@ type ColumnInformation = {
   numeric_scale: number;
 };
 
+type ConstraintInformation = {
+  table_schema: string;
+  table_name: string;
+  constraint_type: string;
+  constraint_name: string;
+};
+
 async function syncDatabaseSchema(server: IRpdServer, applicationConfig: RpdApplicationConfig) {
   const logger = server.getLogger();
   logger.info("Synchronizing database schema...");
@@ -187,7 +194,7 @@ async function syncDatabaseSchema(server: IRpdServer, applicationConfig: RpdAppl
     logger.debug(`Checking data columns for '${model.namespace}.${model.singularCode}'...`);
 
     for (const property of model.properties) {
-      let columnDDL;
+      let columnDDL = "";
       if (isRelationProperty(property)) {
         if (property.relation === "one") {
           const targetModel = applicationConfig.models.find((item) => item.singularCode === property.targetSingularCode);
@@ -222,6 +229,12 @@ async function syncDatabaseSchema(server: IRpdServer, applicationConfig: RpdAppl
                 selfIdColumnName: property.selfIdColumnName!,
               });
             }
+
+            const contraintName = `${property.linkTableName}_pk`;
+            columnDDL += `ALTER TABLE ${queryBuilder.quoteTable(({
+              schema: property.linkSchema,
+              tableName: property.linkTableName,
+            }))} ADD CONSTRAINT ${queryBuilder.quoteObject(contraintName)} PRIMARY KEY (id);`;
           } else {
             const targetModel = applicationConfig.models.find((item) => item.singularCode === property.targetSingularCode);
             if (!targetModel) {
@@ -307,6 +320,24 @@ async function syncDatabaseSchema(server: IRpdServer, applicationConfig: RpdAppl
       }
     }
   }
+
+  const sqlQueryConstraints = `SELECT table_schema, table_name, constraint_type, constraint_name FROM information_schema.table_constraints WHERE constraint_type = 'PRIMARY KEY';`;
+  const constraintsInDb: ConstraintInformation[] = await server.queryDatabaseObject(sqlQueryConstraints);
+  for (const model of applicationConfig.models) {
+    const expectedTableSchema = model.schema || server.databaseConfig.dbDefaultSchema;
+    const expectedTableName = model.tableName;
+    const expectedContraintName = `${expectedTableName}_pk`;
+    logger.debug(`Checking pk for '${expectedTableSchema}.${expectedTableName}'...`);
+    const constraintInDb = find(constraintsInDb, {
+      table_schema: expectedTableSchema,
+      table_name: expectedTableName,
+      constraint_type: "PRIMARY KEY",
+      constraint_name: expectedContraintName,
+    });
+    if (!constraintInDb) {
+      await server.queryDatabaseObject(`ALTER TABLE ${queryBuilder.quoteTable(model)} ADD CONSTRAINT ${queryBuilder.quoteObject(expectedContraintName)} PRIMARY KEY (id);`, []);
+    }
+  }
 }
 
 function generateCreateColumnDDL(
@@ -358,7 +389,7 @@ function generateLinkTableDDL(
   })} (`;
   columnDDL += `id serial not null,`;
   columnDDL += `${queryBuilder.quoteObject(options.selfIdColumnName)} integer not null,`;
-  columnDDL += `${queryBuilder.quoteObject(options.targetIdColumnName)} integer not null)`;
+  columnDDL += `${queryBuilder.quoteObject(options.targetIdColumnName)} integer not null);`;
 
   return columnDDL;
 }

package/src/server.ts

@@ -1,5 +1,5 @@
 import DataAccessor from "./dataAccess/dataAccessor";
-import { GetDataAccessorOptions, GetModelOptions, IDatabaseAccessor, IDatabaseConfig, IQueryBuilder, IRpdDataAccessor, RpdApplicationConfig, RpdDataModel, RpdServerEventTypes, RapidServerConfig, RpdDataModelProperty, CreateEntityOptions, UpdateEntityByIdOptions, EntityWatchHandlerContext, EntityWatcherType, RpdEntityCreateEventPayload } from "./types";
+import { GetDataAccessorOptions, GetModelOptions, IDatabaseAccessor, IDatabaseConfig, IQueryBuilder, IRpdDataAccessor, RpdApplicationConfig, RpdDataModel, RpdServerEventTypes, RapidServerConfig, RpdDataModelProperty, CreateEntityOptions, UpdateEntityByIdOptions, EntityWatchHandlerContext, EntityWatcherType, RpdEntityCreateEventPayload, EmitServerEventOptions } from "./types";
 
 import QueryBuilder from "./queryBuilder/queryBuilder";
 import PluginManager from "./core/pluginManager";
@@ -237,9 +237,10 @@ export class RapidServer implements IRpdServer {
     this.#entityWatchers.push(entityWatcher);
   }
 
-  async emitEvent<K extends keyof RpdServerEventTypes>(eventName: K, payload: RpdServerEventTypes[K][1], sender?: RapidPlugin) {
+  async emitEvent<TEventName extends keyof RpdServerEventTypes>(event: EmitServerEventOptions<TEventName>) {
+    const { eventName, payload, sender, routeContext: routerContext } = event;
     this.#logger.debug(`Emitting '${eventName}' event.`, { eventName, payload });
-    await this.#eventManager.emit<K>(eventName, sender, payload as any);
+    await this.#eventManager.emit<TEventName>(eventName, sender, payload as any, routerContext);
 
     // TODO: should move this logic into metaManager
     // if (
@@ -392,11 +393,12 @@ export class RapidServer implements IRpdServer {
     await this.#pluginManager.beforeUpdateEntity(model, options, currentEntity);
   }
 
-  async #handleEntityEvent(eventName: keyof RpdServerEventTypes, sender: RapidPlugin, payload: RpdEntityCreateEventPayload) {
+  async #handleEntityEvent(eventName: keyof RpdServerEventTypes, sender: RapidPlugin, payload: RpdEntityCreateEventPayload, routerContext?: RouteContext) {
     const { modelSingularCode, baseModelSingularCode } = payload;
     const entityWatchHandlerContext: EntityWatchHandlerContext<typeof eventName> = {
       server: this,
       payload,
+      routerContext,
     };
 
     let emitter: EventManager<Record<string, [EntityWatchHandlerContext<any>]>>;

package/src/types.ts

@@ -68,19 +68,18 @@ 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];
-  "entity.beforeResponse": [RapidPlugin, RpdEntityBeforeResponseEventPayload];
+  "entity.beforeCreate": [RapidPlugin, RpdEntityBeforeCreateEventPayload, RouteContext?];
+  "entity.create": [RapidPlugin, RpdEntityCreateEventPayload, RouteContext?];
+  "entity.beforeUpdate": [RapidPlugin, RpdEntityBeforeUpdateEventPayload, RouteContext?];
+  "entity.update": [RapidPlugin, RpdEntityUpdateEventPayload, RouteContext?];
+  "entity.beforeDelete": [RapidPlugin, RpdEntityBeforeDeleteEventPayload, RouteContext?];
+  "entity.delete": [RapidPlugin, RpdEntityDeleteEventPayload, RouteContext?];
+  "entity.addRelations": [RapidPlugin, RpdEntityAddRelationsEventPayload, RouteContext?];
+  "entity.removeRelations": [RapidPlugin, RpdEntityRemoveRelationsEventPayload, RouteContext?];
+  "entity.beforeResponse": [RapidPlugin, RpdEntityBeforeResponseEventPayload, RouteContext?];
 };
 
 export interface RpdEntityBeforeCreateEventPayload {
-  routerContext?: RouteContext;
   namespace: string;
   modelSingularCode: string;
   baseModelSingularCode?: string;
@@ -88,7 +87,6 @@ export interface RpdEntityBeforeCreateEventPayload {
 }
 
 export interface RpdEntityCreateEventPayload {
-  routerContext?: RouteContext;
   namespace: string;
   modelSingularCode: string;
   baseModelSingularCode?: string;
@@ -96,7 +94,6 @@ export interface RpdEntityCreateEventPayload {
 }
 
 export interface RpdEntityBeforeUpdateEventPayload {
-  routerContext?: RouteContext;
   namespace: string;
   modelSingularCode: string;
   baseModelSingularCode?: string;
@@ -105,7 +102,6 @@ export interface RpdEntityBeforeUpdateEventPayload {
 }
 
 export interface RpdEntityUpdateEventPayload {
-  routerContext?: RouteContext;
   namespace: string;
   modelSingularCode: string;
   baseModelSingularCode?: string;
@@ -115,7 +111,6 @@ export interface RpdEntityUpdateEventPayload {
 }
 
 export interface RpdEntityBeforeDeleteEventPayload {
-  routerContext?: RouteContext;
   namespace: string;
   modelSingularCode: string;
   baseModelSingularCode?: string;
@@ -123,7 +118,6 @@ export interface RpdEntityBeforeDeleteEventPayload {
 }
 
 export interface RpdEntityDeleteEventPayload {
-  routerContext?: RouteContext;
   namespace: string;
   modelSingularCode: string;
   baseModelSingularCode?: string;
@@ -131,7 +125,6 @@ export interface RpdEntityDeleteEventPayload {
 }
 
 export interface RpdEntityAddRelationsEventPayload {
-  routerContext?: RouteContext;
   namespace: string;
   modelSingularCode: string;
   baseModelSingularCode?: string;
@@ -141,7 +134,6 @@ export interface RpdEntityAddRelationsEventPayload {
 }
 
 export interface RpdEntityRemoveRelationsEventPayload {
-  routerContext?: RouteContext;
   namespace: string;
   modelSingularCode: string;
   baseModelSingularCode?: string;
@@ -151,13 +143,19 @@ export interface RpdEntityRemoveRelationsEventPayload {
 }
 
 export interface RpdEntityBeforeResponseEventPayload {
-  routerContext?: RouteContext;
   namespace: string;
   modelSingularCode: string;
   baseModelSingularCode?: string;
   entities: any[];
 }
 
+export type EmitServerEventOptions<TEventName extends keyof RpdServerEventTypes> = {
+  eventName: TEventName;
+  payload: RpdServerEventTypes[TEventName][1];
+  sender?: RapidPlugin;
+  routeContext?: RouteContext;
+}
+
 export interface QuoteTableOptions {
   schema?: string;
   tableName: string;
@@ -399,7 +397,7 @@ export type EntityFilterOptions = FindEntityRelationalFilterOptions | FindEntity
 export type EntityNonRelationPropertyFilterOptions = FindEntityRelationalFilterOptions | FindEntitySetFilterOptions | FindEntityUnaryFilterOptions;
 
 export interface FindEntityOptions {
-  routerContext?: RouteContext;
+  routeContext?: RouteContext;
   filters?: EntityFilterOptions[];
   orderBy?: FindEntityOrderByOptions[];
   pagination?: FindEntityPaginationOptions;
@@ -407,6 +405,13 @@ export interface FindEntityOptions {
   keepNonPropertyFields?: boolean;
 }
 
+export interface FindEntityByIdOptions {
+  routeContext?: RouteContext;
+  id: any;
+  properties?: string[];
+  keepNonPropertyFields?: boolean;
+}
+
 export interface FindEntityRelationalFilterOptions {
   field: string;
   operator: EntityFilterRelationalOperators;
@@ -448,6 +453,7 @@ export interface FindEntityOrderByOptions {
 }
 
 export interface CountEntityOptions {
+  routeContext?: RouteContext;
   filters?: EntityFilterOptions[];
 }
 
@@ -455,19 +461,24 @@ export interface CountEntityResult {
   count: number;
 }
 
+export interface DeleteEntityByIdOptions {
+  routeContext?: RouteContext;
+  id: any;
+}
+
 export interface CreateEntityOptions {
-  routerContext?: RouteContext;
+  routeContext?: RouteContext;
   entity: any;
 }
 
 export interface UpdateEntityOptions {
-  routerContext?: RouteContext;
+  routeContext?: RouteContext;
   filters?: EntityFilterOptions[];
   entity: any;
 }
 
 export interface UpdateEntityByIdOptions {
-  routerContext?: RouteContext;
+  routeContext?: RouteContext;
   id: any;
   entityToSave: any;
   operation?: any;
@@ -475,19 +486,19 @@ export interface UpdateEntityByIdOptions {
 }
 
 export interface DeleteEntityOptions {
-  routerContext?: RouteContext;
+  routeContext?: RouteContext;
   filters?: EntityFilterOptions[];
 }
 
 export interface AddEntityRelationsOptions {
-  routerContext?: RouteContext;
+  routeContext?: RouteContext;
   id: number;
   property: string;
   relations: { id?: number; [k: string]: any }[];
 }
 
 export interface RemoveEntityRelationsOptions {
-  routerContext?: RouteContext;
+  routeContext?: RouteContext;
   id: number;
   property: string;
   relations: { id?: number; [k: string]: any }[];
@@ -507,6 +518,7 @@ export type EntityWatchHandler<TEventName extends keyof RpdServerEventTypes> = (
 export type EntityWatchHandlerContext<TEventName extends keyof RpdServerEventTypes> = {
   server: IRpdServer;
   payload: RpdServerEventTypes[TEventName][1];
+  routerContext?: RouteContext;
 };
 
 export interface EntityWatchPluginInitOptions {