@loomcore/api 0.0.48 → 0.0.50

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

@@ -406,21 +406,12 @@ export class GenericApiService {
                 this.auditForUpdate(userContext, preparedEntity);
             }
         }
+        if (!this.modelSpec?.fullSchema) {
+            throw new ServerError(`Cannot prepare entity: No model specification with schema provided for ${this.pluralResourceName}`);
+        }
         let cleanedEntity = preparedEntity;
         if (this.modelSpec) {
-            let entityId = null;
-            if (allowId) {
-                entityId = preparedEntity._id;
-            }
-            console.log(`preparedEntity is ${JSON.stringify(preparedEntity)}`);
             cleanedEntity = this.modelSpec.decode(preparedEntity);
-            console.log(`cleanedEntity is ${JSON.stringify(cleanedEntity)}`);
-            if (allowId && entityId) {
-                cleanedEntity._id = entityId;
-            }
-        }
-        if (!this.modelSpec?.fullSchema) {
-            throw new ServerError(`Cannot prepare entity: No model specification with schema provided for ${this.pluralResourceName}`);
         }
         return dbUtils.convertStringsToObjectIds(cleanedEntity, this.modelSpec.fullSchema);
     }

package/package.json

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