@solidxai/core 0.1.1 → 0.1.4

package/src/controllers/service.controller.ts

@@ -26,7 +26,6 @@ export class ServiceController {
         private readonly mqMessageService: MqMessageService,
         private readonly errorMapper: ErrorMapperService,
         private readonly ingestMetadataService: IngestMetadataService,
-        
     ) { }
 
     @Public()
@@ -35,64 +34,64 @@ export class ServiceController {
         return { pong: 'v1.0.2' };
     }
 
-    @ApiBearerAuth("jwt")
-    @Get('mcp/ping')
-    async mcpPingPong(@ActiveUser() activeUser: ActiveUserData) {
-        // TODO: do a MCP client invocation, wait for response and return.
-        // If failure then decide shape to return.
-
-        const threadId = `pingPongTxn-${activeUser.sub}`;
-        const dto ={prompt:"Can you do 1 + 1", moduleName:"solidCoreModule"}
-        const { queueMessageId, aiInteractionId } = await this.aiInteractionService.triggerMcpClientJob(
-            dto,
-            activeUser.sub,
-            true,
-            threadId
-        );
-
-        this.logger.debug(`mcp ping pong job triggered: queueMessageId=${queueMessageId}, aiInteractionId=${aiInteractionId}`);
-
-        // Wait up to 2 minutes, start at 500ms poll, back off to max 2s, throw if failed:
-        const result = await this.mqMessageService.waitForTerminalStatus(queueMessageId, {
-            timeoutMs: 2 * 60 * 1000,
-            intervalMs: 500,
-            maxIntervalMs: 2000,
-            throwOnFailure: false,
-        });
-
-        this.logger.debug(`mcp ping pong job finished with stage=${result.stage}`)
-
-        this.logger.debug(`mcp ping pong trying to find genai (child) interaction for aiInteraction for id=${aiInteractionId}`)
-
-        // @ts-ignore
-        const genAiInteractions = await this.aiInteractionService.find({
-            filters: {
-                parentInteraction: {
-                    id: {
-                        $eq: aiInteractionId
-                    }
-                }
-            }
-        });
-
-        const genAiInteraction = genAiInteractions['records'][0];
-        this.logger.debug(genAiInteraction.message);
-
-        this.logger.debug(`identified gen-ai interaction with id=${genAiInteraction.id}`);
-        this.logger.debug(`proceeding with applying the gen-ai interaction`)
-
-        return {
-            mcpPong: 'v1.0.2',
-            genAiInteraction: {
-                status: genAiInteraction.status,
-                errorCode: genAiInteraction.status === 'failed' ? this.errorMapper.mapMessage(genAiInteraction.errorMessage, genAiInteraction.metadata) : '',
-                errorMessage: genAiInteraction.errorMessage,
-            }
-        };
-    }
+    // @ApiBearerAuth("jwt")
+    // @Get('mcp/ping')
+    // async mcpPingPong(@ActiveUser() activeUser: ActiveUserData) {
+    //     // TODO: do a MCP client invocation, wait for response and return.
+    //     // If failure then decide shape to return.
+
+    //     const threadId = `pingPongTxn-${activeUser.sub}`;
+    //     const dto = { prompt: "Can you do 1 + 1", moduleName: "solidCoreModule" }
+    //     const { queueMessageId, aiInteractionId } = await this.aiInteractionService.triggerMcpClientJob(
+    //         dto,
+    //         activeUser.sub,
+    //         true,
+    //         threadId
+    //     );
+
+    //     this.logger.debug(`mcp ping pong job triggered: queueMessageId=${queueMessageId}, aiInteractionId=${aiInteractionId}`);
+
+    //     // Wait up to 2 minutes, start at 500ms poll, back off to max 2s, throw if failed:
+    //     const result = await this.mqMessageService.waitForTerminalStatus(queueMessageId, {
+    //         timeoutMs: 2 * 60 * 1000,
+    //         intervalMs: 500,
+    //         maxIntervalMs: 2000,
+    //         throwOnFailure: false,
+    //     });
+
+    //     this.logger.debug(`mcp ping pong job finished with stage=${result.stage}`)
+
+    //     this.logger.debug(`mcp ping pong trying to find genai (child) interaction for aiInteraction for id=${aiInteractionId}`)
+
+    //     // @ts-ignore
+    //     const genAiInteractions = await this.aiInteractionService.find({
+    //         filters: {
+    //             parentInteraction: {
+    //                 id: {
+    //                     $eq: aiInteractionId
+    //                 }
+    //             }
+    //         }
+    //     });
+
+    //     const genAiInteraction = genAiInteractions['records'][0];
+    //     this.logger.debug(genAiInteraction.message);
+
+    //     this.logger.debug(`identified gen-ai interaction with id=${genAiInteraction.id}`);
+    //     this.logger.debug(`proceeding with applying the gen-ai interaction`)
+
+    //     return {
+    //         mcpPong: 'v1.0.2',
+    //         genAiInteraction: {
+    //             status: genAiInteraction.status,
+    //             errorCode: genAiInteraction.status === 'failed' ? this.errorMapper.mapMessage(genAiInteraction.errorMessage, genAiInteraction.metadata) : '',
+    //             errorMessage: genAiInteraction.errorMessage,
+    //         }
+    //     };
+    // }
 
-    @Public()
     // @SkipThrottle({ short: false, login: true, burst: true, sustained: true }) //Enable the short throttle only
+    @ApiBearerAuth("jwt")
     @Post('seed')
     async seedData(@Body() seedData: any) {
         const seeder = this.solidRegistry
@@ -111,7 +110,7 @@ export class ServiceController {
 
     @ApiBearerAuth("jwt")
     @Post('code-generation/post-process')
-    async postProcessCodeGeneration(@Body() config : PostProcessCodeGenConfig) {
+    async postProcessCodeGeneration(@Body() config: PostProcessCodeGenConfig) {
         // Set defaults if not provided
         config.runModuleMetadataSeeder = config.runModuleMetadataSeeder ?? true;
         config.runSolidIngestion = config.runSolidIngestion ?? true;
@@ -132,7 +131,7 @@ export class ServiceController {
         } else {
             this.logger.debug(`Skipping the Module Metadata Seeder Service as part of post-process code generation`);
         }
-        
+
         // Run the Solid ingestion command
         if (config.runSolidIngestion) {
             this.logger.debug(`Running the Solid ingestion command as part of post-process code generation`);

package/src/dtos/basic-filters.dto.ts

@@ -28,12 +28,10 @@ export class BasicFilterDto extends PaginationQueryDto {
     @ApiProperty({ description: "aggregates" })
     readonly aggregates?: string[];
 
-
     @IsOptional()
     @ApiProperty({ description: "populate" })
     readonly populate?: string[];
 
-
     @IsOptional()
     @ApiProperty({ description: "populateMedia" })
     readonly populateMedia?: string[];

package/src/dtos/create-user.dto.ts

@@ -5,6 +5,7 @@ import { Type } from 'class-transformer';
 import { UpdateRoleMetadataDto } from 'src/dtos/update-role-metadata.dto';
 import { UpdateUserViewMetadataDto } from 'src/dtos/update-user-view-metadata.dto';
 
+export const DEFAULT_SA_PASSWORD = 'Admin@3214$';
 export class CreateUserDto {
     @IsOptional()
     @IsString()

package/src/helpers/schematic.service.ts

@@ -73,7 +73,7 @@ export class SchematicService {
       })
       .map((fieldName) => {
         // Using argument array eliminates the need for shell-specific quoting
-        return `--fieldNamesForRemoval=${fieldName}`;
+        return `--field-names-for-removal=${fieldName}`;
       });
   }
 

package/src/index.ts

@@ -4,6 +4,8 @@ export * from './commands/refresh-module.command'
 export * from './commands/remove-fields.command'
 export * from './commands/seed.command'
 export * from './commands/test-data.command'
+export * from './commands/run-tests.command'
+export * from './commands/test.command'
 
 export * from './config/cache.options'
 
@@ -179,6 +181,7 @@ export * from './helpers/security.helper'
 export * from './helpers/model-metadata-helper.service'
 export * from './helpers/image-encoding.helper'
 export * from './helpers/solid-microservice-adapter.service'
+export * from './helpers/typeorm-db-helper';
 
 export * from './services/crud.service'
 export * from './interceptors/logging.interceptor'

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

@@ -31,7 +31,7 @@ import { ViewMetadataService } from '../services/view-metadata.service';
 import solidCoreMetadata from './seed-data/solid-core-metadata.json';
 import { SystemFieldsSeederService } from './system-fields-seeder.service';
 // import { CreateScheduledJobDto } from 'src/dtos/create-scheduled-job.dto';
-import { ActionMetadata, MENU_ROLE_JOIN_TABLE_NAME, MENU_ROLE_JOIN_TABLE_NAME_MENU_COL, MENU_ROLE_JOIN_TABLE_NAME_ROLE_COL, MenuItemMetadata, ModuleMetadata, RoleMetadata, SignUpDto } from 'src';
+import { ActionMetadata, DEFAULT_SA_PASSWORD, MENU_ROLE_JOIN_TABLE_NAME, MENU_ROLE_JOIN_TABLE_NAME_MENU_COL, MENU_ROLE_JOIN_TABLE_NAME_ROLE_COL, MenuItemMetadata, ModuleMetadata, RoleMetadata, SignUpDto } from 'src';
 import { ADMIN_ROLE_NAME } from 'src/dtos/create-role-metadata.dto';
 import { CreateSavedFiltersDto } from 'src/dtos/create-saved-filters.dto';
 import { CreateScheduledJobDto } from 'src/dtos/create-scheduled-job.dto';
@@ -654,7 +654,8 @@ export class ModuleMetadataSeederService {
                     action,
                     module,
                     parentMenuItem,
-                    sequenceNumber: m.sequenceNumber
+                    sequenceNumber: m.sequenceNumber,
+                    iconName: m.iconName,
                 };
 
                 // If existing, set its id so save() will perform an update, otherwise insert
@@ -767,7 +768,7 @@ export class ModuleMetadataSeederService {
     }
 
     // OK
-    private async handleSeedUsers(users) {
+    private async handleSeedUsers(users: SignUpDto[]) {
         if (!users) {
             return;
         }
@@ -776,33 +777,12 @@ export class ModuleMetadataSeederService {
             const user: SignUpDto = users[l];
             let exisitingUser = await this.userService.findOneByUsername(user.username);
             if (!exisitingUser) {
-                let generatedAdminPassword: string | null = null;
                 if (user.username === 'sa') {
-                    generatedAdminPassword = uuidv4();
-                    user.password = generatedAdminPassword;
+                    user.password = DEFAULT_SA_PASSWORD;
                 }
 
                 exisitingUser = await this.authenticationService.signUp(user);
                 this.logger.log(`Newly created user ${user.username}`);
-
-                // Surface the generated SA password clearly to the operator.
-                if (generatedAdminPassword) {
-                    const banner = [
-                        '',
-                        '============================================================',
-                        '  SYSTEM ADMIN USER CREATED',
-                        '------------------------------------------------------------',
-                        '  Username : sa',
-                        `  Password : ${generatedAdminPassword}`,
-                        '',
-                        '  Copy and store this password securely now.',
-                        '  It is shown only once during seeding.',
-                        '============================================================',
-                        ''
-                    ].join('\n');
-                    // Use console.log to ensure visibility even if logger formatting changes.
-                    console.log(banner);
-                }
             }
             //FIXME: Create the user roles assignment logic here.
             // now add Roles to user.

package/src/seeders/module-test-data.service.ts

@@ -185,8 +185,10 @@ export class ModuleTestDataService {
       throw new Error('Module metadata missing from test data payload.');
     }
 
-    const testData: Array<{ modelUserKey: string; data: Record<string, any> }> = overallMetadata.testData ?? [];
-    if (testData.length === 0) {
+    // console.log(JSON.stringify(moduleMetadata, null, 2));    
+
+    const testingData: Array<{ modelUserKey: string; data: Record<string, any> }> = overallMetadata?.testing?.data ?? [];
+    if (testingData.length === 0) {
       this.logger.debug(`No test data found for ${moduleMetadata.name}`);
       return;
     }
@@ -195,7 +197,7 @@ export class ModuleTestDataService {
       (moduleMetadata.models ?? []).map((m) => [m.singularName, m]),
     );
 
-    for (const entry of testData) {
+    for (const entry of testingData) {
       const modelUserKey = entry.modelUserKey;
       const modelDef = modelsByName.get(modelUserKey);
       if (!modelDef) {

package/src/seeders/seed-data/solid-core-metadata.json

@@ -5899,7 +5899,8 @@
       "sequenceNumber": 1,
       "actionUserKey": "appBuilder-root",
       "moduleUserKey": "solid-core",
-      "parentMenuItemUserKey": ""
+      "parentMenuItemUserKey": "",
+      "iconName" : "app_registration"
     },
     {
       "displayName": "Module",
@@ -5931,7 +5932,8 @@
       "sequenceNumber": 2,
       "actionUserKey": "layoutBuilder-root",
       "moduleUserKey": "solid-core",
-      "parentMenuItemUserKey": ""
+      "parentMenuItemUserKey": "",
+      "iconName": "space_dashboard"
     },
     {
       "displayName": "Menu Item",
@@ -5971,7 +5973,8 @@
       "sequenceNumber": 3,
       "actionUserKey": "media-root",
       "moduleUserKey": "solid-core",
-      "parentMenuItemUserKey": ""
+      "parentMenuItemUserKey": "",
+      "iconName":"perm_media"
     },
     {
       "displayName": "Media",
@@ -5995,7 +5998,8 @@
       "sequenceNumber": 4,
       "actionUserKey": "iam-root",
       "moduleUserKey": "solid-core",
-      "parentMenuItemUserKey": ""
+      "parentMenuItemUserKey": "",
+      "iconName": "person_shield"
     },
     {
       "displayName": "User",
@@ -6043,7 +6047,8 @@
       "sequenceNumber": 5,
       "actionUserKey": "queues-root",
       "moduleUserKey": "solid-core",
-      "parentMenuItemUserKey": ""
+      "parentMenuItemUserKey": "",
+      "iconName":"low_priority"
     },
     {
       "displayName": "Messages",
@@ -6067,7 +6072,8 @@
       "sequenceNumber": 6,
       "actionUserKey": "notification-root",
       "moduleUserKey": "solid-core",
-      "parentMenuItemUserKey": ""
+      "parentMenuItemUserKey": "",
+      "iconName":"notification_settings"
     },
     {
       "displayName": "Email",
@@ -6091,7 +6097,8 @@
       "sequenceNumber": 7,
       "actionUserKey": "other-root",
       "moduleUserKey": "solid-core",
-      "parentMenuItemUserKey": ""
+      "parentMenuItemUserKey": "",
+      "iconName":"other_admission"
     },
     {
       "displayName": "List of Values",
@@ -6171,7 +6178,8 @@
       "sequenceNumber": 8,
       "actionUserKey": "dasbhoard-root",
       "moduleUserKey": "solid-core",
-      "parentMenuItemUserKey": ""
+      "parentMenuItemUserKey": "",
+      "iconName" : "dashboard_customize"
     },
     {
       "displayName": "Dashboard",
@@ -6195,7 +6203,8 @@
       "sequenceNumber": 9,
       "actionUserKey": "settings-root",
       "moduleUserKey": "solid-core",
-      "parentMenuItemUserKey": ""
+      "parentMenuItemUserKey": "",
+      "iconName":"settings"
     },
     {
       "displayName": "App Settings",
@@ -11146,6 +11155,22 @@
               "sortable": true,
               "filterable": true
             }
+          },
+          {
+            "type": "field",
+            "attrs": {
+              "name": "userAgent",
+              "sortable": true,
+              "filterable": true
+            }
+          },
+          {
+            "type": "field",
+            "attrs": {
+              "name": "createdAt",
+              "sortable": true,
+              "filterable": true
+            }
           }
         ]
       }

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

@@ -18,9 +18,12 @@ import { ChatterMessageDetails } from '../entities/chatter-message-details.entit
 import { ChatterMessage } from '../entities/chatter-message.entity';
 import { getMediaStorageProvider } from './mediaStorageProviders';
 import { RequestContextService } from './request-context.service';
-import { take } from 'rxjs';
+import { Logger } from '@nestjs/common';
+
 @Injectable()
 export class ChatterMessageService extends CRUDService<ChatterMessage> {
+    private readonly _logger = new Logger(ChatterMessageService.name);
+
     constructor(
         @InjectEntityManager()
         readonly entityManager: EntityManager,
@@ -502,16 +505,23 @@ export class ChatterMessageService extends CRUDService<ChatterMessage> {
         return populatedEntity;
     }
 
+    private logHeapUsed(label: string) {
+        const mb = () => Math.round(process.memoryUsage().heapUsed / 1024 / 1024);
+        this._logger.log(`heapUsedMB(${label}): ${mb()}`);
+    }
+
     // [2026-02-05T23:31:21.025Z] INFO: [200 OK] 
     // GET /api/chatter-message/getChatterMessages/216/mswipeBoomboxBulkUpload?populateMedia[0]=messageAttachments&populate[0]=user&populate[1]=chatterMessageDetails&limit=25 22747ms
     async getChatterMessages(entityId: number, entityName: string, query: any) {
         const { limit = 25, offset = 0, populate = [], populateMedia = [], filters } = query;
+        this.logHeapUsed('getChatterMessages-start');
 
         const model = await this.modelMetadataRepo.findOne({
             where: {
                 singularName: entityName
             },
         });
+        this.logHeapUsed('getChatterMessages-modelLoaded');
         const oneToManyFields = await this.fieldMetadataRepo.find({
             where: {
                 model: { id: model.id },
@@ -519,11 +529,13 @@ export class ChatterMessageService extends CRUDService<ChatterMessage> {
                 relationType: 'one-to-many'
             }
         });
+        this.logHeapUsed('getChatterMessages-oneToManyFieldsLoaded');
 
         const relatedEntitiesMap = new Map<string, number[]>();
 
         for (const field of oneToManyFields) {
             if (field.enableAuditTracking === false) {
+                this._logger.log(`Skipping field ${field.name} for chatter message retrieval because audit tracking is disabled`);
                 continue
             }
             const coModelName = field.relationCoModelSingularName;
@@ -552,8 +564,10 @@ export class ChatterMessageService extends CRUDService<ChatterMessage> {
                 relatedEntitiesMap.set(field.name, relatedIds);
             }
         }
+        this.logHeapUsed('getChatterMessages-relatedEntitiesLoaded');
 
         const qb = await this.repo.createSecurityRuleAwareQueryBuilder('entity');
+        this.logHeapUsed('getChatterMessages-queryBuilderReady');
 
         const orConditions: string[] = [];
         const parameters: any = {};
@@ -602,10 +616,13 @@ export class ChatterMessageService extends CRUDService<ChatterMessage> {
         qb.skip(offset).take(limit);
 
         const [entities, count] = await qb.getManyAndCount();
+        this.logHeapUsed('getChatterMessages-entitiesLoaded');
 
         if (populateMedia && populateMedia.length > 0) {
             const normalizedPopulateMedia = this.crudHelperService.normalize(populateMedia);
+            this.logHeapUsed('getChatterMessages-beforePopulateMedia');
             await this['handlePopulateMedia'](normalizedPopulateMedia, entities);
+            this.logHeapUsed('getChatterMessages-afterPopulateMedia');
         }
 
         const currentPage = Math.floor(offset / limit) + 1;

package/src/services/crud.service.ts

@@ -67,6 +67,7 @@ export class CRUDService<T extends CommonEntity> { // Add two generic value i.e
     protected get discoveryService(): DiscoveryService {
         return this._discoveryService ??= this.moduleRef.get(DiscoveryService, { strict: false });
     }
+
     protected get settingService(): SettingService {
         return this._settingService ??= this.moduleRef.get(SettingService, { strict: false });
     }

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

@@ -876,7 +876,8 @@ export class ModelMetadataService {
       sequenceNumber: 1,
       actionUserKey: actionName,
       moduleUserKey: `${model.module.name}`,
-      parentMenuItemUserKey: ""
+      parentMenuItemUserKey: "",
+      iconName : ""
     };
 
     const modelListview = {

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

@@ -181,7 +181,8 @@ export class ModuleMetadataService {
             sequenceNumber: 1,
             actionUserKey: `${module?.name}-home-action`,
             moduleUserKey: module?.name,
-            parentMenuItemUserKey: ""
+            parentMenuItemUserKey: "",
+            iconName : "home"
           }
         ],
         views: [],

package/src/services/queues/common.ts

@@ -0,0 +1,75 @@
+/**
+ * Convert a string into a lower-case slug separated by a join character.
+ *
+ * Logic:
+ * - Keep only ASCII letters and digits.
+ * - Convert A-Z to a-z.
+ * - Replace runs of non-alphanumeric characters with a single join character.
+ * - Trim leading/trailing join characters.
+ *
+ * Examples (joinChar "_"):
+ * - "Venue App" -> "venue_app"
+ * - "My-App@2025" -> "my_app_2025"
+ * - "  CORE__API!! " -> "core_api"
+ *
+ * Examples (joinChar "-"):
+ * - "Venue App" -> "venue-app"
+ */
+export function toSlug(value?: string | null, joinChar: string = '-'): string {
+    if (!value) {
+        return '';
+    }
+
+    const slugChars: string[] = [];
+    let lastJoin = true;
+
+    for (let i = 0; i < value.length; i += 1) {
+        const code = value.charCodeAt(i);
+
+        // ASCII uppercase -> lowercase
+        if (code >= 65 && code <= 90) {
+            slugChars.push(String.fromCharCode(code + 32));
+            lastJoin = false;
+            continue;
+        }
+
+        // ASCII lowercase letters or digits are kept as-is
+        if ((code >= 97 && code <= 122) || (code >= 48 && code <= 57)) {
+            slugChars.push(value[i]);
+            lastJoin = false;
+            continue;
+        }
+
+        // Any other char becomes a single join character (collapse runs)
+        if (!lastJoin && slugChars.length > 0) {
+            slugChars.push(joinChar);
+            lastJoin = true;
+        }
+    }
+
+    if (slugChars.length && slugChars[slugChars.length - 1] === joinChar) {
+        slugChars.pop();
+    }
+
+    return slugChars.join('');
+}
+
+/**
+ * Build a namespaced queue name by prefixing the queue name with the
+ * slugged app name, the slugged env, and underscores.
+ *
+ * Examples:
+ * - appName "Venue App", env "Prod", queue "orders" -> "venue_app_prod_orders"
+ * - appName "core-api", env "staging", queue "sync" -> "core_api_staging_sync"
+ * - appName "" or undefined, env "" or undefined, queue "jobs" -> "_dev_jobs"
+ */
+export function buildNamespacedQueueName(
+    queueName: string,
+    appName: string | undefined | null = process.env.SOLID_APP_NAME,
+    env: string | undefined | null = process.env.ENV,
+): string {
+    const appNameSlug = toSlug(appName, '_');
+    const envValue = env && env.length > 0 ? env : (process.env.ENV && process.env.ENV.length > 0 ? process.env.ENV : 'dev');
+    const envSlug = toSlug(envValue, '_');
+    return `${appNameSlug}_${envSlug}_${queueName}`;
+}

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

@@ -4,6 +4,7 @@ import { QueuesModuleOptions } from "../../interfaces";
 import { QueueMessage, QueuePublisher } from '../../interfaces/mq';
 import { MqMessageQueueService } from '../mq-message-queue.service';
 import { MqMessageService } from '../mq-message.service';
+import { buildNamespacedQueueName } from './common';
 
 export abstract class DatabasePublisher<T> implements QueuePublisher<T> {
     private readonly logger = new Logger(DatabasePublisher.name);
@@ -38,6 +39,8 @@ export abstract class DatabasePublisher<T> implements QueuePublisher<T> {
         const options = this.options();
 
         const queueName = options.queueName;
+        const namespacedQueueName = buildNamespacedQueueName(queueName);
+
         if (!message.retryCount) message.retryCount = 0;
         if (!message.retryInterval) message.retryInterval = 1000;
 
@@ -45,7 +48,7 @@ export abstract class DatabasePublisher<T> implements QueuePublisher<T> {
         message.messageId = uuidv4();
 
         // Save the message to the DB so that we can then change its status in the subscriber...
-        await this.persistToDatabase(queueName, message);
+        await this.persistToDatabase(namespacedQueueName, message);
 
         // return the newly created message id.
         return message.messageId;

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

@@ -4,7 +4,7 @@ import { QueueMessage, QueueSubscriber } from '../../interfaces/mq';
 import { MqMessageQueueService } from '../mq-message-queue.service';
 import { MqMessageService } from '../mq-message.service';
 import { PollerService } from '../poller.service';
-
+import { buildNamespacedQueueName } from './common';
 
 export abstract class DatabaseSubscriber<T> implements OnModuleInit, QueueSubscriber<T> {
     private readonly logger = new Logger(DatabaseSubscriber.name);
@@ -97,7 +97,8 @@ export abstract class DatabaseSubscriber<T> implements OnModuleInit, QueueSubscr
                 }
             }
 
-            this.poller.start(queueName, (q) => this.processNext(q), {
+            const namespacedQueueName = buildNamespacedQueueName(queueName);
+            this.poller.start(namespacedQueueName, (q) => this.processNext(q), {
                 baseDelayMs: 1000,
                 maxDelayMs: 30_000,
                 timeoutPerIterationMs: 5 * 60_000,
@@ -111,7 +112,8 @@ export abstract class DatabaseSubscriber<T> implements OnModuleInit, QueueSubscr
     onModuleDestroy() {
         const options = this.options();
         const queueName = options.queueName;
-        this.poller.stop(queueName);
+        const namespacedQueueName = buildNamespacedQueueName(queueName);
+        this.poller.stop(namespacedQueueName);
     }
 
     /**