ci: Bump version to 0.0.11 [skip ci]

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

@@ -51,7 +51,14 @@ jobs:
 
           # Bump the patch version number. This creates a new commit and a new tag.
           # The commit message includes [skip ci] to prevent this push from triggering another workflow run.
-          npm version patch -m "ci: Bump version to %s [skip ci]"
+          # If the tag already exists (e.g. re-running a failed job), we skip the conflicting version.
+          if ! npm version patch -m "ci: Bump version to %s [skip ci]"; then
+            echo "⚠️ Version bump failed (likely tag exists). Attempting to skip to next version..."
+            # Bump package.json to the conflicting version without git tagging
+            npm version patch --no-git-tag-version > /dev/null
+            # Bump again to the next version, forcing it because the directory is now dirty
+            npm version patch -m "ci: Bump version to %s [skip ci]" --force
+          fi
 
           # Push the new commit and the new tag back to the main branch.
           git push --follow-tags

package-lock.json

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

src/routes/auth.routes.test.ts

@@ -192,7 +192,7 @@ describe('Auth Routes (/api/auth)', () => {
       // Assert
       expect(response.status).toBe(201);
       expect(response.body.message).toBe('User registered successfully!');
-      expect(response.body.user.email).toBe(newUserEmail);
+      expect(response.body.userprofile.user.email).toBe(newUserEmail);
       expect(response.body.token).toBeTypeOf('string'); // This was a duplicate, fixed.
       expect(db.userRepo.createUser).toHaveBeenCalled();
     });
@@ -295,7 +295,7 @@ describe('Auth Routes (/api/auth)', () => {
       // Assert
       expect(response.status).toBe(200);
       // The API now returns a nested UserProfile object
-      expect(response.body.user).toEqual(
+      expect(response.body.userprofile).toEqual(
         expect.objectContaining({
           user_id: 'user-123',
           user: expect.objectContaining({

src/routes/system.routes.test.ts

@@ -1,10 +1,10 @@
 // src/routes/system.routes.test.ts
 import { describe, it, expect, vi, beforeEach } from 'vitest';
 import supertest from 'supertest';
-import { exec, type ExecException, type ExecOptions } from 'child_process'; // Keep this for mocking
+import systemRouter from './system.routes'; // This was a duplicate, fixed.
+import { exec, type ExecException, type ExecOptions } from 'child_process';
 import { geocodingService } from '../services/geocodingService.server';
 import { createTestApp } from '../tests/utils/createTestApp';
-import { mockLogger } from '../tests/utils/mockLogger';
 
 // FIX: Use the simple factory pattern for child_process to avoid default export issues
 vi.mock('child_process', () => {
@@ -30,12 +30,15 @@ vi.mock('../services/geocodingService.server', () => ({
 
 // 3. Mock Logger
 vi.mock('../services/logger.server', () => ({
-  logger: mockLogger,
+  logger: {
+    info: vi.fn(),
+    debug: vi.fn(),
+    error: vi.fn(),
+    warn: vi.fn(),
+    child: vi.fn().mockReturnThis(),
+  },
 }));
 
-// Import the router AFTER all mocks are defined.
-import systemRouter from './system.routes';
-
 describe('System Routes (/api/system)', () => {
   const app = createTestApp({ router: systemRouter, basePath: '/api/system' });
 

src/routes/system.routes.ts

@@ -1,4 +1,4 @@
-// src/routes/system.ts
+// src/routes/system.routes.ts
 import { Router, Request, Response, NextFunction } from 'express';
 import { exec } from 'child_process';
 import { z } from 'zod';

src/services/aiService.server.ts

@@ -128,7 +128,7 @@ export class AIService {
       // This preserves the dependency injection pattern used throughout the class.
       this.aiClient = genAI
         ? {
-            generateContent: (request) => {
+            generateContent: async (request) => {
               // The model name is now injected here, into every call, as the new SDK requires.
               // Architectural guard clause: All requests from this service must have content.
               // This prevents sending invalid requests to the API and satisfies TypeScript's strictness.

src/services/db/user.db.ts

@@ -52,7 +52,10 @@ export class UserRepository {
       );
       return res.rows[0];
     } catch (error) {
-      logger.error({ err: error, email }, 'Database error in findUserByEmail');
+      logger.error(
+        { err: error instanceof Error ? error.message : error, email },
+        'Database error in findUserByEmail',
+      );
       throw new Error('Failed to retrieve user from database.');
     }
   }
@@ -127,7 +130,10 @@ 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, email }, 'Error during createUser transaction');
+      logger.error(
+        { err: error instanceof Error ? error.message : error, email },
+        'Error during createUser transaction',
+      );
       throw new Error('Failed to create user in database.');
     });
   }
@@ -182,7 +188,10 @@ export class UserRepository {
 
       return authableProfile;
     } catch (error) {
-      logger.error({ err: error, email }, 'Database error in findUserWithProfileByEmail');
+      logger.error(
+        { err: error instanceof Error ? error.message : error, email },
+        'Database error in findUserWithProfileByEmail',
+      );
       throw new Error('Failed to retrieve user with profile from database.');
     }
   }
@@ -205,7 +214,10 @@ export class UserRepository {
       return res.rows[0];
     } catch (error) {
       if (error instanceof NotFoundError) throw error;
-      logger.error({ err: error, userId }, 'Database error in findUserById');
+      logger.error(
+        { err: error instanceof Error ? error.message : error, userId },
+        'Database error in findUserById',
+      );
       throw new Error('Failed to retrieve user by ID from database.');
     }
   }
@@ -229,7 +241,10 @@ export class UserRepository {
       return res.rows[0];
     } catch (error) {
       if (error instanceof NotFoundError) throw error;
-      logger.error({ err: error, userId }, 'Database error in findUserWithPasswordHashById');
+      logger.error(
+        { err: error instanceof Error ? error.message : error, userId },
+        'Database error in findUserWithPasswordHashById',
+      );
       throw new Error('Failed to retrieve user with sensitive data by ID from database.');
     }
   }
@@ -275,7 +290,10 @@ export class UserRepository {
       if (error instanceof NotFoundError) {
         throw error;
       }
-      logger.error({ err: error, userId }, 'Database error in findUserProfileById');
+      logger.error(
+        { err: error instanceof Error ? error.message : error, userId },
+        'Database error in findUserProfileById',
+      );
       throw new Error('Failed to retrieve user profile from database.');
     }
   }
@@ -321,7 +339,10 @@ export class UserRepository {
       if (error instanceof NotFoundError) {
         throw error;
       }
-      logger.error({ err: error, userId, profileData }, 'Database error in updateUserProfile');
+      logger.error(
+        { err: error instanceof Error ? error.message : error, userId, profileData },
+        'Database error in updateUserProfile',
+      );
       throw new Error('Failed to update user profile in database.');
     }
   }
@@ -350,7 +371,10 @@ export class UserRepository {
       if (error instanceof NotFoundError) {
         throw error;
       }
-      logger.error({ err: error, userId, preferences }, 'Database error in updateUserPreferences');
+      logger.error(
+        { err: error instanceof Error ? error.message : error, userId, preferences },
+        'Database error in updateUserPreferences',
+      );
       throw new Error('Failed to update user preferences in database.');
     }
   }
@@ -368,7 +392,10 @@ export class UserRepository {
         [passwordHash, userId]
       );
     } catch (error) {
-      logger.error({ err: error, userId }, 'Database error in updateUserPassword');
+      logger.error(
+        { err: error instanceof Error ? error.message : error, userId },
+        'Database error in updateUserPassword',
+      );
       throw new Error('Failed to update user password in database.');
     }
   }
@@ -382,7 +409,10 @@ export class UserRepository {
     try {
       await this.db.query('DELETE FROM public.users WHERE user_id = $1', [userId]);
     } catch (error) {
-      logger.error({ err: error, userId }, 'Database error in deleteUserById');
+      logger.error(
+        { err: error instanceof Error ? error.message : error, userId },
+        'Database error in deleteUserById',
+      );
       throw new Error('Failed to delete user from database.');
     }
   }
@@ -400,7 +430,10 @@ export class UserRepository {
         [refreshToken, userId]
       );
     } catch (error) {
-      logger.error({ err: error, userId }, 'Database error in saveRefreshToken');
+      logger.error(
+        { err: error instanceof Error ? error.message : error, userId },
+        'Database error in saveRefreshToken',
+      );
       throw new Error('Failed to save refresh token.');
     }
   }
@@ -423,7 +456,10 @@ export class UserRepository {
       return res.rows[0];
     } catch (error) {
       if (error instanceof NotFoundError) throw error;
-      logger.error({ err: error }, 'Database error in findUserByRefreshToken');
+      logger.error(
+        { err: error instanceof Error ? error.message : error },
+        'Database error in findUserByRefreshToken',
+      );
       throw new Error('Failed to find user by refresh token.'); // Generic error for other failures
     }
   }
@@ -438,7 +474,10 @@ export class UserRepository {
         refreshToken,
       ]);
     } catch (error) {
-      logger.error({ err: error }, 'Database error in deleteRefreshToken');
+      logger.error(
+        { err: error instanceof Error ? error.message : error },
+        'Database error in deleteRefreshToken',
+      );
     }
   }
 
@@ -461,7 +500,10 @@ export class UserRepository {
       if (error instanceof Error && 'code' in error && error.code === '23503') {
         throw new ForeignKeyConstraintError('The specified user does not exist.');
       }
-      logger.error({ err: error, userId }, 'Database error in createPasswordResetToken');
+      logger.error(
+        { err: error instanceof Error ? error.message : error, userId },
+        'Database error in createPasswordResetToken',
+      );
       throw new Error('Failed to create password reset token.');
     }
   }
@@ -478,7 +520,10 @@ export class UserRepository {
       );
       return res.rows;
     } catch (error) {
-      logger.error({ err: error }, 'Database error in getValidResetTokens');
+      logger.error(
+        { err: error instanceof Error ? error.message : error },
+        'Database error in getValidResetTokens',
+      );
       throw new Error('Failed to retrieve valid reset tokens.');
     }
   }
@@ -492,7 +537,10 @@ export class UserRepository {
     try {
       await this.db.query('DELETE FROM public.password_reset_tokens WHERE token_hash = $1', [tokenHash]);
     } catch (error) {
-      logger.error({ err: error, tokenHash }, 'Database error in deleteResetToken');
+      logger.error(
+        { err: error instanceof Error ? error.message : error, tokenHash },
+        'Database error in deleteResetToken',
+      );
     }
   }
 
@@ -511,7 +559,10 @@ export class UserRepository {
       );
       return res.rowCount ?? 0;
     } catch (error) {
-      logger.error({ err: error }, 'Database error in deleteExpiredResetTokens');
+      logger.error(
+        { err: error instanceof Error ? error.message : error },
+        'Database error in deleteExpiredResetTokens',
+      );
       throw new Error('Failed to delete expired password reset tokens.');
     }
   }
@@ -530,7 +581,10 @@ 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, followerId, followingId }, 'Database error in followUser');
+      logger.error(
+        { err: error instanceof Error ? error.message : error, followerId, followingId },
+        'Database error in followUser',
+      );
       throw new Error('Failed to follow user.');
     }
   }
@@ -547,7 +601,10 @@ export class UserRepository {
         [followerId, followingId],
       );
     } catch (error) {
-      logger.error({ err: error, followerId, followingId }, 'Database error in unfollowUser');
+      logger.error(
+        { err: error instanceof Error ? error.message : error, followerId, followingId },
+        'Database error in unfollowUser',
+      );
       throw new Error('Failed to unfollow user.');
     }
   }
@@ -578,7 +635,10 @@ export class UserRepository {
       const res = await this.db.query<ActivityLogItem>(query, [userId, limit, offset]);
       return res.rows;
     } catch (error) {
-      logger.error({ err: error, userId, limit, offset }, 'Database error in getUserFeed');
+      logger.error(
+        { err: error instanceof Error ? error.message : error, userId, limit, offset },
+        'Database error in getUserFeed',
+      );
       throw new Error('Failed to retrieve user feed.');
     }
   }
@@ -600,7 +660,10 @@ export class UserRepository {
       );
       return res.rows[0];
     } catch (error) {
-      logger.error({ err: error, queryData }, 'Database error in logSearchQuery');
+      logger.error(
+        { err: error instanceof Error ? error.message : error, queryData },
+        'Database error in logSearchQuery',
+      );
       throw new Error('Failed to log search query.');
     }
   }
@@ -634,7 +697,10 @@ export async function exportUserData(userId: string, logger: Logger): Promise<{
       return { profile, watchedItems, shoppingLists };
     });
   } catch (error) {
-    logger.error({ err: error, userId }, 'Database error in exportUserData');
+    logger.error(
+      { err: error instanceof Error ? error.message : error, userId },
+      'Database error in exportUserData',
+    );
     throw new Error('Failed to export user data.');
   }
 }

src/services/geocodingService.server.test.ts

@@ -87,7 +87,7 @@ describe('Geocoding Service', () => {
       // Assert
       expect(result).toEqual(coordinates);
       expect(logger.error).toHaveBeenCalledWith(
-        { err: expect.any(Error), cacheKey: expect.any(String) },
+        { err: 'Redis down', cacheKey: expect.any(String) },
         'Redis GET or JSON.parse command failed. Proceeding without cache.',
       );
       expect(mockGoogleService.geocode).toHaveBeenCalled(); // Should still proceed to fetch
@@ -107,7 +107,7 @@ describe('Geocoding Service', () => {
       expect(mocks.mockRedis.get).toHaveBeenCalledWith(cacheKey);
       // The service should log the JSON parsing error and continue
       expect(logger.error).toHaveBeenCalledWith(
-        { err: expect.any(SyntaxError), cacheKey: expect.any(String) },
+        { err: expect.any(String), cacheKey: expect.any(String) },
         'Redis GET or JSON.parse command failed. Proceeding without cache.',
       );
       expect(mockGoogleService.geocode).toHaveBeenCalledTimes(1);
@@ -185,7 +185,7 @@ describe('Geocoding Service', () => {
       // Assert
       expect(result).toEqual(coordinates);
       expect(logger.error).toHaveBeenCalledWith(
-        { err: expect.any(Error) },
+        { err: 'Network Error' },
         expect.stringContaining('An error occurred while calling the Google Maps Geocoding API'),
       );
       expect(mockNominatimService.geocode).toHaveBeenCalledWith(address, logger);
@@ -223,7 +223,7 @@ describe('Geocoding Service', () => {
       expect(mockGoogleService.geocode).toHaveBeenCalledTimes(1);
       expect(mocks.mockRedis.set).toHaveBeenCalledTimes(1);
       expect(logger.error).toHaveBeenCalledWith(
-        { err: expect.any(Error), cacheKey: expect.any(String) },
+        { err: 'Redis SET failed', cacheKey: expect.any(String) },
         'Redis SET command failed. Result will not be cached.',
       );
     });
@@ -271,7 +271,7 @@ describe('Geocoding Service', () => {
       // Act & Assert
       await expect(geocodingService.clearGeocodeCache(logger)).rejects.toThrow(redisError);
       expect(logger.error).toHaveBeenCalledWith(
-        { err: redisError },
+        { err: redisError.message },
         'Failed to clear geocode cache from Redis.',
       );
       expect(mocks.mockRedis.del).not.toHaveBeenCalled();

src/services/geocodingService.server.ts

@@ -26,7 +26,7 @@ export class GeocodingService {
       }
     } catch (error) {
       logger.error(
-        { err: error, cacheKey },
+        { err: error instanceof Error ? error.message : error, cacheKey },
         'Redis GET or JSON.parse command failed. Proceeding without cache.',
       );
     }
@@ -44,7 +44,7 @@ export class GeocodingService {
         );
       } catch (error) {
         logger.error(
-          { err: error },
+          { err: error instanceof Error ? error.message : error },
           'An error occurred while calling the Google Maps Geocoding API. Falling back to Nominatim.',
         );
       }
@@ -73,7 +73,7 @@ export class GeocodingService {
       await redis.set(cacheKey, JSON.stringify(result), 'EX', 60 * 60 * 24 * 30); // Cache for 30 days
     } catch (error) {
       logger.error(
-        { err: error, cacheKey },
+        { err: error instanceof Error ? error.message : error, cacheKey },
         'Redis SET command failed. Result will not be cached.',
       );
     }
@@ -98,7 +98,10 @@ export class GeocodingService {
       logger.info(`Successfully deleted ${totalDeleted} geocode cache entries.`);
       return totalDeleted;
     } catch (error) {
-      logger.error({ err: error }, 'Failed to clear geocode cache from Redis.');
+      logger.error(
+        { err: error instanceof Error ? error.message : error },
+        'Failed to clear geocode cache from Redis.',
+      );
       throw error;
     }
   }

src/services/googleGeocodingService.server.ts

@@ -45,7 +45,7 @@ export class GoogleGeocodingService {
       return null;
     } catch (error) {
       logger.error(
-        { err: error, address },
+        { err: error instanceof Error ? error.message : 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).