ci: Bump version to 0.9.34 [skip ci]

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "flyer-crawler",
-  "version": "0.9.30",
+  "version": "0.9.34",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "flyer-crawler",
-      "version": "0.9.30",
+      "version": "0.9.34",
       "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.9.30",
+  "version": "0.9.34",
   "type": "module",
   "scripts": {
     "dev": "concurrently \"npm:start:dev\" \"vite\"",

src/routes/ai.routes.ts

@@ -28,6 +28,7 @@ const uploadAndProcessSchema = z.object({
         .length(64, 'Checksum must be 64 characters long.')
         .regex(/^[a-f0-9]+$/, 'Checksum must be a valid hexadecimal string.'),
     ),
+    baseUrl: z.string().url().optional(),
   }),
 });
 
@@ -144,26 +145,6 @@ const searchWebSchema = z.object({
 
 const uploadToDisk = createUploadMiddleware({ storageType: 'flyer' });
 
-// --- Rate Limiting Configuration ---
-
-const aiUploadLimiter = rateLimit({
-  windowMs: 15 * 60 * 1000, // 15 minutes
-  max: 10,
-  message: 'Too many file uploads from this IP, please try again after 15 minutes.',
-  standardHeaders: true,
-  legacyHeaders: false,
-  skip: shouldSkipRateLimit,
-});
-
-const aiGenerationLimiter = rateLimit({
-  windowMs: 15 * 60 * 1000, // 15 minutes
-  max: 20,
-  message: 'Too many AI generation requests from this IP, please try again after 15 minutes.',
-  standardHeaders: true,
-  legacyHeaders: false,
-  skip: shouldSkipRateLimit,
-});
-
 // Diagnostic middleware: log incoming AI route requests (headers and sizes)
 router.use((req: Request, res: Response, next: NextFunction) => {
   try {
@@ -218,6 +199,7 @@ router.post(
         userProfile,
         req.ip ?? 'unknown',
         req.log,
+        body.baseUrl,
       );
 
       // Respond immediately to the client with 202 Accepted

src/routes/deals.routes.test.ts

@@ -113,8 +113,8 @@ describe('Deals Routes (/api/users/deals)', () => {
         .set('X-Test-Rate-Limit-Enable', 'true');
 
       expect(response.status).toBe(200);
-      expect(response.headers).toHaveProperty('x-ratelimit-limit');
-      expect(parseInt(response.headers['x-ratelimit-limit'])).toBe(100);
+      expect(response.headers).toHaveProperty('ratelimit-limit');
+      expect(parseInt(response.headers['ratelimit-limit'])).toBe(100);
     });
   });
 });

src/routes/flyer.routes.test.ts

@@ -319,8 +319,8 @@ describe('Flyer Routes (/api/flyers)', () => {
         .set('X-Test-Rate-Limit-Enable', 'true');
       
       expect(response.status).toBe(200);
-      expect(response.headers).toHaveProperty('x-ratelimit-limit');
-      expect(parseInt(response.headers['x-ratelimit-limit'])).toBe(100);
+      expect(response.headers).toHaveProperty('ratelimit-limit');
+      expect(parseInt(response.headers['ratelimit-limit'])).toBe(100);
     });
 
     it('should apply batchLimiter to POST /items/batch-fetch', async () => {
@@ -331,8 +331,8 @@ describe('Flyer Routes (/api/flyers)', () => {
         .send({ flyerIds: [1] });
 
       expect(response.status).toBe(200);
-      expect(response.headers).toHaveProperty('x-ratelimit-limit');
-      expect(parseInt(response.headers['x-ratelimit-limit'])).toBe(50);
+      expect(response.headers).toHaveProperty('ratelimit-limit');
+      expect(parseInt(response.headers['ratelimit-limit'])).toBe(50);
     });
 
     it('should apply batchLimiter to POST /items/batch-count', async () => {
@@ -343,8 +343,8 @@ describe('Flyer Routes (/api/flyers)', () => {
         .send({ flyerIds: [1] });
 
       expect(response.status).toBe(200);
-      expect(response.headers).toHaveProperty('x-ratelimit-limit');
-      expect(parseInt(response.headers['x-ratelimit-limit'])).toBe(50);
+      expect(response.headers).toHaveProperty('ratelimit-limit');
+      expect(parseInt(response.headers['ratelimit-limit'])).toBe(50);
     });
 
     it('should apply trackingLimiter to POST /items/:itemId/track', async () => {
@@ -357,8 +357,8 @@ describe('Flyer Routes (/api/flyers)', () => {
         .send({ type: 'view' });
 
       expect(response.status).toBe(202);
-      expect(response.headers).toHaveProperty('x-ratelimit-limit');
-      expect(parseInt(response.headers['x-ratelimit-limit'])).toBe(200);
+      expect(response.headers).toHaveProperty('ratelimit-limit');
+      expect(parseInt(response.headers['ratelimit-limit'])).toBe(200);
     });
   });
 });

src/routes/gamification.routes.test.ts

@@ -345,8 +345,8 @@ describe('Gamification Routes (/api/achievements)', () => {
         .set('X-Test-Rate-Limit-Enable', 'true');
 
       expect(response.status).toBe(200);
-      expect(response.headers).toHaveProperty('x-ratelimit-limit');
-      expect(parseInt(response.headers['x-ratelimit-limit'])).toBe(100);
+      expect(response.headers).toHaveProperty('ratelimit-limit');
+      expect(parseInt(response.headers['ratelimit-limit'])).toBe(100);
     });
 
     it('should apply userReadLimiter to GET /me', async () => {
@@ -360,8 +360,8 @@ describe('Gamification Routes (/api/achievements)', () => {
         .set('X-Test-Rate-Limit-Enable', 'true');
 
       expect(response.status).toBe(200);
-      expect(response.headers).toHaveProperty('x-ratelimit-limit');
-      expect(parseInt(response.headers['x-ratelimit-limit'])).toBe(100);
+      expect(response.headers).toHaveProperty('ratelimit-limit');
+      expect(parseInt(response.headers['ratelimit-limit'])).toBe(100);
     });
 
     it('should apply adminTriggerLimiter to POST /award', async () => {
@@ -378,8 +378,8 @@ describe('Gamification Routes (/api/achievements)', () => {
         .send({ userId: 'some-user', achievementName: 'some-achievement' });
 
       expect(response.status).toBe(200);
-      expect(response.headers).toHaveProperty('x-ratelimit-limit');
-      expect(parseInt(response.headers['x-ratelimit-limit'])).toBe(30);
+      expect(response.headers).toHaveProperty('ratelimit-limit');
+      expect(parseInt(response.headers['ratelimit-limit'])).toBe(30);
     });
   });
 });

src/routes/personalization.routes.test.ts

@@ -115,7 +115,7 @@ describe('Personalization Routes (/api/personalization)', () => {
         .set('X-Test-Rate-Limit-Enable', 'true');
 
       expect(response.status).toBe(200);
-      expect(response.headers).toHaveProperty('x-ratelimit-limit');
+      expect(response.headers).toHaveProperty('ratelimit-limit');
     });
   });
 });

src/routes/price.routes.test.ts

@@ -159,8 +159,8 @@ describe('Price Routes (/api/price-history)', () => {
         .send({ masterItemIds: [1, 2] });
 
       expect(response.status).toBe(200);
-      expect(response.headers).toHaveProperty('x-ratelimit-limit');
-      expect(parseInt(response.headers['x-ratelimit-limit'])).toBe(50);
+      expect(response.headers).toHaveProperty('ratelimit-limit');
+      expect(parseInt(response.headers['ratelimit-limit'])).toBe(50);
     });
   });
 });

src/routes/reactions.routes.test.ts

@@ -211,13 +211,14 @@ describe('Reaction Routes (/api/reactions)', () => {
 
   describe('Rate Limiting', () => {
     it('should apply publicReadLimiter to GET /', async () => {
+      const app = createTestApp({ router: reactionsRouter, basePath: '/api/reactions' });
       vi.mocked(reactionRepo.getReactions).mockResolvedValue([]);
       const response = await supertest(app)
         .get('/api/reactions')
         .set('X-Test-Rate-Limit-Enable', 'true');
 
       expect(response.status).toBe(200);
-      expect(response.headers).toHaveProperty('x-ratelimit-limit');
+      expect(response.headers).toHaveProperty('ratelimit-limit');
     });
 
     it('should apply userUpdateLimiter to POST /toggle', async () => {
@@ -235,8 +236,8 @@ describe('Reaction Routes (/api/reactions)', () => {
         .send({ entity_type: 'recipe', entity_id: '1', reaction_type: 'like' });
 
       expect(response.status).toBe(200);
-      expect(response.headers).toHaveProperty('x-ratelimit-limit');
-      expect(parseInt(response.headers['x-ratelimit-limit'])).toBe(150);
+      expect(response.headers).toHaveProperty('ratelimit-limit');
+      expect(parseInt(response.headers['ratelimit-limit'])).toBe(150);
     });
   });
 });

src/routes/recipe.routes.test.ts

@@ -350,7 +350,7 @@ describe('Recipe Routes (/api/recipes)', () => {
 
       // Assert
       expect(blockedResponse.status).toBe(429);
-      expect(blockedResponse.text).toContain('Too many recipe suggestion requests');
+      expect(blockedResponse.text).toContain('Too many AI generation requests');
     });
 
     it('should NOT block requests when the opt-in header is not sent', async () => {
@@ -375,8 +375,8 @@ describe('Recipe Routes (/api/recipes)', () => {
         .set('X-Test-Rate-Limit-Enable', 'true');
 
       expect(response.status).toBe(200);
-      expect(response.headers).toHaveProperty('x-ratelimit-limit');
-      expect(parseInt(response.headers['x-ratelimit-limit'])).toBe(100);
+      expect(response.headers).toHaveProperty('ratelimit-limit');
+      expect(parseInt(response.headers['ratelimit-limit'])).toBe(100);
     });
   });
 });

src/routes/stats.routes.test.ts

@@ -75,7 +75,7 @@ describe('Stats Routes (/api/stats)', () => {
         .set('X-Test-Rate-Limit-Enable', 'true');
 
       expect(response.status).toBe(200);
-      expect(response.headers).toHaveProperty('x-ratelimit-limit');
+      expect(response.headers).toHaveProperty('ratelimit-limit');
     });
   });
 });

src/routes/system.routes.test.ts

@@ -171,10 +171,10 @@ describe('System Routes (/api/system)', () => {
         .send({ address });
 
       expect(response.status).toBe(200);
-      expect(response.headers).toHaveProperty('x-ratelimit-limit');
-      expect(response.headers).toHaveProperty('x-ratelimit-remaining');
-      expect(parseInt(response.headers['x-ratelimit-limit'])).toBe(limit);
-      expect(parseInt(response.headers['x-ratelimit-remaining'])).toBeLessThan(limit);
+      expect(response.headers).toHaveProperty('ratelimit-limit');
+      expect(response.headers).toHaveProperty('ratelimit-remaining');
+      expect(parseInt(response.headers['ratelimit-limit'])).toBe(limit);
+      expect(parseInt(response.headers['ratelimit-remaining'])).toBeLessThan(limit);
     });
   });
 });

src/routes/user.routes.test.ts

@@ -1237,6 +1237,19 @@ describe('User Routes (/api/users)', () => {
     }); // End of Recipe Routes
 
     describe('Rate Limiting', () => {
+      beforeAll(() => {
+        vi.useFakeTimers();
+      });
+
+      beforeEach(() => {
+        // Advance time to ensure rate limits are reset between tests
+        vi.advanceTimersByTime(2 * 60 * 60 * 1000);
+      });
+
+      afterAll(() => {
+        vi.useRealTimers();
+      });
+
       it('should apply userUpdateLimiter to PUT /profile', async () => {
         vi.mocked(db.userRepo.updateUserProfile).mockResolvedValue(mockUserProfile);
 
@@ -1246,8 +1259,8 @@ describe('User Routes (/api/users)', () => {
           .send({ full_name: 'Rate Limit Test' });
 
         expect(response.status).toBe(200);
-        expect(response.headers).toHaveProperty('x-ratelimit-limit');
-        expect(parseInt(response.headers['x-ratelimit-limit'])).toBe(100);
+        expect(response.headers).toHaveProperty('ratelimit-limit');
+        expect(parseInt(response.headers['ratelimit-limit'])).toBe(100);
       });
 
       it('should apply userSensitiveUpdateLimiter to PUT /profile/password and block after limit', async () => {
@@ -1283,12 +1296,15 @@ describe('User Routes (/api/users)', () => {
           .attach('avatar', Buffer.from('dummy-image-content'), dummyImagePath);
 
         expect(response.status).toBe(200);
-        expect(response.headers).toHaveProperty('x-ratelimit-limit');
-        expect(parseInt(response.headers['x-ratelimit-limit'])).toBe(20);
+        expect(response.headers).toHaveProperty('ratelimit-limit');
+        expect(parseInt(response.headers['ratelimit-limit'])).toBe(20);
       });
     });
 
     it('should apply userSensitiveUpdateLimiter to DELETE /account and block after limit', async () => {
+        // Explicitly advance time to ensure the rate limiter window has reset from previous tests
+        vi.advanceTimersByTime(60 * 60 * 1000 + 5000);
+
       const limit = 5;
       vi.mocked(userService.deleteUserAccount).mockResolvedValue(undefined);
 

src/services/aiService.server.ts

@@ -753,6 +753,7 @@ async enqueueFlyerProcessing(
     userProfile: UserProfile | undefined,
     submitterIp: string,
     logger: Logger,
+    baseUrlOverride?: string,
   ): Promise<Job> {
     // 1. Check for duplicate flyer
     const existingFlyer = await db.flyerRepo.findFlyerByChecksum(checksum, logger);
@@ -779,7 +780,7 @@ async enqueueFlyerProcessing(
         .join(', ');
     }
 
-    const baseUrl = getBaseUrl(logger);
+    const baseUrl = baseUrlOverride || getBaseUrl(logger);
     // --- START DEBUGGING ---
     // Add a fail-fast check to ensure the baseUrl is a valid URL before enqueuing.
     // This will make the test fail at the upload step if the URL is the problem,

src/services/flyerDataTransformer.test.ts

@@ -5,6 +5,7 @@ import { logger as mockLogger } from './logger.server';
 import { generateFlyerIcon } from '../utils/imageProcessor';
 import type { AiProcessorResult } from './flyerAiProcessor.server';
 import type { FlyerItemInsert } from '../types';
+import { getBaseUrl } from '../utils/serverUtils';
 
 // Mock the dependencies
 vi.mock('../utils/imageProcessor', () => ({
@@ -15,6 +16,10 @@ vi.mock('./logger.server', () => ({
   logger: { info: vi.fn(), error: vi.fn(), warn: vi.fn(), debug: vi.fn() },
 }));
 
+vi.mock('../utils/serverUtils', () => ({
+  getBaseUrl: vi.fn(),
+}));
+
 describe('FlyerDataTransformer', () => {
   let transformer: FlyerDataTransformer;
 
@@ -29,6 +34,7 @@ describe('FlyerDataTransformer', () => {
 
     // Provide a default mock implementation for generateFlyerIcon
     vi.mocked(generateFlyerIcon).mockResolvedValue('icon-flyer-page-1.webp');
+    vi.mocked(getBaseUrl).mockReturnValue('http://localhost:3000');
   });
 
   it('should transform AI data into database-ready format with a user ID', async () => {
@@ -244,7 +250,7 @@ describe('FlyerDataTransformer', () => {
     );
   });
 
-  it('should use fallback baseUrl if none is provided and log a warning', async () => {
+  it('should use fallback baseUrl from getBaseUrl if none is provided', async () => {
     // Arrange
     const aiResult: AiProcessorResult = {
       data: {
@@ -258,9 +264,8 @@ describe('FlyerDataTransformer', () => {
     };
     const baseUrl = undefined; // Explicitly pass undefined for this test
 
-    // The fallback logic uses process.env.PORT || 3000.
-    // The beforeEach sets PORT to '', so it should fallback to 3000.
-    const expectedFallbackUrl = 'http://localhost:3000';
+    const expectedFallbackUrl = 'http://fallback-url.com';
+    vi.mocked(getBaseUrl).mockReturnValue(expectedFallbackUrl);
 
     // Act
     const { flyerData } = await transformer.transform(
@@ -275,10 +280,8 @@ describe('FlyerDataTransformer', () => {
     );
 
     // Assert
-    // 1. Check that a warning was logged
-    expect(mockLogger.warn).toHaveBeenCalledWith(
-      `Base URL not provided in job data. Falling back to default local URL: ${expectedFallbackUrl}`,
-    );
+    // 1. Check that getBaseUrl was called
+    expect(getBaseUrl).toHaveBeenCalledWith(mockLogger);
 
     // 2. Check that the URLs were constructed with the fallback
     expect(flyerData.image_url).toBe(`${expectedFallbackUrl}/flyer-images/flyer-page-1.jpg`);

src/services/flyerDataTransformer.ts

@@ -7,6 +7,7 @@ import type { AiProcessorResult } from './flyerAiProcessor.server'; // Keep this
 import { AiFlyerDataSchema } from '../types/ai'; // Import consolidated schema
 import { TransformationError } from './processingErrors';
 import { parsePriceToCents } from '../utils/priceParser';
+import { getBaseUrl } from '../utils/serverUtils';
 
 /**
  * This class is responsible for transforming the validated data from the AI service
@@ -62,13 +63,7 @@ export class FlyerDataTransformer {
     logger: Logger,
   ): { imageUrl: string; iconUrl: string } {
     logger.debug({ imageFileName, iconFileName, baseUrl }, 'Building URLs');
-    let finalBaseUrl = baseUrl;
-    if (!finalBaseUrl) {
-      const port = process.env.PORT || 3000;
-      finalBaseUrl = `http://localhost:${port}`;
-      logger.warn(`Base URL not provided in job data. Falling back to default local URL: ${finalBaseUrl}`);
-    }
-    finalBaseUrl = finalBaseUrl.endsWith('/') ? finalBaseUrl.slice(0, -1) : finalBaseUrl;
+    const finalBaseUrl = baseUrl || getBaseUrl(logger);
     const imageUrl = `${finalBaseUrl}/flyer-images/${imageFileName}`;
     const iconUrl = `${finalBaseUrl}/flyer-images/icons/${iconFileName}`;
     logger.debug({ imageUrl, iconUrl }, 'Constructed URLs');

src/services/userService.test.ts

@@ -7,6 +7,7 @@ import { ValidationError, NotFoundError } from './db/errors.db';
 import { DatabaseError } from './processingErrors';
 import type { Job } from 'bullmq';
 import type { TokenCleanupJobData } from '../types/job-data';
+import { getTestBaseUrl } from '../tests/utils/testHelpers';
 
 // Un-mock the service under test to ensure we are testing the real implementation,
 // not the global mock from `tests/setup/tests-setup-unit.ts`.
@@ -240,12 +241,12 @@ describe('UserService', () => {
   describe('updateUserAvatar', () => {
     it('should construct avatar URL and update profile', async () => {
       const { logger } = await import('./logger.server');
-      const testBaseUrl = 'http://localhost:3001';
+      const testBaseUrl = getTestBaseUrl(3001);
       vi.stubEnv('FRONTEND_URL', testBaseUrl);
 
       const userId = 'user-123';
       const file = { filename: 'avatar.jpg' } as Express.Multer.File;
-      const expectedUrl = `${testBaseUrl}/uploads/avatars/avatar.jpg`;
+      const expectedUrl = `${testBaseUrl}/uploads/avatars/${file.filename}`;
 
       mocks.mockUpdateUserProfile.mockResolvedValue({} as any);
 

src/tests/integration/admin.integration.test.ts

@@ -4,7 +4,7 @@ import supertest from 'supertest';
 import app from '../../../server';
 import { getPool } from '../../services/db/connection.db';
 import type { UserProfile } from '../../types';
-import { createAndLoginUser } from '../utils/testHelpers';
+import { createAndLoginUser, TEST_EXAMPLE_DOMAIN } from '../utils/testHelpers';
 import { cleanupDb } from '../utils/cleanup';
 
 /**
@@ -164,7 +164,7 @@ describe('Admin API Routes Integration Tests', () => {
     beforeEach(async () => {
       const flyerRes = await getPool().query(
         `INSERT INTO public.flyers (store_id, file_name, image_url, icon_url, item_count, checksum) 
-         VALUES ($1, 'admin-test.jpg', 'https://example.com/flyer-images/asdmin-test.jpg', 'https://example.com/flyer-images/icons/admin-test.jpg', 1, $2) RETURNING flyer_id`,
+         VALUES ($1, 'admin-test.jpg', '${TEST_EXAMPLE_DOMAIN}/flyer-images/asdmin-test.jpg', '${TEST_EXAMPLE_DOMAIN}/flyer-images/icons/admin-test.jpg', 1, $2) RETURNING flyer_id`,
         // The checksum must be a unique 64-character string to satisfy the DB constraint.
         // We generate a dynamic string and pad it to 64 characters.
         [testStoreId, `checksum-${Date.now()}-${Math.random()}`.padEnd(64, '0')],

src/tests/integration/flyer-processing.integration.test.ts

@@ -9,7 +9,7 @@ import { getPool } from '../../services/db/connection.db';
 import { generateFileChecksum } from '../../utils/checksum';
 import { logger } from '../../services/logger.server';
 import type { UserProfile, ExtractedFlyerItem } from '../../types';
-import { createAndLoginUser } from '../utils/testHelpers';
+import { createAndLoginUser, getTestBaseUrl } from '../utils/testHelpers';
 import { cleanupDb } from '../utils/cleanup';
 import { poll } from '../utils/poll';
 import { cleanupFiles } from '../utils/cleanupFiles';
@@ -130,7 +130,7 @@ describe('Flyer Processing Background Job Integration Test', () => {
       .field('checksum', checksum)
       // Pass the baseUrl directly in the form data to ensure the worker receives it,
       // bypassing issues with vi.stubEnv in multi-threaded test environments.
-      .field('baseUrl', 'http://localhost:3000')
+      .field('baseUrl', getTestBaseUrl())
       .attach('flyerFile', uniqueContent, uniqueFileName);
     if (token) {
       uploadReq.set('Authorization', `Bearer ${token}`);
@@ -248,7 +248,7 @@ describe('Flyer Processing Background Job Integration Test', () => {
       const uploadResponse = await request
         .post('/api/ai/upload-and-process')
         .set('Authorization', `Bearer ${token}`)
-        .field('baseUrl', 'http://localhost:3000')
+        .field('baseUrl', getTestBaseUrl())
         .field('checksum', checksum)
         .attach('flyerFile', imageWithExifBuffer, uniqueFileName);
 
@@ -333,7 +333,7 @@ describe('Flyer Processing Background Job Integration Test', () => {
       const uploadResponse = await request
         .post('/api/ai/upload-and-process')
         .set('Authorization', `Bearer ${token}`)
-        .field('baseUrl', 'http://localhost:3000')
+        .field('baseUrl', getTestBaseUrl())
         .field('checksum', checksum)
         .attach('flyerFile', imageWithMetadataBuffer, uniqueFileName);
 
@@ -399,7 +399,7 @@ it(
       // Act 1: Upload the file to start the background job.
       const uploadResponse = await request
         .post('/api/ai/upload-and-process')
-        .field('baseUrl', 'http://localhost:3000')
+        .field('baseUrl', getTestBaseUrl())
         .field('checksum', checksum)
         .attach('flyerFile', uniqueContent, uniqueFileName);
 
@@ -451,7 +451,7 @@ it(
       // Act 1: Upload the file to start the background job.
       const uploadResponse = await request
         .post('/api/ai/upload-and-process')
-        .field('baseUrl', 'http://localhost:3000')
+        .field('baseUrl', getTestBaseUrl())
         .field('checksum', checksum)
         .attach('flyerFile', uniqueContent, uniqueFileName);
 
@@ -505,7 +505,7 @@ it(
       // Act 1: Upload the file to start the background job.
       const uploadResponse = await request
         .post('/api/ai/upload-and-process')
-        .field('baseUrl', 'http://localhost:3000')
+        .field('baseUrl', getTestBaseUrl())
         .field('checksum', checksum)
         .attach('flyerFile', uniqueContent, uniqueFileName);
 

src/tests/integration/flyer.integration.test.ts

@@ -5,6 +5,7 @@ import { getPool } from '../../services/db/connection.db';
 import app from '../../../server';
 import type { Flyer, FlyerItem } from '../../types';
 import { cleanupDb } from '../utils/cleanup';
+import { TEST_EXAMPLE_DOMAIN } from '../utils/testHelpers';
 
 /**
  * @vitest-environment node
@@ -27,7 +28,7 @@ describe('Public Flyer API Routes Integration Tests', () => {
 
     const flyerRes = await getPool().query(
       `INSERT INTO public.flyers (store_id, file_name, image_url, icon_url, item_count, checksum) 
-       VALUES ($1, 'integration-test.jpg', 'https://example.com/flyer-images/integration-test.jpg', 'https://example.com/flyer-images/icons/integration-test.jpg', 1, $2) RETURNING flyer_id`,
+       VALUES ($1, 'integration-test.jpg', '${TEST_EXAMPLE_DOMAIN}/flyer-images/integration-test.jpg', '${TEST_EXAMPLE_DOMAIN}/flyer-images/icons/integration-test.jpg', 1, $2) RETURNING flyer_id`,
       [testStoreId, `${Date.now().toString(16)}`.padEnd(64, '0')],
     );
     createdFlyerId = flyerRes.rows[0].flyer_id;

src/tests/integration/gamification.integration.test.ts

@@ -5,7 +5,7 @@ import app from '../../../server';
 import path from 'path';
 import fs from 'node:fs/promises';
 import { getPool } from '../../services/db/connection.db';
-import { createAndLoginUser } from '../utils/testHelpers';
+import { createAndLoginUser, getTestBaseUrl } from '../utils/testHelpers';
 import { generateFileChecksum } from '../../utils/checksum';
 import * as db from '../../services/db/index.db';
 import { cleanupDb } from '../utils/cleanup';
@@ -253,7 +253,8 @@ describe('Gamification Flow Integration Test', () => {
       // 8. Assert that the URLs are fully qualified.
       expect(savedFlyer.image_url).to.equal(newFlyer.image_url);
       expect(savedFlyer.icon_url).to.equal(newFlyer.icon_url);
-      expect(newFlyer.image_url).toContain('http://localhost:3001/flyer-images/');
+      const expectedBaseUrl = getTestBaseUrl(3001);
+      expect(newFlyer.image_url).toContain(`${expectedBaseUrl}/flyer-images/`);
     });
   });
 });

src/tests/integration/price.integration.test.ts

@@ -3,6 +3,7 @@ import { describe, it, expect, beforeAll, afterAll } from 'vitest';
 import supertest from 'supertest';
 import app from '../../../server';
 import { getPool } from '../../services/db/connection.db';
+import { TEST_EXAMPLE_DOMAIN } from '../utils/testHelpers';
 
 /**
  * @vitest-environment node
@@ -35,21 +36,21 @@ describe('Price History API Integration Test (/api/price-history)', () => {
     // 3. Create two flyers with different dates
     const flyerRes1 = await pool.query(
       `INSERT INTO public.flyers (store_id, file_name, image_url, icon_url, item_count, checksum, valid_from) 
-       VALUES ($1, 'price-test-1.jpg', 'https://example.com/flyer-images/price-test-1.jpg', 'https://example.com/flyer-images/icons/price-test-1.jpg', 1, $2, '2025-01-01') RETURNING flyer_id`,
+       VALUES ($1, 'price-test-1.jpg', '${TEST_EXAMPLE_DOMAIN}/flyer-images/price-test-1.jpg', '${TEST_EXAMPLE_DOMAIN}/flyer-images/icons/price-test-1.jpg', 1, $2, '2025-01-01') RETURNING flyer_id`,
       [storeId, `${Date.now().toString(16)}1`.padEnd(64, '0')],
     );
     flyerId1 = flyerRes1.rows[0].flyer_id;
 
     const flyerRes2 = await pool.query(
       `INSERT INTO public.flyers (store_id, file_name, image_url, icon_url, item_count, checksum, valid_from) 
-       VALUES ($1, 'price-test-2.jpg', 'https://example.com/flyer-images/price-test-2.jpg', 'https://example.com/flyer-images/icons/price-test-2.jpg', 1, $2, '2025-01-08') RETURNING flyer_id`,
+       VALUES ($1, 'price-test-2.jpg', '${TEST_EXAMPLE_DOMAIN}/flyer-images/price-test-2.jpg', '${TEST_EXAMPLE_DOMAIN}/flyer-images/icons/price-test-2.jpg', 1, $2, '2025-01-08') RETURNING flyer_id`,
       [storeId, `${Date.now().toString(16)}2`.padEnd(64, '0')],
     );
     flyerId2 = flyerRes2.rows[0].flyer_id; // This was a duplicate, fixed.
 
     const flyerRes3 = await pool.query(
       `INSERT INTO public.flyers (store_id, file_name, image_url, icon_url, item_count, checksum, valid_from) 
-       VALUES ($1, 'price-test-3.jpg', 'https://example.com/flyer-images/price-test-3.jpg', 'https://example.com/flyer-images/icons/price-test-3.jpg', 1, $2, '2025-01-15') RETURNING flyer_id`,
+       VALUES ($1, 'price-test-3.jpg', '${TEST_EXAMPLE_DOMAIN}/flyer-images/price-test-3.jpg', '${TEST_EXAMPLE_DOMAIN}/flyer-images/icons/price-test-3.jpg', 1, $2, '2025-01-15') RETURNING flyer_id`,
       [storeId, `${Date.now().toString(16)}3`.padEnd(64, '0')],
     );
     flyerId3 = flyerRes3.rows[0].flyer_id;

src/tests/integration/public.routes.integration.test.ts

@@ -14,7 +14,7 @@ import type {
 import { getPool } from '../../services/db/connection.db';
 import { cleanupDb } from '../utils/cleanup';
 import { poll } from '../utils/poll';
-import { createAndLoginUser } from '../utils/testHelpers';
+import { createAndLoginUser, TEST_EXAMPLE_DOMAIN } from '../utils/testHelpers';
 
 /**
  * @vitest-environment node
@@ -64,7 +64,7 @@ describe('Public API Routes Integration Tests', () => {
     testStoreId = storeRes.rows[0].store_id;
     const flyerRes = await pool.query(
       `INSERT INTO public.flyers (store_id, file_name, image_url, icon_url, item_count, checksum) 
-       VALUES ($1, 'public-routes-test.jpg', 'https://example.com/flyer-images/public-routes-test.jpg', 'https://example.com/flyer-images/icons/public-routes-test.jpg', 1, $2) RETURNING *`,
+       VALUES ($1, 'public-routes-test.jpg', '${TEST_EXAMPLE_DOMAIN}/flyer-images/public-routes-test.jpg', '${TEST_EXAMPLE_DOMAIN}/flyer-images/icons/public-routes-test.jpg', 1, $2) RETURNING *`,
       [testStoreId, `${Date.now().toString(16)}`.padEnd(64, '0')],
     );
     testFlyer = flyerRes.rows[0];

src/tests/utils/testHelpers.ts

@@ -5,6 +5,12 @@ import type { UserProfile } from '../../types';
 import supertest from 'supertest';
 
 export const TEST_PASSWORD = 'a-much-stronger-password-for-testing-!@#$';
+export const TEST_EXAMPLE_DOMAIN = 'https://example.com';
+
+export const getTestBaseUrl = (fallbackPort = 3000): string => {
+  const url = process.env.FRONTEND_URL || `http://localhost:${fallbackPort}`;
+  return url.endsWith('/') ? url.slice(0, -1) : url;
+};
 
 interface CreateUserOptions {
   email?: string;