@loomcore/api 0.0.49 → 0.0.51

package/dist/__tests__/common-test.utils.d.ts

@@ -3,6 +3,7 @@ import { Application } from 'express';
 import { IUser, IUserContext, IEntity, IAuditable } from '@loomcore/common/models';
 import { GenericApiService } from '../services/generic-api.service.js';
 import { ApiController } from '../controllers/api.controller.js';
+import { MultiTenantApiService } from '../services/multi-tenant-api.service.js';
 declare function initialize(database: Db): void;
 declare function createIndexes(db: Db): Promise<void>;
 declare function createMetaOrg(): Promise<void>;
@@ -59,6 +60,14 @@ export declare class ProductService extends GenericApiService<IProduct> {
 export declare class ProductsController extends ApiController<IProduct> {
     constructor(app: Application, db: Db);
 }
+export declare class MultiTenantProductService extends MultiTenantApiService<IProduct> {
+    constructor(db: Db);
+    protected getAdditionalPipelineStages(): any[];
+    transformSingle(single: any): any;
+}
+export declare class MultiTenantProductsController extends ApiController<IProduct> {
+    constructor(app: Application, db: Db);
+}
 declare function getTestUser(): Partial<IUser>;
 declare function configureJwtSecret(): void;
 declare function loginWithTestUser(agent: any): Promise<string>;

package/dist/__tests__/common-test.utils.js

@@ -9,6 +9,7 @@ import { AuthService } from '../services/auth.service.js';
 import { GenericApiService } from '../services/generic-api.service.js';
 import { ApiController } from '../controllers/api.controller.js';
 import { entityUtils } from '@loomcore/common/utils';
+import { MultiTenantApiService } from '../services/multi-tenant-api.service.js';
 let db;
 let collections = {};
 let deviceIdCookie;
@@ -242,6 +243,49 @@ export class ProductsController extends ApiController {
         super('products', app, productService, 'product', ProductSpec, PublicAggregatedProductSchema);
     }
 }
+export class MultiTenantProductService extends MultiTenantApiService {
+    constructor(db) {
+        super(db, 'products', 'product', ProductSpec);
+    }
+    getAdditionalPipelineStages() {
+        return [
+            {
+                $lookup: {
+                    from: 'categories',
+                    localField: 'categoryId',
+                    foreignField: '_id',
+                    as: 'category'
+                }
+            },
+            {
+                $unwind: {
+                    path: '$category',
+                    preserveNullAndEmptyArrays: true
+                }
+            }
+        ];
+    }
+    transformSingle(single) {
+        if (single && single.category) {
+            const categoryService = new CategoryService(this.db);
+            single.category = categoryService.transformSingle(single.category);
+        }
+        return super.transformSingle(single);
+    }
+}
+export class MultiTenantProductsController extends ApiController {
+    constructor(app, db) {
+        const productService = new MultiTenantProductService(db);
+        const AggregatedProductSchema = Type.Intersect([
+            ProductSpec.fullSchema,
+            Type.Partial(Type.Object({
+                category: CategorySpec.fullSchema
+            }))
+        ]);
+        const PublicAggregatedProductSchema = Type.Omit(AggregatedProductSchema, ['internalNumber']);
+        super('multi-tenant-products', app, productService, 'product', ProductSpec, PublicAggregatedProductSchema);
+    }
+}
 function getTestUser() {
     return testUser;
 }

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

@@ -122,25 +122,35 @@ export class GenericApiService {
         return pagedResult;
     }
     async getById(userContext, id) {
+        console.log(`--- GenericApiService.getById ENTER ---`);
+        console.log(`ID received: ${id}`);
         if (!entityUtils.isValidObjectId(id)) {
             throw new BadRequestError('id is not a valid ObjectId');
         }
         const baseQuery = { _id: new ObjectId(id) };
         const query = this.prepareQuery(userContext, baseQuery);
+        console.log('Constructed query:', JSON.stringify(query, null, 2));
         let entity = null;
         if (this.getAdditionalPipelineStages().length > 0) {
+            console.log('Branch: Executing with aggregation pipeline.');
             const pipeline = [
                 { $match: query },
                 ...this.getAdditionalPipelineStages()
             ];
+            console.log('Aggregation Pipeline:', JSON.stringify(pipeline, null, 2));
             entity = await this.collection.aggregate(pipeline).next();
         }
         else {
+            console.log('Branch: Executing with findOne.');
             entity = await this.collection.findOne(query);
         }
+        console.log('IMMEDIATE DB RESULT (entity):', JSON.stringify(entity, null, 2));
         if (!entity) {
+            console.log('Entity not found, throwing IdNotFoundError.');
             throw new IdNotFoundError();
         }
+        console.log('Entity before transformSingle:', JSON.stringify(entity, null, 2));
+        console.log(`--- GenericApiService.getById EXIT ---`);
         return this.transformSingle(entity);
     }
     async getCount(userContext) {
@@ -361,12 +371,14 @@ export class GenericApiService {
         return list.map(item => this.transformSingle(item));
     }
     transformSingle(single) {
+        console.log('Starting base class transformSingle, entity:', JSON.stringify(single, null, 2));
         if (!single)
             return single;
         if (!this.modelSpec?.fullSchema) {
             throw new ServerError(`Cannot transform entity: No model specification with schema provided for ${this.pluralResourceName}`);
         }
         const transformedEntity = dbUtils.convertObjectIdsToStrings(single, this.modelSpec.fullSchema);
+        console.log('Leaving base class transformSingle, transformedEntity:', JSON.stringify(transformedEntity, null, 2));
         return transformedEntity;
     }
     stripSenderProvidedSystemProperties(userContext, doc, allowId = false) {

package/package.json

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