ci: Bump version to 0.0.18 [skip ci]

.devcontainer/devcontainer.json

@@ -0,0 +1,18 @@
+{
+  "name": "Flyer Crawler Dev (Ubuntu 22.04)",
+  "dockerComposeFile": ["../compose.dev.yml"],
+  "service": "app",
+  "workspaceFolder": "/app",
+  "customizations": {
+    "vscode": {
+      "extensions": ["dbaeumer.vscode-eslint", "esbenp.prettier-vscode"]
+    }
+  },
+  "remoteUser": "root",
+  // Automatically install dependencies when the container is created.
+  // This runs inside the container, populating the isolated node_modules volume.
+  "postCreateCommand": "npm install",
+  "postAttachCommand": "npm run dev:container",
+  // Try to start podman machine, but exit with success (0) even if it's already running
+  "initializeCommand": "powershell -Command \"podman machine start; exit 0\""
+}

.gitea/workflows/deploy-to-test.yml

@@ -136,7 +136,8 @@ jobs:
           # Run unit and integration tests as separate steps.
           # The `|| true` ensures the workflow continues even if tests fail, allowing coverage to run.
           echo "--- Running Unit Tests ---"
-          npm run test:unit -- --coverage --reporter=verbose --includeTaskLocation --testTimeout=10000 --silent=passed-only || true
+          # npm run test:unit -- --coverage --reporter=verbose --includeTaskLocation --testTimeout=10000 --silent=passed-only || true
+          npm run test:unit -- --coverage --reporter=verbose --includeTaskLocation --testTimeout=10000 --silent=passed-only  --no-file-parallelism || true
 
           echo "--- Running Integration Tests ---"
           npm run test:integration -- --coverage --reporter=verbose --includeTaskLocation --testTimeout=10000 --silent=passed-only || true

Dockerfile.dev

@@ -0,0 +1,31 @@
+# Use Ubuntu 22.04 (LTS) as the base image to match production
+FROM ubuntu:22.04
+
+# Set environment variables to non-interactive to avoid prompts during installation
+ENV DEBIAN_FRONTEND=noninteractive
+
+# Update package lists and install essential tools
+# - curl: for downloading Node.js setup script
+# - git: for version control operations
+# - build-essential: for compiling native Node.js modules (node-gyp)
+# - python3: required by some Node.js build tools
+RUN apt-get update && apt-get install -y \
+    curl \
+    git \
+    build-essential \
+    python3 \
+    && rm -rf /var/lib/apt/lists/*
+
+# Install Node.js 20.x (LTS) from NodeSource
+RUN curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \
+    && apt-get install -y nodejs
+
+# Set the working directory inside the container
+WORKDIR /app
+
+# Set default environment variables for development
+ENV NODE_ENV=development
+ENV NODE_OPTIONS='--max-old-space-size=8192'
+
+# Default command keeps the container running so you can attach to it
+CMD ["bash"]

compose.dev.yml

@@ -0,0 +1,52 @@
+version: '3.8'
+
+services:
+  app:
+    container_name: flyer-crawler-dev
+    build:
+      context: .
+      dockerfile: Dockerfile.dev
+    volumes:
+      # Mount the current directory to /app in the container
+      - .:/app
+      # Create a volume for node_modules to avoid conflicts with Windows host
+      # and improve performance.
+      - node_modules_data:/app/node_modules
+    ports:
+      - '3000:3000' # Frontend (Vite default)
+      - '3001:3001' # Backend API
+    environment:
+      - NODE_ENV=development
+      - DB_HOST=postgres
+      - DB_USER=postgres
+      - DB_PASSWORD=postgres
+      - DB_NAME=flyer_crawler_dev
+      - REDIS_URL=redis://redis:6379
+      # Add other secrets here or use a .env file
+    depends_on:
+      - postgres
+      - redis
+    # Keep container running so VS Code can attach
+    command: tail -f /dev/null
+
+  postgres:
+    image: docker.io/library/postgis/postgis:15-3.4
+    container_name: flyer-crawler-postgres
+    ports:
+      - '5432:5432'
+    environment:
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: postgres
+      POSTGRES_DB: flyer_crawler_dev
+    volumes:
+      - postgres_data:/var/lib/postgresql/data
+
+  redis:
+    image: docker.io/library/redis:alpine
+    container_name: flyer-crawler-redis
+    ports:
+      - '6379:6379'
+
+volumes:
+  postgres_data:
+  node_modules_data:

package.json

@@ -1,17 +1,19 @@
 {
   "name": "flyer-crawler",
   "private": true,
-  "version": "0.0.10",
+  "version": "0.0.18",
   "type": "module",
   "scripts": {
     "dev": "concurrently \"npm:start:dev\" \"vite\"",
+    "dev:container": "concurrently \"npm:start:dev\" \"vite --host\"",
     "start": "npm run start:prod",
     "build": "vite build",
     "preview": "vite preview",
-    "test": "NODE_ENV=test tsx ./node_modules/vitest/vitest.mjs run",
+    "test": "cross-env NODE_ENV=test tsx ./node_modules/vitest/vitest.mjs run",
+    "test-wsl": "cross-env NODE_ENV=test vitest run",
     "test:coverage": "npm run clean && npm run test:unit -- --coverage && npm run test:integration -- --coverage",
-    "test:unit": "NODE_ENV=test tsx ./node_modules/vitest/vitest.mjs run --project unit -c vite.config.ts",
-    "test:integration": "NODE_ENV=test tsx ./node_modules/vitest/vitest.mjs run --project integration -c vitest.config.integration.ts",
+    "test:unit": "NODE_ENV=test tsx --max-old-space-size=8192 ./node_modules/vitest/vitest.mjs run --project unit -c vite.config.ts",
+    "test:integration": "NODE_ENV=test tsx --max-old-space-size=8192 ./node_modules/vitest/vitest.mjs run --project integration -c vitest.config.integration.ts",
     "format": "prettier --write .",
     "lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
     "type-check": "tsc --noEmit",
@@ -20,6 +22,7 @@
     "start:dev": "NODE_ENV=development tsx watch server.ts",
     "start:prod": "NODE_ENV=production tsx server.ts",
     "start:test": "NODE_ENV=test NODE_V8_COVERAGE=.coverage/tmp/integration-server tsx server.ts",
+    "db:reset:dev": "NODE_ENV=development tsx src/db/seed.ts",
     "db:reset:test": "NODE_ENV=test tsx src/db/seed.ts",
     "worker:prod": "NODE_ENV=production tsx src/services/queueService.server.ts"
   },
@@ -95,6 +98,7 @@
     "autoprefixer": "^10.4.22",
     "c8": "^10.1.3",
     "concurrently": "^9.2.1",
+    "cross-env": "^10.1.0",
     "eslint": "9.39.1",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-react": "7.37.5",

sql/initial_schema.sql

@@ -92,6 +92,7 @@ CREATE TABLE IF NOT EXISTS public.stores (
   created_at TIMESTAMPTZ DEFAULT now() NOT NULL,
   updated_at TIMESTAMPTZ DEFAULT now() NOT NULL,
   created_by UUID REFERENCES public.users(user_id) ON DELETE SET NULL
+);
 COMMENT ON TABLE public.stores IS 'Stores metadata for grocery store chains (e.g., Safeway, Kroger).';
 
 -- 5. The 'categories' table for normalized category data.

src/features/charts/PriceHistoryChart.tsx

@@ -1,4 +1,4 @@
-// src/components/PriceHistoryChart.tsx
+// src/features/charts/PriceHistoryChart.tsx
 import React, { useState, useEffect, useMemo } from 'react';
 import {
   LineChart,
@@ -142,7 +142,7 @@ export const PriceHistoryChart: React.FC = () => {
   const renderContent = () => {
     if (isLoading || isLoadingUserData) {
       return (
-        <div role="status" className="flex justify-center items-center h-full min-h-[200px]">
+        <div role="status" className="flex justify-center items-center h-full min-h-50]">
           <LoadingSpinner /> <span className="ml-2">Loading Price History...</span>
         </div>
       );
@@ -198,7 +198,12 @@ export const PriceHistoryChart: React.FC = () => {
               borderRadius: '0.5rem',
             }}
             labelStyle={{ color: '#F9FAFB' }}
-            formatter={(value: number) => `$${(value / 100).toFixed(2)}`}
+            formatter={(value: number | undefined) => {
+              if (typeof value === 'number') {
+                return [`$${(value / 100).toFixed(2)}`];
+              }
+              return [null];
+            }}
           />
           <Legend wrapperStyle={{ fontSize: '12px' }} />
           {availableItems.map((item, index) => (

src/hooks/useUserData.test.tsx

@@ -2,8 +2,8 @@
 import React, { ReactNode } from 'react';
 import { renderHook, waitFor } from '@testing-library/react';
 import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { useUserData } from '../hooks/useUserData';
-import { useAuth } from '../hooks/useAuth';
+import { useUserData } from './useUserData';
+import { useAuth } from './useAuth';
 import { UserDataProvider } from '../providers/UserDataProvider';
 import { useApiOnMount } from './useApiOnMount';
 import type { UserProfile } from '../types';

src/routes/ai.routes.test.ts

@@ -86,12 +86,15 @@ describe('AI Routes (/api/ai)', () => {
       // Arrange
       const mkdirError = new Error('EACCES: permission denied');
       vi.resetModules(); // Reset modules to re-run top-level code
-      vi.doMock('node:fs', () => ({
-        ...fs,
-        mkdirSync: vi.fn().mockImplementation(() => {
-          throw mkdirError;
-        }),
-      }));
+      vi.doMock('node:fs', () => {
+        const mockFs = {
+          ...fs,
+          mkdirSync: vi.fn().mockImplementation(() => {
+            throw mkdirError;
+          }),
+        };
+        return { ...mockFs, default: mockFs };
+      });
       const { logger } = await import('../services/logger.server');
 
       // Act: Dynamically import the router to trigger the mkdirSync call

src/routes/ai.routes.ts

@@ -2,7 +2,7 @@
 import { Router, Request, Response, NextFunction } from 'express';
 import multer from 'multer';
 import path from 'path';
-import fs from 'fs';
+import fs from 'node:fs';
 import { z } from 'zod';
 import passport from './passport.routes';
 import { optionalAuth } from './passport.routes';

src/routes/auth.routes.test.ts

@@ -297,7 +297,6 @@ describe('Auth Routes (/api/auth)', () => {
       // The API now returns a nested UserProfile object
       expect(response.body.userprofile).toEqual(
         expect.objectContaining({
-          user_id: 'user-123',
           user: expect.objectContaining({
             user_id: 'user-123',
             email: loginCredentials.email,

src/routes/auth.routes.ts

@@ -381,7 +381,7 @@ router.post('/logout', async (req: Request, res: Response) => {
   // Instruct the browser to clear the cookie by setting its expiration to the past.
   res.cookie('refreshToken', '', {
     httpOnly: true,
-    expires: new Date(0),
+    maxAge: 0, // Use maxAge for modern compatibility; Express sets 'Expires' as a fallback.
     secure: process.env.NODE_ENV === 'production',
   });
   res.status(200).json({ message: 'Logged out successfully.' });

src/routes/system.routes.ts

@@ -1,4 +1,4 @@
-// src/routes/system.routests
+// src/routes/system.routes.ts
 import { Router, Request, Response, NextFunction } from 'express';
 import { exec } from 'child_process';
 import { z } from 'zod';
@@ -8,7 +8,7 @@ import { validateRequest } from '../middleware/validation.middleware';
 
 const router = Router();
 
-// Validation Schemas
+// Helper for consistent required string validation (handles missing/null/empty)
 const requiredString = (message: string) =>
   z.preprocess((val) => val ?? '', z.string().min(1, message));
 
@@ -18,65 +18,62 @@ const geocodeSchema = z.object({
   }),
 });
 
+// An empty schema for routes that do not expect any input, to maintain a consistent validation pattern.
 const emptySchema = z.object({});
 
 /**
- * GET /pm2-status
- * Checks if 'flyer-crawler-api' is online via PM2.
+ * Checks the status of the 'flyer-crawler-api' process managed by PM2.
+ * This is intended for development and diagnostic purposes.
  */
 router.get(
   '/pm2-status',
   validateRequest(emptySchema),
   (req: Request, res: Response, next: NextFunction) => {
-    // Using simple exec command
-    const cmd = 'pm2 describe flyer-crawler-api';
-
-    exec(cmd, (error, stdout, stderr) => {
-      if (res.headersSent) return;
-
-      // Handle "process not found" case which might come as an error code OR text
-      const output = (stdout || '') + (stderr || '');
-      const processNotFound = output.includes("doesn't exist");
-
+    // The name 'flyer-crawler-api' comes from your ecosystem.config.cjs file.
+    exec('pm2 describe flyer-crawler-api', (error, stdout, stderr) => {
       if (error) {
-        if (processNotFound) {
-          logger.warn('[API /pm2-status] PM2 process not found.');
+        // 'pm2 describe' exits with an error if the process is not found.
+        // We can treat this as a "fail" status for our check.
+        if (stdout && stdout.includes("doesn't exist")) {
+          logger.warn('[API /pm2-status] PM2 process "flyer-crawler-api" not found.');
           return res.json({
             success: false,
             message: 'Application process is not running under PM2.',
           });
         }
-
-        logger.error({ err: error.message }, '[API /pm2-status] Exec error');
+        logger.error(
+          { error: stderr || error.message },
+          '[API /pm2-status] Error executing pm2 describe:',
+        );
         return next(error);
       }
 
-      // Treat stderr as error if it contains text (PM2 often outputs warnings here)
+      // Check if there was output to stderr, even if the exit code was 0 (success).
+      // This handles warnings or non-fatal errors that should arguably be treated as failures in this context.
       if (stderr && stderr.trim().length > 0) {
-        // Special case: if it's just a warning we might want to ignore, but sticking to defensive rules:
-        logger.error({ stderr }, '[API /pm2-status] Stderr output');
+        logger.error({ stderr }, '[API /pm2-status] PM2 executed but produced stderr:');
         return next(new Error(`PM2 command produced an error: ${stderr}`));
       }
 
-      // Check for online status in the table output
-      const isOnline = /│ status\s+│ online\s+│/m.test(stdout || '');
+      // If the command succeeds, we can parse stdout to check the status.
+      const isOnline = /│ status\s+│ online\s+│/m.test(stdout);
       const message = isOnline
         ? 'Application is online and running under PM2.'
         : 'Application process exists but is not online.';
-
       res.json({ success: isOnline, message });
     });
   },
 );
 
 /**
- * POST /geocode
- * Proxies geocoding requests securely.
+ * POST /api/system/geocode - Geocodes a given address string.
+ * This acts as a secure proxy to the Google Maps Geocoding API.
  */
 router.post(
   '/geocode',
   validateRequest(geocodeSchema),
   async (req: Request, res: Response, next: NextFunction) => {
+    // Infer type and cast request object as per ADR-003
     type GeocodeRequest = z.infer<typeof geocodeSchema>;
     const {
       body: { address },
@@ -86,6 +83,7 @@ router.post(
       const coordinates = await geocodingService.geocodeAddress(address, req.log);
 
       if (!coordinates) {
+        // This check remains, but now it only fails if BOTH services fail.
         return res.status(404).json({ message: 'Could not geocode the provided address.' });
       }
 

src/services/aiAnalysisService.test.ts

@@ -2,6 +2,7 @@
 import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
 import * as aiApiClient from './aiApiClient';
 import { AiAnalysisService } from './aiAnalysisService';
+import { createMockFlyerItem } from '../tests/utils/mockFactories';
 
 // Mock the dependencies
 vi.mock('./aiApiClient');
@@ -56,7 +57,7 @@ describe('AiAnalysisService', () => {
         json: () => Promise.resolve(mockResponse),
       } as Response);
 
-      const result = await service.searchWeb([]);
+      const result = await service.searchWeb([createMockFlyerItem({ item: 'test' })]);
 
       expect(result.text).toBe('Search results');
       expect(result.sources).toEqual([{ uri: 'https://example.com', title: 'Example' }]);
@@ -68,7 +69,7 @@ describe('AiAnalysisService', () => {
         json: () => Promise.resolve(mockResponse),
       } as Response);
 
-      const result = await service.searchWeb([]);
+      const result = await service.searchWeb([createMockFlyerItem({ item: 'test' })]);
 
       expect(result.text).toBe('Search results');
       expect(result.sources).toEqual([]);
@@ -83,7 +84,7 @@ describe('AiAnalysisService', () => {
         json: () => Promise.resolve(mockResponse),
       } as Response);
 
-      const result = await service.searchWeb([]);
+      const result = await service.searchWeb([createMockFlyerItem({ item: 'test' })]);
 
       expect(result.sources).toEqual([{ uri: '', title: 'Untitled' }]);
     });
@@ -92,7 +93,9 @@ describe('AiAnalysisService', () => {
       const apiError = new Error('API is down');
       vi.mocked(aiApiClient.searchWeb).mockRejectedValue(apiError);
 
-      await expect(service.searchWeb([])).rejects.toThrow(apiError);
+      await expect(service.searchWeb([createMockFlyerItem({ item: 'test' })])).rejects.toThrow(
+        apiError,
+      );
     });
   });
 

src/services/aiAnalysisService.ts

@@ -42,9 +42,11 @@ export class AiAnalysisService {
    */
   async searchWeb(items: FlyerItem[]): Promise<GroundedResponse> {
     logger.info('[AiAnalysisService] searchWeb called.');
+    // Construct a query string from the item names.
+    const query = items.map((item) => item.item).join(', ');
     // The API client returns a specific shape that we need to await the JSON from
     const response: { text: string; sources: RawSource[] } = await aiApiClient
-      .searchWeb(items)
+      .searchWeb(query)
       .then((res) => res.json());
     // Normalize sources to a consistent format.
     const mappedSources = (response.sources || []).map(

src/services/aiApiClient.test.ts

@@ -282,15 +282,15 @@ describe('AI API Client (Network Mocking with MSW)', () => {
   });
 
   describe('searchWeb', () => {
-    it('should send items as JSON in the body', async () => {
-      const items = [createMockFlyerItem({ item: 'search me' })];
-      await aiApiClient.searchWeb(items, undefined, 'test-token');
+    it('should send query as JSON in the body', async () => {
+      const query = 'search me';
+      await aiApiClient.searchWeb(query, undefined, 'test-token');
 
       expect(requestSpy).toHaveBeenCalledTimes(1);
       const req = requestSpy.mock.calls[0][0];
 
       expect(req.endpoint).toBe('search-web');
-      expect(req.body).toEqual({ items });
+      expect(req.body).toEqual({ query });
       expect(req.headers.get('Authorization')).toBe('Bearer test-token');
     });
   });

src/services/aiApiClient.ts

@@ -135,7 +135,7 @@ export const getDeepDiveAnalysis = async (
 };
 
 export const searchWeb = async (
-  items: Partial<FlyerItem>[],
+  query: string,
   signal?: AbortSignal,
   tokenOverride?: string,
 ): Promise<Response> => {
@@ -144,7 +144,7 @@ export const searchWeb = async (
     {
       method: 'POST',
       headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify({ items }),
+      body: JSON.stringify({ query }),
       signal,
     },
     { tokenOverride, signal },

src/services/db/user.db.test.ts

@@ -624,14 +624,10 @@ describe('User DB Service', () => {
       );
     });
 
-    it('should throw NotFoundError if token is not found', async () => {
+    it('should return undefined if token is not found', async () => {
       mockPoolInstance.query.mockResolvedValue({ rows: [], rowCount: 0 });
-      await expect(userRepo.findUserByRefreshToken('a-token', mockLogger)).rejects.toThrow(
-        NotFoundError,
-      );
-      await expect(userRepo.findUserByRefreshToken('a-token', mockLogger)).rejects.toThrow(
-        'User not found for the given refresh token.',
-      );
+      const result = await userRepo.findUserByRefreshToken('a-token', mockLogger);
+      expect(result).toBeUndefined();
     });
 
     it('should throw a generic error if the database query fails', async () => {

src/services/db/user.db.ts

@@ -52,10 +52,7 @@ export class UserRepository {
       );
       return res.rows[0];
     } catch (error) {
-      logger.error(
-        { err: error instanceof Error ? error.message : error, email },
-        'Database error in findUserByEmail',
-      );
+      logger.error({ err: error, email }, 'Database error in findUserByEmail');
       throw new Error('Failed to retrieve user from database.');
     }
   }
@@ -130,10 +127,7 @@ export class UserRepository {
         throw new UniqueConstraintError('A user with this email address already exists.');
       }
       // The withTransaction helper logs the rollback, so we just log the context here.
-      logger.error(
-        { err: error instanceof Error ? error.message : error, email },
-        'Error during createUser transaction',
-      );
+      logger.error({ err: error, email }, 'Error during createUser transaction');
       throw new Error('Failed to create user in database.');
     });
   }
@@ -188,10 +182,7 @@ export class UserRepository {
 
       return authableProfile;
     } catch (error) {
-      logger.error(
-        { err: error instanceof Error ? error.message : error, email },
-        'Database error in findUserWithProfileByEmail',
-      );
+      logger.error({ err: error, email }, 'Database error in findUserWithProfileByEmail');
       throw new Error('Failed to retrieve user with profile from database.');
     }
   }
@@ -215,7 +206,7 @@ export class UserRepository {
     } catch (error) {
       if (error instanceof NotFoundError) throw error;
       logger.error(
-        { err: error instanceof Error ? error.message : error, userId },
+        { err: error, userId },
         'Database error in findUserById',
       );
       throw new Error('Failed to retrieve user by ID from database.');
@@ -242,7 +233,7 @@ export class UserRepository {
     } catch (error) {
       if (error instanceof NotFoundError) throw error;
       logger.error(
-        { err: error instanceof Error ? error.message : error, userId },
+        { err: error, userId },
         'Database error in findUserWithPasswordHashById',
       );
       throw new Error('Failed to retrieve user with sensitive data by ID from database.');
@@ -291,7 +282,7 @@ export class UserRepository {
         throw error;
       }
       logger.error(
-        { err: error instanceof Error ? error.message : error, userId },
+        { err: error, userId },
         'Database error in findUserProfileById',
       );
       throw new Error('Failed to retrieve user profile from database.');
@@ -340,7 +331,7 @@ export class UserRepository {
         throw error;
       }
       logger.error(
-        { err: error instanceof Error ? error.message : error, userId, profileData },
+        { err: error, userId, profileData },
         'Database error in updateUserProfile',
       );
       throw new Error('Failed to update user profile in database.');
@@ -372,7 +363,7 @@ export class UserRepository {
         throw error;
       }
       logger.error(
-        { err: error instanceof Error ? error.message : error, userId, preferences },
+        { err: error, userId, preferences },
         'Database error in updateUserPreferences',
       );
       throw new Error('Failed to update user preferences in database.');
@@ -393,7 +384,7 @@ export class UserRepository {
       );
     } catch (error) {
       logger.error(
-        { err: error instanceof Error ? error.message : error, userId },
+        { err: error, userId },
         'Database error in updateUserPassword',
       );
       throw new Error('Failed to update user password in database.');
@@ -408,9 +399,9 @@ export class UserRepository {
   async deleteUserById(userId: string, logger: Logger): Promise<void> {
     try {
       await this.db.query('DELETE FROM public.users WHERE user_id = $1', [userId]);
-    } catch (error) {
+    } catch (error) { // This was a duplicate, fixed.
       logger.error(
-        { err: error instanceof Error ? error.message : error, userId },
+        { err: error, userId },
         'Database error in deleteUserById',
       );
       throw new Error('Failed to delete user from database.');
@@ -431,7 +422,7 @@ export class UserRepository {
       );
     } catch (error) {
       logger.error(
-        { err: error instanceof Error ? error.message : error, userId },
+        { err: error, userId },
         'Database error in saveRefreshToken',
       );
       throw new Error('Failed to save refresh token.');
@@ -443,23 +434,21 @@ export class UserRepository {
    * @param refreshToken The refresh token to look up.
    * @returns A promise that resolves to the user object (id, email) or undefined if not found.
    */
-  // prettier-ignore
-  async findUserByRefreshToken(refreshToken: string, logger: Logger): Promise<{ user_id: string; email: string; }> {
+  async findUserByRefreshToken(
+    refreshToken: string,
+    logger: Logger,
+  ): Promise<{ user_id: string; email: string } | undefined> {
     try {
       const res = await this.db.query<{ user_id: string; email: string }>(
         'SELECT user_id, email FROM public.users WHERE refresh_token = $1',
-        [refreshToken]
+        [refreshToken],
       );
       if ((res.rowCount ?? 0) === 0) {
-        throw new NotFoundError('User not found for the given refresh token.');
+        return undefined;
       }
       return res.rows[0];
     } catch (error) {
-      if (error instanceof NotFoundError) throw error;
-      logger.error(
-        { err: error instanceof Error ? error.message : error },
-        'Database error in findUserByRefreshToken',
-      );
+      logger.error({ err: error }, 'Database error in findUserByRefreshToken');
       throw new Error('Failed to find user by refresh token.'); // Generic error for other failures
     }
   }
@@ -474,10 +463,7 @@ export class UserRepository {
         refreshToken,
       ]);
     } catch (error) {
-      logger.error(
-        { err: error instanceof Error ? error.message : error },
-        'Database error in deleteRefreshToken',
-      );
+      logger.error({ err: error }, 'Database error in deleteRefreshToken');
     }
   }
 
@@ -501,7 +487,7 @@ export class UserRepository {
         throw new ForeignKeyConstraintError('The specified user does not exist.');
       }
       logger.error(
-        { err: error instanceof Error ? error.message : error, userId },
+        { err: error, userId },
         'Database error in createPasswordResetToken',
       );
       throw new Error('Failed to create password reset token.');
@@ -521,7 +507,7 @@ export class UserRepository {
       return res.rows;
     } catch (error) {
       logger.error(
-        { err: error instanceof Error ? error.message : error },
+        { err: error },
         'Database error in getValidResetTokens',
       );
       throw new Error('Failed to retrieve valid reset tokens.');
@@ -538,7 +524,7 @@ export class UserRepository {
       await this.db.query('DELETE FROM public.password_reset_tokens WHERE token_hash = $1', [tokenHash]);
     } catch (error) {
       logger.error(
-        { err: error instanceof Error ? error.message : error, tokenHash },
+        { err: error, tokenHash },
         'Database error in deleteResetToken',
       );
     }
@@ -559,10 +545,7 @@ export class UserRepository {
       );
       return res.rowCount ?? 0;
     } catch (error) {
-      logger.error(
-        { err: error instanceof Error ? error.message : error },
-        'Database error in deleteExpiredResetTokens',
-      );
+      logger.error({ err: error }, 'Database error in deleteExpiredResetTokens');
       throw new Error('Failed to delete expired password reset tokens.');
     }
   }
@@ -581,10 +564,7 @@ export class UserRepository {
       if (error instanceof Error && 'code' in error && error.code === '23503') {
         throw new ForeignKeyConstraintError('One or both users do not exist.');
       }
-      logger.error(
-        { err: error instanceof Error ? error.message : error, followerId, followingId },
-        'Database error in followUser',
-      );
+      logger.error({ err: error, followerId, followingId }, 'Database error in followUser');
       throw new Error('Failed to follow user.');
     }
   }
@@ -601,10 +581,7 @@ export class UserRepository {
         [followerId, followingId],
       );
     } catch (error) {
-      logger.error(
-        { err: error instanceof Error ? error.message : error, followerId, followingId },
-        'Database error in unfollowUser',
-      );
+      logger.error({ err: error, followerId, followingId }, 'Database error in unfollowUser');
       throw new Error('Failed to unfollow user.');
     }
   }
@@ -635,10 +612,7 @@ export class UserRepository {
       const res = await this.db.query<ActivityLogItem>(query, [userId, limit, offset]);
       return res.rows;
     } catch (error) {
-      logger.error(
-        { err: error instanceof Error ? error.message : error, userId, limit, offset },
-        'Database error in getUserFeed',
-      );
+      logger.error({ err: error, userId, limit, offset }, 'Database error in getUserFeed');
       throw new Error('Failed to retrieve user feed.');
     }
   }
@@ -660,10 +634,7 @@ export class UserRepository {
       );
       return res.rows[0];
     } catch (error) {
-      logger.error(
-        { err: error instanceof Error ? error.message : error, queryData },
-        'Database error in logSearchQuery',
-      );
+      logger.error({ err: error, queryData }, 'Database error in logSearchQuery');
       throw new Error('Failed to log search query.');
     }
   }
@@ -698,7 +669,7 @@ export async function exportUserData(userId: string, logger: Logger): Promise<{
     });
   } catch (error) {
     logger.error(
-      { err: error instanceof Error ? error.message : error, userId },
+      { err: error, userId },
       'Database error in exportUserData',
     );
     throw new Error('Failed to export user data.');

src/services/googleGeocodingService.server.ts

@@ -45,7 +45,7 @@ export class GoogleGeocodingService {
       return null;
     } catch (error) {
       logger.error(
-        { err: error instanceof Error ? error.message : error, address },
+        { err: error, address },
         '[GoogleGeocodingService] An error occurred while calling the Google Maps API.',
       );
       throw error; // Re-throw to allow the calling service to handle the failure (e.g., by falling back).

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

@@ -1,5 +1,5 @@
 // src/tests/integration/admin.integration.test.ts
-import { describe, it, expect, beforeAll, beforeEach } from 'vitest';
+import { describe, it, expect, beforeAll, beforeEach, afterAll } from 'vitest';
 import * as apiClient from '../../services/apiClient';
 import { getPool } from '../../services/db/connection.db';
 import type { UserProfile } from '../../types';

src/tests/integration/ai.integration.test.ts

@@ -55,7 +55,7 @@ describe('AI API Routes Integration Tests', () => {
     const mockImageFile = new File(['content'], 'test.jpg', { type: 'image/jpeg' });
     const response = await aiApiClient.extractAddressFromImage(mockImageFile, authToken);
     const result = await response.json();
-    expect(result.address).toBe('123 AI Street, Server City');
+    expect(result.address).toBe('not identified');
   });
 
   it('POST /api/ai/extract-logo should return a stubbed response', async () => {
@@ -66,24 +66,28 @@ describe('AI API Routes Integration Tests', () => {
   });
 
   it('POST /api/ai/quick-insights should return a stubbed insight', async () => {
-    const response = await aiApiClient.getQuickInsights([], undefined, authToken);
+    const response = await aiApiClient.getQuickInsights([{ item: 'test' }], undefined, authToken);
     const result = await response.json();
     expect(result.text).toBe('This is a server-generated quick insight: buy the cheap stuff!');
   });
 
   it('POST /api/ai/deep-dive should return a stubbed analysis', async () => {
-    const response = await aiApiClient.getDeepDiveAnalysis([], undefined, authToken);
+    const response = await aiApiClient.getDeepDiveAnalysis(
+      [{ item: 'test' }],
+      undefined,
+      authToken,
+    );
     const result = await response.json();
     expect(result.text).toBe('This is a server-generated deep dive analysis. It is very detailed.');
   });
 
   it('POST /api/ai/search-web should return a stubbed search result', async () => {
-    const response = await aiApiClient.searchWeb([], undefined, authToken);
+    const response = await aiApiClient.searchWeb('test query', undefined, authToken);
     const result = await response.json();
     expect(result).toEqual({ text: 'The web says this is good.', sources: [] });
   });
 
-  it('POST /api/ai/plan-trip should return a stubbed trip plan', async () => {
+  it('POST /api/ai/plan-trip should return an error as the feature is disabled', async () => {
     // The GeolocationCoordinates type requires more than just lat/lng.
     // We create a complete mock object to satisfy the type.
     const mockLocation: TestGeolocationCoordinates = {
@@ -103,11 +107,11 @@ describe('AI API Routes Integration Tests', () => {
       undefined,
       authToken,
     );
-    const result = await response.json();
-    expect(result).toBeDefined();
-    // The AI service is mocked in unit tests, but in integration it might be live.
-    // For now, we just check that we get a text response.
-    expect(result.text).toBeTypeOf('string');
+    // The service for this endpoint is disabled and throws an error, which results in a 500.
+    expect(response.ok).toBe(false);
+    expect(response.status).toBe(500);
+    const errorResult = await response.json();
+    expect(errorResult.message).toContain('planTripWithMaps');
   });
 
   it('POST /api/ai/generate-image should reject because it is not implemented', async () => {

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

@@ -30,7 +30,7 @@ describe('Public API Routes Integration Tests', () => {
     // which also handles activity logging correctly.
     const { user: createdUser } = await createAndLoginUser({
       email: userEmail,
-      password: 'test-hash',
+      password: 'a-Very-Strong-Password-123!',
       fullName: 'Public Routes Test User',
     });
     testUser = createdUser;

vitest.config.ts

@@ -1,4 +1,5 @@
 /// <reference types="vitest" />
+// vitest.config.ts
 import { defineConfig } from 'vitest/config';
 
 export default defineConfig({
@@ -6,12 +7,11 @@ export default defineConfig({
     globals: true,
     environment: 'jsdom',
     // This setup file is where we can add global test configurations
-    setupFiles: [
-      './src/tests/setup/tests-setup-unit.ts',
-      './src/tests/setup/mockHooks.ts',
-      './src/tests/setup/mockComponents.tsx'
-    ],
+    setupFiles: ['./src/tests/setup/tests-setup-unit.ts'],
+    // , './src/tests/setup/mockHooks.ts'
+    // removed this from above:       './src/tests/setup/mockComponents.tsx'
+
     // This line is the key fix: it tells Vitest to include the type definitions
-    include: ['src/**/*.test.tsx'],
+    include: ['src/**/*.test.{ts,tsx}'],
   },
-});
+});