@solidstarters/solid-core 1.2.157 → 1.2.159

package/dist/services/chatter-message.service.js

@@ -29,8 +29,10 @@ const chatter_message_details_entity_1 = require("../entities/chatter-message-de
 const model_metadata_entity_1 = require("../entities/model-metadata.entity");
 const request_context_service_1 = require("./request-context.service");
 const chatter_message_repository_1 = require("../repository/chatter-message.repository");
+const string_helper_1 = require("../helpers/string.helper");
+const model_metadata_helper_service_1 = require("../helpers/model-metadata-helper.service");
 let ChatterMessageService = class ChatterMessageService extends crud_service_1.CRUDService {
-    constructor(modelMetadataService, moduleMetadataService, configService, fileService, discoveryService, crudHelperService, entityManager, repo, chatterMessageDetailsRepo, moduleRef, modelMetadataRepo, requestContextService) {
+    constructor(modelMetadataService, moduleMetadataService, configService, fileService, discoveryService, crudHelperService, entityManager, repo, chatterMessageDetailsRepo, moduleRef, modelMetadataRepo, requestContextService, modelMetadataHelperService) {
         super(modelMetadataService, moduleMetadataService, configService, fileService, discoveryService, crudHelperService, entityManager, repo, 'chatterMessage', 'solid-core', moduleRef);
         this.modelMetadataService = modelMetadataService;
         this.moduleMetadataService = moduleMetadataService;
@@ -44,6 +46,7 @@ let ChatterMessageService = class ChatterMessageService extends crud_service_1.C
         this.moduleRef = moduleRef;
         this.modelMetadataRepo = modelMetadataRepo;
         this.requestContextService = requestContextService;
+        this.modelMetadataHelperService = modelMetadataHelperService;
     }
     async postMessage(postDto, files = []) {
         const chatterMessage = new chatter_message_entity_1.ChatterMessage();
@@ -88,7 +91,7 @@ let ChatterMessageService = class ChatterMessageService extends crud_service_1.C
         }
         const model = await this.modelMetadataRepo.findOne({
             where: {
-                displayName: metadata.name
+                singularName: (0, string_helper_1.lowerFirst)(metadata.name)
             },
             relations: {
                 fields: true,
@@ -130,13 +133,13 @@ let ChatterMessageService = class ChatterMessageService extends crud_service_1.C
             }
         }
     }
-    async postAuditMessageOnUpdate(entity, metadata, databaseEntity, messageQueue = false) {
+    async postAuditMessageOnUpdate(entity, metadata, databaseEntity, updatedColumns = [], messageQueue = false) {
         if (!databaseEntity || !entity) {
             return;
         }
         const model = await this.modelMetadataRepo.findOne({
             where: {
-                displayName: metadata.name
+                singularName: (0, string_helper_1.lowerFirst)(metadata.name)
             },
             relations: {
                 fields: true,
@@ -146,25 +149,50 @@ let ChatterMessageService = class ChatterMessageService extends crud_service_1.C
         if (!model || !model.enableAuditTracking) {
             return;
         }
-        const auditFields = model.fields.filter(field => field.enableAuditTracking &&
+        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'));
-        const relationFields = auditFields.filter(field => field.type === 'relation');
-        if (relationFields.length > 0) {
-            const populatedEntity = await this.entityManager.findOne(metadata.target, {
-                where: { id: databaseEntity.id },
-                relations: relationFields.map(field => field.name)
-            });
-            if (populatedEntity) {
-                databaseEntity = populatedEntity;
-            }
+        const updatedFieldNames = new Set(updatedColumns.map(col => col.propertyName));
+        const allNonRelationFields = auditFields.filter(field => field.type !== 'relation');
+        const allRelationFields = auditFields.filter(field => field.type === 'relation');
+        let potentialNonRelationFields = [];
+        if (updatedColumns.length > 0) {
+            potentialNonRelationFields = allNonRelationFields.filter(field => updatedFieldNames.has(field.name));
         }
-        const changedFields = auditFields.filter(field => {
+        else {
+            potentialNonRelationFields = allNonRelationFields;
+        }
+        const potentialRelationFields = allRelationFields;
+        const changedNonRelationFields = potentialNonRelationFields.filter(field => {
             const newValue = entity[field.name];
             const oldValue = databaseEntity[field.name];
             return this.hasValueChanged(newValue, oldValue);
         });
-        if (changedFields.length === 0) {
+        const changedRelationFields = [];
+        if (potentialRelationFields.length > 0) {
+            const populatedOldEntity = await this.populateRelationFields(databaseEntity, potentialRelationFields, metadata);
+            for (const field of potentialRelationFields) {
+                const newValue = entity[field.name];
+                const oldValue = populatedOldEntity[field.name];
+                if (this.hasRelationValueChanged(field, newValue, oldValue)) {
+                    changedRelationFields.push({
+                        field,
+                        newValue,
+                        oldValue
+                    });
+                }
+            }
+        }
+        const allChangedFields = [
+            ...changedNonRelationFields.map(field => ({
+                field,
+                newValue: entity[field.name],
+                oldValue: databaseEntity[field.name]
+            })),
+            ...changedRelationFields
+        ];
+        if (allChangedFields.length === 0) {
             return;
         }
         const activeUser = this.requestContextService.getActiveUser();
@@ -182,21 +210,21 @@ let ChatterMessageService = class ChatterMessageService extends crud_service_1.C
             chatterMessage.user = null;
         }
         const savedMessage = await this.repo.save(chatterMessage);
-        for (const field of changedFields) {
+        for (const { field, newValue, oldValue } of allChangedFields) {
             const messageDetail = new chatter_message_details_entity_1.ChatterMessageDetails();
             messageDetail.chatterMessage = savedMessage;
             messageDetail.fieldName = field.name;
-            messageDetail.oldValue = this.formatFieldValue(field, databaseEntity[field.name]);
-            messageDetail.newValue = this.formatFieldValue(field, entity[field.name]);
-            messageDetail.oldValueDisplay = this.formatFieldValueDisplay(field, databaseEntity[field.name]);
-            messageDetail.newValueDisplay = this.formatFieldValueDisplay(field, entity[field.name]);
+            messageDetail.oldValue = this.formatFieldValue(field, oldValue);
+            messageDetail.newValue = this.formatFieldValue(field, newValue);
+            messageDetail.oldValueDisplay = this.formatFieldValueDisplay(field, oldValue);
+            messageDetail.newValueDisplay = this.formatFieldValueDisplay(field, newValue);
             await this.chatterMessageDetailsRepo.save(messageDetail);
         }
     }
     async postAuditMessageOnDelete(entity, metadata, databaseEntity, messageQueue = false) {
         const model = await this.modelMetadataRepo.findOne({
             where: {
-                displayName: metadata.name
+                singularName: (0, string_helper_1.lowerFirst)(metadata.name)
             },
             relations: {
                 fields: true,
@@ -257,22 +285,118 @@ let ChatterMessageService = class ChatterMessageService extends crud_service_1.C
         return value.toString();
     }
     hasValueChanged(newValue, oldValue) {
-        if ((newValue === null || newValue === undefined) &&
-            (oldValue === null || oldValue === undefined)) {
+        if (newValue === oldValue) {
             return false;
         }
-        if (newValue === oldValue) {
+        if (newValue === null && oldValue === null) {
             return false;
         }
-        if (Array.isArray(newValue) && Array.isArray(oldValue)) {
-            return JSON.stringify(newValue) !== JSON.stringify(oldValue);
+        if (newValue === undefined && oldValue === undefined) {
+            return false;
+        }
+        if (newValue && oldValue && typeof newValue === 'object' && typeof oldValue === 'object') {
+            if (newValue.id !== undefined && oldValue.id !== undefined) {
+                return newValue.id !== oldValue.id;
+            }
+            if (Array.isArray(newValue) && Array.isArray(oldValue)) {
+                if (newValue.length !== oldValue.length) {
+                    return true;
+                }
+                const newIds = newValue.map(item => item.id || item).sort();
+                const oldIds = oldValue.map(item => item.id || item).sort();
+                return JSON.stringify(newIds) !== JSON.stringify(oldIds);
+            }
         }
-        if (typeof newValue === 'object' && newValue !== null &&
-            typeof oldValue === 'object' && oldValue !== null) {
+        if (Array.isArray(newValue) && Array.isArray(oldValue)) {
             return JSON.stringify(newValue) !== JSON.stringify(oldValue);
         }
         return true;
     }
+    hasRelationValueChanged(field, newValue, oldValue) {
+        if (newValue === oldValue) {
+            return false;
+        }
+        if ((newValue === null || newValue === undefined) && (oldValue === null || oldValue === undefined)) {
+            return false;
+        }
+        if (field.relationType === 'many-to-one') {
+            const newId = this.extractRelationId(newValue);
+            const oldId = this.extractRelationId(oldValue);
+            return newId !== oldId;
+        }
+        if (field.relationType === 'many-to-many' || field.relationType === 'manyToMany') {
+            const newIds = this.extractRelationIds(newValue);
+            const oldIds = this.extractRelationIds(oldValue);
+            if (newIds.length !== oldIds.length) {
+                return true;
+            }
+            newIds.sort();
+            oldIds.sort();
+            return JSON.stringify(newIds) !== JSON.stringify(oldIds);
+        }
+        return this.hasValueChanged(newValue, oldValue);
+    }
+    extractRelationId(value) {
+        if (value === null || value === undefined) {
+            return null;
+        }
+        if (typeof value === 'string' || typeof value === 'number') {
+            return value;
+        }
+        if (typeof value === 'object' && value.id !== undefined) {
+            return value.id;
+        }
+        return null;
+    }
+    extractRelationIds(value) {
+        if (!Array.isArray(value)) {
+            const id = this.extractRelationId(value);
+            return id !== null ? [id] : [];
+        }
+        return value.map(item => this.extractRelationId(item)).filter(id => id !== null);
+    }
+    async populateRelationFields(databaseEntity, relationFields, metadata) {
+        const populatedEntity = { ...databaseEntity };
+        for (const field of relationFields) {
+            const relationValue = databaseEntity[field.name];
+            if (relationValue === null || relationValue === undefined) {
+                populatedEntity[field.name] = relationValue;
+                continue;
+            }
+            const relationMetadata = metadata.relations.find(rel => rel.propertyName === field.name);
+            if (!relationMetadata) {
+                populatedEntity[field.name] = relationValue;
+                continue;
+            }
+            const targetEntity = relationMetadata.inverseEntityMetadata || relationMetadata.type;
+            if (field.relationType === 'many-to-one') {
+                const relationId = this.extractRelationId(relationValue);
+                if (relationId) {
+                    const relatedEntity = await this.entityManager.findOne(targetEntity, {
+                        where: { id: relationId }
+                    });
+                    populatedEntity[field.name] = relatedEntity;
+                }
+                else {
+                    populatedEntity[field.name] = relationValue;
+                }
+            }
+            else if (field.relationType === 'many-to-many' || field.relationType === 'manyToMany') {
+                const relationIds = this.extractRelationIds(relationValue);
+                if (relationIds.length > 0) {
+                    const relatedEntities = await this.entityManager.findByIds(targetEntity, relationIds);
+                    populatedEntity[field.name] = relatedEntities;
+                }
+                else {
+                    populatedEntity[field.name] = relationValue;
+                }
+            }
+            else {
+                populatedEntity[field.name] = relationValue;
+            }
+        }
+        return populatedEntity;
+    }
 };
 exports.ChatterMessageService = ChatterMessageService;
 exports.ChatterMessageService = ChatterMessageService = __decorate([
@@ -291,6 +415,7 @@ exports.ChatterMessageService = ChatterMessageService = __decorate([
         typeorm_2.Repository,
         core_1.ModuleRef,
         typeorm_2.Repository,
-        request_context_service_1.RequestContextService])
+        request_context_service_1.RequestContextService,
+        model_metadata_helper_service_1.ModelMetadataHelperService])
 ], ChatterMessageService);
 //# sourceMappingURL=chatter-message.service.js.map

package/dist/services/chatter-message.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"chatter-message.service.js","sourceRoot":"","sources":["../../src/services/chatter-message.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable } from '@nestjs/common';\nimport { InjectEntityManager, InjectRepository } from '@nestjs/typeorm';\nimport { DiscoveryService, ModuleRef  } from \"@nestjs/core\";\nimport { EntityManager, Repository, EntityMetadata } from 'typeorm';\n\nimport { CRUDService } from 'src/services/crud.service';\nimport { ModelMetadataService } from 'src/services/model-metadata.service';\nimport { ModuleMetadataService } from 'src/services/module-metadata.service';\nimport { ConfigService } from '@nestjs/config';\nimport { FileService } from 'src/services/file.service';\nimport { CrudHelperService } from 'src/services/crud-helper.service';\nimport { PostChatterMessageDto } from 'src/dtos/post-chatter-message.dto';\nimport { SolidRequestContextDto } from 'src/dtos/solid-request-context.dto';\nimport { ChatterMessage } from '../entities/chatter-message.entity';\nimport { getMediaStorageProvider } from './mediaStorageProviders';\nimport { MediaStorageProviderType } from '../dtos/create-media-storage-provider-metadata.dto';\nimport { ChatterMessageDetails } from '../entities/chatter-message-details.entity';\nimport { ModelMetadata } from 'src/entities/model-metadata.entity';\nimport { RequestContextService } from './request-context.service';\nimport { ChatterMessageRepository } from 'src/repository/chatter-message.repository';\n@Injectable()\nexport class ChatterMessageService extends CRUDService<ChatterMessage>{\n  constructor(\n    readonly modelMetadataService: ModelMetadataService,\n    readonly moduleMetadataService: ModuleMetadataService,\n    readonly configService: ConfigService,\n    readonly fileService: FileService,\n    readonly discoveryService: DiscoveryService,\n    readonly crudHelperService: CrudHelperService,\n    @InjectEntityManager()\n    readonly entityManager: EntityManager,\n    // @InjectRepository(ChatterMessage, 'default')\n    readonly repo: ChatterMessageRepository,\n    @InjectRepository(ChatterMessageDetails, 'default')\n    readonly chatterMessageDetailsRepo: Repository<ChatterMessageDetails>,\n    readonly moduleRef: ModuleRef,\n    @InjectRepository(ModelMetadata)\n    private readonly modelMetadataRepo: Repository<ModelMetadata>,\n    readonly requestContextService: RequestContextService\n ) {\n   super(modelMetadataService, moduleMetadataService,  configService, fileService,  discoveryService, crudHelperService,entityManager, repo, 'chatterMessage', 'solid-core', moduleRef);\n }\n\n async postMessage(postDto: PostChatterMessageDto, files: Express.Multer.File[] = []) {\n    const chatterMessage = new ChatterMessage();\n    chatterMessage.messageType = 'custom';\n    chatterMessage.messageSubType = postDto.messageSubType || 'post_message';\n    chatterMessage.messageBody = postDto.messageBody;\n    chatterMessage.coModelEntityId = postDto.coModelEntityId;\n    chatterMessage.coModelName = postDto.coModelName;\n    \n    const activeUser = this.requestContextService.getActiveUser();\n\n    if (activeUser) {\n        const userId = activeUser?.sub;\n        chatterMessage.user = { id: userId } as any;\n    } else {\n        chatterMessage.user = null;\n    }\n\n    const savedMessage = await this.repo.save(chatterMessage);\n\n    if (files && files.length > 0) {\n      const model = await this.modelMetadataService.findOneBySingularName('chatterMessage', {\n        fields: {\n          model: true,\n          mediaStorageProvider: true,\n        },\n        module: true,\n      });\n\n      const mediaFields = model.fields.filter(field => field.type === 'mediaSingle' || field.type === 'mediaMultiple');\n\n      for (const mediaField of mediaFields) {\n        const media = files.filter(multerFile => multerFile.fieldname === mediaField.name);\n        if (media.length > 0) {\n          const storageProviderMetadata = mediaField.mediaStorageProvider;\n          const storageProviderType = storageProviderMetadata.type as MediaStorageProviderType;\n          const storageProvider = await getMediaStorageProvider(this.moduleRef, storageProviderType);\n          await storageProvider.store(media, savedMessage, mediaField);\n        }\n      }\n    }\n\n    return savedMessage;\n }\n\n async postAuditMessageOnInsert(entity: any, metadata: EntityMetadata, messageQueue: boolean = false) {\n    if(!entity){\n        return;\n    }\n    const model = await this.modelMetadataRepo.findOne({\n        where: {\n            displayName: metadata.name\n        },\n        relations: {\n            fields: true,\n            module: true\n        }\n    });\n\n    if (!model || !model.enableAuditTracking) {\n        return;\n    }\n\n    const auditFields = model.fields.filter(field => \n        field.enableAuditTracking && \n        !['mediaSingle', 'mediaMultiple', 'computed', 'richText', 'json'].includes(field.type) &&\n        !(field.type === 'relation' && field.relationType === 'one-to-many')\n    );\n\n    const activeUser = this.requestContextService.getActiveUser();\n\n    const chatterMessage = new ChatterMessage();\n    chatterMessage.messageType = 'audit';\n    chatterMessage.messageSubType = 'insert';\n    chatterMessage.coModelEntityId = entity.id;\n    chatterMessage.coModelName = model.singularName;\n    chatterMessage.messageBody = `New ${model.displayName} created`;\n    \n    if (activeUser) {\n        const userId = activeUser?.sub;\n        chatterMessage.user = { id: userId } as any;\n    } else {\n        chatterMessage.user = null;\n    }\n\n    const savedMessage = await this.repo.save(chatterMessage);\n\n    for (const field of auditFields) {\n        const fieldValue = entity[field.name];\n        if (fieldValue !== undefined && fieldValue !== null && fieldValue !== '') {\n            const messageDetail = new ChatterMessageDetails();\n            messageDetail.chatterMessage = savedMessage;\n            messageDetail.fieldName = field.name;\n            messageDetail.oldValue = null;\n            messageDetail.oldValueDisplay = null;\n            messageDetail.newValue = this.formatFieldValue(field, fieldValue);\n            messageDetail.newValueDisplay = this.formatFieldValueDisplay(field, fieldValue);\n            await this.chatterMessageDetailsRepo.save(messageDetail);\n        }\n    }\n}\n\nasync postAuditMessageOnUpdate(entity: any, metadata: EntityMetadata, databaseEntity: any, messageQueue: boolean = false) {\n    if(!databaseEntity || !entity){\n        return;\n    }\n    const model = await this.modelMetadataRepo.findOne({\n        where: {\n            displayName: metadata.name\n        },\n        relations: {\n            fields: true,\n            module: true\n        }\n    });\n\n    if (!model || !model.enableAuditTracking) {\n        return;\n    }\n\n    const auditFields = model.fields.filter(field => \n        field.enableAuditTracking && \n        !['mediaSingle', 'mediaMultiple', 'computed', 'richText', 'json'].includes(field.type) &&\n        !(field.type === 'relation' && field.relationType === 'one-to-many')\n    );\n\n    const relationFields = auditFields.filter(field => \n        field.type === 'relation'\n    );\n    if (relationFields.length > 0) {\n        const populatedEntity = await this.entityManager.findOne(metadata.target, {\n            where: { id: databaseEntity.id },\n            relations: relationFields.map(field => field.name)\n        });\n        if (populatedEntity) {\n            databaseEntity = populatedEntity;\n        }\n    }\n    const changedFields = auditFields.filter(field => {\n        const newValue = entity[field.name];\n        const oldValue = databaseEntity[field.name];\n        return this.hasValueChanged(newValue, oldValue);\n    });\n    \n    if (changedFields.length === 0) {\n        return;\n    }\n    const activeUser = this.requestContextService.getActiveUser();\n\n    const chatterMessage = new ChatterMessage();\n    chatterMessage.messageType = 'audit';\n    chatterMessage.messageSubType = 'update';\n    chatterMessage.coModelEntityId = entity.id;\n    chatterMessage.coModelName = model.singularName;\n    chatterMessage.messageBody = `${model.displayName} updated`;\n    \n    if (activeUser) {\n        const userId = activeUser?.sub;\n        chatterMessage.user = { id: userId } as any;\n    } else {\n        chatterMessage.user = null;\n    }\n\n    const savedMessage = await this.repo.save(chatterMessage);\n\n    for (const field of changedFields) {\n        const messageDetail = new ChatterMessageDetails();\n        messageDetail.chatterMessage = savedMessage;\n        messageDetail.fieldName = field.name;\n        messageDetail.oldValue = this.formatFieldValue(field, databaseEntity[field.name]);\n        messageDetail.newValue = this.formatFieldValue(field, entity[field.name]);\n        messageDetail.oldValueDisplay = this.formatFieldValueDisplay(field, databaseEntity[field.name]);\n        messageDetail.newValueDisplay = this.formatFieldValueDisplay(field, entity[field.name]);\n        await this.chatterMessageDetailsRepo.save(messageDetail);\n    }\n}\n\nasync postAuditMessageOnDelete(entity: any, metadata: EntityMetadata, databaseEntity: any, messageQueue: boolean = false) {\n    const model = await this.modelMetadataRepo.findOne({\n        where: {\n            displayName: metadata.name\n        },\n        relations: {\n            fields: true,\n            module: true\n        }\n    });\n\n    if (!model || !model.enableAuditTracking) {\n        return;\n    }\n\n    const chatterMessage = new ChatterMessage();\n    chatterMessage.messageType = 'audit';\n    chatterMessage.messageSubType = 'delete';\n    chatterMessage.coModelEntityId = databaseEntity.id;\n    chatterMessage.coModelName = model.singularName;\n    chatterMessage.messageBody = `${model.displayName} deleted`;\n    \n    const activeUser = this.requestContextService.getActiveUser();\n\n    if (activeUser) {\n        const userId = activeUser?.sub;\n        chatterMessage.user = { id: userId } as any;\n    } else {\n        chatterMessage.user = null;\n    }\n\n    await this.repo.save(chatterMessage);\n}\n\nprivate formatFieldValue(field: any, value: any): string {\n    if (value === null || value === undefined) {\n        return '';\n    }\n\n    if (field.type === 'selectionStatic' || field.type === 'selectionDynamic') {\n        return `${value}`;\n    }\n\n    if (field.type === 'relation') {\n        if (field.relationType === \"many-to-one\") {\n            return value.id;\n        }\n        if (field.relationType === 'manyToMany') {\n            return value.map(item => item.id).join(', ');\n        }\n    }\n\n\n    return value.toString();\n}\n\nprivate formatFieldValueDisplay(field: any, value: any): string {\n    if (value === null || value === undefined) {\n        return '';\n    }\n\n    if (field.type === 'selectionStatic' || field.type === 'selectionDynamic') {\n        return `${value}`;\n    }\n\n    if (field.type === 'relation') {\n        if (field.relationType === \"many-to-one\") {\n            return value.name;\n        }\n        if (field.relationType === 'many-toMany') {\n            return value.map(item => item.name).join(', ');\n        }\n    }\n\n\n    return value.toString();\n}\n\nprivate hasValueChanged(newValue: any, oldValue: any): boolean {\n    if (\n        (newValue === null || newValue === undefined) &&\n        (oldValue === null || oldValue === undefined)\n    ) {\n        return false;\n    }\n\n    if (newValue === oldValue) {\n        return false;\n    }\n\n    if (Array.isArray(newValue) && Array.isArray(oldValue)) {\n        return JSON.stringify(newValue) !== JSON.stringify(oldValue);\n    }\n\n    if (\n        typeof newValue === 'object' && newValue !== null &&\n        typeof oldValue === 'object' && oldValue !== null\n    ) {\n        return JSON.stringify(newValue) !== JSON.stringify(oldValue);\n    }\n\n    return true;\n}\n}\n"]}
+{"version":3,"file":"chatter-message.service.js","sourceRoot":"","sources":["../../src/services/chatter-message.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable } from '@nestjs/common';\nimport { InjectEntityManager, InjectRepository } from '@nestjs/typeorm';\nimport { DiscoveryService, ModuleRef  } from \"@nestjs/core\";\nimport { EntityManager, Repository, EntityMetadata } from 'typeorm';\n\nimport { CRUDService } from 'src/services/crud.service';\nimport { ModelMetadataService } from 'src/services/model-metadata.service';\nimport { ModuleMetadataService } from 'src/services/module-metadata.service';\nimport { ConfigService } from '@nestjs/config';\nimport { FileService } from 'src/services/file.service';\nimport { CrudHelperService } from 'src/services/crud-helper.service';\nimport { PostChatterMessageDto } from 'src/dtos/post-chatter-message.dto';\nimport { SolidRequestContextDto } from 'src/dtos/solid-request-context.dto';\nimport { ChatterMessage } from '../entities/chatter-message.entity';\nimport { getMediaStorageProvider } from './mediaStorageProviders';\nimport { MediaStorageProviderType } from '../dtos/create-media-storage-provider-metadata.dto';\nimport { ChatterMessageDetails } from '../entities/chatter-message-details.entity';\nimport { ModelMetadata } from 'src/entities/model-metadata.entity';\nimport { RequestContextService } from './request-context.service';\nimport { ChatterMessageRepository } from 'src/repository/chatter-message.repository';\nimport { lowerFirst } from 'src/helpers/string.helper';\nimport { ModelMetadataHelperService } from 'src/helpers/model-metadata-helper.service';\n@Injectable()\nexport class ChatterMessageService extends CRUDService<ChatterMessage>{\n  constructor(\n    readonly modelMetadataService: ModelMetadataService,\n    readonly moduleMetadataService: ModuleMetadataService,\n    readonly configService: ConfigService,\n    readonly fileService: FileService,\n    readonly discoveryService: DiscoveryService,\n    readonly crudHelperService: CrudHelperService,\n    @InjectEntityManager()\n    readonly entityManager: EntityManager,\n    // @InjectRepository(ChatterMessage, 'default')\n    readonly repo: ChatterMessageRepository,\n    @InjectRepository(ChatterMessageDetails, 'default')\n    readonly chatterMessageDetailsRepo: Repository<ChatterMessageDetails>,\n    readonly moduleRef: ModuleRef,\n    @InjectRepository(ModelMetadata)\n    private readonly modelMetadataRepo: Repository<ModelMetadata>,\n    readonly requestContextService: RequestContextService,\n    private readonly modelMetadataHelperService: ModelMetadataHelperService,\n ) {\n   super(modelMetadataService, moduleMetadataService,  configService, fileService,  discoveryService, crudHelperService,entityManager, repo, 'chatterMessage', 'solid-core', moduleRef);\n }\n\n async postMessage(postDto: PostChatterMessageDto, files: Express.Multer.File[] = []) {\n    const chatterMessage = new ChatterMessage();\n    chatterMessage.messageType = 'custom';\n    chatterMessage.messageSubType = postDto.messageSubType || 'post_message';\n    chatterMessage.messageBody = postDto.messageBody;\n    chatterMessage.coModelEntityId = postDto.coModelEntityId;\n    chatterMessage.coModelName = postDto.coModelName;\n    \n    const activeUser = this.requestContextService.getActiveUser();\n\n    if (activeUser) {\n        const userId = activeUser?.sub;\n        chatterMessage.user = { id: userId } as any;\n    } else {\n        chatterMessage.user = null;\n    }\n\n    const savedMessage = await this.repo.save(chatterMessage);\n\n    if (files && files.length > 0) {\n      const model = await this.modelMetadataService.findOneBySingularName('chatterMessage', {\n        fields: {\n          model: true,\n          mediaStorageProvider: true,\n        },\n        module: true,\n      });\n\n      const mediaFields = model.fields.filter(field => field.type === 'mediaSingle' || field.type === 'mediaMultiple');\n\n      for (const mediaField of mediaFields) {\n        const media = files.filter(multerFile => multerFile.fieldname === mediaField.name);\n        if (media.length > 0) {\n          const storageProviderMetadata = mediaField.mediaStorageProvider;\n          const storageProviderType = storageProviderMetadata.type as MediaStorageProviderType;\n          const storageProvider = await getMediaStorageProvider(this.moduleRef, storageProviderType);\n          await storageProvider.store(media, savedMessage, mediaField);\n        }\n      }\n    }\n\n    return savedMessage;\n }\n\n async postAuditMessageOnInsert(entity: any, metadata: EntityMetadata, messageQueue: boolean = false) {\n    if(!entity){\n        return;\n    }\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;\n    }\n\n    const auditFields = model.fields.filter(field => \n        field.enableAuditTracking && \n        !['mediaSingle', 'mediaMultiple', 'computed', 'richText', 'json'].includes(field.type) &&\n        !(field.type === 'relation' && field.relationType === 'one-to-many')\n    );\n\n    const activeUser = this.requestContextService.getActiveUser();\n\n    const chatterMessage = new ChatterMessage();\n    chatterMessage.messageType = 'audit';\n    chatterMessage.messageSubType = 'insert';\n    chatterMessage.coModelEntityId = entity.id;\n    chatterMessage.coModelName = model.singularName;\n    chatterMessage.messageBody = `New ${model.displayName} created`;\n    \n    if (activeUser) {\n        const userId = activeUser?.sub;\n        chatterMessage.user = { id: userId } as any;\n    } else {\n        chatterMessage.user = null;\n    }\n\n    const savedMessage = await this.repo.save(chatterMessage);\n\n    for (const field of auditFields) {\n        const fieldValue = entity[field.name];\n        if (fieldValue !== undefined && fieldValue !== null && fieldValue !== '') {\n            const messageDetail = new ChatterMessageDetails();\n            messageDetail.chatterMessage = savedMessage;\n            messageDetail.fieldName = field.name;\n            messageDetail.oldValue = null;\n            messageDetail.oldValueDisplay = null;\n            messageDetail.newValue = this.formatFieldValue(field, fieldValue);\n            messageDetail.newValueDisplay = this.formatFieldValueDisplay(field, fieldValue);\n            await this.chatterMessageDetailsRepo.save(messageDetail);\n        }\n    }\n}\n\nasync postAuditMessageOnUpdate(entity: any, metadata: EntityMetadata, databaseEntity: any, updatedColumns: any[] = [], messageQueue: boolean = false) {\n    if(!databaseEntity || !entity){\n        return;\n    }\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;\n    }\n    \n    const modelFields = await this.modelMetadataHelperService.loadFieldHierarchy(model.singularName)\n\n    const auditFields = modelFields.filter(field => \n        field.enableAuditTracking && \n        !['mediaSingle', 'mediaMultiple', 'computed', 'richText', 'json'].includes(field.type) &&\n        !(field.type === 'relation' && field.relationType === 'one-to-many')\n    );\n\n    const updatedFieldNames = new Set(updatedColumns.map(col => col.propertyName));\n    \n    const allNonRelationFields = auditFields.filter(field => field.type !== 'relation');\n    const allRelationFields = auditFields.filter(field => field.type === 'relation');\n\n    let potentialNonRelationFields = [];\n    \n    if (updatedColumns.length > 0) {\n        potentialNonRelationFields = allNonRelationFields.filter(field => \n            updatedFieldNames.has(field.name)\n        );\n    } else {\n        potentialNonRelationFields = allNonRelationFields;\n    }\n\n    const potentialRelationFields = allRelationFields;\n\n    const changedNonRelationFields = potentialNonRelationFields.filter(field => {\n        const newValue = entity[field.name];\n        const oldValue = databaseEntity[field.name];\n        return this.hasValueChanged(newValue, oldValue);\n    });\n\n    const changedRelationFields = [];\n    if (potentialRelationFields.length > 0) {\n        const populatedOldEntity = await this.populateRelationFields(databaseEntity, potentialRelationFields, metadata);\n\n        for (const field of potentialRelationFields) {\n            const newValue = entity[field.name];\n            const oldValue = populatedOldEntity[field.name];\n            \n            if (this.hasRelationValueChanged(field, newValue, oldValue)) {\n                changedRelationFields.push({\n                    field,\n                    newValue,\n                    oldValue\n                });\n            }\n        }\n    }\n\n\n    const allChangedFields = [\n        ...changedNonRelationFields.map(field => ({\n            field,\n            newValue: entity[field.name],\n            oldValue: databaseEntity[field.name]\n        })),\n        ...changedRelationFields\n    ];\n    \n    if (allChangedFields.length === 0) {\n        return;\n    }\n\n    const activeUser = this.requestContextService.getActiveUser();\n\n    const chatterMessage = new ChatterMessage();\n    chatterMessage.messageType = 'audit';\n    chatterMessage.messageSubType = 'update';\n    chatterMessage.coModelEntityId = entity.id;\n    chatterMessage.coModelName = model.singularName;\n    chatterMessage.messageBody = `${model.displayName} updated`;\n    \n    if (activeUser) {\n        const userId = activeUser?.sub;\n        chatterMessage.user = { id: userId } as any;\n    } else {\n        chatterMessage.user = null;\n    }\n\n    const savedMessage = await this.repo.save(chatterMessage);\n\n    for (const { field, newValue, oldValue } of allChangedFields) {\n        const messageDetail = new ChatterMessageDetails();\n        messageDetail.chatterMessage = savedMessage;\n        messageDetail.fieldName = field.name;\n        messageDetail.oldValue = this.formatFieldValue(field, oldValue);\n        messageDetail.newValue = this.formatFieldValue(field, newValue);\n        messageDetail.oldValueDisplay = this.formatFieldValueDisplay(field, oldValue);\n        messageDetail.newValueDisplay = this.formatFieldValueDisplay(field, newValue);\n        await this.chatterMessageDetailsRepo.save(messageDetail);\n    }\n}\n\nasync postAuditMessageOnDelete(entity: any, metadata: EntityMetadata, databaseEntity: any, messageQueue: boolean = false) {\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;\n    }\n\n    const chatterMessage = new ChatterMessage();\n    chatterMessage.messageType = 'audit';\n    chatterMessage.messageSubType = 'delete';\n    chatterMessage.coModelEntityId = databaseEntity.id;\n    chatterMessage.coModelName = model.singularName;\n    chatterMessage.messageBody = `${model.displayName} deleted`;\n    \n    const activeUser = this.requestContextService.getActiveUser();\n\n    if (activeUser) {\n        const userId = activeUser?.sub;\n        chatterMessage.user = { id: userId } as any;\n    } else {\n        chatterMessage.user = null;\n    }\n\n    await this.repo.save(chatterMessage);\n}\n\nprivate formatFieldValue(field: any, value: any): string {\n    if (value === null || value === undefined) {\n        return '';\n    }\n\n    if (field.type === 'selectionStatic' || field.type === 'selectionDynamic') {\n        return `${value}`;\n    }\n\n    if (field.type === 'relation') {\n        if (field.relationType === \"many-to-one\") {\n            return value.id;\n        }\n        if (field.relationType === 'manyToMany') {\n            return value.map(item => item.id).join(', ');\n        }\n    }\n\n\n    return value.toString();\n}\n\nprivate formatFieldValueDisplay(field: any, value: any): string {\n    if (value === null || value === undefined) {\n        return '';\n    }\n\n    if (field.type === 'selectionStatic' || field.type === 'selectionDynamic') {\n        return `${value}`;\n    }\n\n    if (field.type === 'relation') {\n        if (field.relationType === \"many-to-one\") {\n            return value.name;\n        }\n        if (field.relationType === 'many-toMany') {\n            return value.map(item => item.name).join(', ');\n        }\n    }\n\n\n    return value.toString();\n}\n\nprivate hasValueChanged(newValue: any, oldValue: any): boolean {\n    if (newValue === oldValue) {\n        return false;\n    }\n\n    if (newValue === null && oldValue === null) {\n        return false;\n    }\n\n    if (newValue === undefined && oldValue === undefined) {\n        return false;\n    }\n\n    if (newValue && oldValue && typeof newValue === 'object' && typeof oldValue === 'object') {\n        if (newValue.id !== undefined && oldValue.id !== undefined) {\n            return newValue.id !== oldValue.id;\n        }\n        \n        if (Array.isArray(newValue) && Array.isArray(oldValue)) {\n            if (newValue.length !== oldValue.length) {\n                return true;\n            }\n            const newIds = newValue.map(item => item.id || item).sort();\n            const oldIds = oldValue.map(item => item.id || item).sort();\n            return JSON.stringify(newIds) !== JSON.stringify(oldIds);\n        }\n    }\n\n    if (Array.isArray(newValue) && Array.isArray(oldValue)) {\n        return JSON.stringify(newValue) !== JSON.stringify(oldValue);\n    }\n\n    return true;\n}\n\nprivate hasRelationValueChanged(field: any, newValue: any, oldValue: any): boolean {\n    if (newValue === oldValue) {\n        return false;\n    }\n    \n    if ((newValue === null || newValue === undefined) && (oldValue === null || oldValue === undefined)) {\n        return false;\n    }\n\n    if (field.relationType === 'many-to-one') {\n        const newId = this.extractRelationId(newValue);\n        const oldId = this.extractRelationId(oldValue);\n        return newId !== oldId;\n    }\n\n    if (field.relationType === 'many-to-many' || field.relationType === 'manyToMany') {\n        const newIds = this.extractRelationIds(newValue);\n        const oldIds = this.extractRelationIds(oldValue);\n        \n        if (newIds.length !== oldIds.length) {\n            return true;\n        }\n        \n        newIds.sort();\n        oldIds.sort();\n        \n        return JSON.stringify(newIds) !== JSON.stringify(oldIds);\n    }\n\n    return this.hasValueChanged(newValue, oldValue);\n}\n\nprivate extractRelationId(value: any): any {\n    if (value === null || value === undefined) {\n        return null;\n    }\n    \n    if (typeof value === 'string' || typeof value === 'number') {\n        return value;\n    }\n    \n    if (typeof value === 'object' && value.id !== undefined) {\n        return value.id;\n    }\n    \n    return null;\n}\n\nprivate extractRelationIds(value: any): any[] {\n    if (!Array.isArray(value)) {\n        const id = this.extractRelationId(value);\n        return id !== null ? [id] : [];\n    }\n    \n    return value.map(item => this.extractRelationId(item)).filter(id => id !== null);\n}\n\nprivate async populateRelationFields(databaseEntity: any, relationFields: any[], metadata: EntityMetadata): Promise<any> {\n    const populatedEntity = { ...databaseEntity };\n    \n    for (const field of relationFields) {\n        const relationValue = databaseEntity[field.name];\n        \n        if (relationValue === null || relationValue === undefined) {\n            populatedEntity[field.name] = relationValue;\n            continue;\n        }\n\n        const relationMetadata = metadata.relations.find(rel => rel.propertyName === field.name);\n        if (!relationMetadata) {\n            populatedEntity[field.name] = relationValue;\n            continue;\n        }\n\n        const targetEntity = relationMetadata.inverseEntityMetadata || relationMetadata.type;\n        \n        if (field.relationType === 'many-to-one') {\n            const relationId = this.extractRelationId(relationValue);\n            if (relationId) {\n                const relatedEntity = await this.entityManager.findOne(targetEntity as any, {\n                    where: { id: relationId }\n                });\n                populatedEntity[field.name] = relatedEntity;\n            } else {\n                populatedEntity[field.name] = relationValue; \n            }\n        } else if (field.relationType === 'many-to-many' || field.relationType === 'manyToMany') {\n            const relationIds = this.extractRelationIds(relationValue);\n            if (relationIds.length > 0) {\n                const relatedEntities = await this.entityManager.findByIds(targetEntity as any, relationIds);\n                populatedEntity[field.name] = relatedEntities;\n            } else {\n                populatedEntity[field.name] = relationValue; \n            }\n        } else {\n            populatedEntity[field.name] = relationValue;\n        }\n    }\n    \n    return populatedEntity;\n}\n}\n"]}

package/dist/services/crud-helper.service.d.ts

@@ -1,17 +1,21 @@
-import { SelectQueryBuilder } from "typeorm";
+import { SelectQueryBuilder, WhereExpressionBuilder } from "typeorm";
 import { BasicFilterDto } from "../dtos/basic-filters.dto";
 import { ActiveUserData } from "src/interfaces/active-user-data.interface";
+export declare enum FilterCombinator {
+    AND = "$and",
+    OR = "$or"
+}
 export declare class CrudHelperService {
     constructor();
     private readonly logger;
     private orderOptions;
-    private applyFilters;
+    applyFilters(qb: WhereExpressionBuilder, filters: any, alias: string, selectQb: SelectQueryBuilder<any>): void;
     private buildOperatorQuery;
     private normalizeObjectKeys;
     normalize(value: string | string[]): string[];
     private isRelationJoined;
     private hasJoins;
-    buildFilterQuery(qb: SelectQueryBuilder<any>, basicFilterDto: BasicFilterDto, entityAlias: string, internationalisation?: boolean, draftPublishWorkflow?: boolean, moduleRef?: any): SelectQueryBuilder<any>;
+    buildFilterQuery(qb: SelectQueryBuilder<any>, basicFilterDto: BasicFilterDto, entityAlias: string, internationalisation?: boolean, draftPublishWorkflow?: boolean, moduleRef?: any, filterCombinator?: FilterCombinator): SelectQueryBuilder<any>;
     additionalRelationsRequiredForMediaPopulation(normalizedPopulateMedia: string[]): string[];
     private buildPopulateQuery;
     private buildJoinQueryForRelation;

package/dist/services/crud-helper.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"crud-helper.service.d.ts","sourceRoot":"","sources":["../../src/services/crud-helper.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,kBAAkB,EAA0B,MAAM,SAAS,CAAC;AAC/E,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAE3D,OAAO,EAAE,cAAc,EAAE,MAAM,2CAA2C,CAAC;AAM3E,qBAAa,iBAAiB;;IAG1B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAsC;IAE7D,OAAO,CAAC,YAAY;IAYpB,OAAO,CAAC,YAAY;IAuCpB,OAAO,CAAC,kBAAkB;IAwE1B,OAAO,CAAC,mBAAmB;IAU3B,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,MAAM,EAAE;IAK7C,OAAO,CAAC,gBAAgB;IAIxB,OAAO,CAAC,QAAQ;IAIhB,gBAAgB,CAAC,EAAE,EAAE,kBAAkB,CAAC,GAAG,CAAC,EAAE,cAAc,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,EAAE,oBAAoB,CAAC,EAAE,OAAO,EAAE,oBAAoB,CAAC,EAAE,OAAO,EAAC,SAAS,CAAC,EAAC,GAAG,GAAG,kBAAkB,CAAC,GAAG,CAAC;IAiG1M,6CAA6C,CAAC,uBAAuB,EAAE,MAAM,EAAE;IAW/E,OAAO,CAAC,kBAAkB;IAO1B,OAAO,CAAC,yBAAyB;IAqBjC,OAAO,CAAC,kBAAkB;IAS1B,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;IAIxC,mBAAmB,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO;IAIxD,yBAAyB,CAAC,aAAa,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM;IAIvE,wBAAwB,CAAC,EAAE,EAAE,kBAAkB,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,GAAG,kBAAkB,CAAC,GAAG,CAAC;IAazG,YAAY,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM;IAO/C,kBAAkB,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG;;;;IAO5D,eAAe,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM;;;IAenC,mBAAmB,CAAC,EAAE,EAAE,kBAAkB,CAAC,GAAG,CAAC,EAAE,cAAc,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM;IA0B1G,wBAAwB,eAAgB,cAAc,aAAa,MAAM,aAIxE;IAED,yBAAyB,eAAgB,cAAc,aAAa,MAAM,aAIzE;IAED,0BAA0B,eAAgB,cAAc,aAAa,MAAM,aAI1E;IAED,0BAA0B,eAAgB,cAAc,aAAa,MAAM,aAI1E;IACD,0BAA0B,eAAgB,cAAc,aAAa,MAAM,aAI1E;IACD,2BAA2B,eAAgB,cAAc,aAAa,MAAM,aAI3E;CAIJ"}
+{"version":3,"file":"crud-helper.service.d.ts","sourceRoot":"","sources":["../../src/services/crud-helper.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,kBAAkB,EAAE,sBAAsB,EAAE,MAAM,SAAS,CAAC;AAC/E,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAE3D,OAAO,EAAE,cAAc,EAAE,MAAM,2CAA2C,CAAC;AAK3E,oBAAY,gBAAgB;IACxB,GAAG,SAAS;IACZ,EAAE,QAAQ;CACb;AAED,qBAAa,iBAAiB;;IAG1B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAsC;IAE7D,OAAO,CAAC,YAAY;IAYpB,YAAY,CAAC,EAAE,EAAE,sBAAsB,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,MAAiB,EAAE,QAAQ,EAAE,kBAAkB,CAAC,GAAG,CAAC;IAuClH,OAAO,CAAC,kBAAkB;IAwE1B,OAAO,CAAC,mBAAmB;IAU3B,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,MAAM,EAAE;IAK7C,OAAO,CAAC,gBAAgB;IAIxB,OAAO,CAAC,QAAQ;IAIhB,gBAAgB,CACZ,EAAE,EAAE,kBAAkB,CAAC,GAAG,CAAC,EAC3B,cAAc,EAAE,cAAc,EAC9B,WAAW,EAAE,MAAM,EACnB,oBAAoB,CAAC,EAAE,OAAO,EAC9B,oBAAoB,CAAC,EAAE,OAAO,EAC9B,SAAS,CAAC,EAAE,GAAG,EACf,gBAAgB,GAAE,gBAAuC,GAC1D,kBAAkB,CAAC,GAAG,CAAC;IAuG1B,6CAA6C,CAAC,uBAAuB,EAAE,MAAM,EAAE;IAW/E,OAAO,CAAC,kBAAkB;IAO1B,OAAO,CAAC,yBAAyB;IAqBjC,OAAO,CAAC,kBAAkB;IAS1B,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;IAIxC,mBAAmB,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO;IAIxD,yBAAyB,CAAC,aAAa,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM;IAIvE,wBAAwB,CAAC,EAAE,EAAE,kBAAkB,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,GAAG,kBAAkB,CAAC,GAAG,CAAC;IAazG,YAAY,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM;IAO/C,kBAAkB,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG;;;;IAO5D,eAAe,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM;;;IAenC,mBAAmB,CAAC,EAAE,EAAE,kBAAkB,CAAC,GAAG,CAAC,EAAE,cAAc,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM;IA0B1G,wBAAwB,eAAgB,cAAc,aAAa,MAAM,aAIxE;IAED,yBAAyB,eAAgB,cAAc,aAAa,MAAM,aAIzE;IAED,0BAA0B,eAAgB,cAAc,aAAa,MAAM,aAI1E;IAED,0BAA0B,eAAgB,cAAc,aAAa,MAAM,aAI1E;IACD,0BAA0B,eAAgB,cAAc,aAAa,MAAM,aAI1E;IACD,2BAA2B,eAAgB,cAAc,aAAa,MAAM,aAI3E;CAIJ"}

package/dist/services/crud-helper.service.js

@@ -1,11 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CrudHelperService = void 0;
+exports.CrudHelperService = exports.FilterCombinator = void 0;
 const typeorm_1 = require("typeorm");
 const strings_1 = require("@angular-devkit/core/src/utils/strings");
 const solid_registry_1 = require("../helpers/solid-registry");
 const common_1 = require("@nestjs/common");
 const error_messages_1 = require("../constants/error-messages");
+var FilterCombinator;
+(function (FilterCombinator) {
+    FilterCombinator["AND"] = "$and";
+    FilterCombinator["OR"] = "$or";
+})(FilterCombinator || (exports.FilterCombinator = FilterCombinator = {}));
 class CrudHelperService {
     constructor() {
         this.logger = new common_1.Logger(CrudHelperService.name);
@@ -174,7 +179,7 @@ class CrudHelperService {
     hasJoins(queryBuilder) {
         return queryBuilder.expressionMap.joinAttributes.length > 0;
     }
-    buildFilterQuery(qb, basicFilterDto, entityAlias, internationalisation, draftPublishWorkflow, moduleRef) {
+    buildFilterQuery(qb, basicFilterDto, entityAlias, internationalisation, draftPublishWorkflow, moduleRef, filterCombinator = FilterCombinator.AND) {
         let { limit, offset, showSoftDeleted, filters } = basicFilterDto;
         const { fields, sort, groupBy, populate = [], populateMedia = [], locale, status } = basicFilterDto;
         const normalizedFields = this.normalize(fields);
@@ -191,9 +196,16 @@ class CrudHelperService {
             this.buildPopulateQuery(normalizedPopulate, entityAlias, qb);
         }
         if (filters) {
-            qb.andWhere(new typeorm_1.Brackets(whereQb => {
-                this.applyFilters(whereQb, filters, entityAlias, qb);
-            }));
+            if (filterCombinator === FilterCombinator.AND) {
+                qb.andWhere(new typeorm_1.Brackets(whereQb => {
+                    this.applyFilters(whereQb, filters, entityAlias, qb);
+                }));
+            }
+            else if (filterCombinator === FilterCombinator.OR) {
+                qb.orWhere(new typeorm_1.Brackets(whereQb => {
+                    this.applyFilters(whereQb, filters, entityAlias, qb);
+                }));
+            }
         }
         let finalLocale = locale;
         if (internationalisation) {