@solidstarters/solid-core 1.2.189 → 1.2.192

package/dist/services/queues/rabbitmq-publisher.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"rabbitmq-publisher.service.js","sourceRoot":"","sources":["../../../src/services/queues/rabbitmq-publisher.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Logger } from '@nestjs/common';\nimport * as amqp from 'amqplib';\nimport { v4 as uuidv4 } from 'uuid';\nimport { QueuesModuleOptions } from \"../../interfaces\";\nimport { QueueMessage, QueuePublisher } from '../../interfaces/mq';\nimport { MqMessageQueueService } from '../mq-message-queue.service';\nimport { MqMessageService } from '../mq-message.service';\n\nexport abstract class RabbitMqPublisher<T> implements QueuePublisher<T> {\n    private readonly logger = new Logger(RabbitMqPublisher.name);\n    private readonly url: string;\n    private readonly serviceRole: string;\n\n    constructor(\n        protected readonly mqMessageService: MqMessageService,\n        protected readonly mqMessageQueueService: MqMessageQueueService,\n    ) {\n        this.url = process.env.QUEUES_RABBIT_MQ_URL;\n        this.serviceRole = process.env.QUEUES_SERVICE_ROLE;\n        if (!this.url) {\n            this.logger.debug('RabbitMqPublisher url is not defined in the environment variables');\n        }\n        if (!this.serviceRole) {\n            this.logger.debug('Queue service Role is not defined in the environment variables');\n        }\n        this.logger.debug(`RabbitMqPublisher instance created with options: ${JSON.stringify(this.options())} and url: ${this.url}`);\n    }\n\n    abstract options(): QueuesModuleOptions;\n\n    async establishConnection(): Promise<amqp.Connection> {\n\n        const url = new URL(this.url);\n\n        const connection = await amqp.connect({\n            protocol: url.protocol.replace(':', ''),\n            hostname: url.hostname,\n            port: parseInt(url.port),\n            username: url.username,\n            password: url.password,\n            frameMax: 131072,\n        });\n\n        return connection\n    }\n\n    async publish(message: QueueMessage<T>): Promise<string> {\n        if (!this.url) {\n            this.logger.error('RabbitMqPublisher url is not defined in the environment variables');\n            throw new Error('RabbitMqPublisher url is not defined in the environment variables');\n        }\n        if (!this.serviceRole) {\n            this.logger.error('Queue service Role is not defined in the environment variables');\n            throw new Error('Queue service Role is not defined in the environment variables');\n        }\n        if (this.serviceRole === 'subscriber') {\n            this.logger.error('Queue service Role is subscriber, cannot publish messages');\n            throw new Error('Queue service Role is subscriber, cannot publish messages');\n        }\n\n        this.logger.debug(`RabbitMqPublisher publishing with options: ${JSON.stringify(this.options())} and url: ${this.url}`);\n\n        // const connection = await amqp.connect(this.url);\n        const connection = await this.establishConnection();\n        // this.logger.debug(`RabbitMqPublisher publisher connected options: ${JSON.stringify(this.options())} and url: ${url}`);\n\n        const channel = await connection.createChannel();\n        // this.logger.debug(`RabbitMqPublisher publisher channel created options: ${JSON.stringify(this.options())} and url: ${url}`);\n\n        const options = this.options();\n\n        const queueName = options.queueName;\n        const exchangeName = `${queueName}.exchange`;\n        const routingKey = `${queueName}.routing-key`;\n\n        await channel.assertExchange(exchangeName, 'direct', {});\n        // this.logger.debug(`RabbitMqPublisher channel asserted: ${JSON.stringify(this.options())} and url: ${url}`);\n\n        const queue = await channel.assertQueue(queueName, {});\n        // this.logger.debug(`RabbitMqPublisher queue asserted: ${JSON.stringify(this.options())} and url: ${url}`);\n\n        await channel.bindQueue(queue.queue, exchangeName, routingKey);\n        // this.logger.debug(`RabbitMqPublisher queue bound: ${JSON.stringify(this.options())} and url: ${url}`);\n\n        // Set default values for retry. \n        // by default there are no retries.\n        if (!message.retryCount) message.retryCount = 0;\n        if (!message.retryInterval) message.retryInterval = 1000;\n\n        // generate a new message id \n        message.messageId = uuidv4();\n\n        // Save the message to the DB so that we can then change its status in the subscriber...\n        await this.persistToDatabase(queueName, message);\n\n        // wait for the channel to confirm \n        try {\n            // Publish the message\n            // const publishStatus = channel.publish(exchangeName, routingKey, Buffer.from(JSON.stringify(message)));\n            const publishStatus = channel.publish(exchangeName, routingKey, Buffer.from(JSON.stringify(message)), { mandatory: true });\n            // this.logger.debug(`RabbitMqPublisher publish status: ${JSON.stringify(publishStatus)}`);\n            // if (!publishStatus) {\n            //     this.logger.warn('RabbitMqPublisher Message buffering failed!');\n            // }\n            // await channel.waitForConfirms();\n            // this.logger.debug('RabbitMqPublisher Message published successfully');\n        } catch (err) {\n            this.logger.error(`RabbitMqPublisher Message publish failed: ${JSON.stringify(err)}`);\n            if (err instanceof Error) {\n                this.logger.error(`RabbitMqPublisher Error stack: ${err.stack}`);\n            }\n        }\n        finally {\n            // TODO: check if we want to do this or keep the connection open all the time. \n            // connection.close();\n            // setTimeout(() => {\n            //     connection.close();\n            //     this.logger.error('RabbitMqPublisher connection closed');\n            // }, 3000);\n        }\n        // this.logger.debug(`Sent message: ${JSON.stringify(message)}`);\n\n        // TODO: check if we want to do this or keep the connection open all the time. \n        // setTimeout(() => {\n        //     connection.close();\n        // }, 500);\n\n        // return the newly created message id.\n        return message.messageId;\n    }\n\n    private async persistToDatabase(queueName: string, message: QueueMessage<T>) {\n\n        // TODO: make an entry in the relevant database table, generate a unique id earlier.\n        try {\n            // 1. resolve the queue first\n            const mqMessageQueue = await this.mqMessageQueueService.resolveQueue(queueName);\n\n            // 2. Next create an entry in the mqMessage table. \n            await this.mqMessageService.create({\n                messageBroker: this.options().type,\n                messageId: message.messageId,\n                retryCount: message.retryCount,\n                retryInterval: message.retryInterval,\n                stage: 'pending',\n                startedAt: new Date(),\n                input: JSON.stringify(message, null, 2),\n                parentEntityId: message.parentEntityId,\n                parentEntity: message.parentEntity,\n                mqMessageQueueId: mqMessageQueue.id,\n            });\n        }\n        catch (error) {\n            this.logger.error(error.message, error.stack);\n        }\n\n    }\n}\n"]}
+{"version":3,"file":"rabbitmq-publisher.service.js","sourceRoot":"","sources":["../../../src/services/queues/rabbitmq-publisher.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Logger, OnModuleDestroy } from '@nestjs/common';\nimport * as amqp from 'amqplib';\nimport { v4 as uuidv4 } from 'uuid';\nimport { QueuesModuleOptions } from \"../../interfaces\";\nimport { QueueMessage, QueuePublisher } from '../../interfaces/mq';\nimport { MqMessageQueueService } from '../mq-message-queue.service';\nimport { MqMessageService } from '../mq-message.service';\n\nexport abstract class RabbitMqPublisher<T> implements OnModuleDestroy, QueuePublisher<T> {\n    private readonly logger = new Logger(RabbitMqPublisher.name);\n    private readonly url: string;\n    private readonly serviceRole: string;\n\n    // Maintain connection...\n    private connection: amqp.Connection | null = null;\n    private channel: amqp.Channel | null = null;\n    private connectingPromise: Promise<void> | null = null;\n\n    constructor(\n        protected readonly mqMessageService: MqMessageService,\n        protected readonly mqMessageQueueService: MqMessageQueueService,\n    ) {\n        this.url = process.env.QUEUES_RABBIT_MQ_URL;\n        this.serviceRole = process.env.QUEUES_SERVICE_ROLE;\n        if (!this.url) {\n            this.logger.debug('RabbitMqPublisher url is not defined in the environment variables');\n        }\n        if (!this.serviceRole) {\n            this.logger.debug('Queue service Role is not defined in the environment variables');\n        }\n        // this.logger.debug(`RabbitMqPublisher instance created with options: ${JSON.stringify(this.options())} and url: ${this.url}`);\n    }\n\n    abstract options(): QueuesModuleOptions;\n\n    private async ensureConnectionAndChannel(): Promise<amqp.Channel> {\n        if (this.channel) {\n            return this.channel;\n        }\n\n        // If another call is already connecting, wait for it\n        if (this.connectingPromise) {\n            await this.connectingPromise;\n            if (this.channel) return this.channel;\n        }\n\n        this.connectingPromise = (async () => {\n            const url = new URL(this.url);\n\n            const conn = await amqp.connect({\n                protocol: url.protocol.replace(':', ''), // \"amqps\"\n                hostname: url.hostname,\n                port: parseInt(url.port),\n                username: url.username,\n                // Node's URL already decodes percent-encoding; decodeURIComponent is not needed\n                // But without it does not seem to be working...\n                password: decodeURIComponent(url.password),\n                frameMax: 131072,\n            });\n\n            conn.on('error', (err) => {\n                this.logger.error(`RabbitMQ connection error: ${err.message}`, err.stack);\n            });\n\n            conn.on('close', () => {\n                this.logger.warn('RabbitMQ connection closed, resetting');\n                this.connection = null;\n                this.channel = null;\n            });\n\n            const channel = await conn.createChannel();\n\n            const options = this.options();\n            const queueName = options.queueName;\n            const exchangeName = `${queueName}.exchange`;\n            const routingKey = `${queueName}.routing-key`;\n\n            await channel.assertExchange(exchangeName, 'direct', {});\n            const queue = await channel.assertQueue(queueName, {});\n            await channel.bindQueue(queue.queue, exchangeName, routingKey);\n\n            this.connection = conn;\n            this.channel = channel;\n        })();\n\n        try {\n            await this.connectingPromise;\n        } finally {\n            this.connectingPromise = null;\n        }\n\n        if (!this.channel) {\n            throw new Error('Failed to initialize RabbitMQ channel');\n        }\n\n        return this.channel;\n    }\n\n    // Nest will call this for every subclass instance, because they inherit the method\n    async onModuleDestroy(): Promise<void> {\n        await this.closeConnectionAndChannel();\n    }\n\n    private async closeConnectionAndChannel(): Promise<void> {\n        if (this.channel) {\n            try {\n                await this.channel.close();\n            } catch (err) {\n                this.logger.warn(\n                    `RabbitMqPublisher error closing channel: ${(err as Error).message}`,\n                );\n            } finally {\n                this.channel = null;\n            }\n        }\n\n        if (this.connection) {\n            try {\n                await this.connection.close();\n            } catch (err) {\n                this.logger.warn(\n                    `RabbitMqPublisher error closing connection: ${(err as Error).message}`,\n                );\n            } finally {\n                this.connection = null;\n            }\n        }\n    }\n\n\n    async publish(message: QueueMessage<T>): Promise<string> {\n        if (!this.url) {\n            this.logger.error('RabbitMqPublisher url is not defined in the environment variables');\n            throw new Error('RabbitMqPublisher url is not defined in the environment variables');\n        }\n        if (!this.serviceRole) {\n            this.logger.error('Queue service Role is not defined in the environment variables');\n            throw new Error('Queue service Role is not defined in the environment variables');\n        }\n        if (this.serviceRole === 'subscriber') {\n            this.logger.error('Queue service Role is subscriber, cannot publish messages');\n            throw new Error('Queue service Role is subscriber, cannot publish messages');\n        }\n\n        const channel = await this.ensureConnectionAndChannel();\n        // this.logger.debug(`RabbitMqPublisher publisher channel created options: ${JSON.stringify(this.options())} and url: ${url}`);\n\n        const options = this.options();\n\n        const queueName = options.queueName;\n        const exchangeName = `${queueName}.exchange`;\n        const routingKey = `${queueName}.routing-key`;\n\n        // Set default values for retry. \n        // by default there are no retries.\n        if (!message.retryCount) message.retryCount = 0;\n        if (!message.retryInterval) message.retryInterval = 1000;\n\n        // generate a new message id \n        message.messageId = uuidv4();\n\n        // Save the message to the DB so that we can then change its status in the subscriber...\n        await this.persistToDatabase(queueName, message);\n\n        // wait for the channel to confirm \n        try {\n            // Publish the message\n            // const publishStatus = channel.publish(exchangeName, routingKey, Buffer.from(JSON.stringify(message)));\n            const publishStatus = channel.publish(exchangeName, routingKey, Buffer.from(JSON.stringify(message)), { mandatory: true });\n            // this.logger.debug(`RabbitMqPublisher publish status: ${JSON.stringify(publishStatus)}`);\n            // if (!publishStatus) {\n            //     this.logger.warn('RabbitMqPublisher Message buffering failed!');\n            // }\n            // await channel.waitForConfirms();\n            // this.logger.debug('RabbitMqPublisher Message published successfully');\n        } catch (err) {\n            this.logger.error(`RabbitMqPublisher Message publish failed: ${JSON.stringify(err)}`);\n            if (err instanceof Error) {\n                this.logger.error(`RabbitMqPublisher Error stack: ${err.stack}`);\n            }\n        }\n        finally {\n        }\n        // this.logger.debug(`Sent message: ${JSON.stringify(message)}`);\n\n        // return the newly created message id.\n        return message.messageId;\n    }\n\n    private async persistToDatabase(queueName: string, message: QueueMessage<T>) {\n\n        // TODO: make an entry in the relevant database table, generate a unique id earlier.\n        try {\n            // 1. resolve the queue first\n            const mqMessageQueue = await this.mqMessageQueueService.resolveQueue(queueName);\n\n            // 2. Next create an entry in the mqMessage table. \n            await this.mqMessageService.create({\n                messageBroker: this.options().type,\n                messageId: message.messageId,\n                retryCount: message.retryCount,\n                retryInterval: message.retryInterval,\n                stage: 'pending',\n                startedAt: new Date(),\n                input: JSON.stringify(message, null, 2),\n                parentEntityId: message.parentEntityId,\n                parentEntity: message.parentEntity,\n                mqMessageQueueId: mqMessageQueue.id,\n            });\n        }\n        catch (error) {\n            this.logger.error(error.message, error.stack);\n        }\n\n    }\n}\n"]}

package/dist/services/queues/rabbitmq-subscriber.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rabbitmq-subscriber.service.d.ts","sourceRoot":"","sources":["../../../src/services/queues/rabbitmq-subscriber.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,YAAY,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,KAAK,IAAI,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AACpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAGzD,8BAAsB,kBAAkB,CAAC,CAAC,CAAE,YAAW,YAAY,EAAE,eAAe,CAAC,CAAC,CAAC;IAM/E,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB;IACrD,SAAS,CAAC,QAAQ,CAAC,qBAAqB,EAAE,qBAAqB;IANnE,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAuC;IAC9D,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAS;IAC7B,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;gBAGd,gBAAgB,EAAE,gBAAgB,EAClC,qBAAqB,EAAE,qBAAqB;IAanE,QAAQ,CAAC,SAAS,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC;IAE3C,QAAQ,CAAC,OAAO,IAAI,mBAAmB;IAEjC,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC;IAgB/C,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;cAkFnB,cAAc,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,UAAU,KAAA,EAAE,OAAO,KAAA,GAAG,OAAO,CAAC,IAAI,CAAC;YAiB9E,YAAY;YA0BZ,sBAAsB;CAkCvC"}
+{"version":3,"file":"rabbitmq-subscriber.service.d.ts","sourceRoot":"","sources":["../../../src/services/queues/rabbitmq-subscriber.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,YAAY,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,KAAK,IAAI,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AACpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAGzD,8BAAsB,kBAAkB,CAAC,CAAC,CAAE,YAAW,YAAY,EAAE,eAAe,CAAC,CAAC,CAAC;IAM/E,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB;IACrD,SAAS,CAAC,QAAQ,CAAC,qBAAqB,EAAE,qBAAqB;IANnE,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAuC;IAC9D,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAS;IAC7B,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;gBAGd,gBAAgB,EAAE,gBAAgB,EAClC,qBAAqB,EAAE,qBAAqB;IAanE,QAAQ,CAAC,SAAS,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC;IAE3C,QAAQ,CAAC,OAAO,IAAI,mBAAmB;IAEjC,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC;IAqB/C,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;cA0FnB,cAAc,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,UAAU,KAAA,EAAE,OAAO,KAAA,GAAG,OAAO,CAAC,IAAI,CAAC;YAiB9E,YAAY;YA0BZ,sBAAsB;CAkCvC"}

package/dist/services/queues/rabbitmq-subscriber.service.js

@@ -49,7 +49,6 @@ class RabbitMqSubscriber {
         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}`);
     }
     async establishConnection() {
         const url = new URL(this.url);
@@ -58,14 +57,21 @@ class RabbitMqSubscriber {
             hostname: url.hostname,
             port: parseInt(url.port),
             username: url.username,
-            password: url.password,
+            password: decodeURIComponent(url.password),
             frameMax: 131072,
         });
         return connection;
     }
     async onModuleInit() {
         if (this.url && ['both', 'subscriber'].includes(this.serviceRole)) {
-            const connection = await this.establishConnection();
+            let connection;
+            try {
+                connection = await this.establishConnection();
+            }
+            catch (err) {
+                this.logger.error(`Failed to connect to RabbitMQ: ${err.message}`, err.stack);
+                throw err;
+            }
             const channel = await connection.createChannel();
             const options = this.options();
             const queueName = options.queueName;

package/dist/services/queues/rabbitmq-subscriber.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"rabbitmq-subscriber.service.js","sourceRoot":"","sources":["../../../src/services/queues/rabbitmq-subscriber.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAAsD;AACtD,8CAAgC;AAOhC,MAAsB,kBAAkB;IAKpC,YACuB,gBAAkC,EAClC,qBAA4C;QAD5C,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,0BAAqB,GAArB,qBAAqB,CAAuB;QANlD,WAAM,GAAG,IAAI,eAAM,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;QAQ1D,IAAI,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC;QAC5C,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC;QACnD,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;YACZ,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mEAAmE,CAAC,CAAC;QAC3F,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YACpB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,gEAAgE,CAAC,CAAC;QACxF,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,qDAAqD,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,aAAa,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;IAClI,CAAC;IAMD,KAAK,CAAC,mBAAmB;QAErB,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAE9B,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC;YAClC,QAAQ,EAAE,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC;YACvC,QAAQ,EAAE,GAAG,CAAC,QAAQ;YACtB,IAAI,EAAE,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC;YACxB,QAAQ,EAAE,GAAG,CAAC,QAAQ;YACtB,QAAQ,EAAE,GAAG,CAAC,QAAQ;YACtB,QAAQ,EAAE,MAAM;SACnB,CAAC,CAAC;QAEH,OAAO,UAAU,CAAA;IACrB,CAAC;IAED,KAAK,CAAC,YAAY;QAEd,IAAI,IAAI,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC;YAIhE,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,mBAAmB,EAAE,CAAC;YAGpD,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,aAAa,EAAE,CAAC;YAGjD,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;YAE/B,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;YACpC,MAAM,YAAY,GAAG,GAAG,SAAS,WAAW,CAAC;YAC7C,MAAM,UAAU,GAAG,GAAG,SAAS,cAAc,CAAC;YAE9C,MAAM,OAAO,CAAC,cAAc,CAAC,YAAY,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC;YAGzD,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;YAGvD,MAAM,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,EAAE,YAAY,EAAE,UAAU,CAAC,CAAC;YAI/D,OAAO,CAAC,OAAO,CACX,KAAK,CAAC,KAAK,EACX,KAAK,EAAE,UAAU,EAAE,EAAE;gBACjB,IAAI,UAAU,EAAE,CAAC;oBACb,MAAM,oBAAoB,GAAG,UAAU,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;oBAC3D,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,4CAA4C,oBAAoB,EAAE,CAAC,CAAC;oBAEtF,IAAI,OAAO,GAAoB,IAAI,CAAC;oBAEpC,IAAI,CAAC;wBACD,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,oBAAoB,CAAoB,CAAC;wBAG9D,IAAI,CAAC,OAAO,CAAC,UAAU;4BAAE,OAAO,CAAC,UAAU,GAAG,CAAC,CAAC;wBAChD,IAAI,CAAC,OAAO,CAAC,aAAa;4BAAE,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC;wBACzD,IAAI,CAAC,OAAO,CAAC,YAAY;4BAAE,OAAO,CAAC,YAAY,GAAG,CAAC,CAAC;wBAEpD,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;oBAC5D,CAAC;oBACD,OAAO,KAAK,EAAE,CAAC;wBACX,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,6BAA6B,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;wBAGhE,IAAI,OAAO,EAAE,CAAC;4BACV,IAAI,OAAO,CAAC,YAAY,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;gCAC5C,MAAM,IAAI,CAAC,sBAAsB,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;gCAEvD,OAAO,CAAC,YAAY,EAAE,CAAC;gCACvB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,qBAAqB,OAAO,CAAC,YAAY,IAAI,OAAO,CAAC,UAAU,WAAW,OAAO,CAAC,aAAa,IAAI,CAAC,CAAC;gCACtH,UAAU,CAAC,GAAG,EAAE;oCACZ,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;gCACpD,CAAC,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC;4BAC9B,CAAC;iCAAM,CAAC;gCACJ,MAAM,IAAI,CAAC,sBAAsB,CAAC,QAAQ,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;gCAExE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,wBAAwB,OAAO,CAAC,UAAU,cAAc,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;gCAC3F,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;4BAC5B,CAAC;wBACL,CAAC;oBAEL,CAAC;gBACL,CAAC;YACL,CAAC,EAED,EAAE,CACL,CAAC;YAEF,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,iDAAiD,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,aAAa,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;QAC5H,CAAC;IACL,CAAC;IAKS,KAAK,CAAC,cAAc,CAAC,OAAwB,EAAE,UAAU,EAAE,OAAO;QACxE,MAAM,IAAI,CAAC,sBAAsB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAGtD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAG7C,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAGxB,MAAM,IAAI,CAAC,sBAAsB,CAAC,WAAW,EAAE,OAAO,EAAE,EAAE,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IAE/G,CAAC;IAKO,KAAK,CAAC,YAAY,CAAC,OAAwB,EAAE,UAAU,EAAE,OAAO;QACpE,IAAI,CAAC;YACD,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;QAC5D,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,IAAI,OAAO,CAAC,YAAY,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;gBAC5C,MAAM,IAAI,CAAC,sBAAsB,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;gBAEvD,OAAO,CAAC,YAAY,EAAE,CAAC;gBACvB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,qBAAqB,OAAO,CAAC,YAAY,IAAI,OAAO,CAAC,UAAU,WAAW,OAAO,CAAC,aAAa,OAAO,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;gBACxI,UAAU,CAAC,GAAG,EAAE;oBACZ,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;gBACpD,CAAC,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC;YAC9B,CAAC;iBAAM,CAAC;gBAEJ,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,wBAAwB,OAAO,CAAC,UAAU,cAAc,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;gBAG3F,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;gBAGxB,MAAM,IAAI,CAAC,sBAAsB,CAAC,QAAQ,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;YAE5E,CAAC;QACL,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,sBAAsB,CAAC,KAAa,EAAE,OAAwB,EAAE,QAAgB,EAAE,EAAE,SAAiB,EAAE;QAGjH,IAAI,CAAC;YAED,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC;gBACvD,KAAK,EAAE;oBACH,SAAS,EAAE,OAAO,CAAC,SAAS;iBAC/B;aACJ,CAAC,CAAC;YAEH,IAAI,SAAS,EAAE,CAAC;gBACZ,MAAM,aAAa,GAAG;oBAClB,KAAK,EAAE,KAAK;iBACf,CAAC;gBACF,IAAI,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,WAAW,EAAE,CAAC;oBAC9C,aAAa,CAAC,YAAY,CAAC,GAAG,IAAI,IAAI,EAAE,CAAC;oBACzC,aAAa,CAAC,eAAe,CAAC,GAAG,aAAa,CAAC,YAAY,CAAC,CAAC,OAAO,EAAE,GAAG,SAAS,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;gBAC3G,CAAC;gBACD,IAAI,KAAK,KAAK,WAAW,EAAE,CAAC;oBACxB,aAAa,CAAC,QAAQ,CAAC,GAAG,MAAM,CAAC;gBACrC,CAAC;gBACD,IAAI,KAAK,KAAK,QAAQ,EAAE,CAAC;oBACrB,aAAa,CAAC,OAAO,CAAC,GAAG,KAAK,CAAC;gBACnC,CAAC;gBACD,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,EAAE,aAAa,CAAC,CAAC;YACzE,CAAC;QACL,CAAC;QACD,OAAO,KAAK,EAAE,CAAC;YACX,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;QAClD,CAAC;IAEL,CAAC;CAEJ;AAvMD,gDAuMC","sourcesContent":["import { Logger, OnModuleInit } from '@nestjs/common';\nimport * as amqp from 'amqplib';\nimport { QueuesModuleOptions } from \"../../interfaces\";\nimport { QueueMessage, QueueSubscriber } from '../../interfaces/mq';\nimport { MqMessageQueueService } from '../mq-message-queue.service';\nimport { MqMessageService } from '../mq-message.service';\n\n\nexport abstract class RabbitMqSubscriber<T> implements OnModuleInit, QueueSubscriber<T> { // TODO This can be made a generic type for better type visibility\n    private readonly logger = new Logger(RabbitMqSubscriber.name);\n    private readonly url: string;\n    private readonly serviceRole: string;\n\n    constructor(\n        protected readonly mqMessageService: MqMessageService,\n        protected readonly mqMessageQueueService: MqMessageQueueService,\n    ) {\n        this.url = process.env.QUEUES_RABBIT_MQ_URL;\n        this.serviceRole = process.env.QUEUES_SERVICE_ROLE;\n        if (!this.url) {\n            this.logger.debug('RabbitMqPublisher url is not defined in the environment variables');\n        }\n        if (!this.serviceRole) {\n            this.logger.debug('Queue service Role is not defined in the environment variables');\n        }\n        this.logger.debug(`RabbitMqSubscriber instance created with options: ${JSON.stringify(this.options())} and url: ${this.url}`);\n    }\n\n    abstract subscribe(message: QueueMessage<T>);\n\n    abstract options(): QueuesModuleOptions;\n\n    async establishConnection(): Promise<amqp.Connection> {\n\n        const url = new URL(this.url);\n\n        const connection = await amqp.connect({\n            protocol: url.protocol.replace(':', ''),\n            hostname: url.hostname,\n            port: parseInt(url.port),\n            username: url.username,\n            password: url.password,\n            frameMax: 131072,\n        });\n\n        return connection\n    }\n\n    async onModuleInit(): Promise<void> {\n        // we will start subscriber only if the current service role is subscriber. \n        if (this.url && ['both', 'subscriber'].includes(this.serviceRole)) {\n\n            // this.logger.debug(`RabbitMqSubscriber instance created with options: ${JSON.stringify(this.options())} and url: ${url}`);\n            // const connection = await amqp.connect(this.url);\n            const connection = await this.establishConnection();\n            // this.logger.debug(`RabbitMqSubscriber connection established: ${JSON.stringify(this.options())} and url: ${url}`);\n\n            const channel = await connection.createChannel();\n            // this.logger.debug(`RabbitMqSubscriber channel created: ${JSON.stringify(this.options())} and url: ${url}`);\n\n            const options = this.options();\n\n            const queueName = options.queueName;\n            const exchangeName = `${queueName}.exchange`;\n            const routingKey = `${queueName}.routing-key`;\n\n            await channel.assertExchange(exchangeName, 'direct', {});\n            // this.logger.debug(`RabbitMqSubscriber channel asserted: ${JSON.stringify(this.options())} and url: ${url}`);\n\n            const queue = await channel.assertQueue(queueName, {});\n            // this.logger.debug(`RabbitMqSubscriber queue asserted: ${JSON.stringify(this.options())} and url: ${url}`);\n\n            await channel.bindQueue(queue.queue, exchangeName, routingKey);\n            // this.logger.debug(`RabbitMqSubscriber queue bound: ${JSON.stringify(this.options())} and url: ${url}`);\n\n            // Consume messages from the queue\n            channel.consume(\n                queue.queue,\n                async (rawMessage) => {\n                    if (rawMessage) {\n                        const messageContentString = rawMessage.content.toString();\n                        this.logger.debug(`RabbitMqSubscriber Received raw message: ${messageContentString}`);\n\n                        let message: QueueMessage<T> = null;\n\n                        try {\n                            message = JSON.parse(messageContentString) as QueueMessage<T>;\n\n                            // this is the first time we are receiving the message so we set the currentRetry to 0\n                            if (!message.retryCount) message.retryCount = 0;\n                            if (!message.retryInterval) message.retryInterval = 1000;\n                            if (!message.currentRetry) message.currentRetry = 0;\n\n                            await this.processMessage(message, rawMessage, channel);\n                        }\n                        catch (error) {\n                            this.logger.error(`Error processing message: ${error.message}`);\n\n                            // if an error occurs then if retryCount is set we start retrying. \n                            if (message) {\n                                if (message.currentRetry < message.retryCount) {\n                                    await this.updateStatusInDatabase('retrying', message);\n\n                                    message.currentRetry++;\n                                    this.logger.warn(`Retrying message (${message.currentRetry}/${message.retryCount}) after ${message.retryInterval}ms`);\n                                    setTimeout(() => {\n                                        this.retryMessage(message, rawMessage, channel);\n                                    }, message.retryInterval);\n                                } else {\n                                    await this.updateStatusInDatabase('failed', message, error.message, '');\n\n                                    this.logger.error(`Message failed after ${message.retryCount} attempts: ${error.message}`);\n                                    channel.ack(rawMessage); // Discard the message after max retries\n                                }\n                            }\n\n                        }\n                    }\n                },\n                // { noAck: true },\n                {},\n            );\n\n            this.logger.log(`RabbitMqSubscriber ready to consume messages: ${JSON.stringify(this.options())} and url: ${this.url}`);\n        }\n    }\n\n    /**\n     * Abstract method for message processing logic.\n     */\n    protected async processMessage(message: QueueMessage<T>, rawMessage, channel): Promise<void> {\n        await this.updateStatusInDatabase('started', message);\n\n        // Capture the results of handling the task.\n        const result = await this.subscribe(message);\n\n        // Ack the message. \n        channel.ack(rawMessage);\n\n        // TODO: Update the database to indicate that the task is finished.\n        await this.updateStatusInDatabase('succeeded', message, '', result ? JSON.stringify(result, null, 2) : '');\n\n    }\n\n    /**\n     * Retry the message by invoking the processing logic again.\n     */\n    private async retryMessage(message: QueueMessage<T>, rawMessage, channel) {\n        try {\n            await this.processMessage(message, rawMessage, channel);\n        } catch (error) {\n            if (message.currentRetry < message.retryCount) {\n                await this.updateStatusInDatabase('retrying', message);\n\n                message.currentRetry++;\n                this.logger.warn(`Retrying message (${message.currentRetry}/${message.retryCount}) after ${message.retryInterval}ms: ${error.message}`);\n                setTimeout(() => {\n                    this.retryMessage(message, rawMessage, channel);\n                }, message.retryInterval);\n            } else {\n\n                this.logger.error(`Message failed after ${message.retryCount} attempts: ${error.message}`);\n\n                // Discard the message after max retries\n                channel.ack(rawMessage);\n\n                // TODO: Store the error in the database and update the status accordingly.\n                await this.updateStatusInDatabase('failed', message, error.message, '');\n\n            }\n        }\n    }\n\n    private async updateStatusInDatabase(stage: string, message: QueueMessage<T>, error: string = '', result: string = '') {\n\n        // TODO: make an entry in the relevant database table, generate a unique id earlier.\n        try {\n            // 1. resolve the queue first\n            const mqMessage = await this.mqMessageService.repo.findOne({\n                where: {\n                    messageId: message.messageId,\n                }\n            });\n\n            if (mqMessage) {\n                const updatedFields = {\n                    stage: stage\n                };\n                if (stage === 'failed' || stage === 'succeeded') {\n                    updatedFields['finishedAt'] = new Date();\n                    updatedFields['elapsedMillis'] = updatedFields['finishedAt'].getTime() - mqMessage.startedAt.getTime();\n                }\n                if (stage === 'succeeded') {\n                    updatedFields['output'] = result;\n                }\n                if (stage === 'failed') {\n                    updatedFields['error'] = error;\n                }\n                await this.mqMessageService.repo.update(mqMessage.id, updatedFields);\n            }\n        }\n        catch (error) {\n            this.logger.error(error.message, error.stack);\n        }\n\n    }\n\n}"]}
+{"version":3,"file":"rabbitmq-subscriber.service.js","sourceRoot":"","sources":["../../../src/services/queues/rabbitmq-subscriber.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Logger, OnModuleInit } from '@nestjs/common';\nimport * as amqp from 'amqplib';\nimport { QueuesModuleOptions } from \"../../interfaces\";\nimport { QueueMessage, QueueSubscriber } from '../../interfaces/mq';\nimport { MqMessageQueueService } from '../mq-message-queue.service';\nimport { MqMessageService } from '../mq-message.service';\n\n\nexport abstract class RabbitMqSubscriber<T> implements OnModuleInit, QueueSubscriber<T> { // TODO This can be made a generic type for better type visibility\n    private readonly logger = new Logger(RabbitMqSubscriber.name);\n    private readonly url: string;\n    private readonly serviceRole: string;\n\n    constructor(\n        protected readonly mqMessageService: MqMessageService,\n        protected readonly mqMessageQueueService: MqMessageQueueService,\n    ) {\n        this.url = process.env.QUEUES_RABBIT_MQ_URL;\n        this.serviceRole = process.env.QUEUES_SERVICE_ROLE;\n        if (!this.url) {\n            this.logger.debug('RabbitMqPublisher url is not defined in the environment variables');\n        }\n        if (!this.serviceRole) {\n            this.logger.debug('Queue service Role is not defined in the environment variables');\n        }\n        // this.logger.debug(`RabbitMqSubscriber instance created with options: ${JSON.stringify(this.options())} and url: ${this.url}`);\n    }\n\n    abstract subscribe(message: QueueMessage<T>);\n\n    abstract options(): QueuesModuleOptions;\n\n    async establishConnection(): Promise<amqp.Connection> {\n\n        const url = new URL(this.url);\n\n        // this.logger.debug(`user: ${url.username}`);\n        // // just for local debug, don’t log in prod\n        // this.logger.debug(`pass: ${url.password}`);\n        // this.logger.debug(`path (vhost): ${url.pathname}`);\n\n        const connection = await amqp.connect({\n            protocol: url.protocol.replace(':', ''),\n            hostname: url.hostname,\n            port: parseInt(url.port),\n            username: url.username,\n            password: decodeURIComponent(url.password),\n            frameMax: 131072,\n        });\n\n        return connection\n    }\n\n    async onModuleInit(): Promise<void> {\n        // we will start subscriber only if the current service role is subscriber. \n        if (this.url && ['both', 'subscriber'].includes(this.serviceRole)) {\n\n            // this.logger.debug(`RabbitMqSubscriber instance created with options: ${JSON.stringify(this.options())} and url: ${this.url}`);\n            // const connection = await amqp.connect(this.url);\n\n            let connection;\n            try {\n                connection = await this.establishConnection();\n                // this.logger.debug(`RabbitMqSubscriber connection established: ${JSON.stringify(this.options())} and url: ${this.url}`);\n            }\n            catch (err) {\n                this.logger.error(`Failed to connect to RabbitMQ: ${(err as Error).message}`, (err as Error).stack);\n                throw err;\n            }\n\n            const channel = await connection.createChannel();\n            // this.logger.debug(`RabbitMqSubscriber channel created: ${JSON.stringify(this.options())} and url: ${url}`);\n\n            const options = this.options();\n\n            const queueName = options.queueName;\n            const exchangeName = `${queueName}.exchange`;\n            const routingKey = `${queueName}.routing-key`;\n\n            await channel.assertExchange(exchangeName, 'direct', {});\n            // this.logger.debug(`RabbitMqSubscriber channel asserted: ${JSON.stringify(this.options())} and url: ${url}`);\n\n            const queue = await channel.assertQueue(queueName, {});\n            // this.logger.debug(`RabbitMqSubscriber queue asserted: ${JSON.stringify(this.options())} and url: ${url}`);\n\n            await channel.bindQueue(queue.queue, exchangeName, routingKey);\n            // this.logger.debug(`RabbitMqSubscriber queue bound: ${JSON.stringify(this.options())} and url: ${url}`);\n\n            // Consume messages from the queue\n            channel.consume(\n                queue.queue,\n                async (rawMessage) => {\n                    if (rawMessage) {\n                        const messageContentString = rawMessage.content.toString();\n                        this.logger.debug(`RabbitMqSubscriber Received raw message: ${messageContentString}`);\n\n                        let message: QueueMessage<T> = null;\n\n                        try {\n                            message = JSON.parse(messageContentString) as QueueMessage<T>;\n\n                            // this is the first time we are receiving the message so we set the currentRetry to 0\n                            if (!message.retryCount) message.retryCount = 0;\n                            if (!message.retryInterval) message.retryInterval = 1000;\n                            if (!message.currentRetry) message.currentRetry = 0;\n\n                            await this.processMessage(message, rawMessage, channel);\n                        }\n                        catch (error) {\n                            this.logger.error(`Error processing message: ${error.message}`);\n\n                            // if an error occurs then if retryCount is set we start retrying. \n                            if (message) {\n                                if (message.currentRetry < message.retryCount) {\n                                    await this.updateStatusInDatabase('retrying', message);\n\n                                    message.currentRetry++;\n                                    this.logger.warn(`Retrying message (${message.currentRetry}/${message.retryCount}) after ${message.retryInterval}ms`);\n                                    setTimeout(() => {\n                                        this.retryMessage(message, rawMessage, channel);\n                                    }, message.retryInterval);\n                                } else {\n                                    await this.updateStatusInDatabase('failed', message, error.message, '');\n\n                                    this.logger.error(`Message failed after ${message.retryCount} attempts: ${error.message}`);\n                                    channel.ack(rawMessage); // Discard the message after max retries\n                                }\n                            }\n\n                        }\n                    }\n                },\n                // { noAck: true },\n                {},\n            );\n\n            this.logger.log(`RabbitMqSubscriber ready to consume messages: ${JSON.stringify(this.options())} and url: ${this.url}`);\n        }\n    }\n\n    /**\n     * Abstract method for message processing logic.\n     */\n    protected async processMessage(message: QueueMessage<T>, rawMessage, channel): Promise<void> {\n        await this.updateStatusInDatabase('started', message);\n\n        // Capture the results of handling the task.\n        const result = await this.subscribe(message);\n\n        // Ack the message. \n        channel.ack(rawMessage);\n\n        // TODO: Update the database to indicate that the task is finished.\n        await this.updateStatusInDatabase('succeeded', message, '', result ? JSON.stringify(result, null, 2) : '');\n\n    }\n\n    /**\n     * Retry the message by invoking the processing logic again.\n     */\n    private async retryMessage(message: QueueMessage<T>, rawMessage, channel) {\n        try {\n            await this.processMessage(message, rawMessage, channel);\n        } catch (error) {\n            if (message.currentRetry < message.retryCount) {\n                await this.updateStatusInDatabase('retrying', message);\n\n                message.currentRetry++;\n                this.logger.warn(`Retrying message (${message.currentRetry}/${message.retryCount}) after ${message.retryInterval}ms: ${error.message}`);\n                setTimeout(() => {\n                    this.retryMessage(message, rawMessage, channel);\n                }, message.retryInterval);\n            } else {\n\n                this.logger.error(`Message failed after ${message.retryCount} attempts: ${error.message}`);\n\n                // Discard the message after max retries\n                channel.ack(rawMessage);\n\n                // TODO: Store the error in the database and update the status accordingly.\n                await this.updateStatusInDatabase('failed', message, error.message, '');\n\n            }\n        }\n    }\n\n    private async updateStatusInDatabase(stage: string, message: QueueMessage<T>, error: string = '', result: string = '') {\n\n        // TODO: make an entry in the relevant database table, generate a unique id earlier.\n        try {\n            // 1. resolve the queue first\n            const mqMessage = await this.mqMessageService.repo.findOne({\n                where: {\n                    messageId: message.messageId,\n                }\n            });\n\n            if (mqMessage) {\n                const updatedFields = {\n                    stage: stage\n                };\n                if (stage === 'failed' || stage === 'succeeded') {\n                    updatedFields['finishedAt'] = new Date();\n                    updatedFields['elapsedMillis'] = updatedFields['finishedAt'].getTime() - mqMessage.startedAt.getTime();\n                }\n                if (stage === 'succeeded') {\n                    updatedFields['output'] = result;\n                }\n                if (stage === 'failed') {\n                    updatedFields['error'] = error;\n                }\n                await this.mqMessageService.repo.update(mqMessage.id, updatedFields);\n            }\n        }\n        catch (error) {\n            this.logger.error(error.message, error.stack);\n        }\n\n    }\n\n}"]}

package/dist/services/role-metadata.service.d.ts

@@ -1,14 +1,15 @@
+import { ConfigService } from '@nestjs/config';
 import { DiscoveryService, ModuleRef } from "@nestjs/core";
-import { EntityManager, Repository } from '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 { RoleMetadata } from '../entities/role-metadata.entity';
-import { PermissionMetadata } from '../entities/permission-metadata.entity';
+import { EntityManager } from 'typeorm';
+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 { RoleMetadata } from '../entities/role-metadata.entity';
 export declare class RoleMetadataService extends CRUDService<RoleMetadata> {
     readonly modelMetadataService: ModelMetadataService;
     readonly moduleMetadataService: ModuleMetadataService;
@@ -17,11 +18,11 @@ export declare class RoleMetadataService extends CRUDService<RoleMetadata> {
     readonly discoveryService: DiscoveryService;
     readonly crudHelperService: CrudHelperService;
     readonly entityManager: EntityManager;
-    readonly repo: Repository<RoleMetadata>;
-    private readonly permissionRepository;
+    readonly repo: RoleMetadataRepository;
+    readonly permissionRepository: PermissionMetadataRepository;
     readonly moduleRef: ModuleRef;
     private readonly logger;
-    constructor(modelMetadataService: ModelMetadataService, moduleMetadataService: ModuleMetadataService, configService: ConfigService, fileService: FileService, discoveryService: DiscoveryService, crudHelperService: CrudHelperService, entityManager: EntityManager, repo: Repository<RoleMetadata>, permissionRepository: Repository<PermissionMetadata>, moduleRef: ModuleRef);
+    constructor(modelMetadataService: ModelMetadataService, moduleMetadataService: ModuleMetadataService, configService: ConfigService, fileService: FileService, discoveryService: DiscoveryService, crudHelperService: CrudHelperService, entityManager: EntityManager, repo: RoleMetadataRepository, permissionRepository: PermissionMetadataRepository, moduleRef: ModuleRef);
     findRoleByName(roleName: string): Promise<RoleMetadata>;
     createRolesIfNotExists(roles: CreateRoleMetadataDto[]): Promise<void>;
     addAllPermissionsToRole(roleName: string): Promise<RoleMetadata>;

package/dist/services/role-metadata.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"role-metadata.service.d.ts","sourceRoot":"","sources":["../../src/services/role-metadata.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAM,UAAU,EAAE,MAAM,SAAS,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAC3E,OAAO,EAAE,qBAAqB,EAAE,MAAM,sCAAsC,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AAErE,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAChE,OAAO,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AAC5E,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AAGzE,qBACa,mBAAoB,SAAQ,WAAW,CAAC,YAAY,CAAC;IAK9D,QAAQ,CAAC,oBAAoB,EAAE,oBAAoB;IACnD,QAAQ,CAAC,qBAAqB,EAAE,qBAAqB;IACrD,QAAQ,CAAC,aAAa,EAAE,aAAa;IACrC,QAAQ,CAAC,WAAW,EAAE,WAAW;IACjC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB;IAC3C,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB;IAE7C,QAAQ,CAAC,aAAa,EAAE,aAAa;IAErC,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC,YAAY,CAAC;IAEvC,OAAO,CAAC,QAAQ,CAAC,oBAAoB;IACrC,QAAQ,CAAC,SAAS,EAAE,SAAS;IAhB/B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAwC;gBAIpD,oBAAoB,EAAE,oBAAoB,EAC1C,qBAAqB,EAAE,qBAAqB,EAC5C,aAAa,EAAE,aAAa,EAC5B,WAAW,EAAE,WAAW,EACxB,gBAAgB,EAAE,gBAAgB,EAClC,iBAAiB,EAAE,iBAAiB,EAEpC,aAAa,EAAE,aAAa,EAE5B,IAAI,EAAE,UAAU,CAAC,YAAY,CAAC,EAEtB,oBAAoB,EAAE,UAAU,CAAC,kBAAkB,CAAC,EAC5D,SAAS,EAAE,SAAS;IAMzB,cAAc,CAAC,QAAQ,EAAE,MAAM;IAgB/B,sBAAsB,CAAC,KAAK,EAAE,qBAAqB,EAAE;IAmDrD,uBAAuB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;IAIhE,oBAAoB,CAAC,QAAQ,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,YAAY,CAAC;IAIxF,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE;YAItD,qBAAqB;IAiE7B,yBAAyB,CAAC,QAAQ,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,YAAY,CAAC;YAsBrF,uBAAuB;CAWtC"}
+{"version":3,"file":"role-metadata.service.d.ts","sourceRoot":"","sources":["../../src/services/role-metadata.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAE3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAC3E,OAAO,EAAE,qBAAqB,EAAE,MAAM,sCAAsC,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAM,MAAM,SAAS,CAAC;AAG5C,OAAO,EAAE,4BAA4B,EAAE,MAAM,+CAA+C,CAAC;AAC7F,OAAO,EAAE,sBAAsB,EAAE,MAAM,yCAAyC,CAAC;AACjF,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AAEzE,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAEhE,qBACa,mBAAoB,SAAQ,WAAW,CAAC,YAAY,CAAC;IAK9D,QAAQ,CAAC,oBAAoB,EAAE,oBAAoB;IACnD,QAAQ,CAAC,qBAAqB,EAAE,qBAAqB;IACrD,QAAQ,CAAC,aAAa,EAAE,aAAa;IACrC,QAAQ,CAAC,WAAW,EAAE,WAAW;IACjC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB;IAC3C,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB;IAE7C,QAAQ,CAAC,aAAa,EAAE,aAAa;IAGrC,QAAQ,CAAC,IAAI,EAAE,sBAAsB;IAGrC,QAAQ,CAAC,oBAAoB,EAAE,4BAA4B;IAC3D,QAAQ,CAAC,SAAS,EAAE,SAAS;IAlB/B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAwC;gBAIpD,oBAAoB,EAAE,oBAAoB,EAC1C,qBAAqB,EAAE,qBAAqB,EAC5C,aAAa,EAAE,aAAa,EAC5B,WAAW,EAAE,WAAW,EACxB,gBAAgB,EAAE,gBAAgB,EAClC,iBAAiB,EAAE,iBAAiB,EAEpC,aAAa,EAAE,aAAa,EAG5B,IAAI,EAAE,sBAAsB,EAG5B,oBAAoB,EAAE,4BAA4B,EAClD,SAAS,EAAE,SAAS;IAMzB,cAAc,CAAC,QAAQ,EAAE,MAAM;IAgB/B,sBAAsB,CAAC,KAAK,EAAE,qBAAqB,EAAE;IAmDrD,uBAAuB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;IAIhE,oBAAoB,CAAC,QAAQ,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,YAAY,CAAC;IAIxF,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE;YAItD,qBAAqB;IAiE7B,yBAAyB,CAAC,QAAQ,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,YAAY,CAAC;YAsBrF,uBAAuB;CAWtC"}

package/dist/services/role-metadata.service.js

@@ -15,18 +15,18 @@ var RoleMetadataService_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RoleMetadataService = void 0;
 const common_1 = require("@nestjs/common");
-const typeorm_1 = require("@nestjs/typeorm");
+const config_1 = require("@nestjs/config");
 const core_1 = require("@nestjs/core");
-const typeorm_2 = require("typeorm");
+const typeorm_1 = require("@nestjs/typeorm");
+const crud_helper_service_1 = require("./crud-helper.service");
 const crud_service_1 = require("./crud.service");
+const file_service_1 = require("./file.service");
 const model_metadata_service_1 = require("./model-metadata.service");
 const module_metadata_service_1 = require("./module-metadata.service");
-const config_1 = require("@nestjs/config");
-const file_service_1 = require("./file.service");
-const crud_helper_service_1 = require("./crud-helper.service");
-const role_metadata_entity_1 = require("../entities/role-metadata.entity");
-const permission_metadata_entity_1 = require("../entities/permission-metadata.entity");
+const typeorm_2 = require("typeorm");
 const error_messages_1 = require("../constants/error-messages");
+const permission_metadata_repository_1 = require("../repository/permission-metadata.repository");
+const role_metadata_repository_1 = require("../repository/role-metadata.repository");
 let RoleMetadataService = RoleMetadataService_1 = class RoleMetadataService extends crud_service_1.CRUDService {
     constructor(modelMetadataService, moduleMetadataService, configService, fileService, discoveryService, crudHelperService, entityManager, repo, permissionRepository, moduleRef) {
         super(modelMetadataService, moduleMetadataService, configService, fileService, discoveryService, crudHelperService, entityManager, repo, 'roleMetadata', 'solid-core', moduleRef);
@@ -166,8 +166,6 @@ exports.RoleMetadataService = RoleMetadataService = RoleMetadataService_1 = __de
     (0, common_1.Injectable)(),
     __param(0, (0, common_1.Inject)((0, common_1.forwardRef)(() => model_metadata_service_1.ModelMetadataService))),
     __param(6, (0, typeorm_1.InjectEntityManager)()),
-    __param(7, (0, typeorm_1.InjectRepository)(role_metadata_entity_1.RoleMetadata, 'default')),
-    __param(8, (0, typeorm_1.InjectRepository)(permission_metadata_entity_1.PermissionMetadata)),
     __metadata("design:paramtypes", [model_metadata_service_1.ModelMetadataService,
         module_metadata_service_1.ModuleMetadataService,
         config_1.ConfigService,
@@ -175,8 +173,8 @@ exports.RoleMetadataService = RoleMetadataService = RoleMetadataService_1 = __de
         core_1.DiscoveryService,
         crud_helper_service_1.CrudHelperService,
         typeorm_2.EntityManager,
-        typeorm_2.Repository,
-        typeorm_2.Repository,
+        role_metadata_repository_1.RoleMetadataRepository,
+        permission_metadata_repository_1.PermissionMetadataRepository,
         core_1.ModuleRef])
 ], RoleMetadataService);
 //# sourceMappingURL=role-metadata.service.js.map

package/dist/services/role-metadata.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"role-metadata.service.js","sourceRoot":"","sources":["../../src/services/role-metadata.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { forwardRef, Inject, Injectable, Logger, NotFoundException } from '@nestjs/common';\nimport { InjectEntityManager, InjectRepository } from '@nestjs/typeorm';\nimport { DiscoveryService, ModuleRef } from \"@nestjs/core\";\nimport { EntityManager, In, Repository } from 'typeorm';\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\";\n\nimport { RoleMetadata } from '../entities/role-metadata.entity';\nimport { PermissionMetadata } from '../entities/permission-metadata.entity';\nimport { CreateRoleMetadataDto } from '../dtos/create-role-metadata.dto';\nimport { ERROR_MESSAGES } from 'src/constants/error-messages';\n\n@Injectable()\nexport class RoleMetadataService extends CRUDService<RoleMetadata> {\n  private readonly logger = new Logger(RoleMetadataService.name);\n\n  constructor(\n    @Inject(forwardRef(() => ModelMetadataService))\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(RoleMetadata, 'default')\n    readonly repo: Repository<RoleMetadata>,\n    @InjectRepository(PermissionMetadata)\n    private readonly permissionRepository: Repository<PermissionMetadata>,\n    readonly moduleRef: ModuleRef\n\n  ) {\n    super(modelMetadataService, moduleMetadataService, configService, fileService, discoveryService, crudHelperService, entityManager, repo, 'roleMetadata', 'solid-core', moduleRef);\n  }\n\n  async findRoleByName(roleName: string) {\n    const entity = await this.repo.findOne({\n      where: {\n        name: roleName\n      },\n      relations: {\n        permissions: true\n      }\n    });\n    if (!entity) {\n      throw new NotFoundException(`Entity #${roleName} not found`);\n    }\n    return entity;\n  }\n\n  // OK\n  async createRolesIfNotExists(roles: CreateRoleMetadataDto[]) {\n    for (let id = 0; id < roles.length; id++) {\n      try {\n        const roleObj = roles[id];\n        // this.logger.log(`Resolving role: ${JSON.stringify(roleObj)}`);\n\n        const existingRole = await this.repo.findOne({\n          where: {\n            name: roleObj.name,\n          },\n          relations: {},\n        });\n\n        // Create only if not existing already.\n        if (!existingRole) {\n          this.logger.debug(`Role ${roleObj.name} does not exist, hence creating`);\n\n          let permissions = [];\n\n          if (roleObj.permissions && roleObj.permissions.length > 0) {\n            await Promise.all(\n              roleObj.permissions.map(permission => this.preloadPermissionByName(permission.name)),\n            );\n          }\n\n          // const role = this.repo.create({ ...roleObj, permissions });\n          const role = this.repo.create({ ...roleObj });\n          await this.repo.save(role);\n        } else {\n          /*\n          this.logger.debug(`Role ${roleObj.name} already exists`);\n          const existingPermissions = existingRole.permissions.map(permission => permission.name);\n          const newPermissions = roleObj.permissions.map(permission => permission.name);\n          const permissionsToAdd = newPermissions.filter(permission => !existingPermissions.includes(permission));\n          const permissionsToRemove = existingPermissions.filter(permission => !newPermissions.includes(permission));\n          this.logger.debug(`Permissions to add: ${JSON.stringify(permissionsToAdd)}`);\n          if (permissionsToAdd.length > 0) {\n            await this.addPermissionsToRole(roleObj.name, permissionsToAdd);\n          }\n          this.logger.debug(`Permissions to remove: ${JSON.stringify(permissionsToRemove)}`);\n          if (permissionsToRemove.length > 0) {\n            await this.removePermissionsFromRole(roleObj.name, permissionsToRemove);\n          }\n          */\n        }\n      } catch (error) {\n        this.logger.error(error);\n      }\n    }\n  }\n\n  async addAllPermissionsToRole(roleName: string): Promise<RoleMetadata> {\n    return await this._addPermissionsToRole(roleName, null);\n  }\n\n  async addPermissionsToRole(roleName: string, permissionNames: string[]): Promise<RoleMetadata> {\n    return await this._addPermissionsToRole(roleName, permissionNames);\n  }\n\n  async addPermissionToRole(roleName: string, permissionName: string[]) {\n    return await this._addPermissionsToRole(roleName, permissionName);\n  }\n\n  private async _addPermissionsToRole(roleName: string, permissionNames: string[]): Promise<RoleMetadata> {\n    const role = await this.repo.findOne({\n      where: { name: roleName },\n      relations: {\n        permissions: true\n      }\n    });\n    if (!role) {\n      throw new Error(`Role '${roleName}' not found.`);\n    }\n\n    // this.logger.log(`Found role ${roleName}`);\n\n    // The new set of permissions which are to be added to this role.\n    let newPermissions: PermissionMetadata[];\n\n    // Load all the specified permissions in the system. \n    if (permissionNames && permissionNames.length != 0) {\n      // this.logger.log(`Loading specified permissions.`);\n\n      newPermissions = await this.permissionRepository.find({ where: { name: In(permissionNames) } });\n      if (newPermissions.length !== permissionNames.length) {\n        throw new Error(`One or more permissions not found.`);\n      }\n    }\n    else {\n      // this.logger.log(`Loading all permissions in system.`);\n\n      // Load all permissions in the system. \n      // TODO: Do we want to convert this to a paginated query to avoid having to load a very large permissions table into memory?\n      newPermissions = await this.permissionRepository.find();\n      if (newPermissions.length == 0) {\n        throw new Error(`No permissions configured in the system. Did you forget to run the PermissionSeederService?`);\n      }\n    }\n\n    // this.logger.log(`Adding ${newPermissions.length} permissions to role ${roleName}.`);\n\n    // if there are already permissions assigned. \n    if (role.permissions && role.permissions.length > 0) {\n      for (let i = 0; i < newPermissions.length; i++) {\n        const newPermission = newPermissions[i];\n        let newPermissionFound = true;\n        for (let j = 0; j < role.permissions.length; j++) {\n          const existingPermission = role.permissions[j];\n          if (existingPermission.name === newPermission.name) {\n            newPermissionFound = false;\n            break;\n          }\n        }\n\n        if (newPermissionFound) {\n          role.permissions.push(newPermission);\n        }\n      }\n\n    }\n    // else we create a new permissions set. \n    else {\n      role.permissions = newPermissions;\n    }\n\n    return await this.repo.save(role);\n  }\n\n  async removePermissionsFromRole(roleName: string, permissionNames: string[]): Promise<RoleMetadata> {\n\n    // load the role with the respective permissions.\n    const role = await this.repo.findOne({\n      where: {\n        name: roleName\n      },\n      relations: {\n        permissions: true\n      }\n    });\n\n    if (!role) {\n      throw new Error(ERROR_MESSAGES.ROLE_NOT_FOUND(roleName));\n    }\n\n    // modify the permissions array.\n    role.permissions = role.permissions.filter(permission => !permissionNames.includes(permission.name));\n\n    return await this.repo.save(role);\n  }\n\n  private async preloadPermissionByName(name: string): Promise<PermissionMetadata> {\n    const existingPermission = await this.permissionRepository.findOne({\n      where: { name },\n    });\n    if (!existingPermission) {\n      throw new NotFoundException(ERROR_MESSAGES.PERMISSION_NOT_EXIST(name));\n    }\n    return existingPermission;\n  }\n\n\n}\n"]}
+{"version":3,"file":"role-metadata.service.js","sourceRoot":"","sources":["../../src/services/role-metadata.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { forwardRef, Inject, Injectable, Logger, NotFoundException } from '@nestjs/common';\nimport { ConfigService } from '@nestjs/config';\nimport { DiscoveryService, ModuleRef } from \"@nestjs/core\";\nimport { InjectEntityManager } from '@nestjs/typeorm';\nimport { CrudHelperService } from \"src/services/crud-helper.service\";\nimport { CRUDService } from 'src/services/crud.service';\nimport { FileService } from \"src/services/file.service\";\nimport { ModelMetadataService } from 'src/services/model-metadata.service';\nimport { ModuleMetadataService } from 'src/services/module-metadata.service';\nimport { EntityManager, In } from 'typeorm';\n\nimport { ERROR_MESSAGES } from 'src/constants/error-messages';\nimport { PermissionMetadataRepository } from 'src/repository/permission-metadata.repository';\nimport { RoleMetadataRepository } from 'src/repository/role-metadata.repository';\nimport { CreateRoleMetadataDto } from '../dtos/create-role-metadata.dto';\nimport { PermissionMetadata } from '../entities/permission-metadata.entity';\nimport { RoleMetadata } from '../entities/role-metadata.entity';\n\n@Injectable()\nexport class RoleMetadataService extends CRUDService<RoleMetadata> {\n  private readonly logger = new Logger(RoleMetadataService.name);\n\n  constructor(\n    @Inject(forwardRef(() => ModelMetadataService))\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(RoleMetadata, 'default')\n    // readonly repo: Repository<RoleMetadata>,\n    readonly repo: RoleMetadataRepository,\n    // @InjectRepository(PermissionMetadata)\n    // private readonly permissionRepository: Repository<PermissionMetadata>,\n    readonly permissionRepository: PermissionMetadataRepository,\n    readonly moduleRef: ModuleRef\n\n  ) {\n    super(modelMetadataService, moduleMetadataService, configService, fileService, discoveryService, crudHelperService, entityManager, repo, 'roleMetadata', 'solid-core', moduleRef);\n  }\n\n  async findRoleByName(roleName: string) {\n    const entity = await this.repo.findOne({\n      where: {\n        name: roleName\n      },\n      relations: {\n        permissions: true\n      }\n    });\n    if (!entity) {\n      throw new NotFoundException(`Entity #${roleName} not found`);\n    }\n    return entity;\n  }\n\n  // OK\n  async createRolesIfNotExists(roles: CreateRoleMetadataDto[]) {\n    for (let id = 0; id < roles.length; id++) {\n      try {\n        const roleObj = roles[id];\n        // this.logger.log(`Resolving role: ${JSON.stringify(roleObj)}`);\n\n        const existingRole = await this.repo.findOne({\n          where: {\n            name: roleObj.name,\n          },\n          relations: {},\n        });\n\n        // Create only if not existing already.\n        if (!existingRole) {\n          this.logger.debug(`Role ${roleObj.name} does not exist, hence creating`);\n\n          let permissions = [];\n\n          if (roleObj.permissions && roleObj.permissions.length > 0) {\n            await Promise.all(\n              roleObj.permissions.map(permission => this.preloadPermissionByName(permission.name)),\n            );\n          }\n\n          // const role = this.repo.create({ ...roleObj, permissions });\n          const role = this.repo.create({ ...roleObj });\n          await this.repo.save(role);\n        } else {\n          /*\n          this.logger.debug(`Role ${roleObj.name} already exists`);\n          const existingPermissions = existingRole.permissions.map(permission => permission.name);\n          const newPermissions = roleObj.permissions.map(permission => permission.name);\n          const permissionsToAdd = newPermissions.filter(permission => !existingPermissions.includes(permission));\n          const permissionsToRemove = existingPermissions.filter(permission => !newPermissions.includes(permission));\n          this.logger.debug(`Permissions to add: ${JSON.stringify(permissionsToAdd)}`);\n          if (permissionsToAdd.length > 0) {\n            await this.addPermissionsToRole(roleObj.name, permissionsToAdd);\n          }\n          this.logger.debug(`Permissions to remove: ${JSON.stringify(permissionsToRemove)}`);\n          if (permissionsToRemove.length > 0) {\n            await this.removePermissionsFromRole(roleObj.name, permissionsToRemove);\n          }\n          */\n        }\n      } catch (error) {\n        this.logger.error(error);\n      }\n    }\n  }\n\n  async addAllPermissionsToRole(roleName: string): Promise<RoleMetadata> {\n    return await this._addPermissionsToRole(roleName, null);\n  }\n\n  async addPermissionsToRole(roleName: string, permissionNames: string[]): Promise<RoleMetadata> {\n    return await this._addPermissionsToRole(roleName, permissionNames);\n  }\n\n  async addPermissionToRole(roleName: string, permissionName: string[]) {\n    return await this._addPermissionsToRole(roleName, permissionName);\n  }\n\n  private async _addPermissionsToRole(roleName: string, permissionNames: string[]): Promise<RoleMetadata> {\n    const role = await this.repo.findOne({\n      where: { name: roleName },\n      relations: {\n        permissions: true\n      }\n    });\n    if (!role) {\n      throw new Error(`Role '${roleName}' not found.`);\n    }\n\n    // this.logger.log(`Found role ${roleName}`);\n\n    // The new set of permissions which are to be added to this role.\n    let newPermissions: PermissionMetadata[];\n\n    // Load all the specified permissions in the system. \n    if (permissionNames && permissionNames.length != 0) {\n      // this.logger.log(`Loading specified permissions.`);\n\n      newPermissions = await this.permissionRepository.find({ where: { name: In(permissionNames) } });\n      if (newPermissions.length !== permissionNames.length) {\n        throw new Error(`One or more permissions not found.`);\n      }\n    }\n    else {\n      // this.logger.log(`Loading all permissions in system.`);\n\n      // Load all permissions in the system. \n      // TODO: Do we want to convert this to a paginated query to avoid having to load a very large permissions table into memory?\n      newPermissions = await this.permissionRepository.find();\n      if (newPermissions.length == 0) {\n        throw new Error(`No permissions configured in the system. Did you forget to run the PermissionSeederService?`);\n      }\n    }\n\n    // this.logger.log(`Adding ${newPermissions.length} permissions to role ${roleName}.`);\n\n    // if there are already permissions assigned. \n    if (role.permissions && role.permissions.length > 0) {\n      for (let i = 0; i < newPermissions.length; i++) {\n        const newPermission = newPermissions[i];\n        let newPermissionFound = true;\n        for (let j = 0; j < role.permissions.length; j++) {\n          const existingPermission = role.permissions[j];\n          if (existingPermission.name === newPermission.name) {\n            newPermissionFound = false;\n            break;\n          }\n        }\n\n        if (newPermissionFound) {\n          role.permissions.push(newPermission);\n        }\n      }\n\n    }\n    // else we create a new permissions set. \n    else {\n      role.permissions = newPermissions;\n    }\n\n    return await this.repo.save(role);\n  }\n\n  async removePermissionsFromRole(roleName: string, permissionNames: string[]): Promise<RoleMetadata> {\n\n    // load the role with the respective permissions.\n    const role = await this.repo.findOne({\n      where: {\n        name: roleName\n      },\n      relations: {\n        permissions: true\n      }\n    });\n\n    if (!role) {\n      throw new Error(ERROR_MESSAGES.ROLE_NOT_FOUND(roleName));\n    }\n\n    // modify the permissions array.\n    role.permissions = role.permissions.filter(permission => !permissionNames.includes(permission.name));\n\n    return await this.repo.save(role);\n  }\n\n  private async preloadPermissionByName(name: string): Promise<PermissionMetadata> {\n    const existingPermission = await this.permissionRepository.findOne({\n      where: { name },\n    });\n    if (!existingPermission) {\n      throw new NotFoundException(ERROR_MESSAGES.PERMISSION_NOT_EXIST(name));\n    }\n    return existingPermission;\n  }\n\n\n}\n"]}

package/dist/services/saved-filters.service.d.ts

@@ -1,11 +1,12 @@
 import { DiscoveryService, ModuleRef } from "@nestjs/core";
-import { EntityManager, Repository } from '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';
 export declare class SavedFiltersService extends CRUDService<SavedFilters> {
     readonly modelMetadataService: ModelMetadataService;
@@ -15,8 +16,8 @@ export declare class SavedFiltersService extends CRUDService<SavedFilters> {
     readonly discoveryService: DiscoveryService;
     readonly crudHelperService: CrudHelperService;
     readonly entityManager: EntityManager;
-    readonly repo: Repository<SavedFilters>;
+    readonly repo: SavedFiltersRepository;
     readonly moduleRef: ModuleRef;
-    constructor(modelMetadataService: ModelMetadataService, moduleMetadataService: ModuleMetadataService, configService: ConfigService, fileService: FileService, discoveryService: DiscoveryService, crudHelperService: CrudHelperService, entityManager: EntityManager, repo: Repository<SavedFilters>, moduleRef: ModuleRef);
+    constructor(modelMetadataService: ModelMetadataService, moduleMetadataService: ModuleMetadataService, configService: ConfigService, fileService: FileService, discoveryService: DiscoveryService, crudHelperService: CrudHelperService, entityManager: EntityManager, repo: SavedFiltersRepository, moduleRef: ModuleRef);
 }
 //# sourceMappingURL=saved-filters.service.d.ts.map

package/dist/services/saved-filters.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"saved-filters.service.d.ts","sourceRoot":"","sources":["../../src/services/saved-filters.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAG,MAAM,cAAc,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAEpD,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAC3E,OAAO,EAAE,qBAAqB,EAAE,MAAM,sCAAsC,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AAGrE,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAEhE,qBACa,mBAAoB,SAAQ,WAAW,CAAC,YAAY,CAAC;IAE9D,QAAQ,CAAC,oBAAoB,EAAE,oBAAoB;IACnD,QAAQ,CAAC,qBAAqB,EAAE,qBAAqB;IACrD,QAAQ,CAAC,aAAa,EAAE,aAAa;IACrC,QAAQ,CAAC,WAAW,EAAE,WAAW;IACjC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB;IAC3C,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB;IAE7C,QAAQ,CAAC,aAAa,EAAE,aAAa;IAErC,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC,YAAY,CAAC;IACvC,QAAQ,CAAC,SAAS,EAAE,SAAS;gBAVpB,oBAAoB,EAAE,oBAAoB,EAC1C,qBAAqB,EAAE,qBAAqB,EAC5C,aAAa,EAAE,aAAa,EAC5B,WAAW,EAAE,WAAW,EACxB,gBAAgB,EAAE,gBAAgB,EAClC,iBAAiB,EAAE,iBAAiB,EAEpC,aAAa,EAAE,aAAa,EAE5B,IAAI,EAAE,UAAU,CAAC,YAAY,CAAC,EAC9B,SAAS,EAAE,SAAS;CAKhC"}
+{"version":3,"file":"saved-filters.service.d.ts","sourceRoot":"","sources":["../../src/services/saved-filters.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAE3D,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAExC,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAC3E,OAAO,EAAE,qBAAqB,EAAE,MAAM,sCAAsC,CAAC;AAG7E,OAAO,EAAE,sBAAsB,EAAE,MAAM,yCAAyC,CAAC;AACjF,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAEhE,qBACa,mBAAoB,SAAQ,WAAW,CAAC,YAAY,CAAC;IAE9D,QAAQ,CAAC,oBAAoB,EAAE,oBAAoB;IACnD,QAAQ,CAAC,qBAAqB,EAAE,qBAAqB;IACrD,QAAQ,CAAC,aAAa,EAAE,aAAa;IACrC,QAAQ,CAAC,WAAW,EAAE,WAAW;IACjC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB;IAC3C,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB;IAE7C,QAAQ,CAAC,aAAa,EAAE,aAAa;IAGrC,QAAQ,CAAC,IAAI,EAAE,sBAAsB;IACrC,QAAQ,CAAC,SAAS,EAAE,SAAS;gBAXpB,oBAAoB,EAAE,oBAAoB,EAC1C,qBAAqB,EAAE,qBAAqB,EAC5C,aAAa,EAAE,aAAa,EAC5B,WAAW,EAAE,WAAW,EACxB,gBAAgB,EAAE,gBAAgB,EAClC,iBAAiB,EAAE,iBAAiB,EAEpC,aAAa,EAAE,aAAa,EAG5B,IAAI,EAAE,sBAAsB,EAC5B,SAAS,EAAE,SAAS;CAKhC"}

package/dist/services/saved-filters.service.js

@@ -14,16 +14,16 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SavedFiltersService = void 0;
 const common_1 = require("@nestjs/common");
-const typeorm_1 = require("@nestjs/typeorm");
 const core_1 = require("@nestjs/core");
+const typeorm_1 = require("@nestjs/typeorm");
 const typeorm_2 = require("typeorm");
+const config_1 = require("@nestjs/config");
+const crud_helper_service_1 = require("./crud-helper.service");
 const crud_service_1 = require("./crud.service");
+const file_service_1 = require("./file.service");
 const model_metadata_service_1 = require("./model-metadata.service");
 const module_metadata_service_1 = require("./module-metadata.service");
-const config_1 = require("@nestjs/config");
-const file_service_1 = require("./file.service");
-const crud_helper_service_1 = require("./crud-helper.service");
-const saved_filters_entity_1 = require("../entities/saved-filters.entity");
+const saved_filters_repository_1 = require("../repository/saved-filters.repository");
 let SavedFiltersService = class SavedFiltersService extends crud_service_1.CRUDService {
     constructor(modelMetadataService, moduleMetadataService, configService, fileService, discoveryService, crudHelperService, entityManager, repo, moduleRef) {
         super(modelMetadataService, moduleMetadataService, configService, fileService, discoveryService, crudHelperService, entityManager, repo, 'savedFilters', 'solid-core', moduleRef);
@@ -42,7 +42,6 @@ exports.SavedFiltersService = SavedFiltersService;
 exports.SavedFiltersService = SavedFiltersService = __decorate([
     (0, common_1.Injectable)(),
     __param(6, (0, typeorm_1.InjectEntityManager)()),
-    __param(7, (0, typeorm_1.InjectRepository)(saved_filters_entity_1.SavedFilters, 'default')),
     __metadata("design:paramtypes", [model_metadata_service_1.ModelMetadataService,
         module_metadata_service_1.ModuleMetadataService,
         config_1.ConfigService,
@@ -50,7 +49,7 @@ exports.SavedFiltersService = SavedFiltersService = __decorate([
         core_1.DiscoveryService,
         crud_helper_service_1.CrudHelperService,
         typeorm_2.EntityManager,
-        typeorm_2.Repository,
+        saved_filters_repository_1.SavedFiltersRepository,
         core_1.ModuleRef])
 ], SavedFiltersService);
 //# sourceMappingURL=saved-filters.service.js.map

package/dist/services/saved-filters.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"saved-filters.service.js","sourceRoot":"","sources":["../../src/services/saved-filters.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,6CAAwE;AACxE,uCAA4D;AAC5D,qCAAoD;AAEpD,iDAAwD;AACxD,qEAA2E;AAC3E,uEAA6E;AAC7E,2CAA+C;AAC/C,iDAAwD;AACxD,+DAAqE;AAGrE,2EAAgE;AAGzD,IAAM,mBAAmB,GAAzB,MAAM,mBAAoB,SAAQ,0BAAyB;IAChE,YACW,oBAA0C,EAC1C,qBAA4C,EAC5C,aAA4B,EAC5B,WAAwB,EACxB,gBAAkC,EAClC,iBAAoC,EAEpC,aAA4B,EAE5B,IAA8B,EAC9B,SAAoB;QAG9B,KAAK,CAAC,oBAAoB,EAAE,qBAAqB,EAAG,aAAa,EAAE,WAAW,EAAG,gBAAgB,EAAE,iBAAiB,EAAC,aAAa,EAAE,IAAI,EAAE,cAAc,EAAE,YAAY,EAAE,SAAS,CAAC,CAAC;QAbzK,yBAAoB,GAApB,oBAAoB,CAAsB;QAC1C,0BAAqB,GAArB,qBAAqB,CAAuB;QAC5C,kBAAa,GAAb,aAAa,CAAe;QAC5B,gBAAW,GAAX,WAAW,CAAa;QACxB,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,sBAAiB,GAAjB,iBAAiB,CAAmB;QAEpC,kBAAa,GAAb,aAAa,CAAe;QAE5B,SAAI,GAAJ,IAAI,CAA0B;QAC9B,cAAS,GAAT,SAAS,CAAW;IAIhC,CAAC;CACD,CAAA;AAjBY,kDAAmB;8BAAnB,mBAAmB;IAD/B,IAAA,mBAAU,GAAE;IASR,WAAA,IAAA,6BAAmB,GAAE,CAAA;IAErB,WAAA,IAAA,0BAAgB,EAAC,mCAAY,EAAE,SAAS,CAAC,CAAA;qCARX,6CAAoB;QACnB,+CAAqB;QAC7B,sBAAa;QACf,0BAAW;QACN,uBAAgB;QACf,uCAAiB;QAErB,uBAAa;QAEtB,oBAAU;QACL,gBAAS;GAZpB,mBAAmB,CAiB/B","sourcesContent":["import { Injectable } from '@nestjs/common';\nimport { InjectEntityManager, InjectRepository } from '@nestjs/typeorm';\nimport { DiscoveryService, ModuleRef  } from \"@nestjs/core\";\nimport { EntityManager, Repository } 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';\n\n\nimport { SavedFilters } from '../entities/saved-filters.entity';\n\n@Injectable()\nexport class SavedFiltersService extends CRUDService<SavedFilters>{\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(SavedFilters, 'default')\n    readonly repo: Repository<SavedFilters>,\n    readonly moduleRef: ModuleRef\n\n ) {\n   super(modelMetadataService, moduleMetadataService,  configService, fileService,  discoveryService, crudHelperService,entityManager, repo, 'savedFilters', 'solid-core', moduleRef);\n }\n}\n"]}
+{"version":3,"file":"saved-filters.service.js","sourceRoot":"","sources":["../../src/services/saved-filters.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,uCAA2D;AAC3D,6CAAsD;AACtD,qCAAwC;AAExC,2CAA+C;AAC/C,+DAAqE;AACrE,iDAAwD;AACxD,iDAAwD;AACxD,qEAA2E;AAC3E,uEAA6E;AAG7E,qFAAiF;AAI1E,IAAM,mBAAmB,GAAzB,MAAM,mBAAoB,SAAQ,0BAAyB;IAChE,YACW,oBAA0C,EAC1C,qBAA4C,EAC5C,aAA4B,EAC5B,WAAwB,EACxB,gBAAkC,EAClC,iBAAoC,EAEpC,aAA4B,EAG5B,IAA4B,EAC5B,SAAoB;QAG9B,KAAK,CAAC,oBAAoB,EAAE,qBAAqB,EAAG,aAAa,EAAE,WAAW,EAAG,gBAAgB,EAAE,iBAAiB,EAAC,aAAa,EAAE,IAAI,EAAE,cAAc,EAAE,YAAY,EAAE,SAAS,CAAC,CAAC;QAdzK,yBAAoB,GAApB,oBAAoB,CAAsB;QAC1C,0BAAqB,GAArB,qBAAqB,CAAuB;QAC5C,kBAAa,GAAb,aAAa,CAAe;QAC5B,gBAAW,GAAX,WAAW,CAAa;QACxB,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,sBAAiB,GAAjB,iBAAiB,CAAmB;QAEpC,kBAAa,GAAb,aAAa,CAAe;QAG5B,SAAI,GAAJ,IAAI,CAAwB;QAC5B,cAAS,GAAT,SAAS,CAAW;IAIhC,CAAC;CACD,CAAA;AAlBY,kDAAmB;8BAAnB,mBAAmB;IAD/B,IAAA,mBAAU,GAAE;IASR,WAAA,IAAA,6BAAmB,GAAE,CAAA;qCANS,6CAAoB;QACnB,+CAAqB;QAC7B,sBAAa;QACf,0BAAW;QACN,uBAAgB;QACf,uCAAiB;QAErB,uBAAa;QAGtB,iDAAsB;QACjB,gBAAS;GAbpB,mBAAmB,CAkB/B","sourcesContent":["import { Injectable } from '@nestjs/common';\nimport { DiscoveryService, ModuleRef } from \"@nestjs/core\";\nimport { InjectEntityManager } from '@nestjs/typeorm';\nimport { EntityManager } from 'typeorm';\n\nimport { ConfigService } from '@nestjs/config';\nimport { CrudHelperService } from 'src/services/crud-helper.service';\nimport { CRUDService } from 'src/services/crud.service';\nimport { FileService } from 'src/services/file.service';\nimport { ModelMetadataService } from 'src/services/model-metadata.service';\nimport { ModuleMetadataService } from 'src/services/module-metadata.service';\n\n\nimport { SavedFiltersRepository } from 'src/repository/saved-filters.repository';\nimport { SavedFilters } from '../entities/saved-filters.entity';\n\n@Injectable()\nexport class SavedFiltersService extends CRUDService<SavedFilters>{\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(SavedFilters, 'default')\n    // readonly repo: Repository<SavedFilters>,\n    readonly repo: SavedFiltersRepository,\n    readonly moduleRef: ModuleRef\n\n ) {\n   super(modelMetadataService, moduleMetadataService,  configService, fileService,  discoveryService, crudHelperService,entityManager, repo, 'savedFilters', 'solid-core', moduleRef);\n }\n}\n"]}

package/dist/services/scheduled-job.service.d.ts

@@ -1,5 +1,5 @@
 import { DiscoveryService, ModuleRef } from "@nestjs/core";
-import { EntityManager, Repository } from 'typeorm';
+import { EntityManager } from 'typeorm';
 import { ScheduledJob } from 'src/entities/scheduled-job.entity';
 import { ModelMetadataService } from './model-metadata.service';
 import { ModuleMetadataService } from './module-metadata.service';
@@ -7,6 +7,7 @@ import { ConfigService } from '@nestjs/config';
 import { FileService } from './file.service';
 import { CrudHelperService } from './crud-helper.service';
 import { CRUDService } from './crud.service';
+import { ScheduledJobRepository } from 'src/repository/scheduled-job.repository';
 export declare class ScheduledJobService extends CRUDService<ScheduledJob> {
     readonly modelMetadataService: ModelMetadataService;
     readonly moduleMetadataService: ModuleMetadataService;
@@ -15,9 +16,9 @@ export declare class ScheduledJobService extends CRUDService<ScheduledJob> {
     readonly discoveryService: DiscoveryService;
     readonly crudHelperService: CrudHelperService;
     readonly entityManager: EntityManager;
-    readonly repo: Repository<ScheduledJob>;
+    readonly repo: ScheduledJobRepository;
     readonly moduleRef: ModuleRef;
     private readonly logger;
-    constructor(modelMetadataService: ModelMetadataService, moduleMetadataService: ModuleMetadataService, configService: ConfigService, fileService: FileService, discoveryService: DiscoveryService, crudHelperService: CrudHelperService, entityManager: EntityManager, repo: Repository<ScheduledJob>, moduleRef: ModuleRef);
+    constructor(modelMetadataService: ModelMetadataService, moduleMetadataService: ModuleMetadataService, configService: ConfigService, fileService: FileService, discoveryService: DiscoveryService, crudHelperService: CrudHelperService, entityManager: EntityManager, repo: ScheduledJobRepository, moduleRef: ModuleRef);
 }
 //# sourceMappingURL=scheduled-job.service.d.ts.map

package/dist/services/scheduled-job.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scheduled-job.service.d.ts","sourceRoot":"","sources":["../../src/services/scheduled-job.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AACjE,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAG7C,qBACa,mBAAoB,SAAQ,WAAW,CAAC,YAAY,CAAC;IAI9D,QAAQ,CAAC,oBAAoB,EAAE,oBAAoB;IACnD,QAAQ,CAAC,qBAAqB,EAAE,qBAAqB;IACrD,QAAQ,CAAC,aAAa,EAAE,aAAa;IACrC,QAAQ,CAAC,WAAW,EAAE,WAAW;IACjC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB;IAC3C,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB;IAE7C,QAAQ,CAAC,aAAa,EAAE,aAAa;IAErC,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC,YAAY,CAAC;IACvC,QAAQ,CAAC,SAAS,EAAE,SAAS;IAb/B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAwC;gBAGpD,oBAAoB,EAAE,oBAAoB,EAC1C,qBAAqB,EAAE,qBAAqB,EAC5C,aAAa,EAAE,aAAa,EAC5B,WAAW,EAAE,WAAW,EACxB,gBAAgB,EAAE,gBAAgB,EAClC,iBAAiB,EAAE,iBAAiB,EAEpC,aAAa,EAAE,aAAa,EAE5B,IAAI,EAAE,UAAU,CAAC,YAAY,CAAC,EAC9B,SAAS,EAAE,SAAS;CAKhC"}
+{"version":3,"file":"scheduled-job.service.d.ts","sourceRoot":"","sources":["../../src/services/scheduled-job.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAc,MAAM,SAAS,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AACjE,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,OAAO,EAAE,sBAAsB,EAAE,MAAM,yCAAyC,CAAC;AAEjF,qBACa,mBAAoB,SAAQ,WAAW,CAAC,YAAY,CAAC;IAI9D,QAAQ,CAAC,oBAAoB,EAAE,oBAAoB;IACnD,QAAQ,CAAC,qBAAqB,EAAE,qBAAqB;IACrD,QAAQ,CAAC,aAAa,EAAE,aAAa;IACrC,QAAQ,CAAC,WAAW,EAAE,WAAW;IACjC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB;IAC3C,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB;IAE7C,QAAQ,CAAC,aAAa,EAAE,aAAa;IAGrC,QAAQ,CAAC,IAAI,EAAE,sBAAsB;IACrC,QAAQ,CAAC,SAAS,EAAE,SAAS;IAd/B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAwC;gBAGpD,oBAAoB,EAAE,oBAAoB,EAC1C,qBAAqB,EAAE,qBAAqB,EAC5C,aAAa,EAAE,aAAa,EAC5B,WAAW,EAAE,WAAW,EACxB,gBAAgB,EAAE,gBAAgB,EAClC,iBAAiB,EAAE,iBAAiB,EAEpC,aAAa,EAAE,aAAa,EAG5B,IAAI,EAAE,sBAAsB,EAC5B,SAAS,EAAE,SAAS;CAKhC"}

package/dist/services/scheduled-job.service.js

@@ -18,7 +18,6 @@ const common_1 = require("@nestjs/common");
 const typeorm_1 = require("@nestjs/typeorm");
 const core_1 = require("@nestjs/core");
 const typeorm_2 = require("typeorm");
-const scheduled_job_entity_1 = require("../entities/scheduled-job.entity");
 const model_metadata_service_1 = require("./model-metadata.service");
 const module_metadata_service_1 = require("./module-metadata.service");
 const config_1 = require("@nestjs/config");
@@ -26,6 +25,7 @@ const file_service_1 = require("./file.service");
 const crud_helper_service_1 = require("./crud-helper.service");
 const crud_service_1 = require("./crud.service");
 const common_2 = require("@nestjs/common");
+const scheduled_job_repository_1 = require("../repository/scheduled-job.repository");
 let ScheduledJobService = ScheduledJobService_1 = class ScheduledJobService extends crud_service_1.CRUDService {
     constructor(modelMetadataService, moduleMetadataService, configService, fileService, discoveryService, crudHelperService, entityManager, repo, moduleRef) {
         super(modelMetadataService, moduleMetadataService, configService, fileService, discoveryService, crudHelperService, entityManager, repo, 'scheduledJob', 'solid-core', moduleRef);
@@ -45,7 +45,6 @@ exports.ScheduledJobService = ScheduledJobService;
 exports.ScheduledJobService = ScheduledJobService = ScheduledJobService_1 = __decorate([
     (0, common_1.Injectable)(),
     __param(6, (0, typeorm_1.InjectEntityManager)()),
-    __param(7, (0, typeorm_1.InjectRepository)(scheduled_job_entity_1.ScheduledJob)),
     __metadata("design:paramtypes", [model_metadata_service_1.ModelMetadataService,
         module_metadata_service_1.ModuleMetadataService,
         config_1.ConfigService,
@@ -53,7 +52,7 @@ exports.ScheduledJobService = ScheduledJobService = ScheduledJobService_1 = __de
         core_1.DiscoveryService,
         crud_helper_service_1.CrudHelperService,
         typeorm_2.EntityManager,
-        typeorm_2.Repository,
+        scheduled_job_repository_1.ScheduledJobRepository,
         core_1.ModuleRef])
 ], ScheduledJobService);
 //# sourceMappingURL=scheduled-job.service.js.map

package/dist/services/scheduled-job.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"scheduled-job.service.js","sourceRoot":"","sources":["../../src/services/scheduled-job.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,6CAAwE;AACxE,uCAA2D;AAC3D,qCAAoD;AACpD,2EAAiE;AACjE,qEAAgE;AAChE,uEAAkE;AAClE,2CAA+C;AAC/C,iDAA6C;AAC7C,+DAA0D;AAC1D,iDAA6C;AAC7C,2CAAwC;AAGjC,IAAM,mBAAmB,2BAAzB,MAAM,mBAAoB,SAAQ,0BAAyB;IAGhE,YACW,oBAA0C,EAC1C,qBAA4C,EAC5C,aAA4B,EAC5B,WAAwB,EACxB,gBAAkC,EAClC,iBAAoC,EAE7C,aAAqC,EAErC,IAAuC,EAC9B,SAAoB;QAG7B,KAAK,CAAC,oBAAoB,EAAE,qBAAqB,EAAE,aAAa,EAAE,WAAW,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,aAAa,EAAE,IAAI,EAAE,cAAc,EAAE,YAAY,EAAE,SAAS,CAAC,CAAC;QAbzK,yBAAoB,GAApB,oBAAoB,CAAsB;QAC1C,0BAAqB,GAArB,qBAAqB,CAAuB;QAC5C,kBAAa,GAAb,aAAa,CAAe;QAC5B,gBAAW,GAAX,WAAW,CAAa;QACxB,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,sBAAiB,GAAjB,iBAAiB,CAAmB;QAEpC,kBAAa,GAAb,aAAa,CAAe;QAE5B,SAAI,GAAJ,IAAI,CAA0B;QAC9B,cAAS,GAAT,SAAS,CAAW;QAbd,WAAM,GAAG,IAAI,eAAM,CAAC,qBAAmB,CAAC,IAAI,CAAC,CAAC;IAiB/D,CAAC;CACF,CAAA;AAnBY,kDAAmB;8BAAnB,mBAAmB;IAD/B,IAAA,mBAAU,GAAE;IAWR,WAAA,IAAA,6BAAmB,GAAE,CAAA;IAErB,WAAA,IAAA,0BAAgB,EAAC,mCAAY,CAAC,CAAA;qCARA,6CAAoB;QACnB,+CAAqB;QAC7B,sBAAa;QACf,0BAAW;QACN,uBAAgB;QACf,uCAAiB;QAErB,uBAAa;QAEtB,oBAAU;QACL,gBAAS;GAdpB,mBAAmB,CAmB/B","sourcesContent":["import { Injectable } from '@nestjs/common';\nimport { InjectEntityManager, InjectRepository } from '@nestjs/typeorm';\nimport { DiscoveryService, ModuleRef } from \"@nestjs/core\";\nimport { EntityManager, Repository } from 'typeorm';\nimport { ScheduledJob } from 'src/entities/scheduled-job.entity';\nimport { ModelMetadataService } from './model-metadata.service';\nimport { ModuleMetadataService } from './module-metadata.service';\nimport { ConfigService } from '@nestjs/config';\nimport { FileService } from './file.service';\nimport { CrudHelperService } from './crud-helper.service';\nimport { CRUDService } from './crud.service';\nimport { Logger } from '@nestjs/common';\n\n@Injectable()\nexport class ScheduledJobService extends CRUDService<ScheduledJob> {\n  private readonly logger = new Logger(ScheduledJobService.name);\n\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(ScheduledJob)\n    readonly repo: Repository<ScheduledJob>,\n    readonly moduleRef: ModuleRef\n\n  ) {\n    super(modelMetadataService, moduleMetadataService, configService, fileService, discoveryService, crudHelperService, entityManager, repo, 'scheduledJob', 'solid-core', moduleRef);\n  }\n}\n"]}
+{"version":3,"file":"scheduled-job.service.js","sourceRoot":"","sources":["../../src/services/scheduled-job.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,6CAAwE;AACxE,uCAA2D;AAC3D,qCAAoD;AAEpD,qEAAgE;AAChE,uEAAkE;AAClE,2CAA+C;AAC/C,iDAA6C;AAC7C,+DAA0D;AAC1D,iDAA6C;AAC7C,2CAAwC;AACxC,qFAAiF;AAG1E,IAAM,mBAAmB,2BAAzB,MAAM,mBAAoB,SAAQ,0BAAyB;IAGhE,YACW,oBAA0C,EAC1C,qBAA4C,EAC5C,aAA4B,EAC5B,WAAwB,EACxB,gBAAkC,EAClC,iBAAoC,EAE7C,aAAqC,EAG5B,IAA4B,EAC5B,SAAoB;QAG7B,KAAK,CAAC,oBAAoB,EAAE,qBAAqB,EAAE,aAAa,EAAE,WAAW,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,aAAa,EAAE,IAAI,EAAE,cAAc,EAAE,YAAY,EAAE,SAAS,CAAC,CAAC;QAdzK,yBAAoB,GAApB,oBAAoB,CAAsB;QAC1C,0BAAqB,GAArB,qBAAqB,CAAuB;QAC5C,kBAAa,GAAb,aAAa,CAAe;QAC5B,gBAAW,GAAX,WAAW,CAAa;QACxB,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,sBAAiB,GAAjB,iBAAiB,CAAmB;QAEpC,kBAAa,GAAb,aAAa,CAAe;QAG5B,SAAI,GAAJ,IAAI,CAAwB;QAC5B,cAAS,GAAT,SAAS,CAAW;QAdd,WAAM,GAAG,IAAI,eAAM,CAAC,qBAAmB,CAAC,IAAI,CAAC,CAAC;IAkB/D,CAAC;CACF,CAAA;AApBY,kDAAmB;8BAAnB,mBAAmB;IAD/B,IAAA,mBAAU,GAAE;IAWR,WAAA,IAAA,6BAAmB,GAAE,CAAA;qCANS,6CAAoB;QACnB,+CAAqB;QAC7B,sBAAa;QACf,0BAAW;QACN,uBAAgB;QACf,uCAAiB;QAErB,uBAAa;QAGtB,iDAAsB;QACjB,gBAAS;GAfpB,mBAAmB,CAoB/B","sourcesContent":["import { Injectable } from '@nestjs/common';\nimport { InjectEntityManager, InjectRepository } from '@nestjs/typeorm';\nimport { DiscoveryService, ModuleRef } from \"@nestjs/core\";\nimport { EntityManager, Repository } from 'typeorm';\nimport { ScheduledJob } from 'src/entities/scheduled-job.entity';\nimport { ModelMetadataService } from './model-metadata.service';\nimport { ModuleMetadataService } from './module-metadata.service';\nimport { ConfigService } from '@nestjs/config';\nimport { FileService } from './file.service';\nimport { CrudHelperService } from './crud-helper.service';\nimport { CRUDService } from './crud.service';\nimport { Logger } from '@nestjs/common';\nimport { ScheduledJobRepository } from 'src/repository/scheduled-job.repository';\n\n@Injectable()\nexport class ScheduledJobService extends CRUDService<ScheduledJob> {\n  private readonly logger = new Logger(ScheduledJobService.name);\n\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(ScheduledJob)\n    // readonly repo: Repository<ScheduledJob>,\n    readonly repo: ScheduledJobRepository,\n    readonly moduleRef: ModuleRef\n\n  ) {\n    super(modelMetadataService, moduleMetadataService, configService, fileService, discoveryService, crudHelperService, entityManager, repo, 'scheduledJob', 'solid-core', moduleRef);\n  }\n}\n"]}

package/dist/services/scheduled-jobs/scheduler.service.d.ts

@@ -1,12 +1,11 @@
-import { Repository } from 'typeorm';
-import { ISchedulerService } from './scheduler.interface';
 import { SolidRegistry } from 'src/helpers/solid-registry';
-import { ScheduledJob } from 'src/entities/scheduled-job.entity';
+import { ScheduledJobRepository } from 'src/repository/scheduled-job.repository';
+import { ISchedulerService } from './scheduler.interface';
 export declare class SchedulerServiceImpl implements ISchedulerService {
     private readonly scheduledJobRepo;
     private readonly solidRegistry;
     private readonly logger;
-    constructor(scheduledJobRepo: Repository<ScheduledJob>, solidRegistry: SolidRegistry);
+    constructor(scheduledJobRepo: ScheduledJobRepository, solidRegistry: SolidRegistry);
     runScheduledJobs(): Promise<void>;
     private shouldRunNow;
     private computeNextRunAt;

package/dist/services/scheduled-jobs/scheduler.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scheduler.service.d.ts","sourceRoot":"","sources":["../../../src/services/scheduled-jobs/scheduler.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAA2B,UAAU,EAAE,MAAM,SAAS,CAAC;AAE9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AAIjE,qBACa,oBAAqB,YAAW,iBAAiB;IAKtD,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,aAAa;IALlC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAyC;gBAI3C,gBAAgB,EAAE,UAAU,CAAC,YAAY,CAAC,EAC1C,aAAa,EAAE,aAAa;IAI3C,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IAmDvC,OAAO,CAAC,YAAY;IAmCpB,OAAO,CAAC,gBAAgB;CAyB3B"}
+{"version":3,"file":"scheduler.service.d.ts","sourceRoot":"","sources":["../../../src/services/scheduled-jobs/scheduler.service.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,sBAAsB,EAAE,MAAM,yCAAyC,CAAC;AACjF,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAE1D,qBACa,oBAAqB,YAAW,iBAAiB;IAMtD,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,aAAa;IANlC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAyC;gBAK3C,gBAAgB,EAAE,sBAAsB,EACxC,aAAa,EAAE,aAAa;IAI3C,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IAmDvC,OAAO,CAAC,YAAY;IAmCpB,OAAO,CAAC,gBAAgB;CAyB3B"}