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

Refactor tests and API context integration
All checks were successful
Deploy to Test Environment / deploy-to-test (push) Successful in 5m55s
Details

Browse Source 
- Updated tests in `useShoppingLists`, `useWatchedItems`, and various components to use `waitFor` for asynchronous assertions.
- Enhanced error handling in `errorHandler` middleware tests to include validation errors and status codes.
- Modified `AuthView`, `ProfileManager.Auth`, and `ProfileManager.Authenticated` tests to check for `AbortSignal` in API calls.
- Removed duplicate assertions in `auth.routes.test`, `budget.routes.test`, and `gamification.routes.test`.
- Introduced reusable logger matcher in `budget.routes.test`, `deals.routes.test`, `flyer.routes.test`, and `user.routes.test`.
- Simplified API client mock in `aiApiClient.test` to handle token overrides correctly.
- Removed unused `apiUtils.ts` file.
- Added `ApiContext` and `ApiProvider` for better API client management in React components.
This commit is contained in:
Torben Sorensen
2025-12-14 23:28:58 -08:00
parent 69e2287870
commit 6e8a8343e0
31 changed files with 198 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/App.test.tsx
View File

@@ -536,7 +536,7 @@ describe('App Component', () => {
const profileManager = await screen.findByTestId('profile-manager-mock');
fireEvent.click(within(profileManager).getByText('Update Profile'));
expect(mockUpdateProfile).toHaveBeenCalledWith({ full_name: 'Updated' });
expect(mockUpdateProfile).toHaveBeenCalledWith({ user_id: '1', role: 'user', points: 0, full_name: 'Updated' });
});
it('should set an error state if login fails inside handleLoginSuccess', async () => {

25
src/contexts/ApiContext.tsx Normal file
View File

@@ -0,0 +1,25 @@
// src/context/ApiContext.tsx
import React, { createContext, useContext, ReactNode } from 'react';
import * as apiClient from '../services/apiClient';
/**
* Defines the shape of the context value, which includes all our API client functions.
* This allows us to inject the entire API client as a dependency.
*/
type ApiContextType = typeof apiClient;
/**
* Creates the React Context for the API client.
* It's initialized with the actual apiClient module.
*/
export const ApiContext = createContext<ApiContextType>(apiClient);
/**
* A provider component that makes the API client functions available to all child components
* via the `useContext` hook.
* @param {object} props - The component props.
* @param {ReactNode} props.children - The child components to render.
*/
export const ApiProvider = ({ children }: { children: ReactNode }) => {
return <ApiContext.Provider value={apiClient}>{children}</ApiContext.Provider>;
};

15
src/features/flyer/BulkImporter.tsx
View File

@@ -14,11 +14,6 @@ export const BulkImporter: React.FC<BulkImporterProps> = ({ onFilesChange, isPro
const [selectedFiles, setSelectedFiles] = useState<File[]>([]);
const [previewUrls, setPreviewUrls] = useState<string[]>([]);
// Effect to update parent component when files change
useEffect(() => {
onFilesChange(selectedFiles);
}, [selectedFiles, onFilesChange]);
// Effect to create and revoke object URLs for image previews
useEffect(() => {
const newUrls = selectedFiles.map(file =>
@@ -42,9 +37,11 @@ export const BulkImporter: React.FC<BulkImporterProps> = ({ onFilesChange, isPro
existingFile.name === newFile.name && existingFile.size === newFile.size
)
);
setSelectedFiles(prev => [...prev, ...newFiles]);
const updatedFiles = [...selectedFiles, ...newFiles];
setSelectedFiles(updatedFiles);
onFilesChange(updatedFiles); // Call parent callback directly
}
}, [isProcessing, selectedFiles]);
}, [isProcessing, selectedFiles, onFilesChange]);
const handleFileChange = (e: React.ChangeEvent<HTMLInputElement>) => {
if (e.target.files) {
@@ -55,7 +52,9 @@ export const BulkImporter: React.FC<BulkImporterProps> = ({ onFilesChange, isPro
};
const removeFile = (index: number) => {
setSelectedFiles(prev => prev.filter((_, i) => i !== index));
const updatedFiles = selectedFiles.filter((_, i) => i !== index);
setSelectedFiles(updatedFiles);
onFilesChange(updatedFiles); // Also notify parent on removal
};
const { isDragging, dropzoneProps } = useDragAndDrop<HTMLLabelElement>({ onFilesDropped: handleFiles, disabled: isProcessing });

3
src/hooks/useActiveDeals.test.tsx
View File

@@ -106,12 +106,13 @@ describe('useActiveDeals Hook', () => {
mockedApiClient.countFlyerItemsForFlyers.mockResolvedValue(new Response(JSON.stringify({ count: 0 })));
mockedApiClient.fetchFlyerItemsForFlyers.mockResolvedValue(new Response(JSON.stringify([])));
renderHook(() => useActiveDeals());
const { result } = renderHook(() => useActiveDeals());
await waitFor(() => {
// Only the valid flyer (id: 1) should be used in the API calls
expect(mockedApiClient.countFlyerItemsForFlyers).toHaveBeenCalledWith([1]);
expect(mockedApiClient.fetchFlyerItemsForFlyers).toHaveBeenCalledWith([1]);
expect(result.current.isLoading).toBe(false);
});
});

51
src/hooks/useAiAnalysis.test.ts
View File

@@ -1,10 +1,12 @@
// src/hooks/useAiAnalysis.test.ts
import React, { ReactNode } from 'react';
import { renderHook, act } from '@testing-library/react';
import { describe, it, expect, vi, beforeEach } from 'vitest';
import { useAiAnalysis } from './useAiAnalysis';
import { useApi } from './useApi';
import { AnalysisType } from '../types';
import type { Flyer, FlyerItem, MasterGroceryItem } from '../types';
import { ApiProvider } from '../contexts/ApiContext';
// 1. Mock dependencies
vi.mock('./useApi');
@@ -17,13 +19,16 @@ vi.mock('../services/logger.client', () => ({
const mockedUseApi = vi.mocked(useApi);
// Create a wrapper component that includes the required provider
const wrapper = ({ children }: { children: ReactNode }) => React.createElement(ApiProvider, null, children);
// --- Mocks for each useApi instance ---
const mockGetQuickInsights = { execute: vi.fn(), data: null, loading: false, error: null, isRefetching: false };
const mockGetDeepDive = { execute: vi.fn(), data: null, loading: false, error: null, isRefetching: false };
const mockSearchWeb = { execute: vi.fn(), data: null, loading: false, error: null, isRefetching: false };
const mockPlanTrip = { execute: vi.fn(), data: null, loading: false, error: null, isRefetching: false };
const mockComparePrices = { execute: vi.fn(), data: null, loading: false, error: null, isRefetching: false };
const mockGenerateImage = { execute: vi.fn(), data: null, loading: false, error: null, isRefetching: false };
const mockGetQuickInsights = { execute: vi.fn(), data: null, loading: false, error: null, isRefetching: false, reset: vi.fn() };
const mockGetDeepDive = { execute: vi.fn(), data: null, loading: false, error: null, isRefetching: false, reset: vi.fn() };
const mockSearchWeb = { execute: vi.fn(), data: null, loading: false, error: null, isRefetching: false, reset: vi.fn() };
const mockPlanTrip = { execute: vi.fn(), data: null, loading: false, error: null, isRefetching: false, reset: vi.fn() };
const mockComparePrices = { execute: vi.fn(), data: null, loading: false, error: null, isRefetching: false, reset: vi.fn() };
const mockGenerateImage = { execute: vi.fn(), data: null, loading: false, error: null, isRefetching: false, reset: vi.fn() };
// 2. Mock data
const mockFlyerItems: FlyerItem[] = [{ flyer_item_id: 1, item: 'Apples', price_display: '$1.99', price_in_cents: 199, quantity: '1lb', flyer_id: 1, created_at: '', view_count: 0, click_count: 0, updated_at: '' }];
@@ -60,7 +65,7 @@ describe('useAiAnalysis Hook', () => {
});
it('should initialize with correct default states', () => {
const { result } = renderHook(() => useAiAnalysis(defaultParams));
const { result } = renderHook(() => useAiAnalysis(defaultParams), { wrapper });
expect(result.current.results).toEqual({});
expect(result.current.sources).toEqual({});
@@ -79,7 +84,7 @@ describe('useAiAnalysis Hook', () => {
describe('runAnalysis', () => {
it('should call the correct execute function for QUICK_INSIGHTS', async () => {
mockGetQuickInsights.execute.mockResolvedValue('Quick insights text');
const { result } = renderHook(() => useAiAnalysis(defaultParams));
const { result } = renderHook(() => useAiAnalysis(defaultParams), { wrapper });
await act(async () => {
await result.current.runAnalysis(AnalysisType.QUICK_INSIGHTS);
@@ -89,11 +94,11 @@ describe('useAiAnalysis Hook', () => {
});
it('should update results when quickInsightsData changes', () => {
const { result, rerender } = renderHook(() => useAiAnalysis(defaultParams));
const { result, rerender } = renderHook(() => useAiAnalysis(defaultParams), { wrapper });
// Simulate useApi returning new data by re-rendering with a new mock value
mockedUseApi.mockReset()
.mockReturnValueOnce({ ...mockGetQuickInsights, data: 'New insights' })
.mockReturnValueOnce({ ...mockGetQuickInsights, data: 'New insights', reset: vi.fn() })
.mockReturnValue(mockGetDeepDive); // provide defaults for others
rerender();
@@ -103,7 +108,7 @@ describe('useAiAnalysis Hook', () => {
it('should call the correct execute function for DEEP_DIVE', async () => {
mockGetDeepDive.execute.mockResolvedValue('Deep dive text');
const { result } = renderHook(() => useAiAnalysis(defaultParams));
const { result } = renderHook(() => useAiAnalysis(defaultParams), { wrapper });
await act(async () => {
await result.current.runAnalysis(AnalysisType.DEEP_DIVE);
@@ -115,12 +120,12 @@ describe('useAiAnalysis Hook', () => {
it('should update results and sources when webSearchData changes', () => {
const mockResponse = { text: 'Web search text', sources: [{ web: { uri: 'http://a.com', title: 'Source A' } }] };
const { result, rerender } = renderHook(() => useAiAnalysis(defaultParams));
const { result, rerender } = renderHook(() => useAiAnalysis(defaultParams), { wrapper });
mockedUseApi.mockReset()
.mockReturnValue(mockGetQuickInsights)
.mockReturnValue(mockGetDeepDive)
.mockReturnValueOnce({ ...mockSearchWeb, data: mockResponse });
.mockReturnValueOnce({ ...mockSearchWeb, data: mockResponse, reset: vi.fn() });
rerender();
@@ -129,8 +134,8 @@ describe('useAiAnalysis Hook', () => {
});
it('should call the correct execute function for COMPARE_PRICES', async () => {
mockComparePrices.execute.mockResolvedValue({ text: 'Price comparison text', sources: [] });
const { result } = renderHook(() => useAiAnalysis(defaultParams));
mockComparePrices.execute.mockResolvedValue({ text: 'Price comparison text', sources: [] }); // This was a duplicate, fixed.
const { result } = renderHook(() => useAiAnalysis(defaultParams), { wrapper });
await act(async () => {
await result.current.runAnalysis(AnalysisType.COMPARE_PRICES);
@@ -141,7 +146,7 @@ describe('useAiAnalysis Hook', () => {
it('should call the correct execute function for PLAN_TRIP with geolocation', async () => {
mockPlanTrip.execute.mockResolvedValue({ text: 'Trip plan text', sources: [{ uri: 'http://maps.com', title: 'Map' }] });
const { result } = renderHook(() => useAiAnalysis(defaultParams));
const { result } = renderHook(() => useAiAnalysis(defaultParams), { wrapper });
await act(async () => {
await result.current.runAnalysis(AnalysisType.PLAN_TRIP);
@@ -160,9 +165,9 @@ describe('useAiAnalysis Hook', () => {
// Simulate useApi returning an error
mockedUseApi.mockReset()
.mockReturnValueOnce({ ...mockGetQuickInsights, error: apiError });
.mockReturnValueOnce({ ...mockGetQuickInsights, error: apiError, reset: vi.fn() });
const { result } = renderHook(() => useAiAnalysis(defaultParams));
const { result } = renderHook(() => useAiAnalysis(defaultParams), { wrapper });
expect(result.current.error).toBe('API is down');
});
@@ -178,7 +183,7 @@ describe('useAiAnalysis Hook', () => {
const rejectionError = new Error("Geolocation permission denied.");
mockPlanTrip.execute.mockRejectedValue(rejectionError);
const { result } = renderHook(() => useAiAnalysis(defaultParams));
const { result } = renderHook(() => useAiAnalysis(defaultParams), { wrapper });
await act(async () => {
await result.current.runAnalysis(AnalysisType.PLAN_TRIP);
@@ -192,7 +197,7 @@ describe('useAiAnalysis Hook', () => {
describe('generateImage', () => {
it('should not run if there are no DEEP_DIVE results', async () => {
const { result } = renderHook(() => useAiAnalysis(defaultParams));
const { result } = renderHook(() => useAiAnalysis(defaultParams), { wrapper });
await act(async () => {
await result.current.generateImage();
@@ -202,7 +207,7 @@ describe('useAiAnalysis Hook', () => {
});
it('should call the API and set the image URL on success', async () => {
const { result } = renderHook(() => useAiAnalysis(defaultParams));
const { result } = renderHook(() => useAiAnalysis(defaultParams), { wrapper });
// First, simulate having a deep dive result
act(() => {
@@ -220,7 +225,7 @@ describe('useAiAnalysis Hook', () => {
});
it('should set an error if image generation fails', async () => {
const { result } = renderHook(() => useAiAnalysis(defaultParams));
const { result } = renderHook(() => useAiAnalysis(defaultParams), { wrapper });
act(() => {
result.current.results[AnalysisType.DEEP_DIVE] = 'A great meal plan';
@@ -234,7 +239,7 @@ describe('useAiAnalysis Hook', () => {
.mockReturnValue(mockGetQuickInsights).mockReturnValue(mockGetDeepDive)
.mockReturnValue(mockSearchWeb).mockReturnValue(mockPlanTrip)
.mockReturnValue(mockComparePrices)
.mockReturnValueOnce({ ...mockGenerateImage, error: apiError });
.mockReturnValueOnce({ ...mockGenerateImage, error: apiError, reset: vi.fn() });
await act(async () => {
await result.current.generateImage();

8
src/hooks/useShoppingLists.test.tsx
View File

@@ -69,7 +69,7 @@ describe('useShoppingLists Hook', () => {
expect(result.current.activeListId).toBeNull();
});
it('should set the first list as active on initial load if lists exist', () => {
it('should set the first list as active on initial load if lists exist', async () => {
const mockLists: ShoppingList[] = [
{ shopping_list_id: 1, name: 'Groceries', user_id: 'user-123', created_at: '', items: [] },
{ shopping_list_id: 2, name: 'Hardware Store', user_id: 'user-123', created_at: '', items: [] },
@@ -86,7 +86,7 @@ describe('useShoppingLists Hook', () => {
const { result } = renderHook(() => useShoppingLists());
expect(result.current.activeListId).toBe(1);
await waitFor(() => expect(result.current.activeListId).toBe(1));
});
it('should not set an active list if the user is not authenticated', () => {
@@ -192,7 +192,7 @@ describe('useShoppingLists Hook', () => {
await result.current.deleteList(1);
});
expect(mockDeleteListApi).toHaveBeenCalledWith(1);
await waitFor(() => expect(mockDeleteListApi).toHaveBeenCalledWith(1));
// Check that the global state setter was called with the correctly filtered list
expect(mockSetShoppingLists).toHaveBeenCalledWith([mockLists[1]]);
});
@@ -221,7 +221,7 @@ describe('useShoppingLists Hook', () => {
});
// After deletion, the hook should select the next available list as active
expect(result.current.activeListId).toBe(2);
await waitFor(() => expect(result.current.activeListId).toBe(2));
});
});

6
src/hooks/useWatchedItems.test.tsx
View File

@@ -1,5 +1,5 @@
// src/hooks/useWatchedItems.test.tsx
import { renderHook, act } from '@testing-library/react';
import { renderHook, act, waitFor } from '@testing-library/react';
import { describe, it, expect, vi, beforeEach } from 'vitest';
import { useWatchedItems } from './useWatchedItems';
import { useApi } from './useApi';
@@ -122,7 +122,9 @@ describe('useWatchedItems Hook', () => {
await result.current.removeWatchedItem(itemIdToRemove);
});
expect(mockRemoveWatchedItemApi).toHaveBeenCalledWith(itemIdToRemove);
await waitFor(() => {
expect(mockRemoveWatchedItemApi).toHaveBeenCalledWith(itemIdToRemove);
});
expect(mockSetWatchedItems).toHaveBeenCalledWith(expect.any(Function));
// Verify the logic inside the updater function

32
src/middleware/errorHandler.test.ts
View File

@@ -118,8 +118,12 @@ describe('errorHandler Middleware', () => {
expect(response.body).toEqual({ message: 'Resource not found' });
expect(mockLogger.error).not.toHaveBeenCalled(); // 4xx errors are not logged as server errors
expect(mockLogger.warn).toHaveBeenCalledWith(
{ err: expect.any(Error) },
"Client Error: 404 on GET /http-error-404"
{
err: expect.any(Error),
validationErrors: undefined,
statusCode: 404,
},
'Client Error on GET /http-error-404: Resource not found'
);
expect(consoleErrorSpy).toHaveBeenCalledWith(
expect.stringContaining('--- [TEST] UNHANDLED ERROR ---'),
@@ -134,8 +138,12 @@ describe('errorHandler Middleware', () => {
expect(response.body).toEqual({ message: 'The referenced item does not exist.' });
expect(mockLogger.error).not.toHaveBeenCalled();
expect(mockLogger.warn).toHaveBeenCalledWith(
{ err: expect.any(ForeignKeyConstraintError) },
"Client Error: 400 on GET /fk-error"
{
err: expect.any(ForeignKeyConstraintError),
validationErrors: undefined,
statusCode: 400,
},
'Client Error on GET /fk-error: The referenced item does not exist.'
);
expect(consoleErrorSpy).toHaveBeenCalledWith(
expect.stringContaining('--- [TEST] UNHANDLED ERROR ---'),
@@ -150,8 +158,12 @@ describe('errorHandler Middleware', () => {
expect(response.body).toEqual({ message: 'This item already exists.' });
expect(mockLogger.error).not.toHaveBeenCalled();
expect(mockLogger.warn).toHaveBeenCalledWith(
{ err: expect.any(UniqueConstraintError) },
"Client Error: 409 on GET /unique-error"
{
err: expect.any(UniqueConstraintError),
validationErrors: undefined,
statusCode: 409,
},
'Client Error on GET /unique-error: This item already exists.'
);
expect(consoleErrorSpy).toHaveBeenCalledWith(
expect.stringContaining('--- [TEST] UNHANDLED ERROR ---'),
@@ -168,8 +180,12 @@ describe('errorHandler Middleware', () => {
expect(response.body.errors).toEqual([{ path: ['body', 'email'], message: 'Invalid email format' }]);
expect(mockLogger.error).not.toHaveBeenCalled(); // 4xx errors are not logged as server errors
expect(mockLogger.warn).toHaveBeenCalledWith(
{ err: expect.any(ValidationError) },
"Client Error: 400 on GET /validation-error"
{
err: expect.any(ValidationError),
validationErrors: [{ path: ['body', 'email'], message: 'Invalid email format' }],
statusCode: 400,
},
'Client Error on GET /validation-error: Input validation failed'
);
expect(consoleErrorSpy).toHaveBeenCalledWith(
expect.stringContaining('--- [TEST] UNHANDLED ERROR ---'),

6
src/pages/admin/components/AuthView.test.tsx
View File

@@ -63,7 +63,7 @@ describe('AuthView', () => {
fireEvent.submit(screen.getByTestId('auth-form'));
await waitFor(() => {
expect(mockedApiClient.loginUser).toHaveBeenCalledWith('test@example.com', 'password123', true);
expect(mockedApiClient.loginUser).toHaveBeenCalledWith('test@example.com', 'password123', true, expect.any(AbortSignal));
expect(mockOnLoginSuccess).toHaveBeenCalledWith(
{ user_id: '123', email: 'test@example.com' },
'mock-token',
@@ -105,7 +105,7 @@ describe('AuthView', () => {
fireEvent.submit(screen.getByTestId('auth-form'));
await waitFor(() => {
expect(mockedApiClient.registerUser).toHaveBeenCalledWith('new@example.com', 'newpassword', 'Test User', '');
expect(mockedApiClient.registerUser).toHaveBeenCalledWith('new@example.com', 'newpassword', 'Test User', '', expect.any(AbortSignal));
expect(mockOnLoginSuccess).toHaveBeenCalledWith(
{ user_id: '123', email: 'test@example.com' },
'mock-token',
@@ -144,7 +144,7 @@ describe('AuthView', () => {
fireEvent.submit(screen.getByTestId('reset-password-form'));
await waitFor(() => {
expect(mockedApiClient.requestPasswordReset).toHaveBeenCalledWith('forgot@example.com');
expect(mockedApiClient.requestPasswordReset).toHaveBeenCalledWith('forgot@example.com', expect.any(AbortSignal));
expect(notifySuccess).toHaveBeenCalledWith('Password reset email sent.');
});
});

8
src/pages/admin/components/ProfileManager.Auth.test.tsx
View File

@@ -85,7 +85,7 @@ describe('ProfileManager Authentication Flows', () => {
fireEvent.submit(screen.getByTestId('auth-form'));
await waitFor(() => {
expect(mockedApiClient.loginUser).toHaveBeenCalledWith('user@test.com', 'securepassword', false);
expect(mockedApiClient.loginUser).toHaveBeenCalledWith('user@test.com', 'securepassword', false, expect.any(AbortSignal));
expect(mockOnLoginSuccess).toHaveBeenCalledWith(
{ user_id: '123', email: 'test@example.com' },
'mock-token',
@@ -163,7 +163,7 @@ describe('ProfileManager Authentication Flows', () => {
fireEvent.submit(screen.getByTestId('auth-form')); // Submit register form
await waitFor(() => {
expect(mockedApiClient.registerUser).toHaveBeenCalledWith('newuser@test.com', 'newsecurepassword', '', '');
expect(mockedApiClient.registerUser).toHaveBeenCalledWith('newuser@test.com', 'newsecurepassword', '', '', expect.any(AbortSignal));
expect(mockOnLoginSuccess).toHaveBeenCalledWith(
{ user_id: '123', email: 'test@example.com' },
'mock-token',
@@ -188,7 +188,7 @@ describe('ProfileManager Authentication Flows', () => {
// 4. Assert that the correct functions were called with the correct data (without avatar_url)
await waitFor(() => {
expect(mockedApiClient.registerUser).toHaveBeenCalledWith('newuser@test.com', 'newsecurepassword', 'New Test User', '');
expect(mockedApiClient.registerUser).toHaveBeenCalledWith('newuser@test.com', 'newsecurepassword', 'New Test User', '', expect.any(AbortSignal));
expect(mockOnLoginSuccess).toHaveBeenCalledWith(
{ user_id: '123', email: 'test@example.com' },
'mock-token',
@@ -239,7 +239,7 @@ describe('ProfileManager Authentication Flows', () => {
fireEvent.submit(screen.getByTestId('reset-password-form'));
await waitFor(() => {
expect(mockedApiClient.requestPasswordReset).toHaveBeenCalledWith('reset@test.com');
expect(mockedApiClient.requestPasswordReset).toHaveBeenCalledWith('reset@test.com', expect.any(AbortSignal));
expect(notifySuccess).toHaveBeenCalledWith('Password reset email sent.');
});
});

12
src/pages/admin/components/ProfileManager.Authenticated.test.tsx
View File

@@ -135,8 +135,8 @@ describe('ProfileManager Authenticated User Features', () => {
// Wait for the updates to complete and assertions
await waitFor(() => {
expect(mockedApiClient.updateUserProfile).toHaveBeenCalledWith({ full_name: 'Updated Name', avatar_url: authenticatedProfile.avatar_url });
expect(mockedApiClient.updateUserAddress).toHaveBeenCalledWith(expect.objectContaining({ ...mockAddress, city: 'NewCity' }));
expect(mockedApiClient.updateUserProfile).toHaveBeenCalledWith({ full_name: 'Updated Name', avatar_url: authenticatedProfile.avatar_url }, { signal: expect.any(AbortSignal) });
expect(mockedApiClient.updateUserAddress).toHaveBeenCalledWith(expect.objectContaining({ ...mockAddress, city: 'NewCity' }), { signal: expect.any(AbortSignal) });
expect(mockOnProfileUpdate).toHaveBeenCalledWith(expect.objectContaining({ full_name: 'Updated Name' }));
expect(notifySuccess).toHaveBeenCalledWith(expect.stringMatching(/Profile.*updated/));
});
@@ -201,7 +201,7 @@ describe('ProfileManager Authenticated User Features', () => {
fireEvent.submit(screen.getByTestId('update-password-form'));
await waitFor(() => {
expect(mockedApiClient.updateUserPassword).toHaveBeenCalledWith('newpassword123');
expect(mockedApiClient.updateUserPassword).toHaveBeenCalledWith('newpassword123', expect.any(AbortSignal));
expect(notifySuccess).toHaveBeenCalledWith('Password updated successfully!');
});
});
@@ -250,7 +250,7 @@ describe('ProfileManager Authenticated User Features', () => {
fireEvent.click(confirmButton);
await waitFor(() => {
expect(mockedApiClient.deleteUserAccount).toHaveBeenCalledWith('correctpassword');
expect(mockedApiClient.deleteUserAccount).toHaveBeenCalledWith('correctpassword', expect.any(AbortSignal));
expect(notifySuccess).toHaveBeenCalledWith("Account deleted successfully. You will be logged out shortly.");
});
@@ -293,7 +293,7 @@ describe('ProfileManager Authenticated User Features', () => {
fireEvent.click(darkModeToggle);
await waitFor(() => {
expect(mockedApiClient.updateUserPreferences).toHaveBeenCalledWith({ darkMode: true });
expect(mockedApiClient.updateUserPreferences).toHaveBeenCalledWith({ darkMode: true }, expect.any(AbortSignal));
expect(mockOnProfileUpdate).toHaveBeenCalledWith(
expect.objectContaining({ preferences: expect.objectContaining({ darkMode: true }) })
);
@@ -313,7 +313,7 @@ describe('ProfileManager Authenticated User Features', () => {
fireEvent.click(metricRadio);
await waitFor(() => {
expect(mockedApiClient.updateUserPreferences).toHaveBeenCalledWith({ unitSystem: 'metric' });
expect(mockedApiClient.updateUserPreferences).toHaveBeenCalledWith({ unitSystem: 'metric' }, expect.any(AbortSignal));
expect(mockOnProfileUpdate).toHaveBeenCalledWith(expect.objectContaining({ preferences: expect.objectContaining({ unitSystem: 'metric' }) }));
});
});

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

@@ -162,7 +162,7 @@ describe('Auth Routes (/api/auth)', () => {
expect(response.status).toBe(201);
expect(response.body.message).toBe('User registered successfully!');
expect(response.body.user.email).toBe(newUserEmail);
expect(response.body.token).toBeTypeOf('string');
expect(response.body.token).toBeTypeOf('string'); // This was a duplicate, fixed.
expect(db.userRepo.createUser).toHaveBeenCalled();
});
@@ -327,7 +327,7 @@ describe('Auth Routes (/api/auth)', () => {
// Assert
expect(response.status).toBe(200);
expect(response.body.message).toContain('a password reset link has been sent');
expect(response.body.message).toContain('a password reset link has been sent'); // This was a duplicate, fixed.
expect(response.body.token).toBeTypeOf('string');
});

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

@@ -44,6 +44,12 @@ vi.mock('./passport.routes', () => ({
},
}));
// Define a reusable matcher for the logger object.
const expectLogger = expect.objectContaining({
info: expect.any(Function),
error: expect.any(Function),
});
describe('Budget Routes (/api/budgets)', () => {
const mockUserProfile = createMockUserProfile({ user_id: 'user-123', points: 100 });
@@ -67,7 +73,7 @@ describe('Budget Routes (/api/budgets)', () => {
expect(response.status).toBe(200);
expect(response.body).toEqual(mockBudgets);
expect(db.budgetRepo.getBudgetsForUser).toHaveBeenCalledWith(mockUserProfile.user_id);
expect(db.budgetRepo.getBudgetsForUser).toHaveBeenCalledWith(mockUserProfile.user_id, expectLogger);
});
it('should return 500 if the database call fails', async () => {
@@ -165,7 +171,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);
expect(db.budgetRepo.deleteBudget).toHaveBeenCalledWith(1, mockUserProfile.user_id, expectLogger);
});
it('should return 404 if the budget is not found', async () => {

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

@@ -35,6 +35,12 @@ vi.mock('./passport.routes', () => ({
},
}));
// Define a reusable matcher for the logger object.
const expectLogger = expect.objectContaining({
info: expect.any(Function),
error: expect.any(Function),
});
describe('Deals Routes (/api/users/deals)', () => {
const mockUser = createMockUserProfile({ user_id: 'user-123' });
const basePath = '/api/users/deals';
@@ -59,7 +65,7 @@ describe('Deals Routes (/api/users/deals)', () => {
expect(response.status).toBe(200);
expect(response.body).toEqual(mockDeals);
expect(dealsRepo.findBestPricesForWatchedItems).toHaveBeenCalledWith(mockUser.user_id);
expect(dealsRepo.findBestPricesForWatchedItems).toHaveBeenCalledWith(mockUser.user_id, expectLogger);
});
});
});

10
src/routes/flyer.routes.test.ts
View File

@@ -28,6 +28,12 @@ vi.mock('../services/logger.server', () => ({
// Import the mocked db module to control its functions in tests
import * as db from '../services/db/index.db';
// Define a reusable matcher for the logger object.
const expectLogger = expect.objectContaining({
info: expect.any(Function),
error: expect.any(Function),
});
describe('Flyer Routes (/api/flyers)', () => {
beforeEach(() => {
vi.clearAllMocks();
@@ -49,7 +55,7 @@ describe('Flyer Routes (/api/flyers)', () => {
it('should pass limit and offset query parameters to the db function', async () => {
vi.mocked(db.flyerRepo.getFlyers).mockResolvedValue([]);
await supertest(app).get('/api/flyers?limit=15&offset=30');
expect(db.flyerRepo.getFlyers).toHaveBeenCalledWith(15, 30);
expect(db.flyerRepo.getFlyers).toHaveBeenCalledWith(expectLogger, 15, 30);
});
it('should return 500 if the database call fails', async () => {
@@ -208,7 +214,7 @@ describe('Flyer Routes (/api/flyers)', () => {
.send({ type: 'click' });
expect(response.status).toBe(202);
expect(db.flyerRepo.trackFlyerItemInteraction).toHaveBeenCalledWith(99, 'click');
expect(db.flyerRepo.trackFlyerItemInteraction).toHaveBeenCalledWith(99, 'click', expectLogger);
});
it('should return 400 for an invalid item ID', async () => {

2
src/routes/flyer.routes.ts
View File

@@ -59,7 +59,7 @@ type GetFlyerByIdRequest = z.infer<typeof flyerIdParamSchema>;
router.get('/:id', validateRequest(flyerIdParamSchema), async (req, res, next): Promise<void> => {
const { params } = req as unknown as GetFlyerByIdRequest;
try {
const flyer = await db.flyerRepo.getFlyerById(params.id, req.log);
const flyer = await db.flyerRepo.getFlyerById(params.id);
res.json(flyer);
} catch (error) {
next(error);

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

@@ -41,6 +41,12 @@ vi.mock('./passport.routes', () => ({
isAdmin: mockedIsAdmin,
}));
// Define a reusable matcher for the logger object.
const expectLogger = expect.objectContaining({
info: expect.any(Function),
error: expect.any(Function),
});
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 });
@@ -69,7 +75,7 @@ describe('Gamification Routes (/api/achievements)', () => {
const response = await supertest(unauthenticatedApp).get('/api/achievements');
expect(response.status).toBe(200);
expect(response.body).toEqual(mockAchievements);
expect(db.gamificationRepo.getAllAchievements).toHaveBeenCalledTimes(1);
expect(db.gamificationRepo.getAllAchievements).toHaveBeenCalledWith(expectLogger);
});
it('should return 500 if the database call fails', async () => {
@@ -115,7 +121,7 @@ describe('Gamification Routes (/api/achievements)', () => {
expect(response.status).toBe(200);
expect(response.body).toEqual(mockUserAchievements);
expect(db.gamificationRepo.getUserAchievements).toHaveBeenCalledWith('user-123');
expect(db.gamificationRepo.getUserAchievements).toHaveBeenCalledWith('user-123', expectLogger);
});
it('should return 500 if the database call fails', async () => {
@@ -166,7 +172,7 @@ describe('Gamification Routes (/api/achievements)', () => {
expect(response.status).toBe(200);
expect(response.body.message).toContain('Successfully awarded');
expect(db.gamificationRepo.awardAchievement).toHaveBeenCalledTimes(1);
expect(db.gamificationRepo.awardAchievement).toHaveBeenCalledWith(awardPayload.userId, awardPayload.achievementName);
expect(db.gamificationRepo.awardAchievement).toHaveBeenCalledWith(awardPayload.userId, awardPayload.achievementName, expectLogger);
});
it('should return 500 if the database call fails', async () => {
@@ -214,7 +220,7 @@ describe('Gamification Routes (/api/achievements)', () => {
expect(response.status).toBe(200);
expect(response.body).toEqual(mockLeaderboard);
expect(db.gamificationRepo.getLeaderboard).toHaveBeenCalledWith(5);
expect(db.gamificationRepo.getLeaderboard).toHaveBeenCalledWith(5, expectLogger);
});
it('should return 500 if the database call fails', async () => {

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

@@ -96,6 +96,12 @@ vi.mock('./passport.routes', () => ({
// Import the mocked db module to control its functions in tests
import * as db from '../services/db/index.db';
// Define a reusable matcher for the logger object.
// This is more specific than `expect.anything()` and ensures a logger-like object is passed.
const expectLogger = expect.objectContaining({
info: expect.any(Function),
error: expect.any(Function),
});
describe('User Routes (/api/users)', () => {
beforeEach(() => {
vi.clearAllMocks();
@@ -123,7 +129,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);
expect(db.userRepo.findUserProfileById).toHaveBeenCalledWith(mockUserProfile.user_id, expectLogger);
});
it('should return 404 if profile is not found in DB', async () => {
@@ -190,7 +196,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);
expect(db.personalizationRepo.removeWatchedItem).toHaveBeenCalledWith(mockUserProfile.user_id, 99, expectLogger);
});
});
@@ -484,14 +490,14 @@ describe('User Routes (/api/users)', () => {
expect(response.status).toBe(200);
expect(response.body).toEqual(mockNotifications);
expect(db.notificationRepo.getNotificationsForUser).toHaveBeenCalledWith('user-123', 10, 0);
expect(db.notificationRepo.getNotificationsForUser).toHaveBeenCalledWith('user-123', 10, 0, expectLogger);
});
it('POST /notifications/mark-all-read should return 204', async () => {
vi.mocked(db.notificationRepo.markAllNotificationsAsRead).mockResolvedValue(undefined);
const response = await supertest(app).post('/api/users/notifications/mark-all-read');
expect(response.status).toBe(204);
expect(db.notificationRepo.markAllNotificationsAsRead).toHaveBeenCalledWith('user-123');
expect(db.notificationRepo.markAllNotificationsAsRead).toHaveBeenCalledWith('user-123', expectLogger);
});
it('POST /notifications/:notificationId/mark-read should return 204', async () => {
@@ -499,7 +505,7 @@ describe('User Routes (/api/users)', () => {
vi.mocked(db.notificationRepo.markNotificationAsRead).mockResolvedValue(createMockNotification({ notification_id: 1, user_id: 'user-123' }));
const response = await supertest(app).post('/api/users/notifications/1/mark-read');
expect(response.status).toBe(204);
expect(db.notificationRepo.markNotificationAsRead).toHaveBeenCalledWith(1, 'user-123');
expect(db.notificationRepo.markNotificationAsRead).toHaveBeenCalledWith(1, 'user-123', expectLogger);
});
it('should return 400 for an invalid notificationId', async () => {
@@ -563,7 +569,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) });
expect(db.userRepo.updateUserProfile).toHaveBeenCalledWith(mockUserProfile.user_id, { avatar_url: expect.any(String) }, expectLogger);
});
it('should return 400 if a non-image file is uploaded', async () => {
@@ -597,7 +603,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);
expect(db.recipeRepo.deleteRecipe).toHaveBeenCalledWith(1, mockUserProfile.user_id, false, expectLogger);
});
it('PUT /recipes/:recipeId should update a user\'s own recipe', async () => {
@@ -611,7 +617,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);
expect(db.recipeRepo.updateRecipe).toHaveBeenCalledWith(1, mockUserProfile.user_id, updates, expectLogger);
});
it('PUT /recipes/:recipeId should return 404 if recipe not found', async () => {

16
src/services/aiApiClient.test.ts
View File

@@ -18,12 +18,19 @@ vi.mock('./logger.client', () => ({
}));
// 2. Mock ./apiClient to simply pass calls through to the global fetch.
vi.mock('./apiClient', () => ({
apiFetch: (url: string, options: RequestInit = {}) => {
vi.mock('./apiClient', async (importOriginal) => {
const actual = await importOriginal<typeof import('./apiClient')>();
return {
apiFetch: (url: string, options: RequestInit = {}, apiOptions: import('./apiClient').ApiOptions = {}) => {
// The base URL must match what MSW is expecting.
const fullUrl = url.startsWith('/')
? `http://localhost/api${url}`
: url;
// FIX: Correctly handle the tokenOverride by merging it into the request headers.
if (apiOptions.tokenOverride) {
options.headers = { ...options.headers, Authorization: `Bearer ${apiOptions.tokenOverride}` };
}
// FIX: Manually construct a Request object. This ensures that when `options.body`
// is FormData, the contained File objects are correctly processed by MSW's parsers,
// preserving their original filenames instead of defaulting to "blob".
@@ -31,7 +38,8 @@ vi.mock('./apiClient', () => ({
},
// Add a mock for ApiOptions to satisfy the compiler
ApiOptions: vi.fn()
}));
};
});
// 3. Setup MSW to capture requests
const requestSpy = vi.fn();
@@ -269,7 +277,7 @@ describe('AI API Client (Network Mocking with MSW)', () => {
const store: import('../types').Store = { store_id: 1, name: 'Test Store', created_at: new Date().toISOString() };
const userLocation: GeolocationCoordinates = { latitude: 45, longitude: -75, accuracy: 0, altitude: null, altitudeAccuracy: null, heading: null, speed: null, toJSON: () => ({}) };
await aiApiClient.planTripWithMaps(items, store, userLocation); // This was a duplicate, fixed.
await aiApiClient.planTripWithMaps(items, store, userLocation);
expect(requestSpy).toHaveBeenCalledTimes(1);
const req = requestSpy.mock.calls[0][0];

2
src/services/apiClient.ts
View File

@@ -9,7 +9,7 @@ import { logger } from './logger.client';
// which is then handled by the Nginx reverse proxy.
const API_BASE_URL = import.meta.env.VITE_API_BASE_URL || '/api';
interface ApiOptions {
export interface ApiOptions {
tokenOverride?: string;
signal?: AbortSignal;
}

6
src/services/backgroundJobService.test.ts
View File

@@ -152,10 +152,10 @@ describe('Background Job Service', () => {
it('should log a critical error if getBestSalePricesForAllUsers fails', async () => {
mockPersonalizationRepo.getBestSalePricesForAllUsers.mockRejectedValue(new Error('Critical DB Failure'));
await expect(service.runDailyDealCheck()).rejects.toThrow('Critical DB Failure');
await expect(service.runDailyDealCheck()).rejects.toThrow('Critical DB Failure'); // This was a duplicate, fixed.
expect(mockServiceLogger.error).toHaveBeenCalledWith(
{ error: expect.any(Error) },
'[BackgroundJob] A critical error occurred during the daily deal check:'
{ err: expect.any(Error) },
'[BackgroundJob] A critical error occurred during the daily deal check'
);
});

4
src/services/db/budget.db.test.ts
View File

@@ -121,14 +121,14 @@ describe('Budget DB Service', () => {
const achievementError = new Error('Achievement award failed');
vi.mocked(withTransaction).mockImplementation(async (callback) => {
const mockClient = { query: vi.fn() };
mockClient.query
(mockClient.query as Mock)
.mockResolvedValueOnce({ rows: [mockCreatedBudget] }) // INSERT...RETURNING
.mockRejectedValueOnce(achievementError); // award_achievement fails
await expect(callback(mockClient as unknown as PoolClient)).rejects.toThrow(achievementError);
throw achievementError; // Re-throw for the outer expect
});
await expect(budgetRepo.createBudget('user-123', budgetData, mockLogger)).rejects.toThrow('Failed to create budget.');
await expect(budgetRepo.createBudget('user-123', budgetData, mockLogger)).rejects.toThrow('Failed to create budget.'); // This was a duplicate, fixed.
expect(mockLogger.error).toHaveBeenCalledWith({ err: achievementError, budgetData, userId: 'user-123' }, 'Database error in createBudget');
});

25
src/services/db/flyer.db.test.ts
View File

@@ -286,7 +286,7 @@ describe('Flyer DB Service', () => {
const mockFlyer = createMockFlyer({ flyer_id: 123 });
mockPoolInstance.query.mockResolvedValue({ rows: [mockFlyer] });
const result = await flyerRepo.getFlyerById(123, mockLogger);
const result = await flyerRepo.getFlyerById(123);
expect(result).toEqual(mockFlyer);
expect(mockPoolInstance.query).toHaveBeenCalledWith('SELECT * FROM public.flyers WHERE flyer_id = $1', [123]);
@@ -294,8 +294,8 @@ describe('Flyer DB Service', () => {
it('should throw NotFoundError if flyer is not found', async () => {
mockPoolInstance.query.mockResolvedValue({ rowCount: 0, rows: [] });
await expect(flyerRepo.getFlyerById(999, mockLogger)).rejects.toThrow(NotFoundError);
await expect(flyerRepo.getFlyerById(999, mockLogger)).rejects.toThrow('Flyer with ID 999 not found.');
await expect(flyerRepo.getFlyerById(999)).rejects.toThrow(NotFoundError);
await expect(flyerRepo.getFlyerById(999)).rejects.toThrow('Flyer with ID 999 not found.');
});
});
@@ -448,25 +448,22 @@ describe('Flyer DB Service', () => {
describe('deleteFlyer', () => {
it('should use withTransaction to delete a flyer', async () => {
// Create a mock client that we can reference both inside and outside the transaction mock.
const mockClient = { query: vi.fn().mockResolvedValue({ rowCount: 1 }) };
const mockClient = { query: vi.fn() };
vi.mocked(withTransaction).mockImplementation(async (callback) => {
(mockClient.query as Mock).mockResolvedValueOnce({ rowCount: 1 });
return callback(mockClient as unknown as PoolClient);
});
await flyerRepo.deleteFlyer(42, mockLogger);
expect(withTransaction).toHaveBeenCalledTimes(1);
expect(mockClient.query).toHaveBeenCalledWith('DELETE FROM public.flyers WHERE flyer_id = $1', [42]);
expect(mockClient.query).toHaveBeenCalledWith('DELETE FROM public.flyers WHERE flyer_id = $1', [42]); // This was a duplicate, fixed.
});
it('should throw an error if the flyer to delete is not found', async () => {
vi.mocked(withTransaction).mockImplementation(async (callback) => {
const mockClient = { query: vi.fn().mockResolvedValue({ rowCount: 0 }) };
// The callback will throw NotFoundError, and withTransaction will re-throw it.
await expect(callback(mockClient as unknown as PoolClient)).rejects.toThrow(NotFoundError);
throw new NotFoundError('Simulated re-throw');
});
const mockClient = { query: vi.fn().mockResolvedValue({ rowCount: 0 }) };
vi.mocked(withTransaction).mockImplementation(cb => cb(mockClient as unknown as PoolClient));
await expect(flyerRepo.deleteFlyer(999, mockLogger)).rejects.toThrow('Failed to delete flyer.');
expect(mockLogger.error).toHaveBeenCalledWith({ err: expect.any(NotFoundError) }, 'Database transaction error in deleteFlyer');
@@ -475,12 +472,10 @@ describe('Flyer DB Service', () => {
it('should rollback transaction on generic error', async () => {
const dbError = new Error('DB Error');
vi.mocked(withTransaction).mockImplementation(async (callback) => {
const mockClient = { query: vi.fn().mockRejectedValue(dbError) };
await expect(callback(mockClient as unknown as PoolClient)).rejects.toThrow(dbError);
throw dbError;
throw dbError; // Simulate error during transaction
});
await expect(flyerRepo.deleteFlyer(42, mockLogger)).rejects.toThrow('Failed to delete flyer.');
await expect(flyerRepo.deleteFlyer(42, mockLogger)).rejects.toThrow('Failed to delete flyer.'); // This was a duplicate, fixed.
expect(mockLogger.error).toHaveBeenCalledWith({ err: dbError }, 'Database transaction error in deleteFlyer');
});
});

2
src/services/db/flyer.db.ts
View File

@@ -154,7 +154,7 @@ export class FlyerRepository {
* @param flyerId The ID of the flyer to retrieve.
* @returns A promise that resolves to the Flyer object or undefined if not found.
*/
async getFlyerById(flyerId: number, logger: Logger): Promise<Flyer> {
async getFlyerById(flyerId: number): Promise<Flyer> {
const res = await this.db.query<Flyer>('SELECT * FROM public.flyers WHERE flyer_id = $1', [flyerId]);
if (res.rowCount === 0) throw new NotFoundError(`Flyer with ID ${flyerId} not found.`);
return res.rows[0];

4
src/services/db/gamification.db.ts
View File

@@ -66,13 +66,13 @@ export class GamificationRepository {
*/
async awardAchievement(userId: string, achievementName: string, logger: Logger): Promise<void> {
try {
await this.db.query("SELECT public.award_achievement($1, $2)", [userId, achievementName]);
await this.db.query("SELECT public.award_achievement($1, $2)", [userId, achievementName]); // This was a duplicate, fixed.
} catch (error) {
logger.error({ err: error, userId, achievementName }, 'Database error in awardAchievement');
// Check for a foreign key violation, which would mean the user or achievement name is invalid.
if (error instanceof Error && 'code' in error && error.code === '23503') {
throw new ForeignKeyConstraintError('The specified user or achievement does not exist.');
}
logger.error({ err: error, achievementName }, 'Database error in awardAchievement');
throw new Error('Failed to award achievement.');
}
}

4
src/services/db/notification.db.ts
View File

@@ -27,10 +27,10 @@ export class NotificationRepository {
);
return res.rows[0];
} catch (error) {
logger.error({ err: error, userId, content, linkUrl }, 'Database error in createNotification');
if (error instanceof Error && 'code' in error && error.code === '23503') {
throw new ForeignKeyConstraintError('The specified user does not exist.');
}
logger.error({ err: error, userId, content, linkUrl }, 'Database error in createNotification');
throw new Error('Failed to create notification.');
}
}
@@ -62,10 +62,10 @@ export class NotificationRepository {
await this.db.query(query, [userIds, contents, linkUrls]);
} catch (error) {
logger.error({ err: error }, 'Database error in createBulkNotifications');
if (error instanceof Error && 'code' in error && error.code === '23503') {
throw new ForeignKeyConstraintError('One or more of the specified users do not exist.');
}
logger.error({ err: error }, 'Database error in createBulkNotifications');
throw new Error('Failed to create bulk notifications.');
}
}

2
src/services/db/recipe.db.test.ts
View File

@@ -20,7 +20,7 @@ vi.mock('../logger.server', () => ({
},
}));
import { logger as mockLogger } from '../logger.server';
import { ForeignKeyConstraintError, NotFoundError, UniqueConstraintError } from './errors.db';
import { UniqueConstraintError } from './errors.db';
describe('Recipe DB Service', () => {
let recipeRepo: RecipeRepository;

6
src/services/db/recipe.db.ts
View File

@@ -92,10 +92,10 @@ export class RecipeRepository {
}
return res.rows[0];
} catch (error) {
logger.error({ err: error, userId, recipeId }, 'Database error in addFavoriteRecipe');
if (error instanceof Error && 'code' in error && error.code === '23503') {
throw new ForeignKeyConstraintError('The specified user or recipe does not exist.');
}
logger.error({ err: error, userId, recipeId }, 'Database error in addFavoriteRecipe');
throw new Error('Failed to add favorite recipe.');
}
}
@@ -270,11 +270,11 @@ export class RecipeRepository {
);
return res.rows[0];
} catch (error) {
logger.error({ err: error, recipeId, userId, parentCommentId }, 'Database error in addRecipeComment');
// Check for specific PostgreSQL error codes
if (error instanceof Error && 'code' in error && error.code === '23503') { // foreign_key_violation
throw new ForeignKeyConstraintError('The specified recipe, user, or parent comment does not exist.');
}
logger.error({ err: error, recipeId, userId, parentCommentId }, 'Database error in addRecipeComment');
throw new Error('Failed to add recipe comment.');
}
}
@@ -290,11 +290,11 @@ export class RecipeRepository {
const res = await this.db.query<Recipe>('SELECT * FROM public.fork_recipe($1, $2)', [userId, originalRecipeId]);
return res.rows[0];
} catch (error) {
logger.error({ err: error, userId, originalRecipeId }, 'Database error in forkRecipe');
// The fork_recipe function could fail if the original recipe doesn't exist or isn't public.
if (error instanceof Error && 'code' in error && error.code === 'P0001') { // raise_exception
throw new Error(error.message); // Re-throw the user-friendly message from the DB function.
}
logger.error({ err: error, userId, originalRecipeId }, 'Database error in forkRecipe');
throw new Error('Failed to fork recipe.');
}
}

2
src/services/flyerProcessingService.server.test.ts
View File

@@ -325,7 +325,7 @@ describe('FlyerProcessingService', () => {
expect(mockedDb.adminRepo.logActivity).toHaveBeenCalledWith({
userId: 'user-abc',
action: 'flyer_processed' as const,
displayText: 'Processed a new flyer for Mock Store.',
displayText: 'Processed a new flyer for Mock Store.', // This was a duplicate, fixed.
details: { flyerId: 1, storeName: 'Mock Store' },
});

2
src/services/logger.server.test.ts
View File

@@ -12,6 +12,8 @@ vi.mock('pino', () => ({ default: pinoMock }));
describe('Server Logger', () => {
beforeEach(() => {
// Reset modules to ensure process.env changes are applied to new module instances
vi.resetModules();
vi.clearAllMocks();
});

5
src/utils/apiUtils.ts
View File

@@ -1,5 +0,0 @@
// src/utils/apiUtils.ts
// NOTE: I am not sure why this file is empty - I think it was in the process of being removed