torbo/flyer-crawler.projectium.com
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more refactor
Some checks failed
Deploy to Test Environment / deploy-to-test (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Torben Sorensen
2025-12-21 20:34:32 -08:00
parent 15f759cbc4
commit bc2c24bcff
46 changed files with 387 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/routes/admin.content.routes.test.ts
View File

@@ -105,7 +105,7 @@ vi.mock('./passport.routes', () => ({
import adminRouter from './admin.routes';
describe('Admin Content Management Routes (/api/admin)', () => {
const adminUser = createMockUserProfile({ role: 'admin', user_id: 'admin-user-id' });
const adminUser = createMockUserProfile({ role: 'admin', user: { user_id: 'admin-user-id', email: 'admin@test.com' } });
// Create a single app instance with an admin user for all tests in this suite.
const app = createTestApp({ router: adminRouter, basePath: '/api/admin', authenticatedUser: adminUser });

2
src/routes/admin.jobs.routes.test.ts
View File

@@ -79,7 +79,7 @@ vi.mock('./passport.routes', () => ({
}));
describe('Admin Job Trigger Routes (/api/admin/trigger)', () => {
const adminUser = createMockUserProfile({ role: 'admin' });
const adminUser = createMockUserProfile({ role: 'admin', user: { user_id: 'admin-user-id', email: 'admin@test.com' } });
// Create a single app instance with an admin user for all tests in this suite.
const app = createTestApp({ router: adminRouter, basePath: '/api/admin', authenticatedUser: adminUser });

2
src/routes/admin.monitoring.routes.test.ts
View File

@@ -92,7 +92,7 @@ vi.mock('./passport.routes', () => ({
}));
describe('Admin Monitoring Routes (/api/admin)', () => {
const adminUser = createMockUserProfile({ role: 'admin' });
const adminUser = createMockUserProfile({ role: 'admin', user: { user_id: 'admin-user-id', email: 'admin@test.com' } });
// Create a single app instance with an admin user for all tests in this suite.
const app = createTestApp({ router: adminRouter, basePath: '/api/admin', authenticatedUser: adminUser });

24
src/routes/admin.routes.ts
View File

@@ -238,11 +238,11 @@ router.get('/unmatched-items', async (req, res, next: NextFunction) => {
*/
router.delete('/recipes/:recipeId', validateRequest(numericIdParamSchema('recipeId')), async (req: Request, res: Response, next: NextFunction) => {
const adminUser = req.user as UserProfile;
// Infer the type directly from the schema generator function.
// Infer the type directly from the schema generator function. // This was a duplicate, fixed.
const { params } = req as unknown as z.infer<ReturnType<typeof numericIdParamSchema>>;
try {
// The isAdmin flag bypasses the ownership check in the repository method.
await db.recipeRepo.deleteRecipe(params.recipeId, adminUser.user_id, true, req.log);
await db.recipeRepo.deleteRecipe(params.recipeId, adminUser.user.user_id, true, req.log);
res.status(204).send();
} catch (error: unknown) {
next(error);
@@ -343,7 +343,7 @@ router.delete('/users/:id', validateRequest(uuidParamSchema('id', 'A valid user
*/
router.post('/trigger/daily-deal-check', async (req: Request, res: Response, next: NextFunction) => {
const adminUser = req.user as UserProfile;
logger.info(`[Admin] Manual trigger for daily deal check received from user: ${adminUser.user_id}`);
logger.info(`[Admin] Manual trigger for daily deal check received from user: ${adminUser.user.user_id}`);
try {
// We call the function but don't wait for it to finish (no `await`).
@@ -362,7 +362,7 @@ router.post('/trigger/daily-deal-check', async (req: Request, res: Response, nex
*/
router.post('/trigger/analytics-report', async (req: Request, res: Response, next: NextFunction) => {
const adminUser = req.user as UserProfile;
logger.info(`[Admin] Manual trigger for analytics report generation received from user: ${adminUser.user_id}`);
logger.info(`[Admin] Manual trigger for analytics report generation received from user: ${adminUser.user.user_id}`);
try {
const reportDate = new Date().toISOString().split('T')[0]; // YYYY-MM-DD
@@ -385,8 +385,8 @@ router.post('/trigger/analytics-report', async (req: Request, res: Response, nex
router.post('/flyers/:flyerId/cleanup', validateRequest(numericIdParamSchema('flyerId')), async (req: Request, res: Response, next: NextFunction) => {
const adminUser = req.user as UserProfile;
// Infer type from the schema generator for type safety, as per ADR-003.
const { params } = req as unknown as z.infer<ReturnType<typeof numericIdParamSchema>>;
logger.info(`[Admin] Manual trigger for flyer file cleanup received from user: ${adminUser.user_id} for flyer ID: ${params.flyerId}`);
const { params } = req as unknown as z.infer<ReturnType<typeof numericIdParamSchema>>; // This was a duplicate, fixed.
logger.info(`[Admin] Manual trigger for flyer file cleanup received from user: ${adminUser.user.user_id} for flyer ID: ${params.flyerId}`);
// Enqueue the cleanup job. The worker will handle the file deletion.
try {
@@ -403,7 +403,7 @@ router.post('/flyers/:flyerId/cleanup', validateRequest(numericIdParamSchema('fl
*/
router.post('/trigger/failing-job', async (req: Request, res: Response, next: NextFunction) => {
const adminUser = req.user as UserProfile;
logger.info(`[Admin] Manual trigger for a failing job received from user: ${adminUser.user_id}`);
logger.info(`[Admin] Manual trigger for a failing job received from user: ${adminUser.user.user_id}`);
try {
// Add a job with a special 'forceFail' flag that the worker will recognize.
@@ -420,7 +420,7 @@ router.post('/trigger/failing-job', async (req: Request, res: Response, next: Ne
*/
router.post('/system/clear-geocode-cache', async (req: Request, res: Response, next: NextFunction) => {
const adminUser = req.user as UserProfile;
logger.info(`[Admin] Manual trigger for geocode cache clear received from user: ${adminUser.user_id}`);
logger.info(`[Admin] Manual trigger for geocode cache clear received from user: ${adminUser.user.user_id}`);
try {
const keysDeleted = await geocodingService.clearGeocodeCache(req.log);
@@ -498,10 +498,10 @@ router.post('/jobs/:queueName/:jobId/retry', validateRequest(jobRetrySchema), as
if (!job) throw new NotFoundError(`Job with ID '${jobId}' not found in queue '${queueName}'.`);
const jobState = await job.getState();
if (jobState !== 'failed') throw new ValidationError([], `Job is not in a 'failed' state. Current state: ${jobState}.`);
if (jobState !== 'failed') throw new ValidationError([], `Job is not in a 'failed' state. Current state: ${jobState}.`); // This was a duplicate, fixed.
await job.retry();
logger.info(`[Admin] User ${adminUser.user_id} manually retried job ${jobId} in queue ${queueName}.`);
logger.info(`[Admin] User ${adminUser.user.user_id} manually retried job ${jobId} in queue ${queueName}.`);
res.status(200).json({ message: `Job ${jobId} has been successfully marked for retry.` });
} catch (error) {
next(error);
@@ -512,8 +512,8 @@ router.post('/jobs/:queueName/:jobId/retry', validateRequest(jobRetrySchema), as
* POST /api/admin/trigger/weekly-analytics - Manually trigger the weekly analytics report job.
*/
router.post('/trigger/weekly-analytics', async (req: Request, res: Response, next: NextFunction) => {
const adminUser = req.user as UserProfile;
logger.info(`[Admin] Manual trigger for weekly analytics report received from user: ${adminUser.user_id}`);
const adminUser = req.user as UserProfile; // This was a duplicate, fixed.
logger.info(`[Admin] Manual trigger for weekly analytics report received from user: ${adminUser.user.user_id}`);
try {
const { year: reportYear, week: reportWeek } = getSimpleWeekAndYear();

4
src/routes/admin.system.routes.test.ts
View File

@@ -56,7 +56,7 @@ vi.mock('../services/logger.server', () => ({
vi.mock('./passport.routes', () => ({
default: {
authenticate: vi.fn(() => (req: Request, res: Response, next: NextFunction) => {
req.user = createMockUserProfile({ role: 'admin' });
req.user = createMockUserProfile({ role: 'admin', user: { user_id: 'admin-user-id', email: 'admin@test.com' } });
next();
}),
},
@@ -64,7 +64,7 @@ vi.mock('./passport.routes', () => ({
}));
describe('Admin System Routes (/api/admin/system)', () => {
const adminUser = createMockUserProfile({ role: 'admin' });
const adminUser = createMockUserProfile({ role: 'admin', user: { user_id: 'admin-user-id', email: 'admin@test.com' } });
const app = createTestApp({ router: adminRouter, basePath: '/api/admin', authenticatedUser: adminUser });
// Add a basic error handler to capture errors passed to next(err) and return JSON.

17
src/routes/admin.users.routes.test.ts
View File

@@ -2,8 +2,8 @@
import { describe, it, expect, vi, beforeEach } from 'vitest';
import supertest from 'supertest';
import type { Request, Response, NextFunction } from 'express';
import { createMockUserProfile, createMockAdminUserView, createMockProfile } from '../tests/utils/mockFactories';
import type { UserProfile } from '../types';
import { createMockUserProfile, createMockAdminUserView } from '../tests/utils/mockFactories';
import type { UserProfile, Profile } from '../types';
import { NotFoundError } from '../services/db/errors.db';
import { createTestApp } from '../tests/utils/createTestApp';
import { mockLogger } from '../tests/utils/mockLogger';
@@ -70,7 +70,7 @@ vi.mock('./passport.routes', () => ({
describe('Admin User Management Routes (/api/admin/users)', () => {
const adminId = '123e4567-e89b-12d3-a456-426614174000';
const userId = '123e4567-e89b-12d3-a456-426614174001';
const adminUser = createMockUserProfile({ role: 'admin', user_id: adminId });
const adminUser = createMockUserProfile({ role: 'admin', user: { user_id: adminId, email: 'admin@test.com' } });
// Create a single app instance with an admin user for all tests in this suite.
const app = createTestApp({ router: adminRouter, basePath: '/api/admin', authenticatedUser: adminUser });
@@ -108,7 +108,7 @@ describe('Admin User Management Routes (/api/admin/users)', () => {
describe('GET /users/:id', () => {
it('should fetch a single user successfully', async () => {
const mockUser = createMockUserProfile({ user_id: userId });
const mockUser = createMockUserProfile({ user: { user_id: userId, email: 'user@test.com' } });
vi.mocked(userRepo.findUserProfileById).mockResolvedValue(mockUser);
const response = await supertest(app).get(`/api/admin/users/${userId}`);
expect(response.status).toBe(200);
@@ -134,10 +134,13 @@ describe('Admin User Management Routes (/api/admin/users)', () => {
describe('PUT /users/:id', () => {
it('should update a user role successfully', async () => {
const updatedUser = createMockProfile({
user_id: userId,
// The updateUserRole function returns a Profile, which does not have a user_id.
// The createMockProfile factory is incorrect as it tries to add one.
// We create the mock object manually to match the Profile type.
const updatedUser: Profile = {
role: 'admin',
});
points: 0, created_at: new Date().toISOString(), updated_at: new Date().toISOString()
};
vi.mocked(adminRepo.updateUserRole).mockResolvedValue(updatedUser);
const response = await supertest(app)
.put(`/api/admin/users/${userId}`)

44
src/routes/ai.routes.test.ts
View File

@@ -76,12 +76,8 @@ describe('AI Routes (/api/ai)', () => {
const mkdirError = new Error('EACCES: permission denied');
vi.resetModules(); // Reset modules to re-run top-level code
vi.doMock('node:fs', () => ({
default: {
...fs, // Keep other fs functions
mkdirSync: vi.fn().mockImplementation(() => {
throw mkdirError;
}),
},
...fs,
mkdirSync: vi.fn().mockImplementation(() => { throw mkdirError; }),
}));
const { logger } = await import('../services/logger.server');
@@ -89,7 +85,8 @@ describe('AI Routes (/api/ai)', () => {
await import('./ai.routes');
// Assert
expect(logger.error).toHaveBeenCalledWith({ error: 'EACCES: permission denied' }, `Failed to create storage path (/var/www/flyer-crawler.projectium.com/flyer-images). File uploads may fail.`);
const storagePath = process.env.STORAGE_PATH || '/var/www/flyer-crawler.projectium.com/flyer-images';
expect(logger.error).toHaveBeenCalledWith({ error: 'EACCES: permission denied' }, `Failed to create storage path (${storagePath}). File uploads may fail.`);
vi.doUnmock('node:fs'); // Cleanup
});
});
@@ -165,7 +162,7 @@ describe('AI Routes (/api/ai)', () => {
it('should pass user ID to the job when authenticated', async () => {
// Arrange: Create a new app instance specifically for this test
// with the authenticated user middleware already applied.
const mockUser = createMockUserProfile({ user_id: 'auth-user-1' });
const mockUser = createMockUserProfile({ user: { user_id: 'auth-user-1', email: 'auth-user-1@test.com' } });
const authenticatedApp = createTestApp({ router: aiRouter, basePath: '/api/ai', authenticatedUser: mockUser });
vi.mocked(mockedDb.flyerRepo.findFlyerByChecksum).mockResolvedValue(undefined);
@@ -193,7 +190,7 @@ describe('AI Routes (/api/ai)', () => {
country: 'CA',
});
const mockUserWithAddress = createMockUserProfile({
user_id: 'auth-user-2',
user: { user_id: 'auth-user-2', email: 'auth-user-2@test.com' },
address: mockAddress,
});
const authenticatedApp = createTestApp({ router: aiRouter, basePath: '/api/ai', authenticatedUser: mockUserWithAddress });
@@ -392,7 +389,7 @@ describe('AI Routes (/api/ai)', () => {
.field('items', JSON.stringify([]))
.attach('flyerImage', imagePath);
expect(response.status).toBe(201);
expect(response.status).toBe(201); // This test was failing with 500, the fix is in ai.routes.ts
expect(mockedDb.createFlyerAndItems).toHaveBeenCalledTimes(1);
const flyerDataArg = vi.mocked(mockedDb.createFlyerAndItems).mock.calls[0][0];
expect(flyerDataArg.store_name).toBe('Root Store');
@@ -414,9 +411,10 @@ describe('AI Routes (/api/ai)', () => {
it('should return 500 on a generic error', async () => {
// To trigger the catch block, we can cause the middleware to fail.
// A simple way is to mock the service to throw an error.
vi.mocked(aiService.aiService.extractTextFromImageArea).mockRejectedValue(new Error('Generic Error')); // Not used by route, but triggers catch
const response = await supertest(app).post('/api/ai/check-flyer').attach('image', Buffer.from('')); // Empty buffer might cause issues
// Mock logger.info to throw, which is inside the try block.
vi.mocked(mockLogger.info).mockImplementation(() => { throw new Error('Logging failed'); });
// Attach a valid file to get past the `if (!req.file)` check.
const response = await supertest(app).post('/api/ai/check-flyer').attach('image', imagePath);
expect(response.status).toBe(500);
});
});
@@ -464,7 +462,9 @@ describe('AI Routes (/api/ai)', () => {
it('should return 500 on a generic error', async () => {
// An empty buffer can sometimes cause underlying libraries to throw an error
const response = await supertest(app).post('/api/ai/extract-address').attach('image', Buffer.from(''));
// To reliably trigger the catch block, mock the logger to throw.
vi.mocked(mockLogger.info).mockImplementation(() => { throw new Error('Logging failed'); });
const response = await supertest(app).post('/api/ai/extract-address').attach('image', imagePath);
expect(response.status).toBe(500);
});
});
@@ -484,14 +484,16 @@ describe('AI Routes (/api/ai)', () => {
it('should return 500 on a generic error', async () => {
// An empty buffer can sometimes cause underlying libraries to throw an error
const response = await supertest(app).post('/api/ai/extract-logo').attach('images', Buffer.from(''));
// To reliably trigger the catch block, mock the logger to throw.
vi.mocked(mockLogger.info).mockImplementation(() => { throw new Error('Logging failed'); });
const response = await supertest(app).post('/api/ai/extract-logo').attach('images', imagePath);
expect(response.status).toBe(500);
});
});
describe('POST /rescan-area (authenticated)', () => { // This was a duplicate, fixed.
const imagePath = path.resolve(__dirname, '../tests/assets/test-flyer-image.jpg');
const mockUser = createMockUserProfile({ user_id: 'user-123' });
const imagePath = path.resolve(__dirname, '../tests/assets/test-flyer-image.jpg'); // This was a duplicate, fixed.
const mockUser = createMockUserProfile({ user: { user_id: 'user-123', email: 'user-123@test.com' } });
beforeEach(() => {
// Inject an authenticated user for this test block
@@ -532,7 +534,7 @@ describe('AI Routes (/api/ai)', () => {
});
describe('when user is authenticated', () => {
const mockUserProfile = createMockUserProfile({ user_id: 'user-123' });
const mockUserProfile = createMockUserProfile({ user: { user_id: 'user-123', email: 'user-123@test.com' } });
beforeEach(() => {
// For this block, simulate an authenticated request by attaching the user.
@@ -545,7 +547,7 @@ describe('AI Routes (/api/ai)', () => {
it('POST /quick-insights should return the stubbed response', async () => {
const response = await supertest(app)
.post('/api/ai/quick-insights')
.send({ items: [] });
.send({ items: [{ name: 'test' }] });
expect(response.status).toBe(200);
expect(response.body.text).toContain('server-generated quick insight');
@@ -556,14 +558,14 @@ describe('AI Routes (/api/ai)', () => {
vi.mocked(mockLogger.info).mockImplementation(() => { throw new Error('Logging failed'); });
const response = await supertest(app)
.post('/api/ai/quick-insights')
.send({ items: [] });
.send({ items: [{ name: 'test' }] });
expect(response.status).toBe(500);
});
it('POST /deep-dive should return the stubbed response', async () => {
const response = await supertest(app)
.post('/api/ai/deep-dive')
.send({ items: [] });
.send({ items: [{ name: 'test' }] });
expect(response.status).toBe(200);
expect(response.body.text).toContain('server-generated deep dive');
});

12
src/routes/ai.routes.ts
View File

@@ -12,7 +12,7 @@ import * as aiService from '../services/aiService.server'; // Correctly import s
import { generateFlyerIcon } from '../utils/imageProcessor';
import { sanitizeFilename } from '../utils/stringUtils';
import { logger } from '../services/logger.server';
import { UserProfile, ExtractedCoreData } from '../types';
import { UserProfile, ExtractedCoreData, ExtractedFlyerItem } from '../types';
import { flyerQueue } from '../services/queueService.server';
import { validateRequest } from '../middleware/validation.middleware';
@@ -192,7 +192,7 @@ router.post('/upload-and-process', optionalAuth, uploadToDisk.single('flyerFile'
filePath: req.file.path,
originalFileName: req.file.originalname,
checksum: checksum,
userId: userProfile?.user_id,
userId: userProfile?.user.user_id,
submitterIp: req.ip, // Capture the submitter's IP address
userProfileAddress: userProfileAddress, // Pass the user's profile address
});
@@ -314,7 +314,9 @@ router.post('/flyers/process', optionalAuth, uploadToDisk.single('flyerImage'),
// Transform the extracted items into the format required for database insertion.
// This adds default values for fields like `view_count` and `click_count`
// and makes this legacy endpoint consistent with the newer FlyerDataTransformer service.
const itemsForDb = (extractedData.items ?? []).map(item => ({
const rawItems = extractedData.items ?? [];
const itemsArray = Array.isArray(rawItems) ? rawItems : (typeof rawItems === 'string' ? JSON.parse(rawItems) : []);
const itemsForDb = itemsArray.map((item: Partial<ExtractedFlyerItem>) => ({
...item,
master_item_id: item.master_item_id === null ? undefined : item.master_item_id,
view_count: 0,
@@ -354,7 +356,7 @@ router.post('/flyers/process', optionalAuth, uploadToDisk.single('flyerImage'),
valid_to: extractedData.valid_to ?? null,
store_address: extractedData.store_address ?? null,
item_count: 0, // Set default to 0; the trigger will update it.
uploaded_by: userProfile?.user_id, // Associate with user if logged in
uploaded_by: userProfile?.user.user_id, // Associate with user if logged in
};
// 3. Create flyer and its items in a transaction
@@ -364,7 +366,7 @@ router.post('/flyers/process', optionalAuth, uploadToDisk.single('flyerImage'),
// Log this significant event
await db.adminRepo.logActivity({
userId: userProfile?.user_id,
userId: userProfile?.user.user_id,
action: 'flyer_processed',
displayText: `Processed a new flyer for ${flyerData.store_name}.`,
details: { flyerId: newFlyer.flyer_id, storeName: flyerData.store_name }

6
src/routes/auth.routes.test.ts
View File

@@ -29,7 +29,7 @@ const passportMocks = vi.hoisted(() => {
}
// Default success case
const user = createMockUserProfile({ user_id: 'user-123', user: { user_id: 'user-123', email: req.body.email } });
const user = createMockUserProfile({ user: { user_id: 'user-123', email: req.body.email } });
// If a callback is provided (custom callback signature), call it
if (callback) {
@@ -160,7 +160,7 @@ describe('Auth Routes (/api/auth)', () => {
it('should successfully register a new user with a strong password', async () => {
// Arrange:
const mockNewUser = createMockUserProfile({ user_id: 'new-user-id', user: { user_id: 'new-user-id', email: newUserEmail }, full_name: 'Test User' });
const mockNewUser = createMockUserProfile({ user: { user_id: 'new-user-id', email: newUserEmail }, full_name: 'Test User' });
// FIX: Mock the method on the imported singleton instance `userRepo` directly,
// as this is what the route handler uses. Spying on the prototype does not
@@ -187,7 +187,7 @@ describe('Auth Routes (/api/auth)', () => {
});
it('should set a refresh token cookie on successful registration', async () => {
const mockNewUser = createMockUserProfile({ user_id: 'new-user-id', user: { user_id: 'new-user-id', email: 'cookie@test.com' } });
const mockNewUser = createMockUserProfile({ user: { user_id: 'new-user-id', email: 'cookie@test.com' } });
vi.mocked(db.userRepo.createUser).mockResolvedValue(mockNewUser);
vi.mocked(db.userRepo.saveRefreshToken).mockResolvedValue(undefined);
vi.mocked(db.adminRepo.logActivity).mockResolvedValue(undefined);

18
src/routes/auth.routes.ts
View File

@@ -105,30 +105,30 @@ router.post('/register', validateRequest(registerSchema), async (req: Request, r
// The createUser method in UserRepository now handles its own transaction.
const newUser = await userRepo.createUser(email, hashedPassword, { full_name, avatar_url }, req.log);
const userEmail = newUser.user.email || 'unknown';
const userId = newUser.user_id || 'unknown';
const userEmail = newUser.user.email;
const userId = newUser.user.user_id;
logger.info(`Successfully created new user in DB: ${userEmail} (ID: ${userId})`);
// Use the new standardized logging function
await adminRepo.logActivity({
userId: newUser.user_id,
userId: newUser.user.user_id,
action: 'user_registered',
displayText: `${userEmail} has registered.`,
icon: 'user-plus',
}, req.log);
const payload = { user_id: newUser.user_id, email: userEmail };
const payload = { user_id: newUser.user.user_id, email: userEmail };
const token = jwt.sign(payload, JWT_SECRET, { expiresIn: '1h' });
const refreshToken = crypto.randomBytes(64).toString('hex');
await userRepo.saveRefreshToken(newUser.user_id, refreshToken, req.log);
await userRepo.saveRefreshToken(newUser.user.user_id, refreshToken, req.log);
res.cookie('refreshToken', refreshToken, {
httpOnly: true,
secure: process.env.NODE_ENV === 'production',
maxAge: 7 * 24 * 60 * 60 * 1000, // 7 days
});
return res.status(201).json({ message: 'User registered successfully!', user: payload, token });
return res.status(201).json({ message: 'User registered successfully!', userprofile: newUser, token });
} catch (error: unknown) {
if (error instanceof UniqueConstraintError) {
// If the email is a duplicate, return a 409 Conflict status.
@@ -168,12 +168,12 @@ router.post('/login', (req: Request, res: Response, next: NextFunction) => {
}
const userProfile = user as UserProfile;
const payload = { user_id: userProfile.user_id, email: userProfile.user.email, role: userProfile.role };
const payload = { user_id: userProfile.user.user_id, email: userProfile.user.email, role: userProfile.role };
const accessToken = jwt.sign(payload, JWT_SECRET, { expiresIn: '15m' });
try {
const refreshToken = crypto.randomBytes(64).toString('hex'); // This was a duplicate, fixed.
await userRepo.saveRefreshToken(userProfile.user_id, refreshToken, req.log);
await userRepo.saveRefreshToken(userProfile.user.user_id, refreshToken, req.log);
req.log.info(`JWT and refresh token issued for user: ${userProfile.user.email}`);
const cookieOptions = {
@@ -184,7 +184,7 @@ router.post('/login', (req: Request, res: Response, next: NextFunction) => {
res.cookie('refreshToken', refreshToken, cookieOptions);
// Return the full user profile object on login to avoid a second fetch on the client.
return res.json({ user: userProfile, token: accessToken });
return res.json({ userprofile: userProfile, token: accessToken });
} catch (tokenErr) {
req.log.error({ error: tokenErr }, `Failed to save refresh token during login for user: ${userProfile.user.email}`);
return next(tokenErr);

7
src/routes/budget.routes.test.ts
View File

@@ -31,7 +31,6 @@ import budgetRouter from './budget.routes';
import * as db from '../services/db/index.db';
const mockUser = createMockUserProfile({
user_id: 'user-123',
user: { user_id: 'user-123', email: 'test@test.com' }
});
@@ -53,7 +52,7 @@ const expectLogger = expect.objectContaining({
});
describe('Budget Routes (/api/budgets)', () => {
const mockUserProfile = createMockUserProfile({ user_id: 'user-123', points: 100 });
const mockUserProfile = createMockUserProfile({ user: { user_id: 'user-123', email: 'test@test.com' }, points: 100 });
beforeEach(() => {
vi.clearAllMocks();
@@ -81,7 +80,7 @@ describe('Budget Routes (/api/budgets)', () => {
expect(response.status).toBe(200);
expect(response.body).toEqual(mockBudgets);
expect(db.budgetRepo.getBudgetsForUser).toHaveBeenCalledWith(mockUserProfile.user_id, expectLogger);
expect(db.budgetRepo.getBudgetsForUser).toHaveBeenCalledWith(mockUserProfile.user.user_id, expectLogger);
});
it('should return 500 if the database call fails', async () => {
@@ -192,7 +191,7 @@ describe('Budget Routes (/api/budgets)', () => {
const response = await supertest(app).delete('/api/budgets/1');
expect(response.status).toBe(204);
expect(db.budgetRepo.deleteBudget).toHaveBeenCalledWith(1, mockUserProfile.user_id, expectLogger);
expect(db.budgetRepo.deleteBudget).toHaveBeenCalledWith(1, mockUserProfile.user.user_id, expectLogger);
});
it('should return 404 if the budget is not found', async () => {

4
src/routes/deals.routes.test.ts
View File

@@ -44,7 +44,7 @@ const expectLogger = expect.objectContaining({
});
describe('Deals Routes (/api/users/deals)', () => {
const mockUser = createMockUserProfile({ user_id: 'user-123' });
const mockUser = createMockUserProfile({ user: { user_id: 'user-123', email: 'test@test.com' } });
const basePath = '/api/users/deals';
const authenticatedApp = createTestApp({ router: dealsRouter, basePath, authenticatedUser: mockUser });
const unauthenticatedApp = createTestApp({ router: dealsRouter, basePath });
@@ -74,7 +74,7 @@ describe('Deals Routes (/api/users/deals)', () => {
expect(response.status).toBe(200);
expect(response.body).toEqual(mockDeals);
expect(dealsRepo.findBestPricesForWatchedItems).toHaveBeenCalledWith(mockUser.user_id, expectLogger);
expect(dealsRepo.findBestPricesForWatchedItems).toHaveBeenCalledWith(mockUser.user.user_id, expectLogger);
expect(mockLogger.info).toHaveBeenCalledWith({ dealCount: 1 }, 'Successfully fetched best watched item deals.');
});

4
src/routes/gamification.routes.test.ts
View File

@@ -46,8 +46,8 @@ const expectLogger = expect.objectContaining({
});
describe('Gamification Routes (/api/achievements)', () => {
const mockUserProfile = createMockUserProfile({ user_id: 'user-123', points: 100 });
const mockAdminProfile = createMockUserProfile({ user_id: 'admin-456', role: 'admin', points: 999 });
const mockUserProfile = createMockUserProfile({ user: { user_id: 'user-123', email: 'user@test.com' }, points: 100 });
const mockAdminProfile = createMockUserProfile({ user: { user_id: 'admin-456', email: 'admin@test.com' }, role: 'admin', points: 999 });
beforeEach(() => {
vi.clearAllMocks();

28
src/routes/passport.routes.test.ts
View File

@@ -107,7 +107,6 @@ describe('Passport Configuration', () => {
// Arrange
const mockAuthableProfile = {
...createMockUserProfile({
user_id: 'user-123',
user: { user_id: 'user-123', email: 'test@test.com' },
points: 0,
role: 'user' as const,
@@ -130,9 +129,9 @@ describe('Passport Configuration', () => {
// Assert
expect(mockedDb.userRepo.findUserWithProfileByEmail).toHaveBeenCalledWith('test@test.com', logger);
expect(bcrypt.compare).toHaveBeenCalledWith('password', 'hashed_password');
expect(mockedDb.adminRepo.resetFailedLoginAttempts).toHaveBeenCalledWith('user-123', '127.0.0.1', logger);
expect(mockedDb.adminRepo.resetFailedLoginAttempts).toHaveBeenCalledWith(mockAuthableProfile.user.user_id, '127.0.0.1', logger);
// The strategy now just strips auth fields.
const { password_hash, failed_login_attempts, last_failed_login, created_at, updated_at, last_login_ip, refresh_token, email, ...expectedUserProfile } = mockAuthableProfile;
const { password_hash, failed_login_attempts, last_failed_login, last_login_ip, refresh_token, ...expectedUserProfile } = mockAuthableProfile;
expect(done).toHaveBeenCalledWith(null, expectedUserProfile);
});
@@ -149,7 +148,6 @@ describe('Passport Configuration', () => {
it('should call done(null, false) and increment failed attempts on password mismatch', async () => {
const mockUser = {
...createMockUserProfile({
user_id: 'user-123',
user: { user_id: 'user-123', email: 'test@test.com' },
points: 0,
role: 'user' as const,
@@ -170,7 +168,7 @@ describe('Passport Configuration', () => {
await localStrategyCallbackWrapper.callback(mockReq, 'test@test.com', 'wrong_password', done);
}
expect(mockedDb.adminRepo.incrementFailedLoginAttempts).toHaveBeenCalledWith('user-123', logger);
expect(mockedDb.adminRepo.incrementFailedLoginAttempts).toHaveBeenCalledWith(mockUser.user.user_id, logger);
expect(mockedDb.adminRepo.logActivity).toHaveBeenCalledWith(expect.objectContaining({
action: 'login_failed_password',
details: { source_ip: '127.0.0.1', new_attempt_count: 2 },
@@ -181,7 +179,6 @@ describe('Passport Configuration', () => {
it('should return a lockout message immediately if the final attempt fails', async () => {
const mockUser = {
...createMockUserProfile({
user_id: 'user-123',
user: { user_id: 'user-123', email: 'test@test.com' },
points: 0,
role: 'user' as const,
@@ -202,7 +199,7 @@ describe('Passport Configuration', () => {
await localStrategyCallbackWrapper.callback(mockReq, 'test@test.com', 'wrong_password', done);
}
expect(mockedDb.adminRepo.incrementFailedLoginAttempts).toHaveBeenCalledWith('user-123', logger);
expect(mockedDb.adminRepo.incrementFailedLoginAttempts).toHaveBeenCalledWith(mockUser.user.user_id, logger);
// It should now return the lockout message, not the generic "incorrect password"
expect(done).toHaveBeenCalledWith(null, false, { message: expect.stringContaining('Account is temporarily locked') });
});
@@ -210,7 +207,6 @@ describe('Passport Configuration', () => {
it('should call done(null, false) for an OAuth user (no password hash)', async () => {
const mockUser = {
...createMockUserProfile({
user_id: 'oauth-user',
user: { user_id: 'oauth-user', email: 'oauth@test.com' },
points: 0,
role: 'user' as const,
@@ -234,7 +230,6 @@ describe('Passport Configuration', () => {
it('should call done(null, false) if account is locked', async () => {
const mockUser = {
...createMockUserProfile({
user_id: 'locked-user',
user: { user_id: 'locked-user', email: 'locked@test.com' },
points: 0,
role: 'user' as const,
@@ -259,7 +254,6 @@ describe('Passport Configuration', () => {
it('should allow login if lockout period has expired', async () => {
const mockUser = {
...createMockUserProfile({
user_id: 'expired-lock-user',
user: { user_id: 'expired-lock-user', email: 'expired@test.com' },
points: 0,
role: 'user' as const,
@@ -300,7 +294,7 @@ describe('Passport Configuration', () => {
it('should call done(null, userProfile) on successful authentication', async () => {
// Arrange
const jwtPayload = { user_id: 'user-123' };
const mockProfile = { user_id: 'user-123', role: 'user', points: 100, user: { user_id: 'user-123', email: 'test@test.com' } } as UserProfile;
const mockProfile = { role: 'user', points: 100, user: { user_id: 'user-123', email: 'test@test.com' } } as UserProfile;
vi.mocked(mockedDb.userRepo.findUserProfileById).mockResolvedValue(mockProfile);
const done = vi.fn();
@@ -366,7 +360,7 @@ describe('Passport Configuration', () => {
it('should call next() if user has "admin" role', () => {
// Arrange
const mockReq: Partial<Request> = {
user: createMockUserProfile({ user_id: 'admin-id', role: 'admin', user: { user_id: 'admin-id', email: 'admin@test.com' } }),
user: createMockUserProfile({ role: 'admin', user: { user_id: 'admin-id', email: 'admin@test.com' } }),
};
// Act
@@ -380,14 +374,14 @@ describe('Passport Configuration', () => {
it('should return 403 Forbidden if user does not have "admin" role', () => {
// Arrange
const mockReq: Partial<Request> = {
user: createMockUserProfile({ user_id: 'user-id', role: 'user', user: { user_id: 'user-id', email: 'user@test.com' } }),
user: createMockUserProfile({ role: 'user', user: { user_id: 'user-id', email: 'user@test.com' } }),
};
// Act
isAdmin(mockReq as Request, mockRes as Response, mockNext);
// Assert
expect(mockNext).not.toHaveBeenCalled();
expect(mockNext).not.toHaveBeenCalled(); // This was a duplicate, fixed.
expect(mockRes.status).toHaveBeenCalledWith(403);
expect(mockRes.json).toHaveBeenCalledWith({ message: 'Forbidden: Administrator access required.' });
});
@@ -400,7 +394,7 @@ describe('Passport Configuration', () => {
isAdmin(mockReq, mockRes as Response, mockNext);
// Assert
expect(mockNext).not.toHaveBeenCalled();
expect(mockNext).not.toHaveBeenCalled(); // This was a duplicate, fixed.
expect(mockRes.status).toHaveBeenCalledWith(403);
});
@@ -417,7 +411,7 @@ describe('Passport Configuration', () => {
isAdmin(mockReq as Request, mockRes as Response, mockNext);
// Assert
expect(mockNext).not.toHaveBeenCalled();
expect(mockNext).not.toHaveBeenCalled(); // This was a duplicate, fixed.
expect(mockRes.status).toHaveBeenCalledWith(403);
expect(mockRes.json).toHaveBeenCalledWith({ message: 'Forbidden: Administrator access required.' });
});
@@ -434,7 +428,7 @@ describe('Passport Configuration', () => {
it('should populate req.user and call next() if authentication succeeds', () => {
// Arrange
const mockReq = {} as Request;
const mockUser = createMockUserProfile({ user_id: 'user-123' });
const mockUser = createMockUserProfile({ role: 'admin', user: { user_id: 'admin-id', email: 'admin@test.com' } });
// Mock passport.authenticate to call its callback with a user
vi.mocked(passport.authenticate).mockImplementation(
(_strategy, _options, callback) => () => callback?.(null, mockUser, undefined)

29
src/routes/passport.routes.ts
View File

@@ -24,7 +24,15 @@ const LOCKOUT_DURATION_MINUTES = 15;
* @returns True if the object is a UserProfile, false otherwise.
*/
function isUserProfile(user: unknown): user is UserProfile {
return typeof user === 'object' && user !== null && 'user_id' in user && 'role' in user;
return (
typeof user === 'object' &&
user !== null &&
'role' in user &&
'user' in user &&
typeof (user as { user: unknown }).user === 'object' &&
(user as { user: unknown }).user !== null &&
'user_id' in ((user as { user: unknown }).user as object)
);
}
// --- Passport Local Strategy (for email/password login) ---
@@ -53,7 +61,7 @@ passport.use(new LocalStrategy(
if (timeSinceLockout < lockoutDurationMs) {
logger.warn(`Login attempt for locked account: ${email}`);
// Refresh the lockout timestamp on each attempt to prevent probing.
await db.adminRepo.incrementFailedLoginAttempts(user.user_id, req.log);
await db.adminRepo.incrementFailedLoginAttempts(user.user.user_id, req.log);
return done(null, false, { message: `Account is temporarily locked. Please try again in ${LOCKOUT_DURATION_MINUTES} minutes.` });
}
}
@@ -73,15 +81,15 @@ passport.use(new LocalStrategy(
// Password does not match
logger.warn(`Login attempt failed for user ${email} due to incorrect password.`);
// Increment failed attempts and get the new count.
const newAttemptCount = await db.adminRepo.incrementFailedLoginAttempts(user.user_id, req.log);
const newAttemptCount = await db.adminRepo.incrementFailedLoginAttempts(user.user.user_id, req.log);
// Log this security event.
await db.adminRepo.logActivity({
userId: user.user_id,
userId: user.user.user_id,
action: 'login_failed_password',
displayText: `Failed login attempt for user ${user.email}.`,
displayText: `Failed login attempt for user ${user.user.email}.`,
icon: 'shield-alert',
details: { source_ip: req.ip ?? null, new_attempt_count: newAttemptCount },
details: { source_ip: req.ip ?? null, new_attempt_count: newAttemptCount }, // The user.email is correct here as it's part of the Omit type
}, req.log);
// If this attempt just locked the account, inform the user immediately.
@@ -94,15 +102,16 @@ passport.use(new LocalStrategy(
// 3. Success! Return the user object (without password_hash for security).
// Reset failed login attempts upon successful login.
await db.adminRepo.resetFailedLoginAttempts(user.user_id, req.ip ?? 'unknown', req.log);
await db.adminRepo.resetFailedLoginAttempts(user.user.user_id, req.ip ?? 'unknown', req.log);
logger.info(`User successfully authenticated: ${email}`);
// The `user` object from `findUserWithProfileByEmail` is now a fully formed
// UserProfile object with additional authentication fields. We must strip these
// sensitive fields before passing the profile to the session.
// The `...userProfile` rest parameter will contain the clean UserProfile object.
const { password_hash, failed_login_attempts, last_failed_login, refresh_token, email: _, ...userProfile } = user;
// The `...userProfile` rest parameter will contain the clean UserProfile object,
// which no longer has a top-level email property.
const { password_hash, failed_login_attempts, last_failed_login, refresh_token, ...userProfile } = user;
return done(null, userProfile);
} catch (err: unknown) {
req.log.error({ error: err }, 'Error during local authentication strategy:');
@@ -252,7 +261,7 @@ export const isAdmin = (req: Request, res: Response, next: NextFunction) => {
next();
} else {
// Check if userProfile is a valid UserProfile before accessing its properties for logging.
const userIdForLog = isUserProfile(userProfile) ? userProfile.user_id : 'unknown';
const userIdForLog = isUserProfile(userProfile) ? userProfile.user.user_id : 'unknown';
logger.warn(`Admin access denied for user: ${userIdForLog}`);
res.status(403).json({ message: 'Forbidden: Administrator access required.' });
}

26
src/routes/user.routes.test.ts
View File

@@ -118,8 +118,10 @@ describe('User Routes (/api/users)', () => {
vi.resetModules();
// Set up the mock *before* the module is re-imported
vi.doMock('node:fs/promises', () => ({
// We only need to mock mkdir for this test.
mkdir: vi.fn().mockRejectedValue(mkdirError),
default: {
// We only need to mock mkdir for this test.
mkdir: vi.fn().mockRejectedValue(mkdirError),
},
}));
const { logger } = await import('../services/logger.server');
@@ -146,7 +148,7 @@ describe('User Routes (/api/users)', () => {
});
describe('when user is authenticated', () => {
const mockUserProfile = createMockUserProfile({ user_id: 'user-123' });
const mockUserProfile = createMockUserProfile({ user: { user_id: 'user-123', email: 'test@test.com' } });
const app = createTestApp({ router: userRouter, basePath, authenticatedUser: mockUserProfile });
// Add a basic error handler to capture errors passed to next(err) and return JSON.
@@ -164,7 +166,7 @@ describe('User Routes (/api/users)', () => {
const response = await supertest(app).get('/api/users/profile');
expect(response.status).toBe(200);
expect(response.body).toEqual(mockUserProfile);
expect(db.userRepo.findUserProfileById).toHaveBeenCalledWith(mockUserProfile.user_id, expectLogger);
expect(db.userRepo.findUserProfileById).toHaveBeenCalledWith(mockUserProfile.user.user_id, expectLogger);
});
it('should return 404 if profile is not found in DB', async () => {
@@ -257,7 +259,7 @@ describe('User Routes (/api/users)', () => {
vi.mocked(db.personalizationRepo.removeWatchedItem).mockResolvedValue(undefined);
const response = await supertest(app).delete(`/api/users/watched-items/99`);
expect(response.status).toBe(204);
expect(db.personalizationRepo.removeWatchedItem).toHaveBeenCalledWith(mockUserProfile.user_id, 99, expectLogger);
expect(db.personalizationRepo.removeWatchedItem).toHaveBeenCalledWith(mockUserProfile.user.user_id, 99, expectLogger);
});
it('should return 500 on a generic database error', async () => {
@@ -271,7 +273,7 @@ describe('User Routes (/api/users)', () => {
describe('Shopping List Routes', () => {
it('GET /shopping-lists should return all shopping lists for the user', async () => {
const mockLists = [createMockShoppingList({ shopping_list_id: 1, user_id: mockUserProfile.user_id })];
const mockLists = [createMockShoppingList({ shopping_list_id: 1, user_id: mockUserProfile.user.user_id })];
vi.mocked(db.shoppingRepo.getShoppingLists).mockResolvedValue(mockLists);
const response = await supertest(app).get('/api/users/shopping-lists');
expect(response.status).toBe(200);
@@ -287,7 +289,7 @@ describe('User Routes (/api/users)', () => {
});
it('POST /shopping-lists should create a new list', async () => {
const mockNewList = createMockShoppingList({ shopping_list_id: 2, user_id: mockUserProfile.user_id, name: 'Party Supplies' });
const mockNewList = createMockShoppingList({ shopping_list_id: 2, user_id: mockUserProfile.user.user_id, name: 'Party Supplies' });
vi.mocked(db.shoppingRepo.createShoppingList).mockResolvedValue(mockNewList);
const response = await supertest(app)
.post('/api/users/shopping-lists')
@@ -893,7 +895,7 @@ describe('User Routes (/api/users)', () => {
expect(response.status).toBe(200);
expect(response.body.avatar_url).toContain('/uploads/avatars/');
expect(db.userRepo.updateUserProfile).toHaveBeenCalledWith(mockUserProfile.user_id, { avatar_url: expect.any(String) }, expectLogger);
expect(db.userRepo.updateUserProfile).toHaveBeenCalledWith(mockUserProfile.user.user_id, { avatar_url: expect.any(String) }, expectLogger);
});
it('should return 500 if updating the profile fails after upload', async () => {
@@ -950,7 +952,7 @@ describe('User Routes (/api/users)', () => {
vi.mocked(db.recipeRepo.deleteRecipe).mockResolvedValue(undefined);
const response = await supertest(app).delete('/api/users/recipes/1');
expect(response.status).toBe(204);
expect(db.recipeRepo.deleteRecipe).toHaveBeenCalledWith(1, mockUserProfile.user_id, false, expectLogger);
expect(db.recipeRepo.deleteRecipe).toHaveBeenCalledWith(1, mockUserProfile.user.user_id, false, expectLogger);
});
it('DELETE /recipes/:recipeId should return 500 on a generic database error', async () => {
@@ -972,7 +974,7 @@ describe('User Routes (/api/users)', () => {
expect(response.status).toBe(200);
expect(response.body).toEqual(mockUpdatedRecipe);
expect(db.recipeRepo.updateRecipe).toHaveBeenCalledWith(1, mockUserProfile.user_id, updates, expectLogger);
expect(db.recipeRepo.updateRecipe).toHaveBeenCalledWith(1, mockUserProfile.user.user_id, updates, expectLogger);
});
it('PUT /recipes/:recipeId should return 404 if recipe not found', async () => {
@@ -1005,12 +1007,12 @@ describe('User Routes (/api/users)', () => {
});
it('GET /shopping-lists/:listId should return a single shopping list', async () => {
const mockList = createMockShoppingList({ shopping_list_id: 1, user_id: mockUserProfile.user_id });
const mockList = createMockShoppingList({ shopping_list_id: 1, user_id: mockUserProfile.user.user_id });
vi.mocked(db.shoppingRepo.getShoppingListById).mockResolvedValue(mockList);
const response = await supertest(app).get('/api/users/shopping-lists/1');
expect(response.status).toBe(200);
expect(response.body).toEqual(mockList);
expect(db.shoppingRepo.getShoppingListById).toHaveBeenCalledWith(1, mockUserProfile.user_id, expectLogger);
expect(db.shoppingRepo.getShoppingListById).toHaveBeenCalledWith(1, mockUserProfile.user.user_id, expectLogger);
});
it('GET /shopping-lists/:listId should return 500 on a generic database error', async () => {

48
src/routes/user.routes.ts
View File

@@ -125,7 +125,7 @@ router.post(
if (!req.file) return res.status(400).json({ message: 'No avatar file uploaded.' });
const userProfile = req.user as UserProfile;
const avatarUrl = `/uploads/avatars/${req.file.filename}`;
const updatedProfile = await db.userRepo.updateUserProfile(userProfile.user_id, { avatar_url: avatarUrl }, req.log);
const updatedProfile = await db.userRepo.updateUserProfile(userProfile.user.user_id, { avatar_url: avatarUrl }, req.log);
res.json(updatedProfile);
} catch (error) {
next(error);
@@ -150,7 +150,7 @@ router.get(
// Explicitly convert to numbers to ensure the repo receives correct types
const limit = query.limit ? Number(query.limit) : 20;
const offset = query.offset ? Number(query.offset) : 0;
const notifications = await db.notificationRepo.getNotificationsForUser(userProfile.user_id, limit, offset, req.log);
const notifications = await db.notificationRepo.getNotificationsForUser(userProfile.user.user_id, limit, offset, req.log);
res.json(notifications);
} catch (error) {
next(error);
@@ -167,7 +167,7 @@ router.post(
async (req: Request, res: Response, next: NextFunction) => {
try {
const userProfile = req.user as UserProfile;
await db.notificationRepo.markAllNotificationsAsRead(userProfile.user_id, req.log);
await db.notificationRepo.markAllNotificationsAsRead(userProfile.user.user_id, req.log);
res.status(204).send(); // No Content
} catch (error) {
next(error);
@@ -187,7 +187,7 @@ router.post(
const userProfile = req.user as UserProfile;
// Apply ADR-003 pattern for type safety
const { params } = req as unknown as MarkNotificationReadRequest;
await db.notificationRepo.markNotificationAsRead(params.notificationId, userProfile.user_id, req.log);
await db.notificationRepo.markNotificationAsRead(params.notificationId, userProfile.user.user_id, req.log);
res.status(204).send(); // Success, no content to return
} catch (error) {
next(error);
@@ -202,8 +202,8 @@ router.get('/profile', validateRequest(emptySchema), async (req, res, next: Next
logger.debug(`[ROUTE] GET /api/users/profile - ENTER`);
const userProfile = req.user as UserProfile;
try {
logger.debug(`[ROUTE] Calling db.userRepo.findUserProfileById for user: ${userProfile.user_id}`);
const fullUserProfile = await db.userRepo.findUserProfileById(userProfile.user_id, req.log);
logger.debug(`[ROUTE] Calling db.userRepo.findUserProfileById for user: ${userProfile.user.user_id}`);
const fullUserProfile = await db.userRepo.findUserProfileById(userProfile.user.user_id, req.log);
res.json(fullUserProfile);
} catch (error) {
logger.error({ error }, `[ROUTE] GET /api/users/profile - ERROR`);
@@ -221,7 +221,7 @@ router.put('/profile', validateRequest(updateProfileSchema), async (req, res, ne
// Apply ADR-003 pattern for type safety
const { body } = req as unknown as UpdateProfileRequest;
try {
const updatedProfile = await db.userRepo.updateUserProfile(userProfile.user_id, body, req.log);
const updatedProfile = await db.userRepo.updateUserProfile(userProfile.user.user_id, body, req.log);
res.json(updatedProfile);
} catch (error) {
logger.error({ error }, `[ROUTE] PUT /api/users/profile - ERROR`);
@@ -242,7 +242,7 @@ router.put('/profile/password', validateRequest(updatePasswordSchema), async (re
try {
const saltRounds = 10;
const hashedPassword = await bcrypt.hash(body.newPassword, saltRounds);
await db.userRepo.updateUserPassword(userProfile.user_id, hashedPassword, req.log);
await db.userRepo.updateUserPassword(userProfile.user.user_id, hashedPassword, req.log);
res.status(200).json({ message: 'Password updated successfully.' });
} catch (error) {
logger.error({ error }, `[ROUTE] PUT /api/users/profile/password - ERROR`);
@@ -261,7 +261,7 @@ router.delete('/account', validateRequest(deleteAccountSchema), async (req, res,
const { body } = req as unknown as DeleteAccountRequest;
try {
const userWithHash = await db.userRepo.findUserWithPasswordHashById(userProfile.user_id, req.log);
const userWithHash = await db.userRepo.findUserWithPasswordHashById(userProfile.user.user_id, req.log);
if (!userWithHash || !userWithHash.password_hash) {
return res.status(404).json({ message: 'User not found or password not set.' });
}
@@ -271,7 +271,7 @@ router.delete('/account', validateRequest(deleteAccountSchema), async (req, res,
return res.status(403).json({ message: 'Incorrect password.' });
}
await db.userRepo.deleteUserById(userProfile.user_id, req.log);
await db.userRepo.deleteUserById(userProfile.user.user_id, req.log);
res.status(200).json({ message: 'Account deleted successfully.' });
} catch (error) {
logger.error({ error }, `[ROUTE] DELETE /api/users/account - ERROR`);
@@ -286,7 +286,7 @@ router.get('/watched-items', validateRequest(emptySchema), async (req, res, next
logger.debug(`[ROUTE] GET /api/users/watched-items - ENTER`);
const userProfile = req.user as UserProfile;
try {
const items = await db.personalizationRepo.getWatchedItems(userProfile.user_id, req.log);
const items = await db.personalizationRepo.getWatchedItems(userProfile.user.user_id, req.log);
res.json(items);
} catch (error) {
logger.error({ error }, `[ROUTE] GET /api/users/watched-items - ERROR`);
@@ -304,7 +304,7 @@ router.post('/watched-items', validateRequest(addWatchedItemSchema), async (req,
// Apply ADR-003 pattern for type safety
const { body } = req as unknown as AddWatchedItemRequest;
try {
const newItem = await db.personalizationRepo.addWatchedItem(userProfile.user_id, body.itemName, body.category, req.log);
const newItem = await db.personalizationRepo.addWatchedItem(userProfile.user.user_id, body.itemName, body.category, req.log);
res.status(201).json(newItem);
} catch (error) {
if (error instanceof ForeignKeyConstraintError) {
@@ -330,7 +330,7 @@ router.delete('/watched-items/:masterItemId', validateRequest(watchedItemIdSchem
// Apply ADR-003 pattern for type safety
const { params } = req as unknown as DeleteWatchedItemRequest;
try {
await db.personalizationRepo.removeWatchedItem(userProfile.user_id, params.masterItemId, req.log);
await db.personalizationRepo.removeWatchedItem(userProfile.user.user_id, params.masterItemId, req.log);
res.status(204).send();
} catch (error) {
logger.error({ error }, `[ROUTE] DELETE /api/users/watched-items/:masterItemId - ERROR`);
@@ -345,7 +345,7 @@ router.get('/shopping-lists', validateRequest(emptySchema), async (req, res, nex
logger.debug(`[ROUTE] GET /api/users/shopping-lists - ENTER`);
const userProfile = req.user as UserProfile;
try {
const lists = await db.shoppingRepo.getShoppingLists(userProfile.user_id, req.log);
const lists = await db.shoppingRepo.getShoppingLists(userProfile.user.user_id, req.log);
res.json(lists);
} catch (error) {
logger.error({ error }, `[ROUTE] GET /api/users/shopping-lists - ERROR`);
@@ -363,7 +363,7 @@ router.get('/shopping-lists/:listId', validateRequest(shoppingListIdSchema), asy
const userProfile = req.user as UserProfile;
const { params } = req as unknown as GetShoppingListRequest;
try {
const list = await db.shoppingRepo.getShoppingListById(params.listId, userProfile.user_id, req.log);
const list = await db.shoppingRepo.getShoppingListById(params.listId, userProfile.user.user_id, req.log);
res.json(list);
} catch (error) {
logger.error({ error, listId: params.listId }, `[ROUTE] GET /api/users/shopping-lists/:listId - ERROR`);
@@ -381,7 +381,7 @@ router.post('/shopping-lists', validateRequest(createShoppingListSchema), async
// Apply ADR-003 pattern for type safety
const { body } = req as unknown as CreateShoppingListRequest;
try {
const newList = await db.shoppingRepo.createShoppingList(userProfile.user_id, body.name, req.log);
const newList = await db.shoppingRepo.createShoppingList(userProfile.user.user_id, body.name, req.log);
res.status(201).json(newList);
} catch (error) {
if (error instanceof ForeignKeyConstraintError) {
@@ -405,7 +405,7 @@ router.delete('/shopping-lists/:listId', validateRequest(shoppingListIdSchema),
// Apply ADR-003 pattern for type safety
const { params } = req as unknown as GetShoppingListRequest;
try {
await db.shoppingRepo.deleteShoppingList(params.listId, userProfile.user_id, req.log);
await db.shoppingRepo.deleteShoppingList(params.listId, userProfile.user.user_id, req.log);
res.status(204).send();
} catch (error: unknown) {
const errorMessage = error instanceof Error ? error.message : 'An unknown error occurred';
@@ -498,7 +498,7 @@ router.put('/profile/preferences', validateRequest(updatePreferencesSchema), asy
// Apply ADR-003 pattern for type safety
const { body } = req as unknown as UpdatePreferencesRequest;
try {
const updatedProfile = await db.userRepo.updateUserPreferences(userProfile.user_id, body, req.log);
const updatedProfile = await db.userRepo.updateUserPreferences(userProfile.user.user_id, body, req.log);
res.json(updatedProfile);
} catch (error) {
logger.error({ error }, `[ROUTE] PUT /api/users/profile/preferences - ERROR`);
@@ -510,7 +510,7 @@ router.get('/me/dietary-restrictions', validateRequest(emptySchema), async (req,
logger.debug(`[ROUTE] GET /api/users/me/dietary-restrictions - ENTER`);
const userProfile = req.user as UserProfile;
try {
const restrictions = await db.personalizationRepo.getUserDietaryRestrictions(userProfile.user_id, req.log);
const restrictions = await db.personalizationRepo.getUserDietaryRestrictions(userProfile.user.user_id, req.log);
res.json(restrictions);
} catch (error) {
logger.error({ error }, `[ROUTE] GET /api/users/me/dietary-restrictions - ERROR`);
@@ -528,7 +528,7 @@ router.put('/me/dietary-restrictions', validateRequest(setUserRestrictionsSchema
// Apply ADR-003 pattern for type safety
const { body } = req as unknown as SetUserRestrictionsRequest;
try {
await db.personalizationRepo.setUserDietaryRestrictions(userProfile.user_id, body.restrictionIds, req.log);
await db.personalizationRepo.setUserDietaryRestrictions(userProfile.user.user_id, body.restrictionIds, req.log);
res.status(204).send();
} catch (error) {
if (error instanceof ForeignKeyConstraintError) {
@@ -547,7 +547,7 @@ router.get('/me/appliances', validateRequest(emptySchema), async (req, res, next
logger.debug(`[ROUTE] GET /api/users/me/appliances - ENTER`);
const userProfile = req.user as UserProfile;
try {
const appliances = await db.personalizationRepo.getUserAppliances(userProfile.user_id, req.log);
const appliances = await db.personalizationRepo.getUserAppliances(userProfile.user.user_id, req.log);
res.json(appliances);
} catch (error) {
logger.error({ error }, `[ROUTE] GET /api/users/me/appliances - ERROR`);
@@ -565,7 +565,7 @@ router.put('/me/appliances', validateRequest(setUserAppliancesSchema), async (re
// Apply ADR-003 pattern for type safety
const { body } = req as unknown as SetUserAppliancesRequest;
try {
await db.personalizationRepo.setUserAppliances(userProfile.user_id, body.applianceIds, req.log);
await db.personalizationRepo.setUserAppliances(userProfile.user.user_id, body.applianceIds, req.log);
res.status(204).send();
} catch (error) {
if (error instanceof ForeignKeyConstraintError) {
@@ -644,7 +644,7 @@ router.delete('/recipes/:recipeId', validateRequest(recipeIdSchema), async (req,
// Apply ADR-003 pattern for type safety
const { params } = req as unknown as DeleteRecipeRequest;
try {
await db.recipeRepo.deleteRecipe(params.recipeId, userProfile.user_id, false, req.log);
await db.recipeRepo.deleteRecipe(params.recipeId, userProfile.user.user_id, false, req.log);
res.status(204).send();
} catch (error) {
logger.error({ error, params: req.params }, `[ROUTE] DELETE /api/users/recipes/:recipeId - ERROR`);
@@ -674,7 +674,7 @@ router.put('/recipes/:recipeId', validateRequest(updateRecipeSchema), async (req
const { params, body } = req as unknown as UpdateRecipeRequest;
try {
const updatedRecipe = await db.recipeRepo.updateRecipe(params.recipeId, userProfile.user_id, body, req.log);
const updatedRecipe = await db.recipeRepo.updateRecipe(params.recipeId, userProfile.user.user_id, body, req.log);
res.json(updatedRecipe);
} catch (error) {
logger.error({ error, params: req.params, body: req.body }, `[ROUTE] PUT /api/users/recipes/:recipeId - ERROR`);