@solidstarters/solid-core 1.2.111 → 1.2.112

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidstarters/solid-core",
-  "version": "1.2.111",
+  "version": "1.2.112",
   "description": "This module is a NestJS module containing all the required core providers required by a Solid application",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/controllers/model-metadata.controller.ts

@@ -69,10 +69,9 @@ export class ModelMetadataController {
     @ApiBearerAuth("jwt")
     @Post(':id/generate-code')
     generateCode(@Param('id', ParseIntPipe) id: number) {
-        return this.modelMetadataService.handleGenerateCode({ modelId: id});
+        return this.modelMetadataService.handleGenerateCode({ modelId: id });
     }
 
-
     @ApiBearerAuth("jwt")
     @Put(':id')
     update(@Param('id') id: number, @Body() updateModelMetaDataDto: UpdateModelMetaDataDto) {

package/src/controllers/queues-test.controller.ts

@@ -1,9 +1,10 @@
-import { Controller, Get } from '@nestjs/common';
+import { Controller, Get, Param } from '@nestjs/common';
 import { ApiTags } from '@nestjs/swagger';
 import { Auth } from 'src/decorators/auth.decorator';
 import { Public } from 'src/decorators/public.decorator';
 import { AuthType } from 'src/enums/auth-type.enum';
 import { TestQueuePublisher } from '../jobs/queue-test-publisher.service';
+import { TestQueueDbPublisher } from 'src/jobs/database/queue-test-db-publisher.service';
 
 
 @Auth(AuthType.None)
@@ -11,11 +12,14 @@ import { TestQueuePublisher } from '../jobs/queue-test-publisher.service';
 @ApiTags("Queues")
 export class QueuesTestController {
 
-    constructor(private readonly publisher: TestQueuePublisher) { }
+    constructor(
+        private readonly publisherRmq: TestQueuePublisher,
+        private readonly publisherDb: TestQueueDbPublisher
+    ) { }
 
     @Public()
-    @Get()
-    async getHello() {
+    @Get(':messageBroker')
+    async getHello(@Param('messageBroker') messageBroker: string) {
         const pubsubMessage = 'A hopping-good time!';
         const m = {
             payload: {
@@ -23,10 +27,15 @@ export class QueuesTestController {
                 lastName: 'Patel',
                 age: 40
             },
-            parentEntity: 'Address',
+            parentEntity: 'feeType',
             parentEntityId: 23,
         };
-        await this.publisher.publish(m);
+        if (messageBroker === 'rabbitmq') {
+            await this.publisherRmq.publish(m);
+        }
+        if (messageBroker === 'database') {
+            await this.publisherDb.publish(m);
+        }
 
         return {};
     }

package/src/entities/field-metadata.entity.ts

@@ -105,7 +105,7 @@ export class FieldMetadata extends CommonEntity {
     // We can store a filter json like this {"fieldName": ${someVarWhichWillComeFromParentModel... or can be hard coded...}}
     // {"type": "INDUSTRY"} .... Eg. static fixedFilter 
     // {"country_id", "${country}"} ... Eg. dynamic fixedFilter 
-    @Column({ name: 'relation_Field_Fixed_Filter', nullable: true })
+    @Column({ name: 'relation_field_fixed_filter', nullable: true })
     relationFieldFixedFilter: string;
 
     @Column({ name: 'selection_dynamic_provider', nullable: true })

package/src/entities/mq-message.entity.ts

@@ -6,6 +6,9 @@ export class MqMessage extends CommonEntity{
 @Column({ type: "varchar", nullable: true })
 messageId: string;
 
+@Column({ type: "varchar", nullable: true })
+messageBroker: string;
+
 @Column({ type: "integer", nullable: true })
 retryCount: number;
 

package/src/helpers/module-metadata-helper.service.ts

@@ -1,3 +1,4 @@
+import { dasherize } from "@angular-devkit/core/src/utils/strings";
 import { Injectable, Logger } from "@nestjs/common";
 import * as fs from 'fs/promises'; // Use the Promise-based version of fs for async/await
 import * as path from 'path'; // To handle file paths
@@ -7,7 +8,7 @@ import { FileService } from "src/services/file.service";
 @Injectable()
 export class ModuleMetadataHelperService {
     private readonly logger = new Logger(ModuleMetadataHelperService.name);
-    constructor(private readonly fileService: FileService) {}
+    constructor(private readonly fileService: FileService) { }
     // async getModuleMetadataConfig(moduleName: string): Promise<ModuleMetadata> {
     //     const filePath = this.getModuleMetadataFilePath(moduleName);
     //     const metadata = await this.getModuleMetadata(filePath);
@@ -19,16 +20,21 @@ export class ModuleMetadataHelperService {
         return JSON.parse(fileContent);
     }
 
+    async getModulePath(moduleName: string): Promise<string> {
+        return path.resolve(process.cwd(), 'src', moduleName);
+    }
+
     async getModuleMetadataFilePath(moduleName: string): Promise<string> {
-        const folderPath = path.resolve(process.cwd(), 'module-metadata', moduleName);
-        const filePath = path.join(folderPath, `${moduleName}-metadata.json`);
+        const dashModuleName = dasherize(moduleName);
+        const folderPath = path.resolve(process.cwd(), 'module-metadata', dashModuleName);
+        const filePath = path.join(folderPath, `${dashModuleName}-metadata.json`);
         // Check if filePath exists
         const fileExists = await this.fileService.fileExists(filePath);
         this.logger.debug(`File exists: ${fileExists} at ${filePath}`);
         if (!fileExists) {
             // If the module is solid-core, try the fallback path, in case the current root directory is the solid core project
-            if (moduleName === SOLID_CORE_MODULE_NAME) {
-                const fallbackPath = path.resolve(process.cwd(), 'src', 'seeders', 'seed-data', `${moduleName}-metadata.json`);
+            if (dashModuleName === SOLID_CORE_MODULE_NAME) {
+                const fallbackPath = path.resolve(process.cwd(), 'src', 'seeders', 'seed-data', `${dashModuleName}-metadata.json`);
                 this.logger.debug(`Fallback path: ${fallbackPath}`);
                 return fallbackPath;
             }

package/src/index.ts

@@ -214,8 +214,8 @@ export * from './services/mq-message-queue.service'
 export * from './services/mq-message.service'
 export * from './services/pdf.service'
 export * from './services/permission-metadata.service'
-export * from './services/rabbitmq-publisher.service'
-export * from './services/rabbitmq-subscriber.service'
+export * from './services/queues/rabbitmq-publisher.service'
+export * from './services/queues/rabbitmq-subscriber.service'
 export * from './services/refresh-token-ids-storage.service'
 export * from './services/role-metadata.service'
 export * from './services/selection-providers/list-of-models-selection-provider.service'
@@ -241,7 +241,7 @@ export * from './repository/field.repository'
 
 
 //softDeleteAwareEventSubscriber.subscriber.ts
-export * from './subscribers/model.subscriber'
+export * from './subscribers/model-metadata.subscriber'
 export * from './subscribers/soft-delete-aware-event.subscriber' //rename
 export * from './subscribers/view-metadata.subscriber' //rename
 export * from './subscribers/audit.subscriber'

package/src/interfaces.ts

@@ -158,6 +158,7 @@ export interface MailAttachment {
 
 export enum BrokerType {
   RabbitMQ = 'rabbitmq',
+  Database = 'database'
 }
 
 export interface QueuesModuleOptions {

package/src/jobs/api-email-publisher.service.ts

@@ -1,6 +1,6 @@
 import { Injectable } from '@nestjs/common';
 
-import { RabbitMqPublisher } from 'src/services/rabbitmq-publisher.service';
+import { RabbitMqPublisher } from 'src/services/queues/rabbitmq-publisher.service';
 import mailQueueOptions from './api-email-queue-options';
 import { MqMessageQueueService } from 'src/services/mq-message-queue.service';
 import { MqMessageService } from 'src/services/mq-message.service';

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

@@ -1,7 +1,7 @@
 import { Injectable } from '@nestjs/common';
 
 import mailQueueOptions from './api-email-queue-options';
-import { RabbitMqSubscriber } from 'src/services/rabbitmq-subscriber.service';
+import { RabbitMqSubscriber } from 'src/services/queues/rabbitmq-subscriber.service';
 import { QueueMessage } from 'src/interfaces/mq';
 import { ElasticEmailService } from '../services/mail/ElasticEmailService';
 import { MqMessageService } from 'src/services/mq-message.service';

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

@@ -0,0 +1,23 @@
+import { Injectable } from '@nestjs/common';
+
+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';
+
+@Injectable()
+export class GenerateCodePublisher extends DatabasePublisher<CodeGenerationOptions> {
+    constructor(
+        protected readonly mqMessageService: MqMessageService,
+        protected readonly mqMessageQueueService: MqMessageQueueService,
+    ) {
+        super(mqMessageService, mqMessageQueueService);
+    }
+
+    options(): QueuesModuleOptions {
+        return {
+            ...generateCodeQueueOptions
+        }
+    }
+}

package/src/jobs/database/generate-code-queue-options.ts

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

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

@@ -0,0 +1,56 @@
+import { forwardRef, Inject, Injectable, Logger } from '@nestjs/common';
+
+import { QueueMessage } from 'src/interfaces/mq';
+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 { 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);
+
+    constructor(
+        readonly mqMessageService: MqMessageService,
+        readonly mqMessageQueueService: MqMessageQueueService,
+        @Inject(forwardRef(() => ModelMetadataService))
+        readonly modelMetadataService: ModelMetadataService,
+    ) {
+        super(mqMessageService, mqMessageQueueService);
+    }
+
+    options(): QueuesModuleOptions {
+        return {
+            ...generateCodeQueueOptions
+        }
+    }
+
+    async subscribe(message: QueueMessage<CodeGenerationOptions>) {
+        this.generateCodeSubscriberLogger.debug(`Received message: ${JSON.stringify(message)}`);
+
+        const codeGnerationOptions = message.payload;
+
+        const { model, removeFieldCodeOuput, refreshModelCodeOutput } = await this.modelMetadataService.generateCode(codeGnerationOptions);
+
+        // Generate the code for models which are linked to fields having an inverse relation
+        const coModelSingularNames = model.fields.
+            filter(field => field.type === SolidFieldType.relation && field.relationCreateInverse === true)
+            .map(field => field.relationCoModelSingularName);
+
+        for (const singularName of coModelSingularNames) {
+            const coModel = await this.modelMetadataService.findOneBySingularName(singularName);
+            const inverseOptions: CodeGenerationOptions = {
+                modelId: coModel.id,
+                dryRun: codeGnerationOptions.dryRun
+            };
+            await this.modelMetadataService.generateCode(inverseOptions);
+        }
+
+        await this.modelMetadataService.generateVAMConfig(model.id);
+
+        return `${removeFieldCodeOuput} \n ${refreshModelCodeOutput}`;
+    }
+}

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

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

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

@@ -0,0 +1,38 @@
+import { Injectable, Logger } from '@nestjs/common';
+
+import { QueueMessage } from 'src/interfaces/mq';
+import testQueueConfig from './test-queue-db-options';
+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);
+    constructor(
+        readonly mqMessageService: MqMessageService,
+        readonly mqMessageQueueService: MqMessageQueueService,
+    ) {
+        super(mqMessageService, mqMessageQueueService);
+    }
+
+    options(): QueuesModuleOptions {
+        return {
+            ...testQueueConfig
+        }
+    }
+
+    subscribe(message: QueueMessage<any>) {
+        // console.log(`Received message ${JSON.stringify(message)}`);
+        this.testQueueLogger.debug(`Received message: ${JSON.stringify(message)}`);
+
+        return new Promise((resolve, reject) => {
+            // Simulate some processing time
+            setTimeout(() => {
+                this.testQueueLogger.debug(`Processed message: ${JSON.stringify(message)}`);
+                resolve({ status: 'success', messageId: message.messageId, message: `Processed message` });
+            }, 10000); // Simulate 1 second processing time
+        });
+    }
+}

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

@@ -0,0 +1,13 @@
+import { BrokerType } from "../../interfaces";
+
+const QUEUE_NAME = 'test_queue_db';
+
+export default {
+    name: 'queueTestDb',
+    type: BrokerType.Database,
+    queueName: QUEUE_NAME,
+    // receive: async (message: QueueMessage<any>) => { // Default receive handler
+    //     console.log(`Received message: ${JSON.stringify(message)} from queue ${MAIL_QUEUE_NAME}`);
+    //     return 'Received';
+    // },
+};

package/src/jobs/email-publisher.service.ts

@@ -1,6 +1,6 @@
 import { Injectable } from '@nestjs/common';
 
-import { RabbitMqPublisher } from 'src/services/rabbitmq-publisher.service';
+import { RabbitMqPublisher } from 'src/services/queues/rabbitmq-publisher.service';
 import mailQueueOptions from './email-queue-options';
 import { MqMessageQueueService } from 'src/services/mq-message-queue.service';
 import { MqMessageService } from 'src/services/mq-message.service';

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

@@ -1,7 +1,7 @@
 import { Injectable } from '@nestjs/common';
 
 import mailQueueOptions from './email-queue-options';
-import { RabbitMqSubscriber } from 'src/services/rabbitmq-subscriber.service';
+import { RabbitMqSubscriber } from 'src/services/queues/rabbitmq-subscriber.service';
 import { QueueMessage } from 'src/interfaces/mq';
 import { SMTPEMailService } from '../services/mail/SMTPEmailService';
 import { MqMessageService } from 'src/services/mq-message.service';

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

@@ -1,6 +1,6 @@
 import { Injectable } from '@nestjs/common';
 
-import { RabbitMqPublisher } from 'src/services/rabbitmq-publisher.service';
+import { RabbitMqPublisher } from 'src/services/queues/rabbitmq-publisher.service';
 import otpQueueOptions from './otp-queue-options';
 import { MqMessageQueueService } from 'src/services/mq-message-queue.service';
 import { MqMessageService } from 'src/services/mq-message.service';

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

@@ -1,7 +1,7 @@
 import { Injectable } from '@nestjs/common';
 
 import { QueueMessage } from 'src/interfaces/mq';
-import { RabbitMqSubscriber } from 'src/services/rabbitmq-subscriber.service';
+import { RabbitMqSubscriber } from 'src/services/queues/rabbitmq-subscriber.service';
 import { Msg91OTPService } from '../services/sms/Msg91OTPService';
 import otpQueueOptions from './otp-queue-options';
 import { MqMessageService } from 'src/services/mq-message.service';

package/src/jobs/queue-test-publisher.service.ts

@@ -1,7 +1,7 @@
 import { Injectable } from '@nestjs/common';
 
-import { RabbitMqPublisher } from 'src/services/rabbitmq-publisher.service';
-import testQueueConfig from './test-queue.config';
+import { RabbitMqPublisher } from 'src/services/queues/rabbitmq-publisher.service';
+import testQueueConfig from './test-queue-options';
 import { MqMessageQueueService } from '../services/mq-message-queue.service';
 import { MqMessageService } from '../services/mq-message.service';
 import { QueuesModuleOptions } from "../interfaces";

package/src/jobs/queue-test-subscriber.service.ts

@@ -1,8 +1,8 @@
 import { Injectable, Logger } from '@nestjs/common';
 
-import { RabbitMqSubscriber } from 'src/services/rabbitmq-subscriber.service';
+import { RabbitMqSubscriber } from 'src/services/queues/rabbitmq-subscriber.service';
 import { QueueMessage } from 'src/interfaces/mq';
-import testQueueConfig from './test-queue.config';
+import testQueueConfig from './test-queue-options';
 import { MqMessageService } from '../services/mq-message.service';
 import { MqMessageQueueService } from '../services/mq-message-queue.service';
 import { QueuesModuleOptions } from "../interfaces";
@@ -26,5 +26,13 @@ export class TestQueueSubscriber extends RabbitMqSubscriber<any> {
     subscribe(message: QueueMessage<any>) {
         // console.log(`Received message ${JSON.stringify(message)}`);
         this.testQueueLogger.debug(`Received message: ${JSON.stringify(message)}`);
+
+        return new Promise((resolve, reject) => {
+            // Simulate some processing time
+            setTimeout(() => {
+                this.testQueueLogger.debug(`Processed message: ${JSON.stringify(message)}`);
+                resolve({ status: 'success', messageId: message.messageId, message: `Processed message` });
+            }, 10000); // Simulate 1 second processing time
+        });
     }
 }

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

@@ -1,6 +1,6 @@
 import { Injectable } from '@nestjs/common';
 
-import { RabbitMqPublisher } from 'src/services/rabbitmq-publisher.service';
+import { RabbitMqPublisher } from 'src/services/queues/rabbitmq-publisher.service';
 import smsQueueOptions from './sms-queue-options';
 import { MqMessageQueueService } from 'src/services/mq-message-queue.service';
 import { MqMessageService } from 'src/services/mq-message.service';

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

@@ -1,6 +1,6 @@
 import { Injectable } from '@nestjs/common';
 
-import { RabbitMqSubscriber } from 'src/services/rabbitmq-subscriber.service';
+import { RabbitMqSubscriber } from 'src/services/queues/rabbitmq-subscriber.service';
 import { QueueMessage } from 'src/interfaces/mq';
 import smsQueueOptions from './sms-queue-options';
 import { Msg91SMSService } from '../services/sms/Msg91SMSService';

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

@@ -1,6 +1,6 @@
 import { Injectable } from '@nestjs/common';
 
-import { RabbitMqPublisher } from 'src/services/rabbitmq-publisher.service';
+import { RabbitMqPublisher } from 'src/services/queues/rabbitmq-publisher.service';
 import whatsappQueueOptions from './whatsapp-queue-options';
 import { MqMessageService } from 'src/services/mq-message.service';
 import { MqMessageQueueService } from 'src/services/mq-message-queue.service';

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

@@ -1,6 +1,6 @@
 import { Injectable } from '@nestjs/common';
 
-import { RabbitMqSubscriber } from 'src/services/rabbitmq-subscriber.service';
+import { RabbitMqSubscriber } from 'src/services/queues/rabbitmq-subscriber.service';
 import { QueueMessage } from 'src/interfaces/mq';
 import whatsappQueueOptions from './whatsapp-queue-options';
 import { Msg91WhatsappService } from '../services/whatsapp/Msg91WhatsappService';