@solidstarters/solid-core 1.2.125 → 1.2.128

package/src/jobs/database/email-queue-options-database.ts

@@ -0,0 +1,10 @@
+import { BrokerType } from "src/interfaces";
+
+
+const MAIL_QUEUE_NAME = 'solid_email_db_queue_v3';
+
+export default {
+    name: 'solidEmailInstance',
+    type: BrokerType.Database,
+    queueName: MAIL_QUEUE_NAME,
+};

package/src/jobs/database/email-subscriber-database.service.ts

@@ -0,0 +1,30 @@
+import { Injectable } from '@nestjs/common';
+
+import mailQueueOptions from './email-queue-options-database';
+import { QueueMessage } from 'src/interfaces/mq';
+import { MqMessageService } from 'src/services/mq-message.service';
+import { MqMessageQueueService } from 'src/services/mq-message-queue.service';
+import { DatabaseSubscriber } from 'src/services/queues/database-subscriber.service';
+import { SMTPEMailService } from 'src/services/mail/SMTPEmailService';
+import { QueuesModuleOptions } from 'src/interfaces';
+
+@Injectable()
+export class EmailQueueSubscriberDatabase extends DatabaseSubscriber<any> {
+    constructor(
+        private readonly emailService: SMTPEMailService,
+        readonly mqMessageService: MqMessageService,
+        readonly mqMessageQueueService: MqMessageQueueService,
+    ) {
+        super(mqMessageService, mqMessageQueueService);
+    }
+
+    options(): QueuesModuleOptions {
+        return {
+            ...mailQueueOptions
+        }
+    }
+
+    subscribe(message: QueueMessage<any>) {
+        return this.emailService.sendEmailSynchronously(message);
+    }
+}

package/src/jobs/database/{generate-code-publisher.service.ts → generate-code-publisher-database.service.ts}

@@ -4,10 +4,10 @@ import { MqMessageQueueService } from '../../services/mq-message-queue.service';
 import { MqMessageService } from '../../services/mq-message.service';
 import { CodeGenerationOptions, QueuesModuleOptions } from "../../interfaces";
 import { DatabasePublisher } from 'src/services/queues/database-publisher.service';
-import generateCodeQueueOptions from './generate-code-queue-options';
+import generateCodeQueueOptions from './generate-code-queue-options-database';
 
 @Injectable()
-export class GenerateCodePublisher extends DatabasePublisher<CodeGenerationOptions> {
+export class GenerateCodePublisherDatabase extends DatabasePublisher<CodeGenerationOptions> {
     constructor(
         protected readonly mqMessageService: MqMessageService,
         protected readonly mqMessageQueueService: MqMessageQueueService,

package/src/jobs/database/{generate-code-subscriber.service.ts → generate-code-subscriber-database.service.ts}

@@ -5,13 +5,13 @@ import { MqMessageService } from '../../services/mq-message.service';
 import { MqMessageQueueService } from '../../services/mq-message-queue.service';
 import { CodeGenerationOptions, QueuesModuleOptions } from "../../interfaces";
 import { DatabaseSubscriber } from 'src/services/queues/database-subscriber.service';
-import generateCodeQueueOptions from './generate-code-queue-options';
+import generateCodeQueueOptions from './generate-code-queue-options-database';
 import { SolidFieldType } from 'src/dtos/create-field-metadata.dto';
 import { ModelMetadataService } from 'src/services/model-metadata.service';
 
 @Injectable()
-export class GenerateCodeSubscriber extends DatabaseSubscriber<CodeGenerationOptions> {
-    private readonly generateCodeSubscriberLogger = new Logger(GenerateCodeSubscriber.name);
+export class GenerateCodeSubscriberDatabase extends DatabaseSubscriber<CodeGenerationOptions> {
+    private readonly generateCodeSubscriberLogger = new Logger(GenerateCodeSubscriberDatabase.name);
 
     constructor(
         readonly mqMessageService: MqMessageService,

package/src/jobs/database/otp-publisher-database.service.ts

@@ -0,0 +1,23 @@
+import { Injectable } from '@nestjs/common';
+
+import otpQueueOptions from './otp-queue-options-database';
+import { MqMessageQueueService } from 'src/services/mq-message-queue.service';
+import { MqMessageService } from 'src/services/mq-message.service';
+import { DatabasePublisher } from 'src/services/queues/database-publisher.service';
+import { QueuesModuleOptions } from 'src/interfaces';
+
+@Injectable()
+export class OTPQueuePublisherDatabase extends DatabasePublisher<any> {
+    constructor(
+        protected readonly mqMessageService: MqMessageService,
+        protected readonly mqMessageQueueService: MqMessageQueueService,
+    ) {
+        super(mqMessageService, mqMessageQueueService);
+    }
+
+    options(): QueuesModuleOptions {
+        return {
+            ...otpQueueOptions
+        }
+    }
+}

package/src/jobs/database/otp-queue-options-database.ts

@@ -0,0 +1,8 @@
+import { BrokerType } from "src/interfaces";
+
+const OTP_QUEUE_NAME = 'otp_queue_database';
+export default {
+    name: 'otpInstance',
+    type: BrokerType.Database,
+    queueName: OTP_QUEUE_NAME,
+};

package/src/jobs/database/otp-subscriber-database.service.ts

@@ -0,0 +1,30 @@
+import { Injectable } from '@nestjs/common';
+
+import { QueueMessage } from 'src/interfaces/mq';
+import otpQueueOptions from './otp-queue-options-database';
+import { MqMessageService } from 'src/services/mq-message.service';
+import { MqMessageQueueService } from 'src/services/mq-message-queue.service';
+import { DatabaseSubscriber } from 'src/services/queues/database-subscriber.service';
+import { Msg91OTPService } from 'src/services/sms/Msg91OTPService';
+import { QueuesModuleOptions } from 'src/interfaces';
+
+@Injectable()
+export class OTPQueueSubscriberDatabase extends DatabaseSubscriber<any> {
+    constructor(
+        private readonly otpService: Msg91OTPService,
+        readonly mqMessageService: MqMessageService,
+        readonly mqMessageQueueService: MqMessageQueueService,
+    ) {
+        super(mqMessageService, mqMessageQueueService);
+    }
+
+    options(): QueuesModuleOptions {
+        return {
+            ...otpQueueOptions
+        }
+    }
+
+    subscribe(message: QueueMessage<any>) {
+        this.otpService.sendSMSSynchronously(message);
+    }
+}

package/src/jobs/database/sms-publisher-database.service.ts

@@ -0,0 +1,23 @@
+import { Injectable } from '@nestjs/common';
+
+import smsQueueOptions from './sms-queue-database-options';
+import { MqMessageQueueService } from 'src/services/mq-message-queue.service';
+import { MqMessageService } from 'src/services/mq-message.service';
+import { QueuesModuleOptions } from 'src/interfaces';
+import { DatabasePublisher } from 'src/services/queues/database-publisher.service';
+
+@Injectable()
+export class SmsQueuePublisherDatabase extends DatabasePublisher<any> {
+    constructor(
+        protected readonly mqMessageService: MqMessageService,
+        protected readonly mqMessageQueueService: MqMessageQueueService,
+    ) {
+        super(mqMessageService, mqMessageQueueService);
+    }
+
+    options(): QueuesModuleOptions {
+        return {
+            ...smsQueueOptions
+        }
+    }
+}

package/src/jobs/database/sms-queue-database-options.ts

@@ -0,0 +1,8 @@
+import { BrokerType } from "src/interfaces";
+
+const SMS_QUEUE_NAME = 'sms_queue_database';
+export default {
+    name: 'smsInstance',
+    type: BrokerType.Database,
+    queueName: SMS_QUEUE_NAME,
+};

package/src/jobs/database/sms-subscriber-database.service.ts

@@ -0,0 +1,30 @@
+import { Injectable } from '@nestjs/common';
+
+import { QueueMessage } from 'src/interfaces/mq';
+import smsQueueOptions from './sms-queue-database-options';
+import { MqMessageService } from 'src/services/mq-message.service';
+import { MqMessageQueueService } from 'src/services/mq-message-queue.service';
+import { Msg91SMSService } from 'src/services/sms/Msg91SMSService';
+import { QueuesModuleOptions } from 'src/interfaces';
+import { DatabaseSubscriber } from 'src/services/queues/database-subscriber.service';
+
+@Injectable()
+export class SmsQueueSubscriberDatabase extends DatabaseSubscriber<any> {
+    constructor(
+        private readonly smsService: Msg91SMSService,
+        readonly mqMessageService: MqMessageService,
+        readonly mqMessageQueueService: MqMessageQueueService,
+    ) {
+        super(mqMessageService, mqMessageQueueService);
+    }
+
+    options(): QueuesModuleOptions {
+        return {
+            ...smsQueueOptions
+        }
+    }
+
+    subscribe(message: QueueMessage<any>) {
+        this.smsService.sendSMSSynchronously(message);
+    }
+}

package/src/jobs/database/test-queue-options-database.ts

@@ -0,0 +1,9 @@
+import { BrokerType } from "../../interfaces";
+
+const QUEUE_NAME = 'test_queue_db';
+
+export default {
+    name: 'queueTestDb',
+    type: BrokerType.Database,
+    queueName: QUEUE_NAME,
+};

package/src/jobs/database/{queue-test-db-publisher.service.ts → test-queue-publisher-database.service.ts}

@@ -1,6 +1,6 @@
 import { Injectable } from '@nestjs/common';
 
-import testQueueConfig from './test-queue-db-options';
+import testQueueConfig from './test-queue-options-database';
 import { MqMessageQueueService } from '../../services/mq-message-queue.service';
 import { MqMessageService } from '../../services/mq-message.service';
 import { QueuesModuleOptions } from "../../interfaces";
@@ -8,7 +8,7 @@ import { DatabasePublisher } from 'src/services/queues/database-publisher.servic
 
 
 @Injectable()
-export class TestQueueDbPublisher extends DatabasePublisher<any> {
+export class TestQueuePublisherDatabase extends DatabasePublisher<any> {
     constructor(
         protected readonly mqMessageService: MqMessageService,
         protected readonly mqMessageQueueService: MqMessageQueueService,

package/src/jobs/database/{queue-test-db-subscriber.service.ts → test-queue-subscriber-database.service.ts}

@@ -1,15 +1,15 @@
 import { Injectable, Logger } from '@nestjs/common';
 
 import { QueueMessage } from 'src/interfaces/mq';
-import testQueueConfig from './test-queue-db-options';
+import testQueueConfig from './test-queue-options-database';
 import { MqMessageService } from '../../services/mq-message.service';
 import { MqMessageQueueService } from '../../services/mq-message-queue.service';
 import { QueuesModuleOptions } from "../../interfaces";
 import { DatabaseSubscriber } from 'src/services/queues/database-subscriber.service';
 
 @Injectable()
-export class TestQueueDbSubscriber extends DatabaseSubscriber<any> {
-    private readonly testQueueLogger = new Logger(TestQueueDbSubscriber.name);
+export class TestQueueSubscriberDatabase extends DatabaseSubscriber<any> {
+    private readonly testQueueLogger = new Logger(TestQueueSubscriberDatabase.name);
     constructor(
         readonly mqMessageService: MqMessageService,
         readonly mqMessageQueueService: MqMessageQueueService,

package/src/jobs/database/whatsapp-publisher-database.service.ts

@@ -0,0 +1,23 @@
+import { Injectable } from '@nestjs/common';
+
+import whatsappQueueOptions from './whatsapp-queue-options-database';
+import { MqMessageService } from 'src/services/mq-message.service';
+import { MqMessageQueueService } from 'src/services/mq-message-queue.service';
+import { QueuesModuleOptions } from 'src/interfaces';
+import { DatabasePublisher } from 'src/services/queues/database-publisher.service';
+
+@Injectable()
+export class WhatsappQueuePublisherDatabase extends DatabasePublisher<any> {
+    constructor(
+        protected readonly mqMessageService: MqMessageService,
+        protected readonly mqMessageQueueService: MqMessageQueueService,
+    ) {
+        super(mqMessageService, mqMessageQueueService);
+    }
+
+    options(): QueuesModuleOptions {
+        return {
+            ...whatsappQueueOptions
+        }
+    }
+}

package/src/jobs/database/whatsapp-queue-options-database.ts

@@ -0,0 +1,9 @@
+import { BrokerType } from "src/interfaces";
+
+const WHATSAPP_QUEUE_NAME = 'whatsapp_queue_database';
+
+export default {
+    name: 'whatsappInstance',
+    type: BrokerType.Database,
+    queueName: WHATSAPP_QUEUE_NAME,
+};

package/src/jobs/database/whatsapp-subscriber-database.service.ts

@@ -0,0 +1,31 @@
+import { Injectable } from '@nestjs/common';
+
+import { RabbitMqSubscriber } from 'src/services/queues/rabbitmq-subscriber.service';
+import { QueueMessage } from 'src/interfaces/mq';
+import whatsappQueueOptions from './whatsapp-queue-options-database';
+import { MqMessageService } from 'src/services/mq-message.service';
+import { MqMessageQueueService } from 'src/services/mq-message-queue.service';
+import { Msg91WhatsappService } from 'src/services/whatsapp/Msg91WhatsappService';
+import { QueuesModuleOptions } from 'src/interfaces';
+import { DatabaseSubscriber } from 'src/services/queues/database-subscriber.service';
+
+@Injectable()
+export class WhatsappQueueSubscriberDatabase extends DatabaseSubscriber<any> {
+    constructor(
+        private readonly whatsappService: Msg91WhatsappService,
+        readonly mqMessageService: MqMessageService,
+        readonly mqMessageQueueService: MqMessageQueueService,
+    ) {
+        super(mqMessageService, mqMessageQueueService);
+    }
+
+    options(): QueuesModuleOptions {
+        return {
+            ...whatsappQueueOptions
+        }
+    }
+
+    subscribe(message: QueueMessage<any>) {
+        this.whatsappService.sendSMSSynchronously(message);
+    }
+}

package/src/jobs/test-queue-options.ts

@@ -1,4 +1,3 @@
-import { QueueMessage } from 'src/interfaces/mq';
 import { BrokerType } from "../interfaces";
 
 const QUEUE_NAME = 'test_queue';

package/src/seeders/module-metadata-seeder.service.ts

@@ -141,10 +141,21 @@ export class ModuleMetadataSeederService {
             await this.seedMediaStorageProviders(mediaStorageProviders);
             this.logger.debug(`[End] Processing Media Storage Provider for ${moduleMetadata.name}`);
 
-            // TODO: Custom role handling
+            // Custom role handling
             this.logger.debug(`[End] Processing roles for ${moduleMetadata.name}`)
             const roles = overallMetadata.roles;
-            await this.roleService.createRolesIfNotExists(roles);
+
+            // Every role configuration in the seeder json can optionally have a permissions attribute. 
+            // While creating roles we are only passing the role name to be used. 
+            await this.roleService.createRolesIfNotExists(roles.map(role => { return { name: role.name } }));
+
+            // After roles are created, we iterate over all roles and attach permissions (if specified in the seeder json) to the respective role.
+            for (let roleI = 0; roleI < roles.length; roleI++) {
+                const role = roles[roleI];
+                if (role.permissions) {
+                    await this.roleService.addPermissionsToRole(role.name, role.permissions)
+                }
+            }
             this.logger.debug(`[End] Processing roles for ${moduleMetadata.name}`)
 
             // Custom user handling
@@ -365,7 +376,23 @@ export class ModuleMetadataSeederService {
             const menuData = menus[j];
 
             const adminRole = await this.roleService.findRoleByName('Admin');
-            menuData['roles'] = [adminRole]
+
+            const specifiedRoles = menuData['roles'];
+
+            // If the developer has specified roles, then resolve them, making sure that admin role is also given.
+            const specifiedRoleObjects = [adminRole];
+            if (specifiedRoles) {
+                for (let i = 0; i < specifiedRoles.length; i++) {
+                    const specifiedRole = specifiedRoles[i];
+                    const specifiedRoleObject = await this.roleService.findRoleByName(specifiedRole);
+                    if (!specifiedRoleObject) {
+                        throw new Error(`Invalid role: (${specifiedRole}) specified against menu with display name ${menuData.displayName}.`);
+                    }
+                    specifiedRoleObjects.push(specifiedRoleObject);
+                }
+            }
+
+            menuData['roles'] = specifiedRoleObjects;
             menuData['action'] = await this.solidActionService.findOneByUserKey(menuData.actionUserKey);
             menuData['module'] = await this.moduleMetadataService.findOneByUserKey(menuData.moduleUserKey);