fixed cache keys

libs/services/queue/src/queue.ts

@@ -1,11 +1,8 @@
 import { Queue as BullQueue, QueueEvents, Worker, type Job } from 'bullmq';
-import { getLogger } from '@stock-bot/logger';
 import { handlerRegistry } from '@stock-bot/types';
 import type { JobData, JobOptions, QueueStats, RedisConfig } from './types';
 import { getRedisConnection } from './utils';
 
-const logger = getLogger('queue');
-
 export interface QueueWorkerConfig {
   workers?: number;
   concurrency?: number;
@@ -22,15 +19,18 @@ export class Queue {
   private queueEvents?: QueueEvents;
   private queueName: string;
   private redisConfig: RedisConfig;
+  private readonly logger: any;
 
   constructor(
     queueName: string,
     redisConfig: RedisConfig,
     defaultJobOptions: JobOptions = {},
-    config: QueueWorkerConfig = {}
+    config: QueueWorkerConfig = {},
+    logger?: any
   ) {
     this.queueName = queueName;
     this.redisConfig = redisConfig;
+    this.logger = logger || console;
 
     const connection = getRedisConnection(redisConfig);
 
@@ -59,7 +59,7 @@ export class Queue {
       this.startWorkers(config.workers, config.concurrency || 1);
     }
 
-    logger.trace('Queue created', {
+    this.logger.trace('Queue created', {
       queueName,
       workers: config.workers || 0,
       concurrency: config.concurrency || 1,
@@ -77,7 +77,7 @@ export class Queue {
    * Add a single job to the queue
    */
   async add(name: string, data: JobData, options: JobOptions = {}): Promise<Job> {
-    logger.trace('Adding job', { queueName: this.queueName, jobName: name });
+    this.logger.trace('Adding job', { queueName: this.queueName, jobName: name });
     return await this.bullQueue.add(name, data, options);
   }
 
@@ -85,7 +85,7 @@ export class Queue {
    * Add multiple jobs to the queue in bulk
    */
   async addBulk(jobs: Array<{ name: string; data: JobData; opts?: JobOptions }>): Promise<Job[]> {
-    logger.trace('Adding bulk jobs', {
+    this.logger.trace('Adding bulk jobs', {
       queueName: this.queueName,
       jobCount: jobs.length,
     });
@@ -111,7 +111,7 @@ export class Queue {
       },
     };
 
-    logger.info('Adding scheduled job', {
+    this.logger.info('Adding scheduled job', {
       queueName: this.queueName,
       jobName: name,
       cronPattern,
@@ -170,7 +170,7 @@ export class Queue {
    */
   async pause(): Promise<void> {
     await this.bullQueue.pause();
-    logger.info('Queue paused', { queueName: this.queueName });
+    this.logger.info('Queue paused', { queueName: this.queueName });
   }
 
   /**
@@ -178,7 +178,7 @@ export class Queue {
    */
   async resume(): Promise<void> {
     await this.bullQueue.resume();
-    logger.info('Queue resumed', { queueName: this.queueName });
+    this.logger.info('Queue resumed', { queueName: this.queueName });
   }
 
   /**
@@ -186,7 +186,7 @@ export class Queue {
    */
   async drain(delayed = false): Promise<void> {
     await this.bullQueue.drain(delayed);
-    logger.info('Queue drained', { queueName: this.queueName, delayed });
+    this.logger.info('Queue drained', { queueName: this.queueName, delayed });
   }
 
   /**
@@ -198,7 +198,7 @@ export class Queue {
     type: 'completed' | 'failed' = 'completed'
   ): Promise<void> {
     await this.bullQueue.clean(grace, limit, type);
-    logger.debug('Queue cleaned', { queueName: this.queueName, type, grace, limit });
+    this.logger.debug('Queue cleaned', { queueName: this.queueName, type, grace, limit });
   }
 
   /**
@@ -218,12 +218,12 @@ export class Queue {
     try {
       // Close the queue itself
       await this.bullQueue.close();
-      logger.info('Queue closed', { queueName: this.queueName });
+      this.logger.info('Queue closed', { queueName: this.queueName });
 
       // Close queue events
       if (this.queueEvents) {
         await this.queueEvents.close();
-        logger.debug('Queue events closed', { queueName: this.queueName });
+        this.logger.debug('Queue events closed', { queueName: this.queueName });
       }
 
       // Close workers first
@@ -234,14 +234,26 @@ export class Queue {
           })
         );
         this.workers = [];
-        logger.debug('Workers closed', { queueName: this.queueName });
+        this.logger.debug('Workers closed', { queueName: this.queueName });
       }
     } catch (error) {
-      logger.error('Error closing queue', { queueName: this.queueName, error });
+      this.logger.error('Error closing queue', { queueName: this.queueName, error });
       throw error;
     }
   }
 
+  /**
+   * Create a child logger with additional context
+   * Useful for batch processing and other queue operations
+   */
+  createChildLogger(name: string, context?: any) {
+    if (this.logger && typeof this.logger.child === 'function') {
+      return this.logger.child(name, context);
+    }
+    // Fallback to main logger if child not supported (e.g., console)
+    return this.logger;
+  }
+
   /**
    * Start workers for this queue
    */
@@ -258,7 +270,7 @@ export class Queue {
 
       // Setup worker event handlers
       worker.on('completed', job => {
-        logger.trace('Job completed', {
+        this.logger.trace('Job completed', {
           queueName: this.queueName,
           jobId: job.id,
           handler: job.data?.handler,
@@ -267,7 +279,7 @@ export class Queue {
       });
 
       worker.on('failed', (job, err) => {
-        logger.error('Job failed', {
+        this.logger.error('Job failed', {
           queueName: this.queueName,
           jobId: job?.id,
           handler: job?.data?.handler,
@@ -277,7 +289,7 @@ export class Queue {
       });
 
       worker.on('error', error => {
-        logger.error('Worker error', {
+        this.logger.error('Worker error', {
           queueName: this.queueName,
           workerId: i,
           error: error.message,
@@ -287,7 +299,7 @@ export class Queue {
       this.workers.push(worker);
     }
 
-    logger.info('Workers started', {
+    this.logger.info('Workers started', {
       queueName: this.queueName,
       workerCount,
       concurrency,
@@ -300,7 +312,7 @@ export class Queue {
   private async processJob(job: Job): Promise<unknown> {
     const { handler, operation, payload }: JobData = job.data;
 
-    logger.trace('Processing job', {
+    this.logger.trace('Processing job', {
       id: job.id,
       handler,
       operation,
@@ -317,7 +329,7 @@ export class Queue {
 
       const result = await jobHandler(payload);
 
-      logger.trace('Job completed successfully', {
+      this.logger.trace('Job completed successfully', {
         id: job.id,
         handler,
         operation,
@@ -326,7 +338,7 @@ export class Queue {
 
       return result;
     } catch (error) {
-      logger.error('Job processing failed', {
+      this.logger.error('Job processing failed', {
         id: job.id,
         handler,
         operation,
@@ -342,7 +354,7 @@ export class Queue {
    */
   startWorkersManually(workerCount: number, concurrency: number = 1): void {
     if (this.workers.length > 0) {
-      logger.warn('Workers already started for queue', { queueName: this.queueName });
+      this.logger.warn('Workers already started for queue', { queueName: this.queueName });
       return;
     }