@ruiapp/rapid-core 0.10.6 → 0.10.8

package/dist/index.js

@@ -2742,12 +2742,16 @@ async function findEntities(server, dataAccessor, options) {
     return entities;
 }
 async function findEntity(server, dataAccessor, options) {
-    const entities = await findEntities(server, dataAccessor, {
-        ...options,
-        ...{
+    if (options.pagination) {
+        options.pagination.limit = 1;
+    }
+    else {
+        options.pagination = {
+            offset: 0,
             limit: 1,
-        },
-    });
+        };
+    }
+    const entities = await findEntities(server, dataAccessor, options);
     return lodash.first(entities);
 }
 async function findById(server, dataAccessor, options) {
@@ -2971,7 +2975,10 @@ async function convertEntityFiltersToRowFilters(routeContext, server, model, bas
                     }
                 }
             }
-            // TODO: do not use `any` here
+            let itemType;
+            if (filter.operator === "in" || filter.operator === "notIn") {
+                itemType = filter.itemType || (property && pgPropertyTypeColumnMap[property.type]);
+            }
             replacedFilters.push({
                 operator: filter.operator,
                 field: {
@@ -2979,7 +2986,7 @@ async function convertEntityFiltersToRowFilters(routeContext, server, model, bas
                     tableName: property && property.isBaseProperty ? baseModel.tableName : model.tableName,
                 },
                 value: filterValue,
-                itemType: filter.itemType,
+                itemType,
             });
         }
     }

package/package.json

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

package/src/dataAccess/entityManager.ts

@@ -59,6 +59,7 @@ import { newEntityOperationError } from "~/utilities/errorUtility";
 import { getNowStringWithTimezone } from "~/utilities/timeUtility";
 import { RouteContext } from "~/core/routeContext";
 import { validateEntity } from "./entityValidator";
+import { pgPropertyTypeColumnMap } from "./columnTypeMapper";
 
 export type FindOneRelationEntitiesOptions = {
   server: IRpdServer;
@@ -361,12 +362,15 @@ async function findEntities(server: IRpdServer, dataAccessor: IRpdDataAccessor,
 }
 
 async function findEntity(server: IRpdServer, dataAccessor: IRpdDataAccessor, options: FindEntityOptions) {
-  const entities = await findEntities(server, dataAccessor, {
-    ...options,
-    ...{
+  if (options.pagination) {
+    options.pagination.limit = 1;
+  } else {
+    options.pagination = {
+      offset: 0,
       limit: 1,
-    },
-  });
+    };
+  }
+  const entities = await findEntities(server, dataAccessor, options);
   return first(entities);
 }
 
@@ -611,7 +615,11 @@ async function convertEntityFiltersToRowFilters(
         }
       }
 
-      // TODO: do not use `any` here
+      let itemType: string | undefined;
+      if (filter.operator === "in" || filter.operator === "notIn") {
+        itemType = filter.itemType || (property && pgPropertyTypeColumnMap[property.type]);
+      }
+
       replacedFilters.push({
         operator: filter.operator,
         field: {
@@ -619,7 +627,7 @@ async function convertEntityFiltersToRowFilters(
           tableName: property && property.isBaseProperty ? baseModel.tableName : model.tableName,
         },
         value: filterValue,
-        itemType: (filter as any).itemType,
+        itemType,
       } as any);
     }
   }