@solidstarters/solid-core 1.2.191 → 1.2.192

package/src/seeders/seed-data/solid-core-metadata.json

@@ -2969,7 +2969,7 @@
             "relationCoModelColumnName": null,
             "relationModelModuleName": "solid-core",
             "relationCascade": "restrict",
-            "required": true,
+            "required": false,
             "unique": false,
             "index": false,
             "private": false,
@@ -3055,6 +3055,18 @@
             "encrypt": false,
             "isSystem": false
           },
+          {
+            "name": "description",
+            "displayName": "Description",
+            "type": "longText",
+            "ormType": "text",
+            "required": false,
+            "unique": false,
+            "index": false,
+            "private": false,
+            "encrypt": false,
+            "isSystem": false
+          },
           {
             "name": "isPrivate",
             "displayName": "Is Private",
@@ -3150,6 +3162,22 @@
             "private": false,
             "encrypt": false,
             "isSystem": true
+          },
+          {
+            "name": "securityRuleConfigProvider",
+            "displayName": "Security Rule Config Provider",
+            "type": "selectionDynamic",
+            "ormType": "varchar",
+            "length": 128,
+            "required": false,
+            "unique": false,
+            "index": false,
+            "private": false,
+            "encrypt": false,
+            "isSystem": true,
+            "selectionValueType": "string",
+            "selectionDynamicProvider": "SecurityRuleConfigSelectionProvider",
+            "selectionDynamicProviderCtxt": "{}"
           }
         ]
       },
@@ -5847,7 +5875,7 @@
     {
       "displayName": "Menu Item",
       "name": "menuItemMetadata-menu-item",
-      "sequenceNumber": 4,
+      "sequenceNumber": 1,
       "actionUserKey": "menuItemMetadata-list-action",
       "moduleUserKey": "solid-core",
       "parentMenuItemUserKey": "layoutBuilder-menu-item"
@@ -5855,7 +5883,7 @@
     {
       "displayName": "View",
       "name": "viewMetadata-menu-item",
-      "sequenceNumber": 5,
+      "sequenceNumber": 2,
       "actionUserKey": "viewMetadata-list-action",
       "moduleUserKey": "solid-core",
       "parentMenuItemUserKey": "layoutBuilder-menu-item"
@@ -5863,7 +5891,7 @@
     {
       "displayName": "Action",
       "name": "actionMetadata-menu-item",
-      "sequenceNumber": 6,
+      "sequenceNumber": 3,
       "actionUserKey": "actionMetadata-list-action",
       "moduleUserKey": "solid-core",
       "parentMenuItemUserKey": "layoutBuilder-menu-item"
@@ -5871,7 +5899,7 @@
     {
       "displayName": "Saved Filters",
       "name": "savedFilters-menu-item",
-      "sequenceNumber": 7,
+      "sequenceNumber": 4,
       "actionUserKey": "savedFilters-list-action",
       "moduleUserKey": "solid-core",
       "parentMenuItemUserKey": "layoutBuilder-menu-item"
@@ -5879,7 +5907,7 @@
     {
       "displayName": "User View",
       "name": "userViewMetadata-menu-item",
-      "sequenceNumber": 7,
+      "sequenceNumber": 5,
       "actionUserKey": "userViewMetadata-list-action",
       "moduleUserKey": "solid-core",
       "parentMenuItemUserKey": "layoutBuilder-menu-item"
@@ -5895,7 +5923,7 @@
     {
       "displayName": "Media",
       "name": "media-menu-item",
-      "sequenceNumber": 3,
+      "sequenceNumber": 1,
       "actionUserKey": "media-list-action",
       "moduleUserKey": "solid-core",
       "parentMenuItemUserKey": "mediaManagement-menu-item"
@@ -5903,7 +5931,7 @@
     {
       "displayName": "Media Storage Provider",
       "name": "mediaStorageProviderMetadata-menu-item",
-      "sequenceNumber": 7,
+      "sequenceNumber": 2,
       "actionUserKey": "mediaStorageProviderMetadata-list-action",
       "moduleUserKey": "solid-core",
       "parentMenuItemUserKey": "mediaManagement-menu-item"
@@ -5911,7 +5939,7 @@
     {
       "displayName": "IAM",
       "name": "iam-menu-item",
-      "sequenceNumber": 3,
+      "sequenceNumber": 4,
       "actionUserKey": "iam-root",
       "moduleUserKey": "solid-core",
       "parentMenuItemUserKey": ""
@@ -5948,10 +5976,18 @@
       "moduleUserKey": "solid-core",
       "parentMenuItemUserKey": "iam-menu-item"
     },
+    {
+      "displayName": "User Activity History",
+      "name": "userActivityHistory-menu-item",
+      "sequenceNumber": 5,
+      "actionUserKey": "userActivityHistory-list-action",
+      "moduleUserKey": "solid-core",
+      "parentMenuItemUserKey": "iam-menu-item"
+    },
     {
       "displayName": "Queues",
       "name": "queues-menu-item",
-      "sequenceNumber": 3,
+      "sequenceNumber": 5,
       "actionUserKey": "queues-root",
       "moduleUserKey": "solid-core",
       "parentMenuItemUserKey": ""
@@ -5975,7 +6011,7 @@
     {
       "displayName": "Notification",
       "name": "notification-menu-item",
-      "sequenceNumber": 3,
+      "sequenceNumber": 6,
       "actionUserKey": "notification-root",
       "moduleUserKey": "solid-core",
       "parentMenuItemUserKey": ""
@@ -5991,7 +6027,7 @@
     {
       "displayName": "SMS",
       "name": "smsTemplate-menu-item",
-      "sequenceNumber": 1,
+      "sequenceNumber": 2,
       "actionUserKey": "smsTemplate-list-action",
       "moduleUserKey": "solid-core",
       "parentMenuItemUserKey": "notification-menu-item"
@@ -5999,7 +6035,7 @@
     {
       "displayName": "Other",
       "name": "other-menu-item",
-      "sequenceNumber": 3,
+      "sequenceNumber": 7,
       "actionUserKey": "other-root",
       "moduleUserKey": "solid-core",
       "parentMenuItemUserKey": ""
@@ -6011,7 +6047,7 @@
       "actionUserKey": "listOfValues-list-action",
       "moduleUserKey": "solid-core",
       "parentMenuItemUserKey": "other-menu-item"
-    },   
+    },
     {
       "displayName": "Scheduled Jobs",
       "name": "scheduledJob-menu-item",
@@ -6027,20 +6063,19 @@
       "actionUserKey": "aiInteraction-list-action",
       "moduleUserKey": "solid-core",
       "parentMenuItemUserKey": "other-menu-item"
-    },    
+    },
     {
       "displayName": "Saved Filters",
       "name": "savedFilters-menu-item",
-      "sequenceNumber": 7,
+      "sequenceNumber": 4,
       "actionUserKey": "savedFilters-list-action",
       "moduleUserKey": "solid-core",
       "parentMenuItemUserKey": "other-menu-item"
     },
-
     {
       "displayName": "Chatter Message",
       "name": "chatterMessage-menu-item",
-      "sequenceNumber": 8,
+      "sequenceNumber": 5,
       "actionUserKey": "chatterMessage-list-action",
       "moduleUserKey": "solid-core",
       "parentMenuItemUserKey": "other-menu-item"
@@ -6048,48 +6083,63 @@
     {
       "displayName": "Chatter Message Details",
       "name": "chatterMessageDetails-menu-item",
-      "sequenceNumber": 9,
+      "sequenceNumber": 6,
       "actionUserKey": "chatterMessageDetails-list-action",
       "moduleUserKey": "solid-core",
       "parentMenuItemUserKey": "other-menu-item"
     },
+    {
+      "displayName": "Locale",
+      "name": "locale-menu-item",
+      "sequenceNumber": 7,
+      "actionUserKey": "locale-list-action",
+      "moduleUserKey": "solid-core",
+      "parentMenuItemUserKey": "other-menu-item"
+    },
     {
       "displayName": "Import Transactions",
       "name": "importTransaction-menu-item",
-      "sequenceNumber": 11,
-      "actionUserKey": "importTransaction-list-view",
+      "sequenceNumber": 8,
+      "actionUserKey": "importTransaction-list-action",
       "moduleUserKey": "solid-core",
       "parentMenuItemUserKey": "other-menu-item"
     },
     {
       "displayName": "Import Transaction Error Logs",
       "name": "importTransactionErrorLog-menu-item",
-      "sequenceNumber": 12,
+      "sequenceNumber": 9,
       "actionUserKey": "importTransactionErrorLog-list-action",
       "moduleUserKey": "solid-core",
       "parentMenuItemUserKey": "other-menu-item"
     },
     {
-      "displayName": "Locale",
-      "name": "locale-menu-item",
-      "sequenceNumber": 10,
-      "actionUserKey": "locale-list-action",
+      "displayName": "Dashboard Management",
+      "name": "dashboardManagement-menu-item",
+      "sequenceNumber": 8,
+      "actionUserKey": "dasbhoard-root",
       "moduleUserKey": "solid-core",
-      "parentMenuItemUserKey": "other-menu-item"
+      "parentMenuItemUserKey": ""
     },
     {
-      "displayName": "User Activity History",
-      "name": "userActivityHistory-menu-item",
+      "displayName": "Dashboard",
+      "name": "dashboard-menu-item",
       "sequenceNumber": 1,
-      "actionUserKey": "userActivityHistory-list-view",
+      "actionUserKey": "dashboard-list-action",
       "moduleUserKey": "solid-core",
-      "parentMenuItemUserKey": "other-menu-item"
+      "parentMenuItemUserKey": "dashboardManagement-menu-item"
+    },
+    {
+      "displayName": "Dashboard Question",
+      "name": "dashboardQuestion-menu-item",
+      "sequenceNumber": 2,
+      "actionUserKey": "dashboardQuestion-list-action",
+      "moduleUserKey": "solid-core",
+      "parentMenuItemUserKey": "dashboardManagement-menu-item"
     },
-
     {
       "displayName": "Settings",
       "name": "settings-menu-item",
-      "sequenceNumber": 3,
+      "sequenceNumber": 9,
       "actionUserKey": "settings-root",
       "moduleUserKey": "solid-core",
       "parentMenuItemUserKey": ""
@@ -6121,34 +6171,10 @@
     {
       "displayName": "Misc",
       "name": "miscSettings-menu-item",
-      "sequenceNumber": 3,
+      "sequenceNumber": 4,
       "actionUserKey": "miscSettings-action",
       "moduleUserKey": "solid-core",
       "parentMenuItemUserKey": "settings-menu-item"
-    },
-    {
-      "displayName": "Dashboard Management",
-      "name": "dashboardManagement-menu-item",
-      "sequenceNumber": 9,
-      "actionUserKey": "dasbhoard-root",
-      "moduleUserKey": "solid-core",
-      "parentMenuItemUserKey": ""
-    },
-    {
-      "displayName": "Dashboard",
-      "name": "dashboard-menu-item",
-      "sequenceNumber": 1,
-      "actionUserKey": "dashboard-list-action",
-      "moduleUserKey": "solid-core",
-      "parentMenuItemUserKey": "dashboardManagement-menu-item"
-    },
-    {
-      "displayName": "Dashboard Question",
-      "name": "dashboardQuestion-menu-item",
-      "sequenceNumber": 2,
-      "actionUserKey": "dashboardQuestion-list-action",
-      "moduleUserKey": "solid-core",
-      "parentMenuItemUserKey": "dashboardManagement-menu-item"
     }
   ],
   "views": [
@@ -7205,9 +7231,9 @@
             50
           ],
           "enableGlobalSearch": true,
-          "create": true,
-          "edit": true,
-          "delete": true
+          "create": false,
+          "edit": false,
+          "delete": false
         },
         "children": [
           {
@@ -7260,7 +7286,10 @@
         "attrs": {
           "name": "form-1",
           "label": "Chatter Message Details Model",
-          "className": "grid"
+          "className": "grid",
+          "showEditFormButton": false,
+          "showAddFormButton": false,
+          "showDeleteFormButton": false 
         },
         "children": [
           {
@@ -7336,9 +7365,9 @@
             50
           ],
           "enableGlobalSearch": true,
-          "create": true,
-          "edit": true,
-          "delete": true
+          "create": false,
+          "edit": false,
+          "delete": false
         },
         "children": [
           {
@@ -7384,7 +7413,10 @@
         "attrs": {
           "name": "form-1",
           "label": "Chatter Message Model",
-          "className": "grid"
+          "className": "grid",
+          "showEditFormButton": false,
+          "showAddFormButton": false,
+          "showDeleteFormButton": false 
         },
         "children": [
           {
@@ -7428,6 +7460,12 @@
                       "name": "coModelName",
                       "isSearchable": true
                     }
+                  },
+                  {
+                    "type": "field",
+                    "attrs": {
+                      "name": "chatterMessageDetails"
+                    }
                   }
                 ]
               }
@@ -11095,6 +11133,13 @@
                       "label": "Body"
                     }
                   },
+                  {
+                    "type": "field",
+                    "attrs": {
+                      "name": "smsProviderTemplateId",
+                      "label": "Sms Provider Template Id"
+                    }
+                  },
                   {
                     "type": "field",
                     "attrs": {

package/src/seeders/system-fields-seeder.service.ts

@@ -1,20 +1,22 @@
 // This class will add the system fields in the field-metadata table if they are missing.
 // Fetch all the models and their fields metadata and check if the system fields are present.
 
-import { InjectRepository } from "@nestjs/typeorm";
+import { Injectable } from "@nestjs/common";
 import { ModelMetadata } from "src/entities/model-metadata.entity";
 import { ModelMetadataHelperService } from "src/helpers/model-metadata-helper.service";
 import { FieldMetadataRepository } from "src/repository/field-metadata.repository";
-import { Repository } from "typeorm";
+import { ModelMetadataRepository } from "src/repository/model-metadata.repository";
 
+@Injectable()
 export class SystemFieldsSeederService {
    // This service is responsible for seeding the system fields metadata for all models.
    // It will check if the system fields are already present in the field-metadata table.
    // If not, it will add them.
    constructor(
       private readonly modelHelperService: ModelMetadataHelperService,
-      @InjectRepository(ModelMetadata)
-      private readonly modelRepository: Repository<ModelMetadata>, // Replace with actual model repository type
+    //   @InjectRepository(ModelMetadata)
+    //   private readonly modelRepository: Repository<ModelMetadata>, // Replace with actual model repository type
+      private readonly modelRepository: ModelMetadataRepository, // Replace with actual model repository type
       private readonly fieldMetadataRepository: FieldMetadataRepository, // Replace with actual field repository type
    ) {}
   

package/src/services/action-metadata.service.ts

@@ -1,15 +1,16 @@
 import { Injectable } from '@nestjs/common';
-import { InjectEntityManager, InjectRepository } from '@nestjs/typeorm';
+import { ConfigService } from '@nestjs/config';
 import { DiscoveryService, ModuleRef } from "@nestjs/core";
-import { EntityManager, Repository } from 'typeorm';
+import { InjectEntityManager } from '@nestjs/typeorm';
+import { CrudHelperService } from "src/services/crud-helper.service";
 import { CRUDService } from 'src/services/crud.service';
+import { FileService } from "src/services/file.service";
 import { ModelMetadataService } from 'src/services/model-metadata.service';
 import { ModuleMetadataService } from 'src/services/module-metadata.service';
-import { ConfigService } from '@nestjs/config';
-import { FileService } from "src/services/file.service";
-import { CrudHelperService } from "src/services/crud-helper.service";
+import { EntityManager } from 'typeorm';
 
 
+import { ActionMetadataRepository } from 'src/repository/action-metadata.repository';
 import { ActionMetadata } from '../entities/action-metadata.entity';
 
 @Injectable()
@@ -23,8 +24,9 @@ export class ActionMetadataService extends CRUDService<ActionMetadata> {
     readonly crudHelperService: CrudHelperService,
     @InjectEntityManager()
     readonly entityManager: EntityManager,
-    @InjectRepository(ActionMetadata, 'default')
-    readonly repo: Repository<ActionMetadata>,
+    // @InjectRepository(ActionMetadata, 'default')
+    // readonly repo: Repository<ActionMetadata>,
+    readonly repo: ActionMetadataRepository,
     readonly moduleRef: ModuleRef
 
   ) {

package/src/services/ai-interaction.service.ts

@@ -1,22 +1,23 @@
-import { BadRequestException, Logger, Injectable } from '@nestjs/common';
-import { InjectEntityManager, InjectRepository } from '@nestjs/typeorm';
+import { BadRequestException, Injectable, Logger } from '@nestjs/common';
 import { DiscoveryService, ModuleRef } from "@nestjs/core";
-import { EntityManager, Repository } from 'typeorm';
+import { InjectEntityManager } from '@nestjs/typeorm';
+import { EntityManager } from 'typeorm';
 
-import { CRUDService } from 'src/services/crud.service';
-import { ModelMetadataService } from 'src/services/model-metadata.service';
-import { ModuleMetadataService } from 'src/services/module-metadata.service';
 import { ConfigService } from '@nestjs/config';
-import { FileService } from 'src/services/file.service';
-import { CrudHelperService } from 'src/services/crud-helper.service';
 import { spawn } from 'child_process';
-import { AiInteraction } from '../entities/ai-interaction.entity';
 import * as fs from 'fs/promises';
-import { McpResponse, TriggerMcpClientOptions } from 'src/interfaces';
-import { PublisherFactory } from './queues/publisher-factory.service';
 import { ERROR_MESSAGES } from 'src/constants/error-messages';
 import { InvokeAiPromptDto } from 'src/dtos/invoke-ai-prompt.dto';
+import { McpResponse, TriggerMcpClientOptions } from 'src/interfaces';
+import { AiInteractionRepository } from 'src/repository/ai-interaction.repository';
+import { CrudHelperService } from 'src/services/crud-helper.service';
+import { CRUDService } from 'src/services/crud.service';
+import { FileService } from 'src/services/file.service';
+import { ModelMetadataService } from 'src/services/model-metadata.service';
+import { ModuleMetadataService } from 'src/services/module-metadata.service';
+import { AiInteraction } from '../entities/ai-interaction.entity';
 import { McpHandlerFactory } from './genai/mcp-handlers/mcp-handler-factory.service';
+import { PublisherFactory } from './queues/publisher-factory.service';
 
 @Injectable()
 export class AiInteractionService extends CRUDService<AiInteraction> {
@@ -31,8 +32,9 @@ export class AiInteractionService extends CRUDService<AiInteraction> {
     readonly crudHelperService: CrudHelperService,
     @InjectEntityManager()
     readonly entityManager: EntityManager,
-    @InjectRepository(AiInteraction, 'default')
-    readonly repo: Repository<AiInteraction>,
+    // @InjectRepository(AiInteraction, 'default')
+    // readonly repo: Repository<AiInteraction>,
+    readonly repo: AiInteractionRepository,
     readonly moduleRef: ModuleRef,
     readonly publisherFactory: PublisherFactory<TriggerMcpClientOptions>,
     // readonly requestContextService: RequestContextService,

package/src/services/authentication.service.ts

@@ -12,7 +12,7 @@ import {
 import { ConfigType } from '@nestjs/config';
 import { EventEmitter2 } from '@nestjs/event-emitter';
 import { JwtService } from '@nestjs/jwt';
-import { InjectDataSource, InjectRepository } from '@nestjs/typeorm';
+import { InjectDataSource } from '@nestjs/typeorm';
 import { isEmpty, isNotEmpty } from 'class-validator';
 import { randomInt, randomUUID } from 'crypto';
 import commonConfig from 'src/config/common.config';
@@ -21,6 +21,7 @@ import { ERROR_MESSAGES } from 'src/constants/error-messages';
 import { SUCCESS_MESSAGES } from 'src/constants/success-messages';
 import { CreateUserDto } from 'src/dtos/create-user.dto';
 import { MailFactory } from 'src/factories/mail.factory';
+import { UserRepository } from 'src/repository/user.repository';
 import { Msg91OTPService } from 'src/services/sms/Msg91OTPService';
 import { DataSource, Repository } from 'typeorm';
 import { v4 as uuidv4 } from 'uuid';
@@ -44,7 +45,6 @@ import { EventDetails, EventType } from "../interfaces";
 import { ActiveUserData } from '../interfaces/active-user-data.interface';
 import { HashingService } from './hashing.service';
 import { InvalidatedRefreshTokenError, RefreshTokenIdsStorageService } from './refresh-token-ids-storage.service';
-import { RequestContextService } from './request-context.service';
 import { RoleMetadataService } from './role-metadata.service';
 import { SettingService } from './setting.service';
 import { UserActivityHistoryService } from './user-activity-history.service';
@@ -67,7 +67,8 @@ export class AuthenticationService {
     // private readonly mailService: IMail;
     constructor(
         private readonly userService: UserService,
-        @InjectRepository(User) private readonly userRepository: Repository<User>,
+        // @InjectRepository(User) private readonly userRepository: Repository<User>,
+        private readonly userRepository: UserRepository,
         private readonly hashingService: HashingService,
         private readonly jwtService: JwtService,
         @Inject(jwtConfig.KEY)
@@ -85,7 +86,6 @@ export class AuthenticationService {
         @Inject(commonConfig.KEY)
         private readonly commonConfiguration: ConfigType<typeof commonConfig>,
         private readonly userActivityHistoryService: UserActivityHistoryService,
-        private readonly requestContextService: RequestContextService,
         @InjectDataSource()
         private readonly dataSource: DataSource,
     ) {
@@ -903,7 +903,7 @@ export class AuthenticationService {
             const pwdSchemeVersion = this.hashingService.currentVersion(); // e.g. 1, 2, 3 ...
 
             // Check reuse with your existing method (ensure it looks at hashes).
-            await m.getRepository(User).update({ id: user.id }, { password: pwdHash, passwordScheme: pwdScheme, passwordSchemeVersion: pwdSchemeVersion});
+            await m.getRepository(User).update({ id: user.id }, { password: pwdHash, passwordScheme: pwdScheme, passwordSchemeVersion: pwdSchemeVersion });
             this.notifyUserOnPasswordChanged(user);
 
             return {
@@ -1121,22 +1121,36 @@ export class AuthenticationService {
     //     // Invalidate the refresh token
     //     // await this.refreshTokenIdsStorage.invalidate(user.id);
     // }
-    async logout() {
+    async logout(refreshToken: string) {
         try {
-            const activeUser = this.requestContextService.getActiveUser();
-            const userId = activeUser?.sub;
+            // const activeUser = this.requestContextService.getActiveUser();
+            // const userId = activeUser?.sub;
+            // const user = await this.userRepository.findOne({
+            //     where: {
+            //         id: userId,
+            //     }
+            // })
+            // // Invalidate refresh token if you store them
+            // await this.refreshTokenIdsStorage.invalidate(userId); // ← Your existing logic
+            // if (!refreshToken) {
+            //     throw new UnauthorizedException('Refresh token is required');
+            // }
+            const payload = this.jwtService.decode(refreshToken) as any;
+
+            if (!payload || !payload.sub) {
+                throw new UnauthorizedException(ERROR_MESSAGES.INVALID_REFRESH_TOKEN);
+            }
+
+            const userId = payload.sub;
+            await this.refreshTokenIdsStorage.invalidate(userId);
             const user = await this.userRepository.findOne({
                 where: {
                     id: userId,
                 }
             })
-            // Invalidate refresh token if you store them
-            await this.refreshTokenIdsStorage.invalidate(userId); // ← Your existing logic
-
             // Log logout event
             await this.userActivityHistoryService.logEvent('logout', user);
 
-
             return { message: SUCCESS_MESSAGES.LOGOUT_SUCCESS };
         } catch (err) {
             throw err instanceof UnauthorizedException || err instanceof InternalServerErrorException

package/src/services/chatter-message.service.ts

@@ -1,28 +1,28 @@
 import { Injectable } from '@nestjs/common';
-import { InjectEntityManager, InjectRepository } from '@nestjs/typeorm';
 import { DiscoveryService, ModuleRef } from "@nestjs/core";
-import { EntityManager, Repository, EntityMetadata, Brackets } from 'typeorm';
+import { InjectEntityManager } from '@nestjs/typeorm';
+import { Brackets, EntityManager, EntityMetadata } from 'typeorm';
 
+import { classify } from '@angular-devkit/core/src/utils/strings';
+import { ConfigService } from '@nestjs/config';
+import { CHATTER_MESSAGE_SUBTYPE, CHATTER_MESSAGE_TYPE } from 'src/constants/chatter-message.constants';
+import { PostChatterMessageDto } from 'src/dtos/post-chatter-message.dto';
+import { ModelMetadataHelperService } from 'src/helpers/model-metadata-helper.service';
+import { lowerFirst } from 'src/helpers/string.helper';
+import { ChatterMessageDetailsRepository } from 'src/repository/chatter-message-details.repository';
+import { ChatterMessageRepository } from 'src/repository/chatter-message.repository';
+import { FieldMetadataRepository } from 'src/repository/field-metadata.repository';
+import { ModelMetadataRepository } from 'src/repository/model-metadata.repository';
+import { CrudHelperService } from 'src/services/crud-helper.service';
 import { CRUDService } from 'src/services/crud.service';
+import { FileService } from 'src/services/file.service';
 import { ModelMetadataService } from 'src/services/model-metadata.service';
 import { ModuleMetadataService } from 'src/services/module-metadata.service';
-import { ConfigService } from '@nestjs/config';
-import { FileService } from 'src/services/file.service';
-import { CrudHelperService } from 'src/services/crud-helper.service';
-import { PostChatterMessageDto } from 'src/dtos/post-chatter-message.dto';
-import { ChatterMessage } from '../entities/chatter-message.entity';
-import { getMediaStorageProvider } from './mediaStorageProviders';
 import { MediaStorageProviderType } from '../dtos/create-media-storage-provider-metadata.dto';
 import { ChatterMessageDetails } from '../entities/chatter-message-details.entity';
-import { ModelMetadata } from 'src/entities/model-metadata.entity';
+import { ChatterMessage } from '../entities/chatter-message.entity';
+import { getMediaStorageProvider } from './mediaStorageProviders';
 import { RequestContextService } from './request-context.service';
-import { ChatterMessageRepository } from 'src/repository/chatter-message.repository';
-import { lowerFirst } from 'src/helpers/string.helper';
-import { ModelMetadataHelperService } from 'src/helpers/model-metadata-helper.service';
-import { ChatterMessageDetailsRepository } from 'src/repository/chatter-message-details.repository';
-import { FieldMetadata } from 'src/entities/field-metadata.entity';
-import { CHATTER_MESSAGE_TYPE, CHATTER_MESSAGE_SUBTYPE } from 'src/constants/chatter-message.constants';
-import { classify } from '@angular-devkit/core/src/utils/strings';
 @Injectable()
 export class ChatterMessageService extends CRUDService<ChatterMessage> {
     constructor(
@@ -38,11 +38,13 @@ export class ChatterMessageService extends CRUDService<ChatterMessage> {
         readonly repo: ChatterMessageRepository,
         // @InjectRepository(ChatterMessageDetailsRepository, 'default')
         readonly chatterMessageDetailsRepo: ChatterMessageDetailsRepository,
-        @InjectRepository(FieldMetadata, 'default')
-        readonly fieldMetadataRepo: Repository<FieldMetadata>,
+        // @InjectRepository(FieldMetadata, 'default')
+        // readonly fieldMetadataRepo: Repository<FieldMetadata>,
+        readonly fieldMetadataRepo: FieldMetadataRepository,
         readonly moduleRef: ModuleRef,
-        @InjectRepository(ModelMetadata)
-        private readonly modelMetadataRepo: Repository<ModelMetadata>,
+        // @InjectRepository(ModelMetadata)
+        // private readonly modelMetadataRepo: Repository<ModelMetadata>,
+        private readonly modelMetadataRepo: ModelMetadataRepository,
         readonly requestContextService: RequestContextService,
         private readonly modelMetadataHelperService: ModelMetadataHelperService,
     ) {
@@ -551,7 +553,7 @@ export class ChatterMessageService extends CRUDService<ChatterMessage> {
             }
         }
 
-        const qb = this.repo.createQueryBuilder('entity');
+        const qb = await this.repo.createSecurityRuleAwareQueryBuilder('entity');
 
         const orConditions: string[] = [];
         const parameters: any = {};