@ruiapp/rapid-core 0.2.6 → 0.2.8

package/dist/dataAccess/dataAccessor.d.ts

@@ -17,6 +17,6 @@ export default class DataAccessor<T = any> implements IRpdDataAccessor<T> {
     find(options: FindRowOptions): Promise<T[]>;
     findOne(options: FindRowOptions): Promise<T>;
     findById(id: any): Promise<T | null>;
-    count(options: CountRowOptions): Promise<any>;
+    count(options: CountRowOptions): Promise<number>;
     deleteById(id: any): Promise<void>;
 }

package/dist/dataAccess/entityManager.d.ts

@@ -1,4 +1,4 @@
-import { AddEntityRelationsOptions, CountEntityOptions, CountEntityResult, CreateEntityOptions, DeleteEntityByIdOptions, FindEntityByIdOptions, FindEntityOptions, IRpdDataAccessor, RemoveEntityRelationsOptions, RpdDataModel, RpdDataModelIndex, RpdDataModelProperty, UpdateEntityByIdOptions, FindEntityFindOneRelationEntitiesOptions, FindEntityFindManyRelationEntitiesOptions } from "../types";
+import { AddEntityRelationsOptions, CountEntityOptions, CreateEntityOptions, DeleteEntityByIdOptions, FindEntityByIdOptions, FindEntityOptions, IRpdDataAccessor, RemoveEntityRelationsOptions, RpdDataModel, RpdDataModelIndex, RpdDataModelProperty, UpdateEntityByIdOptions, FindEntityFindOneRelationEntitiesOptions, FindEntityFindManyRelationEntitiesOptions } from "../types";
 import { IRpdServer, RapidPlugin } from "../core/server";
 import { RouteContext } from "../core/routeContext";
 export type FindOneRelationEntitiesOptions = {
@@ -30,7 +30,7 @@ export default class EntityManager<TEntity = any> {
     findById(options: FindEntityByIdOptions | string | number): Promise<TEntity | null>;
     createEntity(options: CreateEntityOptions, plugin?: RapidPlugin): Promise<TEntity>;
     updateEntityById(options: UpdateEntityByIdOptions, plugin?: RapidPlugin): Promise<TEntity>;
-    count(options: CountEntityOptions): Promise<CountEntityResult>;
+    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>;

package/dist/index.js

@@ -159,11 +159,9 @@ class DataAccessor {
         const result = await this.#databaseAccessor.queryDatabaseObject(query.command, query.params);
         const row = lodash.first(result);
         if (row) {
-            return row;
+            return row.count;
         }
-        return {
-            count: 0,
-        };
+        return 0;
     }
     async deleteById(id) {
         const options = {
@@ -2972,7 +2970,7 @@ async function createEntity(server, dataAccessor, options, plugin) {
     const newEntityOneRelationProps = {};
     // save one-relation properties
     for (const property of oneRelationPropertiesToCreate) {
-        const targetRow = property.isBaseProperty ? baseRow : row;
+        const rowToBeSaved = property.isBaseProperty ? baseRow : row;
         const fieldValue = entity[property.code];
         const targetDataAccessor = server.getDataAccessor({
             singularCode: property.targetSingularCode,
@@ -2980,13 +2978,15 @@ async function createEntity(server, dataAccessor, options, plugin) {
         if (lodash.isObject(fieldValue)) {
             const targetEntityId = fieldValue["id"];
             if (!targetEntityId) {
-                const targetEntity = fieldValue;
-                const newTargetEntity = await createEntity(server, targetDataAccessor, {
-                    routeContext,
-                    entity: targetEntity,
-                });
-                newEntityOneRelationProps[property.code] = newTargetEntity;
-                targetRow[property.targetIdColumnName] = newTargetEntity["id"];
+                if (!property.selfIdColumnName) {
+                    const targetEntity = fieldValue;
+                    const newTargetEntity = await createEntity(server, targetDataAccessor, {
+                        routeContext,
+                        entity: targetEntity,
+                    });
+                    newEntityOneRelationProps[property.code] = newTargetEntity;
+                    rowToBeSaved[property.targetIdColumnName] = newTargetEntity["id"];
+                }
             }
             else {
                 const targetEntity = await findById(server, targetDataAccessor, {
@@ -2997,7 +2997,7 @@ async function createEntity(server, dataAccessor, options, plugin) {
                     throw newEntityOperationError(`Create ${model.singularCode} entity failed. Property '${property.code}' was invalid. Related ${property.targetSingularCode} entity with id '${targetEntityId}' was not found.`);
                 }
                 newEntityOneRelationProps[property.code] = targetEntity;
-                targetRow[property.targetIdColumnName] = targetEntityId;
+                rowToBeSaved[property.targetIdColumnName] = targetEntityId;
             }
         }
         else if (lodash.isNumber(fieldValue) || lodash.isString(fieldValue)) {
@@ -3011,16 +3011,17 @@ async function createEntity(server, dataAccessor, options, plugin) {
                 throw newEntityOperationError(`Create ${model.singularCode} entity failed. Property '${property.code}' was invalid. Related ${property.targetSingularCode} entity with id '${targetEntityId}' was not found.`);
             }
             newEntityOneRelationProps[property.code] = targetEntity;
-            targetRow[property.targetIdColumnName] = targetEntityId;
+            rowToBeSaved[property.targetIdColumnName] = targetEntityId;
         }
         else {
             newEntityOneRelationProps[property.code] = null;
-            targetRow[property.targetIdColumnName] = null;
+            rowToBeSaved[property.targetIdColumnName] = null;
         }
     }
     let newBaseRow;
+    let baseDataAccessor;
     if (model.base) {
-        const baseDataAccessor = server.getDataAccessor({
+        baseDataAccessor = server.getDataAccessor({
             singularCode: model.base,
         });
         newBaseRow = await baseDataAccessor.create(baseRow);
@@ -3028,6 +3029,35 @@ async function createEntity(server, dataAccessor, options, plugin) {
     }
     const newRow = await dataAccessor.create(row);
     const newEntity = mapDbRowToEntity(server, model, Object.assign({}, newBaseRow, newRow, newEntityOneRelationProps), true);
+    // save one-relation properties that has selfIdColumnName
+    for (const property of oneRelationPropertiesToCreate) {
+        const fieldValue = entity[property.code];
+        const targetDataAccessor = server.getDataAccessor({
+            singularCode: property.targetSingularCode,
+        });
+        if (lodash.isObject(fieldValue)) {
+            const targetEntityId = fieldValue["id"];
+            if (!targetEntityId) {
+                if (property.selfIdColumnName) {
+                    const targetEntity = fieldValue;
+                    targetEntity[property.selfIdColumnName] = newEntity.id;
+                    const newTargetEntity = await createEntity(server, targetDataAccessor, {
+                        routeContext,
+                        entity: targetEntity,
+                    });
+                    let dataAccessorOfMainEntity = dataAccessor;
+                    if (property.isBaseProperty) {
+                        dataAccessorOfMainEntity = baseDataAccessor;
+                    }
+                    const relationFieldChanges = {
+                        [property.targetIdColumnName]: newTargetEntity.id,
+                    };
+                    await dataAccessorOfMainEntity.updateById(newEntity.id, relationFieldChanges);
+                    newEntity[property.code] = newTargetEntity;
+                }
+            }
+        }
+    }
     // save many-relation properties
     for (const property of manyRelationPropertiesToCreate) {
         newEntity[property.code] = [];
@@ -3221,7 +3251,7 @@ async function updateEntityById(server, dataAccessor, options, plugin) {
     const { row, baseRow } = mapEntityToDbRow(server, model, changes);
     const updatedEntityOneRelationProps = {};
     for (const property of oneRelationPropertiesToUpdate) {
-        const targetRow = property.isBaseProperty ? baseRow : row;
+        const rowToBeSaved = property.isBaseProperty ? baseRow : row;
         const fieldValue = changes[property.code];
         const targetDataAccessor = server.getDataAccessor({
             singularCode: property.targetSingularCode,
@@ -3229,13 +3259,15 @@ async function updateEntityById(server, dataAccessor, options, plugin) {
         if (lodash.isObject(fieldValue)) {
             const targetEntityId = fieldValue["id"];
             if (!targetEntityId) {
-                const targetEntity = fieldValue;
-                const newTargetEntity = await createEntity(server, targetDataAccessor, {
-                    routeContext,
-                    entity: targetEntity,
-                });
-                updatedEntityOneRelationProps[property.code] = newTargetEntity;
-                targetRow[property.targetIdColumnName] = newTargetEntity["id"];
+                if (!property.selfIdColumnName) {
+                    const targetEntity = fieldValue;
+                    const newTargetEntity = await createEntity(server, targetDataAccessor, {
+                        routeContext,
+                        entity: targetEntity,
+                    });
+                    updatedEntityOneRelationProps[property.code] = newTargetEntity;
+                    rowToBeSaved[property.targetIdColumnName] = newTargetEntity["id"];
+                }
             }
             else {
                 const targetEntity = await findById(server, targetDataAccessor, {
@@ -3246,7 +3278,7 @@ async function updateEntityById(server, dataAccessor, options, plugin) {
                     throw newEntityOperationError(`Create ${model.singularCode} entity failed. Property '${property.code}' was invalid. Related ${property.targetSingularCode} entity with id '${targetEntityId}' was not found.`);
                 }
                 updatedEntityOneRelationProps[property.code] = targetEntity;
-                targetRow[property.targetIdColumnName] = targetEntityId;
+                rowToBeSaved[property.targetIdColumnName] = targetEntityId;
             }
         }
         else if (lodash.isNumber(fieldValue) || lodash.isString(fieldValue)) {
@@ -3260,11 +3292,11 @@ async function updateEntityById(server, dataAccessor, options, plugin) {
                 throw newEntityOperationError(`Create ${model.singularCode} entity failed. Property '${property.code}' was invalid. Related ${property.targetSingularCode} entity with id '${targetEntityId}' was not found.`);
             }
             updatedEntityOneRelationProps[property.code] = targetEntity;
-            targetRow[property.targetIdColumnName] = targetEntityId;
+            rowToBeSaved[property.targetIdColumnName] = targetEntityId;
         }
         else {
             updatedEntityOneRelationProps[property.code] = null;
-            targetRow[property.targetIdColumnName] = null;
+            rowToBeSaved[property.targetIdColumnName] = null;
         }
     }
     let updatedRow = row;
@@ -3272,14 +3304,47 @@ async function updateEntityById(server, dataAccessor, options, plugin) {
         updatedRow = await dataAccessor.updateById(id, row);
     }
     let updatedBaseRow = baseRow;
-    if (model.base && Object.keys(baseRow).length) {
-        const baseDataAccessor = server.getDataAccessor({
+    let baseDataAccessor;
+    if (model.base) {
+        baseDataAccessor = server.getDataAccessor({
             singularCode: model.base,
         });
-        updatedBaseRow = await baseDataAccessor.updateById(id, updatedBaseRow);
+        if (Object.keys(baseRow).length) {
+            updatedBaseRow = await baseDataAccessor.updateById(id, updatedBaseRow);
+        }
     }
     let updatedEntity = mapDbRowToEntity(server, model, { ...updatedRow, ...updatedBaseRow, ...updatedEntityOneRelationProps }, true);
     updatedEntity = Object.assign({}, entity, updatedEntity);
+    // save one-relation properties that has selfIdColumnName
+    for (const property of oneRelationPropertiesToUpdate) {
+        const fieldValue = changes[property.code];
+        const targetDataAccessor = server.getDataAccessor({
+            singularCode: property.targetSingularCode,
+        });
+        if (lodash.isObject(fieldValue)) {
+            const targetEntityId = fieldValue["id"];
+            if (!targetEntityId) {
+                if (property.selfIdColumnName) {
+                    const targetEntity = fieldValue;
+                    targetEntity[property.selfIdColumnName] = updatedEntity.id;
+                    const newTargetEntity = await createEntity(server, targetDataAccessor, {
+                        routeContext,
+                        entity: targetEntity,
+                    });
+                    let dataAccessorOfMainEntity = dataAccessor;
+                    if (property.isBaseProperty) {
+                        dataAccessorOfMainEntity = baseDataAccessor;
+                    }
+                    const relationFieldChanges = {
+                        [property.targetIdColumnName]: newTargetEntity.id,
+                    };
+                    await dataAccessorOfMainEntity.updateById(updatedEntity.id, relationFieldChanges);
+                    updatedEntity[property.code] = newTargetEntity;
+                    changes[property.code] = newTargetEntity;
+                }
+            }
+        }
+    }
     // save many-relation properties
     for (const property of manyRelationPropertiesToUpdate) {
         const relatedEntities = [];
@@ -4723,8 +4788,8 @@ async function handler$q(plugin, ctx, options) {
         const result = { list: entities };
         if (input.pagination && !input.pagination.withoutTotal) {
             // TOOD: count entities when calling findEntities for performance.
-            const countResult = await entityManager.count(input);
-            result.total = countResult.count;
+            const total = await entityManager.count(input);
+            result.total = total;
         }
         return result;
     });
@@ -4760,10 +4825,11 @@ var findCollectionEntityById = /*#__PURE__*/Object.freeze({
 
 const code$o = "countCollectionEntities";
 async function handler$o(plugin, ctx, options) {
-    await runCollectionEntityActionHandler(ctx, options, code$o, (entityManager, input) => {
+    await runCollectionEntityActionHandler(ctx, options, code$o, async (entityManager, input) => {
         input.filters = removeFiltersWithNullValue(input.filters);
         input.routeContext = ctx.routerContext;
-        return entityManager.count(input);
+        const count = await entityManager.count(input);
+        return { count };
     });
 }
 

package/dist/types.d.ts

@@ -377,7 +377,7 @@ export interface IRpdDataAccessor<T = any> {
     find(options: FindRowOptions): Promise<T[]>;
     findOne(options: FindRowOptions): Promise<T | null>;
     findById(id: any): Promise<T | null>;
-    count(options: CountRowOptions): Promise<any>;
+    count(options: CountRowOptions): Promise<number>;
     deleteById(id: any): Promise<void>;
 }
 export type EntityFilterRelationalOperators = "eq" | "ne" | "lt" | "lte" | "gt" | "gte" | "contains" | "notContains" | "containsCS" | "notContainsCS" | "startsWith" | "notStartsWith" | "endsWith" | "notEndsWith";

package/package.json

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

package/src/dataAccess/dataAccessor.ts

@@ -98,7 +98,7 @@ export default class DataAccessor<T = any> implements IRpdDataAccessor<T> {
     return result;
   }
 
-  async count(options: CountRowOptions): Promise<any> {
+  async count(options: CountRowOptions): Promise<number> {
     let query: DatabaseQuery;
     if (this.#model.base) {
       const baseModel = this.#server.getModel({
@@ -112,11 +112,9 @@ export default class DataAccessor<T = any> implements IRpdDataAccessor<T> {
 
     const row = first(result);
     if (row) {
-      return row;
+      return row.count;
     }
-    return {
-      count: 0,
-    };
+    return 0;
   }
 
   async deleteById(id: any) {

package/src/dataAccess/entityManager.ts

@@ -1,7 +1,6 @@
 import {
   AddEntityRelationsOptions,
   CountEntityOptions,
-  CountEntityResult,
   CreateEntityOptions,
   DeleteEntityByIdOptions,
   EntityFilterOperators,
@@ -796,7 +795,7 @@ async function createEntity(server: IRpdServer, dataAccessor: IRpdDataAccessor,
   const newEntityOneRelationProps = {};
   // save one-relation properties
   for (const property of oneRelationPropertiesToCreate) {
-    const targetRow = property.isBaseProperty ? baseRow : row;
+    const rowToBeSaved = property.isBaseProperty ? baseRow : row;
     const fieldValue = entity[property.code];
     const targetDataAccessor = server.getDataAccessor({
       singularCode: property.targetSingularCode!,
@@ -804,13 +803,15 @@ async function createEntity(server: IRpdServer, dataAccessor: IRpdDataAccessor,
     if (isObject(fieldValue)) {
       const targetEntityId = fieldValue["id"];
       if (!targetEntityId) {
-        const targetEntity = fieldValue;
-        const newTargetEntity = await createEntity(server, targetDataAccessor, {
-          routeContext,
-          entity: targetEntity,
-        });
-        newEntityOneRelationProps[property.code] = newTargetEntity;
-        targetRow[property.targetIdColumnName!] = newTargetEntity["id"];
+        if (!property.selfIdColumnName) {
+          const targetEntity = fieldValue;
+          const newTargetEntity = await createEntity(server, targetDataAccessor, {
+            routeContext,
+            entity: targetEntity,
+          });
+          newEntityOneRelationProps[property.code] = newTargetEntity;
+          rowToBeSaved[property.targetIdColumnName!] = newTargetEntity["id"];
+        }
       } else {
         const targetEntity = await findById(server, targetDataAccessor, {
           id: targetEntityId,
@@ -822,7 +823,7 @@ async function createEntity(server: IRpdServer, dataAccessor: IRpdDataAccessor,
           );
         }
         newEntityOneRelationProps[property.code] = targetEntity;
-        targetRow[property.targetIdColumnName!] = targetEntityId;
+        rowToBeSaved[property.targetIdColumnName!] = targetEntityId;
       }
     } else if (isNumber(fieldValue) || isString(fieldValue)) {
       // fieldValue is id;
@@ -837,16 +838,17 @@ async function createEntity(server: IRpdServer, dataAccessor: IRpdDataAccessor,
         );
       }
       newEntityOneRelationProps[property.code] = targetEntity;
-      targetRow[property.targetIdColumnName!] = targetEntityId;
+      rowToBeSaved[property.targetIdColumnName!] = targetEntityId;
     } else {
       newEntityOneRelationProps[property.code] = null;
-      targetRow[property.targetIdColumnName!] = null;
+      rowToBeSaved[property.targetIdColumnName!] = null;
     }
   }
 
   let newBaseRow: any;
+  let baseDataAccessor: any;
   if (model.base) {
-    const baseDataAccessor = server.getDataAccessor({
+    baseDataAccessor = server.getDataAccessor({
       singularCode: model.base,
     });
     newBaseRow = await baseDataAccessor.create(baseRow);
@@ -856,6 +858,38 @@ async function createEntity(server: IRpdServer, dataAccessor: IRpdDataAccessor,
   const newRow = await dataAccessor.create(row);
   const newEntity = mapDbRowToEntity(server, model, Object.assign({}, newBaseRow, newRow, newEntityOneRelationProps), true);
 
+  // save one-relation properties that has selfIdColumnName
+  for (const property of oneRelationPropertiesToCreate) {
+    const fieldValue = entity[property.code];
+    const targetDataAccessor = server.getDataAccessor({
+      singularCode: property.targetSingularCode!,
+    });
+    if (isObject(fieldValue)) {
+      const targetEntityId = fieldValue["id"];
+      if (!targetEntityId) {
+        if (property.selfIdColumnName) {
+          const targetEntity = fieldValue;
+          targetEntity[property.selfIdColumnName] = newEntity.id;
+          const newTargetEntity = await createEntity(server, targetDataAccessor, {
+            routeContext,
+            entity: targetEntity,
+          });
+
+          let dataAccessorOfMainEntity = dataAccessor;
+          if (property.isBaseProperty) {
+            dataAccessorOfMainEntity = baseDataAccessor;
+          }
+
+          const relationFieldChanges = {
+            [property.targetIdColumnName]: newTargetEntity.id,
+          };
+          await dataAccessorOfMainEntity.updateById(newEntity.id, relationFieldChanges);
+          newEntity[property.code] = newTargetEntity;
+        }
+      }
+    }
+  }
+
   // save many-relation properties
   for (const property of manyRelationPropertiesToCreate) {
     newEntity[property.code] = [];
@@ -1068,7 +1102,7 @@ async function updateEntityById(server: IRpdServer, dataAccessor: IRpdDataAccess
 
   const updatedEntityOneRelationProps = {};
   for (const property of oneRelationPropertiesToUpdate) {
-    const targetRow = property.isBaseProperty ? baseRow : row;
+    const rowToBeSaved = property.isBaseProperty ? baseRow : row;
     const fieldValue = changes[property.code];
     const targetDataAccessor = server.getDataAccessor({
       singularCode: property.targetSingularCode!,
@@ -1077,13 +1111,15 @@ async function updateEntityById(server: IRpdServer, dataAccessor: IRpdDataAccess
     if (isObject(fieldValue)) {
       const targetEntityId = fieldValue["id"];
       if (!targetEntityId) {
-        const targetEntity = fieldValue;
-        const newTargetEntity = await createEntity(server, targetDataAccessor, {
-          routeContext,
-          entity: targetEntity,
-        });
-        updatedEntityOneRelationProps[property.code] = newTargetEntity;
-        targetRow[property.targetIdColumnName!] = newTargetEntity["id"];
+        if (!property.selfIdColumnName) {
+          const targetEntity = fieldValue;
+          const newTargetEntity = await createEntity(server, targetDataAccessor, {
+            routeContext,
+            entity: targetEntity,
+          });
+          updatedEntityOneRelationProps[property.code] = newTargetEntity;
+          rowToBeSaved[property.targetIdColumnName!] = newTargetEntity["id"];
+        }
       } else {
         const targetEntity = await findById(server, targetDataAccessor, {
           id: targetEntityId,
@@ -1095,7 +1131,7 @@ async function updateEntityById(server: IRpdServer, dataAccessor: IRpdDataAccess
           );
         }
         updatedEntityOneRelationProps[property.code] = targetEntity;
-        targetRow[property.targetIdColumnName!] = targetEntityId;
+        rowToBeSaved[property.targetIdColumnName!] = targetEntityId;
       }
     } else if (isNumber(fieldValue) || isString(fieldValue)) {
       // fieldValue is id;
@@ -1110,10 +1146,10 @@ async function updateEntityById(server: IRpdServer, dataAccessor: IRpdDataAccess
         );
       }
       updatedEntityOneRelationProps[property.code] = targetEntity;
-      targetRow[property.targetIdColumnName!] = targetEntityId;
+      rowToBeSaved[property.targetIdColumnName!] = targetEntityId;
     } else {
       updatedEntityOneRelationProps[property.code] = null;
-      targetRow[property.targetIdColumnName!] = null;
+      rowToBeSaved[property.targetIdColumnName!] = null;
     }
   }
 
@@ -1122,16 +1158,52 @@ async function updateEntityById(server: IRpdServer, dataAccessor: IRpdDataAccess
     updatedRow = await dataAccessor.updateById(id, row);
   }
   let updatedBaseRow = baseRow;
-  if (model.base && Object.keys(baseRow).length) {
-    const baseDataAccessor = server.getDataAccessor({
+  let baseDataAccessor: any;
+  if (model.base) {
+    baseDataAccessor = server.getDataAccessor({
       singularCode: model.base,
     });
-    updatedBaseRow = await baseDataAccessor.updateById(id, updatedBaseRow);
+    if (Object.keys(baseRow).length) {
+      updatedBaseRow = await baseDataAccessor.updateById(id, updatedBaseRow);
+    }
   }
 
   let updatedEntity = mapDbRowToEntity(server, model, { ...updatedRow, ...updatedBaseRow, ...updatedEntityOneRelationProps }, true);
   updatedEntity = Object.assign({}, entity, updatedEntity);
 
+  // save one-relation properties that has selfIdColumnName
+  for (const property of oneRelationPropertiesToUpdate) {
+    const fieldValue = changes[property.code];
+    const targetDataAccessor = server.getDataAccessor({
+      singularCode: property.targetSingularCode!,
+    });
+    if (isObject(fieldValue)) {
+      const targetEntityId = fieldValue["id"];
+      if (!targetEntityId) {
+        if (property.selfIdColumnName) {
+          const targetEntity = fieldValue;
+          targetEntity[property.selfIdColumnName] = updatedEntity.id;
+          const newTargetEntity = await createEntity(server, targetDataAccessor, {
+            routeContext,
+            entity: targetEntity,
+          });
+
+          let dataAccessorOfMainEntity = dataAccessor;
+          if (property.isBaseProperty) {
+            dataAccessorOfMainEntity = baseDataAccessor;
+          }
+
+          const relationFieldChanges = {
+            [property.targetIdColumnName]: newTargetEntity.id,
+          };
+          await dataAccessorOfMainEntity.updateById(updatedEntity.id, relationFieldChanges);
+          updatedEntity[property.code] = newTargetEntity;
+          changes[property.code] = newTargetEntity;
+        }
+      }
+    }
+  }
+
   // save many-relation properties
   for (const property of manyRelationPropertiesToUpdate) {
     const relatedEntities: any[] = [];
@@ -1386,7 +1458,7 @@ export default class EntityManager<TEntity = any> {
     return await updateEntityById(this.#server, this.#dataAccessor, options, plugin);
   }
 
-  async count(options: CountEntityOptions): Promise<CountEntityResult> {
+  async count(options: CountEntityOptions): Promise<number> {
     const model = this.#dataAccessor.getModel();
     let baseModel: RpdDataModel;
     if (model.base) {

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

@@ -1,4 +1,4 @@
-import { CountEntityOptions, RunEntityActionHandlerOptions } from "~/types";
+import { CountEntityOptions, CountEntityResult, RunEntityActionHandlerOptions } from "~/types";
 import runCollectionEntityActionHandler from "~/helpers/runCollectionEntityActionHandler";
 import { removeFiltersWithNullValue } from "~/helpers/filterHelper";
 import { ActionHandlerContext } from "~/core/actionHandler";
@@ -7,9 +7,10 @@ import { RapidPlugin } from "~/core/server";
 export const code = "countCollectionEntities";
 
 export async function handler(plugin: RapidPlugin, ctx: ActionHandlerContext, options: RunEntityActionHandlerOptions) {
-  await runCollectionEntityActionHandler(ctx, options, code, (entityManager, input: CountEntityOptions) => {
+  await runCollectionEntityActionHandler(ctx, options, code, async (entityManager, input: CountEntityOptions): Promise<CountEntityResult> => {
     input.filters = removeFiltersWithNullValue(input.filters);
     input.routeContext = ctx.routerContext;
-    return entityManager.count(input);
+    const count = await entityManager.count(input);
+    return { count };
   });
 }

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

@@ -18,8 +18,8 @@ export async function handler(plugin: RapidPlugin, ctx: ActionHandlerContext, op
 
     if (input.pagination && !input.pagination.withoutTotal) {
       // TOOD: count entities when calling findEntities for performance.
-      const countResult = await entityManager.count(input);
-      result.total = countResult.count;
+      const total = await entityManager.count(input);
+      result.total = total;
     }
     return result;
   });

package/src/types.ts

@@ -456,7 +456,7 @@ export interface IRpdDataAccessor<T = any> {
   find(options: FindRowOptions): Promise<T[]>;
   findOne(options: FindRowOptions): Promise<T | null>;
   findById(id: any): Promise<T | null>;
-  count(options: CountRowOptions): Promise<any>;
+  count(options: CountRowOptions): Promise<number>;
   deleteById(id: any): Promise<void>;
 }