@loomcore/api 0.0.46 → 0.0.48

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

@@ -195,16 +195,6 @@ export class GenericApiService {
         const entities = await this.onBeforeUpdate(userContext, preparedEntities);
         const operations = [];
         const entityIds = [];
-        console.log('--- DIAGNOSTICS: Entities received in batchUpdate ---');
-        entities.forEach((entity, index) => {
-            const entityWithId = entity;
-            if (entityWithId && entityWithId._id) {
-                console.log(`  [${index}]: ID is ${entityWithId._id.toString()}, Type is ${entityWithId._id.constructor.name}`);
-            }
-            else {
-                console.log(`  [${index}]: Entity has no _id or is null.`);
-            }
-        });
         for (const entity of entities) {
             const { _id, ...updateData } = entity;
             if (!_id || !(_id instanceof ObjectId)) {
@@ -380,7 +370,6 @@ export class GenericApiService {
         return transformedEntity;
     }
     stripSenderProvidedSystemProperties(userContext, doc, allowId = false) {
-        console.log(`in stripSenderProvidedSystemProperties, allowId is ${allowId}`);
         const isSystemUser = userContext.user?._id === 'system';
         if (isSystemUser) {
             return;
@@ -404,21 +393,11 @@ export class GenericApiService {
         }
     }
     async prepareDataForBatchUpdate(userContext, entities) {
-        console.log('--- DIAGNOSTICS: Executing prepareDataForBatchUpdate ---');
-        return Promise.all(entities.map(item => {
-            const allowId = true;
-            console.log(`in prepareDataForBatchUpdate, item is ${JSON.stringify(item)}, and allowId is ${allowId}`);
-            return this.prepareEntity(userContext, item, false, allowId);
-        }));
+        return Promise.all(entities.map(item => this.prepareEntity(userContext, item, false, true)));
     }
     async prepareEntity(userContext, entity, isCreate, allowId = false) {
-        console.log(`ENTRY: prepareEntity called with allowId = ${allowId}`);
         const preparedEntity = _.clone(entity);
-        console.log(`in prepareEntity, pluralResourceName is ${this.pluralResourceName}`);
-        console.log(`before stripping system properties, preparedEntity is ${JSON.stringify(preparedEntity)}`);
-        console.log(`allowId is ${allowId}`);
         this.stripSenderProvidedSystemProperties(userContext, preparedEntity, allowId);
-        console.log(`after stripping system properties, preparedEntity is ${JSON.stringify(preparedEntity)}`);
         if (this.modelSpec?.isAuditable) {
             if (isCreate) {
                 this.auditForCreate(userContext, preparedEntity);
@@ -431,27 +410,19 @@ export class GenericApiService {
         if (this.modelSpec) {
             let entityId = null;
             if (allowId) {
-                console.log(`_id is present and equals ${preparedEntity._id}`);
                 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) {
-                console.log(`after decode, restoring _id to ${entityId}`);
                 cleanedEntity._id = entityId;
             }
         }
         if (!this.modelSpec?.fullSchema) {
             throw new ServerError(`Cannot prepare entity: No model specification with schema provided for ${this.pluralResourceName}`);
         }
-        const finalEntity = dbUtils.convertStringsToObjectIds(cleanedEntity, this.modelSpec.fullSchema);
-        const finalEntityWithId = finalEntity;
-        if (finalEntityWithId && finalEntityWithId._id) {
-            console.log(`--- DIAGNOSTICS: In prepareEntity, after conversion, ID is ${finalEntityWithId._id.toString()}, Type is ${finalEntityWithId._id.constructor.name} ---`);
-        }
-        else {
-            console.log('--- DIAGNOSTICS: In prepareEntity, after conversion, entity has no _id or is null. ---');
-        }
-        return finalEntity;
+        return dbUtils.convertStringsToObjectIds(cleanedEntity, this.modelSpec.fullSchema);
     }
     prepareQuery(userContext, query) {
         return query;

package/dist/services/multi-tenant-api.service.d.ts

@@ -6,5 +6,5 @@ export declare class MultiTenantApiService<T extends IEntity> extends GenericApi
     constructor(db: Db, pluralResourceName: string, singularResourceName: string, modelSpec?: IModelSpec);
     protected prepareQuery(userContext: IUserContext, query: any): any;
     protected prepareQueryOptions(userContext: IUserContext, queryOptions: IQueryOptions): IQueryOptions;
-    protected prepareEntity(userContext: IUserContext, entity: T, isCreate: boolean): Promise<T | Partial<T>>;
+    protected prepareEntity(userContext: IUserContext, entity: T, isCreate: boolean, allowId?: boolean): Promise<T | Partial<T>>;
 }

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

@@ -28,14 +28,14 @@ export class MultiTenantApiService extends GenericApiService {
         }
         return this.tenantDecorator.applyTenantToQueryOptions(userContext, queryOptions, this.pluralResourceName);
     }
-    async prepareEntity(userContext, entity, isCreate) {
+    async prepareEntity(userContext, entity, isCreate, allowId = false) {
         if (!config?.app?.isMultiTenant) {
-            return super.prepareEntity(userContext, entity, isCreate);
+            return super.prepareEntity(userContext, entity, isCreate, allowId);
         }
         if (!userContext || !userContext._orgId) {
             throw new BadRequestError('A valid userContext was not provided to MultiTenantApiService.prepareEntity');
         }
-        const preparedEntity = await super.prepareEntity(userContext, entity, isCreate);
+        const preparedEntity = await super.prepareEntity(userContext, entity, isCreate, allowId);
         const orgIdField = this.tenantDecorator.getOrgIdField();
         preparedEntity[orgIdField] = userContext._orgId;
         return preparedEntity;

package/package.json

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