@solidstarters/solid-core 1.2.158 → 1.2.160

package/src/solid-core.module.ts

@@ -283,6 +283,7 @@ import { Three60WhatsappQueueSubscriberDatabase } from './jobs/database/three60-
 import { Three60WhatsappService } from './services/whatsapp/Three60WhatsappService';
 import { ThrottlerStorageRedisService } from '@nest-lab/throttler-storage-redis/src/throttler-storage-redis.service';
 import { isRedisConfigured } from './helpers/environment.helper';
+import { UserRepository } from './repository/user.repository';
 
 
 @Global()
@@ -546,6 +547,7 @@ import { isRedisConfigured } from './helpers/environment.helper';
     RoleMetadataService,
     PermissionMetadataSeederService,
     UserService,
+    UserRepository,
     SettingService,
     ConcatComputedFieldProvider,
     FileStorageProvider,
@@ -615,6 +617,7 @@ import { isRedisConfigured } from './helpers/environment.helper';
     MailFactory,
     ChatterMessageRepository,
     ChatterMessageDetailsRepository,
+
   ],
   exports: [
     ModuleMetadataService,

package/src/subscribers/audit.subscriber.ts

@@ -3,6 +3,9 @@ import { InjectDataSource, InjectRepository } from '@nestjs/typeorm';
 import { DataSource, EntityMetadata, EntitySubscriberInterface, EventSubscriber, InsertEvent, RemoveEvent, Repository, UpdateEvent } from 'typeorm';
 import { ModelMetadata } from '../entities/model-metadata.entity';
 import { ChatterMessageService } from '../services/chatter-message.service';
+import { lowerFirst } from 'src/helpers/string.helper';
+import { ModelMetadataHelperService } from 'src/helpers/model-metadata-helper.service';
+
 @Injectable()
 @EventSubscriber()
 export class AuditSubscriber implements EntitySubscriberInterface {
@@ -13,6 +16,7 @@ export class AuditSubscriber implements EntitySubscriberInterface {
         private readonly chatterMessageService: ChatterMessageService,
         @InjectRepository(ModelMetadata)
         private readonly modelMetadataRepo: Repository<ModelMetadata>,
+        private readonly modelMetadataHelperService : ModelMetadataHelperService,
     ) {
         this.dataSource.subscribers.push(this);
     }
@@ -20,7 +24,7 @@ export class AuditSubscriber implements EntitySubscriberInterface {
     private async shouldTrackAudit(entity: any, metadata: EntityMetadata): Promise<boolean> {
         const model = await this.modelMetadataRepo.findOne({
             where: {
-                displayName: metadata.name
+                singularName: lowerFirst(metadata.name)
             },
             relations: {
                 fields: true,
@@ -32,7 +36,9 @@ export class AuditSubscriber implements EntitySubscriberInterface {
             return false;
         }
 
-        const auditFields = model.fields.filter(field =>
+        const modelFields = await this.modelMetadataHelperService.loadFieldHierarchy(model.singularName)
+
+        const auditFields = modelFields.filter(field =>
             field.enableAuditTracking &&
             !['mediaSingle', 'mediaMultiple', 'computed', 'richText', 'json'].includes(field.type) &&
             !(field.type === 'relation' && field.relationType === 'one-to-many')
@@ -56,7 +62,7 @@ export class AuditSubscriber implements EntitySubscriberInterface {
 
     async afterUpdate(event: UpdateEvent<any>) {
         if (await this.shouldTrackAudit(event.entity, event.metadata)) {
-            await this.chatterMessageService.postAuditMessageOnUpdate(event.entity, event.metadata, event.databaseEntity);
+            await this.chatterMessageService.postAuditMessageOnUpdate(event.entity, event.metadata, event.databaseEntity, event.updatedColumns || []);
         }
     }