@ruiapp/rapid-core 0.2.0 → 0.2.2

package/dist/dataAccess/entityManager.d.ts

@@ -1,4 +1,4 @@
-import { AddEntityRelationsOptions, CountEntityOptions, CountEntityResult, CreateEntityOptions, DeleteEntityByIdOptions, FindEntityByIdOptions, FindEntityOptions, FindEntitySelectRelationOptions, IRpdDataAccessor, RemoveEntityRelationsOptions, RpdDataModel, RpdDataModelIndex, RpdDataModelProperty, UpdateEntityByIdOptions } from "../types";
+import { AddEntityRelationsOptions, CountEntityOptions, CountEntityResult, 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 = {
@@ -6,14 +6,14 @@ export type FindOneRelationEntitiesOptions = {
     mainModel: RpdDataModel;
     relationProperty: RpdDataModelProperty;
     relationEntityIds: any[];
-    selectRelationOptions?: FindEntitySelectRelationOptions;
+    selectRelationOptions?: FindEntityFindOneRelationEntitiesOptions;
 };
 export type FindManyRelationEntitiesOptions = {
     server: IRpdServer;
     mainModel: RpdDataModel;
     relationProperty: RpdDataModelProperty;
     mainEntityIds: any[];
-    selectRelationOptions?: FindEntitySelectRelationOptions;
+    selectRelationOptions?: FindEntityFindManyRelationEntitiesOptions;
 };
 export type CheckEntityDuplicatedOptions = {
     routeContext?: RouteContext;

package/dist/index.js

@@ -2691,10 +2691,14 @@ async function convertEntityFiltersToRowFilters(server, model, baseModel, filter
         else {
             const filterField = filter.field;
             let property = getEntityPropertyByCode(server, model, filterField);
+            let filterValue = filter.value;
             let columnName = "";
             if (property) {
                 if (isOneRelationProperty(property)) {
                     columnName = property.targetIdColumnName;
+                    if (lodash.isPlainObject(filterValue)) {
+                        filterValue = filterValue.id;
+                    }
                 }
                 else if (isManyRelationProperty(property)) {
                     throw new Error(`Operator "${operator}" is not supported on many-relation property "${property.code}"`);
@@ -2716,6 +2720,9 @@ async function convertEntityFiltersToRowFilters(server, model, baseModel, filter
                     });
                     if (property) {
                         columnName = property.targetIdColumnName;
+                        if (lodash.isPlainObject(filterValue)) {
+                            filterValue = filterValue.id;
+                        }
                     }
                     else {
                         columnName = filterField;
@@ -2729,7 +2736,7 @@ async function convertEntityFiltersToRowFilters(server, model, baseModel, filter
                     name: columnName,
                     tableName: property && property.isBaseProperty ? baseModel.tableName : model.tableName,
                 },
-                value: filter.value,
+                value: filterValue,
                 itemType: filter.itemType,
             });
         }
@@ -2741,7 +2748,9 @@ async function findManyRelationLinksViaLinkTable(options) {
     const command = `SELECT * FROM ${server.queryBuilder.quoteTable({
         schema: relationProperty.linkSchema,
         tableName: relationProperty.linkTableName,
-    })} WHERE ${server.queryBuilder.quoteObject(relationProperty.selfIdColumnName)} = ANY($1::int[])`;
+    })} WHERE ${server.queryBuilder.quoteObject(relationProperty.selfIdColumnName)} = ANY($1::int[])
+    ORDER BY id
+  `;
     const params = [mainEntityIds];
     const links = await server.queryDatabaseObject(command, params);
     const targetEntityIds = links.map((link) => link[relationProperty.targetIdColumnName]);
@@ -2767,6 +2776,18 @@ async function findManyRelationLinksViaLinkTable(options) {
             if (selectRelationOptions.relations) {
                 findEntityOptions.relations = selectRelationOptions.relations;
             }
+            if (selectRelationOptions.orderBy) {
+                findEntityOptions.orderBy = selectRelationOptions.orderBy;
+            }
+            if (selectRelationOptions.pagination) {
+                findEntityOptions.pagination = selectRelationOptions.pagination;
+            }
+            if (selectRelationOptions.filters) {
+                findEntityOptions.filters = [...findEntityOptions.filters, ...selectRelationOptions.filters];
+            }
+            if (!lodash.isUndefined(selectRelationOptions.keepNonPropertyFields)) {
+                findEntityOptions.keepNonPropertyFields = selectRelationOptions.keepNonPropertyFields;
+            }
         }
     }
     const targetEntities = await findEntities(server, dataAccessor, findEntityOptions);
@@ -2788,6 +2809,11 @@ async function findManyRelatedEntitiesViaIdPropertyCode(options) {
                 value: mainEntityIds,
             },
         ],
+        orderBy: [
+            {
+                field: "id",
+            },
+        ],
         extraColumnsToSelect: [relationProperty.selfIdColumnName],
         keepNonPropertyFields: true,
     };
@@ -2799,6 +2825,18 @@ async function findManyRelatedEntitiesViaIdPropertyCode(options) {
             if (selectRelationOptions.relations) {
                 findEntityOptions.relations = selectRelationOptions.relations;
             }
+            if (selectRelationOptions.orderBy) {
+                findEntityOptions.orderBy = selectRelationOptions.orderBy;
+            }
+            if (selectRelationOptions.pagination) {
+                findEntityOptions.pagination = selectRelationOptions.pagination;
+            }
+            if (selectRelationOptions.filters) {
+                findEntityOptions.filters = [...findEntityOptions.filters, ...selectRelationOptions.filters];
+            }
+            if (!lodash.isUndefined(selectRelationOptions.keepNonPropertyFields)) {
+                findEntityOptions.keepNonPropertyFields = selectRelationOptions.keepNonPropertyFields;
+            }
         }
     }
     return await findEntities(server, dataAccessor, findEntityOptions);

package/dist/types.d.ts

@@ -391,7 +391,7 @@ export interface FindEntityOptions {
     orderBy?: FindEntityOrderByOptions[];
     pagination?: FindEntityPaginationOptions;
     properties?: string[];
-    relations?: Record<string, FindEntitySelectRelationOptions>;
+    relations?: Record<string, FindEntityFindRelationEntitiesOptions>;
     extraColumnsToSelect?: ColumnSelectOptions[];
     keepNonPropertyFields?: boolean;
 }
@@ -399,7 +399,7 @@ export interface FindEntityByIdOptions {
     routeContext?: RouteContext;
     id: any;
     properties?: string[];
-    relations?: Record<string, FindEntitySelectRelationOptions>;
+    relations?: Record<string, FindEntityFindRelationEntitiesOptions>;
     keepNonPropertyFields?: boolean;
 }
 export interface FindEntityRelationalFilterOptions {
@@ -437,9 +437,19 @@ export interface FindEntityPaginationOptions {
     limit: number;
     withoutTotal?: boolean;
 }
-export type FindEntitySelectRelationOptions = true | {
+export type FindEntityFindRelationEntitiesOptions = FindEntityFindOneRelationEntitiesOptions | FindEntityFindManyRelationEntitiesOptions;
+export type FindEntityFindOneRelationEntitiesOptions = true | {
     properties?: string[];
-    relations?: Record<string, FindEntitySelectRelationOptions>;
+    relations?: Record<string, FindEntityFindRelationEntitiesOptions>;
+    keepNonPropertyFields?: boolean;
+};
+export type FindEntityFindManyRelationEntitiesOptions = true | {
+    properties?: string[];
+    relations?: Record<string, FindEntityFindRelationEntitiesOptions>;
+    filters?: EntityFilterOptions[];
+    orderBy?: FindEntityOrderByOptions[];
+    pagination?: FindEntityPaginationOptions;
+    keepNonPropertyFields?: boolean;
 };
 export interface FindEntityOrderByOptions {
     field: string;

package/package.json

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

package/src/dataAccess/entityManager.ts

@@ -10,7 +10,6 @@ import {
   FindEntityByIdOptions,
   FindEntityOptions,
   FindEntityOrderByOptions,
-  FindEntitySelectRelationOptions,
   IRpdDataAccessor,
   RemoveEntityRelationsOptions,
   RpdDataModel,
@@ -18,13 +17,15 @@ import {
   RpdDataModelIndexOptions,
   RpdDataModelProperty,
   UpdateEntityByIdOptions,
+  FindEntityFindOneRelationEntitiesOptions,
+  FindEntityFindManyRelationEntitiesOptions,
 } from "~/types";
 import { isNullOrUndefined } from "~/utilities/typeUtility";
 import { mapDbRowToEntity, mapEntityToDbRow } from "./entityMapper";
 import { mapPropertyNameToColumnName } from "./propertyMapper";
 import { IRpdServer, RapidPlugin } from "~/core/server";
 import { getEntityPartChanges } from "~/helpers/entityHelpers";
-import { cloneDeep, filter, find, first, forEach, isArray, isNumber, isObject, isString, keys, map, reject, uniq } from "lodash";
+import { cloneDeep, filter, find, first, forEach, isArray, isNumber, isObject, isPlainObject, isString, isUndefined, keys, map, reject, uniq } from "lodash";
 import {
   getEntityPropertiesIncludingBase,
   getEntityProperty,
@@ -37,7 +38,6 @@ import {
 import { ColumnSelectOptions, CountRowOptions, FindRowOptions, FindRowOrderByOptions, RowFilterOptions } from "./dataAccessTypes";
 import { newEntityOperationError } from "~/utilities/errorUtility";
 import { getNowStringWithTimezone } from "~/utilities/timeUtility";
-import { or } from "xstate";
 import { RouteContext } from "~/core/routeContext";
 
 export type FindOneRelationEntitiesOptions = {
@@ -45,7 +45,7 @@ export type FindOneRelationEntitiesOptions = {
   mainModel: RpdDataModel;
   relationProperty: RpdDataModelProperty;
   relationEntityIds: any[];
-  selectRelationOptions?: FindEntitySelectRelationOptions;
+  selectRelationOptions?: FindEntityFindOneRelationEntitiesOptions;
 };
 
 export type FindManyRelationEntitiesOptions = {
@@ -53,7 +53,7 @@ export type FindManyRelationEntitiesOptions = {
   mainModel: RpdDataModel;
   relationProperty: RpdDataModelProperty;
   mainEntityIds: any[];
-  selectRelationOptions?: FindEntitySelectRelationOptions;
+  selectRelationOptions?: FindEntityFindManyRelationEntitiesOptions;
 };
 
 function convertEntityOrderByToRowOrderBy(server: IRpdServer, model: RpdDataModel, baseModel?: RpdDataModel, orderByList?: FindEntityOrderByOptions[]) {
@@ -526,10 +526,15 @@ async function convertEntityFiltersToRowFilters(
       const filterField = (filter as EntityNonRelationPropertyFilterOptions).field;
       let property: RpdDataModelProperty = getEntityPropertyByCode(server, model, filterField);
 
+      let filterValue = (filter as any).value;
+
       let columnName = "";
       if (property) {
         if (isOneRelationProperty(property)) {
           columnName = property.targetIdColumnName;
+          if (isPlainObject(filterValue)) {
+            filterValue = filterValue.id;
+          }
         } else if (isManyRelationProperty(property)) {
           throw new Error(`Operator "${operator}" is not supported on many-relation property "${property.code}"`);
         } else {
@@ -549,6 +554,9 @@ async function convertEntityFiltersToRowFilters(
 
           if (property) {
             columnName = property.targetIdColumnName;
+            if (isPlainObject(filterValue)) {
+              filterValue = filterValue.id;
+            }
           } else {
             columnName = filterField;
           }
@@ -562,7 +570,7 @@ async function convertEntityFiltersToRowFilters(
           name: columnName,
           tableName: property && property.isBaseProperty ? baseModel.tableName : model.tableName,
         },
-        value: (filter as any).value,
+        value: filterValue,
         itemType: (filter as any).itemType,
       } as any);
     }
@@ -575,7 +583,9 @@ async function findManyRelationLinksViaLinkTable(options: FindManyRelationEntiti
   const command = `SELECT * FROM ${server.queryBuilder.quoteTable({
     schema: relationProperty.linkSchema,
     tableName: relationProperty.linkTableName!,
-  })} WHERE ${server.queryBuilder.quoteObject(relationProperty.selfIdColumnName!)} = ANY($1::int[])`;
+  })} WHERE ${server.queryBuilder.quoteObject(relationProperty.selfIdColumnName!)} = ANY($1::int[])
+    ORDER BY id
+  `;
   const params = [mainEntityIds];
   const links = await server.queryDatabaseObject(command, params);
   const targetEntityIds = links.map((link) => link[relationProperty.targetIdColumnName!]);
@@ -604,6 +614,18 @@ async function findManyRelationLinksViaLinkTable(options: FindManyRelationEntiti
       if (selectRelationOptions.relations) {
         findEntityOptions.relations = selectRelationOptions.relations;
       }
+      if (selectRelationOptions.orderBy) {
+        findEntityOptions.orderBy = selectRelationOptions.orderBy;
+      }
+      if (selectRelationOptions.pagination) {
+        findEntityOptions.pagination = selectRelationOptions.pagination;
+      }
+      if (selectRelationOptions.filters) {
+        findEntityOptions.filters = [...findEntityOptions.filters, ...selectRelationOptions.filters];
+      }
+      if (!isUndefined(selectRelationOptions.keepNonPropertyFields)) {
+        findEntityOptions.keepNonPropertyFields = selectRelationOptions.keepNonPropertyFields;
+      }
     }
   }
 
@@ -630,6 +652,11 @@ async function findManyRelatedEntitiesViaIdPropertyCode(options: FindManyRelatio
         value: mainEntityIds,
       },
     ],
+    orderBy: [
+      {
+        field: "id",
+      },
+    ],
     extraColumnsToSelect: [relationProperty.selfIdColumnName],
     keepNonPropertyFields: true,
   };
@@ -642,6 +669,18 @@ async function findManyRelatedEntitiesViaIdPropertyCode(options: FindManyRelatio
       if (selectRelationOptions.relations) {
         findEntityOptions.relations = selectRelationOptions.relations;
       }
+      if (selectRelationOptions.orderBy) {
+        findEntityOptions.orderBy = selectRelationOptions.orderBy;
+      }
+      if (selectRelationOptions.pagination) {
+        findEntityOptions.pagination = selectRelationOptions.pagination;
+      }
+      if (selectRelationOptions.filters) {
+        findEntityOptions.filters = [...findEntityOptions.filters, ...selectRelationOptions.filters];
+      }
+      if (!isUndefined(selectRelationOptions.keepNonPropertyFields)) {
+        findEntityOptions.keepNonPropertyFields = selectRelationOptions.keepNonPropertyFields;
+      }
     }
   }
 

package/src/types.ts

@@ -509,7 +509,7 @@ export interface FindEntityOptions {
   orderBy?: FindEntityOrderByOptions[];
   pagination?: FindEntityPaginationOptions;
   properties?: string[];
-  relations?: Record<string, FindEntitySelectRelationOptions>;
+  relations?: Record<string, FindEntityFindRelationEntitiesOptions>;
   extraColumnsToSelect?: ColumnSelectOptions[];
   keepNonPropertyFields?: boolean;
 }
@@ -518,7 +518,7 @@ export interface FindEntityByIdOptions {
   routeContext?: RouteContext;
   id: any;
   properties?: string[];
-  relations?: Record<string, FindEntitySelectRelationOptions>;
+  relations?: Record<string, FindEntityFindRelationEntitiesOptions>;
   keepNonPropertyFields?: boolean;
 }
 
@@ -564,11 +564,25 @@ export interface FindEntityPaginationOptions {
   withoutTotal?: boolean;
 }
 
-export type FindEntitySelectRelationOptions =
+export type FindEntityFindRelationEntitiesOptions = FindEntityFindOneRelationEntitiesOptions | FindEntityFindManyRelationEntitiesOptions;
+
+export type FindEntityFindOneRelationEntitiesOptions =
+  | true
+  | {
+      properties?: string[];
+      relations?: Record<string, FindEntityFindRelationEntitiesOptions>;
+      keepNonPropertyFields?: boolean;
+    };
+
+export type FindEntityFindManyRelationEntitiesOptions =
   | true
   | {
       properties?: string[];
-      relations?: Record<string, FindEntitySelectRelationOptions>;
+      relations?: Record<string, FindEntityFindRelationEntitiesOptions>;
+      filters?: EntityFilterOptions[];
+      orderBy?: FindEntityOrderByOptions[];
+      pagination?: FindEntityPaginationOptions;
+      keepNonPropertyFields?: boolean;
     };
 
 export interface FindEntityOrderByOptions {