@loomcore/api 0.0.53 → 0.0.54

package/dist/services/generic-api.service.js

@@ -87,7 +87,7 @@ export class GenericApiService {
     }
     async get(userContext, queryOptions = { ...DefaultQueryOptions }) {
         const preparedOptions = this.prepareQueryOptions(userContext, queryOptions);
-        const match = dbUtils.buildMongoMatchFromQueryOptions(preparedOptions);
+        const match = dbUtils.buildMongoMatchFromQueryOptions(preparedOptions, this.modelSpec);
         const additionalStages = this.getAdditionalPipelineStages();
         const results = [...additionalStages];
         if (preparedOptions.orderBy) {

package/dist/utils/db.utils.d.ts

@@ -1,11 +1,11 @@
 import { ObjectId } from 'mongodb';
 import { TSchema } from '@sinclair/typebox';
-import { IQueryOptions, Filter } from '@loomcore/common/models';
+import { IQueryOptions, Filter, IModelSpec } from '@loomcore/common/models';
 export declare const PROPERTIES_THAT_ARE_NOT_OBJECT_IDS: string[];
 declare function convertObjectIdsToStrings<T>(entity: T, schema?: TSchema): T;
 declare function convertStringsToObjectIds(entity: any, schema: TSchema): any;
 declare function convertStringToObjectId(value: any): ObjectId | any;
-declare function buildMongoMatchFromQueryOptions(queryOptions: IQueryOptions): {
+declare function buildMongoMatchFromQueryOptions(queryOptions: IQueryOptions, modelSpec?: IModelSpec): {
     $match: any;
 };
 declare function buildSQLWhereClauseFromQueryOptions(queryOptions: IQueryOptions, columnAliasMap: {

package/dist/utils/db.utils.js

@@ -2,6 +2,21 @@ import { ObjectId } from 'mongodb';
 import _ from 'lodash';
 import { entityUtils } from '@loomcore/common/utils';
 import { stringUtils } from './string.utils.js';
+function getPropertySchema(key, schema) {
+    if (!schema || typeof schema !== 'object')
+        return undefined;
+    if (schema.allOf && Array.isArray(schema.allOf)) {
+        for (const nestedSchema of schema.allOf) {
+            const propSchema = getPropertySchema(key, nestedSchema);
+            if (propSchema)
+                return propSchema;
+        }
+    }
+    if (schema.type === 'object' && schema.properties) {
+        return schema.properties[key];
+    }
+    return undefined;
+}
 export const PROPERTIES_THAT_ARE_NOT_OBJECT_IDS = ['_orgId'];
 function convertObjectIdsToStrings(entity, schema) {
     if (!entity)
@@ -149,27 +164,30 @@ function convertStringToObjectId(value) {
     }
     return value;
 }
-function buildMongoMatchFromQueryOptions(queryOptions) {
+function buildMongoMatchFromQueryOptions(queryOptions, modelSpec) {
     const filters = queryOptions.filters || {};
+    const schema = modelSpec?.fullSchema;
     let match = {};
     for (const [key, value] of Object.entries(filters)) {
         if (value) {
+            const propSchema = schema ? getPropertySchema(key, schema) : undefined;
             if (value.eq !== undefined) {
-                if (typeof value.eq === 'string'
-                    && key.endsWith('Id')
-                    && !PROPERTIES_THAT_ARE_NOT_OBJECT_IDS.includes(key)
-                    && entityUtils.isValidObjectId(value.eq)) {
-                    match[key] = new ObjectId(value.eq);
+                const isObjectIdField = propSchema?.format === 'objectid';
+                const valueToCompare = value.eq;
+                if ((isObjectIdField || (!schema && key.endsWith('Id') && !PROPERTIES_THAT_ARE_NOT_OBJECT_IDS.includes(key)))
+                    && typeof valueToCompare === 'string' && entityUtils.isValidObjectId(valueToCompare)) {
+                    match[key] = new ObjectId(valueToCompare);
                 }
-                else if (typeof value.eq === 'string' && !isNaN(Number(value.eq))) {
-                    match[key] = Number(value.eq);
+                else if (typeof valueToCompare === 'string' && !isNaN(Number(valueToCompare))) {
+                    match[key] = Number(valueToCompare);
                 }
                 else {
-                    match[key] = value.eq;
+                    match[key] = valueToCompare;
                 }
             }
             else if (value.in !== undefined && Array.isArray(value.in)) {
-                if (key.endsWith('Id') && !PROPERTIES_THAT_ARE_NOT_OBJECT_IDS.includes(key)) {
+                const isObjectIdArray = propSchema?.type === 'array' && propSchema.items?.format === 'objectid';
+                if (isObjectIdArray || (!schema && (key.endsWith('Id') || key.endsWith('Ids')) && !PROPERTIES_THAT_ARE_NOT_OBJECT_IDS.includes(key))) {
                     const objectIds = value.in
                         .filter(val => typeof val === 'string' && entityUtils.isValidObjectId(val))
                         .map(val => new ObjectId(val));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loomcore/api",
-  "version": "0.0.53",
+  "version": "0.0.54",
   "private": false,
   "description": "Loom Core Api - An opinionated Node.js api using Typescript, Express, and MongoDb",
   "scripts": {