@loomcore/api 0.0.55 → 0.0.58

package/dist/services/multi-tenant-api.service.js

@@ -20,13 +20,18 @@ export class MultiTenantApiService extends GenericApiService {
         return this.tenantDecorator.applyTenantToQuery(userContext, query, this.pluralResourceName);
     }
     prepareQueryOptions(userContext, queryOptions) {
+        console.log('--- MultiTenantApiService.prepareQueryOptions ---');
+        console.log('Initial queryOptions.filters:', JSON.stringify(queryOptions.filters, null, 2));
         if (!config?.app?.isMultiTenant) {
             return super.prepareQueryOptions(userContext, queryOptions);
         }
         if (!userContext || !userContext._orgId) {
             throw new BadRequestError('A valid userContext was not provided to MultiTenantApiService.prepareQueryOptions');
         }
-        return this.tenantDecorator.applyTenantToQueryOptions(userContext, queryOptions, this.pluralResourceName);
+        const newQueryOptions = this.tenantDecorator.applyTenantToQueryOptions(userContext, queryOptions, this.pluralResourceName);
+        console.log('Final queryOptions.filters:', JSON.stringify(newQueryOptions.filters, null, 2));
+        console.log('-------------------------------------------------');
+        return newQueryOptions;
     }
     async prepareEntity(userContext, entity, isCreate, allowId = false) {
         if (!config?.app?.isMultiTenant) {

package/dist/utils/db.utils.js

@@ -168,6 +168,9 @@ function buildMongoMatchFromQueryOptions(queryOptions, modelSpec) {
     const filters = queryOptions.filters || {};
     const schema = modelSpec?.fullSchema;
     let match = {};
+    console.log('--- Building Mongo Match ---');
+    console.log('Received queryOptions.filters:', JSON.stringify(filters, null, 2));
+    console.log('Received modelSpec:', !!modelSpec);
     for (const [key, value] of Object.entries(filters)) {
         if (value) {
             const propSchema = schema ? getPropertySchema(key, schema) : undefined;
@@ -217,6 +220,8 @@ function buildMongoMatchFromQueryOptions(queryOptions, modelSpec) {
             }
         }
     }
+    console.log('Constructed $match object:', JSON.stringify(match, null, 2));
+    console.log('--------------------------');
     return { $match: match };
 }
 function buildSQLWhereClauseFromQueryOptions(queryOptions, columnAliasMap) {

package/dist/utils/express.utils.js

@@ -2,11 +2,15 @@ import express from 'express';
 import cookieParser from "cookie-parser";
 import bodyParser from "body-parser";
 import cors from "cors";
+import qs from 'qs';
 import { NotFoundError } from "../errors/not-found.error.js";
 import { errorHandler } from "../middleware/error-handler.js";
 import { ensureUserContext } from '../middleware/ensure-user-context.js';
 function setupExpressApp(db, config, setupRoutes) {
     const app = express();
+    app.set('query parser', (str) => {
+        return qs.parse(str, {});
+    });
     app.use((req, res, next) => {
         if (req.path !== '/api/health' && process.env.NODE_ENV !== 'test') {
             console.log(`[${new Date().toLocaleString('en-US', { timeZone: 'America/Chicago' })}] INCOMING REQUEST: ${req.method} ${req.path}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loomcore/api",
-  "version": "0.0.55",
+  "version": "0.0.58",
   "private": false,
   "description": "Loom Core Api - An opinionated Node.js api using Typescript, Express, and MongoDb",
   "scripts": {
@@ -41,7 +41,8 @@
   },
   "dependencies": {
     "jsonwebtoken": "^9.0.2",
-    "node-mailjet": "^6.0.8"
+    "node-mailjet": "^6.0.8",
+    "qs": "^6.14.0"
   },
   "peerDependencies": {
     "@loomcore/common": "^0.0.14",
@@ -60,6 +61,7 @@
     "@types/express": "^5.0.1",
     "@types/jsonwebtoken": "^9.0.9",
     "@types/lodash": "^4.17.13",
+    "@types/qs": "^6.14.0",
     "@types/supertest": "^6.0.3",
     "@vitest/coverage-v8": "^3.0.9",
     "cross-env": "^7.0.3",