ci: Bump version to 0.1.17 [skip ci]

ecosystem.config.cjs

@@ -88,7 +88,7 @@ module.exports = {
       // --- General Worker ---
       name: 'flyer-crawler-worker',
       script: './node_modules/.bin/tsx',
-      args: 'src/worker.ts', // tsx will execute this file
+      args: 'src/services/worker.ts', // tsx will execute this file
       // Production Environment Settings
       env_production: {
         NODE_ENV: 'production',
@@ -164,7 +164,7 @@ module.exports = {
       // --- Analytics Worker ---
       name: 'flyer-crawler-analytics-worker',
       script: './node_modules/.bin/tsx',
-      args: 'src/worker.ts', // tsx will execute this file
+      args: 'src/services/worker.ts', // tsx will execute this file
       // Production Environment Settings
       env_production: {
         NODE_ENV: 'production',

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "flyer-crawler",
-  "version": "0.1.9",
+  "version": "0.1.17",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "flyer-crawler",
-      "version": "0.1.9",
+      "version": "0.1.17",
       "dependencies": {
         "@bull-board/api": "^6.14.2",
         "@bull-board/express": "^6.14.2",

package.json

@@ -1,7 +1,7 @@
 {
   "name": "flyer-crawler",
   "private": true,
-  "version": "0.1.9",
+  "version": "0.1.17",
   "type": "module",
   "scripts": {
     "dev": "concurrently \"npm:start:dev\" \"vite\"",

src/middleware/errorHandler.test.ts

@@ -15,16 +15,19 @@ import type { Logger } from 'pino';
 // Create a mock logger that we can inject into requests and assert against.
 // We only mock the methods we intend to spy on. The rest of the complex Pino
 // Logger type is satisfied by casting, which is a common and clean testing practice.
-const mockLogger = {
+const { mockLogger } = vi.hoisted(() => {
-  error: vi.fn(),
+  const mockLogger = {
-  warn: vi.fn(),
+    error: vi.fn(),
-  info: vi.fn(),
+    warn: vi.fn(),
-  debug: vi.fn(),
+    info: vi.fn(),
-  fatal: vi.fn(),
+    debug: vi.fn(),
-  trace: vi.fn(),
+    fatal: vi.fn(),
-  silent: vi.fn(),
+    trace: vi.fn(),
-  child: vi.fn().mockReturnThis(),
+    silent: vi.fn(),
-} as unknown as Logger;
+    child: vi.fn().mockReturnThis(),
+  };
+  return { mockLogger };
+});
 
 // Mock the global logger as a fallback, though our tests will focus on req.log
 vi.mock('../services/logger.server', () => ({ logger: mockLogger }));
@@ -37,7 +40,7 @@ const app = express();
 app.use(express.json());
 // Add a middleware to inject our mock logger into each request as `req.log`
 app.use((req: Request, res: Response, next: NextFunction) => {
-  req.log = mockLogger;
+  req.log = mockLogger as unknown as Logger;
   next();
 });
 
@@ -106,7 +109,10 @@ describe('errorHandler Middleware', () => {
   it('should return a generic 500 error for a standard Error object', async () => {
     const response = await supertest(app).get('/generic-error');
     expect(response.status).toBe(500);
-    expect(response.body).toEqual({ message: 'A generic server error occurred.' });
+    // In test/dev, we now expect a stack trace for 5xx errors.
+    expect(response.body.message).toBe('A generic server error occurred.');
+    expect(response.body.stack).toBeDefined();
+    expect(response.body.errorId).toEqual(expect.any(String));
     expect(mockLogger.error).toHaveBeenCalledWith(
       expect.objectContaining({
         err: expect.any(Error),
@@ -116,7 +122,7 @@ describe('errorHandler Middleware', () => {
       expect.stringMatching(/Unhandled API Error \(ID: \w+\)/),
     );
     expect(consoleErrorSpy).toHaveBeenCalledWith(
-      expect.stringContaining('--- [TEST] UNHANDLED ERROR ---'),
+      expect.stringMatching(/--- \[TEST\] UNHANDLED ERROR \(ID: \w+\) ---/),
       expect.any(Error),
     );
   });
@@ -130,15 +136,11 @@ describe('errorHandler Middleware', () => {
     expect(mockLogger.warn).toHaveBeenCalledWith(
       {
         err: expect.any(Error),
-        validationErrors: undefined,
         statusCode: 404,
       },
       'Client Error on GET /http-error-404: Resource not found',
     );
-    expect(consoleErrorSpy).toHaveBeenCalledWith(
+    expect(consoleErrorSpy).not.toHaveBeenCalled();
-      expect.stringContaining('--- [TEST] UNHANDLED ERROR ---'),
-      expect.any(Error),
-    );
   });
 
   it('should handle a NotFoundError with a 404 status', async () => {
@@ -150,15 +152,11 @@ describe('errorHandler Middleware', () => {
     expect(mockLogger.warn).toHaveBeenCalledWith(
       {
         err: expect.any(NotFoundError),
-        validationErrors: undefined,
         statusCode: 404,
       },
       'Client Error on GET /not-found-error: Specific resource missing',
     );
-    expect(consoleErrorSpy).toHaveBeenCalledWith(
+    expect(consoleErrorSpy).not.toHaveBeenCalled();
-      expect.stringContaining('--- [TEST] UNHANDLED ERROR ---'),
-      expect.any(NotFoundError),
-    );
   });
 
   it('should handle a ForeignKeyConstraintError with a 400 status and the specific error message', async () => {
@@ -170,15 +168,11 @@ describe('errorHandler Middleware', () => {
     expect(mockLogger.warn).toHaveBeenCalledWith(
       {
         err: expect.any(ForeignKeyConstraintError),
-        validationErrors: undefined,
         statusCode: 400,
       },
       'Client Error on GET /fk-error: The referenced item does not exist.',
     );
-    expect(consoleErrorSpy).toHaveBeenCalledWith(
+    expect(consoleErrorSpy).not.toHaveBeenCalled();
-      expect.stringContaining('--- [TEST] UNHANDLED ERROR ---'),
-      expect.any(ForeignKeyConstraintError),
-    );
   });
 
   it('should handle a UniqueConstraintError with a 409 status and the specific error message', async () => {
@@ -190,15 +184,11 @@ describe('errorHandler Middleware', () => {
     expect(mockLogger.warn).toHaveBeenCalledWith(
       {
         err: expect.any(UniqueConstraintError),
-        validationErrors: undefined,
         statusCode: 409,
       },
       'Client Error on GET /unique-error: This item already exists.',
     );
-    expect(consoleErrorSpy).toHaveBeenCalledWith(
+    expect(consoleErrorSpy).not.toHaveBeenCalled();
-      expect.stringContaining('--- [TEST] UNHANDLED ERROR ---'),
-      expect.any(UniqueConstraintError),
-    );
   });
 
   it('should handle a ValidationError with a 400 status and include the validation errors array', async () => {
@@ -219,17 +209,17 @@ describe('errorHandler Middleware', () => {
       },
       'Client Error on GET /validation-error: Input validation failed',
     );
-    expect(consoleErrorSpy).toHaveBeenCalledWith(
+    expect(consoleErrorSpy).not.toHaveBeenCalled();
-      expect.stringContaining('--- [TEST] UNHANDLED ERROR ---'),
-      expect.any(ValidationError),
-    );
   });
 
   it('should handle a DatabaseError with a 500 status and a generic message', async () => {
     const response = await supertest(app).get('/db-error-500');
 
     expect(response.status).toBe(500);
-    expect(response.body).toEqual({ message: 'A database connection issue occurred.' });
+    // In test/dev, we now expect a stack trace for 5xx errors.
+    expect(response.body.message).toBe('A database connection issue occurred.');
+    expect(response.body.stack).toBeDefined();
+    expect(response.body.errorId).toEqual(expect.any(String));
     expect(mockLogger.error).toHaveBeenCalledWith(
       expect.objectContaining({
         err: expect.any(DatabaseError),
@@ -239,7 +229,7 @@ describe('errorHandler Middleware', () => {
       expect.stringMatching(/Unhandled API Error \(ID: \w+\)/),
     );
     expect(consoleErrorSpy).toHaveBeenCalledWith(
-      expect.stringContaining('--- [TEST] UNHANDLED ERROR ---'),
+      expect.stringMatching(/--- \[TEST\] UNHANDLED ERROR \(ID: \w+\) ---/),
       expect.any(DatabaseError),
     );
   });
@@ -249,8 +239,14 @@ describe('errorHandler Middleware', () => {
 
     expect(response.status).toBe(401);
     expect(response.body).toEqual({ message: 'Invalid Token' });
-    // 4xx errors log as warn
+    expect(mockLogger.warn).toHaveBeenCalledWith(
-    expect(mockLogger.warn).toHaveBeenCalled();
+      {
+        err: expect.any(Error),
+        statusCode: 401,
+      },
+      'Client Error on GET /unauthorized-error-no-status: Invalid Token',
+    );
+    expect(consoleErrorSpy).not.toHaveBeenCalled();
   });
 
   it('should handle an UnauthorizedError with explicit status', async () => {
@@ -258,6 +254,14 @@ describe('errorHandler Middleware', () => {
 
     expect(response.status).toBe(401);
     expect(response.body).toEqual({ message: 'Invalid Token' });
+    expect(mockLogger.warn).toHaveBeenCalledWith(
+      {
+        err: expect.any(Error),
+        statusCode: 401,
+      },
+      'Client Error on GET /unauthorized-error-with-status: Invalid Token',
+    );
+    expect(consoleErrorSpy).not.toHaveBeenCalled();
   });
 
   it('should call next(err) if headers have already been sent', () => {
@@ -302,6 +306,7 @@ describe('errorHandler Middleware', () => {
       expect(response.body.message).toMatch(
         /An unexpected server error occurred. Please reference error ID: \w+/,
       );
+      expect(response.body.stack).toBeUndefined();
     });
 
     it('should return the actual error message for client errors (4xx) in production', async () => {

src/middleware/errorHandler.ts

@@ -1,5 +1,6 @@
 // src/middleware/errorHandler.ts
 import { Request, Response, NextFunction } from 'express';
+import crypto from 'crypto';
 import { ZodError } from 'zod';
 import {
   ForeignKeyConstraintError,
@@ -24,45 +25,77 @@ export const errorHandler = (err: Error, req: Request, res: Response, next: Next
   // Use the request-scoped logger if available, otherwise fall back to the global logger.
   const log = req.log || logger;
 
-  // --- Handle Zod Validation Errors ---
+  // --- Handle Zod Validation Errors (from validateRequest middleware) ---
   if (err instanceof ZodError) {
-    log.warn({ err: err.flatten() }, 'Request validation failed');
+    const statusCode = 400;
-    return res.status(400).json({
+    const message = 'The request data is invalid.';
-      message: 'The request data is invalid.',
+    const errors = err.issues.map((e) => ({ path: e.path, message: e.message }));
-      errors: err.issues.map((e) => ({ path: e.path, message: e.message })),
+    log.warn({ err, validationErrors: errors, statusCode }, `Client Error on ${req.method} ${req.path}: ${message}`);
-    });
+    return res.status(statusCode).json({ message, errors });
   }
 
   // --- Handle Custom Operational Errors ---
   if (err instanceof NotFoundError) {
-    log.info({ err }, 'Resource not found');
+    const statusCode = 404;
-    return res.status(404).json({ message: err.message });
+    log.warn({ err, statusCode }, `Client Error on ${req.method} ${req.path}: ${err.message}`);
+    return res.status(statusCode).json({ message: err.message });
   }
 
   if (err instanceof ValidationError) {
-    log.warn({ err }, 'Validation error occurred');
+    const statusCode = 400;
-    return res.status(400).json({ message: err.message, errors: err.validationErrors });
+    log.warn(
+      { err, validationErrors: err.validationErrors, statusCode },
+      `Client Error on ${req.method} ${req.path}: ${err.message}`,
+    );
+    return res.status(statusCode).json({ message: err.message, errors: err.validationErrors });
   }
 
   if (err instanceof UniqueConstraintError) {
-    log.warn({ err }, 'Constraint error occurred');
+    const statusCode = 409;
-    return res.status(409).json({ message: err.message }); // Use 409 Conflict for unique constraints
+    log.warn({ err, statusCode }, `Client Error on ${req.method} ${req.path}: ${err.message}`);
+    return res.status(statusCode).json({ message: err.message }); // Use 409 Conflict for unique constraints
   }
 
   if (err instanceof ForeignKeyConstraintError) {
-    log.warn({ err }, 'Foreign key constraint violation');
+    const statusCode = 400;
-    return res.status(400).json({ message: err.message });
+    log.warn({ err, statusCode }, `Client Error on ${req.method} ${req.path}: ${err.message}`);
+    return res.status(statusCode).json({ message: err.message });
   }
 
-  // --- Handle Generic Errors ---
+  // --- Handle Generic Client Errors (e.g., from express-jwt, or manual status setting) ---
-  // Log the full error object for debugging. The pino logger will handle redaction.
+  let status = (err as any).status || (err as any).statusCode;
-  log.error({ err }, 'An unhandled error occurred in an Express route');
+  // Default UnauthorizedError to 401 if no status is present, a common case for express-jwt.
+  if (err.name === 'UnauthorizedError' && !status) {
+    status = 401;
+  }
+  if (status && status >= 400 && status < 500) {
+    log.warn({ err, statusCode: status }, `Client Error on ${req.method} ${req.path}: ${err.message}`);
+    return res.status(status).json({ message: err.message });
+  }
+
+  // --- Handle All Other (500-level) Errors ---
+  const errorId = crypto.randomBytes(4).toString('hex');
+  log.error(
+    {
+      err,
+      errorId,
+      req: { method: req.method, url: req.url, headers: req.headers, body: req.body },
+    },
+    `Unhandled API Error (ID: ${errorId})`,
+  );
+
+  // Also log to console in test environment for visibility in test runners
+  if (process.env.NODE_ENV === 'test') {
+    console.error(`--- [TEST] UNHANDLED ERROR (ID: ${errorId}) ---`, err);
+  }
 
   // In production, send a generic message to avoid leaking implementation details.
   if (process.env.NODE_ENV === 'production') {
-    return res.status(500).json({ message: 'An internal server error occurred.' });
+    return res.status(500).json({
+      message: `An unexpected server error occurred. Please reference error ID: ${errorId}`,
+    });
   }
 
-  // In development, send more details for easier debugging.
+  // In non-production environments (dev, test, etc.), send more details for easier debugging.
-  return res.status(500).json({ message: err.message, stack: err.stack });
+  return res.status(500).json({ message: err.message, stack: err.stack, errorId });
 };

src/providers/ApiProvider.test.tsx

@@ -0,0 +1,55 @@
+// src/providers/ApiProvider.test.tsx
+import React, { useContext } from 'react';
+import { render, screen } from '@testing-library/react';
+import { describe, it, expect, vi } from 'vitest';
+import { ApiProvider } from './ApiProvider';
+import { ApiContext } from '../contexts/ApiContext';
+import * as apiClient from '../services/apiClient';
+
+// Mock the apiClient module.
+// Since ApiProvider and ApiContext import * as apiClient, mocking it ensures
+// we control the reference identity and can verify it's being passed correctly.
+vi.mock('../services/apiClient', () => ({
+  fetchFlyers: vi.fn(),
+  fetchMasterItems: vi.fn(),
+  // Add other mocked methods as needed for the shape to be valid-ish
+}));
+
+describe('ApiProvider & ApiContext', () => {
+  const TestConsumer = () => {
+    const contextValue = useContext(ApiContext);
+    // We check if the context value is strictly equal to the imported module
+    return (
+      <div>
+        <span data-testid="value-check">
+          {contextValue === apiClient ? 'Matches apiClient' : 'Does not match'}
+        </span>
+      </div>
+    );
+  };
+
+  it('renders children correctly', () => {
+    render(
+      <ApiProvider>
+        <div data-testid="child">Child Content</div>
+      </ApiProvider>
+    );
+    expect(screen.getByTestId('child')).toBeInTheDocument();
+    expect(screen.getByText('Child Content')).toBeInTheDocument();
+  });
+
+  it('provides the apiClient module via context', () => {
+    render(
+      <ApiProvider>
+        <TestConsumer />
+      </ApiProvider>
+    );
+    expect(screen.getByTestId('value-check')).toHaveTextContent('Matches apiClient');
+  });
+
+  it('ApiContext has apiClient as the default value (when no provider is present)', () => {
+    // This verifies the logic in ApiContext.tsx: createContext(apiClient)
+    render(<TestConsumer />);
+    expect(screen.getByTestId('value-check')).toHaveTextContent('Matches apiClient');
+  });
+});

src/routes/admin.content.routes.test.ts

@@ -13,7 +13,6 @@ import {
 import type { SuggestedCorrection, Brand, UserProfile, UnmatchedFlyerItem } from '../types';
 import { NotFoundError } from '../services/db/errors.db'; // This can stay, it's a type/class not a module with side effects.
 import { createTestApp } from '../tests/utils/createTestApp';
-import { mockLogger } from '../tests/utils/mockLogger';
 
 // Mock the file upload middleware to allow testing the controller's internal check
 vi.mock('../middleware/fileUpload.middleware', () => ({
@@ -96,8 +95,9 @@ vi.mock('@bull-board/express', () => ({
 }));
 
 // Mock the logger
-vi.mock('../services/logger.server', () => ({
+vi.mock('../services/logger.server', async () => ({
-  logger: mockLogger,
+  // Use async import to avoid hoisting issues with mockLogger
+  logger: (await import('../tests/utils/mockLogger')).mockLogger,
 }));
 
 // Mock the passport middleware

src/routes/admin.jobs.routes.test.ts

@@ -6,7 +6,6 @@ import { createMockUserProfile } from '../tests/utils/mockFactories';
 import type { Job } from 'bullmq';
 import type { UserProfile } from '../types';
 import { createTestApp } from '../tests/utils/createTestApp';
-import { mockLogger } from '../tests/utils/mockLogger';
 
 // Mock the background job service to control its methods.
 vi.mock('../services/backgroundJobService', () => ({
@@ -66,8 +65,9 @@ import {
 } from '../services/queueService.server';
 
 // Mock the logger
-vi.mock('../services/logger.server', () => ({
+vi.mock('../services/logger.server', async () => ({
-  logger: mockLogger,
+  // Use async import to avoid hoisting issues with mockLogger
+  logger: (await import('../tests/utils/mockLogger')).mockLogger,
 }));
 
 // Mock the passport middleware

src/routes/admin.stats.routes.test.ts

@@ -5,7 +5,6 @@ import type { Request, Response, NextFunction } from 'express';
 import { createMockUserProfile } from '../tests/utils/mockFactories';
 import type { UserProfile } from '../types';
 import { createTestApp } from '../tests/utils/createTestApp';
-import { mockLogger } from '../tests/utils/mockLogger';
 
 vi.mock('../services/db/index.db', () => ({
   adminRepo: {
@@ -45,8 +44,9 @@ import adminRouter from './admin.routes';
 import { adminRepo } from '../services/db/index.db';
 
 // Mock the logger
-vi.mock('../services/logger.server', () => ({
+vi.mock('../services/logger.server', async () => ({
-  logger: mockLogger,
+  // Use async import to avoid hoisting issues with mockLogger
+  logger: (await import('../tests/utils/mockLogger')).mockLogger,
 }));
 
 // Mock the passport middleware

src/routes/admin.system.routes.test.ts

@@ -4,7 +4,6 @@ import supertest from 'supertest';
 import type { Request, Response, NextFunction } from 'express';
 import { createMockUserProfile } from '../tests/utils/mockFactories';
 import { createTestApp } from '../tests/utils/createTestApp';
-import { mockLogger } from '../tests/utils/mockLogger';
 
 // Mock dependencies
 vi.mock('../services/geocodingService.server', () => ({
@@ -50,8 +49,9 @@ import adminRouter from './admin.routes';
 import { geocodingService } from '../services/geocodingService.server';
 
 // Mock the logger
-vi.mock('../services/logger.server', () => ({
+vi.mock('../services/logger.server', async () => ({
-  logger: mockLogger,
+  // Use async import to avoid hoisting issues with mockLogger
+  logger: (await import('../tests/utils/mockLogger')).mockLogger,
 }));
 
 // Mock the passport middleware

src/routes/admin.users.routes.test.ts

@@ -6,7 +6,6 @@ import { createMockUserProfile, createMockAdminUserView } from '../tests/utils/m
 import type { UserProfile, Profile } from '../types';
 import { NotFoundError } from '../services/db/errors.db';
 import { createTestApp } from '../tests/utils/createTestApp';
-import { mockLogger } from '../tests/utils/mockLogger';
 
 vi.mock('../services/db/index.db', () => ({
   adminRepo: {
@@ -44,8 +43,9 @@ vi.mock('@bull-board/express', () => ({
 }));
 
 // Mock the logger
-vi.mock('../services/logger.server', () => ({
+vi.mock('../services/logger.server', async () => ({
-  logger: mockLogger,
+  // Use async import to avoid hoisting issues with mockLogger
+  logger: (await import('../tests/utils/mockLogger')).mockLogger,
 }));
 
 // Import the router AFTER all mocks are defined.

src/routes/ai.routes.test.ts

@@ -55,8 +55,9 @@ import aiRouter from './ai.routes';
 import { flyerQueue } from '../services/queueService.server';
 
 // Mock the logger to keep test output clean
-vi.mock('../services/logger.server', () => ({
+vi.mock('../services/logger.server', async () => ({
-  logger: mockLogger,
+  // Use async import to avoid hoisting issues with mockLogger
+  logger: (await import('../tests/utils/mockLogger')).mockLogger,
 }));
 
 // Mock the passport module to control authentication for different tests.

src/routes/auth.routes.test.ts

@@ -9,7 +9,6 @@ import {
   createMockUserProfile,
   createMockUserWithPasswordHash,
 } from '../tests/utils/mockFactories';
-import { mockLogger } from '../tests/utils/mockLogger';
 
 // --- FIX: Hoist passport mocks to be available for vi.mock ---
 const passportMocks = vi.hoisted(() => {
@@ -111,8 +110,9 @@ vi.mock('../services/db/connection.db', () => ({
 }));
 
 // Mock the logger
-vi.mock('../services/logger.server', () => ({
+vi.mock('../services/logger.server', async () => ({
-  logger: mockLogger,
+  // Use async import to avoid hoisting issues with mockLogger
+  logger: (await import('../tests/utils/mockLogger')).mockLogger,
 }));
 
 // Mock the email service
@@ -144,6 +144,8 @@ import { UniqueConstraintError } from '../services/db/errors.db'; // Import actu
 import express from 'express';
 import { errorHandler } from '../middleware/errorHandler'; // Assuming this exists
 
+const { mockLogger } = await import('../tests/utils/mockLogger');
+
 const app = express();
 app.use(express.json());
 app.use(cookieParser()); // Mount BEFORE router

src/routes/budget.routes.test.ts

@@ -7,7 +7,6 @@ import {
   createMockBudget,
   createMockSpendingByCategory,
 } from '../tests/utils/mockFactories';
-import { mockLogger } from '../tests/utils/mockLogger';
 import { createTestApp } from '../tests/utils/createTestApp';
 import { ForeignKeyConstraintError, NotFoundError } from '../services/db/errors.db';
 // 1. Mock the Service Layer directly.
@@ -26,8 +25,9 @@ vi.mock('../services/db/index.db', () => ({
 }));
 
 // Mock the logger to keep test output clean
-vi.mock('../services/logger.server', () => ({
+vi.mock('../services/logger.server', async () => ({
-  logger: mockLogger,
+  // Use async import to avoid hoisting issues with mockLogger
+  logger: (await import('../tests/utils/mockLogger')).mockLogger,
 }));
 
 // Import the router and mocked DB AFTER all mocks are defined.

src/routes/deals.routes.test.ts

@@ -4,7 +4,6 @@ import supertest from 'supertest';
 import type { Request, Response, NextFunction } from 'express';
 import { createMockUserProfile, createMockWatchedItemDeal } from '../tests/utils/mockFactories';
 import type { WatchedItemDeal } from '../types';
-import { mockLogger } from '../tests/utils/mockLogger';
 import { createTestApp } from '../tests/utils/createTestApp';
 
 // 1. Mock the Service Layer directly.
@@ -17,10 +16,12 @@ vi.mock('../services/db/deals.db', () => ({
 // Import the router and mocked repo AFTER all mocks are defined.
 import dealsRouter from './deals.routes';
 import { dealsRepo } from '../services/db/deals.db';
+import { mockLogger } from '../tests/utils/mockLogger';
 
 // Mock the logger to keep test output clean
-vi.mock('../services/logger.server', () => ({
+vi.mock('../services/logger.server', async () => ({
-  logger: mockLogger,
+  // Use async import to avoid hoisting issues with mockLogger
+  logger: (await import('../tests/utils/mockLogger')).mockLogger,
 }));
 
 // Mock the passport middleware

src/routes/flyer.routes.test.ts

@@ -23,8 +23,9 @@ import * as db from '../services/db/index.db';
 import { mockLogger } from '../tests/utils/mockLogger';
 
 // Mock the logger to keep test output clean
-vi.mock('../services/logger.server', () => ({
+vi.mock('../services/logger.server', async () => ({
-  logger: mockLogger,
+  // Use async import to avoid hoisting issues with mockLogger
+  logger: (await import('../tests/utils/mockLogger')).mockLogger,
 }));
 
 // Define a reusable matcher for the logger object.

src/routes/gamification.routes.test.ts

@@ -27,8 +27,9 @@ import gamificationRouter from './gamification.routes';
 import * as db from '../services/db/index.db';
 
 // Mock the logger to keep test output clean
-vi.mock('../services/logger.server', () => ({
+vi.mock('../services/logger.server', async () => ({
-  logger: mockLogger,
+  // Use async import to avoid hoisting issues with mockLogger
+  logger: (await import('../tests/utils/mockLogger')).mockLogger,
 }));
 
 // Use vi.hoisted to create mutable mock function references.

src/routes/health.routes.test.ts

@@ -32,8 +32,9 @@ import healthRouter from './health.routes';
 import * as dbConnection from '../services/db/connection.db';
 
 // Mock the logger to keep test output clean.
-vi.mock('../services/logger.server', () => ({
+vi.mock('../services/logger.server', async () => ({
-  logger: mockLogger,
+  // Use async import to avoid hoisting issues with mockLogger
+  logger: (await import('../tests/utils/mockLogger')).mockLogger,
 }));
 
 // Cast the mocked import to a Mocked type for type-safe access to mock functions.
@@ -160,10 +161,14 @@ describe('Health Routes (/api/health)', () => {
       const response = await supertest(app).get('/api/health/db-schema');
 
       expect(response.status).toBe(500);
-      expect(response.body.message).toBe('DB connection failed');
+      expect(response.body.message).toBe('DB connection failed'); // This is the message from the original error
-      expect(logger.error).toHaveBeenCalledWith(
+      expect(response.body.stack).toBeDefined();
-        { error: 'DB connection failed' },
+      expect(response.body.errorId).toEqual(expect.any(String));
-        'Error during DB schema check:',
+      expect(mockLogger.error).toHaveBeenCalledWith(
+        expect.objectContaining({
+          err: expect.any(Error),
+        }),
+        expect.stringMatching(/Unhandled API Error \(ID: \w+\)/),
       );
     });
 
@@ -175,10 +180,13 @@ describe('Health Routes (/api/health)', () => {
       const response = await supertest(app).get('/api/health/db-schema');
 
       expect(response.status).toBe(500);
-      expect(response.body.message).toBe('DB connection failed');
+      expect(response.body.message).toBe('DB connection failed'); // This is the message from the original error
-      expect(logger.error).toHaveBeenCalledWith(
+      expect(response.body.errorId).toEqual(expect.any(String));
-        { error: dbError },
+      expect(mockLogger.error).toHaveBeenCalledWith(
-        'Error during DB schema check:',
+        expect.objectContaining({
+          err: expect.objectContaining({ message: 'DB connection failed' }),
+        }),
+        expect.stringMatching(/Unhandled API Error \(ID: \w+\)/),
       );
     });
   });
@@ -208,9 +216,11 @@ describe('Health Routes (/api/health)', () => {
       // Assert
       expect(response.status).toBe(500);
       expect(response.body.message).toContain('Storage check failed.');
-      expect(logger.error).toHaveBeenCalledWith(
+      expect(mockLogger.error).toHaveBeenCalledWith(
-        { error: 'EACCES: permission denied' },
+        expect.objectContaining({
-        expect.stringContaining('Storage check failed for path:'),
+          err: expect.any(Error),
+        }),
+        expect.stringMatching(/Unhandled API Error \(ID: \w+\)/),
       );
     });
 
@@ -225,9 +235,11 @@ describe('Health Routes (/api/health)', () => {
       // Assert
       expect(response.status).toBe(500);
       expect(response.body.message).toContain('Storage check failed.');
-      expect(logger.error).toHaveBeenCalledWith(
+      expect(mockLogger.error).toHaveBeenCalledWith(
-        { error: accessError },
+        expect.objectContaining({
-        expect.stringContaining('Storage check failed for path:'),
+          err: expect.any(Error),
+        }),
+        expect.stringMatching(/Unhandled API Error \(ID: \w+\)/),
       );
     });
   });
@@ -282,10 +294,13 @@ describe('Health Routes (/api/health)', () => {
     const response = await supertest(app).get('/api/health/db-pool');
 
     expect(response.status).toBe(500);
-    expect(response.body.message).toBe('Pool is not initialized');
+    expect(response.body.message).toBe('Pool is not initialized'); // This is the message from the original error
-    expect(logger.error).toHaveBeenCalledWith(
+    expect(response.body.errorId).toEqual(expect.any(String));
-      { error: 'Pool is not initialized' },
+    expect(mockLogger.error).toHaveBeenCalledWith(
-      'Error during DB pool health check:',
+      expect.objectContaining({
+        err: expect.any(Error),
+      }),
+      expect.stringMatching(/Unhandled API Error \(ID: \w+\)/),
     );
   });
 
@@ -299,10 +314,51 @@ describe('Health Routes (/api/health)', () => {
     const response = await supertest(app).get('/api/health/db-pool');
 
     expect(response.status).toBe(500);
-    expect(response.body.message).toBe('Pool is not initialized');
+    expect(response.body.message).toBe('Pool is not initialized'); // This is the message from the original error
-    expect(logger.error).toHaveBeenCalledWith(
+    expect(response.body.stack).toBeDefined();
-      { error: poolError },
+    expect(response.body.errorId).toEqual(expect.any(String));
-      'Error during DB pool health check:',
+    expect(mockLogger.error).toHaveBeenCalledWith(
+      expect.objectContaining({
+        err: expect.objectContaining({ message: 'Pool is not initialized' }),
+      }),
+      expect.stringMatching(/Unhandled API Error \(ID: \w+\)/),
     );
   });
+
+  describe('GET /redis', () => {
+    it('should return 500 if Redis ping fails', async () => {
+      const redisError = new Error('Connection timed out');
+      mockedRedisConnection.ping.mockRejectedValue(redisError);
+
+      const response = await supertest(app).get('/api/health/redis');
+
+      expect(response.status).toBe(500);
+      expect(response.body.message).toBe('Connection timed out');
+      expect(response.body.stack).toBeDefined();
+      expect(response.body.errorId).toEqual(expect.any(String));
+      expect(mockLogger.error).toHaveBeenCalledWith(
+        expect.objectContaining({
+          err: expect.any(Error),
+        }),
+        expect.stringMatching(/Unhandled API Error \(ID: \w+\)/),
+      );
+    });
+
+    it('should return 500 if Redis ping returns an unexpected response', async () => {
+      mockedRedisConnection.ping.mockResolvedValue('OK'); // Not 'PONG'
+
+      const response = await supertest(app).get('/api/health/redis');
+
+      expect(response.status).toBe(500);
+      expect(response.body.message).toContain('Unexpected Redis ping response: OK');
+      expect(response.body.stack).toBeDefined();
+      expect(response.body.errorId).toEqual(expect.any(String));
+      expect(mockLogger.error).toHaveBeenCalledWith(
+        expect.objectContaining({
+          err: expect.any(Error),
+        }),
+        expect.stringMatching(/Unhandled API Error \(ID: \w+\)/),
+      );
+    });
+  });
 });

src/routes/health.routes.ts

@@ -39,7 +39,6 @@ router.get('/db-schema', validateRequest(emptySchema), async (req, res, next: Ne
     }
     return res.status(200).json({ success: true, message: 'All required database tables exist.' });
   } catch (error: unknown) {
-    logger.error({ error }, 'Error during DB schema check:');
     next(error);
   }
 });
@@ -59,10 +58,6 @@ router.get('/storage', validateRequest(emptySchema), async (req, res, next: Next
         message: `Storage directory '${storagePath}' is accessible and writable.`,
       });
   } catch (error: unknown) {
-    logger.error(
-      { error: error instanceof Error ? error.message : error },
-      `Storage check failed for path: ${storagePath}`,
-    );
     next(
       new Error(
         `Storage check failed. Ensure the directory '${storagePath}' exists and is writable by the application.`,
@@ -93,10 +88,6 @@ router.get(
           .json({ success: false, message: `Pool may be under stress. ${message}` });
       }
     } catch (error: unknown) {
-      logger.error(
-        { error: error instanceof Error ? error.message : error },
-        'Error during DB pool health check:',
-      );
       next(error);
     }
   },
@@ -130,7 +121,6 @@ router.get(
       }
       throw new Error(`Unexpected Redis ping response: ${reply}`); // This will be caught below
     } catch (error: unknown) {
-      logger.error({ error }, 'Error checking Redis health');
       next(error);
     }
   },

src/routes/passport.routes.test.ts

@@ -56,7 +56,6 @@ import {
   createMockUserProfile,
   createMockUserWithPasswordHash,
 } from '../tests/utils/mockFactories';
-import { mockLogger } from '../tests/utils/mockLogger';
 
 // Mock dependencies before importing the passport configuration
 vi.mock('../services/db/index.db', () => ({
@@ -74,9 +73,10 @@ vi.mock('../services/db/index.db', () => ({
 
 const mockedDb = db as Mocked<typeof db>;
 
-vi.mock('../services/logger.server', () => ({
+vi.mock('../services/logger.server', async () => ({
-  // This mock is used by the module under test and can be imported in the test file.
+  // Use async import to avoid hoisting issues with mockLogger
-  logger: mockLogger,
+  // Note: We need to await the import inside the factory
+  logger: (await import('../tests/utils/mockLogger')).mockLogger,
 }));
 
 // Mock bcrypt for password comparisons

src/routes/personalization.routes.test.ts

@@ -6,7 +6,6 @@ import {
   createMockDietaryRestriction,
   createMockAppliance,
 } from '../tests/utils/mockFactories';
-import { mockLogger } from '../tests/utils/mockLogger';
 import { createTestApp } from '../tests/utils/createTestApp';
 
 // 1. Mock the Service Layer directly.
@@ -21,10 +20,12 @@ vi.mock('../services/db/index.db', () => ({
 // Import the router and mocked DB AFTER all mocks are defined.
 import personalizationRouter from './personalization.routes';
 import * as db from '../services/db/index.db';
+import { mockLogger } from '../tests/utils/mockLogger';
 
 // Mock the logger to keep test output clean
-vi.mock('../services/logger.server', () => ({
+vi.mock('../services/logger.server', async () => ({
-  logger: mockLogger,
+  // Use async import to avoid hoisting issues with mockLogger
+  logger: (await import('../tests/utils/mockLogger')).mockLogger,
 }));
 
 describe('Personalization Routes (/api/personalization)', () => {

src/routes/price.routes.test.ts

@@ -12,8 +12,9 @@ vi.mock('../services/db/price.db', () => ({
 }));
 
 // Mock the logger to keep test output clean
-vi.mock('../services/logger.server', () => ({
+vi.mock('../services/logger.server', async () => ({
-  logger: mockLogger,
+  // Use async import to avoid hoisting issues with mockLogger
+  logger: (await import('../tests/utils/mockLogger')).mockLogger,
 }));
 
 // Import the router AFTER other setup.

src/routes/recipe.routes.test.ts

@@ -1,7 +1,6 @@
 // src/routes/recipe.routes.test.ts
 import { describe, it, expect, vi, beforeEach } from 'vitest';
 import supertest from 'supertest';
-import { mockLogger } from '../tests/utils/mockLogger';
 import { createMockRecipe, createMockRecipeComment } from '../tests/utils/mockFactories';
 import { NotFoundError } from '../services/db/errors.db';
 import { createTestApp } from '../tests/utils/createTestApp';
@@ -20,10 +19,12 @@ vi.mock('../services/db/index.db', () => ({
 // Import the router and mocked DB AFTER all mocks are defined.
 import recipeRouter from './recipe.routes';
 import * as db from '../services/db/index.db';
+import { mockLogger } from '../tests/utils/mockLogger';
 
 // Mock the logger to keep test output clean
-vi.mock('../services/logger.server', () => ({
+vi.mock('../services/logger.server', async () => ({
-  logger: mockLogger,
+  // Use async import to avoid hoisting issues with mockLogger
+  logger: (await import('../tests/utils/mockLogger')).mockLogger,
 }));
 
 // Import the mocked db module to control its functions in tests

src/routes/stats.routes.test.ts

@@ -1,7 +1,6 @@
 // src/routes/stats.routes.test.ts
 import { describe, it, expect, vi, beforeEach } from 'vitest';
 import supertest from 'supertest';
-import { mockLogger } from '../tests/utils/mockLogger';
 import { createTestApp } from '../tests/utils/createTestApp';
 
 // 1. Mock the Service Layer directly.
@@ -14,10 +13,12 @@ vi.mock('../services/db/index.db', () => ({
 // Import the router and mocked DB AFTER all mocks are defined.
 import statsRouter from './stats.routes';
 import * as db from '../services/db/index.db';
+import { mockLogger } from '../tests/utils/mockLogger';
 
 // Mock the logger to keep test output clean
-vi.mock('../services/logger.server', () => ({
+vi.mock('../services/logger.server', async () => ({
-  logger: mockLogger,
+  // Use async import to avoid hoisting issues with mockLogger
+  logger: (await import('../tests/utils/mockLogger')).mockLogger,
 }));
 
 const expectLogger = expect.objectContaining({

src/routes/user.routes.test.ts

@@ -86,8 +86,9 @@ vi.mock('bcrypt', () => {
 });
 
 // Mock the logger
-vi.mock('../services/logger.server', () => ({
+vi.mock('../services/logger.server', async () => ({
-  logger: mockLogger,
+  // Use async import to avoid hoisting issues with mockLogger
+  logger: (await import('../tests/utils/mockLogger')).mockLogger,
 }));
 
 // Import the router and other modules AFTER mocks are established
@@ -147,8 +148,8 @@ describe('User Routes (/api/users)', () => {
 
       // Assert
       expect(logger.error).toHaveBeenCalledWith(
-        'Failed to create avatar upload directory:',
+        { err: mkdirError },
-        mkdirError,
+        'Failed to create avatar upload directory',
       );
       vi.doUnmock('node:fs/promises'); // Clean up
     });

src/services/db/price.db.test.ts

@@ -0,0 +1,96 @@
+// src/services/db/price.db.test.ts
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { mockPoolInstance } from '../../tests/setup/tests-setup-unit';
+import { getPool } from './connection.db';
+import { priceRepo } from './price.db';
+import type { PriceHistoryData } from '../../types';
+
+// Un-mock the module we are testing to ensure we use the real implementation.
+vi.unmock('./price.db');
+
+// Mock dependencies
+vi.mock('./connection.db', () => ({
+  getPool: vi.fn(),
+}));
+
+vi.mock('../logger.server', () => ({
+  logger: {
+    info: vi.fn(),
+    warn: vi.fn(),
+    error: vi.fn(),
+    debug: vi.fn(),
+  },
+}));
+
+import { logger as mockLogger } from '../logger.server';
+
+describe('Price DB Service', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+    // Make getPool return our mock instance for each test
+    vi.mocked(getPool).mockReturnValue(mockPoolInstance as any);
+  });
+
+  describe('getPriceHistory', () => {
+    it('should return an empty array if masterItemIds is empty and not query the db', async () => {
+      const result = await priceRepo.getPriceHistory([], mockLogger);
+      expect(result).toEqual([]);
+      expect(mockPoolInstance.query).not.toHaveBeenCalled();
+    });
+
+    it('should execute the correct query with default limit and offset', async () => {
+      mockPoolInstance.query.mockResolvedValue({ rows: [] });
+      await priceRepo.getPriceHistory([1, 2], mockLogger);
+      expect(mockPoolInstance.query).toHaveBeenCalledWith(
+        expect.stringContaining('LIMIT $2 OFFSET $3'),
+        [[1, 2], 1000, 0],
+      );
+    });
+
+    it('should execute the correct query with provided limit and offset', async () => {
+      mockPoolInstance.query.mockResolvedValue({ rows: [] });
+      await priceRepo.getPriceHistory([1, 2], mockLogger, 50, 10);
+      expect(mockPoolInstance.query).toHaveBeenCalledWith(
+        expect.stringContaining('LIMIT $2 OFFSET $3'),
+        [[1, 2], 50, 10],
+      );
+    });
+
+    it('should return price history data on success', async () => {
+      const mockHistory: PriceHistoryData[] = [
+        { master_item_id: 1, price_in_cents: 199, date: '2024-01-01' },
+        { master_item_id: 1, price_in_cents: 209, date: '2024-01-08' },
+      ];
+      mockPoolInstance.query.mockResolvedValue({ rows: mockHistory });
+
+      const result = await priceRepo.getPriceHistory([1], mockLogger);
+      expect(result).toEqual(mockHistory);
+    });
+
+    it('should log the result count on success', async () => {
+      const mockHistory: PriceHistoryData[] = [
+        { master_item_id: 1, price_in_cents: 199, date: '2024-01-01' },
+      ];
+      mockPoolInstance.query.mockResolvedValue({ rows: mockHistory });
+
+      await priceRepo.getPriceHistory([1], mockLogger, 50, 10);
+      expect(mockLogger.debug).toHaveBeenCalledWith(
+        { count: 1, itemIds: 1, limit: 50, offset: 10 },
+        'Fetched price history from database.',
+      );
+    });
+
+    it('should throw a generic error if the database query fails', async () => {
+      const dbError = new Error('DB Connection Error');
+      mockPoolInstance.query.mockRejectedValue(dbError);
+
+      await expect(priceRepo.getPriceHistory([1], mockLogger, 50, 10)).rejects.toThrow(
+        'Failed to retrieve price history.',
+      );
+      expect(mockLogger.error).toHaveBeenCalledWith(
+        { err: dbError, masterItemIds: [1], limit: 50, offset: 10 },
+        'Database error in getPriceHistory',
+      );
+    });
+  });
+});

src/services/db/price.db.ts

@@ -43,11 +43,19 @@ export const priceRepo = {
       LIMIT $2 OFFSET $3;
     `;
 
-    const result = await getPool().query(query, [masterItemIds, limit, offset]);
+    try {
-    logger.debug(
+      const result = await getPool().query(query, [masterItemIds, limit, offset]);
-      { count: result.rows.length, itemIds: masterItemIds.length, limit, offset },
+      logger.debug(
-      'Fetched price history from database.',
+        { count: result.rows.length, itemIds: masterItemIds.length, limit, offset },
-    );
+        'Fetched price history from database.',
-    return result.rows;
+      );
+      return result.rows;
+    } catch (error) {
+      logger.error(
+        { err: error, masterItemIds, limit, offset },
+        'Database error in getPriceHistory',
+      );
+      throw new Error('Failed to retrieve price history.');
+    }
   },
 };

src/services/eventBus.test.ts

@@ -0,0 +1,84 @@
+// src/services/eventBus.test.ts
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { EventBus } from './eventBus';
+
+describe('EventBus', () => {
+  let eventBus: EventBus;
+
+  beforeEach(() => {
+    // Create a new instance for each test to ensure isolation
+    eventBus = new EventBus();
+  });
+
+  it('should call a listener when an event is dispatched', () => {
+    const callback = vi.fn();
+    eventBus.on('test-event', callback);
+    eventBus.dispatch('test-event');
+    expect(callback).toHaveBeenCalledTimes(1);
+  });
+
+  it('should pass data to the listener when dispatched', () => {
+    const callback = vi.fn();
+    const data = { message: 'hello' };
+    eventBus.on('data-event', callback);
+    eventBus.dispatch('data-event', data);
+    expect(callback).toHaveBeenCalledWith(data);
+  });
+
+  it('should call multiple listeners for the same event', () => {
+    const callback1 = vi.fn();
+    const callback2 = vi.fn();
+    eventBus.on('multi-event', callback1);
+    eventBus.on('multi-event', callback2);
+    eventBus.dispatch('multi-event');
+    expect(callback1).toHaveBeenCalledTimes(1);
+    expect(callback2).toHaveBeenCalledTimes(1);
+  });
+
+  it('should stop calling a listener after it has been removed', () => {
+    const callback = vi.fn();
+    eventBus.on('remove-event', callback);
+    eventBus.dispatch('remove-event');
+    expect(callback).toHaveBeenCalledTimes(1);
+
+    eventBus.off('remove-event', callback);
+    eventBus.dispatch('remove-event');
+    // The callback should still have been called only once from the first dispatch
+    expect(callback).toHaveBeenCalledTimes(1);
+  });
+
+  it('should not throw an error when dispatching an event with no listeners', () => {
+    expect(() => eventBus.dispatch('no-listener-event')).not.toThrow();
+  });
+
+  it('should not throw an error when removing a listener that does not exist for an event', () => {
+    const existentCallback = vi.fn();
+    const nonExistentCallback = () => {};
+    eventBus.on('some-event', existentCallback);
+    expect(() => eventBus.off('some-event', nonExistentCallback)).not.toThrow();
+  });
+
+  it('should not throw an error when removing a listener from an event that has no listeners', () => {
+    const callback = vi.fn();
+    expect(() => eventBus.off('non-existent-event', callback)).not.toThrow();
+  });
+
+  it('should handle removing one of multiple listeners correctly', () => {
+    const callback1 = vi.fn();
+    const callback2 = vi.fn();
+    eventBus.on('multi-remove-event', callback1);
+    eventBus.on('multi-remove-event', callback2);
+
+    eventBus.dispatch('multi-remove-event');
+    expect(callback1).toHaveBeenCalledTimes(1);
+    expect(callback2).toHaveBeenCalledTimes(1);
+
+    eventBus.off('multi-remove-event', callback1);
+    eventBus.dispatch('multi-remove-event');
+
+    // callback1 should not be called again
+    expect(callback1).toHaveBeenCalledTimes(1);
+    // callback2 should be called again
+    expect(callback2).toHaveBeenCalledTimes(2);
+  });
+});

src/services/eventBus.ts

@@ -7,7 +7,7 @@
 
 type EventCallback = (data?: any) => void;
 
-class EventBus {
+export class EventBus {
   private listeners: { [key: string]: EventCallback[] } = {};
 
   on(event: string, callback: EventCallback): void {

src/services/queueService.test.ts

@@ -0,0 +1,118 @@
+// src/services/queueService.test.ts
+import { describe, it, expect, vi, beforeEach, afterEach, type Mock } from 'vitest';
+
+// --- Hoisted Mocks ---
+const mocks = vi.hoisted(() => {
+  const createMockQueue = (name: string) => ({
+    name,
+    close: vi.fn().mockResolvedValue(undefined),
+    add: vi.fn(),
+  });
+
+  return {
+    flyerQueue: createMockQueue('flyer-processing'),
+    emailQueue: createMockQueue('email-sending'),
+    analyticsQueue: createMockQueue('analytics-reporting'),
+    weeklyAnalyticsQueue: createMockQueue('weekly-analytics-reporting'),
+    cleanupQueue: createMockQueue('file-cleanup'),
+    tokenCleanupQueue: createMockQueue('token-cleanup'),
+    redisConnection: {
+      quit: vi.fn().mockResolvedValue('OK'),
+    },
+    logger: {
+      info: vi.fn(),
+      warn: vi.fn(),
+      error: vi.fn(),
+      debug: vi.fn(),
+    },
+  };
+});
+
+// --- Mock Modules ---
+vi.mock('./queues.server', () => ({
+  flyerQueue: mocks.flyerQueue,
+  emailQueue: mocks.emailQueue,
+  analyticsQueue: mocks.analyticsQueue,
+  weeklyAnalyticsQueue: mocks.weeklyAnalyticsQueue,
+  cleanupQueue: mocks.cleanupQueue,
+  tokenCleanupQueue: mocks.tokenCleanupQueue,
+}));
+
+vi.mock('./redis.server', () => ({
+  connection: mocks.redisConnection,
+}));
+
+vi.mock('./logger.server', () => ({
+  logger: mocks.logger,
+}));
+
+// --- Test ---
+describe('Queue Service (API Shutdown)', () => {
+  let gracefulShutdown: (signal: string) => Promise<void>;
+  let processExitSpy: Mock;
+
+  beforeEach(async () => {
+    vi.clearAllMocks();
+    vi.resetModules();
+
+    // Spy on process.exit and prevent it from actually exiting
+    processExitSpy = vi.spyOn(process, 'exit').mockImplementation(() => undefined as never);
+
+    // Dynamically import the module under test
+    const queueService = await import('./queueService.server');
+    gracefulShutdown = queueService.gracefulShutdown;
+  });
+
+  afterEach(() => {
+    processExitSpy.mockRestore();
+  });
+
+  it('should attempt to close all queues and the redis connection on shutdown', async () => {
+    await gracefulShutdown('SIGINT');
+
+    expect(mocks.flyerQueue.close).toHaveBeenCalledTimes(1);
+    expect(mocks.emailQueue.close).toHaveBeenCalledTimes(1);
+    expect(mocks.analyticsQueue.close).toHaveBeenCalledTimes(1);
+    expect(mocks.cleanupQueue.close).toHaveBeenCalledTimes(1);
+    expect(mocks.weeklyAnalyticsQueue.close).toHaveBeenCalledTimes(1);
+    expect(mocks.tokenCleanupQueue.close).toHaveBeenCalledTimes(1);
+    expect(mocks.redisConnection.quit).toHaveBeenCalledTimes(1);
+  });
+
+  it('should log success and exit with code 0 if all resources close successfully', async () => {
+    await gracefulShutdown('SIGINT');
+
+    expect(mocks.logger.info).toHaveBeenCalledWith(
+      '[Shutdown] All queues and connections closed successfully.',
+    );
+    expect(processExitSpy).toHaveBeenCalledWith(0);
+  });
+
+  it('should log a warning and exit with code 1 if a queue fails to close', async () => {
+    const closeError = new Error('Queue failed to close');
+    mocks.emailQueue.close.mockRejectedValue(closeError);
+
+    await gracefulShutdown('SIGTERM');
+
+    expect(mocks.logger.error).toHaveBeenCalledWith(
+      { err: closeError, resource: 'emailQueue' },
+      '[Shutdown] Error closing resource.',
+    );
+    expect(mocks.logger.warn).toHaveBeenCalledWith('[Shutdown] Graceful shutdown completed with errors.');
+    expect(processExitSpy).toHaveBeenCalledWith(1);
+  });
+
+  it('should log a warning and exit with code 1 if the redis connection fails to close', async () => {
+    const redisError = new Error('Redis quit failed');
+    mocks.redisConnection.quit.mockRejectedValue(redisError);
+
+    await gracefulShutdown('SIGTERM');
+
+    expect(mocks.logger.error).toHaveBeenCalledWith(
+      { err: redisError, resource: 'redisConnection' },
+      '[Shutdown] Error closing resource.',
+    );
+    expect(mocks.logger.warn).toHaveBeenCalledWith('[Shutdown] Graceful shutdown completed with errors.');
+    expect(processExitSpy).toHaveBeenCalledWith(1);
+  });
+});

src/services/queueService.workers.test.ts

@@ -86,20 +86,6 @@ vi.mock('./flyerDataTransformer', () => ({
   },
 }));
 
-// Import the module under test AFTER the mocks are set up.
-// This will trigger the instantiation of the workers.
-import './queueService.server';
-
-// Destructure the captured processors for easier use in tests.
-const {
-  'flyer-processing': flyerProcessor,
-  'email-sending': emailProcessor,
-  'analytics-reporting': analyticsProcessor,
-  'file-cleanup': cleanupProcessor,
-  'weekly-analytics-reporting': weeklyAnalyticsProcessor,
-  'token-cleanup': tokenCleanupProcessor,
-} = mocks.capturedProcessors;
-
 // Helper to create a mock BullMQ Job object
 const createMockJob = <T>(data: T): Job<T> => {
   return {
@@ -116,14 +102,32 @@ const createMockJob = <T>(data: T): Job<T> => {
 };
 
 describe('Queue Workers', () => {
-  beforeEach(() => {
+  let flyerProcessor: (job: Job) => Promise<unknown>;
+  let emailProcessor: (job: Job) => Promise<unknown>;
+  let analyticsProcessor: (job: Job) => Promise<unknown>;
+  let cleanupProcessor: (job: Job) => Promise<unknown>;
+  let weeklyAnalyticsProcessor: (job: Job) => Promise<unknown>;
+  let tokenCleanupProcessor: (job: Job) => Promise<unknown>;
+
+  beforeEach(async () => {
     vi.clearAllMocks();
+    vi.resetModules();
+
     // Reset default mock implementations for hoisted mocks
     mocks.sendEmail.mockResolvedValue(undefined);
     mocks.unlink.mockResolvedValue(undefined);
     mocks.processFlyerJob.mockResolvedValue({ flyerId: 123 }); // Default success for flyer processing
+    mocks.deleteExpiredResetTokens.mockResolvedValue(5);
+
+    await import('./workers.server');
+
+    flyerProcessor = mocks.capturedProcessors['flyer-processing'];
+    emailProcessor = mocks.capturedProcessors['email-sending'];
+    analyticsProcessor = mocks.capturedProcessors['analytics-reporting'];
+    cleanupProcessor = mocks.capturedProcessors['file-cleanup'];
+    weeklyAnalyticsProcessor = mocks.capturedProcessors['weekly-analytics-reporting'];
+    tokenCleanupProcessor = mocks.capturedProcessors['token-cleanup'];
   });
-  mocks.deleteExpiredResetTokens.mockResolvedValue(5);
 
   describe('flyerWorker', () => {
     it('should call flyerProcessingService.processJob with the job data', async () => {

src/services/queues.server.test.ts

@@ -0,0 +1,119 @@
+// src/services/queues.server.test.ts
+import { describe, it, expect, vi, beforeEach, type Mock } from 'vitest';
+
+// --- Hoisted Mocks ---
+const mocks = vi.hoisted(() => {
+  return {
+    // This will be our mock for the BullMQ Queue constructor
+    MockQueue: vi.fn(),
+    // This is a mock for the Redis connection object
+    mockConnection: { id: 'mock-redis-connection' },
+  };
+});
+
+// --- Mock Modules ---
+
+// Mock the 'bullmq' library to replace the real Queue constructor with our mock.
+vi.mock('bullmq', () => ({
+  Queue: mocks.MockQueue,
+}));
+
+// Mock our internal redis connection module to export our mock connection object.
+vi.mock('./redis.server', () => ({
+  connection: mocks.mockConnection,
+}));
+
+describe('Queue Definitions', () => {
+  beforeEach(async () => {
+    // Clear any previous mock calls and reset module cache before each test.
+    // This is crucial because the queues are instantiated at the module level.
+    // Resetting modules ensures the `queues.server.ts` file is re-executed.
+    vi.clearAllMocks();
+    vi.resetModules();
+
+    // Dynamically import the module under test. This will trigger the
+    // `new Queue(...)` calls, which will be captured by our mock constructor.
+    await import('./queues.server');
+  });
+
+  it('should create flyerQueue with the correct name and options', () => {
+    expect(mocks.MockQueue).toHaveBeenCalledWith('flyer-processing', {
+      connection: mocks.mockConnection,
+      defaultJobOptions: {
+        attempts: 3,
+        backoff: {
+          type: 'exponential',
+          delay: 5000,
+        },
+      },
+    });
+  });
+
+  it('should create emailQueue with the correct name and options', () => {
+    expect(mocks.MockQueue).toHaveBeenCalledWith('email-sending', {
+      connection: mocks.mockConnection,
+      defaultJobOptions: {
+        attempts: 5,
+        backoff: {
+          type: 'exponential',
+          delay: 10000,
+        },
+      },
+    });
+  });
+
+  it('should create analyticsQueue with the correct name and options', () => {
+    expect(mocks.MockQueue).toHaveBeenCalledWith('analytics-reporting', {
+      connection: mocks.mockConnection,
+      defaultJobOptions: {
+        attempts: 2,
+        backoff: {
+          type: 'exponential',
+          delay: 60000,
+        },
+        removeOnComplete: true,
+        removeOnFail: 50,
+      },
+    });
+  });
+
+  it('should create weeklyAnalyticsQueue with the correct name and options', () => {
+    expect(mocks.MockQueue).toHaveBeenCalledWith('weekly-analytics-reporting', {
+      connection: mocks.mockConnection,
+      defaultJobOptions: {
+        attempts: 2,
+        backoff: { type: 'exponential', delay: 3600000 },
+        removeOnComplete: true,
+        removeOnFail: 50,
+      },
+    });
+  });
+
+  it('should create cleanupQueue with the correct name and options', () => {
+    expect(mocks.MockQueue).toHaveBeenCalledWith('file-cleanup', {
+      connection: mocks.mockConnection,
+      defaultJobOptions: {
+        attempts: 3,
+        backoff: { type: 'exponential', delay: 30000 },
+        removeOnComplete: true,
+      },
+    });
+  });
+
+  it('should create tokenCleanupQueue with the correct name and options', () => {
+    expect(mocks.MockQueue).toHaveBeenCalledWith('token-cleanup', {
+      connection: mocks.mockConnection,
+      defaultJobOptions: {
+        attempts: 2,
+        backoff: { type: 'exponential', delay: 3600000 },
+        removeOnComplete: true,
+        removeOnFail: 10,
+      },
+    });
+  });
+
+  it('should create exactly 6 queues', () => {
+    // This is a good sanity check to ensure no new queues were added without tests.
+    expect(mocks.MockQueue).toHaveBeenCalledTimes(6);
+  });
+});

src/services/worker.test.ts

@@ -0,0 +1,172 @@
+// src/services/worker.test.ts
+import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
+
+// --- Hoisted Mocks ---
+const mocks = vi.hoisted(() => {
+  return {
+    gracefulShutdown: vi.fn(),
+    logger: {
+      info: vi.fn(),
+      error: vi.fn(),
+      warn: vi.fn(),
+      debug: vi.fn(),
+    },
+    // Mock process events
+    processOn: vi.fn(),
+    processExit: vi.fn(),
+  };
+});
+
+// --- Mock Modules ---
+vi.mock('./workers.server', () => ({
+  gracefulShutdown: mocks.gracefulShutdown,
+}));
+
+vi.mock('./logger.server', () => ({
+  logger: mocks.logger,
+}));
+
+describe('Worker Entry Point', () => {
+  let originalProcessOn: typeof process.on;
+  let originalProcessExit: typeof process.exit;
+  let eventHandlers: Record<string, (...args: any[]) => void> = {};
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+    vi.resetModules(); // This is key to re-run the top-level code in worker.ts
+
+    // Reset default mock implementations
+    mocks.gracefulShutdown.mockResolvedValue(undefined);
+
+    // Spy on and mock process methods
+    originalProcessOn = process.on;
+    originalProcessExit = process.exit;
+
+    // Capture event handlers registered with process.on
+    eventHandlers = {};
+    process.on = vi.fn((event, listener) => {
+      eventHandlers[event] = listener;
+      return process;
+    }) as any;
+
+    process.exit = mocks.processExit as any;
+  });
+
+  afterEach(() => {
+    // Restore original process methods
+    process.on = originalProcessOn;
+    process.exit = originalProcessExit;
+  });
+
+  it('should log initialization messages on import', async () => {
+    // Act: Import the module to trigger top-level code
+    await import('./worker');
+
+    // Assert
+    expect(mocks.logger.info).toHaveBeenCalledWith('[Worker] Initializing worker process...');
+    expect(mocks.logger.info).toHaveBeenCalledWith(
+      '[Worker] Worker process is running and listening for jobs.',
+    );
+  });
+
+  it('should register handlers for SIGINT, SIGTERM, uncaughtException, and unhandledRejection', async () => {
+    // Act
+    await import('./worker');
+
+    // Assert
+    expect(process.on).toHaveBeenCalledWith('SIGINT', expect.any(Function));
+    expect(process.on).toHaveBeenCalledWith('SIGTERM', expect.any(Function));
+    expect(process.on).toHaveBeenCalledWith('uncaughtException', expect.any(Function));
+    expect(process.on).toHaveBeenCalledWith('unhandledRejection', expect.any(Function));
+  });
+
+  describe('Shutdown Handling', () => {
+    it('should call gracefulShutdown on SIGINT', async () => {
+      // Arrange
+      await import('./worker');
+      const sigintHandler = eventHandlers['SIGINT'];
+      expect(sigintHandler).toBeDefined();
+
+      // Act
+      sigintHandler();
+
+      // Assert
+      expect(mocks.logger.info).toHaveBeenCalledWith(
+        '[Worker] Received SIGINT. Initiating graceful shutdown...',
+      );
+      expect(mocks.gracefulShutdown).toHaveBeenCalledWith('SIGINT');
+    });
+
+    it('should call gracefulShutdown on SIGTERM', async () => {
+      // Arrange
+      await import('./worker');
+      const sigtermHandler = eventHandlers['SIGTERM'];
+      expect(sigtermHandler).toBeDefined();
+
+      // Act
+      sigtermHandler();
+
+      // Assert
+      expect(mocks.logger.info).toHaveBeenCalledWith(
+        '[Worker] Received SIGTERM. Initiating graceful shutdown...',
+      );
+      expect(mocks.gracefulShutdown).toHaveBeenCalledWith('SIGTERM');
+    });
+
+    it('should log an error and exit if gracefulShutdown rejects', async () => {
+      // Arrange
+      const shutdownError = new Error('Shutdown failed');
+      mocks.gracefulShutdown.mockRejectedValue(shutdownError);
+      await import('./worker');
+      const sigintHandler = eventHandlers['SIGINT'];
+
+      // Act
+      // The handler catches the rejection, so we don't need to wrap this in expect().rejects
+      await sigintHandler();
+
+      // Assert
+      expect(mocks.logger.error).toHaveBeenCalledWith(
+        { err: shutdownError },
+        '[Worker] Error during shutdown.',
+      );
+      expect(mocks.processExit).toHaveBeenCalledWith(1);
+    });
+  });
+
+  describe('Error Handling', () => {
+    it('should log uncaught exceptions', async () => {
+      // Arrange
+      await import('./worker');
+      const exceptionHandler = eventHandlers['uncaughtException'];
+      expect(exceptionHandler).toBeDefined();
+      const testError = new Error('Test uncaught exception');
+
+      // Act
+      exceptionHandler(testError);
+
+      // Assert
+      expect(mocks.logger.error).toHaveBeenCalledWith(
+        { err: testError },
+        '[Worker] Uncaught exception',
+      );
+    });
+
+    it('should log unhandled promise rejections', async () => {
+      // Arrange
+      await import('./worker');
+      const rejectionHandler = eventHandlers['unhandledRejection'];
+      expect(rejectionHandler).toBeDefined();
+      const testReason = 'Promise rejected';
+      const testPromise = Promise.reject(testReason);
+
+      // Act
+      rejectionHandler(testReason, testPromise);
+
+      // Assert
+      expect(mocks.logger.error).toHaveBeenCalledWith(
+        { reason: testReason, promise: testPromise },
+        '[Worker] Unhandled Rejection',
+      );
+    });
+  });
+});

src/services/worker.ts

@@ -1,3 +1,4 @@
+// src/services/worker.ts
 import { gracefulShutdown } from './workers.server';
 import { logger } from './logger.server';