ci: Bump version to 0.9.5 [skip ci]

package-lock.json

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

sql/Initial_triggers_and_functions.sql

@@ -1079,6 +1079,8 @@ $$;
 -- It replaces the need to call get_best_sale_prices_for_user for each user individually.
 -- Returns: TABLE(...) - A set of records including user details and deal information.
 -- =================================================================
+DROP FUNCTION IF EXISTS public.get_best_sale_prices_for_all_users();
+
 CREATE OR REPLACE FUNCTION public.get_best_sale_prices_for_all_users()
 RETURNS TABLE(
     user_id uuid,

sql/master_schema_rollup.sql

@@ -2809,6 +2809,8 @@ CREATE TRIGGER on_recipe_fork
 -- It replaces the need to call get_best_sale_prices_for_user for each user individually.
 -- Returns: TABLE(...) - A set of records including user details and deal information.
 -- =================================================================
+DROP FUNCTION IF EXISTS public.get_best_sale_prices_for_all_users();
+
 CREATE OR REPLACE FUNCTION public.get_best_sale_prices_for_all_users()
 RETURNS TABLE(
     user_id uuid,

src/db/seed.ts

@@ -110,8 +110,8 @@ async function main() {
     validTo.setDate(today.getDate() + 5);
 
     const flyerQuery = `
-        INSERT INTO public.flyers (file_name, image_url, checksum, store_id, valid_from, valid_to)
-        VALUES ('safeway-flyer.jpg', 'https://example.com/flyer-images/safeway-flyer.jpg', 'a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0', ${storeMap.get('Safeway')}, $1, $2)
+        INSERT INTO public.flyers (file_name, image_url, icon_url, checksum, store_id, valid_from, valid_to)
+        VALUES ('safeway-flyer.jpg', 'https://example.com/flyer-images/safeway-flyer.jpg', 'https://example.com/flyer-images/icons/safeway-flyer.jpg', 'a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0', ${storeMap.get('Safeway')}, $1, $2)
         RETURNING flyer_id;
     `;
     const flyerRes = await client.query<{ flyer_id: number }>(flyerQuery, [

src/services/aiService.server.test.ts

@@ -279,8 +279,8 @@ describe('AI Service (Server)', () => {
       });
 
       // Check second call
-      expect(mockGenerateContent).toHaveBeenNthCalledWith(2, { // The second model in the list is 'gemini-2.5-flash'
-        model: 'gemini-2.5-flash',
+      expect(mockGenerateContent).toHaveBeenNthCalledWith(2, { // The second model in the list is 'gemini-2.5-pro'
+        model: 'gemini-2.5-pro',
         ...request,
       });
 

src/services/flyerDataTransformer.ts

@@ -76,12 +76,15 @@ export class FlyerDataTransformer {
       }
 
       // Construct proper URLs including protocol and host to satisfy DB constraints
-      const baseUrl = process.env.BASE_URL || `http://localhost:${process.env.PORT || 3000}`;
+      const rawBaseUrl = process.env.BASE_URL || `http://localhost:${process.env.PORT || 3000}`;
+      // Normalize base URL by removing any trailing slash to prevent double slashes in the final URL,
+      // and replace the strict `new URL()` constructor to prevent exceptions in test environments.
+      const baseUrl = rawBaseUrl.endsWith('/') ? rawBaseUrl.slice(0, -1) : rawBaseUrl;
 
       const flyerData: FlyerInsert = {
         file_name: originalFileName,
-        image_url: new URL(`/flyer-images/${path.basename(firstImage)}`, baseUrl).href,
-        icon_url: new URL(`/flyer-images/icons/${iconFileName}`, baseUrl).href,
+        image_url: `${baseUrl}/flyer-images/${path.basename(firstImage)}`,
+        icon_url: `${baseUrl}/flyer-images/icons/${iconFileName}`,
         checksum,
         store_name: storeName,
         valid_from: extractedData.valid_from,

src/tests/e2e/auth.e2e.test.ts

@@ -174,6 +174,10 @@ describe('Authentication E2E Flow', () => {
       expect(registerResponse.status).toBe(201);
       createdUserIds.push(registerData.userprofile.user.user_id);
 
+      // Add a small delay to mitigate potential DB replication lag or race conditions
+      // where the user might not be found immediately after creation.
+      await new Promise((resolve) => setTimeout(resolve, 2000));
+
       // Act 1: Request a password reset.
       // The test environment returns the token directly in the response for E2E testing.
       const forgotResponse = await apiClient.requestPasswordReset(email);

src/tests/e2e/flyer-upload.e2e.test.ts

@@ -89,7 +89,7 @@ describe('E2E Flyer Upload and Processing Workflow', () => {
 
     // 5. Poll for job completion
     let jobStatus;
-    const maxRetries = 30; // Poll for up to 90 seconds
+    const maxRetries = 60; // Poll for up to 180 seconds
     for (let i = 0; i < maxRetries; i++) {
       await new Promise((resolve) => setTimeout(resolve, 3000)); // Wait 3s
       
@@ -106,5 +106,5 @@ describe('E2E Flyer Upload and Processing Workflow', () => {
     expect(jobStatus.state).toBe('completed');
     flyerId = jobStatus.returnValue?.flyerId;
     expect(flyerId).toBeTypeOf('number');
-  }, 120000); // Extended timeout for AI processing
+  }, 240000); // Extended timeout for AI processing
 });

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

@@ -163,8 +163,8 @@ describe('Admin API Routes Integration Tests', () => {
     // Before each modification test, create a fresh flyer item and a correction for it.
     beforeEach(async () => {
       const flyerRes = await getPool().query(
-        `INSERT INTO public.flyers (store_id, file_name, image_url, item_count, checksum) 
-         VALUES ($1, 'admin-test.jpg', 'https://example.com/flyer-images/asdmin-test.jpg', 1, $2) RETURNING flyer_id`,
+        `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`,
         // 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

@@ -223,7 +223,7 @@ describe('Flyer Processing Background Job Integration Test', () => {
 
       // Poll for job completion
       let jobStatus;
-      const maxRetries = 30; // Poll for up to 90 seconds
+      const maxRetries = 60; // Poll for up to 180 seconds
       for (let i = 0; i < maxRetries; i++) {
         await new Promise((resolve) => setTimeout(resolve, 3000));
         const statusResponse = await request
@@ -309,7 +309,7 @@ describe('Flyer Processing Background Job Integration Test', () => {
 
       // Poll for job completion
       let jobStatus;
-      const maxRetries = 30;
+      const maxRetries = 60; // Poll for up to 180 seconds
       for (let i = 0; i < maxRetries; i++) {
         await new Promise((resolve) => setTimeout(resolve, 3000));
         const statusResponse = await request

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

@@ -24,8 +24,8 @@ describe('Public Flyer API Routes Integration Tests', () => {
     const storeId = storeRes.rows[0].store_id;
 
     const flyerRes = await getPool().query(
-      `INSERT INTO public.flyers (store_id, file_name, image_url, item_count, checksum) 
-       VALUES ($1, 'integration-test.jpg', 'https://example.com/flyer-images/integration-test.jpg', 1, $2) RETURNING flyer_id`,
+      `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`,
       [storeId, `${Date.now().toString(16)}`.padEnd(64, '0')],
     );
     createdFlyerId = flyerRes.rows[0].flyer_id;

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

@@ -101,7 +101,7 @@ describe('Gamification Flow Integration Test', () => {
 
       // --- Act 2: Poll for job completion ---
       let jobStatus;
-      const maxRetries = 30; // Poll for up to 90 seconds
+      const maxRetries = 60; // Poll for up to 180 seconds
       for (let i = 0; i < maxRetries; i++) {
         await new Promise((resolve) => setTimeout(resolve, 3000));
         const statusResponse = await request

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

@@ -34,22 +34,22 @@ 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, item_count, checksum, valid_from) 
-       VALUES ($1, 'price-test-1.jpg', 'https://example.com/flyer-images/price-test-1.jpg', 1, $2, '2025-01-01') RETURNING flyer_id`,
+      `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`,
       [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, item_count, checksum, valid_from) 
-       VALUES ($1, 'price-test-2.jpg', 'https://example.com/flyer-images/price-test-2.jpg', 1, $2, '2025-01-08') RETURNING flyer_id`,
+      `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`,
       [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, item_count, checksum, valid_from) 
-       VALUES ($1, 'price-test-3.jpg', 'https://example.com/flyer-images/price-test-3.jpg', 1, $2, '2025-01-15') RETURNING flyer_id`,
+      `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`,
       [storeId, `${Date.now().toString(16)}3`.padEnd(64, '0')],
     );
     flyerId3 = flyerRes3.rows[0].flyer_id;

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

@@ -77,8 +77,8 @@ 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, item_count, checksum) 
-       VALUES ($1, 'public-routes-test.jpg', 'https://example.com/flyer-images/public-routes-test.jpg', 1, $2) RETURNING *`,
+      `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 *`,
       [testStoreId, `${Date.now().toString(16)}`.padEnd(64, '0')],
     );
     testFlyer = flyerRes.rows[0];