@solidxai/core 0.1.6 → 0.1.8-beta.0

package/src/services/scheduled-jobs/scheduler.service.ts

@@ -24,13 +24,23 @@ export class SchedulerServiceImpl implements ISchedulerService {
     async runScheduledJobs(): Promise<void> {
         const solidSchedulerEnabled = process.env.SOLID_SCHEDULER_ENABLED || "true";
         if (solidSchedulerEnabled.toLowerCase() !== "true") {
-            // this.logger.debug('Solid scheduler is disabled via environment variable');
+            this.logger.debug('Solid scheduler is disabled via environment variable');
             return;
         }
         const solidCliRunning = process.env.SOLID_CLI_RUNNING || "false";
         if (solidCliRunning === "true") {
             return;
         }
+        const jobsRegexToEnable = (process.env.SOLID_SCHEDULER_JOBS_REGEX_TO_ENABLE || '').trim();
+        let jobsRegex: RegExp | null = null;
+        if (jobsRegexToEnable && jobsRegexToEnable !== "all") {
+            try {
+                jobsRegex = new RegExp(jobsRegexToEnable);
+            } catch (error) {
+                this.logger.error(`Invalid SOLID_SCHEDULER_JOBS_REGEX_TO_ENABLE regex "${jobsRegexToEnable}". Scheduler loop will skip this run.`);
+                return;
+            }
+        }
 
         const now = new Date();
 
@@ -53,6 +63,12 @@ export class SchedulerServiceImpl implements ISchedulerService {
 
         for (const job of dueJobs) {
             const jobKey = String(job.id ?? job.scheduleName ?? job.job);
+            const jobName = String(job.job ?? '');
+
+            if (jobsRegex && !jobsRegex.test(jobName)) {
+                this.logger.log(`[${now.getTime()}]: scheduler service skipping job ${jobName} because it does not match SOLID_SCHEDULER_JOBS_REGEX_TO_ENABLE=${jobsRegexToEnable}`);
+                continue;
+            }
 
             if (this.runningJobs.has(jobKey)) {
                 this.logger.log(`[${now.getTime()}]: scheduler service skipping job ${job.job} because a run is already in progress`);
@@ -94,22 +110,21 @@ export class SchedulerServiceImpl implements ISchedulerService {
     }
 
     private shouldRunNow(job: ScheduledJob, now: Date): boolean {
-        const today = now.toISOString().split('T')[0]; // yyyy-mm-dd
-        const timeNow = now.toTimeString().slice(0, 5); // hh:mm
+        const today = new Date(now);
+        today.setHours(0, 0, 0, 0);
+        const timeNow = this.toHHMM(now); // hh:mm
 
         // 1. Check startDate / endDate
-        if (job.startDate && new Date(today) < new Date(job.startDate)) return false;
-        if (job.endDate && new Date(today) > new Date(job.endDate)) return false;
+        const startDate = this.toDateOnly(job.startDate as unknown as Date | string | null);
+        const endDate = this.toDateOnly(job.endDate as unknown as Date | string | null);
+        if (startDate && today < startDate) return false;
+        if (endDate && today > endDate) return false;
 
         // 2. Check startTime / endTime
-        if (job.startTime) {
-            const jobStart = job.startTime.toTimeString().slice(0, 5);
-            if (timeNow < jobStart) return false;
-        }
-        if (job.endTime) {
-            const jobEnd = job.endTime.toTimeString().slice(0, 5);
-            if (timeNow > jobEnd) return false;
-        }
+        const jobStart = this.toHHMM(job.startTime as unknown as Date | string | null);
+        const jobEnd = this.toHHMM(job.endTime as unknown as Date | string | null);
+        if (jobStart && timeNow < jobStart) return false;
+        if (jobEnd && timeNow > jobEnd) return false;
 
         // 3. Check custom frequency
         if (job.frequency.toLowerCase() === 'custom') {
@@ -121,8 +136,7 @@ export class SchedulerServiceImpl implements ISchedulerService {
         // 3. Check dayOfWeek (for weekly)
         if (job.frequency.toLowerCase() === 'weekly' && job.dayOfWeek) {
             const todayName = now.toLocaleString('en-US', { weekday: 'long' }); // e.g., "Monday"
-            // const days = job.dayOfWeek.split(',').map(d => d.trim());
-            const days = JSON.parse(job.dayOfWeek) as string[];
+            const days = this.parseDayOfWeek(job.dayOfWeek);
             if (!days.includes(todayName)) return false;
         }
 
@@ -135,7 +149,53 @@ export class SchedulerServiceImpl implements ISchedulerService {
         return true;
     }
 
-    private computeNextRunForCustomCron(job: ScheduledJob, from: Date): Date {
+    private parseDayOfWeek(dayOfWeek: string): string[] {
+        try {
+            const parsed = JSON.parse(dayOfWeek);
+            return Array.isArray(parsed) ? parsed : [];
+        } catch (error) {
+            this.logger.warn(`Invalid dayOfWeek JSON '${dayOfWeek}'`, error as any);
+            return [];
+        }
+    }
+
+    private toDateOnly(value: Date | string | null | undefined): Date | null {
+        if (!value) return null;
+
+        if (value instanceof Date) {
+            const d = new Date(value);
+            d.setHours(0, 0, 0, 0);
+            return d;
+        }
+
+        const parsed = new Date(value);
+        if (Number.isNaN(parsed.getTime())) return null;
+
+        parsed.setHours(0, 0, 0, 0);
+        return parsed;
+    }
+
+    private toHHMM(value: Date | string | null | undefined): string | null {
+        if (!value) return null;
+
+        if (value instanceof Date) {
+            return value.toTimeString().slice(0, 5);
+        }
+
+        if (typeof value === 'string') {
+            const match = value.match(/^(\d{2}):(\d{2})/);
+            if (match) return `${match[1]}:${match[2]}`;
+
+            const parsed = new Date(value);
+            if (!Number.isNaN(parsed.getTime())) {
+                return parsed.toTimeString().slice(0, 5);
+            }
+        }
+
+        return null;
+    }
+
+    public computeNextRunForCustomCron(job: ScheduledJob, from: Date): Date {
         const base = new Date(from);
 
         if (!job.cronExpression) {
@@ -150,22 +210,24 @@ export class SchedulerServiceImpl implements ISchedulerService {
                 tz: 'UTC'
             });
             const nextRun = interval.next().toDate();
+            const runAfterNext = interval.next().toDate();
 
-            // Validate minimum 1 minute interval
-            if (nextRun.getTime() - from.getTime() < 60000) {
+            // Validate minimum 1 minute cadence between consecutive runs.
+            // Comparing nextRun to "from" is incorrect near minute boundaries.
+            if (runAfterNext.getTime() - nextRun.getTime() < 60000) {
                 throw new Error('Cron expression interval must be at least 1 minute');
             }
             
             this.logger.log(`Custom cron '${job.cronExpression}' next run: ${nextRun}`);
             return nextRun;
         } catch (error) {
-            this.logger.error(`Invalid cron expression for job ${job.scheduleName}: ${job.cronExpression}`, error);
+            this.logger.error(`Invalid cron expression for job ${job.scheduleName}: ${job.cronExpression}. Reason: ${(error as Error).message}`);
             // Fallback to daily if cron parsing fails
             return new Date(base.getTime() + 24 * 60 * 60 * 1000);
         }
     }
 
-    private computeNextRunAt(job: ScheduledJob, from: Date): Date {
+    public computeNextRunAt(job: ScheduledJob, from: Date): Date {
         const base = new Date(from);
 
         switch (job.frequency.toLowerCase()) {

package/src/services/selection-providers/list-of-dashboard-question-providers-selection-provider.service.ts

@@ -3,6 +3,7 @@ import { SelectionProvider } from "src/decorators/selection-provider.decorator";
 import { SolidRegistry } from "src/helpers/solid-registry";
 import { IDashboardQuestionDataProvider, IDashboardVariableSelectionProvider, ISelectionProvider, ISelectionProviderContext, ISelectionProviderValues } from "../../interfaces";
 import { SQL_DYNAMIC_PROVIDER_NAME } from "../dashboard.service";
+import { CHARTJS_SQL_DATA_PROVIDER_NAME, INBUILT_SQL_DATA_PROVIDERS, PRIME_REACT_DATATABLE_SQL_DATA_PROVIDER_NAME, PRIME_REACT_METER_GROUP_SQL_DATA_PROVIDER_NAME } from "../dashboard-question.service";
 
 
 @SelectionProvider()
@@ -34,7 +35,9 @@ export class ListOfDashboardQuestionProvidersSelectionProvider implements ISelec
     async values(query: string, ctxt: ISelectionProviderContext): Promise<readonly ISelectionProviderValues[]> {
         const dashboardSelectionProviders = this.solidRegistry.getDashboardQuestionDataProviders()
         //Exclude the SQL dynamic provider from the list, (since although it is a dashboard selection provider, it is not a valid option for the user to select)
-        return dashboardSelectionProviders.map(i => {
+        return dashboardSelectionProviders
+        .filter(provider => !INBUILT_SQL_DATA_PROVIDERS.includes(provider.name())) 
+        .map(i => {
             return { label: i.name, value: i.name };
         });
     }

package/src/services/solid-introspect.service.ts

@@ -1,6 +1,8 @@
 import { classify } from '@angular-devkit/core/src/utils/strings';
 import { Injectable, Logger, OnApplicationBootstrap } from '@nestjs/common';
 import { DiscoveryService, MetadataScanner, ModuleRef, Reflector } from '@nestjs/core';
+import { ModelMetadataHelperService } from 'src/helpers/model-metadata-helper.service';
+import { ModelMetadataRepository } from 'src/repository/model-metadata.repository';
 import { InstanceWrapper } from '@nestjs/core/injector/instance-wrapper';
 import { getDataSourceToken } from '@nestjs/typeorm';
 import { IS_COMPUTED_FIELD_PROVIDER } from 'src/decorators/computed-field-provider.decorator';
@@ -40,6 +42,8 @@ export class SolidIntrospectService implements OnApplicationBootstrap {
     private readonly solidRegistry: SolidRegistry,
     private readonly moduleRef: ModuleRef,
     private readonly settingService: SettingService,
+    private readonly modelMetadataRepo: ModelMetadataRepository,
+    private readonly modelMetadataHelperService: ModelMetadataHelperService,
   ) { }
 
   private readonly logger = new Logger(SolidIntrospectService.name);
@@ -142,9 +146,33 @@ export class SolidIntrospectService implements OnApplicationBootstrap {
 
     // Register the core subscribers against all the configured database modules / datasources
     await this.bootstrapCoreTypeOrmSubscribers(solidDatabaseModules);
+    await this.cacheAuditableModels();
     await this.settingService.updateSettingsCache();
   }
 
+  private async cacheAuditableModels(): Promise<void> {
+    const models = await this.modelMetadataRepo.find({
+      where: { enableAuditTracking: true },
+      relations: { fields: true, module: true },
+    });
+
+    const auditableSet = new Set<string>();
+    for (const model of models) {
+      const allFields = await this.modelMetadataHelperService.loadFieldHierarchy(model.singularName);
+      const hasAuditableField = allFields.some(field =>
+        field.enableAuditTracking &&
+        !['mediaSingle', 'mediaMultiple', 'richText', 'json'].includes(field.type) &&
+        !(field.type === 'relation' && field.relationType === 'one-to-many')
+      );
+      if (hasAuditableField) {
+        auditableSet.add(model.singularName.toLowerCase());
+      }
+    }
+
+    this.solidRegistry.registerAuditableModels(auditableSet);
+    this.logger.debug(`Cached ${auditableSet.size} auditable model(s): ${[...auditableSet].join(', ')}`);
+  }
+
   async bootstrapCoreTypeOrmSubscribers(dbModules: Array<InstanceWrapper<any>>): Promise<void> {
     // Register core subscribers for each Solid database module
     for (const wrapper of dbModules) {

package/src/services/solid-ts-morph.service.ts

@@ -324,6 +324,104 @@ export class SolidTsMorphService {
         return { staged: true, overwritten: false, skipped: false };
     }
 
+
+    //Removes all import declarations from a file whose module specifier matches the given predicate.
+    //Returns the set of identifier names that were imported by the removed declarations.
+    removeImports(
+        filePath: string,
+        filter: (moduleSpecifier: string) => boolean
+    ): { removedIdentifiers: Set<string>; staged: boolean; skipped: boolean } {
+        const abs = this.resolveRepoPath(filePath);
+        if (!existsSync(abs)) {
+            this.logger.warn(`removeImport: file not found at ${filePath}, skipping.`);
+            return { removedIdentifiers: new Set(), staged: false, skipped: true };
+        }
+
+        const existing = this.project.getSourceFile(abs);
+        const sourceFile = existing
+            ? existing
+            : this.project.createSourceFile(abs, readFileSync(abs, "utf8"), { overwrite: true });
+
+        const importsToRemove = sourceFile.getImportDeclarations().filter(decl => {
+            const spec = decl.getModuleSpecifierValue().replace(/\\/g, "/");
+            return filter(spec);
+        });
+
+        if (importsToRemove.length === 0) {
+            return { removedIdentifiers: new Set(), staged: false, skipped: true };
+        }
+
+        const removedIdentifiers = new Set<string>();
+        for (const decl of importsToRemove) {
+            for (const named of decl.getNamedImports()) {
+                removedIdentifiers.add(named.getAliasNode()?.getText() ?? named.getName());
+            }
+            const defaultImport = decl.getDefaultImport();
+            if (defaultImport) removedIdentifiers.add(defaultImport.getText());
+            decl.remove();
+        }
+
+        this.dirtySourceFiles.add(abs);
+        this.logger.log(`Staged removal of ${importsToRemove.length} import(s) in: ${this.rel(abs)}`);
+        return { removedIdentifiers, staged: true, skipped: false };
+    }
+
+    //Removes the given identifier names from all @Module decorator array properties
+    removeModuleMembers(
+        filePath: string,
+        names: Set<string> | string[]
+    ): { staged: boolean; skipped: boolean } {
+        const abs = this.resolveRepoPath(filePath);
+        if (!existsSync(abs)) {
+            this.logger.warn(`removeImportMembers: file not found at ${filePath}, skipping.`);
+            return { staged: false, skipped: true };
+        }
+
+        const identifiers = names instanceof Set ? names : new Set(names);
+        if (identifiers.size === 0) return { staged: false, skipped: true };
+
+        const existing = this.project.getSourceFile(abs);
+        const sourceFile = existing
+            ? existing
+            : this.project.createSourceFile(abs, readFileSync(abs, "utf8"), { overwrite: true });
+
+        const nestModuleClass = sourceFile.getClasses().find(cls =>
+            cls.getDecorators().some(dec => dec.getName() === "Module")
+        );
+        if (!nestModuleClass) {
+            this.logger.warn(`removeImportMembers: no @Module() class found in ${filePath}`);
+            return { staged: false, skipped: true };
+        }
+
+        const moduleDec = nestModuleClass.getDecorators().find(dec => dec.getName() === "Module");
+        const arg0 = moduleDec?.getCallExpression()?.getArguments()[0];
+        if (!arg0 || !Node.isObjectLiteralExpression(arg0)) return { staged: false, skipped: true };
+
+        const meta = arg0 as ObjectLiteralExpression;
+        for (const propName of ["imports", "providers", "controllers", "exports"] as const) {
+            const prop = meta.getProperty(propName);
+            if (!prop || !Node.isPropertyAssignment(prop)) continue;
+            const init = prop.getInitializer();
+            if (!init || !Node.isArrayLiteralExpression(init)) continue;
+            const arr = init as ArrayLiteralExpression;
+            const elements = arr.getElements();
+            for (let i = elements.length - 1; i >= 0; i--) {
+                const elemText = elements[i].getText().trim();
+                // Match direct identifiers (e.g. TestService) or call expressions that reference them (e.g. TypeOrmModule.forFeature([Test])).
+                const shouldRemove = identifiers.has(elemText) ||
+                    [...identifiers].some(id => new RegExp(`\\b${id}\\b`).test(elemText));
+                if (shouldRemove) {
+                    arr.removeElement(i);
+                }
+            }
+        }
+
+        this.dirtySourceFiles.add(abs);
+        this.logger.log(`Staged removal of [${[...identifiers].join(", ")}] from @Module arrays in: ${this.rel(abs)}`);
+        return { staged: true, skipped: false };
+    }
+
+
     addImport(
         filePath: string,
         importLine: string

package/src/solid-core.module.ts

@@ -82,20 +82,48 @@ import { AuthenticationGuard } from './guards/authentication.guard';
 import { PermissionsGuard } from './guards/permissions.guard';
 import { SolidRegistry } from './helpers/solid-registry';
 import { LoggingInterceptor } from './interceptors/logging.interceptor';
-import { ApiEmailQueuePublisher } from './jobs/api-email-publisher.service';
-import { ApiEmailQueueSubscriber } from './jobs/api-email-subscriber.service';
+import { ApiEmailQueuePublisher } from './jobs/rabbitmq/api-email-publisher.service';
+import { ApiEmailQueueSubscriber } from './jobs/rabbitmq/api-email-subscriber.service';
 import { TestQueuePublisherDatabase } from './jobs/database/test-queue-publisher-database.service';
 import { TestQueueSubscriberDatabase } from './jobs/database/test-queue-subscriber-database.service';
-import { Msg91WhatsappQueuePublisher } from './jobs/msg91-whatsapp-publisher.service';
-import { Msg91WhatsappQueueSubscriber } from './jobs/msg91-whatsapp-subscriber.service';
-import { Msg91OTPQueuePublisher } from './jobs/msg91-otp-publisher.service';
-import { Msg91OTPQueueSubscriber } from './jobs/msg91-otp-subscriber.service';
-import { Msg91SmsQueuePublisher } from './jobs/msg91-sms-publisher.service';
-import { Msg91SmsQueueSubscriber } from './jobs/msg91-sms-subscriber.service';
-import { SmtpEmailQueuePublisherRabbitmq } from './jobs/smtp-email-publisher.service';
-import { SmtpEmailQueueSubscriberRabbitmq } from './jobs/smtp-email-subscriber.service';
-import { TestQueuePublisher } from './jobs/test-queue-publisher.service';
-import { TestQueueSubscriber } from './jobs/test-queue-subscriber.service';
+import { TestQueuePublisherRedis } from './jobs/redis/test-queue-publisher-redis.service';
+import { TestQueueSubscriberRedis } from './jobs/redis/test-queue-subscriber-redis.service';
+import { Msg91WhatsappQueuePublisher } from './jobs/rabbitmq/msg91-whatsapp-publisher.service';
+import { Msg91WhatsappQueueSubscriber } from './jobs/rabbitmq/msg91-whatsapp-subscriber.service';
+import { Msg91OTPQueuePublisher } from './jobs/rabbitmq/msg91-otp-publisher.service';
+import { Msg91OTPQueueSubscriber } from './jobs/rabbitmq/msg91-otp-subscriber.service';
+import { Msg91SmsQueuePublisher } from './jobs/rabbitmq/msg91-sms-publisher.service';
+import { Msg91SmsQueueSubscriber } from './jobs/rabbitmq/msg91-sms-subscriber.service';
+import { SmtpEmailQueuePublisherRabbitmq } from './jobs/rabbitmq/smtp-email-publisher.service';
+import { SmtpEmailQueueSubscriberRabbitmq } from './jobs/rabbitmq/smtp-email-subscriber.service';
+import { TestQueuePublisher } from './jobs/rabbitmq/test-queue-publisher.service';
+import { TestQueueSubscriber } from './jobs/rabbitmq/test-queue-subscriber.service';
+import { ChatterQueuePublisherRabbitmq } from './jobs/rabbitmq/chatter-queue-publisher.service';
+import { ChatterQueueSubscriberRabbitmq } from './jobs/rabbitmq/chatter-queue-subscriber.service';
+import { ChatterQueuePublisherDatabase } from './jobs/database/chatter-queue-publisher-database.service';
+import { ChatterQueueSubscriberDatabase } from './jobs/database/chatter-queue-subscriber-database.service';
+import { ApiEmailQueuePublisherRedis } from './jobs/redis/api-email-publisher-redis.service';
+import { ApiEmailQueueSubscriberRedis } from './jobs/redis/api-email-subscriber-redis.service';
+import { ChatterQueuePublisherRedis } from './jobs/redis/chatter-queue-publisher-redis.service';
+import { ChatterQueueSubscriberRedis } from './jobs/redis/chatter-queue-subscriber-redis.service';
+import { ComputedFieldEvaluationPublisherRedis } from './jobs/redis/computed-field-evaluation-publisher-redis.service';
+import { ComputedFieldEvaluationSubscriberRedis } from './jobs/redis/computed-field-evaluation-subscriber-redis.service';
+import { GenerateCodePublisherRedis } from './jobs/redis/generate-code-publisher-redis.service';
+import { GenerateCodeSubscriberRedis } from './jobs/redis/generate-code-subscriber-redis.service';
+import { Msg91OTPQueuePublisherRedis } from './jobs/redis/msg91-otp-publisher-redis.service';
+import { Msg91OTPQueueSubscriberRedis } from './jobs/redis/msg91-otp-subscriber-redis.service';
+import { Msg91SmsQueuePublisherRedis } from './jobs/redis/msg91-sms-publisher-redis.service';
+import { Msg91SmsQueueSubscriberRedis } from './jobs/redis/msg91-sms-subscriber-redis.service';
+import { Msg91WhatsappQueuePublisherRedis } from './jobs/redis/msg91-whatsapp-publisher-redis.service';
+import { Msg91WhatsappQueueSubscriberRedis } from './jobs/redis/msg91-whatsapp-subscriber-redis.service';
+import { SmtpEmailQueuePublisherRedis } from './jobs/redis/smtp-email-publisher-redis.service';
+import { SmtpEmailQueueSubscriberRedis } from './jobs/redis/smtp-email-subscriber-redis.service';
+import { Three60WhatsappQueuePublisherRedis } from './jobs/redis/three60-whatsapp-publisher-redis.service';
+import { Three60WhatsappQueueSubscriberRedis } from './jobs/redis/three60-whatsapp-subscriber-redis.service';
+import { TriggerMcpClientPublisherRedis } from './jobs/redis/trigger-mcp-client-publisher-redis.service';
+import { TriggerMcpClientSubscriberRedis } from './jobs/redis/trigger-mcp-client-subscriber-redis.service';
+import { TwilioSmsQueuePublisherRedis } from './jobs/redis/twilio-sms-publisher-redis.service';
+import { TwilioSmsQueueSubscriberRedis } from './jobs/redis/twilio-sms-subscriber-redis.service';
 import { UserRegistrationListener } from './listeners/user-registration.listener';
 import { GoogleOauthStrategy } from './passport-strategies/google-oauth.strategy';
 import { AuthenticationService } from './services/authentication.service';
@@ -133,6 +161,8 @@ import { ChatterMessageController } from './controllers/chatter-message.controll
 import { DashboardQuestionSqlDatasetConfigController } from './controllers/dashboard-question-sql-dataset-config.controller';
 import { DashboardQuestionController } from './controllers/dashboard-question.controller';
 import { DashboardVariableController } from './controllers/dashboard-variable.controller';
+import { DashboardLayoutController } from './controllers/dashboard-layout.controller';
+
 import { DashboardController } from './controllers/dashboard.controller';
 import { ExportTemplateController } from './controllers/export-template.controller';
 import { ExportTransactionController } from './controllers/export-transaction.controller';
@@ -156,6 +186,8 @@ import { ChatterMessage } from './entities/chatter-message.entity';
 import { DashboardQuestionSqlDatasetConfig } from './entities/dashboard-question-sql-dataset-config.entity';
 import { DashboardQuestion } from './entities/dashboard-question.entity';
 import { DashboardVariable } from './entities/dashboard-variable.entity';
+import { DashboardLayout } from './entities/dashboard-layout.entity';
+
 import { Dashboard } from './entities/dashboard.entity';
 import { ExportTemplate } from './entities/export-template.entity';
 import { ExportTransaction } from './entities/export-transaction.entity';
@@ -195,22 +227,22 @@ import { IngestCommand } from './commands/ingest.command';
 import { MailFactory } from './factories/mail.factory';
 import { ErrorMapperService } from './helpers/error-mapper.service';
 import { SolidCoreErrorCodesProvider } from './helpers/solid-core-error-codes-provider.service';
-import { ComputedFieldEvaluationPublisherRabbitmq } from './jobs/computed-field-evaluation-publisher.service';
-import { ComputedFieldEvaluationSubscriberRabbitmq } from './jobs/computed-field-evaluation-subscriber.service';
+import { ComputedFieldEvaluationPublisherRabbitmq } from './jobs/rabbitmq/computed-field-evaluation-publisher.service';
+import { ComputedFieldEvaluationSubscriberRabbitmq } from './jobs/rabbitmq/computed-field-evaluation-subscriber.service';
 import { Msg91WhatsappQueuePublisherDatabase } from './jobs/database/msg91-whatsapp-publisher-database.service';
 import { Msg91WhatsappQueueSubscriberDatabase } from './jobs/database/msg91-whatsapp-subscriber-database.service';
 import { Three60WhatsappQueuePublisherDatabase } from './jobs/database/three60-whatsapp-publisher-database.service';
 import { Three60WhatsappQueueSubscriberDatabase } from './jobs/database/three60-whatsapp-subscriber-database.service';
 import { TriggerMcpClientPublisherDatabase } from './jobs/database/trigger-mcp-client-publisher-database.service';
 import { TriggerMcpClientSubscriberDatabase } from './jobs/database/trigger-mcp-client-subscriber-database.service';
-import { GenerateCodePublisherRabbitmq } from './jobs/generate-code-publisher.service';
-import { GenerateCodeSubscriberRabbitmq } from './jobs/generate-code-subscriber.service';
-import { Three60WhatsappQueuePublisher } from './jobs/three60-whatsapp-publisher.service';
-import { Three60WhatsappQueueSubscriber } from './jobs/three60-whatsapp-subscriber.service';
-import { TriggerMcpClientPublisherRabbitmq } from './jobs/trigger-mcp-client-publisher.service';
-import { TriggerMcpClientSubscriberRabbitmq } from './jobs/trigger-mcp-client-subscriber.service';
-import { TwilioSmsQueuePublisherRabbitmq } from './jobs/twilio-sms-publisher.service';
-import { TwilioSmsQueueSubscriberRabbitmq } from './jobs/twilio-sms-subscriber.service';
+import { GenerateCodePublisherRabbitmq } from './jobs/rabbitmq/generate-code-publisher.service';
+import { GenerateCodeSubscriberRabbitmq } from './jobs/rabbitmq/generate-code-subscriber.service';
+import { Three60WhatsappQueuePublisher } from './jobs/rabbitmq/three60-whatsapp-publisher.service';
+import { Three60WhatsappQueueSubscriber } from './jobs/rabbitmq/three60-whatsapp-subscriber.service';
+import { TriggerMcpClientPublisherRabbitmq } from './jobs/rabbitmq/trigger-mcp-client-publisher.service';
+import { TriggerMcpClientSubscriberRabbitmq } from './jobs/rabbitmq/trigger-mcp-client-subscriber.service';
+import { TwilioSmsQueuePublisherRabbitmq } from './jobs/rabbitmq/twilio-sms-publisher.service';
+import { TwilioSmsQueueSubscriberRabbitmq } from './jobs/rabbitmq/twilio-sms-subscriber.service';
 import { DashboardMapper } from './mappers/dashboard-mapper';
 import { ListOfValuesMapper } from './mappers/list-of-values-mapper';
 import { ActionMetadataRepository } from './repository/action-metadata.repository';
@@ -221,6 +253,8 @@ import { DashboardQuestionSqlDatasetConfigRepository } from './repository/dashbo
 import { DashboardQuestionRepository } from './repository/dashboard-question.repository';
 import { DashboardVariableRepository } from './repository/dashboard-variable.repository';
 import { DashboardRepository } from './repository/dashboard.repository';
+import { DashboardLayoutRepository } from './repository/dashboard-layout.repository';
+
 import { EmailTemplateRepository } from './repository/email-template.repository';
 import { ExportTemplateRepository } from './repository/export-template.repository';
 import { ExportTransactionRepository } from './repository/export-transaction.repository';
@@ -263,6 +297,8 @@ import { DashboardVariableSQLDynamicProvider } from './services/dashboard-select
 import { DasbhoardVariableTestDynamicProvider } from './services/dashboard-selection-providers/dashboard-variable-test-dynamic-provider.service';
 import { DashboardVariableService } from './services/dashboard-variable.service';
 import { DashboardService } from './services/dashboard.service';
+import { DashboardLayoutService } from './services/dashboard-layout.service';
+
 import { ExcelService } from './services/excel.service';
 import { ExportTemplateService } from './services/export-template.service';
 import { ExportTransactionService } from './services/export-transaction.service';
@@ -329,6 +365,7 @@ import { ImageEncodingService } from './helpers/image-encoding.helper';
 import { SolidMicroserviceAdapter } from './helpers/solid-microservice-adapter.service';
 import { InfoCommand } from './commands/info.command';
 import { ListOfRolesSelectionProvider } from './services/selection-providers/list-of-roles-selectionproviders.service';
+import { Entity } from 'typeorm';
 
 
 @Global()
@@ -343,6 +380,7 @@ import { ListOfRolesSelectionProvider } from './services/selection-providers/lis
       DashboardQuestion,
       DashboardQuestionSqlDatasetConfig,
       DashboardVariable,
+      DashboardLayout,
       EmailAttachment,
       EmailTemplate,
       ExportTemplate,
@@ -414,6 +452,7 @@ import { ListOfRolesSelectionProvider } from './services/selection-providers/lis
     DashboardQuestionController,
     DashboardQuestionSqlDatasetConfigController,
     DashboardVariableController,
+    DashboardLayoutController,
     EmailTemplateController,
     ExportTemplateController,
     ExportTransactionController,
@@ -584,11 +623,37 @@ import { ListOfRolesSelectionProvider } from './services/selection-providers/lis
     TestQueuePublisher,
     TestQueueSubscriber,
 
-    // ChatterQueuePublisher,
-    // ChatterQueueSubscriber,
+    ChatterQueuePublisherRabbitmq,
+    ChatterQueueSubscriberRabbitmq,
+    ChatterQueuePublisherDatabase,
+    ChatterQueueSubscriberDatabase,
 
     TestQueuePublisherDatabase,
     TestQueueSubscriberDatabase,
+    TestQueuePublisherRedis,
+    TestQueueSubscriberRedis,
+    ApiEmailQueuePublisherRedis,
+    ApiEmailQueueSubscriberRedis,
+    ChatterQueuePublisherRedis,
+    ChatterQueueSubscriberRedis,
+    ComputedFieldEvaluationPublisherRedis,
+    ComputedFieldEvaluationSubscriberRedis,
+    GenerateCodePublisherRedis,
+    GenerateCodeSubscriberRedis,
+    Msg91OTPQueuePublisherRedis,
+    Msg91OTPQueueSubscriberRedis,
+    Msg91SmsQueuePublisherRedis,
+    Msg91SmsQueueSubscriberRedis,
+    Msg91WhatsappQueuePublisherRedis,
+    Msg91WhatsappQueueSubscriberRedis,
+    SmtpEmailQueuePublisherRedis,
+    SmtpEmailQueueSubscriberRedis,
+    Three60WhatsappQueuePublisherRedis,
+    Three60WhatsappQueueSubscriberRedis,
+    TriggerMcpClientPublisherRedis,
+    TriggerMcpClientSubscriberRedis,
+    TwilioSmsQueuePublisherRedis,
+    TwilioSmsQueueSubscriberRedis,
     GenerateCodePublisherDatabase,
     GenerateCodeSubscriberDatabase,
     GenerateCodePublisherRabbitmq,
@@ -638,6 +703,7 @@ import { ListOfRolesSelectionProvider } from './services/selection-providers/lis
     UserActivityHistoryService,
     DashboardService,
     DashboardVariableService,
+    DashboardLayoutService,
     DashboardQuestionService,
     DashboardVariableSQLDynamicProvider,
     DasbhoardVariableTestDynamicProvider,
@@ -682,6 +748,7 @@ import { ListOfRolesSelectionProvider } from './services/selection-providers/lis
     DashboardQuestionSqlDatasetConfigRepository,
     DashboardQuestionRepository,
     DashboardVariableRepository,
+    DashboardLayoutRepository,
     EmailTemplateRepository,
     ExportTemplateRepository,
     ExportTransactionRepository,