@solidxai/core 0.1.13-beta.2 → 0.1.13-beta.21

package/dist/services/chatter-message.service.d.ts

@@ -10,9 +10,13 @@ import { FieldMetadataRepository } from '../repository/field-metadata.repository
 import { MediaRepository } from '../repository/media.repository';
 import { ModelMetadataRepository } from '../repository/model-metadata.repository';
 import { CRUDService } from '../services/crud.service';
+import { BasicFilterDto } from '../dtos/basic-filters.dto';
 import { ChatterMessage } from '../entities/chatter-message.entity';
 import { RequestContextService } from './request-context.service';
 import { PublisherFactory } from './queues/publisher-factory.service';
+export interface PostChatterMessageOptions {
+    createdAt?: Date;
+}
 export declare class ChatterMessageService extends CRUDService<ChatterMessage> {
     readonly entityManager: EntityManager;
     readonly repo: ChatterMessageRepository;
@@ -31,14 +35,25 @@ export declare class ChatterMessageService extends CRUDService<ChatterMessage> {
     private resolveMessageUserId;
     private resolveMessageUser;
     private stampMessageAuditFields;
+    private trimMessageUser;
+    private trimMessageUsers;
+    find(basicFilterDto: BasicFilterDto, solidRequestContext?: any): Promise<any>;
+    findOne(id: number, query?: any, solidRequestContext?: any): Promise<ChatterMessage>;
     private isEditableCustomNoteMessage;
     private parseAttachmentIds;
     private parseMessageBodyMentions;
     private renderMentionTokens;
+    private validateChatterMediaFiles;
+    private validateChatterAttachmentsForFields;
     private publishChatterMentionNotifications;
+    getMentionableUsers(search?: string, limit?: number): Promise<Array<{
+        id: number;
+        username: string;
+        fullName: string;
+    }>>;
     markCompleted(id: number): Promise<ChatterMessage>;
     updateCustomNoteMessage(id: number, updateDto: UpdateChatterNoteMessageDto, files?: Express.Multer.File[]): Promise<ChatterMessage>;
-    postMessage(postDto: PostChatterMessageDto, files?: Express.Multer.File[]): Promise<ChatterMessage>;
+    postMessage(postDto: PostChatterMessageDto, files?: Express.Multer.File[], options?: PostChatterMessageOptions): Promise<ChatterMessage>;
     postAuditMessageOnInsert(entity: any, modelName: string, messageQueue?: boolean, userId?: number | null): Promise<void>;
     postAuditMessageOnUpdate(entity: any, modelName: string, databaseEntity: any, updatedColumns?: any[], messageQueue?: boolean, userId?: number | null): Promise<void>;
     postAuditMessageOnDelete(modelName: string, databaseEntity: any, messageQueue?: boolean, userId?: number | null): Promise<void>;

package/dist/services/chatter-message.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chatter-message.service.d.ts","sourceRoot":"","sources":["../../src/services/chatter-message.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"chatter-message.service.d.ts","sourceRoot":"","sources":["../../src/services/chatter-message.service.ts"],"names":[],"mappings":"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"}

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

@@ -21,7 +21,9 @@ const typeorm_1 = require("@nestjs/typeorm");
 const typeorm_2 = require("typeorm");
 const strings_1 = require("@angular-devkit/core/src/utils/strings");
 const chatter_message_constants_1 = require("../constants/chatter-message.constants");
+const media_file_types_1 = require("../constants/media-file-types");
 const error_messages_1 = require("../constants/error-messages");
+const MediaFieldCrudManager_1 = require("../helpers/field-crud-managers/MediaFieldCrudManager");
 const model_metadata_helper_service_1 = require("../helpers/model-metadata-helper.service");
 const string_helper_1 = require("../helpers/string.helper");
 const chatter_message_details_repository_1 = require("../repository/chatter-message-details.repository");
@@ -32,6 +34,7 @@ const model_metadata_repository_1 = require("../repository/model-metadata.reposi
 const crud_service_1 = require("./crud.service");
 const chatter_message_details_entity_1 = require("../entities/chatter-message-details.entity");
 const chatter_message_entity_1 = require("../entities/chatter-message.entity");
+const user_entity_1 = require("../entities/user.entity");
 const mediaStorageProviders_1 = require("./mediaStorageProviders");
 const request_context_service_1 = require("./request-context.service");
 const common_2 = require("@nestjs/common");
@@ -85,6 +88,26 @@ let ChatterMessageService = ChatterMessageService_1 = class ChatterMessageServic
         chatterMessage.createdBy = resolvedUserId;
         chatterMessage.updatedBy = resolvedUserId;
     }
+    trimMessageUser(message) {
+        if (message?.user) {
+            message.user = this.toUserSummary(message.user);
+        }
+        return message;
+    }
+    trimMessageUsers(messages) {
+        messages?.forEach(message => this.trimMessageUser(message));
+    }
+    async find(basicFilterDto, solidRequestContext = {}) {
+        const result = await super.find(basicFilterDto, solidRequestContext);
+        this.trimMessageUsers(result?.records);
+        for (const groupRecord of result?.groupRecords ?? []) {
+            this.trimMessageUsers(groupRecord?.groupData?.records);
+        }
+        return result;
+    }
+    async findOne(id, query = {}, solidRequestContext = {}) {
+        return this.trimMessageUser(await super.findOne(id, query, solidRequestContext));
+    }
     isEditableCustomNoteMessage(message) {
         if (message.messageType !== chatter_message_constants_1.CHATTER_MESSAGE_TYPE.CUSTOM) {
             return false;
@@ -118,6 +141,31 @@ let ChatterMessageService = ChatterMessageService_1 = class ChatterMessageServic
             return nextMessage.replace(new RegExp(`\\{\\{\\s*${index}\\s*\\}\\}`, 'g'), `@${username}`);
         }, messageBody || '');
     }
+    validateChatterMediaFiles(files = []) {
+        if (Array.isArray(files) && files.some(file => (0, media_file_types_1.isDangerousMediaFile)(file))) {
+            throw new common_1.BadRequestException('Dangerous file types are not allowed in chatter attachments.');
+        }
+    }
+    validateChatterAttachmentsForFields(files, mediaFields, isUpdate) {
+        for (const mediaField of mediaFields) {
+            const media = files.filter(multerFile => multerFile.fieldname === mediaField.name);
+            if (media.length === 0)
+                continue;
+            const validator = new MediaFieldCrudManager_1.MediaFieldCrudManager({
+                type: mediaField.type,
+                required: mediaField.required,
+                fieldName: mediaField.name,
+                mediaMaxSizeKb: mediaField.mediaMaxSizeKb,
+                mediaTypes: mediaField.mediaTypes,
+                mediaAllowedExtensions: mediaField.mediaAllowedExtensions,
+                isUpdate,
+            });
+            const validationErrors = validator.validate({}, media);
+            if (validationErrors.length > 0) {
+                throw new common_1.BadRequestException(validationErrors.map(error => error.error).join(', '));
+            }
+        }
+    }
     async publishChatterMentionNotifications(message, model) {
         if (message.messageType !== chatter_message_constants_1.CHATTER_MESSAGE_TYPE.CUSTOM || message.messageSubType !== chatter_message_constants_1.CHATTER_MESSAGE_SUBTYPE.NOTE) {
             return;
@@ -166,6 +214,23 @@ let ChatterMessageService = ChatterMessageService_1 = class ChatterMessageServic
             this._logger.error(`Failed to publish chatter mention notification email job: ${error.message}`, error.stack);
         }
     }
+    async getMentionableUsers(search, limit = 8) {
+        const normalizedLimit = Number.isInteger(limit) && limit > 0 && limit <= 50 ? limit : 8;
+        const userRepository = this.entityManager.getRepository(user_entity_1.User);
+        const qb = userRepository
+            .createQueryBuilder('user')
+            .select(['user.id', 'user.username', 'user.fullName'])
+            .where('user.active = :active', { active: true });
+        const trimmedSearch = (search ?? '').trim();
+        if (trimmedSearch) {
+            qb.andWhere('(LOWER(user.username) LIKE :search OR LOWER(user.fullName) LIKE :search)', {
+                search: `%${trimmedSearch.toLowerCase()}%`,
+            });
+        }
+        qb.orderBy('user.username', 'ASC').take(normalizedLimit);
+        const users = await qb.getMany();
+        return users.map(user => ({ id: user.id, username: user.username, fullName: user.fullName }));
+    }
     async markCompleted(id) {
         const activeUser = this.requestContextService.getActiveUser();
         if (!activeUser) {
@@ -206,6 +271,22 @@ let ChatterMessageService = ChatterMessageService_1 = class ChatterMessageServic
         if (hasMessageBody && trimmedMessageBody.length === 0) {
             throw new common_1.BadRequestException('Message body cannot be empty.');
         }
+        this.validateChatterMediaFiles(files);
+        let chatterModel = null;
+        let mediaFields = [];
+        if (removeAttachmentIds.length > 0 || hasNewFiles) {
+            chatterModel = await this.modelMetadataService.findOneBySingularName('chatterMessage', {
+                fields: {
+                    model: true,
+                    mediaStorageProvider: true,
+                },
+                module: true,
+            });
+            mediaFields = chatterModel.fields.filter(field => field.type === 'mediaSingle' || field.type === 'mediaMultiple');
+            if (hasNewFiles) {
+                this.validateChatterAttachmentsForFields(files, mediaFields, true);
+            }
+        }
         if (hasMessageBody) {
             message.messageBody = trimmedMessageBody;
         }
@@ -220,21 +301,13 @@ let ChatterMessageService = ChatterMessageService_1 = class ChatterMessageServic
         message.updatedAt = new Date();
         const savedMessage = await this.repo.save(message);
         if (removeAttachmentIds.length > 0 || hasNewFiles) {
-            const model = await this.modelMetadataService.findOneBySingularName('chatterMessage', {
-                fields: {
-                    model: true,
-                    mediaStorageProvider: true,
-                },
-                module: true,
-            });
-            const mediaFields = model.fields.filter(field => field.type === 'mediaSingle' || field.type === 'mediaMultiple');
             const attachmentFieldIds = mediaFields.map(field => field.id);
             if (removeAttachmentIds.length > 0 && attachmentFieldIds.length > 0) {
                 const mediaToRemove = await this.mediaRepository.find({
                     where: {
                         id: (0, typeorm_2.In)(removeAttachmentIds),
                         entityId: savedMessage.id,
-                        modelMetadata: { id: model.id },
+                        modelMetadata: { id: chatterModel.id },
                         fieldMetadata: { id: (0, typeorm_2.In)(attachmentFieldIds) },
                     },
                     relations: {
@@ -262,11 +335,12 @@ let ChatterMessageService = ChatterMessageService_1 = class ChatterMessageServic
             }
         }
         await this.publishChatterMentionNotifications(savedMessage, model);
-        return savedMessage;
+        return this.trimMessageUser(savedMessage);
     }
-    async postMessage(postDto, files = []) {
+    async postMessage(postDto, files = [], options = {}) {
         const coModelName = (0, string_helper_1.lowerFirst)(postDto.coModelName);
         await this.assertRecordAccess(coModelName, postDto.coModelEntityId);
+        this.validateChatterMediaFiles(files);
         const chatterMessage = new chatter_message_entity_1.ChatterMessage();
         chatterMessage.messageType = chatter_message_constants_1.CHATTER_MESSAGE_TYPE.CUSTOM;
         chatterMessage.messageSubType = postDto.messageSubType || chatter_message_constants_1.CHATTER_MESSAGE_SUBTYPE.CUSTOM;
@@ -276,22 +350,29 @@ let ChatterMessageService = ChatterMessageService_1 = class ChatterMessageServic
         chatterMessage.coModelEntityId = postDto.coModelEntityId;
         chatterMessage.coModelName = coModelName;
         chatterMessage.modelUserKey = postDto.modelUserKey ?? null;
+        if (options.createdAt) {
+            chatterMessage.createdAt = options.createdAt;
+        }
         const model = await this.modelMetadataRepo.findOne({
             where: { singularName: coModelName },
             relations: { userKeyField: true, module: true }
         });
         chatterMessage.modelDisplayName = model?.displayName ?? null;
         this.stampMessageAuditFields(chatterMessage);
-        const savedMessage = await this.repo.save(chatterMessage);
+        let mediaFields = [];
         if (files && files.length > 0) {
-            const model = await this.modelMetadataService.findOneBySingularName('chatterMessage', {
+            const chatterModel = await this.modelMetadataService.findOneBySingularName('chatterMessage', {
                 fields: {
                     model: true,
                     mediaStorageProvider: true,
                 },
                 module: true,
             });
-            const mediaFields = model.fields.filter(field => field.type === 'mediaSingle' || field.type === 'mediaMultiple');
+            mediaFields = chatterModel.fields.filter(field => field.type === 'mediaSingle' || field.type === 'mediaMultiple');
+            this.validateChatterAttachmentsForFields(files, mediaFields, false);
+        }
+        const savedMessage = await this.repo.save(chatterMessage);
+        if (files && files.length > 0) {
             for (const mediaField of mediaFields) {
                 const media = files.filter(multerFile => multerFile.fieldname === mediaField.name);
                 if (media.length > 0) {
@@ -734,14 +815,16 @@ let ChatterMessageService = ChatterMessageService_1 = class ChatterMessageServic
         qb.andWhere(new typeorm_2.Brackets(qb => {
             qb.where(orConditions.join(' OR '), parameters);
         }));
-        const relations = ['chatterMessageDetails', 'user'];
+        const relations = ['chatterMessageDetails'];
         if (populate && populate.length > 0) {
             const normalizedPopulate = this.crudHelperService.normalize(populate);
-            relations.push(...normalizedPopulate.filter(rel => !relations.includes(rel)));
+            relations.push(...normalizedPopulate.filter(rel => rel !== 'user' && !relations.includes(rel)));
         }
         relations.forEach(relation => {
             qb.leftJoinAndSelect(`entity.${relation}`, relation);
         });
+        qb.leftJoin('entity.user', 'user');
+        qb.addSelect(chatter_message_constants_1.CHATTER_MESSAGE_USER_FIELDS.map(field => `user.${field}`));
         if (filters) {
             qb.andWhere(new typeorm_2.Brackets(whereQb => {
                 this.crudHelperService.applyFilters(whereQb, filters, 'entity', qb);
@@ -751,6 +834,7 @@ let ChatterMessageService = ChatterMessageService_1 = class ChatterMessageServic
         qb.skip(offset).take(limit);
         const [entities, count] = await qb.getManyAndCount();
         this.logHeapUsed('getChatterMessages-entitiesLoaded');
+        this.trimMessageUsers(entities);
         const DATE_FIELD_TYPES = ['date', 'datetime', 'time'];
         for (const entity of entities) {
             for (const detail of entity.chatterMessageDetails ?? []) {