@solidxai/core 0.1.6-beta.22 → 0.1.6-beta.24

package/dist/subscribers/audit.subscriber.js.map

@@ -1 +1 @@
-{"version":3,"file":"audit.subscriber.js","sourceRoot":"","sources":["../../src/subscribers/audit.subscriber.ts"],"names":[],"mappings":"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","sourcesContent":["import { forwardRef, Inject, Injectable, Scope } from '@nestjs/common';\nimport { ModelMetadataHelperService } from 'src/helpers/model-metadata-helper.service';\nimport { lowerFirst } from 'src/helpers/string.helper';\nimport { ModelMetadataRepository } from 'src/repository/model-metadata.repository';\nimport { DataSource, EntityMetadata, EntitySubscriberInterface, InsertEvent, RemoveEvent, UpdateEvent } from 'typeorm';\nimport { ChatterMessageService } from '../services/chatter-message.service';\n\n\ntype DeferredCall =\n    | { kind: 'insert'; args: Parameters<ChatterMessageService['postAuditMessageOnInsert']> }\n    | { kind: 'update'; args: Parameters<ChatterMessageService['postAuditMessageOnUpdate']> }\n    | { kind: 'delete'; args: Parameters<ChatterMessageService['postAuditMessageOnDelete']> };\n\n@Injectable({scope: Scope.TRANSIENT})\n// @EventSubscriber()\nexport class AuditSubscriber implements EntitySubscriberInterface {\n    private dataSource: DataSource;\n    constructor(\n        // @InjectDataSource()\n        // private readonly dataSource: DataSource,\n        private readonly chatterMessageService: ChatterMessageService,\n        // @InjectRepository(ModelMetadata)\n        // private readonly modelMetadataRepo: Repository<ModelMetadata>,\n        @Inject(forwardRef(() => ModelMetadataRepository))\n        private readonly modelMetadataRepo: ModelMetadataRepository,\n        private readonly modelMetadataHelperService: ModelMetadataHelperService,\n    ) {\n        // this.dataSource.subscribers.push(this);\n    }\n\n    bindToDataSource(dataSource: DataSource) {\n        this.dataSource = dataSource;\n        this.dataSource.subscribers.push(this);\n    }\n\n    // Per-transaction buffer (auto-GC when queryRunner is gone)\n    private perTxn = new WeakMap<any, DeferredCall[]>();\n\n    private enqueue(event: { queryRunner: any }, call: DeferredCall) {\n        const qr = event.queryRunner;\n        const arr = this.perTxn.get(qr) ?? [];\n        arr.push(call);\n        this.perTxn.set(qr, arr);\n    }\n\n    private async shouldTrackAudit(entity: any, metadata: EntityMetadata): Promise<boolean> {\n        const model = await this.modelMetadataRepo.findOne({\n            where: {\n                singularName: lowerFirst(metadata.name)\n            },\n            relations: {\n                fields: true,\n                module: true\n            }\n        });\n\n        if (!model || !model.enableAuditTracking) {\n            return false;\n        }\n\n        const modelFields = await this.modelMetadataHelperService.loadFieldHierarchy(model.singularName)\n\n        const auditFields = modelFields.filter(field =>\n            field.enableAuditTracking &&\n            !['mediaSingle', 'mediaMultiple', 'richText', 'json'].includes(field.type) &&\n            !(field.type === 'relation' && field.relationType === 'one-to-many')\n        );\n\n        if (auditFields.length === 0) {\n            return false;\n        }\n\n        // if (!entity) {\n        //     console.warn(`[AuditSubscriber] Skipping audit for ${metadata.name} – entity is undefined or null`);\n        //     return false;\n        // }\n\n        return entity && auditFields.some(field => {\n            const fieldValue = entity[field.name];\n            return fieldValue !== undefined && fieldValue !== null;\n        });\n    }\n\n    async afterInsert(event: InsertEvent<any>) {\n        if (await this.shouldTrackAudit(event.entity, event.metadata)) {\n            // await this.chatterMessageService.postAuditMessageOnInsert(event.entity, event.metadata);\n            this.enqueue(event, {\n                kind: 'insert',\n                args: [event.entity, event.metadata] as Parameters<ChatterMessageService['postAuditMessageOnInsert']>,\n            });\n        }\n    }\n\n    async afterUpdate(event: UpdateEvent<any>) {\n        if (await this.shouldTrackAudit(event.entity, event.metadata)) {\n            // await this.chatterMessageService.postAuditMessageOnUpdate(event.entity, event.metadata, event.databaseEntity, event.updatedColumns || []);\n            this.enqueue(event, {\n                kind: 'update',\n                args: [\n                    event.entity, // entity (after)\n                    event.metadata,\n                    event.databaseEntity, // entity (before)\n                    event.updatedColumns ?? [],\n                ] as Parameters<ChatterMessageService['postAuditMessageOnUpdate']>,\n            });\n        }\n    }\n\n    async afterRemove(event: RemoveEvent<any>) {\n        if (await this.shouldTrackAudit(event.entity, event.metadata)) {\n            // await this.chatterMessageService.postAuditMessageOnDelete(event.entity, event.metadata, event.databaseEntity);\n            this.enqueue(event, {\n                kind: 'delete',\n                args: [\n                    event.entity,\n                    event.metadata,\n                    event.databaseEntity,\n                ] as Parameters<ChatterMessageService['postAuditMessageOnDelete']>,\n            });\n        }\n    }\n\n    // --------- transaction lifecycle ----------\n    async afterTransactionCommit(event: { queryRunner: any }) {\n        const batch = this.perTxn.get(event.queryRunner) ?? [];\n        this.perTxn.delete(event.queryRunner);\n\n        // Now we’re OUTSIDE the DB transaction — safe to do I/O/DB writes inside chatter service.\n        for (const item of batch) {\n            try {\n                switch (item.kind) {\n                    case 'insert': await this.chatterMessageService.postAuditMessageOnInsert(...item.args); break;\n                    case 'update': await this.chatterMessageService.postAuditMessageOnUpdate(...item.args); break;\n                    case 'delete': await this.chatterMessageService.postAuditMessageOnDelete(...item.args); break;\n                }\n            } catch (e) {\n                // Best effort: log and continue; your core txn was already committed\n                // Optionally: send to a generic error logger/metric here\n            }\n        }\n    }\n\n    afterTransactionRollback(event: { queryRunner: any }) {\n        // Drop buffered calls; the write never happened\n        this.perTxn.delete(event.queryRunner);\n    }\n}\n\n// import { DataSource, EntityMetadata, EntitySubscriberInterface, EventSubscriber, InsertEvent, RemoveEvent, UpdateEvent } from 'typeorm';\n// import { Injectable } from '@nestjs/common';\n// import { InjectDataSource, InjectRepository } from '@nestjs/typeorm';\n// import { Repository } from 'typeorm';\n// import { ModelMetadata } from '../entities/model-metadata.entity';\n// import { lowerFirst } from 'src/helpers/string.helper';\n// import { ModelMetadataHelperService } from 'src/helpers/model-metadata-helper.service';\n// import { ChatterMessagePayload } from 'src/jobs/chatter-queue-publisher.service';\n// import { RequestContextService } from 'src/services/request-context.service';\n// import { PublisherFactory } from 'src/services/queues/publisher-factory.service';\n\n// @EventSubscriber()\n// @Injectable()\n// export class AuditSubscriber implements EntitySubscriberInterface {\n//     private perTxn = new WeakMap<any, ChatterMessagePayload[]>();\n\n//     constructor(\n//         @InjectDataSource() private readonly dataSource: DataSource,\n//         @InjectRepository(ModelMetadata) private readonly modelMetadataRepo: Repository<ModelMetadata>,\n//         private readonly modelMetadataHelperService: ModelMetadataHelperService,\n//         private readonly requestContext: RequestContextService,\n//         private readonly publisherFactory: PublisherFactory<any>\n//     ) {\n//         this.dataSource.subscribers.push(this);\n//     }\n\n//     // --- small cache to avoid metadata queries on every row ---\n//     private modelCache = new Map<string, { enable: boolean; fields: Array<{ name: string; enableAuditTracking: boolean; type: string; relationType?: string }>; ts: number }>();\n//     private cacheTTLms = 60_000;\n\n//     private async shouldTrackAudit(entity: any, metadata: EntityMetadata): Promise<{ enable: boolean; auditFields?: string[] }> {\n//         const key = metadata.name;\n//         const now = Date.now();\n//         const cached = this.modelCache.get(key);\n//         if (cached && (now - cached.ts) < this.cacheTTLms) {\n//             if (!cached.enable) return { enable: false };\n//             const fields = cached.fields.filter(f =>\n//                 f.enableAuditTracking &&\n//                 !['mediaSingle', 'mediaMultiple', 'computed', 'richText', 'json'].includes(f.type) &&\n//                 !(f.type === 'relation' && f.relationType === 'one-to-many')\n//             );\n//             const present = fields.map(f => f.name).filter(n => entity?.[n] !== undefined);\n//             return { enable: present.length > 0, auditFields: present };\n//         }\n\n//         const model = await this.modelMetadataRepo.findOne({\n//             where: { singularName: lowerFirst(metadata.name) },\n//             relations: { fields: true, module: true },\n//         });\n//         const enable = !!model?.enableAuditTracking;\n//         const fields = model?.fields ?? [];\n//         this.modelCache.set(key, { enable, fields, ts: now });\n\n//         if (!enable) return { enable: false };\n//         const filtered = fields.filter(f =>\n//             f.enableAuditTracking &&\n//             !['mediaSingle', 'mediaMultiple', 'computed', 'richText', 'json'].includes(f.type) &&\n//             !(f.type === 'relation' && f.relationType === 'one-to-many')\n//         );\n//         const present = filtered.map(f => f.name).filter(n => entity?.[n] !== undefined);\n//         return { enable: present.length > 0, auditFields: present };\n//     }\n\n//     private push(event: { queryRunner: any }, msg: ChatterMessagePayload) {\n//         const arr = this.perTxn.get(event.queryRunner) ?? [];\n//         arr.push(msg);\n//         this.perTxn.set(event.queryRunner, arr);\n//     }\n\n//     async afterInsert(event: InsertEvent<any>) {\n//         if (!event.entity) return;\n//         const enable = await this.shouldTrackAudit(event.entity, event.metadata);\n//         if (!enable) return;\n\n//         const payload: ChatterMessagePayload = {\n//             eventType: 'insert',\n//             model: event.metadata.name,\n//             entityId: String(event.entity.id ?? event.entity.uuid ?? ''),\n//             occurredAt: new Date().toISOString(),\n//             after: this.safeCopy(event.entity),\n//             userId: this.getUserId(),\n//         };\n//         this.push(event, payload);\n//     }\n\n//     async afterUpdate(event: UpdateEvent<any>) {\n//         // Updated entity may be null if you used raw query; fall back to databaseEntity\n//         const current = event.entity ?? {};\n//         const before = event.databaseEntity ?? {};\n//         const { enable, auditFields } = await this.shouldTrackAudit(current, event.metadata);\n//         if (!enable) return;\n\n//         const changedCols = (event.updatedColumns || []).map(c => c.propertyName);\n//         const payload: ChatterMessagePayload = {\n//             eventType: 'update',\n//             model: event.metadata.name,\n//             entityId: String((current as any).id ?? (before as any).id ?? ''),\n//             occurredAt: new Date().toISOString(),\n//             before: this.pick(before, auditFields || changedCols),\n//             after: this.pick(current, auditFields || changedCols),\n//             diff: changedCols,\n//             userId: this.getUserId(),\n//         };\n//         this.push(event, payload);\n//     }\n\n//     async afterRemove(event: RemoveEvent<any>) {\n//         const base = event.entity ?? event.databaseEntity;\n//         if (!base) return;\n\n//         const { enable } = await this.shouldTrackAudit(base, event.metadata);\n//         if (!enable) return;\n\n//         const payload: ChatterMessagePayload = {\n//             eventType: 'delete',\n//             model: event.metadata.name,\n//             entityId: String((base as any).id ?? ''),\n//             occurredAt: new Date().toISOString(),\n//             before: this.safeCopy(base),\n//             userId: this.getUserId(),\n//         };\n//         this.push(event, payload);\n//     }\n\n//     // Publish AFTER the transaction commits -> no idle-in-transaction\n//     async afterTransactionCommit(event: { queryRunner: any }) {\n//         const batch = this.perTxn.get(event.queryRunner) ?? [];\n//         this.perTxn.delete(event.queryRunner);\n//         for (const msg of batch) {\n//             try {\n//                 await this.publisherFactory.publish({ payload: msg, parentEntity: msg.model, parentEntityId: msg.entityId }, 'ChatterQueuePublisher');\n//             } catch (err) {\n//                 // log + optionally send to a DLQ or retry queue\n//                 // do NOT throw; commit already happened\n//                 // your RabbitMqPublisher likely tracks failures in MqMessage tables anyway\n//             }\n//         }\n//     }\n\n//     afterTransactionRollback(event: { queryRunner: any }) {\n//         this.perTxn.delete(event.queryRunner);\n//     }\n\n//     // --- small helpers to keep payloads JSON-safe and small ---\n//     private safeCopy(obj: any) {\n//         try {\n//             return JSON.parse(JSON.stringify(obj));\n//         } catch {\n//             return {}; // strip circular refs\n//         }\n//     }\n\n//     private pick(obj: any, keys: string[]) {\n//         const out: any = {};\n//         for (const k of keys) out[k] = obj?.[k];\n//         return this.safeCopy(out);\n//     }\n\n//     private getUserId(): string | null {\n\n//         const activeUser = this.requestContext.getActiveUser();\n//         if (activeUser?.sub)\n//             return String(activeUser.sub);\n//     }\n\n\n// }"]}
+{"version":3,"file":"audit.subscriber.js","sourceRoot":"","sources":["../../src/subscribers/audit.subscriber.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable, Scope } from '@nestjs/common';\nimport { lowerFirst } from 'src/helpers/string.helper';\nimport { SolidRegistry } from 'src/helpers/solid-registry';\nimport { DataSource, EntityMetadata, EntitySubscriberInterface, InsertEvent, RemoveEvent, UpdateEvent } from 'typeorm';\nimport { ChatterMessageService } from '../services/chatter-message.service';\n\n\ntype DeferredCall =\n    | { kind: 'insert'; args: Parameters<ChatterMessageService['postAuditMessageOnInsert']> }\n    | { kind: 'update'; args: Parameters<ChatterMessageService['postAuditMessageOnUpdate']> }\n    | { kind: 'delete'; args: Parameters<ChatterMessageService['postAuditMessageOnDelete']> };\n\n@Injectable({scope: Scope.TRANSIENT})\n// @EventSubscriber()\nexport class AuditSubscriber implements EntitySubscriberInterface {\n    private dataSource: DataSource;\n    constructor(\n        private readonly chatterMessageService: ChatterMessageService,\n        private readonly solidRegistry: SolidRegistry,\n    ) { }\n\n    bindToDataSource(dataSource: DataSource) {\n        this.dataSource = dataSource;\n        this.dataSource.subscribers.push(this);\n    }\n\n    // Per-transaction buffer (auto-GC when queryRunner is gone)\n    private perTxn = new WeakMap<any, DeferredCall[]>();\n\n    private enqueue(event: { queryRunner: any }, call: DeferredCall) {\n        const qr = event.queryRunner;\n        const arr = this.perTxn.get(qr) ?? [];\n        arr.push(call);\n        this.perTxn.set(qr, arr);\n    }\n\n    private shouldTrackAudit(metadata: EntityMetadata): boolean {\n        return this.solidRegistry.isAuditableModel(lowerFirst(metadata.name));\n    }\n\n    async afterInsert(event: InsertEvent<any>) {\n        if (this.shouldTrackAudit(event.metadata)) {\n            // await this.chatterMessageService.postAuditMessageOnInsert(event.entity, event.metadata);\n            this.enqueue(event, {\n                kind: 'insert',\n                args: [event.entity, event.metadata] as Parameters<ChatterMessageService['postAuditMessageOnInsert']>,\n            });\n        }\n    }\n\n    async afterUpdate(event: UpdateEvent<any>) {\n        if (this.shouldTrackAudit(event.metadata)) {\n            // await this.chatterMessageService.postAuditMessageOnUpdate(event.entity, event.metadata, event.databaseEntity, event.updatedColumns || []);\n            this.enqueue(event, {\n                kind: 'update',\n                args: [\n                    event.entity, // entity (after)\n                    event.metadata,\n                    event.databaseEntity, // entity (before)\n                    event.updatedColumns ?? [],\n                ] as Parameters<ChatterMessageService['postAuditMessageOnUpdate']>,\n            });\n        }\n    }\n\n    async afterRemove(event: RemoveEvent<any>) {\n        if (this.shouldTrackAudit(event.metadata)) {\n            // await this.chatterMessageService.postAuditMessageOnDelete(event.entity, event.metadata, event.databaseEntity);\n            this.enqueue(event, {\n                kind: 'delete',\n                args: [\n                    event.entity,\n                    event.metadata,\n                    event.databaseEntity,\n                ] as Parameters<ChatterMessageService['postAuditMessageOnDelete']>,\n            });\n        }\n    }\n\n    // --------- transaction lifecycle ----------\n    async afterTransactionCommit(event: { queryRunner: any }) {\n        const batch = this.perTxn.get(event.queryRunner) ?? [];\n        this.perTxn.delete(event.queryRunner);\n\n        // Now we’re OUTSIDE the DB transaction — safe to do I/O/DB writes inside chatter service.\n        for (const item of batch) {\n            try {\n                switch (item.kind) {\n                    case 'insert': await this.chatterMessageService.postAuditMessageOnInsert(...item.args); break;\n                    case 'update': await this.chatterMessageService.postAuditMessageOnUpdate(...item.args); break;\n                    case 'delete': await this.chatterMessageService.postAuditMessageOnDelete(...item.args); break;\n                }\n            } catch (e) {\n                // Best effort: log and continue; your core txn was already committed\n                // Optionally: send to a generic error logger/metric here\n            }\n        }\n    }\n\n    afterTransactionRollback(event: { queryRunner: any }) {\n        // Drop buffered calls; the write never happened\n        this.perTxn.delete(event.queryRunner);\n    }\n}\n\n// import { DataSource, EntityMetadata, EntitySubscriberInterface, EventSubscriber, InsertEvent, RemoveEvent, UpdateEvent } from 'typeorm';\n// import { Injectable } from '@nestjs/common';\n// import { InjectDataSource, InjectRepository } from '@nestjs/typeorm';\n// import { Repository } from 'typeorm';\n// import { ModelMetadata } from '../entities/model-metadata.entity';\n// import { lowerFirst } from 'src/helpers/string.helper';\n// import { ModelMetadataHelperService } from 'src/helpers/model-metadata-helper.service';\n// import { ChatterMessagePayload } from 'src/jobs/chatter-queue-publisher.service';\n// import { RequestContextService } from 'src/services/request-context.service';\n// import { PublisherFactory } from 'src/services/queues/publisher-factory.service';\n\n// @EventSubscriber()\n// @Injectable()\n// export class AuditSubscriber implements EntitySubscriberInterface {\n//     private perTxn = new WeakMap<any, ChatterMessagePayload[]>();\n\n//     constructor(\n//         @InjectDataSource() private readonly dataSource: DataSource,\n//         @InjectRepository(ModelMetadata) private readonly modelMetadataRepo: Repository<ModelMetadata>,\n//         private readonly modelMetadataHelperService: ModelMetadataHelperService,\n//         private readonly requestContext: RequestContextService,\n//         private readonly publisherFactory: PublisherFactory<any>\n//     ) {\n//         this.dataSource.subscribers.push(this);\n//     }\n\n//     // --- small cache to avoid metadata queries on every row ---\n//     private modelCache = new Map<string, { enable: boolean; fields: Array<{ name: string; enableAuditTracking: boolean; type: string; relationType?: string }>; ts: number }>();\n//     private cacheTTLms = 60_000;\n\n//     private async shouldTrackAudit(entity: any, metadata: EntityMetadata): Promise<{ enable: boolean; auditFields?: string[] }> {\n//         const key = metadata.name;\n//         const now = Date.now();\n//         const cached = this.modelCache.get(key);\n//         if (cached && (now - cached.ts) < this.cacheTTLms) {\n//             if (!cached.enable) return { enable: false };\n//             const fields = cached.fields.filter(f =>\n//                 f.enableAuditTracking &&\n//                 !['mediaSingle', 'mediaMultiple', 'computed', 'richText', 'json'].includes(f.type) &&\n//                 !(f.type === 'relation' && f.relationType === 'one-to-many')\n//             );\n//             const present = fields.map(f => f.name).filter(n => entity?.[n] !== undefined);\n//             return { enable: present.length > 0, auditFields: present };\n//         }\n\n//         const model = await this.modelMetadataRepo.findOne({\n//             where: { singularName: lowerFirst(metadata.name) },\n//             relations: { fields: true, module: true },\n//         });\n//         const enable = !!model?.enableAuditTracking;\n//         const fields = model?.fields ?? [];\n//         this.modelCache.set(key, { enable, fields, ts: now });\n\n//         if (!enable) return { enable: false };\n//         const filtered = fields.filter(f =>\n//             f.enableAuditTracking &&\n//             !['mediaSingle', 'mediaMultiple', 'computed', 'richText', 'json'].includes(f.type) &&\n//             !(f.type === 'relation' && f.relationType === 'one-to-many')\n//         );\n//         const present = filtered.map(f => f.name).filter(n => entity?.[n] !== undefined);\n//         return { enable: present.length > 0, auditFields: present };\n//     }\n\n//     private push(event: { queryRunner: any }, msg: ChatterMessagePayload) {\n//         const arr = this.perTxn.get(event.queryRunner) ?? [];\n//         arr.push(msg);\n//         this.perTxn.set(event.queryRunner, arr);\n//     }\n\n//     async afterInsert(event: InsertEvent<any>) {\n//         if (!event.entity) return;\n//         const enable = await this.shouldTrackAudit(event.entity, event.metadata);\n//         if (!enable) return;\n\n//         const payload: ChatterMessagePayload = {\n//             eventType: 'insert',\n//             model: event.metadata.name,\n//             entityId: String(event.entity.id ?? event.entity.uuid ?? ''),\n//             occurredAt: new Date().toISOString(),\n//             after: this.safeCopy(event.entity),\n//             userId: this.getUserId(),\n//         };\n//         this.push(event, payload);\n//     }\n\n//     async afterUpdate(event: UpdateEvent<any>) {\n//         // Updated entity may be null if you used raw query; fall back to databaseEntity\n//         const current = event.entity ?? {};\n//         const before = event.databaseEntity ?? {};\n//         const { enable, auditFields } = await this.shouldTrackAudit(current, event.metadata);\n//         if (!enable) return;\n\n//         const changedCols = (event.updatedColumns || []).map(c => c.propertyName);\n//         const payload: ChatterMessagePayload = {\n//             eventType: 'update',\n//             model: event.metadata.name,\n//             entityId: String((current as any).id ?? (before as any).id ?? ''),\n//             occurredAt: new Date().toISOString(),\n//             before: this.pick(before, auditFields || changedCols),\n//             after: this.pick(current, auditFields || changedCols),\n//             diff: changedCols,\n//             userId: this.getUserId(),\n//         };\n//         this.push(event, payload);\n//     }\n\n//     async afterRemove(event: RemoveEvent<any>) {\n//         const base = event.entity ?? event.databaseEntity;\n//         if (!base) return;\n\n//         const { enable } = await this.shouldTrackAudit(base, event.metadata);\n//         if (!enable) return;\n\n//         const payload: ChatterMessagePayload = {\n//             eventType: 'delete',\n//             model: event.metadata.name,\n//             entityId: String((base as any).id ?? ''),\n//             occurredAt: new Date().toISOString(),\n//             before: this.safeCopy(base),\n//             userId: this.getUserId(),\n//         };\n//         this.push(event, payload);\n//     }\n\n//     // Publish AFTER the transaction commits -> no idle-in-transaction\n//     async afterTransactionCommit(event: { queryRunner: any }) {\n//         const batch = this.perTxn.get(event.queryRunner) ?? [];\n//         this.perTxn.delete(event.queryRunner);\n//         for (const msg of batch) {\n//             try {\n//                 await this.publisherFactory.publish({ payload: msg, parentEntity: msg.model, parentEntityId: msg.entityId }, 'ChatterQueuePublisher');\n//             } catch (err) {\n//                 // log + optionally send to a DLQ or retry queue\n//                 // do NOT throw; commit already happened\n//                 // your RabbitMqPublisher likely tracks failures in MqMessage tables anyway\n//             }\n//         }\n//     }\n\n//     afterTransactionRollback(event: { queryRunner: any }) {\n//         this.perTxn.delete(event.queryRunner);\n//     }\n\n//     // --- small helpers to keep payloads JSON-safe and small ---\n//     private safeCopy(obj: any) {\n//         try {\n//             return JSON.parse(JSON.stringify(obj));\n//         } catch {\n//             return {}; // strip circular refs\n//         }\n//     }\n\n//     private pick(obj: any, keys: string[]) {\n//         const out: any = {};\n//         for (const k of keys) out[k] = obj?.[k];\n//         return this.safeCopy(out);\n//     }\n\n//     private getUserId(): string | null {\n\n//         const activeUser = this.requestContext.getActiveUser();\n//         if (activeUser?.sub)\n//             return String(activeUser.sub);\n//     }\n\n\n// }"]}

package/dist/subscribers/created-by-updated-by.subscriber.d.ts

@@ -9,6 +9,5 @@ export declare class CreatedByUpdatedBySubscriber implements EntitySubscriberInt
     beforeInsert(event: InsertEvent<any>): Promise<void>;
     beforeUpdate(event: UpdateEvent<any>): Promise<void>;
     private stampUserField;
-    private loadUser;
 }
 //# sourceMappingURL=created-by-updated-by.subscriber.d.ts.map

package/dist/subscribers/created-by-updated-by.subscriber.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"created-by-updated-by.subscriber.d.ts","sourceRoot":"","sources":["../../src/subscribers/created-by-updated-by.subscriber.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,qBAAqB,EAAE,MAAM,sCAAsC,CAAC;AAC7E,OAAO,EAAE,UAAU,EAAE,yBAAyB,EAAmB,WAAW,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAE3G,qBAEa,4BAA6B,YAAW,yBAAyB;IAItE,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,qBAAqB;IAJ1C,OAAO,CAAC,UAAU,CAAa;gBAGV,iBAAiB,EAAE,UAAU,EAC7B,qBAAqB,EAAE,qBAAqB;IAKjE,gBAAgB,CAAC,UAAU,EAAE,UAAU;IAKjC,YAAY,CAAC,KAAK,EAAE,WAAW,CAAC,GAAG,CAAC;IAIpC,YAAY,CAAC,KAAK,EAAE,WAAW,CAAC,GAAG,CAAC;YAI5B,cAAc;YAoBd,QAAQ;CAOzB"}
+{"version":3,"file":"created-by-updated-by.subscriber.d.ts","sourceRoot":"","sources":["../../src/subscribers/created-by-updated-by.subscriber.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAE,MAAM,sCAAsC,CAAC;AAC7E,OAAO,EAAE,UAAU,EAAE,yBAAyB,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAE1F,qBAEa,4BAA6B,YAAW,yBAAyB;IAItE,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,qBAAqB;IAJ1C,OAAO,CAAC,UAAU,CAAa;gBAGV,iBAAiB,EAAE,UAAU,EAC7B,qBAAqB,EAAE,qBAAqB;IAKjE,gBAAgB,CAAC,UAAU,EAAE,UAAU;IAKjC,YAAY,CAAC,KAAK,EAAE,WAAW,CAAC,GAAG,CAAC;IAIpC,YAAY,CAAC,KAAK,EAAE,WAAW,CAAC,GAAG,CAAC;YAI5B,cAAc;CAmC/B"}

package/dist/subscribers/created-by-updated-by.subscriber.js

@@ -15,7 +15,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CreatedByUpdatedBySubscriber = void 0;
 const common_1 = require("@nestjs/common");
 const typeorm_1 = require("@nestjs/typeorm");
-const user_entity_1 = require("../entities/user.entity");
 const request_context_service_1 = require("../services/request-context.service");
 const typeorm_2 = require("typeorm");
 let CreatedByUpdatedBySubscriber = class CreatedByUpdatedBySubscriber {
@@ -41,23 +40,14 @@ let CreatedByUpdatedBySubscriber = class CreatedByUpdatedBySubscriber {
         if (!activeUserOrUndefined) {
             return;
         }
-        const loadedUser = await this.loadUser(activeUserOrUndefined);
         if (isInsert) {
-            event.entity.createdBy = loadedUser?.id;
-            event.entity.updatedBy = loadedUser?.id;
+            event.entity.createdBy = activeUserOrUndefined?.sub;
+            event.entity.updatedBy = activeUserOrUndefined?.sub;
         }
         else {
-            event.entity.updatedBy = loadedUser?.id;
+            event.entity.updatedBy = activeUserOrUndefined?.sub;
         }
     }
-    async loadUser(activeUser) {
-        const userRepo = this.defaultDataSource.getRepository(user_entity_1.User);
-        const loadedUser = await userRepo.findOne({
-            where: { id: activeUser.sub },
-        });
-        return loadedUser;
-        ;
-    }
 };
 exports.CreatedByUpdatedBySubscriber = CreatedByUpdatedBySubscriber;
 exports.CreatedByUpdatedBySubscriber = CreatedByUpdatedBySubscriber = __decorate([

package/dist/subscribers/created-by-updated-by.subscriber.js.map

@@ -1 +1 @@
-{"version":3,"file":"created-by-updated-by.subscriber.js","sourceRoot":"","sources":["../../src/subscribers/created-by-updated-by.subscriber.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAmD;AACnD,6CAAmD;AACnD,yDAAgD;AAEhD,iFAA6E;AAC7E,qCAA2G;AAIpG,IAAM,4BAA4B,GAAlC,MAAM,4BAA4B;IAErC,YAEqB,iBAA6B,EAC7B,qBAA4C;QAD5C,sBAAiB,GAAjB,iBAAiB,CAAY;QAC7B,0BAAqB,GAArB,qBAAqB,CAAuB;IAGjE,CAAC;IAED,gBAAgB,CAAC,UAAsB;QACnC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC3C,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,KAAuB;QACtC,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IAC3C,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,KAAuB;QACtC,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IAC5C,CAAC;IAEO,KAAK,CAAC,cAAc,CAAC,KAA0C,EAAE,QAAiB;QACtF,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;YAChB,OAAO;QACX,CAAC;QAED,MAAM,qBAAqB,GAAG,IAAI,CAAC,qBAAqB,CAAC,aAAa,EAAE,CAAC;QACzE,IAAI,CAAC,qBAAqB,EAAE,CAAC;YACzB,OAAO;QACX,CAAC;QAED,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,qBAAkD,CAAC,CAAC;QAC3F,IAAI,QAAQ,EAAE,CAAC;YACX,KAAK,CAAC,MAAM,CAAC,SAAS,GAAG,UAAU,EAAE,EAAE,CAAC;YACxC,KAAK,CAAC,MAAM,CAAC,SAAS,GAAG,UAAU,EAAE,EAAE,CAAC;QAC5C,CAAC;aACI,CAAC;YACF,KAAK,CAAC,MAAM,CAAC,SAAS,GAAG,UAAU,EAAE,EAAE,CAAC;QAC5C,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,QAAQ,CAAC,UAA0B;QAC7C,MAAM,QAAQ,GAAG,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,kBAAI,CAAC,CAAC;QAC5D,MAAM,UAAU,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC;YACtC,KAAK,EAAE,EAAE,EAAE,EAAE,UAAU,CAAC,GAAG,EAAE;SAChC,CAAC,CAAC;QACH,OAAO,UAAU,CAAC;QAAA,CAAC;IACvB,CAAC;CACJ,CAAA;AAlDY,oEAA4B;uCAA5B,4BAA4B;IAFxC,IAAA,mBAAU,EAAC,EAAC,KAAK,EAAE,cAAK,CAAC,SAAS,EAAC,CAAC;IAK5B,WAAA,IAAA,0BAAgB,GAAE,CAAA;qCACiB,oBAAU;QACN,+CAAqB;GALxD,4BAA4B,CAkDxC","sourcesContent":["import { Injectable, Scope } from \"@nestjs/common\";\nimport { InjectDataSource } from \"@nestjs/typeorm\";\nimport { User } from \"src/entities/user.entity\";\nimport { ActiveUserData } from \"src/interfaces/active-user-data.interface\";\nimport { RequestContextService } from \"src/services/request-context.service\";\nimport { DataSource, EntitySubscriberInterface, EventSubscriber, InsertEvent, UpdateEvent } from \"typeorm\";\n\n@Injectable({scope: Scope.TRANSIENT})\n// @EventSubscriber()\nexport class CreatedByUpdatedBySubscriber implements EntitySubscriberInterface {\n    private dataSource: DataSource;\n    constructor(\n        @InjectDataSource()\n        private readonly defaultDataSource: DataSource,\n        private readonly requestContextService: RequestContextService,\n    ) {\n        // this.dataSource.subscribers.push(this);\n    }\n\n    bindToDataSource(dataSource: DataSource) {\n        this.dataSource = dataSource;\n        this.dataSource.subscribers.push(this);\n    }\n\n    async beforeInsert(event: InsertEvent<any>) {\n        await this.stampUserField(event, true);\n    }\n\n    async beforeUpdate(event: UpdateEvent<any>) {\n        await this.stampUserField(event, false);\n    }\n\n    private async stampUserField(event: InsertEvent<any> | UpdateEvent<any>, isInsert: boolean){\n        if (!event.entity) {\n            return;\n        }\n        // Get the current active user details from the request context\n        const activeUserOrUndefined = this.requestContextService.getActiveUser();\n        if (!activeUserOrUndefined) {\n            return;\n        }\n\n        const loadedUser = await this.loadUser(activeUserOrUndefined as unknown as ActiveUserData);\n        if (isInsert) {\n            event.entity.createdBy = loadedUser?.id;\n            event.entity.updatedBy = loadedUser?.id; // For insert, we set both createdBy and updatedBy to the same user\n        }\n        else {\n            event.entity.updatedBy = loadedUser?.id;\n        }\n    }\n\n    private async loadUser(activeUser: ActiveUserData): Promise<User> {\n        const userRepo = this.defaultDataSource.getRepository(User); // Assuming 'User' is the entity name for users in your application\n        const loadedUser = await userRepo.findOne({\n            where: { id: activeUser.sub }, // Assuming 'sub' is the user ID in the JWT token\n        });\n        return loadedUser;;\n    }\n}"]}
+{"version":3,"file":"created-by-updated-by.subscriber.js","sourceRoot":"","sources":["../../src/subscribers/created-by-updated-by.subscriber.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAmD;AACnD,6CAAmD;AACnD,iFAA6E;AAC7E,qCAA0F;AAInF,IAAM,4BAA4B,GAAlC,MAAM,4BAA4B;IAErC,YAEqB,iBAA6B,EAC7B,qBAA4C;QAD5C,sBAAiB,GAAjB,iBAAiB,CAAY;QAC7B,0BAAqB,GAArB,qBAAqB,CAAuB;IAGjE,CAAC;IAED,gBAAgB,CAAC,UAAsB;QACnC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC3C,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,KAAuB;QACtC,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IAC3C,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,KAAuB;QACtC,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IAC5C,CAAC;IAEO,KAAK,CAAC,cAAc,CAAC,KAA0C,EAAE,QAAiB;QACtF,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;YAChB,OAAO;QACX,CAAC;QAED,MAAM,qBAAqB,GAAG,IAAI,CAAC,qBAAqB,CAAC,aAAa,EAAE,CAAC;QACzE,IAAI,CAAC,qBAAqB,EAAE,CAAC;YACzB,OAAO;QACX,CAAC;QAWD,IAAI,QAAQ,EAAE,CAAC;YACX,KAAK,CAAC,MAAM,CAAC,SAAS,GAAG,qBAAqB,EAAE,GAAG,CAAC;YACpD,KAAK,CAAC,MAAM,CAAC,SAAS,GAAG,qBAAqB,EAAE,GAAG,CAAC;QACxD,CAAC;aACI,CAAC;YACF,KAAK,CAAC,MAAM,CAAC,SAAS,GAAG,qBAAqB,EAAE,GAAG,CAAC;QACxD,CAAC;IACL,CAAC;CASJ,CAAA;AA1DY,oEAA4B;uCAA5B,4BAA4B;IAFxC,IAAA,mBAAU,EAAC,EAAE,KAAK,EAAE,cAAK,CAAC,SAAS,EAAE,CAAC;IAK9B,WAAA,IAAA,0BAAgB,GAAE,CAAA;qCACiB,oBAAU;QACN,+CAAqB;GALxD,4BAA4B,CA0DxC","sourcesContent":["import { Injectable, Scope } from \"@nestjs/common\";\nimport { InjectDataSource } from \"@nestjs/typeorm\";\nimport { RequestContextService } from \"src/services/request-context.service\";\nimport { DataSource, EntitySubscriberInterface, InsertEvent, UpdateEvent } from \"typeorm\";\n\n@Injectable({ scope: Scope.TRANSIENT })\n// @EventSubscriber()\nexport class CreatedByUpdatedBySubscriber implements EntitySubscriberInterface {\n    private dataSource: DataSource;\n    constructor(\n        @InjectDataSource()\n        private readonly defaultDataSource: DataSource,\n        private readonly requestContextService: RequestContextService,\n    ) {\n        // this.dataSource.subscribers.push(this);\n    }\n\n    bindToDataSource(dataSource: DataSource) {\n        this.dataSource = dataSource;\n        this.dataSource.subscribers.push(this);\n    }\n\n    async beforeInsert(event: InsertEvent<any>) {\n        await this.stampUserField(event, true);\n    }\n\n    async beforeUpdate(event: UpdateEvent<any>) {\n        await this.stampUserField(event, false);\n    }\n\n    private async stampUserField(event: InsertEvent<any> | UpdateEvent<any>, isInsert: boolean) {\n        if (!event.entity) {\n            return;\n        }\n        // Get the current active user details from the request context\n        const activeUserOrUndefined = this.requestContextService.getActiveUser();\n        if (!activeUserOrUndefined) {\n            return;\n        }\n\n        // const loadedUser = await this.loadUser(activeUserOrUndefined as unknown as ActiveUserData);\n        // if (isInsert) {\n        //     event.entity.createdBy = loadedUser?.id;\n        //     event.entity.updatedBy = loadedUser?.id; // For insert, we set both createdBy and updatedBy to the same user\n        // }\n        // else {\n        //     event.entity.updatedBy = loadedUser?.id;\n        // }\n\n        if (isInsert) {\n            event.entity.createdBy = activeUserOrUndefined?.sub;\n            event.entity.updatedBy = activeUserOrUndefined?.sub; // For insert, we set both createdBy and updatedBy to the same user\n        }\n        else {\n            event.entity.updatedBy = activeUserOrUndefined?.sub;\n        }\n    }\n\n    // private async loadUser(activeUser: ActiveUserData): Promise<User> {\n    //     const userRepo = this.defaultDataSource.getRepository(User); // Assuming 'User' is the entity name for users in your application\n    //     const loadedUser = await userRepo.findOne({\n    //         where: { id: activeUser.sub }, // Assuming 'sub' is the user ID in the JWT token\n    //     });\n    //     return loadedUser;;\n    // }\n}"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidxai/core",
-  "version": "0.1.6-beta.22",
+  "version": "0.1.6-beta.24",
   "description": "This module is a NestJS module containing all the required core providers required by a Solid application",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/helpers/bootstrap.helper.ts

@@ -110,7 +110,7 @@ export async function bootstrapSolidApp(
     if (req.query) {
       req.query = qs.parse(req.url.split('?')[1], {
         allowDots: true,
-        depth: 10,
+        depth: 20,
         arrayLimit: 100,
       });
     }

package/src/helpers/solid-registry.ts

@@ -82,6 +82,7 @@ export class SolidRegistry {
   private securityRuleConfigProviders: Set<InstanceWrapper> = new Set();
   private errorCodeProviders: Set<InstanceWrapper> = new Set();
   private settingsProviders: Set<InstanceWrapper> = new Set();
+  private auditableModels: Set<string> = new Set();
 
   registerErrorCodeProvider(errorCodeProvider: InstanceWrapper): void {
     this.errorCodeProviders.add(errorCodeProvider);
@@ -338,6 +339,14 @@ export class SolidRegistry {
     });
   }
 
+  registerAuditableModels(models: Set<string>): void {
+    this.auditableModels = models;
+  }
+
+  isAuditableModel(modelSingularName: string): boolean {
+    return this.auditableModels.has(modelSingularName.toLowerCase());
+  }
+
   getCommonEntityKeys(): (keyof CommonEntity | 'createdBy' | 'updatedBy')[] {
     return ['id', 'createdAt', 'updatedAt', 'deletedAt', 'createdBy', 'updatedBy', 'deletedTracker', 'localeName', 'defaultEntityLocaleId', 'publishedAt'];
     // return Reflect.getMetadataKeys(CommonEntity.prototype) as (keyof CommonEntity)[];

package/src/interfaces.ts

@@ -271,6 +271,7 @@ export interface QueuesModuleOptions {
   type: BrokerType;
   queueName: string;
   prefetch?: number;
+  persistToDatabase?: boolean;
 }
 
 export type MediaWithFullUrl = Media & {

package/src/jobs/computed-field-evaluation-queue-options.ts

@@ -7,4 +7,5 @@ export default {
     type: BrokerType.RabbitMQ,
     queueName: QUEUE_NAME,
     prefetch: 10,
+    persistToDatabase: false,
 };

package/src/services/queues/rabbitmq-publisher.service.ts

@@ -34,6 +34,10 @@ export abstract class RabbitMqPublisher<T> implements OnModuleDestroy, QueuePubl
 
     abstract options(): QueuesModuleOptions;
 
+    protected shouldPersistToDatabase(): boolean {
+        return this.options().persistToDatabase ?? true;
+    }
+
     private async ensureConnectionAndChannel(): Promise<amqp.Channel> {
         if (this.channel) {
             return this.channel;
@@ -170,7 +174,9 @@ export abstract class RabbitMqPublisher<T> implements OnModuleDestroy, QueuePubl
         message.messageId = uuidv4();
 
         // Save the message to the DB so that we can then change its status in the subscriber...
-        await this.persistToDatabase(namespacedQueueName, message);
+        if (this.shouldPersistToDatabase()) {
+            await this.persistToDatabase(namespacedQueueName, message);
+        }
 
         // wait for the channel to confirm 
         try {
@@ -199,7 +205,7 @@ export abstract class RabbitMqPublisher<T> implements OnModuleDestroy, QueuePubl
 
     private async persistToDatabase(queueName: string, message: QueueMessage<T>) {
 
-        // TODO: make an entry in the relevant database table, generate a unique id earlier.
+        // make an entry in the relevant database table, generate a unique id earlier.
         try {
             // 1. resolve the queue first
             const mqMessageQueue = await this.mqMessageQueueService.resolveQueue(queueName);

package/src/services/queues/rabbitmq-subscriber.service.ts

@@ -56,6 +56,10 @@ export abstract class RabbitMqSubscriber<T> implements OnModuleInit, QueueSubscr
 
     abstract options(): QueuesModuleOptions;
 
+    protected shouldPersistToDatabase(): boolean {
+        return this.options().persistToDatabase ?? true;
+    }
+
     async establishConnection(): Promise<amqp.Connection> {
 
         const url = new URL(this.url);
@@ -236,7 +240,9 @@ export abstract class RabbitMqSubscriber<T> implements OnModuleInit, QueueSubscr
         this.logger.error(`Error processing message on queue ${queueName}: ${errorMessage}`, (error as Error)?.stack);
 
         if (message.currentRetry < message.retryCount) {
-            await this.updateStatusInDatabase('retrying', message);
+            if (this.shouldPersistToDatabase()) {
+                await this.updateStatusInDatabase('retrying', message);
+            }
 
             message.currentRetry++;
             const retryQueue = `${queueName}.retry`;
@@ -254,8 +260,9 @@ export abstract class RabbitMqSubscriber<T> implements OnModuleInit, QueueSubscr
             this.logger.warn(`Retrying message (${message.currentRetry}/${message.retryCount}) after ${message.retryInterval}ms on queue ${queueName}`);
             return;
         }
-
-        await this.updateStatusInDatabase('failed', message, errorMessage, '');
+        if (this.shouldPersistToDatabase()) {
+            await this.updateStatusInDatabase('failed', message, errorMessage, '');
+        }
         channel.ack(rawMessage);
         await this.publishToFailedQueue(queueName, Buffer.from(JSON.stringify(message)), channel, error);
         this.logger.error(`Message failed after ${message.retryCount} attempts on queue ${queueName}: ${errorMessage}`);
@@ -355,7 +362,9 @@ export abstract class RabbitMqSubscriber<T> implements OnModuleInit, QueueSubscr
      * Abstract method for message processing logic.
      */
     protected async processMessage(message: QueueMessage<T>, rawMessage, channel, queueName: string): Promise<void> {
-        await this.updateStatusInDatabase('started', message);
+        if (this.shouldPersistToDatabase()) {
+            await this.updateStatusInDatabase('started', message);
+        }
 
         // Capture the results of handling the task.
         const result = await this.subscribeWithTimeout(message, queueName);
@@ -364,7 +373,9 @@ export abstract class RabbitMqSubscriber<T> implements OnModuleInit, QueueSubscr
         channel.ack(rawMessage);
 
         // Persist success output and timing.
-        await this.updateStatusInDatabase('succeeded', message, '', result ? JSON.stringify(result, null, 2) : '');
+        if (this.shouldPersistToDatabase()) {
+            await this.updateStatusInDatabase('succeeded', message, '', result ? JSON.stringify(result, null, 2) : '');
+        }
 
     }
 

package/src/services/request-context.service.ts

@@ -2,6 +2,7 @@ import { Injectable } from "@nestjs/common";
 import { ClsService } from "nestjs-cls";
 import { REQUEST_USER_KEY } from "src/constants";
 import { BasicFilterDto } from "src/dtos/basic-filters.dto";
+import { ActiveUserData } from "src/interfaces/active-user-data.interface";
 
 @Injectable()
 export class RequestContextService {
@@ -9,7 +10,7 @@ export class RequestContextService {
     }
 
     // This method i.e getActiveUser() will fetch the user from the request object in the context
-    getActiveUser() {
+    getActiveUser(): ActiveUserData | undefined {
         return this.cls.get(REQUEST_USER_KEY);
     }
 

package/src/services/solid-introspect.service.ts

@@ -1,6 +1,8 @@
 import { classify } from '@angular-devkit/core/src/utils/strings';
 import { Injectable, Logger, OnApplicationBootstrap } from '@nestjs/common';
 import { DiscoveryService, MetadataScanner, ModuleRef, Reflector } from '@nestjs/core';
+import { ModelMetadataHelperService } from 'src/helpers/model-metadata-helper.service';
+import { ModelMetadataRepository } from 'src/repository/model-metadata.repository';
 import { InstanceWrapper } from '@nestjs/core/injector/instance-wrapper';
 import { getDataSourceToken } from '@nestjs/typeorm';
 import { IS_COMPUTED_FIELD_PROVIDER } from 'src/decorators/computed-field-provider.decorator';
@@ -40,6 +42,8 @@ export class SolidIntrospectService implements OnApplicationBootstrap {
     private readonly solidRegistry: SolidRegistry,
     private readonly moduleRef: ModuleRef,
     private readonly settingService: SettingService,
+    private readonly modelMetadataRepo: ModelMetadataRepository,
+    private readonly modelMetadataHelperService: ModelMetadataHelperService,
   ) { }
 
   private readonly logger = new Logger(SolidIntrospectService.name);
@@ -142,9 +146,33 @@ export class SolidIntrospectService implements OnApplicationBootstrap {
 
     // Register the core subscribers against all the configured database modules / datasources
     await this.bootstrapCoreTypeOrmSubscribers(solidDatabaseModules);
+    await this.cacheAuditableModels();
     await this.settingService.updateSettingsCache();
   }
 
+  private async cacheAuditableModels(): Promise<void> {
+    const models = await this.modelMetadataRepo.find({
+      where: { enableAuditTracking: true },
+      relations: { fields: true, module: true },
+    });
+
+    const auditableSet = new Set<string>();
+    for (const model of models) {
+      const allFields = await this.modelMetadataHelperService.loadFieldHierarchy(model.singularName);
+      const hasAuditableField = allFields.some(field =>
+        field.enableAuditTracking &&
+        !['mediaSingle', 'mediaMultiple', 'richText', 'json'].includes(field.type) &&
+        !(field.type === 'relation' && field.relationType === 'one-to-many')
+      );
+      if (hasAuditableField) {
+        auditableSet.add(model.singularName.toLowerCase());
+      }
+    }
+
+    this.solidRegistry.registerAuditableModels(auditableSet);
+    this.logger.debug(`Cached ${auditableSet.size} auditable model(s): ${[...auditableSet].join(', ')}`);
+  }
+
   async bootstrapCoreTypeOrmSubscribers(dbModules: Array<InstanceWrapper<any>>): Promise<void> {
     // Register core subscribers for each Solid database module
     for (const wrapper of dbModules) {

package/src/subscribers/audit.subscriber.ts

@@ -1,7 +1,6 @@
-import { forwardRef, Inject, Injectable, Scope } from '@nestjs/common';
-import { ModelMetadataHelperService } from 'src/helpers/model-metadata-helper.service';
+import { Injectable, Scope } from '@nestjs/common';
 import { lowerFirst } from 'src/helpers/string.helper';
-import { ModelMetadataRepository } from 'src/repository/model-metadata.repository';
+import { SolidRegistry } from 'src/helpers/solid-registry';
 import { DataSource, EntityMetadata, EntitySubscriberInterface, InsertEvent, RemoveEvent, UpdateEvent } from 'typeorm';
 import { ChatterMessageService } from '../services/chatter-message.service';
 
@@ -16,17 +15,9 @@ type DeferredCall =
 export class AuditSubscriber implements EntitySubscriberInterface {
     private dataSource: DataSource;
     constructor(
-        // @InjectDataSource()
-        // private readonly dataSource: DataSource,
         private readonly chatterMessageService: ChatterMessageService,
-        // @InjectRepository(ModelMetadata)
-        // private readonly modelMetadataRepo: Repository<ModelMetadata>,
-        @Inject(forwardRef(() => ModelMetadataRepository))
-        private readonly modelMetadataRepo: ModelMetadataRepository,
-        private readonly modelMetadataHelperService: ModelMetadataHelperService,
-    ) {
-        // this.dataSource.subscribers.push(this);
-    }
+        private readonly solidRegistry: SolidRegistry,
+    ) { }
 
     bindToDataSource(dataSource: DataSource) {
         this.dataSource = dataSource;
@@ -43,46 +34,12 @@ export class AuditSubscriber implements EntitySubscriberInterface {
         this.perTxn.set(qr, arr);
     }
 
-    private async shouldTrackAudit(entity: any, metadata: EntityMetadata): Promise<boolean> {
-        const model = await this.modelMetadataRepo.findOne({
-            where: {
-                singularName: lowerFirst(metadata.name)
-            },
-            relations: {
-                fields: true,
-                module: true
-            }
-        });
-
-        if (!model || !model.enableAuditTracking) {
-            return false;
-        }
-
-        const modelFields = await this.modelMetadataHelperService.loadFieldHierarchy(model.singularName)
-
-        const auditFields = modelFields.filter(field =>
-            field.enableAuditTracking &&
-            !['mediaSingle', 'mediaMultiple', 'richText', 'json'].includes(field.type) &&
-            !(field.type === 'relation' && field.relationType === 'one-to-many')
-        );
-
-        if (auditFields.length === 0) {
-            return false;
-        }
-
-        // if (!entity) {
-        //     console.warn(`[AuditSubscriber] Skipping audit for ${metadata.name} – entity is undefined or null`);
-        //     return false;
-        // }
-
-        return entity && auditFields.some(field => {
-            const fieldValue = entity[field.name];
-            return fieldValue !== undefined && fieldValue !== null;
-        });
+    private shouldTrackAudit(metadata: EntityMetadata): boolean {
+        return this.solidRegistry.isAuditableModel(lowerFirst(metadata.name));
     }
 
     async afterInsert(event: InsertEvent<any>) {
-        if (await this.shouldTrackAudit(event.entity, event.metadata)) {
+        if (this.shouldTrackAudit(event.metadata)) {
             // await this.chatterMessageService.postAuditMessageOnInsert(event.entity, event.metadata);
             this.enqueue(event, {
                 kind: 'insert',
@@ -92,7 +49,7 @@ export class AuditSubscriber implements EntitySubscriberInterface {
     }
 
     async afterUpdate(event: UpdateEvent<any>) {
-        if (await this.shouldTrackAudit(event.entity, event.metadata)) {
+        if (this.shouldTrackAudit(event.metadata)) {
             // await this.chatterMessageService.postAuditMessageOnUpdate(event.entity, event.metadata, event.databaseEntity, event.updatedColumns || []);
             this.enqueue(event, {
                 kind: 'update',
@@ -107,7 +64,7 @@ export class AuditSubscriber implements EntitySubscriberInterface {
     }
 
     async afterRemove(event: RemoveEvent<any>) {
-        if (await this.shouldTrackAudit(event.entity, event.metadata)) {
+        if (this.shouldTrackAudit(event.metadata)) {
             // await this.chatterMessageService.postAuditMessageOnDelete(event.entity, event.metadata, event.databaseEntity);
             this.enqueue(event, {
                 kind: 'delete',

package/src/subscribers/created-by-updated-by.subscriber.ts

@@ -1,11 +1,9 @@
 import { Injectable, Scope } from "@nestjs/common";
 import { InjectDataSource } from "@nestjs/typeorm";
-import { User } from "src/entities/user.entity";
-import { ActiveUserData } from "src/interfaces/active-user-data.interface";
 import { RequestContextService } from "src/services/request-context.service";
-import { DataSource, EntitySubscriberInterface, EventSubscriber, InsertEvent, UpdateEvent } from "typeorm";
+import { DataSource, EntitySubscriberInterface, InsertEvent, UpdateEvent } from "typeorm";
 
-@Injectable({scope: Scope.TRANSIENT})
+@Injectable({ scope: Scope.TRANSIENT })
 // @EventSubscriber()
 export class CreatedByUpdatedBySubscriber implements EntitySubscriberInterface {
     private dataSource: DataSource;
@@ -30,7 +28,7 @@ export class CreatedByUpdatedBySubscriber implements EntitySubscriberInterface {
         await this.stampUserField(event, false);
     }
 
-    private async stampUserField(event: InsertEvent<any> | UpdateEvent<any>, isInsert: boolean){
+    private async stampUserField(event: InsertEvent<any> | UpdateEvent<any>, isInsert: boolean) {
         if (!event.entity) {
             return;
         }
@@ -40,21 +38,29 @@ export class CreatedByUpdatedBySubscriber implements EntitySubscriberInterface {
             return;
         }
 
-        const loadedUser = await this.loadUser(activeUserOrUndefined as unknown as ActiveUserData);
+        // const loadedUser = await this.loadUser(activeUserOrUndefined as unknown as ActiveUserData);
+        // if (isInsert) {
+        //     event.entity.createdBy = loadedUser?.id;
+        //     event.entity.updatedBy = loadedUser?.id; // For insert, we set both createdBy and updatedBy to the same user
+        // }
+        // else {
+        //     event.entity.updatedBy = loadedUser?.id;
+        // }
+
         if (isInsert) {
-            event.entity.createdBy = loadedUser?.id;
-            event.entity.updatedBy = loadedUser?.id; // For insert, we set both createdBy and updatedBy to the same user
+            event.entity.createdBy = activeUserOrUndefined?.sub;
+            event.entity.updatedBy = activeUserOrUndefined?.sub; // For insert, we set both createdBy and updatedBy to the same user
         }
         else {
-            event.entity.updatedBy = loadedUser?.id;
+            event.entity.updatedBy = activeUserOrUndefined?.sub;
         }
     }
 
-    private async loadUser(activeUser: ActiveUserData): Promise<User> {
-        const userRepo = this.defaultDataSource.getRepository(User); // Assuming 'User' is the entity name for users in your application
-        const loadedUser = await userRepo.findOne({
-            where: { id: activeUser.sub }, // Assuming 'sub' is the user ID in the JWT token
-        });
-        return loadedUser;;
-    }
+    // private async loadUser(activeUser: ActiveUserData): Promise<User> {
+    //     const userRepo = this.defaultDataSource.getRepository(User); // Assuming 'User' is the entity name for users in your application
+    //     const loadedUser = await userRepo.findOne({
+    //         where: { id: activeUser.sub }, // Assuming 'sub' is the user ID in the JWT token
+    //     });
+    //     return loadedUser;;
+    // }
 }