@ruiapp/rapid-core 0.10.5 → 0.10.7

package/dist/index.js

@@ -2600,8 +2600,8 @@ async function findEntities(server, dataAccessor, options) {
             }
         }
     });
-    // if `keepNonPropertyFields` is true and `properties` are not specified, then select relation columns automatically.
-    if (options.keepNonPropertyFields && (!options.properties || !options.properties.length)) {
+    // if `keepNonPropertyFields` is true, then select relation columns automatically.
+    if (options.keepNonPropertyFields) {
         const oneRelationPropertiesWithNoLinkTable = getEntityPropertiesIncludingBase(server, model).filter((property) => property.relation === "one" && !property.linkTableName);
         oneRelationPropertiesWithNoLinkTable.forEach((property) => {
             if (property.targetIdColumnName) {
@@ -2675,12 +2675,12 @@ async function findEntities(server, dataAccessor, options) {
                                 return lodash.find(relationLinks, (link) => {
                                     return link[relationProperty.selfIdColumnName] == row["id"] && link[relationProperty.targetIdColumnName] == targetEntity["id"];
                                 });
-                            }).map((targetEntity) => mapDbRowToEntity(server, relationModel, targetEntity, options.keepNonPropertyFields));
+                            });
                         }
                         else {
                             row[relationProperty.code] = lodash.filter(relationLinks, (link) => {
                                 return link[relationProperty.selfIdColumnName] == row["id"];
-                            }).map((link) => mapDbRowToEntity(server, relationModel, link.targetEntity, options.keepNonPropertyFields));
+                            }).map((link) => link.targetEntity);
                         }
                     });
                 }
@@ -2708,20 +2708,20 @@ async function findEntities(server, dataAccessor, options) {
                         selectRelationOptions: relationOptions[relationProperty.code],
                     });
                 }
-                const targetModel = server.getModel({
+                server.getModel({
                     singularCode: relationProperty.targetSingularCode,
                 });
                 rows.forEach((row) => {
                     if (isManyRelation) {
                         row[relationProperty.code] = lodash.filter(relatedEntities, (relatedEntity) => {
                             return relatedEntity[relationProperty.selfIdColumnName] == row.id;
-                        }).map((item) => mapDbRowToEntity(server, targetModel, item, options.keepNonPropertyFields));
+                        });
                     }
                     else {
-                        row[relationProperty.code] = mapDbRowToEntity(server, targetModel, lodash.find(relatedEntities, (relatedEntity) => {
+                        row[relationProperty.code] = lodash.find(relatedEntities, (relatedEntity) => {
                             // TODO: id property code should be configurable.
                             return relatedEntity["id"] == row[relationProperty.targetIdColumnName];
-                        }), options.keepNonPropertyFields);
+                        });
                     }
                 });
             }
@@ -2971,7 +2971,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 || pgPropertyTypeColumnMap[property.type];
+            }
             replacedFilters.push({
                 operator: filter.operator,
                 field: {
@@ -2979,7 +2982,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.5",
+  "version": "0.10.7",
   "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;
@@ -208,8 +209,8 @@ async function findEntities(server: IRpdServer, dataAccessor: IRpdDataAccessor,
     }
   });
 
-  // if `keepNonPropertyFields` is true and `properties` are not specified, then select relation columns automatically.
-  if (options.keepNonPropertyFields && (!options.properties || !options.properties.length)) {
+  // if `keepNonPropertyFields` is true, then select relation columns automatically.
+  if (options.keepNonPropertyFields) {
     const oneRelationPropertiesWithNoLinkTable = getEntityPropertiesIncludingBase(server, model).filter(
       (property) => property.relation === "one" && !property.linkTableName,
     );
@@ -289,11 +290,11 @@ async function findEntities(server: IRpdServer, dataAccessor: IRpdDataAccessor,
                 return find(relationLinks, (link: any) => {
                   return link[relationProperty.selfIdColumnName!] == row["id"] && link[relationProperty.targetIdColumnName!] == targetEntity["id"];
                 });
-              }).map((targetEntity) => mapDbRowToEntity(server, relationModel, targetEntity, options.keepNonPropertyFields));
+              });
             } else {
               row[relationProperty.code] = filter(relationLinks, (link: any) => {
                 return link[relationProperty.selfIdColumnName!] == row["id"];
-              }).map((link) => mapDbRowToEntity(server, relationModel, link.targetEntity, options.keepNonPropertyFields));
+              }).map((link) => link.targetEntity);
             }
           });
         }
@@ -332,17 +333,12 @@ async function findEntities(server: IRpdServer, dataAccessor: IRpdDataAccessor,
           if (isManyRelation) {
             row[relationProperty.code] = filter(relatedEntities, (relatedEntity: any) => {
               return relatedEntity[relationProperty.selfIdColumnName!] == row.id;
-            }).map((item) => mapDbRowToEntity(server, targetModel!, item, options.keepNonPropertyFields));
+            });
           } else {
-            row[relationProperty.code] = mapDbRowToEntity(
-              server,
-              targetModel!,
-              find(relatedEntities, (relatedEntity: any) => {
-                // TODO: id property code should be configurable.
-                return relatedEntity["id"] == row[relationProperty.targetIdColumnName!];
-              }),
-              options.keepNonPropertyFields,
-            );
+            row[relationProperty.code] = find(relatedEntities, (relatedEntity: any) => {
+              // TODO: id property code should be configurable.
+              return relatedEntity["id"] == row[relationProperty.targetIdColumnName!];
+            });
           }
         });
       }
@@ -616,7 +612,11 @@ async function convertEntityFiltersToRowFilters(
         }
       }
 
-      // TODO: do not use `any` here
+      let itemType: string | undefined;
+      if (filter.operator === "in" || filter.operator === "notIn") {
+        itemType = filter.itemType || pgPropertyTypeColumnMap[property.type];
+      }
+
       replacedFilters.push({
         operator: filter.operator,
         field: {
@@ -624,7 +624,7 @@ async function convertEntityFiltersToRowFilters(
           tableName: property && property.isBaseProperty ? baseModel.tableName : model.tableName,
         },
         value: filterValue,
-        itemType: (filter as any).itemType,
+        itemType,
       } as any);
     }
   }