@solidstarters/solid-core 1.2.189 → 1.2.192

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

@@ -1,13 +1,19 @@
 import { BadRequestException, Injectable, Logger, NotFoundException } from '@nestjs/common';
-import { InjectDataSource, InjectRepository } from '@nestjs/typeorm';
+import { InjectDataSource } from '@nestjs/typeorm';
 import * as fs from 'fs/promises'; // Use the Promise-based version of fs for async/await
 import { DataSource, EntityManager, In, Repository, SelectQueryBuilder } from 'typeorm';
 import { CreateModelMetadataDto } from '../dtos/create-model-metadata.dto';
 import { ModelMetadata } from '../entities/model-metadata.entity';
 import { ModuleMetadata } from '../entities/module-metadata.entity';
 
+import { classify, dasherize } from '@angular-devkit/core/src/utils/strings';
+import { ERROR_MESSAGES } from 'src/constants/error-messages';
+import { DisallowInProduction } from 'src/decorators/disallow-in-production.decorator';
 import { SolidFieldType } from 'src/dtos/create-field-metadata.dto';
+import { PermissionMetadata } from 'src/entities/permission-metadata.entity';
 import { ModuleMetadataHelperService } from 'src/helpers/module-metadata-helper.service';
+import { FieldMetadataRepository } from 'src/repository/field-metadata.repository';
+import { ModelMetadataRepository } from 'src/repository/model-metadata.repository';
 import { BasicFilterDto } from '../dtos/basic-filters.dto';
 import { UpdateModelMetaDataDto } from '../dtos/update-model-metadata.dto';
 import { ActionMetadata } from '../entities/action-metadata.entity';
@@ -24,19 +30,17 @@ import { CrudHelperService } from './crud-helper.service';
 import { FieldMetadataService } from './field-metadata.service';
 import { MediaStorageProviderMetadataService } from './media-storage-provider-metadata.service';
 import { RoleMetadataService } from './role-metadata.service';
-import { PermissionMetadata } from 'src/entities/permission-metadata.entity';
-import { classify, dasherize } from '@angular-devkit/core/src/utils/strings';
-import { DisallowInProduction } from 'src/decorators/disallow-in-production.decorator';
-import { ERROR_MESSAGES } from 'src/constants/error-messages';
 
 @Injectable()
 export class ModelMetadataService {
   private logger = new Logger('ModelMetadataService');
   constructor(
-    @InjectRepository(ModelMetadata)
-    private readonly modelMetadataRepo: Repository<ModelMetadata>,
-    @InjectRepository(FieldMetadata)
-    private readonly fieldMetadataRepo: Repository<FieldMetadata>,
+    // @InjectRepository(ModelMetadata)
+    // private readonly modelMetadataRepo: Repository<ModelMetadata>,
+    // @InjectRepository(FieldMetadata)
+    // private readonly fieldMetadataRepo: Repository<FieldMetadata>,
+    private readonly modelMetadataRepo: ModelMetadataRepository,
+    private readonly fieldMetadataRepo: FieldMetadataRepository,
     private readonly schematicService: SchematicService,
     @InjectDataSource()
     private readonly dataSource: DataSource,
@@ -55,7 +59,7 @@ export class ModelMetadataService {
     let { limit, offset } = basicFilterDto;
 
     // Create above query on pincode table using query builder
-    var qb: SelectQueryBuilder<ModelMetadata> = this.modelMetadataRepo.createQueryBuilder(alias)
+    var qb: SelectQueryBuilder<ModelMetadata> = await this.modelMetadataRepo.createSecurityRuleAwareQueryBuilder(alias)
     qb = await this.crudHelperService.buildFilterQuery(qb, basicFilterDto, alias);
 
     // Get the records and the count
@@ -555,50 +559,52 @@ export class ModelMetadataService {
       return;
     }
 
-    this.logger.log(`Cleaning up for model: ${modelEntity.singularName} belonging to module: ${modelEntity.module.name}`);
-
-    const modulePath = await this.moduleMetadataHelperService.getModulePath(modelEntity.module.name);
-    // /Users/harishpatel/Code/javascript/school-fees-portal/solid-api/src/solid-core
-    this.logger.log(`Module path: ${modulePath}`);
-
-    const filesToDelete = [];
-    // <singularName>.entity.ts | The TypeORM model that needs to be deleted. | Automatic
-    const entityFilePath = `${modulePath}/entities/${dasherize(modelEntity.singularName)}.entity.ts`;
-    filesToDelete.push(entityFilePath);
-    this.logger.log(`About to delete entity file path: ${entityFilePath}`);
-
-    // <singularName>.create.dto.ts | The TypeORM model that needs to be deleted. | Automatic
-    const createDtoFilePath = `${modulePath}/dtos/create-${dasherize(modelEntity.singularName)}.dto.ts`;
-    filesToDelete.push(createDtoFilePath);
-    this.logger.log(`About to delete create DTO file path: ${createDtoFilePath}`);
-
-    // <singularName>.update.dto.ts | The TypeORM model that needs to be deleted. | Automatic
-    const updateDtoFilePath = `${modulePath}/dtos/update-${dasherize(modelEntity.singularName)}.dto.ts`;
-    filesToDelete.push(updateDtoFilePath);
-    this.logger.log(`About to delete update DTO file path: ${updateDtoFilePath}`);
-
-    // <singularName>.repository.ts | The TypeORM model that needs to be deleted. | Automatic
-    const repositoryFilePath = `${modulePath}/repositories/${dasherize(modelEntity.singularName)}.repository.ts`;
-    filesToDelete.push(repositoryFilePath);
-    this.logger.log(`About to delete repository file path: ${repositoryFilePath}`);
-
-    // <singularName>.service.ts | The TypeORM model that needs to be deleted. | Automatic
-    const serviceFilePath = `${modulePath}/services/${dasherize(modelEntity.singularName)}.service.ts`;
-    filesToDelete.push(serviceFilePath);
-    this.logger.log(`About to delete service file path: ${serviceFilePath}`);
-
-    // <singularName>.controller.ts | The TypeORM model that needs to be deleted. | Automatic
-    const controllerFilePath = `${modulePath}/controllers/${dasherize(modelEntity.singularName)}.controller.ts`;
-    filesToDelete.push(controllerFilePath);
-    this.logger.log(`About to delete controller file path: ${controllerFilePath}`);
-
-    for (let i = 0; i < filesToDelete.length; i++) {
-      const fileToDelete = filesToDelete[i];
-      try {
-        await fs.unlink(fileToDelete);
-        this.logger.log(`Deleted file: ${fileToDelete}`);
-      } catch (error) {
-        this.logger.error(`Error deleting file: ${fileToDelete}`, error);
+    this.logger.log(`Cleaning up for model: ${modelEntity.singularName} belonging to module: ${modelEntity.module?.name}`);
+
+    const modulePath = await this.moduleMetadataHelperService.getModulePath(modelEntity.module?.name);
+    if (modulePath) {
+      // /Users/harishpatel/Code/javascript/school-fees-portal/solid-api/src/solid-core
+      this.logger.log(`Module path: ${modulePath}`);
+
+      const filesToDelete = [];
+      // <singularName>.entity.ts | The TypeORM model that needs to be deleted. | Automatic
+      const entityFilePath = `${modulePath}/entities/${dasherize(modelEntity.singularName)}.entity.ts`;
+      filesToDelete.push(entityFilePath);
+      this.logger.log(`About to delete entity file path: ${entityFilePath}`);
+
+      // <singularName>.create.dto.ts | The TypeORM model that needs to be deleted. | Automatic
+      const createDtoFilePath = `${modulePath}/dtos/create-${dasherize(modelEntity.singularName)}.dto.ts`;
+      filesToDelete.push(createDtoFilePath);
+      this.logger.log(`About to delete create DTO file path: ${createDtoFilePath}`);
+
+      // <singularName>.update.dto.ts | The TypeORM model that needs to be deleted. | Automatic
+      const updateDtoFilePath = `${modulePath}/dtos/update-${dasherize(modelEntity.singularName)}.dto.ts`;
+      filesToDelete.push(updateDtoFilePath);
+      this.logger.log(`About to delete update DTO file path: ${updateDtoFilePath}`);
+
+      // <singularName>.repository.ts | The TypeORM model that needs to be deleted. | Automatic
+      const repositoryFilePath = `${modulePath}/repositories/${dasherize(modelEntity.singularName)}.repository.ts`;
+      filesToDelete.push(repositoryFilePath);
+      this.logger.log(`About to delete repository file path: ${repositoryFilePath}`);
+
+      // <singularName>.service.ts | The TypeORM model that needs to be deleted. | Automatic
+      const serviceFilePath = `${modulePath}/services/${dasherize(modelEntity.singularName)}.service.ts`;
+      filesToDelete.push(serviceFilePath);
+      this.logger.log(`About to delete service file path: ${serviceFilePath}`);
+
+      // <singularName>.controller.ts | The TypeORM model that needs to be deleted. | Automatic
+      const controllerFilePath = `${modulePath}/controllers/${dasherize(modelEntity.singularName)}.controller.ts`;
+      filesToDelete.push(controllerFilePath);
+      this.logger.log(`About to delete controller file path: ${controllerFilePath}`);
+
+      for (let i = 0; i < filesToDelete.length; i++) {
+        const fileToDelete = filesToDelete[i];
+        try {
+          await fs.unlink(fileToDelete);
+          this.logger.log(`Deleted file: ${fileToDelete}`);
+        } catch (error) {
+          this.logger.error(`Error deleting file: ${fileToDelete}`, error);
+        }
       }
     }
 
@@ -655,7 +661,7 @@ export class ModelMetadataService {
     await viewRepo.delete({ model: { id: modelEntity.id } })
 
     // <moduleName>-metadata.json | Remove references to this model in the model metadata, menu, action & view sections. | Automatic
-    const filePath = await this.moduleMetadataHelperService.getModuleMetadataFilePath(modelEntity.module.name);
+    const filePath = await this.moduleMetadataHelperService.getModuleMetadataFilePath(modelEntity.module?.name);
     const metaData = await this.moduleMetadataHelperService.getModuleMetadataConfiguration(filePath);
     if (metaData) {
       const existingModelIndex = metaData.moduleMetadata.models.findIndex(
@@ -668,13 +674,13 @@ export class ModelMetadataService {
       }
 
       // Remove references to this model in the menu, action & view sections.
-      metaData.moduleMetadata.menus = metaData.moduleMetadata.menus.filter(
+      metaData.moduleMetadata.menus = metaData.moduleMetadata?.menus?.filter(
         (menu: any) => menu.modelUserKey !== modelEntity.singularName
       );
-      metaData.moduleMetadata.actions = metaData.moduleMetadata.actions.filter(
+      metaData.moduleMetadata.actions = metaData.moduleMetadata?.actions?.filter(
         (action: any) => action.modelUserKey !== modelEntity.singularName
       );
-      metaData.moduleMetadata.views = metaData.moduleMetadata.views.filter(
+      metaData.moduleMetadata.views = metaData.moduleMetadata?.views?.filter(
         (view: any) => view.modelUserKey !== modelEntity.singularName
       );
 

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

@@ -23,6 +23,8 @@ import { ModelMetadataService } from './model-metadata.service';
 import { ModuleMetadataHelperService } from 'src/helpers/module-metadata-helper.service';
 import { DisallowInProduction } from 'src/decorators/disallow-in-production.decorator';
 import { ERROR_MESSAGES } from 'src/constants/error-messages';
+import Module from 'module';
+import { ModuleMetadataRepository } from 'src/repository/module-metadata.repository';
 
 @Injectable()
 export class ModuleMetadataService {
@@ -31,8 +33,9 @@ export class ModuleMetadataService {
   constructor(
     @InjectDataSource()
     private readonly dataSource: DataSource,
-    @InjectRepository(ModuleMetadata)
-    private readonly moduleMetadataRepo: Repository<ModuleMetadata>,
+    // @InjectRepository(ModuleMetadata)
+    // private readonly moduleMetadataRepo: Repository<ModuleMetadata>,
+    private readonly moduleMetadataRepo: ModuleMetadataRepository,
     private readonly crudHelperService: CrudHelperService,
     private readonly schematicService: SchematicService,
     private readonly configService: ConfigService,
@@ -50,7 +53,7 @@ export class ModuleMetadataService {
     let { limit, offset } = basicFilterDto;
 
     // Create above query on pincode table using query builder
-    var qb: SelectQueryBuilder<ModuleMetadata> = this.moduleMetadataRepo.createQueryBuilder(alias)
+    var qb: SelectQueryBuilder<ModuleMetadata> = await this.moduleMetadataRepo.createSecurityRuleAwareQueryBuilder(alias)
     qb = await this.crudHelperService.buildFilterQuery(qb, basicFilterDto, alias);
 
     // Get the records and the count

package/src/services/mq-message-queue.service.ts

@@ -11,6 +11,7 @@ import { CrudHelperService } from "src/services/crud-helper.service";
 
 
 import { MqMessageQueue } from '../entities/mq-message-queue.entity';
+import { MqMessageQueueRepository } from 'src/repository/mq-message-queue.repository';
 
 @Injectable()
 export class MqMessageQueueService extends CRUDService<MqMessageQueue> {
@@ -24,8 +25,9 @@ export class MqMessageQueueService extends CRUDService<MqMessageQueue> {
     readonly crudHelperService: CrudHelperService,
     @InjectEntityManager()
     readonly entityManager: EntityManager,
-    @InjectRepository(MqMessageQueue)
-    readonly repo: Repository<MqMessageQueue>,
+    // @InjectRepository(MqMessageQueue)
+    // readonly repo: Repository<MqMessageQueue>,
+    readonly repo: MqMessageQueueRepository,
     readonly moduleRef: ModuleRef
 
   ) {

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

@@ -10,6 +10,7 @@ import { FileService } from "src/services/file.service";
 import { CrudHelperService } from "src/services/crud-helper.service";
 import { MqMessage } from '../entities/mq-message.entity';
 import { Logger } from '@nestjs/common';
+import { MqMessageRepository } from 'src/repository/mq-message.repository';
 
 @Injectable()
 export class MqMessageService extends CRUDService<MqMessage> {
@@ -25,8 +26,9 @@ export class MqMessageService extends CRUDService<MqMessage> {
     readonly crudHelperService: CrudHelperService,
     @InjectEntityManager()
     readonly entityManager: EntityManager,
-    @InjectRepository(MqMessage)
-    readonly repo: Repository<MqMessage>,
+    // @InjectRepository(MqMessage)
+    // readonly repo: Repository<MqMessage>,
+    readonly repo: MqMessageRepository,
     readonly moduleRef: ModuleRef
   ) {
     super(modelMetadataService, moduleMetadataService, configService, fileService, discoveryService, crudHelperService, entityManager, repo, 'mqMessage', 'solid-core', moduleRef);

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

@@ -13,6 +13,7 @@ import { CrudHelperService } from "src/services/crud-helper.service";
 import { PermissionMetadata } from '../entities/permission-metadata.entity';
 import { ActiveUserData } from '../interfaces/active-user-data.interface';
 import { classify } from '@angular-devkit/core/src/utils/strings';
+import { PermissionMetadataRepository } from 'src/repository/permission-metadata.repository';
 
 @Injectable()
 export class PermissionMetadataService extends CRUDService<PermissionMetadata> {
@@ -25,9 +26,10 @@ export class PermissionMetadataService extends CRUDService<PermissionMetadata> {
     readonly crudHelperService: CrudHelperService,
     @InjectEntityManager()
     readonly entityManager: EntityManager,
-    @InjectRepository(PermissionMetadata, 'default')
-    readonly repo: Repository<PermissionMetadata>,
-      readonly moduleRef: ModuleRef
+    // @InjectRepository(PermissionMetadata, 'default')
+    // readonly repo: Repository<PermissionMetadata>,
+    readonly repo: PermissionMetadataRepository,
+    readonly moduleRef: ModuleRef
   
   ) {
     super(modelMetadataService, moduleMetadataService,  configService, fileService, discoveryService, crudHelperService, entityManager, repo, 'permissionMetadata', 'solid-core',moduleRef);

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

@@ -1,4 +1,4 @@
-import { Logger } from '@nestjs/common';
+import { Logger, OnModuleDestroy } from '@nestjs/common';
 import * as amqp from 'amqplib';
 import { v4 as uuidv4 } from 'uuid';
 import { QueuesModuleOptions } from "../../interfaces";
@@ -6,11 +6,16 @@ import { QueueMessage, QueuePublisher } from '../../interfaces/mq';
 import { MqMessageQueueService } from '../mq-message-queue.service';
 import { MqMessageService } from '../mq-message.service';
 
-export abstract class RabbitMqPublisher<T> implements QueuePublisher<T> {
+export abstract class RabbitMqPublisher<T> implements OnModuleDestroy, QueuePublisher<T> {
     private readonly logger = new Logger(RabbitMqPublisher.name);
     private readonly url: string;
     private readonly serviceRole: string;
 
+    // Maintain connection...
+    private connection: amqp.Connection | null = null;
+    private channel: amqp.Channel | null = null;
+    private connectingPromise: Promise<void> | null = null;
+
     constructor(
         protected readonly mqMessageService: MqMessageService,
         protected readonly mqMessageQueueService: MqMessageQueueService,
@@ -23,27 +28,106 @@ export abstract class RabbitMqPublisher<T> implements QueuePublisher<T> {
         if (!this.serviceRole) {
             this.logger.debug('Queue service Role is not defined in the environment variables');
         }
-        this.logger.debug(`RabbitMqPublisher instance created with options: ${JSON.stringify(this.options())} and url: ${this.url}`);
+        // this.logger.debug(`RabbitMqPublisher instance created with options: ${JSON.stringify(this.options())} and url: ${this.url}`);
     }
 
     abstract options(): QueuesModuleOptions;
 
-    async establishConnection(): Promise<amqp.Connection> {
+    private async ensureConnectionAndChannel(): Promise<amqp.Channel> {
+        if (this.channel) {
+            return this.channel;
+        }
 
-        const url = new URL(this.url);
+        // If another call is already connecting, wait for it
+        if (this.connectingPromise) {
+            await this.connectingPromise;
+            if (this.channel) return this.channel;
+        }
+
+        this.connectingPromise = (async () => {
+            const url = new URL(this.url);
+
+            const conn = await amqp.connect({
+                protocol: url.protocol.replace(':', ''), // "amqps"
+                hostname: url.hostname,
+                port: parseInt(url.port),
+                username: url.username,
+                // Node's URL already decodes percent-encoding; decodeURIComponent is not needed
+                // But without it does not seem to be working...
+                password: decodeURIComponent(url.password),
+                frameMax: 131072,
+            });
+
+            conn.on('error', (err) => {
+                this.logger.error(`RabbitMQ connection error: ${err.message}`, err.stack);
+            });
+
+            conn.on('close', () => {
+                this.logger.warn('RabbitMQ connection closed, resetting');
+                this.connection = null;
+                this.channel = null;
+            });
 
-        const connection = await amqp.connect({
-            protocol: url.protocol.replace(':', ''),
-            hostname: url.hostname,
-            port: parseInt(url.port),
-            username: url.username,
-            password: url.password,
-            frameMax: 131072,
-        });
+            const channel = await conn.createChannel();
+
+            const options = this.options();
+            const queueName = options.queueName;
+            const exchangeName = `${queueName}.exchange`;
+            const routingKey = `${queueName}.routing-key`;
+
+            await channel.assertExchange(exchangeName, 'direct', {});
+            const queue = await channel.assertQueue(queueName, {});
+            await channel.bindQueue(queue.queue, exchangeName, routingKey);
+
+            this.connection = conn;
+            this.channel = channel;
+        })();
+
+        try {
+            await this.connectingPromise;
+        } finally {
+            this.connectingPromise = null;
+        }
+
+        if (!this.channel) {
+            throw new Error('Failed to initialize RabbitMQ channel');
+        }
 
-        return connection
+        return this.channel;
     }
 
+    // Nest will call this for every subclass instance, because they inherit the method
+    async onModuleDestroy(): Promise<void> {
+        await this.closeConnectionAndChannel();
+    }
+
+    private async closeConnectionAndChannel(): Promise<void> {
+        if (this.channel) {
+            try {
+                await this.channel.close();
+            } catch (err) {
+                this.logger.warn(
+                    `RabbitMqPublisher error closing channel: ${(err as Error).message}`,
+                );
+            } finally {
+                this.channel = null;
+            }
+        }
+
+        if (this.connection) {
+            try {
+                await this.connection.close();
+            } catch (err) {
+                this.logger.warn(
+                    `RabbitMqPublisher error closing connection: ${(err as Error).message}`,
+                );
+            } finally {
+                this.connection = null;
+            }
+        }
+    }
+
+
     async publish(message: QueueMessage<T>): Promise<string> {
         if (!this.url) {
             this.logger.error('RabbitMqPublisher url is not defined in the environment variables');
@@ -58,13 +142,7 @@ export abstract class RabbitMqPublisher<T> implements QueuePublisher<T> {
             throw new Error('Queue service Role is subscriber, cannot publish messages');
         }
 
-        this.logger.debug(`RabbitMqPublisher publishing with options: ${JSON.stringify(this.options())} and url: ${this.url}`);
-
-        // const connection = await amqp.connect(this.url);
-        const connection = await this.establishConnection();
-        // this.logger.debug(`RabbitMqPublisher publisher connected options: ${JSON.stringify(this.options())} and url: ${url}`);
-
-        const channel = await connection.createChannel();
+        const channel = await this.ensureConnectionAndChannel();
         // this.logger.debug(`RabbitMqPublisher publisher channel created options: ${JSON.stringify(this.options())} and url: ${url}`);
 
         const options = this.options();
@@ -73,15 +151,6 @@ export abstract class RabbitMqPublisher<T> implements QueuePublisher<T> {
         const exchangeName = `${queueName}.exchange`;
         const routingKey = `${queueName}.routing-key`;
 
-        await channel.assertExchange(exchangeName, 'direct', {});
-        // this.logger.debug(`RabbitMqPublisher channel asserted: ${JSON.stringify(this.options())} and url: ${url}`);
-
-        const queue = await channel.assertQueue(queueName, {});
-        // this.logger.debug(`RabbitMqPublisher queue asserted: ${JSON.stringify(this.options())} and url: ${url}`);
-
-        await channel.bindQueue(queue.queue, exchangeName, routingKey);
-        // this.logger.debug(`RabbitMqPublisher queue bound: ${JSON.stringify(this.options())} and url: ${url}`);
-
         // Set default values for retry. 
         // by default there are no retries.
         if (!message.retryCount) message.retryCount = 0;
@@ -111,20 +180,9 @@ export abstract class RabbitMqPublisher<T> implements QueuePublisher<T> {
             }
         }
         finally {
-            // TODO: check if we want to do this or keep the connection open all the time. 
-            // connection.close();
-            // setTimeout(() => {
-            //     connection.close();
-            //     this.logger.error('RabbitMqPublisher connection closed');
-            // }, 3000);
         }
         // this.logger.debug(`Sent message: ${JSON.stringify(message)}`);
 
-        // TODO: check if we want to do this or keep the connection open all the time. 
-        // setTimeout(() => {
-        //     connection.close();
-        // }, 500);
-
         // return the newly created message id.
         return message.messageId;
     }

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

@@ -23,7 +23,7 @@ export abstract class RabbitMqSubscriber<T> implements OnModuleInit, QueueSubscr
         if (!this.serviceRole) {
             this.logger.debug('Queue service Role is not defined in the environment variables');
         }
-        this.logger.debug(`RabbitMqSubscriber instance created with options: ${JSON.stringify(this.options())} and url: ${this.url}`);
+        // this.logger.debug(`RabbitMqSubscriber instance created with options: ${JSON.stringify(this.options())} and url: ${this.url}`);
     }
 
     abstract subscribe(message: QueueMessage<T>);
@@ -34,12 +34,17 @@ export abstract class RabbitMqSubscriber<T> implements OnModuleInit, QueueSubscr
 
         const url = new URL(this.url);
 
+        // this.logger.debug(`user: ${url.username}`);
+        // // just for local debug, don’t log in prod
+        // this.logger.debug(`pass: ${url.password}`);
+        // this.logger.debug(`path (vhost): ${url.pathname}`);
+
         const connection = await amqp.connect({
             protocol: url.protocol.replace(':', ''),
             hostname: url.hostname,
             port: parseInt(url.port),
             username: url.username,
-            password: url.password,
+            password: decodeURIComponent(url.password),
             frameMax: 131072,
         });
 
@@ -50,10 +55,18 @@ export abstract class RabbitMqSubscriber<T> implements OnModuleInit, QueueSubscr
         // we will start subscriber only if the current service role is subscriber. 
         if (this.url && ['both', 'subscriber'].includes(this.serviceRole)) {
 
-            // this.logger.debug(`RabbitMqSubscriber instance created with options: ${JSON.stringify(this.options())} and url: ${url}`);
+            // this.logger.debug(`RabbitMqSubscriber instance created with options: ${JSON.stringify(this.options())} and url: ${this.url}`);
             // const connection = await amqp.connect(this.url);
-            const connection = await this.establishConnection();
-            // this.logger.debug(`RabbitMqSubscriber connection established: ${JSON.stringify(this.options())} and url: ${url}`);
+
+            let connection;
+            try {
+                connection = await this.establishConnection();
+                // this.logger.debug(`RabbitMqSubscriber connection established: ${JSON.stringify(this.options())} and url: ${this.url}`);
+            }
+            catch (err) {
+                this.logger.error(`Failed to connect to RabbitMQ: ${(err as Error).message}`, (err as Error).stack);
+                throw err;
+            }
 
             const channel = await connection.createChannel();
             // this.logger.debug(`RabbitMqSubscriber channel created: ${JSON.stringify(this.options())} and url: ${url}`);

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

@@ -1,18 +1,20 @@
 import { forwardRef, Inject, Injectable, Logger, NotFoundException } from '@nestjs/common';
-import { InjectEntityManager, InjectRepository } from '@nestjs/typeorm';
+import { ConfigService } from '@nestjs/config';
 import { DiscoveryService, ModuleRef } from "@nestjs/core";
-import { EntityManager, In, 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, In } from 'typeorm';
 
-import { RoleMetadata } from '../entities/role-metadata.entity';
-import { PermissionMetadata } from '../entities/permission-metadata.entity';
-import { CreateRoleMetadataDto } from '../dtos/create-role-metadata.dto';
 import { ERROR_MESSAGES } from 'src/constants/error-messages';
+import { PermissionMetadataRepository } from 'src/repository/permission-metadata.repository';
+import { RoleMetadataRepository } from 'src/repository/role-metadata.repository';
+import { CreateRoleMetadataDto } from '../dtos/create-role-metadata.dto';
+import { PermissionMetadata } from '../entities/permission-metadata.entity';
+import { RoleMetadata } from '../entities/role-metadata.entity';
 
 @Injectable()
 export class RoleMetadataService extends CRUDService<RoleMetadata> {
@@ -28,10 +30,12 @@ export class RoleMetadataService extends CRUDService<RoleMetadata> {
     readonly crudHelperService: CrudHelperService,
     @InjectEntityManager()
     readonly entityManager: EntityManager,
-    @InjectRepository(RoleMetadata, 'default')
-    readonly repo: Repository<RoleMetadata>,
-    @InjectRepository(PermissionMetadata)
-    private readonly permissionRepository: Repository<PermissionMetadata>,
+    // @InjectRepository(RoleMetadata, 'default')
+    // readonly repo: Repository<RoleMetadata>,
+    readonly repo: RoleMetadataRepository,
+    // @InjectRepository(PermissionMetadata)
+    // private readonly permissionRepository: Repository<PermissionMetadata>,
+    readonly permissionRepository: PermissionMetadataRepository,
     readonly moduleRef: ModuleRef
 
   ) {

package/src/services/saved-filters.service.ts

@@ -1,16 +1,17 @@
 import { Injectable } from '@nestjs/common';
-import { InjectEntityManager, InjectRepository } from '@nestjs/typeorm';
-import { DiscoveryService, ModuleRef  } from "@nestjs/core";
-import { EntityManager, Repository } from 'typeorm';
+import { DiscoveryService, ModuleRef } from "@nestjs/core";
+import { InjectEntityManager } from '@nestjs/typeorm';
+import { EntityManager } from 'typeorm';
 
+import { ConfigService } from '@nestjs/config';
+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 { SavedFiltersRepository } from 'src/repository/saved-filters.repository';
 import { SavedFilters } from '../entities/saved-filters.entity';
 
 @Injectable()
@@ -24,8 +25,9 @@ export class SavedFiltersService extends CRUDService<SavedFilters>{
     readonly crudHelperService: CrudHelperService,
     @InjectEntityManager()
     readonly entityManager: EntityManager,
-    @InjectRepository(SavedFilters, 'default')
-    readonly repo: Repository<SavedFilters>,
+    // @InjectRepository(SavedFilters, 'default')
+    // readonly repo: Repository<SavedFilters>,
+    readonly repo: SavedFiltersRepository,
     readonly moduleRef: ModuleRef
 
  ) {

package/src/services/scheduled-job.service.ts

@@ -10,6 +10,7 @@ import { FileService } from './file.service';
 import { CrudHelperService } from './crud-helper.service';
 import { CRUDService } from './crud.service';
 import { Logger } from '@nestjs/common';
+import { ScheduledJobRepository } from 'src/repository/scheduled-job.repository';
 
 @Injectable()
 export class ScheduledJobService extends CRUDService<ScheduledJob> {
@@ -24,8 +25,9 @@ export class ScheduledJobService extends CRUDService<ScheduledJob> {
     readonly crudHelperService: CrudHelperService,
     @InjectEntityManager()
     readonly entityManager: EntityManager,
-    @InjectRepository(ScheduledJob)
-    readonly repo: Repository<ScheduledJob>,
+    // @InjectRepository(ScheduledJob)
+    // readonly repo: Repository<ScheduledJob>,
+    readonly repo: ScheduledJobRepository,
     readonly moduleRef: ModuleRef
 
   ) {