@ruiapp/rapid-core 0.1.19 → 0.1.21

package/dist/plugins/auth/AuthPlugin.d.ts

@@ -10,18 +10,9 @@ declare class AuthPlugin implements RapidPlugin {
     get extendingAbilities(): RpdServerPluginExtendingAbilities[];
     get configurableTargets(): RpdServerPluginConfigurableTargetOptions[];
     get configurations(): RpdConfigurationItemOptions[];
-    initPlugin(server: IRpdServer): Promise<any>;
-    registerMiddlewares(server: IRpdServer): Promise<any>;
     registerActionHandlers(server: IRpdServer): Promise<any>;
-    registerEventHandlers(server: IRpdServer): Promise<any>;
-    registerMessageHandlers(server: IRpdServer): Promise<any>;
-    registerTaskProcessors(server: IRpdServer): Promise<any>;
-    onLoadingApplication(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any>;
     configureModels(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any>;
-    configureModelProperties(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any>;
     configureRoutes(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any>;
-    onApplicationLoaded(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any>;
-    onApplicationReady(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any>;
     onPrepareRouteContext(server: IRpdServer, routeContext: RouteContext): Promise<void>;
 }
 export default AuthPlugin;

package/dist/plugins/dataManage/DataManagePlugin.d.ts

@@ -11,17 +11,7 @@ declare class DataManager implements RapidPlugin {
     get extendingAbilities(): RpdServerPluginExtendingAbilities[];
     get configurableTargets(): RpdServerPluginConfigurableTargetOptions[];
     get configurations(): RpdConfigurationItemOptions[];
-    initPlugin(server: IRpdServer): Promise<any>;
-    registerMiddlewares(server: IRpdServer): Promise<any>;
     registerActionHandlers(server: IRpdServer): Promise<any>;
-    registerEventHandlers(server: IRpdServer): Promise<any>;
-    registerMessageHandlers(server: IRpdServer): Promise<any>;
-    registerTaskProcessors(server: IRpdServer): Promise<any>;
-    onLoadingApplication(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any>;
-    configureModels(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any>;
-    configureModelProperties(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any>;
     configureRoutes(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any>;
-    onApplicationLoaded(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any>;
-    onApplicationReady(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any>;
 }
 export default DataManager;

package/dist/plugins/entityAccessControl/EntityAccessControlPlugin.d.ts

@@ -0,0 +1,17 @@
+import type { RpdApplicationConfig } from "../../types";
+import { IRpdServer, RapidPlugin, RpdConfigurationItemOptions, RpdServerPluginConfigurableTargetOptions, RpdServerPluginExtendingAbilities } from "../../core/server";
+import { ActionHandlerContext } from "../../core/actionHandler";
+import { RouteContext } from "../../core/routeContext";
+declare class EntityAccessControlPlugin implements RapidPlugin {
+    constructor();
+    get code(): string;
+    get description(): string;
+    get extendingAbilities(): RpdServerPluginExtendingAbilities[];
+    get configurableTargets(): RpdServerPluginConfigurableTargetOptions[];
+    get configurations(): RpdConfigurationItemOptions[];
+    onLoadingApplication(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any>;
+    configureRoutes(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any>;
+    onPrepareRouteContext(server: IRpdServer, routeContext: RouteContext): Promise<void>;
+    beforeRunRouteActions(server: IRpdServer, handlerContext: ActionHandlerContext): Promise<any>;
+}
+export default EntityAccessControlPlugin;

package/dist/plugins/fileManage/FileManagePlugin.d.ts

@@ -9,17 +9,7 @@ declare class FileManager implements RapidPlugin {
     get extendingAbilities(): RpdServerPluginExtendingAbilities[];
     get configurableTargets(): RpdServerPluginConfigurableTargetOptions[];
     get configurations(): RpdConfigurationItemOptions[];
-    initPlugin(server: IRpdServer): Promise<any>;
-    registerMiddlewares(server: IRpdServer): Promise<any>;
     registerActionHandlers(server: IRpdServer): Promise<any>;
-    registerEventHandlers(server: IRpdServer): Promise<any>;
-    registerMessageHandlers(server: IRpdServer): Promise<any>;
-    registerTaskProcessors(server: IRpdServer): Promise<any>;
-    onLoadingApplication(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any>;
-    configureModels(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any>;
-    configureModelProperties(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any>;
     configureRoutes(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any>;
-    onApplicationLoaded(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any>;
-    onApplicationReady(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any>;
 }
 export default FileManager;

package/dist/plugins/metaManage/MetaManagePlugin.d.ts

@@ -9,17 +9,9 @@ declare class MetaManager implements RapidPlugin {
     get extendingAbilities(): RpdServerPluginExtendingAbilities[];
     get configurableTargets(): RpdServerPluginConfigurableTargetOptions[];
     get configurations(): RpdConfigurationItemOptions[];
-    initPlugin(server: IRpdServer): Promise<any>;
-    registerMiddlewares(server: IRpdServer): Promise<any>;
     registerActionHandlers(server: IRpdServer): Promise<any>;
     registerEventHandlers(server: IRpdServer): Promise<any>;
-    registerMessageHandlers(server: IRpdServer): Promise<any>;
-    registerTaskProcessors(server: IRpdServer): Promise<any>;
-    onLoadingApplication(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any>;
     configureModels(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any>;
-    configureModelProperties(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any>;
-    configureRoutes(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any>;
     onApplicationLoaded(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any>;
-    onApplicationReady(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any>;
 }
 export default MetaManager;

package/dist/plugins/routeManage/RouteManagePlugin.d.ts

@@ -9,17 +9,8 @@ declare class RouteManager implements RapidPlugin {
     get extendingAbilities(): RpdServerPluginExtendingAbilities[];
     get configurableTargets(): RpdServerPluginConfigurableTargetOptions[];
     get configurations(): RpdConfigurationItemOptions[];
-    initPlugin(server: IRpdServer): Promise<any>;
-    registerMiddlewares(server: IRpdServer): Promise<any>;
     registerActionHandlers(server: IRpdServer): Promise<any>;
     registerEventHandlers(server: IRpdServer): Promise<any>;
-    registerMessageHandlers(server: IRpdServer): Promise<any>;
-    registerTaskProcessors(server: IRpdServer): Promise<any>;
-    onLoadingApplication(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any>;
-    configureModels(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any>;
-    configureModelProperties(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any>;
     configureRoutes(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any>;
-    onApplicationLoaded(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any>;
-    onApplicationReady(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any>;
 }
 export default RouteManager;

package/dist/plugins/webhooks/WebhooksPlugin.d.ts

@@ -21,13 +21,7 @@ declare class WebhooksPlugin implements RapidPlugin {
     get extendingAbilities(): RpdServerPluginExtendingAbilities[];
     get configurableTargets(): RpdServerPluginConfigurableTargetOptions[];
     get configurations(): RpdConfigurationItemOptions[];
-    initPlugin(server: IRpdServer): Promise<any>;
-    registerMiddlewares(server: IRpdServer): Promise<any>;
-    registerActionHandlers(server: IRpdServer): Promise<any>;
     registerEventHandlers(server: IRpdServer): Promise<any>;
-    registerMessageHandlers(server: IRpdServer): Promise<any>;
-    registerTaskProcessors(server: IRpdServer): Promise<any>;
-    onLoadingApplication(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any>;
     configureModels(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any>;
     configureModelProperties(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any>;
     configureRoutes(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any>;

package/dist/server.d.ts

@@ -1,9 +1,11 @@
-import { GetDataAccessorOptions, GetModelOptions, IDatabaseAccessor, IDatabaseConfig, IQueryBuilder, IRpdDataAccessor, RpdApplicationConfig, RpdDataModel, RpdServerEventTypes, RapidServerConfig } from "./types";
-import { ActionHandler, IPluginActionHandler } from "./core/actionHandler";
+import { GetDataAccessorOptions, GetModelOptions, IDatabaseAccessor, IDatabaseConfig, IQueryBuilder, IRpdDataAccessor, RpdApplicationConfig, RpdDataModel, RpdServerEventTypes, RapidServerConfig, RpdDataModelProperty } from "./types";
+import { ActionHandler, ActionHandlerContext, IPluginActionHandler } from "./core/actionHandler";
 import { IRpdServer, RapidPlugin } from "./core/server";
 import { Next } from "./core/routeContext";
 import EntityManager from "./dataAccess/entityManager";
+import { Logger } from "./facilities/log/LogFacility";
 export interface InitServerOptions {
+    logger: Logger;
     databaseAccessor: IDatabaseAccessor;
     databaseConfig: IDatabaseConfig;
     serverConfig: RapidServerConfig;
@@ -16,8 +18,10 @@ export declare class RapidServer implements IRpdServer {
     config: RapidServerConfig;
     databaseConfig: IDatabaseConfig;
     constructor(options: InitServerOptions);
+    getLogger(): Logger;
     getApplicationConfig(): RpdApplicationConfig;
     appendApplicationConfig(config: Partial<RpdApplicationConfig>): void;
+    appendModelProperties(modelSingularCode: string, properties: RpdDataModelProperty[]): void;
     registerActionHandler(plugin: RapidPlugin, options: IPluginActionHandler): void;
     getActionHandlerByCode(code: string): ActionHandler;
     registerMiddleware(middleware: any): void;
@@ -31,5 +35,6 @@ export declare class RapidServer implements IRpdServer {
     queryDatabaseObject(sql: string, params?: unknown[] | Record<string, unknown>): Promise<any[]>;
     tryQueryDatabaseObject(sql: string, params?: unknown[] | Record<string, unknown>): Promise<any[]>;
     get middlewares(): any[];
-    handleRequest(request: Request, next: Next): Promise<Response>;
+    handleRequest(request: Request, next: Next): any;
+    beforeRunRouteActions(handlerContext: ActionHandlerContext): Promise<void>;
 }

package/dist/types.d.ts

@@ -111,6 +111,17 @@ export interface RpdDataModel {
     tableName: string;
     properties: RpdDataModelProperty[];
     extensions?: RpdDataModelExtension[];
+    permissionPolicies?: RpdDataModelPermissionPolicies;
+}
+export interface RpdDataModelPermissionPolicies {
+    find?: PermissionPolicy;
+    create?: PermissionPolicy;
+    update?: PermissionPolicy;
+    delete?: PermissionPolicy;
+}
+export interface PermissionPolicy {
+    any?: string[];
+    all?: string[];
 }
 export interface RpdDataModelProperty {
     /**

package/dist/utilities/accessControlUtility.d.ts

@@ -0,0 +1,5 @@
+export type PermissionCheckPolicy = {
+    any?: string[];
+    all?: string[];
+};
+export declare function isAccessAllowed(policy: PermissionCheckPolicy, allowedActions: string[]): boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ruiapp/rapid-core",
-  "version": "0.1.19",
+  "version": "0.1.21",
   "description": "",
   "main": "dist/index.js",
   "keywords": [],
@@ -12,8 +12,8 @@
     "@types/node": "^20.11.16",
     "rimraf": "^3.0.2",
     "rollup": "^2.79.1",
+    "rollup-plugin-tsc-alias": "^1.1.2",
     "rollup-plugin-typescript2": "^0.34.1",
-    "tsc-alias": "^1.8.8",
     "typescript": "^4.8.4"
   },
   "dependencies": {
@@ -23,6 +23,9 @@
     "qs": "^6.11.0",
     "uuid": "^9.0.1"
   },
+  "peerDependencies": {
+    "winston": "^3.11.0"
+  },
   "scripts": {
     "build": "rimraf dist && rollup --config",
     "dev": "rollup --config",

package/rollup.config.js

@@ -1,22 +1,5 @@
-import { exec } from "child_process";
 import typescript from 'rollup-plugin-typescript2';
-
-const tscAlias = () => {
-    return {
-        name: "tsAlias",
-        writeBundle: () => {
-            return new Promise((resolve, reject) => {
-                exec("tsc-alias", function callback(error, stdout, stderr) {
-                    if (stderr || error) {
-                        reject(stderr || error);
-                    } else {
-                        resolve(stdout);
-                    }
-                });
-            });
-        },
-    };
-};
+import tscAlias from 'rollup-plugin-tsc-alias';
 
 export default {
     input: ["src/index.ts"],

package/src/core/actionHandler.ts

@@ -1,8 +1,10 @@
 import { RpdApplicationConfig } from "~/types";
 import { IRpdServer, RapidPlugin } from "./server";
 import { Next, RouteContext } from "./routeContext";
+import { Logger } from "~/facilities/log/LogFacility";
 
 export interface ActionHandlerContext {
+  logger: Logger;
   routerContext: RouteContext;
   next: Next;
   server: IRpdServer;

package/src/core/pluginManager.ts

@@ -1,6 +1,7 @@
 import { RpdApplicationConfig } from "~/types";
 import { IRpdServer, RapidPlugin } from "./server";
 import { RouteContext } from "./routeContext";
+import { ActionHandlerContext } from "./actionHandler";
 
 class PluginManager {
   #server: IRpdServer;
@@ -147,6 +148,17 @@ class PluginManager {
       }
     }
   }
+
+  /** 在接收到HTTP请求，执行 actions 前调用。 */
+  async beforeRunRouteActions(
+    handlerContext: ActionHandlerContext,
+  ) {
+    for (const plugin of this.#plugins) {
+      if (plugin.beforeRunRouteActions) {
+        await plugin.beforeRunRouteActions(this.#server, handlerContext);
+      }
+    }
+  }
 }
 
 export default PluginManager;

package/src/core/request.ts

@@ -1,6 +1,8 @@
 import qs from "qs";
 import { parseFormDataBody } from "./http/formDataParser";
 import { getCookies } from "~/deno-std/http/cookie";
+import { IRpdServer } from "./server";
+import { Logger } from "~/facilities/log/LogFacility";
 
 export const GlobalRequest = global.Request;
 
@@ -10,6 +12,7 @@ export interface RapidRequestBody {
 }
 
 export class RapidRequest {
+  #logger: Logger;
   #raw: Request;
   #bodyParsed: boolean;
   #body: RapidRequestBody;
@@ -18,7 +21,8 @@ export class RapidRequest {
   method: string;
   url: URL;
 
-  constructor(req: Request) {
+  constructor(server: IRpdServer, req: Request) {
+    this.#logger = server.getLogger();
     this.#raw = req;
     this.method = req.method;
     this.url = new URL(req.url);
@@ -27,7 +31,7 @@ export class RapidRequest {
 
   async parseBody(): Promise<void> {
     if (this.#bodyParsed) {
-      console.warn("Request body has been parsed. 'parseBody()' method should not be called more than once.");
+      this.#logger.warn("Request body has been parsed. 'parseBody()' method should not be called more than once.");
       return;
     }
 

package/src/core/routeContext.ts

@@ -2,18 +2,23 @@ import { isArray, isObject } from "lodash";
 import { RapidRequest } from "./request";
 import { RapidResponse } from "./response";
 import { HttpStatus, ResponseData } from "./http-types";
+import { IRpdServer } from "./server";
+import { Logger } from "~/facilities/log/LogFacility";
 
 export type Next = () => Promise<void>;
 
 export class RouteContext {
+  #logger: Logger;
   readonly request: RapidRequest;
   readonly response: RapidResponse;
   readonly state: Record<string, any>;
   method: string;
   path: string;
   params: Record<string, string>;
+  routeConfig: any;
 
-  constructor(request: RapidRequest) {
+  constructor(server: IRpdServer, request: RapidRequest) {
+    this.#logger = server.getLogger();
     this.request = request;
     this.state = {};
     this.response = new RapidResponse();

package/src/core/routesBuilder.ts

@@ -5,11 +5,13 @@ import { IRpdServer } from "~/core/server";
 import { RpdApplicationConfig } from "~/types";
 import { isNullOrUndefined } from "~/utilities/typeUtility";
 import { Next, RouteContext } from "./routeContext";
+import { cloneDeep } from "lodash";
 
 export async function buildRoutes(
   server: IRpdServer,
   applicationConfig: RpdApplicationConfig,
 ) {
+  const logger = server.getLogger();
   const router = new Router();
 
   let baseUrl = server.config.baseUrl;
@@ -31,6 +33,7 @@ export async function buildRoutes(
     (router as any)[routeConfig.method.toLowerCase()](
       routePath,
       async (routerContext: RouteContext, next: Next) => {
+        routerContext.routeConfig = cloneDeep(routeConfig);
         const { request, params } = routerContext;
 
         let search = request.url.search;
@@ -53,10 +56,14 @@ export async function buildRoutes(
 
         // Normalize input value
 
-        console.debug(`${requestMethod} ${request.url.toString()}`);
-        console.debug(`input: ${JSON.stringify(input)}`);
+        logger.debug("Processing rapid request.", {
+          method: requestMethod,
+          url: request.url.toString(),
+          input
+        });
 
         let handlerContext: ActionHandlerContext = {
+          logger,
           routerContext,
           next,
           server,
@@ -64,13 +71,16 @@ export async function buildRoutes(
           input,
         };
 
-        for (const handlerConfig of routeConfig.actions) {
-          const handler = server.getActionHandlerByCode(handlerConfig.code);
+        await server.beforeRunRouteActions(handlerContext);
+
+        for (const actionConfig of routeConfig.actions) {
+          const actionCode = actionConfig.code;
+          const handler = server.getActionHandlerByCode(actionCode);
           if (!handler) {
-            throw new Error("Unknown handler: " + handlerConfig.code);
+            throw new Error("Unknown handler: " + actionCode);
           }
 
-          const result = handler(handlerContext, handlerConfig.config);
+          const result = handler(handlerContext, actionConfig.config);
           if (result instanceof Promise) {
             await result;
           }

package/src/core/server.ts

@@ -1,12 +1,14 @@
-import { GetDataAccessorOptions, GetModelOptions, IDatabaseConfig, IQueryBuilder, IRpdDataAccessor, RapidServerConfig, RpdApplicationConfig, RpdDataModel, RpdServerEventTypes } from "~/types";
-import { IPluginActionHandler, ActionHandler } from "./actionHandler";
+import { GetDataAccessorOptions, GetModelOptions, IDatabaseConfig, IQueryBuilder, IRpdDataAccessor, RapidServerConfig, RpdApplicationConfig, RpdDataModel, RpdDataModelProperty, RpdServerEventTypes } from "~/types";
+import { IPluginActionHandler, ActionHandler, ActionHandlerContext } from "./actionHandler";
 import { Next, RouteContext } from "./routeContext";
 import EntityManager from "~/dataAccess/entityManager";
+import { Logger } from "~/facilities/log/LogFacility";
 
 export interface IRpdServer {
   config: RapidServerConfig;
   databaseConfig: IDatabaseConfig;
   queryBuilder: IQueryBuilder;
+  getLogger(): Logger;
   queryDatabaseObject: (
     sql: string,
     params?: unknown[] | Record<string, unknown>,
@@ -27,6 +29,7 @@ export interface IRpdServer {
   getEntityManager<TEntity = any>(singularCode: string): EntityManager<TEntity>;
   getApplicationConfig(): RpdApplicationConfig;
   appendApplicationConfig(config: Partial<RpdApplicationConfig>);
+  appendModelProperties(modelSingularCode: string, properties: RpdDataModelProperty[]);
   getModel(options: GetModelOptions): RpdDataModel | undefined;
   registerEventHandler<K extends keyof RpdServerEventTypes>(
     eventName: K,
@@ -38,6 +41,7 @@ export interface IRpdServer {
     payload: RpdServerEventTypes[K][1],
   ): void;
   handleRequest(request: Request, next: Next): Promise<Response>;
+  beforeRunRouteActions(handlerContext: ActionHandlerContext): Promise<void>;
 }
 
 
@@ -127,4 +131,6 @@ export interface RapidPlugin {
   onApplicationReady?: (server: IRpdServer, applicationConfig: RpdApplicationConfig) => Promise<any>;
   /** 在接收到HTTP请求，准备路由上下文时调用。 */
   onPrepareRouteContext?: (server: IRpdServer, routeContext: RouteContext) => Promise<any>;
+  /** 在接收到HTTP请求，执行 actions 前调用。 */
+  beforeRunRouteActions?: (server: IRpdServer, handlerContext: ActionHandlerContext) => Promise<any>;
 }

package/src/dataAccess/dataAccessor.ts

@@ -1,4 +1,3 @@
-import * as _ from "lodash";
 import {
   CountEntityOptions,
   FindEntityOptions,
@@ -9,6 +8,9 @@ import {
   IDatabaseAccessor,
 } from "~/types";
 import QueryBuilder from "~/queryBuilder/queryBuilder";
+import { first, set } from "lodash";
+import { IRpdServer } from "~/core/server";
+import { Logger } from "~/facilities/log/LogFacility";
 
 export interface IDataAccessorOptions {
   model: RpdDataModel;
@@ -16,11 +18,13 @@ export interface IDataAccessorOptions {
 }
 
 export default class DataAccessor<T = any> implements IRpdDataAccessor<T> {
+  #logger: Logger;
   #model: RpdDataModel;
   #queryBuilder: QueryBuilder;
   #databaseAccessor: IDatabaseAccessor;
 
-  constructor(databaseAccessor: IDatabaseAccessor, options: IDataAccessorOptions) {
+  constructor(server: IRpdServer, databaseAccessor: IDatabaseAccessor, options: IDataAccessorOptions) {
+    this.#logger = server.getLogger();
     this.#databaseAccessor = databaseAccessor;
     this.#queryBuilder = options.queryBuilder;
     this.#model = options.model;
@@ -36,7 +40,7 @@ export default class DataAccessor<T = any> implements IRpdDataAccessor<T> {
     };
     const query = this.#queryBuilder.insert(this.#model, options);
     const result = await this.#databaseAccessor.queryDatabaseObject(query.command, query.params);
-    return _.first(result);
+    return first(result);
   }
 
   async updateById(id: any, entity: Partial<T>): Promise<{ count: number }> {
@@ -52,19 +56,19 @@ export default class DataAccessor<T = any> implements IRpdDataAccessor<T> {
     };
     const query = this.#queryBuilder.update(this.#model, options);
     const result = await this.#databaseAccessor.queryDatabaseObject(query.command, query.params);
-    return _.first(result);
+    return first(result);
   }
 
   async find(options: FindEntityOptions): Promise<T[]> {
-    console.debug(`DataAccessor '${this.#model.singularCode}' find with options:`, options);
+    this.#logger.debug(`Finding '${this.#model.singularCode}' entity.`, { options });
     const query = this.#queryBuilder.select(this.#model, options);
     return await this.#databaseAccessor.queryDatabaseObject(query.command, query.params);
   }
 
   async findOne(options: FindEntityOptions): Promise<T> {
-    _.set(options, "pagination.limit", 1);
+    set(options, "pagination.limit", 1);
     const list = await this.find(options);
-    return _.first(list);
+    return first(list);
   }
 
   async findById(id: any): Promise<T | null> {
@@ -79,14 +83,14 @@ export default class DataAccessor<T = any> implements IRpdDataAccessor<T> {
     };
     const query = this.#queryBuilder.select(this.#model, options);
     const result = await this.#databaseAccessor.queryDatabaseObject(query.command, query.params);
-    return _.first(result);
+    return first(result);
   }
 
   async count(options: CountEntityOptions): Promise<any> {
     const query = this.#queryBuilder.count(this.#model, options);
     const result = await this.#databaseAccessor.queryDatabaseObject(query.command, query.params);
 
-    const row = _.first(result);
+    const row = first(result);
     if (row) {
       return row;
     }