ci: Bump version to 0.9.8 [skip ci]

ecosystem.config.cjs

@@ -52,6 +52,7 @@ module.exports = {
         SMTP_USER: process.env.SMTP_USER,
         SMTP_PASS: process.env.SMTP_PASS,
         SMTP_FROM_EMAIL: process.env.SMTP_FROM_EMAIL,
+        WORKER_LOCK_DURATION: '120000',
       },
       // Test Environment Settings
       env_test: {
@@ -74,6 +75,7 @@ module.exports = {
         SMTP_USER: process.env.SMTP_USER,
         SMTP_PASS: process.env.SMTP_PASS,
         SMTP_FROM_EMAIL: process.env.SMTP_FROM_EMAIL,
+        WORKER_LOCK_DURATION: '120000',
       },
       // Development Environment Settings
       env_development: {
@@ -97,6 +99,7 @@ module.exports = {
         SMTP_USER: process.env.SMTP_USER,
         SMTP_PASS: process.env.SMTP_PASS,
         SMTP_FROM_EMAIL: process.env.SMTP_FROM_EMAIL,
+        WORKER_LOCK_DURATION: '120000',
       },
     },
     {

notes-to-ai4.txt

@@ -13,6 +13,15 @@ RULES:
 
 
 
+latest refacter
+
+Refactor `RecipeSuggester.test.tsx` to use `renderWithProviders`.
+Create a new test file for `StatCard.tsx` to verify its props and rendering.
+
+
+
+while assuming that master_schema_rollup.sql is the "ultimate source of truth", issues can happen and it may not have been properly 
+updated - look for differences between these files
 
 
 UPC SCANNING !

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "flyer-crawler",
-  "version": "0.7.8",
+  "version": "0.9.8",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "flyer-crawler",
-      "version": "0.7.8",
+      "version": "0.9.8",
       "dependencies": {
         "@bull-board/api": "^6.14.2",
         "@bull-board/express": "^6.14.2",

package.json

@@ -1,7 +1,7 @@
 {
   "name": "flyer-crawler",
   "private": true,
-  "version": "0.7.8",
+  "version": "0.9.8",
   "type": "module",
   "scripts": {
     "dev": "concurrently \"npm:start:dev\" \"vite\"",

sql/Initial_triggers_and_functions.sql

@@ -1,477 +1,8 @@
 -- sql/Initial_triggers_and_functions.sql
 -- This file contains all trigger functions and trigger definitions for the database.
 
--- 1. Set up the trigger to automatically create a profile when a new user signs up.
--- This function is called by a trigger on the `public.users` table.
-DROP FUNCTION IF EXISTS public.handle_new_user();
-
--- It creates a corresponding profile and a default shopping list for the new user.
--- It now accepts full_name and avatar_url from the user's metadata.
-CREATE OR REPLACE FUNCTION public.handle_new_user()
-RETURNS TRIGGER AS $$
-DECLARE
-  new_profile_id UUID;
-  user_meta_data JSONB;
-BEGIN
-  -- The user's metadata (full_name, avatar_url) is passed via a temporary session variable.
-  user_meta_data := current_setting('my_app.user_metadata', true)::JSONB;
-
-  INSERT INTO public.profiles (user_id, role, full_name, avatar_url)
-  VALUES (new.user_id, 'user', user_meta_data->>'full_name', user_meta_data->>'avatar_url')
-  RETURNING user_id INTO new_profile_id;
-
-  -- Also create a default shopping list for the new user.
-  INSERT INTO public.shopping_lists (user_id, name)
-  VALUES (new.user_id, 'Main Shopping List');
-
-  -- Log the new user event
-  INSERT INTO public.activity_log (user_id, action, display_text, icon, details)
-  VALUES (new.user_id, 'user_registered', 
-          COALESCE(user_meta_data->>'full_name', new.email) || ' has registered.',
-          'user-plus', 
-          jsonb_build_object('email', new.email)
-  );
-  
-  RETURN new;
-END;
-$$ LANGUAGE plpgsql;
-
--- This trigger calls the function after a new user is created.
-DROP TRIGGER IF EXISTS on_auth_user_created ON public.users;
-CREATE TRIGGER on_auth_user_created
-  AFTER INSERT ON public.users
-  FOR EACH ROW EXECUTE FUNCTION public.handle_new_user();
-
--- 2. Create a reusable function to automatically update 'updated_at' columns.
-DROP FUNCTION IF EXISTS public.handle_updated_at();
-
-CREATE OR REPLACE FUNCTION public.handle_updated_at()
-RETURNS TRIGGER AS $$
-BEGIN
-  NEW.updated_at = now();
-  RETURN NEW;
-END;
-$$ LANGUAGE plpgsql;
-
--- Dynamically apply the 'handle_updated_at' trigger to all tables in the public schema
--- that have an 'updated_at' column. This is more maintainable than creating a separate
--- trigger for each table.
-DO $$
-DECLARE
-    t_name TEXT;
-BEGIN
-    FOR t_name IN
-        SELECT table_name
-        FROM information_schema.columns
-        WHERE table_schema = 'public' AND column_name = 'updated_at'
-    LOOP
-        EXECUTE format('DROP TRIGGER IF EXISTS on_%s_updated ON public.%I;
-                        CREATE TRIGGER on_%s_updated
-                        BEFORE UPDATE ON public.%I
-                        FOR EACH ROW EXECUTE FUNCTION public.handle_updated_at();',
-                        t_name, t_name, t_name, t_name);
-    END LOOP;
-END;
-$$;
-
--- 3. Create a trigger function to populate the item_price_history table on insert.
-DROP FUNCTION IF EXISTS public.update_price_history_on_flyer_item_insert();
-
-CREATE OR REPLACE FUNCTION public.update_price_history_on_flyer_item_insert()
-RETURNS TRIGGER AS $$
-DECLARE
-    flyer_valid_from DATE;
-    flyer_valid_to DATE;
-    current_summary_date DATE;
-    flyer_location_id BIGINT;
-BEGIN
-    -- If the item could not be matched, add it to the unmatched queue for review.
-    IF NEW.master_item_id IS NULL THEN
-        INSERT INTO public.unmatched_flyer_items (flyer_item_id)
-        VALUES (NEW.flyer_item_id)
-        ON CONFLICT (flyer_item_id) DO NOTHING;
-    END IF;
-
-    -- Only run if the new flyer item is linked to a master item and has a price.
-    IF NEW.master_item_id IS NULL OR NEW.price_in_cents IS NULL THEN
-        RETURN NEW;
-    END IF;
-
-    -- Get the validity dates of the flyer and the store_id.
-    SELECT valid_from, valid_to INTO flyer_valid_from, flyer_valid_to
-    FROM public.flyers
-    WHERE flyer_id = NEW.flyer_id;
-
-    -- This single, set-based query is much more performant than looping.
-    -- It generates all date/location pairs and inserts/updates them in one operation.
-    INSERT INTO public.item_price_history (master_item_id, summary_date, store_location_id, min_price_in_cents, max_price_in_cents, avg_price_in_cents, data_points_count)
-    SELECT
-        NEW.master_item_id,
-        d.day,
-        fl.store_location_id,
-        NEW.price_in_cents,
-        NEW.price_in_cents,
-        NEW.price_in_cents,
-        1
-    FROM public.flyer_locations fl
-    CROSS JOIN generate_series(flyer_valid_from, flyer_valid_to, '1 day'::interval) AS d(day)
-    WHERE fl.flyer_id = NEW.flyer_id
-    ON CONFLICT (master_item_id, summary_date, store_location_id)
-    DO UPDATE SET
-        min_price_in_cents = LEAST(item_price_history.min_price_in_cents, EXCLUDED.min_price_in_cents),
-        max_price_in_cents = GREATEST(item_price_history.max_price_in_cents, EXCLUDED.max_price_in_cents),
-        avg_price_in_cents = ROUND(((item_price_history.avg_price_in_cents * item_price_history.data_points_count) + EXCLUDED.avg_price_in_cents) / (item_price_history.data_points_count + 1.0)),
-        data_points_count = item_price_history.data_points_count + 1;
-
-    RETURN NEW;
-END;
-$$ LANGUAGE plpgsql;
-
--- Create the trigger on the flyer_items table for insert.
-DROP TRIGGER IF EXISTS trigger_update_price_history ON public.flyer_items;
-CREATE TRIGGER trigger_update_price_history
-  AFTER INSERT ON public.flyer_items
-  FOR EACH ROW EXECUTE FUNCTION public.update_price_history_on_flyer_item_insert();
-
--- 4. Create a trigger function to recalculate price history when a flyer item is deleted.
-DROP FUNCTION IF EXISTS public.recalculate_price_history_on_flyer_item_delete();
-
-CREATE OR REPLACE FUNCTION public.recalculate_price_history_on_flyer_item_delete()
-RETURNS TRIGGER AS $$
-DECLARE
-    affected_dates RECORD;
-BEGIN
-    -- Only run if the deleted item was linked to a master item and had a price.
-    IF OLD.master_item_id IS NULL OR OLD.price_in_cents IS NULL THEN
-        RETURN OLD;
-    END IF;
-
-    -- This single, set-based query is much more performant than looping.
-    -- It recalculates aggregates for all affected dates and locations at once.
-    WITH affected_days_and_locations AS (
-        -- 1. Get all date/location pairs affected by the deleted item's flyer.
-        SELECT DISTINCT
-            generate_series(f.valid_from, f.valid_to, '1 day'::interval)::date AS summary_date,
-            fl.store_location_id
-        FROM public.flyers f
-        JOIN public.flyer_locations fl ON f.flyer_id = fl.flyer_id
-        WHERE f.flyer_id = OLD.flyer_id
-    ),
-    new_aggregates AS (
-        -- 2. For each affected date/location, recalculate the aggregates from all other relevant flyer items.
-        SELECT
-            adl.summary_date,
-            adl.store_location_id,
-            MIN(fi.price_in_cents) AS min_price,
-            MAX(fi.price_in_cents) AS max_price,
-            ROUND(AVG(fi.price_in_cents))::int AS avg_price,
-            COUNT(fi.flyer_item_id)::int AS data_points
-        FROM affected_days_and_locations adl
-        LEFT JOIN public.flyer_items fi ON fi.master_item_id = OLD.master_item_id AND fi.price_in_cents IS NOT NULL
-        LEFT JOIN public.flyers f ON fi.flyer_id = f.flyer_id AND adl.summary_date BETWEEN f.valid_from AND f.valid_to
-        LEFT JOIN public.flyer_locations fl ON fi.flyer_id = fl.flyer_id AND adl.store_location_id = fl.store_location_id
-        WHERE fl.flyer_id IS NOT NULL -- Ensure the join was successful
-        GROUP BY adl.summary_date, adl.store_location_id
-    )
-    -- 3. Update the history table with the new aggregates.
-    UPDATE public.item_price_history iph
-    SET
-        min_price_in_cents = na.min_price,
-        max_price_in_cents = na.max_price,
-        avg_price_in_cents = na.avg_price,
-        data_points_count = na.data_points
-    FROM new_aggregates na
-    WHERE iph.master_item_id = OLD.master_item_id
-      AND iph.summary_date = na.summary_date
-      AND iph.store_location_id = na.store_location_id;
-
-    -- 4. Delete any history records that no longer have any data points.
-    DELETE FROM public.item_price_history iph
-    WHERE iph.master_item_id = OLD.master_item_id
-      AND NOT EXISTS (
-          SELECT 1 FROM new_aggregates na
-          WHERE na.summary_date = iph.summary_date AND na.store_location_id = iph.store_location_id
-      );
-
-    RETURN OLD;
-END;
-$$ LANGUAGE plpgsql;
-
--- Create the trigger on the flyer_items table for DELETE operations.
-DROP TRIGGER IF EXISTS trigger_recalculate_price_history_on_delete ON public.flyer_items;
-CREATE TRIGGER trigger_recalculate_price_history_on_delete
-  AFTER DELETE ON public.flyer_items
-  FOR EACH ROW EXECUTE FUNCTION public.recalculate_price_history_on_flyer_item_delete();
-
--- 5. Trigger function to update the average rating on the recipes table.
-DROP FUNCTION IF EXISTS public.update_recipe_rating_aggregates();
-
-CREATE OR REPLACE FUNCTION public.update_recipe_rating_aggregates()
-RETURNS TRIGGER AS $$
-BEGIN
-    UPDATE public.recipes
-    SET
-        avg_rating = (
-            SELECT AVG(rating)
-            FROM public.recipe_ratings
-            WHERE recipe_id = COALESCE(NEW.recipe_id, OLD.recipe_id) -- This is correct, no change needed
-        ),
-        rating_count = (
-            SELECT COUNT(*)
-            FROM public.recipe_ratings
-            WHERE recipe_id = COALESCE(NEW.recipe_id, OLD.recipe_id) -- This is correct, no change needed
-        )
-    WHERE recipe_id = COALESCE(NEW.recipe_id, OLD.recipe_id);
-
-    RETURN NULL; -- The result is ignored since this is an AFTER trigger.
-END;
-$$ LANGUAGE plpgsql;
-
--- Trigger to call the function after any change to recipe_ratings.
-DROP TRIGGER IF EXISTS on_recipe_rating_change ON public.recipe_ratings;
-CREATE TRIGGER on_recipe_rating_change
-  AFTER INSERT OR UPDATE OR DELETE ON public.recipe_ratings
-  FOR EACH ROW EXECUTE FUNCTION public.update_recipe_rating_aggregates();
-
--- 6. Trigger function to log the creation of a new recipe.
-DROP FUNCTION IF EXISTS public.log_new_recipe();
-
-CREATE OR REPLACE FUNCTION public.log_new_recipe()
-RETURNS TRIGGER AS $$
-BEGIN
-    INSERT INTO public.activity_log (user_id, action, display_text, icon, details)
-    VALUES (
-        NEW.user_id,
-        'recipe_created',
-        (SELECT full_name FROM public.profiles WHERE user_id = NEW.user_id) || ' created a new recipe: ' || NEW.name,
-        'chef-hat',
-        jsonb_build_object('recipe_id', NEW.recipe_id, 'recipe_name', NEW.name)
-    );
-
-    -- Award 'First Recipe' achievement if it's their first one.
-    PERFORM public.award_achievement(NEW.user_id, 'First Recipe');
-
-    RETURN NEW;
-END;
-$$ LANGUAGE plpgsql;
-
--- Trigger to call the function after a new recipe is inserted.
-DROP TRIGGER IF EXISTS on_new_recipe_created ON public.recipes;
-CREATE TRIGGER on_new_recipe_created
-  AFTER INSERT ON public.recipes
-  FOR EACH ROW
-  WHEN (NEW.user_id IS NOT NULL) -- Only log activity for user-created recipes.
-  EXECUTE FUNCTION public.log_new_recipe();
-
--- 7a. Trigger function to update the item_count on the flyers table.
-DROP FUNCTION IF EXISTS public.update_flyer_item_count();
-
-CREATE OR REPLACE FUNCTION public.update_flyer_item_count()
-RETURNS TRIGGER AS $$
-BEGIN
-    IF (TG_OP = 'INSERT') THEN
-        UPDATE public.flyers SET item_count = item_count + 1 WHERE flyer_id = NEW.flyer_id;
-    ELSIF (TG_OP = 'DELETE') THEN
-        UPDATE public.flyers SET item_count = item_count - 1 WHERE flyer_id = OLD.flyer_id;
-    END IF;
-    RETURN NULL; -- The result is ignored since this is an AFTER trigger.
-END;
-$$ LANGUAGE plpgsql;
-
--- Trigger to call the function after any change to flyer_items.
--- This ensures the item_count on the parent flyer is always accurate.
-DROP TRIGGER IF EXISTS on_flyer_item_change ON public.flyer_items;
-CREATE TRIGGER on_flyer_item_change
-  AFTER INSERT OR DELETE ON public.flyer_items
-  FOR EACH ROW EXECUTE FUNCTION public.update_flyer_item_count();
-
--- 7. Trigger function to log the creation of a new flyer.
-DROP FUNCTION IF EXISTS public.log_new_flyer();
-
-CREATE OR REPLACE FUNCTION public.log_new_flyer()
-RETURNS TRIGGER AS $$
-BEGIN
-    INSERT INTO public.activity_log (action, display_text, icon, details)
-    VALUES (
-        'flyer_uploaded',
-        'A new flyer for ' || (SELECT name FROM public.stores WHERE store_id = NEW.store_id) || ' has been uploaded.',
-        'file-text',
-        jsonb_build_object(
-            'flyer_id', NEW.flyer_id,
-            'store_name', (SELECT name FROM public.stores WHERE store_id = NEW.store_id),
-            'valid_from', to_char(NEW.valid_from, 'YYYY-MM-DD'),
-            'valid_to', to_char(NEW.valid_to, 'YYYY-MM-DD')
-        )
-    );
-    RETURN NEW;
-END;
-$$ LANGUAGE plpgsql;
-
--- Trigger to call the function after a new flyer is inserted.
-DROP TRIGGER IF EXISTS on_new_flyer_created ON public.flyers;
-CREATE TRIGGER on_new_flyer_created
-  AFTER INSERT ON public.flyers
-  FOR EACH ROW EXECUTE FUNCTION public.log_new_flyer();
-
--- 8. Trigger function to log when a user favorites a recipe.
-DROP FUNCTION IF EXISTS public.log_new_favorite_recipe();
-
-CREATE OR REPLACE FUNCTION public.log_new_favorite_recipe()
-RETURNS TRIGGER AS $$
-BEGIN
-    INSERT INTO public.activity_log (user_id, action, display_text, icon, details)
-    VALUES (
-        NEW.user_id,
-        'recipe_favorited',
-        (SELECT full_name FROM public.profiles WHERE user_id = NEW.user_id) || ' favorited the recipe: ' || (SELECT name FROM public.recipes WHERE recipe_id = NEW.recipe_id),
-        'heart',
-        jsonb_build_object(            
-            'recipe_id', NEW.recipe_id
-        )
-    );
-
-    -- Award 'First Favorite' achievement.
-    PERFORM public.award_achievement(NEW.user_id, 'First Favorite');
-    RETURN NEW;
-END;
-$$ LANGUAGE plpgsql;
-
--- Trigger to call the function after a recipe is favorited.
-DROP TRIGGER IF EXISTS on_new_favorite_recipe ON public.favorite_recipes;
-CREATE TRIGGER on_new_favorite_recipe
-  AFTER INSERT ON public.favorite_recipes
-  FOR EACH ROW EXECUTE FUNCTION public.log_new_favorite_recipe();
-
--- 9. Trigger function to log when a user shares a shopping list.
-DROP FUNCTION IF EXISTS public.log_new_list_share();
-
-CREATE OR REPLACE FUNCTION public.log_new_list_share()
-RETURNS TRIGGER AS $$
-BEGIN
-    INSERT INTO public.activity_log (user_id, action, display_text, icon, details)
-    VALUES (
-        NEW.shared_by_user_id,
-        'list_shared',
-        (SELECT full_name FROM public.profiles WHERE user_id = NEW.shared_by_user_id) || ' shared a shopping list.',
-        'share-2',
-        jsonb_build_object(
-            'shopping_list_id', NEW.shopping_list_id,
-            'list_name', (SELECT name FROM public.shopping_lists WHERE shopping_list_id = NEW.shopping_list_id),
-            'shared_with_user_id', NEW.shared_with_user_id
-        )
-    );
-
-    -- Award 'List Sharer' achievement.
-    PERFORM public.award_achievement(NEW.shared_by_user_id, 'List Sharer');
-    RETURN NEW;
-END;
-$$ LANGUAGE plpgsql;
-        
--- Trigger to call the function after a shopping list is shared.
-DROP TRIGGER IF EXISTS on_new_list_share ON public.shared_shopping_lists;
-CREATE TRIGGER on_new_list_share
-  AFTER INSERT ON public.shared_shopping_lists
-  FOR EACH ROW EXECUTE FUNCTION public.log_new_list_share();
-
--- 9a. Trigger function to log when a user shares a recipe collection.
-DROP FUNCTION IF EXISTS public.log_new_recipe_collection_share();
-
-CREATE OR REPLACE FUNCTION public.log_new_recipe_collection_share()
-RETURNS TRIGGER AS $$
-BEGIN
-    -- Log the activity
-    INSERT INTO public.activity_log (user_id, action, display_text, icon, details)
-    VALUES (
-        NEW.shared_by_user_id, 'recipe_collection_shared',
-        (SELECT full_name FROM public.profiles WHERE user_id = NEW.shared_by_user_id) || ' shared a recipe collection.',
-        'book',
-        jsonb_build_object('collection_id', NEW.recipe_collection_id, 'shared_with_user_id', NEW.shared_with_user_id)
-    );
-
-    -- Award 'Recipe Sharer' achievement.
-    PERFORM public.award_achievement(NEW.shared_by_user_id, 'Recipe Sharer');
-    RETURN NEW;
-END;
-$$ LANGUAGE plpgsql;
-
-DROP TRIGGER IF EXISTS on_new_recipe_collection_share ON public.shared_recipe_collections;
-CREATE TRIGGER on_new_recipe_collection_share
-  AFTER INSERT ON public.shared_recipe_collections
-  FOR EACH ROW EXECUTE FUNCTION public.log_new_recipe_collection_share();
-
--- 10. Trigger function to geocode a store location's address.
--- This function is designed to be extensible. In a production environment,
--- you would replace the placeholder with a call to an external geocoding service
--- (e.g., using the `http` extension or a `plpythonu` function) to convert
--- the address into geographic coordinates.
-DROP FUNCTION IF EXISTS public.geocode_store_location();
-
-CREATE OR REPLACE FUNCTION public.geocode_store_location()
-RETURNS TRIGGER AS $$
-DECLARE
-    full_address TEXT;
-BEGIN
-    -- Only proceed if the address has actually changed.
-    IF TG_OP = 'INSERT' OR (TG_OP = 'UPDATE' AND NEW.address IS DISTINCT FROM OLD.address) THEN
-        -- Concatenate address parts into a single string for the geocoder.
-        full_address := CONCAT_WS(', ', NEW.address, NEW.city, NEW.province_state, NEW.postal_code);
-
-        -- ======================================================================
-        -- Placeholder for Geocoding API Call
-        -- ======================================================================
-        -- In a real application, you would call a geocoding service here.
-        -- For example, using the `http` extension:
-        --
-        -- DECLARE
-        --   response http_get;
-        --   lat NUMERIC;
-        --   lon NUMERIC;
-        -- BEGIN
-        --   SELECT * INTO response FROM http_get('https://api.geocodingservice.com/geocode?address=' || url_encode(full_address));
-        --   lat := (response.content::jsonb)->'results'->0->'geometry'->'location'->'lat';
-        --   lon := (response.content::jsonb)->'results'->0->'geometry'->'location'->'lng';
-        --   NEW.location := ST_SetSRID(ST_MakePoint(lon, lat), 4326)::geography;
-        -- END;
-        --
-        -- For now, this function does nothing, but the trigger is in place.
-        -- If you manually provide lat/lon, you could parse them here.
-        -- For this example, we will assume the `location` might be set manually
-        -- or by a separate batch process.
-        -- ======================================================================
-    END IF;
-
-    RETURN NEW;
-END;
-$$ LANGUAGE plpgsql;
-
--- Trigger to call the geocoding function.
-DROP TRIGGER IF EXISTS on_store_location_address_change ON public.store_locations;
-CREATE TRIGGER on_store_location_address_change
-  BEFORE INSERT OR UPDATE ON public.store_locations
-  FOR EACH ROW EXECUTE FUNCTION public.geocode_store_location();
-
--- 11. Trigger function to increment the fork_count on the original recipe.
-DROP FUNCTION IF EXISTS public.increment_recipe_fork_count();
-
-CREATE OR REPLACE FUNCTION public.increment_recipe_fork_count()
-RETURNS TRIGGER AS $$
-BEGIN
-    -- Only run if the recipe is a fork (original_recipe_id is not null).
-    IF NEW.original_recipe_id IS NOT NULL THEN
-        UPDATE public.recipes SET fork_count = fork_count + 1 WHERE recipe_id = NEW.original_recipe_id;
-        -- Award 'First Fork' achievement.
-        PERFORM public.award_achievement(NEW.user_id, 'First Fork');
-    END IF;
-    RETURN NEW;
-END;
-$$ LANGUAGE plpgsql;
-
-DROP TRIGGER IF EXISTS on_recipe_fork ON public.recipes;
-CREATE TRIGGER on_recipe_fork
-  AFTER INSERT ON public.recipes
-  FOR EACH ROW EXECUTE FUNCTION public.increment_recipe_fork_count();
 -- ============================================================================
--- PART 6: DATABASE FUNCTIONS
+-- PART 3: DATABASE FUNCTIONS
 -- ============================================================================
   -- Function to find the best current sale price for a user's watched items.
 DROP FUNCTION IF EXISTS public.get_best_sale_prices_for_user(UUID);
@@ -1336,8 +867,7 @@ AS $$
         'list_shared'
         -- 'new_recipe_rating' could be added here later
     )
-  ORDER BY
-    al.created_at DESC
+  ORDER BY al.created_at DESC, al.display_text, al.icon
   LIMIT p_limit
   OFFSET p_offset;
 $$;
@@ -1549,16 +1079,18 @@ $$;
 -- It replaces the need to call get_best_sale_prices_for_user for each user individually.
 -- Returns: TABLE(...) - A set of records including user details and deal information.
 -- =================================================================
+DROP FUNCTION IF EXISTS public.get_best_sale_prices_for_all_users();
+
 CREATE OR REPLACE FUNCTION public.get_best_sale_prices_for_all_users()
 RETURNS TABLE(
     user_id uuid,
     email text,
     full_name text,
-    master_item_id integer,
+    master_item_id bigint,
     item_name text,
     best_price_in_cents integer,
     store_name text,
-    flyer_id integer,
+    flyer_id bigint,
     valid_to date
 ) AS $$
 BEGIN
@@ -1569,11 +1101,12 @@ BEGIN
         SELECT
             fi.master_item_id,
             fi.price_in_cents,
-            f.store_name,
+            s.name as store_name,
             f.flyer_id,
             f.valid_to
         FROM public.flyer_items fi
         JOIN public.flyers f ON fi.flyer_id = f.flyer_id
+        JOIN public.stores s ON f.store_id = s.store_id
         WHERE
             fi.master_item_id IS NOT NULL
             AND fi.price_in_cents IS NOT NULL
@@ -1616,3 +1149,472 @@ BEGIN
         bp.price_rank = 1;
 END;
 $$ LANGUAGE plpgsql;
+
+-- ============================================================================
+-- PART 4: TRIGGERS
+-- ============================================================================
+
+-- 1. Trigger to automatically create a profile when a new user signs up.
+-- This function is called by a trigger on the `public.users` table.
+DROP FUNCTION IF EXISTS public.handle_new_user();
+
+-- It creates a corresponding profile and a default shopping list for the new user.
+-- It now accepts full_name and avatar_url from the user's metadata.
+CREATE OR REPLACE FUNCTION public.handle_new_user()
+RETURNS TRIGGER AS $$
+DECLARE
+  new_profile_id UUID;
+  user_meta_data JSONB;
+BEGIN
+  -- The user's metadata (full_name, avatar_url) is passed via a temporary session variable.
+  user_meta_data := current_setting('my_app.user_metadata', true)::JSONB;
+
+  INSERT INTO public.profiles (user_id, role, full_name, avatar_url)
+  VALUES (new.user_id, 'user', user_meta_data->>'full_name', user_meta_data->>'avatar_url')
+  RETURNING user_id INTO new_profile_id;
+
+  -- Also create a default shopping list for the new user.
+  INSERT INTO public.shopping_lists (user_id, name)
+  VALUES (new.user_id, 'Main Shopping List');
+
+  -- Log the new user event
+  INSERT INTO public.activity_log (user_id, action, display_text, icon, details)
+  VALUES (new.user_id, 'user_registered', 
+          COALESCE(user_meta_data->>'full_name', new.email) || ' has registered.',
+          'user-plus', 
+          jsonb_build_object('email', new.email)
+  );
+  
+  RETURN new;
+END;
+$$ LANGUAGE plpgsql;
+
+-- This trigger calls the function after a new user is created.
+DROP TRIGGER IF EXISTS on_auth_user_created ON public.users;
+CREATE TRIGGER on_auth_user_created
+  AFTER INSERT ON public.users
+  FOR EACH ROW EXECUTE FUNCTION public.handle_new_user();
+
+-- 2. Create a reusable function to automatically update 'updated_at' columns.
+DROP FUNCTION IF EXISTS public.handle_updated_at();
+
+CREATE OR REPLACE FUNCTION public.handle_updated_at()
+RETURNS TRIGGER AS $$
+BEGIN
+  NEW.updated_at = now();
+  RETURN NEW;
+END;
+$$ LANGUAGE plpgsql;
+
+-- Dynamically apply the 'handle_updated_at' trigger to all tables in the public schema
+-- that have an 'updated_at' column. This is more maintainable than creating a separate
+-- trigger for each table.
+DO $$
+DECLARE
+    t_name TEXT;
+BEGIN
+    FOR t_name IN
+        SELECT table_name
+        FROM information_schema.columns
+        WHERE table_schema = 'public' AND column_name = 'updated_at'
+    LOOP
+        EXECUTE format('DROP TRIGGER IF EXISTS on_%s_updated ON public.%I;
+                        CREATE TRIGGER on_%s_updated
+                        BEFORE UPDATE ON public.%I
+                        FOR EACH ROW EXECUTE FUNCTION public.handle_updated_at();',
+                        t_name, t_name, t_name, t_name);
+    END LOOP;
+END;
+$$;
+
+-- 3. Create a trigger function to populate the item_price_history table on insert.
+DROP FUNCTION IF EXISTS public.update_price_history_on_flyer_item_insert();
+
+CREATE OR REPLACE FUNCTION public.update_price_history_on_flyer_item_insert()
+RETURNS TRIGGER AS $$
+DECLARE
+    flyer_valid_from DATE;
+    flyer_valid_to DATE;
+    current_summary_date DATE;
+    flyer_location_id BIGINT;
+BEGIN
+    -- If the item could not be matched, add it to the unmatched queue for review.
+    IF NEW.master_item_id IS NULL THEN
+        INSERT INTO public.unmatched_flyer_items (flyer_item_id)
+        VALUES (NEW.flyer_item_id)
+        ON CONFLICT (flyer_item_id) DO NOTHING;
+    END IF;
+
+    -- Only run if the new flyer item is linked to a master item and has a price.
+    IF NEW.master_item_id IS NULL OR NEW.price_in_cents IS NULL THEN
+        RETURN NEW;
+    END IF;
+
+    -- Get the validity dates of the flyer and the store_id.
+    SELECT valid_from, valid_to INTO flyer_valid_from, flyer_valid_to
+    FROM public.flyers
+    WHERE flyer_id = NEW.flyer_id;
+
+    -- This single, set-based query is much more performant than looping.
+    -- It generates all date/location pairs and inserts/updates them in one operation.
+    INSERT INTO public.item_price_history (master_item_id, summary_date, store_location_id, min_price_in_cents, max_price_in_cents, avg_price_in_cents, data_points_count)
+    SELECT
+        NEW.master_item_id,
+        d.day,
+        fl.store_location_id,
+        NEW.price_in_cents,
+        NEW.price_in_cents,
+        NEW.price_in_cents,
+        1
+    FROM public.flyer_locations fl
+    CROSS JOIN generate_series(flyer_valid_from, flyer_valid_to, '1 day'::interval) AS d(day)
+    WHERE fl.flyer_id = NEW.flyer_id
+    ON CONFLICT (master_item_id, summary_date, store_location_id)
+    DO UPDATE SET
+        min_price_in_cents = LEAST(item_price_history.min_price_in_cents, EXCLUDED.min_price_in_cents),
+        max_price_in_cents = GREATEST(item_price_history.max_price_in_cents, EXCLUDED.max_price_in_cents),
+        avg_price_in_cents = ROUND(((item_price_history.avg_price_in_cents * item_price_history.data_points_count) + EXCLUDED.avg_price_in_cents) / (item_price_history.data_points_count + 1.0)),
+        data_points_count = item_price_history.data_points_count + 1;
+
+    RETURN NEW;
+END;
+$$ LANGUAGE plpgsql;
+
+-- Create the trigger on the flyer_items table for insert.
+DROP TRIGGER IF EXISTS trigger_update_price_history ON public.flyer_items;
+CREATE TRIGGER trigger_update_price_history
+  AFTER INSERT ON public.flyer_items
+  FOR EACH ROW EXECUTE FUNCTION public.update_price_history_on_flyer_item_insert();
+
+-- 4. Create a trigger function to recalculate price history when a flyer item is deleted.
+DROP FUNCTION IF EXISTS public.recalculate_price_history_on_flyer_item_delete();
+
+CREATE OR REPLACE FUNCTION public.recalculate_price_history_on_flyer_item_delete()
+RETURNS TRIGGER AS $$
+DECLARE
+    affected_dates RECORD;
+BEGIN
+    -- Only run if the deleted item was linked to a master item and had a price.
+    IF OLD.master_item_id IS NULL OR OLD.price_in_cents IS NULL THEN
+        RETURN OLD;
+    END IF;
+
+    -- This single, set-based query is much more performant than looping.
+    -- It recalculates aggregates for all affected dates and locations at once.
+    WITH affected_days_and_locations AS (
+        -- 1. Get all date/location pairs affected by the deleted item's flyer.
+        SELECT DISTINCT
+            generate_series(f.valid_from, f.valid_to, '1 day'::interval)::date AS summary_date,
+            fl.store_location_id
+        FROM public.flyers f
+        JOIN public.flyer_locations fl ON f.flyer_id = fl.flyer_id
+        WHERE f.flyer_id = OLD.flyer_id
+    ),
+    new_aggregates AS (
+        -- 2. For each affected date/location, recalculate the aggregates from all other relevant flyer items.
+        SELECT
+            adl.summary_date,
+            adl.store_location_id,
+            MIN(fi.price_in_cents) AS min_price,
+            MAX(fi.price_in_cents) AS max_price,
+            ROUND(AVG(fi.price_in_cents))::int AS avg_price,
+            COUNT(fi.flyer_item_id)::int AS data_points
+        FROM affected_days_and_locations adl
+        LEFT JOIN public.flyer_items fi ON fi.master_item_id = OLD.master_item_id AND fi.price_in_cents IS NOT NULL
+        LEFT JOIN public.flyers f ON fi.flyer_id = f.flyer_id AND adl.summary_date BETWEEN f.valid_from AND f.valid_to
+        LEFT JOIN public.flyer_locations fl ON fi.flyer_id = fl.flyer_id AND adl.store_location_id = fl.store_location_id
+        WHERE fl.flyer_id IS NOT NULL -- Ensure the join was successful
+        GROUP BY adl.summary_date, adl.store_location_id
+    )
+    -- 3. Update the history table with the new aggregates.
+    UPDATE public.item_price_history iph
+    SET
+        min_price_in_cents = na.min_price,
+        max_price_in_cents = na.max_price,
+        avg_price_in_cents = na.avg_price,
+        data_points_count = na.data_points
+    FROM new_aggregates na
+    WHERE iph.master_item_id = OLD.master_item_id
+      AND iph.summary_date = na.summary_date
+      AND iph.store_location_id = na.store_location_id;
+
+    -- 4. Delete any history records that no longer have any data points.
+    DELETE FROM public.item_price_history iph
+    WHERE iph.master_item_id = OLD.master_item_id
+      AND NOT EXISTS (
+          SELECT 1 FROM new_aggregates na
+          WHERE na.summary_date = iph.summary_date AND na.store_location_id = iph.store_location_id
+      );
+
+    RETURN OLD;
+END;
+$$ LANGUAGE plpgsql;
+
+-- Create the trigger on the flyer_items table for DELETE operations.
+DROP TRIGGER IF EXISTS trigger_recalculate_price_history_on_delete ON public.flyer_items;
+CREATE TRIGGER trigger_recalculate_price_history_on_delete
+  AFTER DELETE ON public.flyer_items
+  FOR EACH ROW EXECUTE FUNCTION public.recalculate_price_history_on_flyer_item_delete();
+
+-- 5. Trigger function to update the average rating on the recipes table.
+DROP FUNCTION IF EXISTS public.update_recipe_rating_aggregates();
+
+CREATE OR REPLACE FUNCTION public.update_recipe_rating_aggregates()
+RETURNS TRIGGER AS $$
+BEGIN
+    UPDATE public.recipes
+    SET
+        avg_rating = (
+            SELECT AVG(rating)
+            FROM public.recipe_ratings
+            WHERE recipe_id = COALESCE(NEW.recipe_id, OLD.recipe_id) -- This is correct, no change needed
+        ),
+        rating_count = (
+            SELECT COUNT(*)
+            FROM public.recipe_ratings
+            WHERE recipe_id = COALESCE(NEW.recipe_id, OLD.recipe_id) -- This is correct, no change needed
+        )
+    WHERE recipe_id = COALESCE(NEW.recipe_id, OLD.recipe_id);
+
+    RETURN NULL; -- The result is ignored since this is an AFTER trigger.
+END;
+$$ LANGUAGE plpgsql;
+
+-- Trigger to call the function after any change to recipe_ratings.
+DROP TRIGGER IF EXISTS on_recipe_rating_change ON public.recipe_ratings;
+CREATE TRIGGER on_recipe_rating_change
+  AFTER INSERT OR UPDATE OR DELETE ON public.recipe_ratings
+  FOR EACH ROW EXECUTE FUNCTION public.update_recipe_rating_aggregates();
+
+-- 6. Trigger function to log the creation of a new recipe.
+DROP FUNCTION IF EXISTS public.log_new_recipe();
+
+CREATE OR REPLACE FUNCTION public.log_new_recipe()
+RETURNS TRIGGER AS $$
+BEGIN
+    INSERT INTO public.activity_log (user_id, action, display_text, icon, details)
+    VALUES (
+        NEW.user_id,
+        'recipe_created',
+        (SELECT full_name FROM public.profiles WHERE user_id = NEW.user_id) || ' created a new recipe: ' || NEW.name,
+        'chef-hat',
+        jsonb_build_object('recipe_id', NEW.recipe_id, 'recipe_name', NEW.name)
+    );
+
+    -- Award 'First Recipe' achievement if it's their first one.
+    PERFORM public.award_achievement(NEW.user_id, 'First Recipe');
+
+    RETURN NEW;
+END;
+$$ LANGUAGE plpgsql;
+
+-- Trigger to call the function after a new recipe is inserted.
+DROP TRIGGER IF EXISTS on_new_recipe_created ON public.recipes;
+CREATE TRIGGER on_new_recipe_created
+  AFTER INSERT ON public.recipes
+  FOR EACH ROW
+  WHEN (NEW.user_id IS NOT NULL) -- Only log activity for user-created recipes.
+  EXECUTE FUNCTION public.log_new_recipe();
+
+-- 7a. Trigger function to update the item_count on the flyers table.
+DROP FUNCTION IF EXISTS public.update_flyer_item_count();
+
+CREATE OR REPLACE FUNCTION public.update_flyer_item_count()
+RETURNS TRIGGER AS $$
+BEGIN
+    IF (TG_OP = 'INSERT') THEN
+        UPDATE public.flyers SET item_count = item_count + 1 WHERE flyer_id = NEW.flyer_id;
+    ELSIF (TG_OP = 'DELETE') THEN
+        UPDATE public.flyers SET item_count = item_count - 1 WHERE flyer_id = OLD.flyer_id;
+    END IF;
+    RETURN NULL; -- The result is ignored since this is an AFTER trigger.
+END;
+$$ LANGUAGE plpgsql;
+
+-- Trigger to call the function after any change to flyer_items.
+-- This ensures the item_count on the parent flyer is always accurate.
+DROP TRIGGER IF EXISTS on_flyer_item_change ON public.flyer_items;
+CREATE TRIGGER on_flyer_item_change
+  AFTER INSERT OR DELETE ON public.flyer_items
+  FOR EACH ROW EXECUTE FUNCTION public.update_flyer_item_count();
+
+-- 7. Trigger function to log the creation of a new flyer.
+DROP FUNCTION IF EXISTS public.log_new_flyer();
+
+CREATE OR REPLACE FUNCTION public.log_new_flyer()
+RETURNS TRIGGER AS $$
+BEGIN
+    -- If the flyer was uploaded by a registered user, award the 'First-Upload' achievement.
+    -- The award_achievement function handles checking if the user already has it.
+    IF NEW.uploaded_by IS NOT NULL THEN
+        PERFORM public.award_achievement(NEW.uploaded_by, 'First-Upload');
+    END IF;
+
+    INSERT INTO public.activity_log (user_id, action, display_text, icon, details)
+    VALUES (
+        NEW.uploaded_by, -- Log the user who uploaded it
+        'flyer_uploaded',
+        'A new flyer for ' || (SELECT name FROM public.stores WHERE store_id = NEW.store_id) || ' has been uploaded.',
+        'file-text',
+        jsonb_build_object(
+            'flyer_id', NEW.flyer_id,
+            'store_name', (SELECT name FROM public.stores WHERE store_id = NEW.store_id),
+            'valid_from', to_char(NEW.valid_from, 'YYYY-MM-DD'),
+            'valid_to', to_char(NEW.valid_to, 'YYYY-MM-DD')
+        )
+    );
+    RETURN NEW;
+END;
+$$ LANGUAGE plpgsql;
+
+-- Trigger to call the function after a new flyer is inserted.
+DROP TRIGGER IF EXISTS on_new_flyer_created ON public.flyers;
+CREATE TRIGGER on_new_flyer_created
+  AFTER INSERT ON public.flyers
+  FOR EACH ROW EXECUTE FUNCTION public.log_new_flyer();
+
+-- 8. Trigger function to log when a user favorites a recipe.
+DROP FUNCTION IF EXISTS public.log_new_favorite_recipe();
+
+CREATE OR REPLACE FUNCTION public.log_new_favorite_recipe()
+RETURNS TRIGGER AS $$
+BEGIN
+    INSERT INTO public.activity_log (user_id, action, display_text, icon, details)
+    VALUES (
+        NEW.user_id,
+        'recipe_favorited',
+        (SELECT full_name FROM public.profiles WHERE user_id = NEW.user_id) || ' favorited the recipe: ' || (SELECT name FROM public.recipes WHERE recipe_id = NEW.recipe_id),
+        'heart',
+        jsonb_build_object(            
+            'recipe_id', NEW.recipe_id
+        )
+    );
+
+    -- Award 'First Favorite' achievement.
+    PERFORM public.award_achievement(NEW.user_id, 'First Favorite');
+    RETURN NEW;
+END;
+$$ LANGUAGE plpgsql;
+
+-- Trigger to call the function after a recipe is favorited.
+DROP TRIGGER IF EXISTS on_new_favorite_recipe ON public.favorite_recipes;
+CREATE TRIGGER on_new_favorite_recipe
+  AFTER INSERT ON public.favorite_recipes
+  FOR EACH ROW EXECUTE FUNCTION public.log_new_favorite_recipe();
+
+-- 9. Trigger function to log when a user shares a shopping list.
+DROP FUNCTION IF EXISTS public.log_new_list_share();
+
+CREATE OR REPLACE FUNCTION public.log_new_list_share()
+RETURNS TRIGGER AS $$
+BEGIN
+    INSERT INTO public.activity_log (user_id, action, display_text, icon, details)
+    VALUES (
+        NEW.shared_by_user_id,
+        'list_shared',
+        (SELECT full_name FROM public.profiles WHERE user_id = NEW.shared_by_user_id) || ' shared a shopping list.',
+        'share-2',
+        jsonb_build_object(
+            'shopping_list_id', NEW.shopping_list_id,
+            'list_name', (SELECT name FROM public.shopping_lists WHERE shopping_list_id = NEW.shopping_list_id),
+            'shared_with_user_id', NEW.shared_with_user_id
+        )
+    );
+
+    -- Award 'List Sharer' achievement.
+    PERFORM public.award_achievement(NEW.shared_by_user_id, 'List Sharer');
+    RETURN NEW;
+END;
+$$ LANGUAGE plpgsql;
+        
+-- Trigger to call the function after a shopping list is shared.
+DROP TRIGGER IF EXISTS on_new_list_share ON public.shared_shopping_lists;
+CREATE TRIGGER on_new_list_share
+  AFTER INSERT ON public.shared_shopping_lists
+  FOR EACH ROW EXECUTE FUNCTION public.log_new_list_share();
+
+-- 9a. Trigger function to log when a user shares a recipe collection.
+DROP FUNCTION IF EXISTS public.log_new_recipe_collection_share();
+
+CREATE OR REPLACE FUNCTION public.log_new_recipe_collection_share()
+RETURNS TRIGGER AS $$
+BEGIN
+    -- Log the activity
+    INSERT INTO public.activity_log (user_id, action, display_text, icon, details)
+    VALUES (
+        NEW.shared_by_user_id, 'recipe_collection_shared',
+        (SELECT full_name FROM public.profiles WHERE user_id = NEW.shared_by_user_id) || ' shared a recipe collection.',
+        'book',
+        jsonb_build_object('collection_id', NEW.recipe_collection_id, 'shared_with_user_id', NEW.shared_with_user_id)
+    );
+
+    -- Award 'Recipe Sharer' achievement.
+    PERFORM public.award_achievement(NEW.shared_by_user_id, 'Recipe Sharer');
+    RETURN NEW;
+END;
+$$ LANGUAGE plpgsql;
+
+DROP TRIGGER IF EXISTS on_new_recipe_collection_share ON public.shared_recipe_collections;
+CREATE TRIGGER on_new_recipe_collection_share
+  AFTER INSERT ON public.shared_recipe_collections
+  FOR EACH ROW EXECUTE FUNCTION public.log_new_recipe_collection_share();
+
+-- 10. Trigger function to geocode a store location's address.
+-- This function is triggered when an address is inserted or updated, and is
+-- designed to be extensible for external geocoding services to populate the
+-- latitude, longitude, and location fields.
+DROP FUNCTION IF EXISTS public.geocode_address();
+
+CREATE OR REPLACE FUNCTION public.geocode_address()
+RETURNS TRIGGER AS $$
+DECLARE
+    full_address TEXT;
+BEGIN
+    -- Only proceed if an address component has actually changed.
+    IF TG_OP = 'INSERT' OR (TG_OP = 'UPDATE' AND (
+        NEW.address_line_1 IS DISTINCT FROM OLD.address_line_1 OR
+        NEW.address_line_2 IS DISTINCT FROM OLD.address_line_2 OR
+        NEW.city IS DISTINCT FROM OLD.city OR
+        NEW.province_state IS DISTINCT FROM OLD.province_state OR
+        NEW.postal_code IS DISTINCT FROM OLD.postal_code OR
+        NEW.country IS DISTINCT FROM OLD.country
+    )) THEN
+        -- Concatenate address parts into a single string for the geocoder.
+        full_address := CONCAT_WS(', ', NEW.address_line_1, NEW.address_line_2, NEW.city, NEW.province_state, NEW.postal_code, NEW.country);
+
+        -- Placeholder for Geocoding API Call
+        -- In a real application, you would call a service here and update NEW.latitude, NEW.longitude, and NEW.location.
+        -- e.g., NEW.latitude := result.lat; NEW.longitude := result.lon;
+        -- NEW.location := ST_SetSRID(ST_MakePoint(NEW.longitude, NEW.latitude), 4326);
+    END IF;
+
+    RETURN NEW;
+END;
+$$ LANGUAGE plpgsql;
+
+-- This trigger calls the geocoding function when an address changes.
+DROP TRIGGER IF EXISTS on_address_change_geocode ON public.addresses;
+CREATE TRIGGER on_address_change_geocode
+  BEFORE INSERT OR UPDATE ON public.addresses
+  FOR EACH ROW EXECUTE FUNCTION public.geocode_address();
+
+-- 11. Trigger function to increment the fork_count on the original recipe.
+DROP FUNCTION IF EXISTS public.increment_recipe_fork_count();
+
+CREATE OR REPLACE FUNCTION public.increment_recipe_fork_count()
+RETURNS TRIGGER AS $$
+BEGIN
+    -- Only run if the recipe is a fork (original_recipe_id is not null).
+    IF NEW.original_recipe_id IS NOT NULL THEN
+        UPDATE public.recipes SET fork_count = fork_count + 1 WHERE recipe_id = NEW.original_recipe_id;
+        -- Award 'First Fork' achievement.
+        PERFORM public.award_achievement(NEW.user_id, 'First Fork');
+    END IF;
+    RETURN NEW;
+END;
+$$ LANGUAGE plpgsql;
+
+DROP TRIGGER IF EXISTS on_recipe_fork ON public.recipes;
+CREATE TRIGGER on_recipe_fork
+  AFTER INSERT ON public.recipes
+  FOR EACH ROW EXECUTE FUNCTION public.increment_recipe_fork_count();

sql/initial_data.sql

@@ -265,5 +265,6 @@ INSERT INTO public.achievements (name, description, icon, points_value) VALUES
 ('List Sharer', 'Share a shopping list with another user for the first time.', 'list', 20),
 ('First Favorite', 'Mark a recipe as one of your favorites.', 'heart', 5),
 ('First Fork', 'Make a personal copy of a public recipe.', 'git-fork', 10),
-('First Budget Created', 'Create your first budget to track spending.', 'piggy-bank', 15)
+('First Budget Created', 'Create your first budget to track spending.', 'piggy-bank', 15),
+('First-Upload', 'Upload your first flyer.', 'upload-cloud', 25)
 ON CONFLICT (name) DO NOTHING;

sql/initial_schema.sql

@@ -162,7 +162,6 @@ COMMENT ON COLUMN public.flyers.uploaded_by IS 'The user who uploaded the flyer.
 CREATE INDEX IF NOT EXISTS idx_flyers_status ON public.flyers(status);
 CREATE INDEX IF NOT EXISTS idx_flyers_created_at ON public.flyers (created_at DESC);
 CREATE INDEX IF NOT EXISTS idx_flyers_valid_to_file_name ON public.flyers (valid_to DESC, file_name ASC);
-CREATE INDEX IF NOT EXISTS idx_flyers_status ON public.flyers(status);
 -- 7. The 'master_grocery_items' table. This is the master dictionary.
 CREATE TABLE IF NOT EXISTS public.master_grocery_items (
     master_grocery_item_id BIGINT PRIMARY KEY GENERATED ALWAYS AS IDENTITY,
@@ -973,6 +972,21 @@ COMMENT ON COLUMN public.user_reactions.reaction_type IS 'The type of reaction (
 CREATE INDEX IF NOT EXISTS idx_user_reactions_user_id ON public.user_reactions(user_id);
 CREATE INDEX IF NOT EXISTS idx_user_reactions_entity ON public.user_reactions(entity_type, entity_id);
 
+-- 56. Store user-defined budgets for spending analysis.
+CREATE TABLE IF NOT EXISTS public.budgets (
+    budget_id BIGINT PRIMARY KEY GENERATED ALWAYS AS IDENTITY,
+    user_id UUID NOT NULL REFERENCES public.users(user_id) ON DELETE CASCADE,
+    name TEXT NOT NULL,
+    amount_cents INTEGER NOT NULL CHECK (amount_cents > 0),
+    period TEXT NOT NULL CHECK (period IN ('weekly', 'monthly')),
+    start_date DATE NOT NULL,
+    created_at TIMESTAMPTZ DEFAULT now() NOT NULL,    
+    updated_at TIMESTAMPTZ DEFAULT now() NOT NULL,
+    CONSTRAINT budgets_name_check CHECK (TRIM(name) <> '')
+);
+COMMENT ON TABLE public.budgets IS 'Allows users to set weekly or monthly grocery budgets for spending tracking.';
+CREATE INDEX IF NOT EXISTS idx_budgets_user_id ON public.budgets(user_id);
+
 -- 57. Static table defining available achievements for gamification.
 CREATE TABLE IF NOT EXISTS public.achievements (
     achievement_id BIGINT PRIMARY KEY GENERATED ALWAYS AS IDENTITY,
@@ -998,17 +1012,3 @@ CREATE INDEX IF NOT EXISTS idx_user_achievements_user_id ON public.user_achievem
 CREATE INDEX IF NOT EXISTS idx_user_achievements_achievement_id ON public.user_achievements(achievement_id);
 
 
--- 56. Store user-defined budgets for spending analysis.
-CREATE TABLE IF NOT EXISTS public.budgets (
-    budget_id BIGINT PRIMARY KEY GENERATED ALWAYS AS IDENTITY,
-    user_id UUID NOT NULL REFERENCES public.users(user_id) ON DELETE CASCADE,
-    name TEXT NOT NULL,
-    amount_cents INTEGER NOT NULL CHECK (amount_cents > 0),
-    period TEXT NOT NULL CHECK (period IN ('weekly', 'monthly')),
-    start_date DATE NOT NULL,
-    created_at TIMESTAMPTZ DEFAULT now() NOT NULL,    
-    updated_at TIMESTAMPTZ DEFAULT now() NOT NULL,
-    CONSTRAINT budgets_name_check CHECK (TRIM(name) <> '')
-);
-COMMENT ON TABLE public.budgets IS 'Allows users to set weekly or monthly grocery budgets for spending tracking.';
-CREATE INDEX IF NOT EXISTS idx_budgets_user_id ON public.budgets(user_id);

sql/master_schema_rollup.sql

@@ -102,11 +102,11 @@ CREATE TABLE IF NOT EXISTS public.profiles (
     address_id BIGINT REFERENCES public.addresses(address_id) ON DELETE SET NULL,
     points INTEGER DEFAULT 0 NOT NULL CHECK (points >= 0),
     preferences JSONB,
-    role TEXT CHECK (role IN ('admin', 'user')),
+    role TEXT NOT NULL CHECK (role IN ('admin', 'user')),
     created_at TIMESTAMPTZ DEFAULT now() NOT NULL,
     updated_at TIMESTAMPTZ DEFAULT now() NOT NULL,
     CONSTRAINT profiles_full_name_check CHECK (full_name IS NULL OR TRIM(full_name) <> ''),
-    CONSTRAINT profiles_avatar_url_check CHECK (avatar_url IS NULL OR avatar_url ~* '^https://?.*'),
+    CONSTRAINT profiles_avatar_url_check CHECK (avatar_url IS NULL OR avatar_url ~* '^https?://.*'),
     created_by UUID REFERENCES public.users(user_id) ON DELETE SET NULL,    
     updated_by UUID REFERENCES public.users(user_id) ON DELETE SET NULL
 );
@@ -124,7 +124,7 @@ CREATE TABLE IF NOT EXISTS public.stores (
     created_at TIMESTAMPTZ DEFAULT now() NOT NULL,
     updated_at TIMESTAMPTZ DEFAULT now() NOT NULL,
     CONSTRAINT stores_name_check CHECK (TRIM(name) <> ''),
-    CONSTRAINT stores_logo_url_check CHECK (logo_url IS NULL OR logo_url ~* '^https://?.*'),
+    CONSTRAINT stores_logo_url_check CHECK (logo_url IS NULL OR logo_url ~* '^https?://.*'),
     created_by UUID REFERENCES public.users(user_id) ON DELETE SET NULL    
 );
 COMMENT ON TABLE public.stores IS 'Stores metadata for grocery store chains (e.g., Safeway, Kroger).';
@@ -144,7 +144,7 @@ CREATE TABLE IF NOT EXISTS public.flyers (
     flyer_id BIGINT PRIMARY KEY GENERATED ALWAYS AS IDENTITY,
     file_name TEXT NOT NULL,
     image_url TEXT NOT NULL,
-    icon_url TEXT,
+    icon_url TEXT NOT NULL,
     checksum TEXT UNIQUE,  
     store_id BIGINT REFERENCES public.stores(store_id) ON DELETE CASCADE,
     valid_from DATE,
@@ -157,8 +157,8 @@ CREATE TABLE IF NOT EXISTS public.flyers (
     updated_at TIMESTAMPTZ DEFAULT now() NOT NULL,
     CONSTRAINT flyers_valid_dates_check CHECK (valid_to >= valid_from),
     CONSTRAINT flyers_file_name_check CHECK (TRIM(file_name) <> ''),
-    CONSTRAINT flyers_image_url_check CHECK (image_url ~* '^https://?.*'),
-    CONSTRAINT flyers_icon_url_check CHECK (icon_url IS NULL OR icon_url ~* '^https://?.*'),
+    CONSTRAINT flyers_image_url_check CHECK (image_url ~* '^https?://.*'),
+    CONSTRAINT flyers_icon_url_check CHECK (icon_url ~* '^https?://.*'),
     CONSTRAINT flyers_checksum_check CHECK (checksum IS NULL OR length(checksum) = 64)
 );
 COMMENT ON TABLE public.flyers IS 'Stores metadata for each processed flyer, linking it to a store and its validity period.';
@@ -215,7 +215,7 @@ CREATE TABLE IF NOT EXISTS public.brands (
     created_at TIMESTAMPTZ DEFAULT now() NOT NULL,
     updated_at TIMESTAMPTZ DEFAULT now() NOT NULL,
     CONSTRAINT brands_name_check CHECK (TRIM(name) <> ''),
-    CONSTRAINT brands_logo_url_check CHECK (logo_url IS NULL OR logo_url ~* '^https://?.*')
+    CONSTRAINT brands_logo_url_check CHECK (logo_url IS NULL OR logo_url ~* '^https?://.*')
 );
 COMMENT ON TABLE public.brands IS 'Stores brand names like "Coca-Cola", "Maple Leaf", or "Kraft".';
 COMMENT ON COLUMN public.brands.store_id IS 'If this is a store-specific brand (e.g., President''s Choice), this links to the parent store.';
@@ -482,7 +482,7 @@ CREATE TABLE IF NOT EXISTS public.user_submitted_prices (
     downvotes INTEGER DEFAULT 0 NOT NULL CHECK (downvotes >= 0),
     created_at TIMESTAMPTZ DEFAULT now() NOT NULL,
     updated_at TIMESTAMPTZ DEFAULT now() NOT NULL,
-    CONSTRAINT user_submitted_prices_photo_url_check CHECK (photo_url IS NULL OR photo_url ~* '^https://?.*')
+    CONSTRAINT user_submitted_prices_photo_url_check CHECK (photo_url IS NULL OR photo_url ~* '^https?://.*')
 );
 COMMENT ON TABLE public.user_submitted_prices IS 'Stores item prices submitted by users directly from physical stores.';
 COMMENT ON COLUMN public.user_submitted_prices.photo_url IS 'URL to user-submitted photo evidence of the price.';
@@ -539,7 +539,7 @@ CREATE TABLE IF NOT EXISTS public.recipes (
     created_at TIMESTAMPTZ DEFAULT now() NOT NULL,
     updated_at TIMESTAMPTZ DEFAULT now() NOT NULL,
     CONSTRAINT recipes_name_check CHECK (TRIM(name) <> ''),
-    CONSTRAINT recipes_photo_url_check CHECK (photo_url IS NULL OR photo_url ~* '^https://?.*')
+    CONSTRAINT recipes_photo_url_check CHECK (photo_url IS NULL OR photo_url ~* '^https?://.*')
 );
 COMMENT ON TABLE public.recipes IS 'Stores recipes that can be used to generate shopping lists.';
 COMMENT ON COLUMN public.recipes.servings IS 'The number of servings this recipe yields.';
@@ -689,8 +689,8 @@ CREATE TABLE IF NOT EXISTS public.planned_meals (
     meal_type TEXT NOT NULL,
     servings_to_cook INTEGER,
     created_at TIMESTAMPTZ DEFAULT now() NOT NULL,    
-    CONSTRAINT planned_meals_meal_type_check CHECK (TRIM(meal_type) <> ''),
-    updated_at TIMESTAMPTZ DEFAULT now() NOT NULL
+    updated_at TIMESTAMPTZ DEFAULT now() NOT NULL,
+    CONSTRAINT planned_meals_meal_type_check CHECK (TRIM(meal_type) <> '')
 );
 COMMENT ON TABLE public.planned_meals IS 'Assigns a recipe to a specific day and meal type within a user''s menu plan.';
 COMMENT ON COLUMN public.planned_meals.meal_type IS 'The designated meal for the recipe, e.g., ''Breakfast'', ''Lunch'', ''Dinner''.';
@@ -940,7 +940,7 @@ CREATE TABLE IF NOT EXISTS public.receipts (
     raw_text TEXT,
     created_at TIMESTAMPTZ DEFAULT now() NOT NULL,
     processed_at TIMESTAMPTZ,    
-    CONSTRAINT receipts_receipt_image_url_check CHECK (receipt_image_url ~* '^https://?.*'),
+    CONSTRAINT receipts_receipt_image_url_check CHECK (receipt_image_url ~* '^https?://.*'),
     updated_at TIMESTAMPTZ DEFAULT now() NOT NULL
 );
 COMMENT ON TABLE public.receipts IS 'Stores uploaded user receipts for purchase tracking and analysis.';
@@ -1113,6 +1113,7 @@ DECLARE
     ground_beef_id BIGINT; pasta_item_id BIGINT; tomatoes_id BIGINT; onions_id BIGINT; garlic_id BIGINT;
     bell_peppers_id BIGINT; carrots_id BIGINT; soy_sauce_id BIGINT;
     soda_item_id BIGINT; turkey_item_id BIGINT; bread_item_id BIGINT; cheese_item_id BIGINT;
+    chicken_thighs_id BIGINT; paper_towels_id BIGINT; toilet_paper_id BIGINT;
 
     -- Tag IDs
     quick_easy_tag BIGINT; healthy_tag BIGINT; chicken_tag BIGINT;
@@ -1164,6 +1165,9 @@ BEGIN
     SELECT mgi.master_grocery_item_id INTO turkey_item_id FROM public.master_grocery_items mgi WHERE mgi.name = 'turkey';
     SELECT mgi.master_grocery_item_id INTO bread_item_id FROM public.master_grocery_items mgi WHERE mgi.name = 'bread';
     SELECT mgi.master_grocery_item_id INTO cheese_item_id FROM public.master_grocery_items mgi WHERE mgi.name = 'cheese';
+    SELECT mgi.master_grocery_item_id INTO chicken_thighs_id FROM public.master_grocery_items mgi WHERE mgi.name = 'chicken thighs';
+    SELECT mgi.master_grocery_item_id INTO paper_towels_id FROM public.master_grocery_items mgi WHERE mgi.name = 'paper towels';
+    SELECT mgi.master_grocery_item_id INTO toilet_paper_id FROM public.master_grocery_items mgi WHERE mgi.name = 'toilet paper';
 
     -- Insert ingredients for each recipe
     INSERT INTO public.recipe_ingredients (recipe_id, master_item_id, quantity, unit) VALUES
@@ -1200,6 +1204,17 @@ BEGIN
     (bolognese_recipe_id, family_tag), (bolognese_recipe_id, beef_tag), (bolognese_recipe_id, weeknight_tag),
     (stir_fry_recipe_id, quick_easy_tag), (stir_fry_recipe_id, healthy_tag), (stir_fry_recipe_id, vegetarian_tag)
     ON CONFLICT (recipe_id, tag_id) DO NOTHING;
+
+    INSERT INTO public.master_item_aliases (master_item_id, alias) VALUES
+    (ground_beef_id, 'ground chuck'), (ground_beef_id, 'lean ground beef'), 
+    (ground_beef_id, 'extra lean ground beef'), (ground_beef_id, 'hamburger meat'),
+    (chicken_breast_id, 'boneless skinless chicken breast'), (chicken_breast_id, 'chicken cutlets'),
+    (chicken_thighs_id, 'boneless skinless chicken thighs'), (chicken_thighs_id, 'bone-in chicken thighs'),
+    (bell_peppers_id, 'red pepper'), (bell_peppers_id, 'green pepper'), (bell_peppers_id, 'yellow pepper'), (bell_peppers_id, 'orange pepper'),
+    (soda_item_id, 'pop'), (soda_item_id, 'soft drink'), (soda_item_id, 'coke'), (soda_item_id, 'pepsi'),
+    (paper_towels_id, 'paper towel'),
+    (toilet_paper_id, 'bathroom tissue'), (toilet_paper_id, 'toilet tissue')
+    ON CONFLICT (alias) DO NOTHING;
 END $$;
 
 -- Pre-populate the unit_conversions table with common cooking conversions.
@@ -1248,7 +1263,8 @@ INSERT INTO public.achievements (name, description, icon, points_value) VALUES
 ('List Sharer', 'Share a shopping list with another user for the first time.', 'list', 20),
 ('First Favorite', 'Mark a recipe as one of your favorites.', 'heart', 5),
 ('First Fork', 'Make a personal copy of a public recipe.', 'git-fork', 10),
-('First Budget Created', 'Create your first budget to track spending.', 'piggy-bank', 15)
+('First Budget Created', 'Create your first budget to track spending.', 'piggy-bank', 15),
+('First-Upload', 'Upload your first flyer.', 'upload-cloud', 25)
 ON CONFLICT (name) DO NOTHING;
 
 -- ============================================================================
@@ -2114,6 +2130,61 @@ AS $$
   ORDER BY potential_savings_cents DESC;
 $$;
 
+-- Function to get a user's spending breakdown by category for a given date range.
+DROP FUNCTION IF EXISTS public.get_spending_by_category(UUID, DATE, DATE);
+
+CREATE OR REPLACE FUNCTION public.get_spending_by_category(p_user_id UUID, p_start_date DATE, p_end_date DATE)
+RETURNS TABLE (
+    category_id BIGINT,
+    category_name TEXT,
+    total_spent_cents BIGINT
+)
+LANGUAGE sql
+STABLE
+SECURITY INVOKER
+AS $$
+  WITH all_purchases AS (
+    -- CTE 1: Combine purchases from completed shopping trips.
+    -- We only consider items that have a price paid.
+    SELECT
+      sti.master_item_id,
+      sti.price_paid_cents
+    FROM public.shopping_trip_items sti
+    JOIN public.shopping_trips st ON sti.shopping_trip_id = st.shopping_trip_id
+    WHERE st.user_id = p_user_id
+      AND st.completed_at::date BETWEEN p_start_date AND p_end_date
+      AND sti.price_paid_cents IS NOT NULL
+
+    UNION ALL
+
+    -- CTE 2: Combine purchases from processed receipts.
+    SELECT
+      ri.master_item_id,
+      ri.price_paid_cents
+    FROM public.receipt_items ri
+    JOIN public.receipts r ON ri.receipt_id = r.receipt_id
+    WHERE r.user_id = p_user_id
+      AND r.transaction_date::date BETWEEN p_start_date AND p_end_date
+      AND ri.master_item_id IS NOT NULL -- Only include items matched to a master item
+  )
+  -- Final Aggregation: Group all combined purchases by category and sum the spending.
+  SELECT
+    c.category_id,
+    c.name AS category_name,
+    SUM(ap.price_paid_cents)::BIGINT AS total_spent_cents
+  FROM all_purchases ap
+  -- Join with master_grocery_items to get the category_id for each purchase.
+  JOIN public.master_grocery_items mgi ON ap.master_item_id = mgi.master_grocery_item_id
+  -- Join with categories to get the category name for display.
+  JOIN public.categories c ON mgi.category_id = c.category_id
+  GROUP BY
+    c.category_id, c.name
+  HAVING
+    SUM(ap.price_paid_cents) > 0
+  ORDER BY
+    total_spent_cents DESC;
+$$;
+
 -- Function to approve a suggested correction and apply it.
 DROP FUNCTION IF EXISTS public.approve_correction(BIGINT);
 
@@ -2557,8 +2628,15 @@ DROP FUNCTION IF EXISTS public.log_new_flyer();
 CREATE OR REPLACE FUNCTION public.log_new_flyer()
 RETURNS TRIGGER AS $$
 BEGIN
-    INSERT INTO public.activity_log (action, display_text, icon, details)
+    -- If the flyer was uploaded by a registered user, award the 'First-Upload' achievement.
+    -- The award_achievement function handles checking if the user already has it.
+    IF NEW.uploaded_by IS NOT NULL THEN
+        PERFORM public.award_achievement(NEW.uploaded_by, 'First-Upload');
+    END IF;
+
+    INSERT INTO public.activity_log (user_id, action, display_text, icon, details)
     VALUES (
+        NEW.uploaded_by, -- Log the user who uploaded it
         'flyer_uploaded',
         'A new flyer for ' || (SELECT name FROM public.stores WHERE store_id = NEW.store_id) || ' has been uploaded.',
         'file-text',
@@ -2616,6 +2694,7 @@ BEGIN
         (SELECT full_name FROM public.profiles WHERE user_id = NEW.shared_by_user_id) || ' shared a shopping list.',
         'share-2',
         jsonb_build_object(
+            'shopping_list_id', NEW.shopping_list_id,
             'list_name', (SELECT name FROM public.shopping_lists WHERE shopping_list_id = NEW.shopping_list_id),
             'shared_with_user_id', NEW.shared_with_user_id
         )
@@ -2663,6 +2742,66 @@ CREATE TRIGGER on_new_recipe_collection_share
   AFTER INSERT ON public.shared_recipe_collections
   FOR EACH ROW EXECUTE FUNCTION public.log_new_recipe_collection_share();
 
+-- 10. Trigger function to geocode a store location's address.
+-- This function is triggered when an address is inserted or updated, and is
+-- designed to be extensible for external geocoding services to populate the
+-- latitude, longitude, and location fields.
+DROP FUNCTION IF EXISTS public.geocode_address();
+
+CREATE OR REPLACE FUNCTION public.geocode_address()
+RETURNS TRIGGER AS $$
+DECLARE
+    full_address TEXT;
+BEGIN
+    -- Only proceed if an address component has actually changed.
+    IF TG_OP = 'INSERT' OR (TG_OP = 'UPDATE' AND (
+        NEW.address_line_1 IS DISTINCT FROM OLD.address_line_1 OR
+        NEW.address_line_2 IS DISTINCT FROM OLD.address_line_2 OR
+        NEW.city IS DISTINCT FROM OLD.city OR
+        NEW.province_state IS DISTINCT FROM OLD.province_state OR
+        NEW.postal_code IS DISTINCT FROM OLD.postal_code OR
+        NEW.country IS DISTINCT FROM OLD.country
+    )) THEN
+        -- Concatenate address parts into a single string for the geocoder.
+        full_address := CONCAT_WS(', ', NEW.address_line_1, NEW.address_line_2, NEW.city, NEW.province_state, NEW.postal_code, NEW.country);
+
+        -- Placeholder for Geocoding API Call.
+        -- In a real application, you would call a service here and update NEW.latitude, NEW.longitude, and NEW.location.
+        -- e.g., NEW.latitude := result.lat; NEW.longitude := result.lon;
+        -- NEW.location := ST_SetSRID(ST_MakePoint(NEW.longitude, NEW.latitude), 4326);
+    END IF;
+
+    RETURN NEW;
+END;
+$$ LANGUAGE plpgsql;
+
+-- This trigger calls the geocoding function when an address changes.
+DROP TRIGGER IF EXISTS on_address_change_geocode ON public.addresses;
+CREATE TRIGGER on_address_change_geocode
+  BEFORE INSERT OR UPDATE ON public.addresses
+  FOR EACH ROW EXECUTE FUNCTION public.geocode_address();
+
+-- 11. Trigger function to increment the fork_count on the original recipe.
+DROP FUNCTION IF EXISTS public.increment_recipe_fork_count();
+
+CREATE OR REPLACE FUNCTION public.increment_recipe_fork_count()
+RETURNS TRIGGER AS $$
+BEGIN
+    -- Only run if the recipe is a fork (original_recipe_id is not null).
+    IF NEW.original_recipe_id IS NOT NULL THEN
+        UPDATE public.recipes SET fork_count = fork_count + 1 WHERE recipe_id = NEW.original_recipe_id;
+        -- Award 'First Fork' achievement.
+        PERFORM public.award_achievement(NEW.user_id, 'First Fork');
+    END IF;
+    RETURN NEW;
+END;
+$$ LANGUAGE plpgsql;
+
+DROP TRIGGER IF EXISTS on_recipe_fork ON public.recipes;
+CREATE TRIGGER on_recipe_fork
+  AFTER INSERT ON public.recipes
+  FOR EACH ROW EXECUTE FUNCTION public.increment_recipe_fork_count();
+
 -- =================================================================
 -- Function: get_best_sale_prices_for_all_users()
 -- Description: Retrieves the best sale price for every item on every user's watchlist.
@@ -2670,17 +2809,19 @@ CREATE TRIGGER on_new_recipe_collection_share
 -- It replaces the need to call get_best_sale_prices_for_user for each user individually.
 -- Returns: TABLE(...) - A set of records including user details and deal information.
 -- =================================================================
+DROP FUNCTION IF EXISTS public.get_best_sale_prices_for_all_users();
+
 CREATE OR REPLACE FUNCTION public.get_best_sale_prices_for_all_users()
 RETURNS TABLE(
     user_id uuid,
 
     email text,
     full_name text,
-    master_item_id integer,
+    master_item_id bigint,
     item_name text,
     best_price_in_cents integer,
     store_name text,
-    flyer_id integer,
+    flyer_id bigint,
     valid_to date
 ) AS $$
 BEGIN
@@ -2692,7 +2833,7 @@ BEGIN
         SELECT
             fi.master_item_id,
             fi.price_in_cents,
-            f.store_name,
+            s.name as store_name,
             f.flyer_id,
             f.valid_to
         FROM public.flyer_items fi

src/components/AchievementsList.test.tsx

@@ -1,9 +1,10 @@
 // src/components/AchievementsList.test.tsx
 import React from 'react';
-import { render, screen } from '@testing-library/react';
+import { screen } from '@testing-library/react';
 import { describe, it, expect } from 'vitest';
 import { AchievementsList } from './AchievementsList';
 import { createMockUserAchievement } from '../tests/utils/mockFactories';
+import { renderWithProviders } from '../tests/utils/renderWithProviders';
 
 describe('AchievementsList', () => {
   it('should render the list of achievements with correct details', () => {
@@ -24,7 +25,7 @@ describe('AchievementsList', () => {
       createMockUserAchievement({ achievement_id: 3, name: 'Unknown Achievement', icon: 'star' }), // This icon is not in the component's map
     ];
 
-    render(<AchievementsList achievements={mockAchievements} />);
+    renderWithProviders(<AchievementsList achievements={mockAchievements} />);
 
     expect(screen.getByRole('heading', { name: /achievements/i })).toBeInTheDocument();
 
@@ -44,7 +45,7 @@ describe('AchievementsList', () => {
   });
 
   it('should render a message when there are no achievements', () => {
-    render(<AchievementsList achievements={[]} />);
+    renderWithProviders(<AchievementsList achievements={[]} />);
     expect(
       screen.getByText('No achievements earned yet. Keep exploring to unlock them!'),
     ).toBeInTheDocument();

src/components/AdminRoute.test.tsx

@@ -1,11 +1,12 @@
 // src/components/AdminRoute.test.tsx
 import React from 'react';
-import { render, screen } from '@testing-library/react';
-import { describe, it, expect } from 'vitest';
-import { MemoryRouter, Routes, Route } from 'react-router-dom';
+import { screen } from '@testing-library/react';
+import { describe, it, expect, vi } from 'vitest';
+import { Routes, Route } from 'react-router-dom';
 import { AdminRoute } from './AdminRoute';
 import type { Profile } from '../types';
 import { createMockProfile } from '../tests/utils/mockFactories';
+import { renderWithProviders } from '../tests/utils/renderWithProviders';
 
 // Unmock the component to test the real implementation
 vi.unmock('./AdminRoute');
@@ -14,15 +15,14 @@ const AdminContent = () => <div>Admin Page Content</div>;
 const HomePage = () => <div>Home Page</div>;
 
 const renderWithRouter = (profile: Profile | null, initialPath: string) => {
-  render(
-    <MemoryRouter initialEntries={[initialPath]}>
-      <Routes>
-        <Route path="/" element={<HomePage />} />
-        <Route path="/admin" element={<AdminRoute profile={profile} />}>
-          <Route index element={<AdminContent />} />
-        </Route>
-      </Routes>
-    </MemoryRouter>,
+  renderWithProviders(
+    <Routes>
+      <Route path="/" element={<HomePage />} />
+      <Route path="/admin" element={<AdminRoute profile={profile} />}>
+        <Route index element={<AdminContent />} />
+      </Route>
+    </Routes>,
+    { initialEntries: [initialPath] },
   );
 };
 

src/components/AnonymousUserBanner.test.tsx

@@ -1,8 +1,9 @@
 // src/components/AnonymousUserBanner.test.tsx
 import React from 'react';
-import { render, screen, fireEvent } from '@testing-library/react';
+import { screen, fireEvent } from '@testing-library/react';
 import { describe, it, expect, vi } from 'vitest';
 import { AnonymousUserBanner } from './AnonymousUserBanner';
+import { renderWithProviders } from '../tests/utils/renderWithProviders';
 
 // Mock the icon to ensure it is rendered correctly
 vi.mock('./icons/InformationCircleIcon', () => ({
@@ -14,7 +15,7 @@ vi.mock('./icons/InformationCircleIcon', () => ({
 describe('AnonymousUserBanner', () => {
   it('should render the banner with the correct text content and accessibility role', () => {
     const mockOnOpenProfile = vi.fn();
-    render(<AnonymousUserBanner onOpenProfile={mockOnOpenProfile} />);
+    renderWithProviders(<AnonymousUserBanner onOpenProfile={mockOnOpenProfile} />);
 
     // Check for accessibility role
     expect(screen.getByRole('alert')).toBeInTheDocument();
@@ -30,7 +31,7 @@ describe('AnonymousUserBanner', () => {
 
   it('should call onOpenProfile when the "sign up or log in" button is clicked', () => {
     const mockOnOpenProfile = vi.fn();
-    render(<AnonymousUserBanner onOpenProfile={mockOnOpenProfile} />);
+    renderWithProviders(<AnonymousUserBanner onOpenProfile={mockOnOpenProfile} />);
 
     const loginButton = screen.getByRole('button', { name: /sign up or log in/i });
     fireEvent.click(loginButton);

src/components/AppGuard.test.tsx

@@ -1,12 +1,15 @@
 // src/components/AppGuard.test.tsx
 import React from 'react';
-import { render, screen, waitFor } from '@testing-library/react';
+import { screen, waitFor } from '@testing-library/react';
 import { describe, it, expect, vi, beforeEach } from 'vitest';
 import { AppGuard } from './AppGuard';
 import { useAppInitialization } from '../hooks/useAppInitialization';
+import * as apiClient from '../services/apiClient';
 import { useModal } from '../hooks/useModal';
+import { renderWithProviders } from '../tests/utils/renderWithProviders';
 
 // Mock dependencies
+// The apiClient is mocked globally in `src/tests/setup/globalApiMock.ts`.
 vi.mock('../hooks/useAppInitialization');
 vi.mock('../hooks/useModal');
 vi.mock('./WhatsNewModal', () => ({
@@ -19,6 +22,7 @@ vi.mock('../config', () => ({
   },
 }));
 
+const mockedApiClient = vi.mocked(apiClient);
 const mockedUseAppInitialization = vi.mocked(useAppInitialization);
 const mockedUseModal = vi.mocked(useModal);
 
@@ -38,7 +42,7 @@ describe('AppGuard', () => {
   });
 
   it('should render children', () => {
-    render(
+    renderWithProviders(
       <AppGuard>
         <div>Child Content</div>
       </AppGuard>,
@@ -51,7 +55,7 @@ describe('AppGuard', () => {
       ...mockedUseModal(),
       isModalOpen: (modalId) => modalId === 'whatsNew',
     });
-    render(
+    renderWithProviders(
       <AppGuard>
         <div>Child</div>
       </AppGuard>,
@@ -64,7 +68,7 @@ describe('AppGuard', () => {
       isDarkMode: true,
       unitSystem: 'imperial',
     });
-    render(
+    renderWithProviders(
       <AppGuard>
         <div>Child</div>
       </AppGuard>,
@@ -78,7 +82,7 @@ describe('AppGuard', () => {
   });
 
   it('should set light mode styles for toaster', async () => {
-    render(
+    renderWithProviders(
       <AppGuard>
         <div>Child</div>
       </AppGuard>,

src/components/ConfirmationModal.test.tsx

@@ -1,8 +1,9 @@
 // src/components/ConfirmationModal.test.tsx
 import React from 'react';
-import { render, screen, fireEvent } from '@testing-library/react';
+import { screen, fireEvent } from '@testing-library/react';
 import { describe, it, expect, vi, beforeEach } from 'vitest';
 import { ConfirmationModal } from './ConfirmationModal';
+import { renderWithProviders } from '../tests/utils/renderWithProviders';
 
 describe('ConfirmationModal (in components)', () => {
   const mockOnClose = vi.fn();
@@ -21,12 +22,12 @@ describe('ConfirmationModal (in components)', () => {
   });
 
   it('should not render when isOpen is false', () => {
-    const { container } = render(<ConfirmationModal {...defaultProps} isOpen={false} />);
+    const { container } = renderWithProviders(<ConfirmationModal {...defaultProps} isOpen={false} />);
     expect(container.firstChild).toBeNull();
   });
 
   it('should render correctly when isOpen is true', () => {
-    render(<ConfirmationModal {...defaultProps} />);
+    renderWithProviders(<ConfirmationModal {...defaultProps} />);
     expect(screen.getByRole('heading', { name: 'Confirm Action' })).toBeInTheDocument();
     expect(screen.getByText('Are you sure you want to do this?')).toBeInTheDocument();
     expect(screen.getByRole('button', { name: 'Confirm' })).toBeInTheDocument();
@@ -34,38 +35,38 @@ describe('ConfirmationModal (in components)', () => {
   });
 
   it('should call onConfirm when the confirm button is clicked', () => {
-    render(<ConfirmationModal {...defaultProps} />);
+    renderWithProviders(<ConfirmationModal {...defaultProps} />);
     fireEvent.click(screen.getByRole('button', { name: 'Confirm' }));
     expect(mockOnConfirm).toHaveBeenCalledTimes(1);
   });
 
   it('should call onClose when the cancel button is clicked', () => {
-    render(<ConfirmationModal {...defaultProps} />);
+    renderWithProviders(<ConfirmationModal {...defaultProps} />);
     fireEvent.click(screen.getByRole('button', { name: 'Cancel' }));
     expect(mockOnClose).toHaveBeenCalledTimes(1);
   });
 
   it('should call onClose when the close icon is clicked', () => {
-    render(<ConfirmationModal {...defaultProps} />);
+    renderWithProviders(<ConfirmationModal {...defaultProps} />);
     fireEvent.click(screen.getByLabelText('Close confirmation modal'));
     expect(mockOnClose).toHaveBeenCalledTimes(1);
   });
 
   it('should call onClose when the overlay is clicked', () => {
-    render(<ConfirmationModal {...defaultProps} />);
+    renderWithProviders(<ConfirmationModal {...defaultProps} />);
     // The overlay is the parent of the modal content div
     fireEvent.click(screen.getByRole('dialog'));
     expect(mockOnClose).toHaveBeenCalledTimes(1);
   });
 
   it('should not call onClose when clicking inside the modal content', () => {
-    render(<ConfirmationModal {...defaultProps} />);
+    renderWithProviders(<ConfirmationModal {...defaultProps} />);
     fireEvent.click(screen.getByText('Are you sure you want to do this?'));
     expect(mockOnClose).not.toHaveBeenCalled();
   });
 
   it('should render custom button text and classes', () => {
-    render(
+    renderWithProviders(
       <ConfirmationModal
         {...defaultProps}
         confirmButtonText="Yes, Delete"

src/components/DarkModeToggle.test.tsx

@@ -1,8 +1,9 @@
 // src/components/DarkModeToggle.test.tsx
 import React from 'react';
-import { render, screen, fireEvent } from '@testing-library/react';
+import { screen, fireEvent } from '@testing-library/react';
 import { describe, it, expect, vi, beforeEach } from 'vitest';
 import { DarkModeToggle } from './DarkModeToggle';
+import { renderWithProviders } from '../tests/utils/renderWithProviders';
 
 // Mock the icon components to isolate the toggle's logic
 vi.mock('./icons/SunIcon', () => ({
@@ -20,7 +21,7 @@ describe('DarkModeToggle', () => {
   });
 
   it('should render in light mode state', () => {
-    render(<DarkModeToggle isDarkMode={false} onToggle={mockOnToggle} />);
+    renderWithProviders(<DarkModeToggle isDarkMode={false} onToggle={mockOnToggle} />);
 
     const checkbox = screen.getByRole('checkbox');
     expect(checkbox).not.toBeChecked();
@@ -29,7 +30,7 @@ describe('DarkModeToggle', () => {
   });
 
   it('should render in dark mode state', () => {
-    render(<DarkModeToggle isDarkMode={true} onToggle={mockOnToggle} />);
+    renderWithProviders(<DarkModeToggle isDarkMode={true} onToggle={mockOnToggle} />);
 
     const checkbox = screen.getByRole('checkbox');
     expect(checkbox).toBeChecked();
@@ -38,7 +39,7 @@ describe('DarkModeToggle', () => {
   });
 
   it('should call onToggle when the label is clicked', () => {
-    render(<DarkModeToggle isDarkMode={false} onToggle={mockOnToggle} />);
+    renderWithProviders(<DarkModeToggle isDarkMode={false} onToggle={mockOnToggle} />);
 
     // Clicking the label triggers the checkbox change
     const label = screen.getByTitle('Switch to Dark Mode');

src/components/Dashboard.test.tsx

@@ -0,0 +1,67 @@
+// src/components/Dashboard.test.tsx
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { screen } from '@testing-library/react';
+import { Dashboard } from './Dashboard';
+import { renderWithProviders } from '../tests/utils/renderWithProviders';
+
+// Mock child components to isolate Dashboard logic
+// Note: The Dashboard component imports these using '../components/RecipeSuggester'
+// which resolves to the same file as './RecipeSuggester' when inside src/components.
+vi.mock('./RecipeSuggester', () => ({
+  RecipeSuggester: () => <div data-testid="recipe-suggester-mock">Recipe Suggester</div>,
+}));
+
+vi.mock('./FlyerCountDisplay', () => ({
+  FlyerCountDisplay: () => <div data-testid="flyer-count-display-mock">Flyer Count Display</div>,
+}));
+
+vi.mock('./Leaderboard', () => ({
+  Leaderboard: () => <div data-testid="leaderboard-mock">Leaderboard</div>,
+}));
+
+describe('Dashboard Component', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  it('renders the dashboard title', () => {
+    console.log('TEST: Verifying dashboard title render');
+    renderWithProviders(<Dashboard />);
+    expect(screen.getByRole('heading', { name: /dashboard/i, level: 1 })).toBeInTheDocument();
+  });
+
+  it('renders the RecipeSuggester widget', () => {
+    console.log('TEST: Verifying RecipeSuggester presence');
+    renderWithProviders(<Dashboard />);
+    expect(screen.getByTestId('recipe-suggester-mock')).toBeInTheDocument();
+  });
+
+  it('renders the FlyerCountDisplay widget within the "Your Flyers" section', () => {
+    console.log('TEST: Verifying FlyerCountDisplay presence and section title');
+    renderWithProviders(<Dashboard />);
+
+    // Check for the section heading
+    expect(screen.getByRole('heading', { name: /your flyers/i, level: 2 })).toBeInTheDocument();
+
+    // Check for the component
+    expect(screen.getByTestId('flyer-count-display-mock')).toBeInTheDocument();
+  });
+
+  it('renders the Leaderboard widget in the sidebar area', () => {
+    console.log('TEST: Verifying Leaderboard presence');
+    renderWithProviders(<Dashboard />);
+    expect(screen.getByTestId('leaderboard-mock')).toBeInTheDocument();
+  });
+
+  it('renders with the correct grid layout classes', () => {
+    console.log('TEST: Verifying layout classes');
+    const { container } = renderWithProviders(<Dashboard />);
+
+    // The main grid container
+    const gridContainer = container.querySelector('.grid');
+    expect(gridContainer).toBeInTheDocument();
+    expect(gridContainer).toHaveClass('grid-cols-1');
+    expect(gridContainer).toHaveClass('lg:grid-cols-3');
+    expect(gridContainer).toHaveClass('gap-6');
+  });
+});

src/components/Dashboard.tsx

@@ -0,0 +1,33 @@
+import React from 'react';
+import { RecipeSuggester } from '../components/RecipeSuggester';
+import { FlyerCountDisplay } from '../components/FlyerCountDisplay';
+import { Leaderboard } from '../components/Leaderboard';
+
+export const Dashboard: React.FC = () => {
+  return (
+    <div className="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8 py-8">
+      <h1 className="text-2xl font-bold text-gray-900 dark:text-white mb-6">Dashboard</h1>
+      
+      <div className="grid grid-cols-1 lg:grid-cols-3 gap-6">
+        {/* Main Content Area */}
+        <div className="lg:col-span-2 space-y-6">
+          {/* Recipe Suggester Section */}
+          <RecipeSuggester />
+
+          {/* Other Dashboard Widgets */}
+          <div className="bg-white dark:bg-gray-800 shadow rounded-lg p-6">
+            <h2 className="text-lg font-medium text-gray-900 dark:text-white mb-4">Your Flyers</h2>
+            <FlyerCountDisplay />
+          </div>
+        </div>
+
+        {/* Sidebar Area */}
+        <div className="space-y-6">
+          <Leaderboard />
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default Dashboard;

src/components/ErrorDisplay.test.tsx

@@ -1,24 +1,25 @@
 // src/components/ErrorDisplay.test.tsx
 import React from 'react';
-import { render, screen } from '@testing-library/react';
+import { screen } from '@testing-library/react';
 import { describe, it, expect } from 'vitest';
 import { ErrorDisplay } from './ErrorDisplay';
+import { renderWithProviders } from '../tests/utils/renderWithProviders';
 
 describe('ErrorDisplay (in components)', () => {
   it('should not render when the message is empty', () => {
-    const { container } = render(<ErrorDisplay message="" />);
+    const { container } = renderWithProviders(<ErrorDisplay message="" />);
     expect(container.firstChild).toBeNull();
   });
 
   it('should not render when the message is null', () => {
     // The component expects a string, but we test for nullish values as a safeguard.
-    const { container } = render(<ErrorDisplay message={null as unknown as string} />);
+    const { container } = renderWithProviders(<ErrorDisplay message={null as unknown as string} />);
     expect(container.firstChild).toBeNull();
   });
 
   it('should render the error message when provided', () => {
     const errorMessage = 'Something went terribly wrong.';
-    render(<ErrorDisplay message={errorMessage} />);
+    renderWithProviders(<ErrorDisplay message={errorMessage} />);
 
     const alert = screen.getByRole('alert');
     expect(alert).toBeInTheDocument();

src/components/FlyerCorrectionTool.test.tsx

@@ -1,24 +1,18 @@
 // src/components/FlyerCorrectionTool.test.tsx
 import React from 'react';
-import { render, screen, fireEvent, waitFor, act } from '@testing-library/react';
+import { screen, fireEvent, waitFor, act } from '@testing-library/react';
 import { describe, it, expect, vi, beforeEach, type Mocked } from 'vitest';
 import { FlyerCorrectionTool } from './FlyerCorrectionTool';
 import * as aiApiClient from '../services/aiApiClient';
 import { notifyError, notifySuccess } from '../services/notificationService';
+import { renderWithProviders } from '../tests/utils/renderWithProviders';
 
 // Unmock the component to test the real implementation
 vi.unmock('./FlyerCorrectionTool');
 
-// Mock dependencies
-vi.mock('../services/aiApiClient');
-vi.mock('../services/notificationService');
-vi.mock('../services/logger', () => ({
-  logger: {
-    error: vi.fn(),
-  },
-}));
-
-const mockedAiApiClient = aiApiClient as Mocked<typeof aiApiClient>;
+// The aiApiClient, notificationService, and logger are mocked globally.
+// We can get a typed reference to the aiApiClient for individual test overrides.
+const mockedAiApiClient = vi.mocked(aiApiClient);
 const mockedNotifySuccess = notifySuccess as Mocked<typeof notifySuccess>;
 const mockedNotifyError = notifyError as Mocked<typeof notifyError>;
 
@@ -54,12 +48,12 @@ describe('FlyerCorrectionTool', () => {
   });
 
   it('should not render when isOpen is false', () => {
-    const { container } = render(<FlyerCorrectionTool {...defaultProps} isOpen={false} />);
+    const { container } = renderWithProviders(<FlyerCorrectionTool {...defaultProps} isOpen={false} />);
     expect(container.firstChild).toBeNull();
   });
 
   it('should render correctly when isOpen is true', () => {
-    render(<FlyerCorrectionTool {...defaultProps} />);
+    renderWithProviders(<FlyerCorrectionTool {...defaultProps} />);
     expect(screen.getByRole('heading', { name: /flyer correction tool/i })).toBeInTheDocument();
     expect(screen.getByAltText('Flyer for correction')).toBeInTheDocument();
     expect(screen.getByRole('button', { name: /extract store name/i })).toBeInTheDocument();
@@ -67,7 +61,7 @@ describe('FlyerCorrectionTool', () => {
   });
 
   it('should call onClose when the close button is clicked', () => {
-    render(<FlyerCorrectionTool {...defaultProps} />);
+    renderWithProviders(<FlyerCorrectionTool {...defaultProps} />);
     // Use the specific aria-label defined in the component to find the close button
     const closeButton = screen.getByLabelText(/close correction tool/i);
     fireEvent.click(closeButton);
@@ -75,13 +69,13 @@ describe('FlyerCorrectionTool', () => {
   });
 
   it('should have disabled extraction buttons initially', () => {
-    render(<FlyerCorrectionTool {...defaultProps} />);
+    renderWithProviders(<FlyerCorrectionTool {...defaultProps} />);
     expect(screen.getByRole('button', { name: /extract store name/i })).toBeDisabled();
     expect(screen.getByRole('button', { name: /extract sale dates/i })).toBeDisabled();
   });
 
   it('should enable extraction buttons after a selection is made', () => {
-    render(<FlyerCorrectionTool {...defaultProps} />);
+    renderWithProviders(<FlyerCorrectionTool {...defaultProps} />);
     const canvas = screen.getByRole('dialog').querySelector('canvas')!;
 
     // Simulate drawing a rectangle
@@ -94,7 +88,7 @@ describe('FlyerCorrectionTool', () => {
   });
 
   it('should stop drawing when the mouse leaves the canvas', () => {
-    render(<FlyerCorrectionTool {...defaultProps} />);
+    renderWithProviders(<FlyerCorrectionTool {...defaultProps} />);
     const canvas = screen.getByRole('dialog').querySelector('canvas')!;
 
     fireEvent.mouseDown(canvas, { clientX: 10, clientY: 10 });
@@ -114,7 +108,7 @@ describe('FlyerCorrectionTool', () => {
     });
     mockedAiApiClient.rescanImageArea.mockReturnValue(rescanPromise);
 
-    render(<FlyerCorrectionTool {...defaultProps} />);
+    renderWithProviders(<FlyerCorrectionTool {...defaultProps} />);
 
     // Wait for the image fetch to complete to ensure 'imageFile' state is populated
     console.log('--- [TEST LOG] ---: Awaiting image fetch inside component...');
@@ -192,7 +186,7 @@ describe('FlyerCorrectionTool', () => {
     // Mock fetch to reject
     global.fetch = vi.fn(() => Promise.reject(new Error('Network error'))) as Mocked<typeof fetch>;
 
-    render(<FlyerCorrectionTool {...defaultProps} />);
+    renderWithProviders(<FlyerCorrectionTool {...defaultProps} />);
 
     await waitFor(() => {
       expect(mockedNotifyError).toHaveBeenCalledWith('Could not load the image for correction.');
@@ -211,7 +205,7 @@ describe('FlyerCorrectionTool', () => {
       return new Promise(() => {});
     }) as Mocked<typeof fetch>;
 
-    render(<FlyerCorrectionTool {...defaultProps} />);
+    renderWithProviders(<FlyerCorrectionTool {...defaultProps} />);
 
     const canvas = screen.getByRole('dialog').querySelector('canvas')!;
 
@@ -238,7 +232,7 @@ describe('FlyerCorrectionTool', () => {
   it('should handle non-standard API errors during rescan', async () => {
     console.log('TEST: Starting "should handle non-standard API errors during rescan"');
     mockedAiApiClient.rescanImageArea.mockRejectedValue('A plain string error');
-    render(<FlyerCorrectionTool {...defaultProps} />);
+    renderWithProviders(<FlyerCorrectionTool {...defaultProps} />);
 
     // Wait for image fetch to ensure imageFile is set before we interact
     await waitFor(() => expect(global.fetch).toHaveBeenCalled());

src/components/FlyerCountDisplay.test.tsx

@@ -1,11 +1,12 @@
 // src/components/FlyerCountDisplay.test.tsx
 import React from 'react';
-import { render, screen } from '@testing-library/react';
+import { screen } from '@testing-library/react';
 import { describe, it, expect, vi, beforeEach } from 'vitest';
 import { FlyerCountDisplay } from './FlyerCountDisplay';
 import { useFlyers } from '../hooks/useFlyers';
 import type { Flyer } from '../types';
 import { createMockFlyer } from '../tests/utils/mockFactories';
+import { renderWithProviders } from '../tests/utils/renderWithProviders';
 
 // Mock the dependencies
 vi.mock('../hooks/useFlyers');
@@ -32,7 +33,7 @@ describe('FlyerCountDisplay', () => {
     });
 
     // Act: Render the component.
-    render(<FlyerCountDisplay />);
+    renderWithProviders(<FlyerCountDisplay />);
 
     // Assert: Check that the loading spinner is visible.
     expect(screen.getByTestId('loading-spinner')).toBeInTheDocument();
@@ -53,7 +54,7 @@ describe('FlyerCountDisplay', () => {
     });
 
     // Act
-    render(<FlyerCountDisplay />);
+    renderWithProviders(<FlyerCountDisplay />);
 
     // Assert: Check that the error message is displayed.
     expect(screen.getByRole('alert')).toHaveTextContent(errorMessage);
@@ -73,7 +74,7 @@ describe('FlyerCountDisplay', () => {
     });
 
     // Act
-    render(<FlyerCountDisplay />);
+    renderWithProviders(<FlyerCountDisplay />);
 
     // Assert: Check that the correct count is displayed.
     const countDisplay = screen.getByTestId('flyer-count');

src/components/Footer.test.tsx

@@ -1,8 +1,9 @@
 // src/components/Footer.test.tsx
 import React from 'react';
-import { render, screen } from '@testing-library/react';
+import { screen } from '@testing-library/react';
 import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
 import { Footer } from './Footer';
+import { renderWithProviders } from '../tests/utils/renderWithProviders';
 
 describe('Footer', () => {
   beforeEach(() => {
@@ -21,7 +22,7 @@ describe('Footer', () => {
     vi.setSystemTime(mockDate);
 
     // Act: Render the component
-    render(<Footer />);
+    renderWithProviders(<Footer />);
 
     // Assert: Check that the rendered text includes the mocked year
     expect(screen.getByText('Copyright 2025-2025')).toBeInTheDocument();
@@ -29,7 +30,7 @@ describe('Footer', () => {
 
   it('should display the correct year when it changes', () => {
     vi.setSystemTime(new Date('2030-01-01T00:00:00Z'));
-    render(<Footer />);
+    renderWithProviders(<Footer />);
     expect(screen.getByText('Copyright 2025-2030')).toBeInTheDocument();
   });
 });

src/components/Header.test.tsx

@@ -1,11 +1,11 @@
 // src/components/Header.test.tsx
 import React from 'react';
-import { render, screen, fireEvent } from '@testing-library/react';
+import { screen, fireEvent } from '@testing-library/react';
 import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { MemoryRouter } from 'react-router-dom';
 import { Header } from './Header';
 import type { UserProfile } from '../types';
 import { createMockUserProfile } from '../tests/utils/mockFactories';
+import { renderWithProviders } from '../tests/utils/renderWithProviders';
 
 // Unmock the component to test the real implementation
 vi.unmock('./Header');
@@ -34,12 +34,8 @@ const defaultProps = {
 };
 
 // Helper to render with router context
-const renderWithRouter = (props: Partial<React.ComponentProps<typeof Header>>) => {
-  return render(
-    <MemoryRouter>
-      <Header {...defaultProps} {...props} />
-    </MemoryRouter>,
-  );
+const renderHeader = (props: Partial<React.ComponentProps<typeof Header>>) => {
+  return renderWithProviders(<Header {...defaultProps} {...props} />);
 };
 
 describe('Header', () => {
@@ -48,30 +44,30 @@ describe('Header', () => {
   });
 
   it('should render the application title', () => {
-    renderWithRouter({});
+    renderHeader({});
     expect(screen.getByRole('heading', { name: /flyer crawler/i })).toBeInTheDocument();
   });
 
   it('should display unit system and theme mode', () => {
-    renderWithRouter({ isDarkMode: true, unitSystem: 'metric' });
+    renderHeader({ isDarkMode: true, unitSystem: 'metric' });
     expect(screen.getByText(/metric/i)).toBeInTheDocument();
     expect(screen.getByText(/dark mode/i)).toBeInTheDocument();
   });
 
   describe('When user is logged out', () => {
     it('should show a Login button', () => {
-      renderWithRouter({ userProfile: null, authStatus: 'SIGNED_OUT' });
+      renderHeader({ userProfile: null, authStatus: 'SIGNED_OUT' });
       expect(screen.getByRole('button', { name: /login/i })).toBeInTheDocument();
     });
 
     it('should call onOpenProfile when Login button is clicked', () => {
-      renderWithRouter({ userProfile: null, authStatus: 'SIGNED_OUT' });
+      renderHeader({ userProfile: null, authStatus: 'SIGNED_OUT' });
       fireEvent.click(screen.getByRole('button', { name: /login/i }));
       expect(mockOnOpenProfile).toHaveBeenCalledTimes(1);
     });
 
     it('should not show user-specific buttons', () => {
-      renderWithRouter({ userProfile: null, authStatus: 'SIGNED_OUT' });
+      renderHeader({ userProfile: null, authStatus: 'SIGNED_OUT' });
       expect(screen.queryByLabelText(/open voice assistant/i)).not.toBeInTheDocument();
       expect(screen.queryByLabelText(/open my account settings/i)).not.toBeInTheDocument();
       expect(screen.queryByRole('button', { name: /logout/i })).not.toBeInTheDocument();
@@ -80,29 +76,29 @@ describe('Header', () => {
 
   describe('When user is authenticated', () => {
     it('should display the user email', () => {
-      renderWithRouter({ userProfile: mockUserProfile, authStatus: 'AUTHENTICATED' });
+      renderHeader({ userProfile: mockUserProfile, authStatus: 'AUTHENTICATED' });
       expect(screen.getByText(mockUserProfile.user.email)).toBeInTheDocument();
     });
 
     it('should display "Guest" for anonymous users', () => {
-      renderWithRouter({ userProfile: mockUserProfile, authStatus: 'SIGNED_OUT' });
+      renderHeader({ userProfile: mockUserProfile, authStatus: 'SIGNED_OUT' });
       expect(screen.getByText(/guest/i)).toBeInTheDocument();
     });
 
     it('should call onOpenVoiceAssistant when microphone icon is clicked', () => {
-      renderWithRouter({ userProfile: mockUserProfile, authStatus: 'AUTHENTICATED' });
+      renderHeader({ userProfile: mockUserProfile, authStatus: 'AUTHENTICATED' });
       fireEvent.click(screen.getByLabelText(/open voice assistant/i));
       expect(mockOnOpenVoiceAssistant).toHaveBeenCalledTimes(1);
     });
 
     it('should call onOpenProfile when cog icon is clicked', () => {
-      renderWithRouter({ userProfile: mockUserProfile, authStatus: 'AUTHENTICATED' });
+      renderHeader({ userProfile: mockUserProfile, authStatus: 'AUTHENTICATED' });
       fireEvent.click(screen.getByLabelText(/open my account settings/i));
       expect(mockOnOpenProfile).toHaveBeenCalledTimes(1);
     });
 
     it('should call onSignOut when Logout button is clicked', () => {
-      renderWithRouter({ userProfile: mockUserProfile, authStatus: 'AUTHENTICATED' });
+      renderHeader({ userProfile: mockUserProfile, authStatus: 'AUTHENTICATED' });
       fireEvent.click(screen.getByRole('button', { name: /logout/i }));
       expect(mockOnSignOut).toHaveBeenCalledTimes(1);
     });
@@ -110,14 +106,14 @@ describe('Header', () => {
 
   describe('Admin user', () => {
     it('should show the Admin Area link for admin users', () => {
-      renderWithRouter({ userProfile: mockAdminProfile, authStatus: 'AUTHENTICATED' });
+      renderHeader({ userProfile: mockAdminProfile, authStatus: 'AUTHENTICATED' });
       const adminLink = screen.getByTitle(/admin area/i);
       expect(adminLink).toBeInTheDocument();
       expect(adminLink.closest('a')).toHaveAttribute('href', '/admin');
     });
 
     it('should not show the Admin Area link for non-admin users', () => {
-      renderWithRouter({ userProfile: mockUserProfile, authStatus: 'AUTHENTICATED' });
+      renderHeader({ userProfile: mockUserProfile, authStatus: 'AUTHENTICATED' });
       expect(screen.queryByTitle(/admin area/i)).not.toBeInTheDocument();
     });
   });

src/components/Leaderboard.test.tsx

@@ -1,21 +1,17 @@
 // src/components/Leaderboard.test.tsx
 import React from 'react';
-import { render, screen, waitFor } from '@testing-library/react';
+import { screen, waitFor } from '@testing-library/react';
 import { describe, it, expect, vi, beforeEach, type Mocked } from 'vitest';
 import Leaderboard from './Leaderboard';
 import * as apiClient from '../services/apiClient';
 import { LeaderboardUser } from '../types';
 import { createMockLeaderboardUser } from '../tests/utils/mockFactories';
 import { createMockLogger } from '../tests/utils/mockLogger';
+import { renderWithProviders } from '../tests/utils/renderWithProviders';
 
-// Mock the apiClient
-vi.mock('../services/apiClient'); // This was correct
-const mockedApiClient = apiClient as Mocked<typeof apiClient>;
-
-// Mock the logger
-vi.mock('../services/logger', () => ({
-  logger: createMockLogger(),
-}));
+// The apiClient and logger are mocked globally.
+// We can get a typed reference to the apiClient for individual test overrides.
+const mockedApiClient = vi.mocked(apiClient);
 
 // Mock lucide-react icons to prevent rendering errors in the test environment
 vi.mock('lucide-react', () => ({
@@ -45,13 +41,13 @@ describe('Leaderboard', () => {
   it('should display a loading message initially', () => {
     // Mock a pending promise that never resolves to keep it in the loading state
     mockedApiClient.fetchLeaderboard.mockReturnValue(new Promise(() => {}));
-    render(<Leaderboard />);
+    renderWithProviders(<Leaderboard />);
     expect(screen.getByText('Loading Leaderboard...')).toBeInTheDocument();
   });
 
   it('should display an error message if the API call fails', async () => {
     mockedApiClient.fetchLeaderboard.mockResolvedValue(new Response(null, { status: 500 }));
-    render(<Leaderboard />);
+    renderWithProviders(<Leaderboard />);
 
     await waitFor(() => {
       expect(screen.getByRole('alert')).toBeInTheDocument();
@@ -62,7 +58,7 @@ describe('Leaderboard', () => {
   it('should display a generic error for unknown error types', async () => {
     const unknownError = 'A string error';
     mockedApiClient.fetchLeaderboard.mockRejectedValue(unknownError);
-    render(<Leaderboard />);
+    renderWithProviders(<Leaderboard />);
 
     await waitFor(() => {
       expect(screen.getByRole('alert')).toBeInTheDocument();
@@ -72,7 +68,7 @@ describe('Leaderboard', () => {
 
   it('should display a message when the leaderboard is empty', async () => {
     mockedApiClient.fetchLeaderboard.mockResolvedValue(new Response(JSON.stringify([])));
-    render(<Leaderboard />);
+    renderWithProviders(<Leaderboard />);
 
     await waitFor(() => {
       expect(
@@ -85,7 +81,7 @@ describe('Leaderboard', () => {
     mockedApiClient.fetchLeaderboard.mockResolvedValue(
       new Response(JSON.stringify(mockLeaderboardData)),
     );
-    render(<Leaderboard />);
+    renderWithProviders(<Leaderboard />);
 
     await waitFor(() => {
       expect(screen.getByRole('heading', { name: 'Top Users' })).toBeInTheDocument();
@@ -110,7 +106,7 @@ describe('Leaderboard', () => {
     mockedApiClient.fetchLeaderboard.mockResolvedValue(
       new Response(JSON.stringify(mockLeaderboardData)),
     );
-    render(<Leaderboard />);
+    renderWithProviders(<Leaderboard />);
 
     await waitFor(() => {
       // Rank 1, 2, and 3 should have a crown icon
@@ -129,7 +125,7 @@ describe('Leaderboard', () => {
     mockedApiClient.fetchLeaderboard.mockResolvedValue(
       new Response(JSON.stringify(dataWithMissingNames)),
     );
-    render(<Leaderboard />);
+    renderWithProviders(<Leaderboard />);
 
     await waitFor(() => {
       // Check for fallback name

src/components/LoadingSpinner.test.tsx

@@ -1,19 +1,19 @@
 // src/components/LoadingSpinner.test.tsx
 import React from 'react';
-import { render } from '@testing-library/react';
 import { describe, it, expect } from 'vitest';
 import { LoadingSpinner } from './LoadingSpinner';
+import { renderWithProviders } from '../tests/utils/renderWithProviders';
 
 describe('LoadingSpinner (in components)', () => {
   it('should render the SVG with animation classes', () => {
-    const { container } = render(<LoadingSpinner />);
+    const { container } = renderWithProviders(<LoadingSpinner />);
     const svgElement = container.querySelector('svg');
     expect(svgElement).toBeInTheDocument();
     expect(svgElement).toHaveClass('animate-spin');
   });
 
   it('should contain the correct SVG paths for the spinner graphic', () => {
-    const { container } = render(<LoadingSpinner />);
+    const { container } = renderWithProviders(<LoadingSpinner />);
     const circle = container.querySelector('circle');
     const path = container.querySelector('path');
     expect(circle).toBeInTheDocument();

src/components/MapView.test.tsx

@@ -1,9 +1,10 @@
 // src/components/MapView.test.tsx
 import React from 'react';
-import { render, screen } from '@testing-library/react';
+import { screen } from '@testing-library/react';
 import { describe, it, expect, vi, beforeEach } from 'vitest';
 import { MapView } from './MapView';
 import config from '../config';
+import { renderWithProviders } from '../tests/utils/renderWithProviders';
 
 // Create a type-safe mocked version of the config for easier manipulation
 const mockedConfig = vi.mocked(config);
@@ -40,14 +41,14 @@ describe('MapView', () => {
 
   describe('when API key is not configured', () => {
     it('should render a disabled message', () => {
-      render(<MapView {...defaultProps} />);
+      renderWithProviders(<MapView {...defaultProps} />);
       expect(
         screen.getByText('Map view is disabled: API key is not configured.'),
       ).toBeInTheDocument();
     });
 
     it('should not render the iframe', () => {
-      render(<MapView {...defaultProps} />);
+      renderWithProviders(<MapView {...defaultProps} />);
       // Use queryByTitle because iframes don't have a default "iframe" role
       expect(screen.queryByTitle('Map view')).not.toBeInTheDocument();
     });
@@ -62,7 +63,7 @@ describe('MapView', () => {
     });
 
     it('should render the iframe with the correct src URL', () => {
-      render(<MapView {...defaultProps} />);
+      renderWithProviders(<MapView {...defaultProps} />);
 
       // Use getByTitle to access the iframe
       const iframe = screen.getByTitle('Map view');

src/components/PasswordInput.test.tsx

@@ -1,8 +1,9 @@
 // src/components/PasswordInput.test.tsx
 import React from 'react';
-import { render, screen, fireEvent } from '@testing-library/react';
+import { screen, fireEvent } from '@testing-library/react';
 import { describe, it, expect, vi } from 'vitest';
 import { PasswordInput } from './PasswordInput';
+import { renderWithProviders } from '../tests/utils/renderWithProviders';
 // Mock the child PasswordStrengthIndicator component to isolate the test (relative to new location)
 vi.mock('./PasswordStrengthIndicator', () => ({
   PasswordStrengthIndicator: ({ password }: { password?: string }) => (
@@ -12,13 +13,13 @@ vi.mock('./PasswordStrengthIndicator', () => ({
 
 describe('PasswordInput (in auth feature)', () => {
   it('should render as a password input by default', () => {
-    render(<PasswordInput placeholder="Enter password" />);
+    renderWithProviders(<PasswordInput placeholder="Enter password" />);
     const input = screen.getByPlaceholderText('Enter password');
     expect(input).toHaveAttribute('type', 'password');
   });
 
   it('should toggle input type between password and text when the eye icon is clicked', () => {
-    render(<PasswordInput placeholder="Enter password" />);
+    renderWithProviders(<PasswordInput placeholder="Enter password" />);
     const input = screen.getByPlaceholderText('Enter password');
     const toggleButton = screen.getByRole('button', { name: /show password/i });
 
@@ -38,7 +39,7 @@ describe('PasswordInput (in auth feature)', () => {
 
   it('should pass through standard input attributes', () => {
     const handleChange = vi.fn();
-    render(
+    renderWithProviders(
       <PasswordInput
         value="test"
         onChange={handleChange}
@@ -56,38 +57,38 @@ describe('PasswordInput (in auth feature)', () => {
   });
 
   it('should not show strength indicator by default', () => {
-    render(<PasswordInput value="some-password" onChange={() => {}} />);
+    renderWithProviders(<PasswordInput value="some-password" onChange={() => {}} />);
     expect(screen.queryByTestId('strength-indicator')).not.toBeInTheDocument();
   });
 
   it('should show strength indicator when showStrength is true and there is a value', () => {
-    render(<PasswordInput value="some-password" showStrength onChange={() => {}} />);
+    renderWithProviders(<PasswordInput value="some-password" showStrength onChange={() => {}} />);
     const indicator = screen.getByTestId('strength-indicator');
     expect(indicator).toBeInTheDocument();
     expect(indicator).toHaveTextContent('Strength for: some-password');
   });
 
   it('should not show strength indicator when showStrength is true but value is empty', () => {
-    render(<PasswordInput value="" showStrength onChange={() => {}} />);
+    renderWithProviders(<PasswordInput value="" showStrength onChange={() => {}} />);
     expect(screen.queryByTestId('strength-indicator')).not.toBeInTheDocument();
   });
 
   it('should handle undefined className gracefully', () => {
-    render(<PasswordInput placeholder="No class" />);
+    renderWithProviders(<PasswordInput placeholder="No class" />);
     const input = screen.getByPlaceholderText('No class');
     expect(input.className).not.toContain('undefined');
     expect(input.className).toContain('block w-full');
   });
 
   it('should not show strength indicator if value is undefined', () => {
-    render(<PasswordInput showStrength onChange={() => {}} />);
+    renderWithProviders(<PasswordInput showStrength onChange={() => {}} />);
     expect(screen.queryByTestId('strength-indicator')).not.toBeInTheDocument();
   });
 
   it('should not show strength indicator if value is not a string', () => {
     // Force a non-string value to test the typeof check
     const props = { value: 12345, showStrength: true, onChange: () => {} } as any;
-    render(<PasswordInput {...props} />);
+    renderWithProviders(<PasswordInput {...props} />);
     expect(screen.queryByTestId('strength-indicator')).not.toBeInTheDocument();
   });
 });

src/components/PasswordStrengthIndicator.test.tsx

@@ -1,8 +1,9 @@
 // src/pages/admin/components/PasswordStrengthIndicator.test.tsx
 import React from 'react';
-import { render, screen } from '@testing-library/react';
+import { screen } from '@testing-library/react';
 import { describe, it, expect, vi, type Mock } from 'vitest';
 import { PasswordStrengthIndicator } from './PasswordStrengthIndicator';
+import { renderWithProviders } from '../tests/utils/renderWithProviders';
 import zxcvbn from 'zxcvbn';
 
 // Mock the zxcvbn library to control its output for testing
@@ -11,7 +12,7 @@ vi.mock('zxcvbn');
 describe('PasswordStrengthIndicator', () => {
   it('should render 5 gray bars when no password is provided', () => {
     (zxcvbn as Mock).mockReturnValue({ score: -1, feedback: { warning: '', suggestions: [] } });
-    const { container } = render(<PasswordStrengthIndicator password="" />);
+    const { container } = renderWithProviders(<PasswordStrengthIndicator password="" />);
     const bars = container.querySelectorAll('.h-1\\.5');
     expect(bars).toHaveLength(5);
     bars.forEach((bar) => {
@@ -28,7 +29,7 @@ describe('PasswordStrengthIndicator', () => {
     { score: 4, label: 'Strong', color: 'bg-green-500', bars: 5 },
   ])('should render correctly for score $score ($label)', ({ score, label, color, bars }) => {
     (zxcvbn as Mock).mockReturnValue({ score, feedback: { warning: '', suggestions: [] } });
-    const { container } = render(<PasswordStrengthIndicator password="some-password" />);
+    const { container } = renderWithProviders(<PasswordStrengthIndicator password="some-password" />);
 
     // Check the label
     expect(screen.getByText(label)).toBeInTheDocument();
@@ -54,7 +55,7 @@ describe('PasswordStrengthIndicator', () => {
         suggestions: [],
       },
     });
-    render(<PasswordStrengthIndicator password="password" />);
+    renderWithProviders(<PasswordStrengthIndicator password="password" />);
     expect(screen.getByText(/this is a very common password/i)).toBeInTheDocument();
   });
 
@@ -66,7 +67,7 @@ describe('PasswordStrengthIndicator', () => {
         suggestions: ['Add another word or two'],
       },
     });
-    render(<PasswordStrengthIndicator password="pass" />);
+    renderWithProviders(<PasswordStrengthIndicator password="pass" />);
     expect(screen.getByText(/add another word or two/i)).toBeInTheDocument();
   });
 
@@ -75,14 +76,14 @@ describe('PasswordStrengthIndicator', () => {
       score: 1,
       feedback: { warning: 'A warning here', suggestions: ['A suggestion here'] },
     });
-    render(<PasswordStrengthIndicator password="password" />);
+    renderWithProviders(<PasswordStrengthIndicator password="password" />);
     expect(screen.getByText(/a warning here/i)).toBeInTheDocument();
     expect(screen.queryByText(/a suggestion here/i)).not.toBeInTheDocument();
   });
 
   it('should use default empty string if password prop is undefined', () => {
     (zxcvbn as Mock).mockReturnValue({ score: 0, feedback: { warning: '', suggestions: [] } });
-    const { container } = render(<PasswordStrengthIndicator />);
+    const { container } = renderWithProviders(<PasswordStrengthIndicator />);
     const bars = container.querySelectorAll('.h-1\\.5');
     expect(bars).toHaveLength(5);
     bars.forEach((bar) => {
@@ -94,7 +95,7 @@ describe('PasswordStrengthIndicator', () => {
   it('should handle out-of-range scores gracefully (defensive)', () => {
     // Mock a score that isn't 0-4 to hit default switch cases
     (zxcvbn as Mock).mockReturnValue({ score: 99, feedback: { warning: '', suggestions: [] } });
-    const { container } = render(<PasswordStrengthIndicator password="test" />);
+    const { container } = renderWithProviders(<PasswordStrengthIndicator password="test" />);
 
     // Check bars - should hit default case in getBarColor which returns gray
     const bars = container.querySelectorAll('.h-1\\.5');

src/components/RecipeSuggester.test.tsx

@@ -0,0 +1,156 @@
+// src/components/RecipeSuggester.test.tsx
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { screen, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { RecipeSuggester } from './RecipeSuggester'; // This should be after mocks
+import * as apiClient from '../services/apiClient';
+import { logger } from '../services/logger.client';
+import { renderWithProviders } from '../tests/utils/renderWithProviders';
+import '@testing-library/jest-dom';
+
+// The apiClient is mocked globally in `src/tests/setup/globalApiMock.ts`.
+// We can get a typed reference to it for individual test overrides.
+const mockedApiClient = vi.mocked(apiClient);
+
+describe('RecipeSuggester Component', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+    // Reset console logs if needed, or just keep them for debug visibility
+  });
+
+  it('renders correctly with initial state', () => {
+    console.log('TEST: Verifying initial render state');
+    renderWithProviders(<RecipeSuggester />);
+
+    expect(screen.getByText('Get a Recipe Suggestion')).toBeInTheDocument();
+    expect(screen.getByLabelText(/Ingredients:/i)).toBeInTheDocument();
+    expect(screen.getByRole('button', { name: /Suggest a Recipe/i })).toBeInTheDocument();
+    expect(screen.queryByText('Getting suggestion...')).not.toBeInTheDocument();
+  });
+
+  it('shows validation error if no ingredients are entered', async () => {
+    console.log('TEST: Verifying validation for empty input');
+    const user = userEvent.setup();
+    renderWithProviders(<RecipeSuggester />);
+
+    const button = screen.getByRole('button', { name: /Suggest a Recipe/i });
+    await user.click(button);
+
+    expect(await screen.findByText('Please enter at least one ingredient.')).toBeInTheDocument();
+    expect(mockedApiClient.suggestRecipe).not.toHaveBeenCalled();
+    console.log('TEST: Validation error displayed correctly');
+  });
+
+  it('calls suggestRecipe and displays suggestion on success', async () => {
+    console.log('TEST: Verifying successful recipe suggestion flow');
+    const user = userEvent.setup();
+    renderWithProviders(<RecipeSuggester />);
+
+    const input = screen.getByLabelText(/Ingredients:/i);
+    await user.type(input, 'chicken, rice');
+
+    // Mock successful API response
+    const mockSuggestion = 'Here is a nice Chicken and Rice recipe...';
+    // Add a delay to ensure the loading state is visible during the test
+    mockedApiClient.suggestRecipe.mockImplementation(async () => {
+      await new Promise((resolve) => setTimeout(resolve, 50));
+      return { ok: true, json: async () => ({ suggestion: mockSuggestion }) } as Response;
+    });
+
+    const button = screen.getByRole('button', { name: /Suggest a Recipe/i });
+    await user.click(button);
+
+    // Check loading state
+    expect(screen.getByRole('button')).toBeDisabled();
+    expect(screen.getByText('Getting suggestion...')).toBeInTheDocument();
+
+    await waitFor(() => {
+      expect(screen.getByText(mockSuggestion)).toBeInTheDocument();
+    });
+
+    expect(mockedApiClient.suggestRecipe).toHaveBeenCalledWith(['chicken', 'rice']);
+    console.log('TEST: Suggestion displayed and API called with correct args');
+  });
+
+  it('handles API errors (non-200 response) gracefully', async () => {
+    console.log('TEST: Verifying API error handling (400/500 responses)');
+    const user = userEvent.setup();
+    renderWithProviders(<RecipeSuggester />);
+
+    const input = screen.getByLabelText(/Ingredients:/i);
+    await user.type(input, 'rocks');
+
+    // Mock API failure response
+    const errorMessage = 'Invalid ingredients provided.';
+    mockedApiClient.suggestRecipe.mockResolvedValue({
+      ok: false,
+      json: async () => ({ message: errorMessage }),
+    } as Response);
+
+    const button = screen.getByRole('button', { name: /Suggest a Recipe/i });
+    await user.click(button);
+
+    await waitFor(() => {
+      expect(screen.getByText(errorMessage)).toBeInTheDocument();
+    });
+
+    // Ensure loading state is reset
+    expect(screen.getByRole('button', { name: /Suggest a Recipe/i })).toBeEnabled();
+    console.log('TEST: API error message displayed to user');
+  });
+
+  it('handles network exceptions and logs them', async () => {
+    console.log('TEST: Verifying network exception handling');
+    const user = userEvent.setup();
+    renderWithProviders(<RecipeSuggester />);
+
+    const input = screen.getByLabelText(/Ingredients:/i);
+    await user.type(input, 'beef');
+
+    // Mock network error
+    const networkError = new Error('Network Error');
+    mockedApiClient.suggestRecipe.mockRejectedValue(networkError);
+
+    const button = screen.getByRole('button', { name: /Suggest a Recipe/i });
+    await user.click(button);
+
+    await waitFor(() => {
+      expect(screen.getByText('Network Error')).toBeInTheDocument();
+    });
+
+    expect(logger.error).toHaveBeenCalledWith(
+      { error: networkError },
+      'Failed to fetch recipe suggestion.'
+    );
+    console.log('TEST: Network error caught and logged');
+  });
+
+  it('clears previous errors when submitting again', async () => {
+    console.log('TEST: Verifying error clearing on re-submit');
+    const user = userEvent.setup();
+    renderWithProviders(<RecipeSuggester />);
+
+    // Trigger validation error first
+    const button = screen.getByRole('button', { name: /Suggest a Recipe/i });
+    await user.click(button);
+    expect(screen.getByText('Please enter at least one ingredient.')).toBeInTheDocument();
+
+    // Now type something to clear it (state change doesn't clear it, submit does)
+    const input = screen.getByLabelText(/Ingredients:/i);
+    await user.type(input, 'tofu');
+
+    // Mock success for the second click
+    mockedApiClient.suggestRecipe.mockResolvedValue({
+      ok: true,
+      json: async () => ({ suggestion: 'Tofu Stir Fry' }),
+    } as Response);
+
+    await user.click(button);
+
+    await waitFor(() => {
+      expect(screen.queryByText('Please enter at least one ingredient.')).not.toBeInTheDocument();
+      expect(screen.getByText('Tofu Stir Fry')).toBeInTheDocument();
+    });
+    console.log('TEST: Previous error cleared successfully');
+  });
+});

src/components/RecipeSuggester.tsx

@@ -0,0 +1,80 @@
+// src/components/RecipeSuggester.tsx
+import React, { useState, useCallback } from 'react';
+import { suggestRecipe } from '../services/apiClient';
+import { logger } from '../services/logger.client';
+
+export const RecipeSuggester: React.FC = () => {
+  const [ingredients, setIngredients] = useState<string>('');
+  const [suggestion, setSuggestion] = useState<string | null>(null);
+  const [isLoading, setIsLoading] = useState<boolean>(false);
+  const [error, setError] = useState<string | null>(null);
+
+  const handleSubmit = useCallback(async (event: React.FormEvent<HTMLFormElement>) => {
+    event.preventDefault();
+    setIsLoading(true);
+    setError(null);
+    setSuggestion(null);
+
+    const ingredientList = ingredients.split(',').map(item => item.trim()).filter(Boolean);
+
+    if (ingredientList.length === 0) {
+      setError('Please enter at least one ingredient.');
+      setIsLoading(false);
+      return;
+    }
+
+    try {
+      const response = await suggestRecipe(ingredientList);
+      const data = await response.json();
+
+      if (!response.ok) {
+        throw new Error(data.message || 'Failed to get suggestion.');
+      }
+
+      setSuggestion(data.suggestion);
+    } catch (err) {
+      const errorMessage = err instanceof Error ? err.message : 'An unknown error occurred.';
+      logger.error({ error: err }, 'Failed to fetch recipe suggestion.');
+      setError(errorMessage);
+    } finally {
+      setIsLoading(false);
+    }
+  }, [ingredients]);
+
+  return (
+    <div className="bg-white dark:bg-gray-800 shadow rounded-lg p-6">
+      <h2 className="text-xl font-semibold text-gray-900 dark:text-white mb-2">Get a Recipe Suggestion</h2>
+      <p className="text-gray-600 dark:text-gray-400 mb-4">Enter some ingredients you have, separated by commas.</p>
+      <form onSubmit={handleSubmit}>
+        <div className="mb-4">
+          <label htmlFor="ingredients-input" className="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">Ingredients:</label>
+          <input
+            id="ingredients-input"
+            type="text"
+            value={ingredients}
+            onChange={(e) => setIngredients(e.target.value)}
+            placeholder="e.g., chicken, rice, broccoli"
+            disabled={isLoading}
+            className="block w-full rounded-md border-gray-300 shadow-sm focus:border-blue-500 focus:ring-blue-500 dark:bg-gray-700 dark:border-gray-600 dark:text-white sm:text-sm p-2 border"
+          />
+        </div>
+        <button type="submit" disabled={isLoading} className="w-full flex justify-center py-2 px-4 border border-transparent rounded-md shadow-sm text-sm font-medium text-white bg-blue-600 hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 disabled:opacity-50 transition-colors">
+          {isLoading ? 'Getting suggestion...' : 'Suggest a Recipe'}
+        </button>
+      </form>
+
+      {error && (
+        <div className="mt-4 p-4 bg-red-50 dark:bg-red-900/50 text-red-700 dark:text-red-200 rounded-md text-sm">{error}</div>
+      )}
+
+      {suggestion && (
+        <div className="mt-6 bg-gray-50 dark:bg-gray-700/50 rounded-lg p-4 border border-gray-200 dark:border-gray-600">
+          <div className="prose dark:prose-invert max-w-none">
+            <h5 className="text-lg font-medium text-gray-900 dark:text-white mb-2">Recipe Suggestion</h5>
+            <p className="text-gray-700 dark:text-gray-300 whitespace-pre-wrap">{suggestion}</p>
+          </div>
+        </div>
+      )}
+    </div>
+  );
+};

src/components/StatCard.test.tsx

@@ -0,0 +1,34 @@
+// src/components/StatCard.test.tsx
+import React from 'react';
+import { screen } from '@testing-library/react';
+import { describe, it, expect } from 'vitest';
+import { StatCard } from './StatCard';
+import { renderWithProviders } from '../tests/utils/renderWithProviders';
+import '@testing-library/jest-dom';
+
+describe('StatCard', () => {
+  it('renders title and value correctly', () => {
+    renderWithProviders(
+      <StatCard
+        title="Total Users"
+        value="1,234"
+        icon={<div data-testid="mock-icon">Icon</div>}
+      />,
+    );
+
+    expect(screen.getByText('Total Users')).toBeInTheDocument();
+    expect(screen.getByText('1,234')).toBeInTheDocument();
+  });
+
+  it('renders the icon', () => {
+    renderWithProviders(
+      <StatCard
+        title="Total Users"
+        value="1,234"
+        icon={<div data-testid="mock-icon">Icon</div>}
+      />,
+    );
+
+    expect(screen.getByTestId('mock-icon')).toBeInTheDocument();
+  });
+});

src/components/StatCard.tsx

@@ -0,0 +1,32 @@
+// src/components/StatCard.tsx
+import React, { ReactNode } from 'react';
+
+interface StatCardProps {
+  title: string;
+  value: string;
+  icon: ReactNode;
+}
+
+export const StatCard: React.FC<StatCardProps> = ({ title, value, icon }) => {
+  return (
+    <div className="bg-white dark:bg-gray-800 overflow-hidden shadow rounded-lg">
+      <div className="p-5">
+        <div className="flex items-center">
+          <div className="flex-shrink-0">
+            <div className="flex items-center justify-center h-12 w-12 rounded-md bg-blue-500 text-white">
+              {icon}
+            </div>
+          </div>
+          <div className="ml-5 w-0 flex-1">
+            <dl>
+              <dt className="text-sm font-medium text-gray-500 dark:text-gray-400 truncate">{title}</dt>
+              <dd>
+                <div className="text-lg font-medium text-gray-900 dark:text-white">{value}</div>
+              </dd>
+            </dl>
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+};

src/components/UnitSystemToggle.test.tsx

@@ -1,8 +1,9 @@
 // src/components/UnitSystemToggle.test.tsx
 import React from 'react';
-import { render, screen, fireEvent } from '@testing-library/react';
+import { screen, fireEvent } from '@testing-library/react';
 import { describe, it, expect, vi, beforeEach } from 'vitest';
 import { UnitSystemToggle } from './UnitSystemToggle';
+import { renderWithProviders } from '../tests/utils/renderWithProviders';
 
 describe('UnitSystemToggle', () => {
   const mockOnToggle = vi.fn();
@@ -12,7 +13,7 @@ describe('UnitSystemToggle', () => {
   });
 
   it('should render correctly for imperial system', () => {
-    render(<UnitSystemToggle currentSystem="imperial" onToggle={mockOnToggle} />);
+    renderWithProviders(<UnitSystemToggle currentSystem="imperial" onToggle={mockOnToggle} />);
 
     const checkbox = screen.getByRole('checkbox');
     expect(checkbox).toBeChecked();
@@ -23,7 +24,7 @@ describe('UnitSystemToggle', () => {
   });
 
   it('should render correctly for metric system', () => {
-    render(<UnitSystemToggle currentSystem="metric" onToggle={mockOnToggle} />);
+    renderWithProviders(<UnitSystemToggle currentSystem="metric" onToggle={mockOnToggle} />);
 
     const checkbox = screen.getByRole('checkbox');
     expect(checkbox).not.toBeChecked();
@@ -34,7 +35,7 @@ describe('UnitSystemToggle', () => {
   });
 
   it('should call onToggle when the toggle is clicked', () => {
-    render(<UnitSystemToggle currentSystem="metric" onToggle={mockOnToggle} />);
+    renderWithProviders(<UnitSystemToggle currentSystem="metric" onToggle={mockOnToggle} />);
     fireEvent.click(screen.getByRole('checkbox'));
     expect(mockOnToggle).toHaveBeenCalledTimes(1);
   });

src/components/UserMenuSkeleton.test.tsx

@@ -1,34 +1,34 @@
 // src/components/UserMenuSkeleton.test.tsx
 import React from 'react';
-import { render } from '@testing-library/react';
 import { describe, it, expect } from 'vitest';
 import { UserMenuSkeleton } from './UserMenuSkeleton';
+import { renderWithProviders } from '../tests/utils/renderWithProviders';
 
 describe('UserMenuSkeleton', () => {
   it('should render without crashing', () => {
-    const { container } = render(<UserMenuSkeleton />);
+    const { container } = renderWithProviders(<UserMenuSkeleton />);
     expect(container.firstChild).toBeInTheDocument();
   });
 
   it('should have the main container with pulse animation', () => {
-    const { container } = render(<UserMenuSkeleton />);
+    const { container } = renderWithProviders(<UserMenuSkeleton />);
     expect(container.firstChild).toHaveClass('animate-pulse');
   });
 
   it('should render two child placeholder elements', () => {
-    const { container } = render(<UserMenuSkeleton />);
+    const { container } = renderWithProviders(<UserMenuSkeleton />);
     expect(container.firstChild?.childNodes.length).toBe(2);
   });
 
   it('should render a rectangular placeholder with correct styles', () => {
-    const { container } = render(<UserMenuSkeleton />);
+    const { container } = renderWithProviders(<UserMenuSkeleton />);
     expect(container.querySelector('.rounded-md')).toHaveClass(
       'h-8 w-24 bg-gray-200 dark:bg-gray-700',
     );
   });
 
   it('should render a circular placeholder with correct styles', () => {
-    const { container } = render(<UserMenuSkeleton />);
+    const { container } = renderWithProviders(<UserMenuSkeleton />);
     expect(container.querySelector('.rounded-full')).toHaveClass(
       'h-10 w-10 bg-gray-200 dark:bg-gray-700',
     );

src/components/WhatsNewModal.test.tsx

@@ -1,8 +1,9 @@
 // src/components/WhatsNewModal.test.tsx
 import React from 'react';
-import { render, screen, fireEvent } from '@testing-library/react';
+import { screen, fireEvent } from '@testing-library/react';
 import { describe, it, expect, vi, beforeEach } from 'vitest';
 import { WhatsNewModal } from './WhatsNewModal';
+import { renderWithProviders } from '../tests/utils/renderWithProviders';
 
 // Unmock the component to test the real implementation
 vi.unmock('./WhatsNewModal');
@@ -21,13 +22,13 @@ describe('WhatsNewModal', () => {
   });
 
   it('should not render when isOpen is false', () => {
-    const { container } = render(<WhatsNewModal {...defaultProps} isOpen={false} />);
+    const { container } = renderWithProviders(<WhatsNewModal {...defaultProps} isOpen={false} />);
     // The component returns null, so the container should be empty.
     expect(container.firstChild).toBeNull();
   });
 
   it('should render correctly when isOpen is true', () => {
-    render(<WhatsNewModal {...defaultProps} />);
+    renderWithProviders(<WhatsNewModal {...defaultProps} />);
 
     expect(screen.getByRole('heading', { name: /what's new/i })).toBeInTheDocument();
     expect(screen.getByText(`Version: ${defaultProps.version}`)).toBeInTheDocument();
@@ -36,13 +37,13 @@ describe('WhatsNewModal', () => {
   });
 
   it('should call onClose when the "Got it!" button is clicked', () => {
-    render(<WhatsNewModal {...defaultProps} />);
+    renderWithProviders(<WhatsNewModal {...defaultProps} />);
     fireEvent.click(screen.getByRole('button', { name: /got it/i }));
     expect(mockOnClose).toHaveBeenCalledTimes(1);
   });
 
   it('should call onClose when the close icon button is clicked', () => {
-    render(<WhatsNewModal {...defaultProps} />);
+    renderWithProviders(<WhatsNewModal {...defaultProps} />);
     // The close button is an SVG icon inside a button, best queried by its aria-label.
     const closeButton = screen.getByRole('button', { name: /close/i });
     fireEvent.click(closeButton);
@@ -50,7 +51,7 @@ describe('WhatsNewModal', () => {
   });
 
   it('should call onClose when clicking on the overlay', () => {
-    render(<WhatsNewModal {...defaultProps} />);
+    renderWithProviders(<WhatsNewModal {...defaultProps} />);
     // The overlay is the root div with the background color.
     const overlay = screen.getByRole('dialog').parentElement;
     fireEvent.click(overlay!);
@@ -58,7 +59,7 @@ describe('WhatsNewModal', () => {
   });
 
   it('should not call onClose when clicking inside the modal content', () => {
-    render(<WhatsNewModal {...defaultProps} />);
+    renderWithProviders(<WhatsNewModal {...defaultProps} />);
     fireEvent.click(screen.getByText(defaultProps.commitMessage));
     expect(mockOnClose).not.toHaveBeenCalled();
   });

src/db/seed.ts

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

src/hooks/useActiveDeals.test.tsx

@@ -12,12 +12,7 @@ import {
 } from '../tests/utils/mockFactories';
 import { mockUseFlyers, mockUseUserData } from '../tests/setup/mockHooks';
 
-// Explicitly mock apiClient to ensure stable spies are used
-vi.mock('../services/apiClient', () => ({
-  countFlyerItemsForFlyers: vi.fn(),
-  fetchFlyerItemsForFlyers: vi.fn(),
-}));
-
+// The apiClient is mocked globally in `src/tests/setup/globalApiMock.ts`.
 // Mock the hooks to avoid Missing Context errors
 vi.mock('./useFlyers', () => ({
   useFlyers: () => mockUseFlyers(),
@@ -30,14 +25,6 @@ vi.mock('../hooks/useUserData', () => ({
 // The apiClient is globally mocked in our test setup, so we just need to cast it
 const mockedApiClient = vi.mocked(apiClient);
 
-// Mock the logger to prevent console noise
-vi.mock('../services/logger.client', () => ({
-  logger: {
-    error: vi.fn(),
-    info: vi.fn(), // Added to prevent crashes on abort logging
-  },
-}));
-
 // Set a consistent "today" for testing flyer validity to make tests deterministic
 const TODAY = new Date('2024-01-15T12:00:00.000Z');
 

src/hooks/useAuth.test.tsx

@@ -11,21 +11,9 @@ import { createMockUserProfile } from '../tests/utils/mockFactories';
 import { logger } from '../services/logger.client';
 
 // Mock the dependencies
-vi.mock('../services/apiClient', () => ({
-  // Mock other functions if needed
-  getAuthenticatedUserProfile: vi.fn(),
-}));
+// The apiClient is mocked globally in `src/tests/setup/globalApiMock.ts`.
 vi.mock('../services/tokenStorage');
 
-// Mock the logger to spy on its methods
-vi.mock('../services/logger.client', () => ({
-  logger: {
-    info: vi.fn(),
-    warn: vi.fn(),
-    error: vi.fn(),
-  },
-}));
-
 const mockedApiClient = vi.mocked(apiClient);
 const mockedTokenStorage = vi.mocked(tokenStorage);
 

src/hooks/useFlyerItems.test.ts

@@ -3,12 +3,11 @@ import { renderHook } from '@testing-library/react';
 import { describe, it, expect, vi, beforeEach } from 'vitest';
 import { useFlyerItems } from './useFlyerItems';
 import { useApiOnMount } from './useApiOnMount';
-import { createMockFlyer, createMockFlyerItem } from '../tests/utils/mockFactories';
 import * as apiClient from '../services/apiClient';
+import { createMockFlyer, createMockFlyerItem } from '../tests/utils/mockFactories';
 
 // Mock the underlying useApiOnMount hook to isolate the useFlyerItems hook's logic.
 vi.mock('./useApiOnMount');
-vi.mock('../services/apiClient');
 
 const mockedUseApiOnMount = vi.mocked(useApiOnMount);
 
@@ -61,7 +60,6 @@ describe('useFlyerItems Hook', () => {
     expect(result.current.flyerItems).toEqual([]);
     expect(result.current.isLoading).toBe(false);
     expect(result.current.error).toBeNull();
-
     // Assert: Check that useApiOnMount was called with `enabled: false`.
     expect(mockedUseApiOnMount).toHaveBeenCalledWith(
       expect.any(Function), // the wrapped fetcher function
@@ -171,11 +169,11 @@ describe('useFlyerItems Hook', () => {
 
       const wrappedFetcher = mockedUseApiOnMount.mock.calls[0][0];
       const mockResponse = new Response();
-      vi.mocked(apiClient.fetchFlyerItems).mockResolvedValue(mockResponse);
-
+      const mockedApiClient = vi.mocked(apiClient);
+      mockedApiClient.fetchFlyerItems.mockResolvedValue(mockResponse);
       const response = await wrappedFetcher(123);
 
-      expect(apiClient.fetchFlyerItems).toHaveBeenCalledWith(123);
+      expect(mockedApiClient.fetchFlyerItems).toHaveBeenCalledWith(123);
       expect(response).toBe(mockResponse);
     });
   });

src/hooks/useShoppingLists.test.tsx

@@ -29,7 +29,6 @@ type MockApiResult = {
 vi.mock('./useApi');
 vi.mock('../hooks/useAuth');
 vi.mock('../hooks/useUserData');
-vi.mock('../services/apiClient');
 
 // The apiClient is globally mocked in our test setup, so we just need to cast it
 const mockedUseApi = vi.mocked(useApi);

src/hooks/useWatchedItems.test.tsx

@@ -17,7 +17,6 @@ import {
 vi.mock('./useApi');
 vi.mock('../hooks/useAuth');
 vi.mock('../hooks/useUserData');
-vi.mock('../services/apiClient');
 
 // The apiClient is globally mocked in our test setup, so we just need to cast it
 const mockedUseApi = vi.mocked(useApi);

src/middleware/errorHandler.test.ts

@@ -1,5 +1,5 @@
 // src/middleware/errorHandler.test.ts
-import { describe, it, expect, vi, beforeEach, afterAll } from 'vitest';
+import { describe, it, expect, vi, beforeEach, afterAll, afterEach } from 'vitest';
 import supertest from 'supertest';
 import express, { Request, Response, NextFunction } from 'express';
 import { errorHandler } from './errorHandler'; // This was a duplicate, fixed.
@@ -98,12 +98,15 @@ describe('errorHandler Middleware', () => {
     vi.clearAllMocks();
     consoleErrorSpy.mockClear(); // Clear spy for console.error
     // Ensure NODE_ENV is set to 'test' for console.error logging
-    process.env.NODE_ENV = 'test';
+    vi.stubEnv('NODE_ENV', 'test');
+  });
+
+  afterEach(() => {
+    vi.unstubAllEnvs(); // Clean up environment variable stubs after each test
   });
 
   afterAll(() => {
     consoleErrorSpy.mockRestore(); // Restore console.error after all tests
-    delete process.env.NODE_ENV; // Clean up environment variable
   });
 
   it('should return a generic 500 error for a standard Error object', async () => {
@@ -293,11 +296,7 @@ describe('errorHandler Middleware', () => {
 
   describe('when NODE_ENV is "production"', () => {
     beforeEach(() => {
-      process.env.NODE_ENV = 'production';
-    });
-
-    afterAll(() => {
-      process.env.NODE_ENV = 'test'; // Reset for other test files
+      vi.stubEnv('NODE_ENV', 'production');
     });
 
     it('should return a generic message with an error ID for a 500 error', async () => {

src/middleware/multer.middleware.test.ts

@@ -109,20 +109,19 @@ describe('Multer Middleware Directory Creation', () => {
 describe('createUploadMiddleware', () => {
   const mockFile = { originalname: 'test.png' } as Express.Multer.File;
   const mockUser = createMockUserProfile({ user: { user_id: 'user-123', email: 'test@user.com' } });
-  let originalNodeEnv: string | undefined;
 
   beforeEach(() => {
     vi.clearAllMocks();
-    originalNodeEnv = process.env.NODE_ENV;
+    vi.unstubAllEnvs();
   });
 
   afterEach(() => {
-    process.env.NODE_ENV = originalNodeEnv;
+    vi.unstubAllEnvs();
   });
 
   describe('Avatar Storage', () => {
     it('should generate a unique filename for an authenticated user', () => {
-      process.env.NODE_ENV = 'production';
+      vi.stubEnv('NODE_ENV', 'production');
       createUploadMiddleware({ storageType: 'avatar' });
       const storageOptions = vi.mocked(multer.diskStorage).mock.calls[0][0];
       const cb = vi.fn();
@@ -150,7 +149,7 @@ describe('createUploadMiddleware', () => {
     });
 
     it('should use a predictable filename in test environment', () => {
-      process.env.NODE_ENV = 'test';
+      vi.stubEnv('NODE_ENV', 'test');
       createUploadMiddleware({ storageType: 'avatar' });
       const storageOptions = vi.mocked(multer.diskStorage).mock.calls[0][0];
       const cb = vi.fn();
@@ -164,7 +163,7 @@ describe('createUploadMiddleware', () => {
 
   describe('Flyer Storage', () => {
     it('should generate a unique, sanitized filename in production environment', () => {
-      process.env.NODE_ENV = 'production';
+      vi.stubEnv('NODE_ENV', 'production');
       const mockFlyerFile = {
         fieldname: 'flyerFile',
         originalname: 'My Flyer (Special!).pdf',
@@ -184,7 +183,7 @@ describe('createUploadMiddleware', () => {
 
     it('should generate a predictable filename in test environment', () => {
       // This test covers lines 43-46
-      process.env.NODE_ENV = 'test';
+      vi.stubEnv('NODE_ENV', 'test');
       const mockFlyerFile = {
         fieldname: 'flyerFile',
         originalname: 'test-flyer.jpg',

src/pages/MyDealsPage.test.tsx

@@ -1,25 +1,15 @@
-// src/components/MyDealsPage.test.tsx
+// src/pages/MyDealsPage.test.tsx
 import React from 'react';
 import { render, screen, waitFor } from '@testing-library/react';
 import { describe, it, expect, vi, beforeEach, type Mocked } from 'vitest';
 import MyDealsPage from './MyDealsPage';
 import * as apiClient from '../services/apiClient';
-import { WatchedItemDeal } from '../types';
+import type { WatchedItemDeal } from '../types';
 import { logger } from '../services/logger.client';
 import { createMockWatchedItemDeal } from '../tests/utils/mockFactories';
 
-// Mock the apiClient. The component now directly uses `fetchBestSalePrices`.
-// By mocking the entire module, we can control the behavior of `fetchBestSalePrices`
-// for our tests.
-vi.mock('../services/apiClient');
-const mockedApiClient = apiClient as Mocked<typeof apiClient>;
-
-// Mock the logger
-vi.mock('../services/logger.client', () => ({
-  logger: {
-    error: vi.fn(),
-  },
-}));
+// The apiClient is mocked globally in `src/tests/setup/globalApiMock.ts`.
+const mockedApiClient = vi.mocked(apiClient);
 
 // Mock lucide-react icons to prevent rendering errors in the test environment
 vi.mock('lucide-react', () => ({

src/pages/ResetPasswordPage.test.tsx

@@ -10,13 +10,7 @@ import { logger } from '../services/logger.client';
 // The apiClient and logger are now mocked globally.
 const mockedApiClient = vi.mocked(apiClient);
 
-vi.mock('../services/logger.client', () => ({
-  logger: {
-    info: vi.fn(),
-    error: vi.fn(),
-  },
-}));
-
+// The logger is mocked globally.
 // Helper function to render the component within a router context
 const renderWithRouter = (token: string) => {
   return render(

src/pages/UserProfilePage.test.tsx

@@ -11,16 +11,8 @@ import {
   createMockUser,
 } from '../tests/utils/mockFactories';
 
-// Mock dependencies
-vi.mock('../services/apiClient'); // This was correct
-vi.mock('../services/logger.client', () => ({
-  logger: {
-    info: vi.fn(),
-    error: vi.fn(),
-  },
-}));
-vi.mock('../services/notificationService');
-vi.mock('../services/aiApiClient'); // Mock aiApiClient as it's used in the component
+// The apiClient, logger, notificationService, and aiApiClient are all mocked globally.
+// We can get a typed reference to the notificationService for individual test overrides.
 const mockedNotificationService = vi.mocked(await import('../services/notificationService'));
 vi.mock('../components/AchievementsList', () => ({
   AchievementsList: ({ achievements }: { achievements: (UserAchievement & Achievement)[] }) => (
@@ -28,7 +20,7 @@ vi.mock('../components/AchievementsList', () => ({
   ),
 }));
 
-const mockedApiClient = apiClient as Mocked<typeof apiClient>;
+const mockedApiClient = vi.mocked(apiClient);
 
 // --- Mock Data ---
 const mockProfile: UserProfile = createMockUserProfile({

src/pages/VoiceLabPage.test.tsx

@@ -10,21 +10,10 @@ import { logger } from '../services/logger.client';
 // Extensive logging for debugging
 const LOG_PREFIX = '[TEST DEBUG]';
 
-vi.mock('../services/notificationService');
-
-// 1. Mock the module to replace its exports with mock functions.
-vi.mock('../services/aiApiClient');
-// 2. Get a typed reference to the mocked module to control its functions in tests.
+// The aiApiClient, notificationService, and logger are mocked globally.
+// We can get a typed reference to the aiApiClient for individual test overrides.
 const mockedAiApiClient = vi.mocked(aiApiClient);
 
-// Mock the logger
-vi.mock('../services/logger.client', () => ({
-  logger: {
-    info: vi.fn(),
-    error: vi.fn(),
-  },
-}));
-
 // Define mock at module level so it can be referenced in the implementation
 const mockAudioPlay = vi.fn(() => {
   console.log(`${LOG_PREFIX} mockAudioPlay executed`);

src/pages/admin/AdminStatsPage.test.tsx

@@ -7,13 +7,13 @@ import { AdminStatsPage } from './AdminStatsPage';
 import * as apiClient from '../../services/apiClient';
 import type { AppStats } from '../../services/apiClient';
 import { createMockAppStats } from '../../tests/utils/mockFactories';
-import { StatCard } from './components/StatCard';
+import { StatCard } from '../../components/StatCard';
 
 // The apiClient and logger are now mocked globally via src/tests/setup/tests-setup-unit.ts.
 const mockedApiClient = vi.mocked(apiClient);
 
 // Mock the child StatCard component to use the shared mock and allow spying
-vi.mock('./components/StatCard', async () => {
+vi.mock('../../components/StatCard', async () => {
   const { MockStatCard } = await import('../../tests/utils/componentMocks');
   return { StatCard: vi.fn(MockStatCard) };
 });

src/pages/admin/AdminStatsPage.tsx

@@ -10,7 +10,7 @@ import { DocumentDuplicateIcon } from '../../components/icons/DocumentDuplicateI
 import { BuildingStorefrontIcon } from '../../components/icons/BuildingStorefrontIcon';
 import { BellAlertIcon } from '../../components/icons/BellAlertIcon';
 import { BookOpenIcon } from '../../components/icons/BookOpenIcon';
-import { StatCard } from './components/StatCard';
+import { StatCard } from '../../components/StatCard';
 
 export const AdminStatsPage: React.FC = () => {
   const [stats, setStats] = useState<AppStats | null>(null);

src/pages/admin/FlyerReviewPage.test.tsx

@@ -6,16 +6,9 @@ import { MemoryRouter } from 'react-router-dom';
 import * as apiClient from '../../services/apiClient';
 import { logger } from '../../services/logger.client';
 
-// Mock dependencies
-vi.mock('../../services/apiClient', () => ({
-  getFlyersForReview: vi.fn(),
-}));
-
-vi.mock('../../services/logger.client', () => ({
-  logger: {
-    error: vi.fn(),
-  },
-}));
+// The apiClient and logger are mocked globally.
+// We can get a typed reference to the apiClient for individual test overrides.
+const mockedApiClient = vi.mocked(apiClient);
 
 // Mock LoadingSpinner to simplify DOM and avoid potential issues
 vi.mock('../../components/LoadingSpinner', () => ({
@@ -29,7 +22,7 @@ describe('FlyerReviewPage', () => {
 
   it('renders loading spinner initially', () => {
     // Mock a promise that doesn't resolve immediately to check loading state
-    vi.mocked(apiClient.getFlyersForReview).mockReturnValue(new Promise(() => {}));
+    mockedApiClient.getFlyersForReview.mockReturnValue(new Promise(() => {}));
 
     render(
       <MemoryRouter>
@@ -41,7 +34,7 @@ describe('FlyerReviewPage', () => {
   });
 
   it('renders empty state when no flyers are returned', async () => {
-    vi.mocked(apiClient.getFlyersForReview).mockResolvedValue({
+    mockedApiClient.getFlyersForReview.mockResolvedValue({
       ok: true,
       json: async () => [],
     } as Response);
@@ -84,7 +77,7 @@ describe('FlyerReviewPage', () => {
       },
     ];
 
-    vi.mocked(apiClient.getFlyersForReview).mockResolvedValue({
+    mockedApiClient.getFlyersForReview.mockResolvedValue({
       ok: true,
       json: async () => mockFlyers,
     } as Response);
@@ -114,7 +107,7 @@ describe('FlyerReviewPage', () => {
   });
 
   it('renders error message when API response is not ok', async () => {
-    vi.mocked(apiClient.getFlyersForReview).mockResolvedValue({
+    mockedApiClient.getFlyersForReview.mockResolvedValue({
       ok: false,
       json: async () => ({ message: 'Server error' }),
     } as Response);
@@ -138,7 +131,7 @@ describe('FlyerReviewPage', () => {
 
   it('renders error message when API throws an error', async () => {
     const networkError = new Error('Network error');
-    vi.mocked(apiClient.getFlyersForReview).mockRejectedValue(networkError);
+    mockedApiClient.getFlyersForReview.mockRejectedValue(networkError);
 
     render(
       <MemoryRouter>
@@ -159,7 +152,7 @@ describe('FlyerReviewPage', () => {
 
   it('renders a generic error for non-Error rejections', async () => {
     const nonErrorRejection = { message: 'This is not an Error object' };
-    vi.mocked(apiClient.getFlyersForReview).mockRejectedValue(nonErrorRejection);
+    mockedApiClient.getFlyersForReview.mockRejectedValue(nonErrorRejection);
 
     render(
       <MemoryRouter>

src/pages/admin/components/AddressForm.test.tsx

@@ -1,9 +1,10 @@
 // src/pages/admin/components/AddressForm.test.tsx
 import React from 'react';
-import { render, screen, fireEvent } from '@testing-library/react';
+import { screen, fireEvent } from '@testing-library/react';
 import { describe, it, expect, vi, beforeEach } from 'vitest';
 import { AddressForm } from './AddressForm';
 import { createMockAddress } from '../../../tests/utils/mockFactories';
+import { renderWithProviders } from '../../../tests/utils/renderWithProviders';
 
 // Mock child components and icons to isolate the form's logic
 vi.mock('lucide-react', () => ({
@@ -30,7 +31,7 @@ describe('AddressForm', () => {
   });
 
   it('should render all address fields correctly', () => {
-    render(<AddressForm {...defaultProps} />);
+    renderWithProviders(<AddressForm {...defaultProps} />);
 
     expect(screen.getByRole('heading', { name: /home address/i })).toBeInTheDocument();
     expect(screen.getByLabelText(/address line 1/i)).toBeInTheDocument();
@@ -48,7 +49,7 @@ describe('AddressForm', () => {
       city: 'Anytown',
       country: 'Canada',
     });
-    render(<AddressForm {...defaultProps} address={fullAddress} />);
+    renderWithProviders(<AddressForm {...defaultProps} address={fullAddress} />);
 
     expect(screen.getByLabelText(/address line 1/i)).toHaveValue('123 Main St');
     expect(screen.getByLabelText(/city/i)).toHaveValue('Anytown');
@@ -56,7 +57,7 @@ describe('AddressForm', () => {
   });
 
   it('should call onAddressChange with the correct field and value for all inputs', () => {
-    render(<AddressForm {...defaultProps} />);
+    renderWithProviders(<AddressForm {...defaultProps} />);
 
     const inputs = [
       { label: /address line 1/i, name: 'address_line_1', value: '123 St' },
@@ -75,7 +76,7 @@ describe('AddressForm', () => {
   });
 
   it('should call onGeocode when the "Re-Geocode" button is clicked', () => {
-    render(<AddressForm {...defaultProps} />);
+    renderWithProviders(<AddressForm {...defaultProps} />);
 
     const geocodeButton = screen.getByRole('button', { name: /re-geocode/i });
     fireEvent.click(geocodeButton);
@@ -84,14 +85,14 @@ describe('AddressForm', () => {
   });
 
   it('should show MapPinIcon when not geocoding', () => {
-    render(<AddressForm {...defaultProps} isGeocoding={false} />);
+    renderWithProviders(<AddressForm {...defaultProps} isGeocoding={false} />);
     expect(screen.getByTestId('map-pin-icon')).toBeInTheDocument();
     expect(screen.queryByTestId('loading-spinner')).not.toBeInTheDocument();
   });
 
   describe('when isGeocoding is true', () => {
     it('should disable the button and show a loading spinner', () => {
-      render(<AddressForm {...defaultProps} isGeocoding={true} />);
+      renderWithProviders(<AddressForm {...defaultProps} isGeocoding={true} />);
 
       const geocodeButton = screen.getByRole('button', { name: /re-geocode/i });
       expect(geocodeButton).toBeDisabled();

src/pages/admin/components/AdminBrandManager.test.tsx

@@ -1,11 +1,12 @@
 // src/pages/admin/components/AdminBrandManager.test.tsx
 import React from 'react';
-import { render, screen, fireEvent, waitFor } from '@testing-library/react';
+import { screen, fireEvent, waitFor } from '@testing-library/react';
 import { describe, it, expect, vi, beforeEach } from 'vitest';
 import toast from 'react-hot-toast';
 import { AdminBrandManager } from './AdminBrandManager';
 import * as apiClient from '../../../services/apiClient';
 import { createMockBrand } from '../../../tests/utils/mockFactories';
+import { renderWithProviders } from '../../../tests/utils/renderWithProviders';
 
 // After mocking, we can get a type-safe mocked version of the module.
 // This allows us to use .mockResolvedValue, .mockRejectedValue, etc. on the functions.
@@ -34,7 +35,7 @@ describe('AdminBrandManager', () => {
     mockedApiClient.fetchAllBrands.mockReturnValue(new Promise(() => {}));
 
     console.log('TEST ACTION: Rendering AdminBrandManager component.');
-    render(<AdminBrandManager />);
+    renderWithProviders(<AdminBrandManager />);
 
     console.log('TEST ASSERTION: Checking for the loading text.');
     expect(screen.getByText('Loading brands...')).toBeInTheDocument();
@@ -49,7 +50,7 @@ describe('AdminBrandManager', () => {
     mockedApiClient.fetchAllBrands.mockRejectedValue(new Error('Network Error'));
 
     console.log('TEST ACTION: Rendering AdminBrandManager component.');
-    render(<AdminBrandManager />);
+    renderWithProviders(<AdminBrandManager />);
 
     console.log('TEST ASSERTION: Waiting for error message to be displayed.');
     await waitFor(() => {
@@ -69,7 +70,7 @@ describe('AdminBrandManager', () => {
     );
 
     console.log('TEST ACTION: Rendering AdminBrandManager component.');
-    render(<AdminBrandManager />);
+    renderWithProviders(<AdminBrandManager />);
 
     console.log('TEST ASSERTION: Waiting for brand list to render.');
     await waitFor(() => {
@@ -98,7 +99,7 @@ describe('AdminBrandManager', () => {
     mockedToast.loading.mockReturnValue('toast-1');
 
     console.log('TEST ACTION: Rendering AdminBrandManager component.');
-    render(<AdminBrandManager />);
+    renderWithProviders(<AdminBrandManager />);
     console.log('TEST ACTION: Waiting for initial brands to render.');
     await waitFor(() => expect(screen.getByText('No Frills')).toBeInTheDocument());
 
@@ -135,7 +136,7 @@ describe('AdminBrandManager', () => {
     mockedApiClient.uploadBrandLogo.mockRejectedValue('A string error');
     mockedToast.loading.mockReturnValue('toast-non-error');
 
-    render(<AdminBrandManager />);
+    renderWithProviders(<AdminBrandManager />);
     await waitFor(() => expect(screen.getByText('No Frills')).toBeInTheDocument());
 
     const file = new File(['logo'], 'logo.png', { type: 'image/png' });
@@ -162,7 +163,7 @@ describe('AdminBrandManager', () => {
     mockedToast.loading.mockReturnValue('toast-2');
 
     console.log('TEST ACTION: Rendering AdminBrandManager component.');
-    render(<AdminBrandManager />);
+    renderWithProviders(<AdminBrandManager />);
     console.log('TEST ACTION: Waiting for initial brands to render.');
     await waitFor(() => expect(screen.getByText('No Frills')).toBeInTheDocument());
 
@@ -189,7 +190,7 @@ describe('AdminBrandManager', () => {
       async () => new Response(JSON.stringify(mockBrands), { status: 200 }),
     );
     console.log('TEST ACTION: Rendering AdminBrandManager component.');
-    render(<AdminBrandManager />);
+    renderWithProviders(<AdminBrandManager />);
     console.log('TEST ACTION: Waiting for initial brands to render.');
     await waitFor(() => expect(screen.getByText('No Frills')).toBeInTheDocument());
 
@@ -217,7 +218,7 @@ describe('AdminBrandManager', () => {
       async () => new Response(JSON.stringify(mockBrands), { status: 200 }),
     );
     console.log('TEST ACTION: Rendering AdminBrandManager component.');
-    render(<AdminBrandManager />);
+    renderWithProviders(<AdminBrandManager />);
     console.log('TEST ACTION: Waiting for initial brands to render.');
     await waitFor(() => expect(screen.getByText('No Frills')).toBeInTheDocument());
 
@@ -247,7 +248,7 @@ describe('AdminBrandManager', () => {
     );
     mockedToast.loading.mockReturnValue('toast-3');
 
-    render(<AdminBrandManager />);
+    renderWithProviders(<AdminBrandManager />);
     await waitFor(() => expect(screen.getByText('No Frills')).toBeInTheDocument());
 
     const file = new File(['logo'], 'logo.png', { type: 'image/png' });
@@ -270,7 +271,7 @@ describe('AdminBrandManager', () => {
     mockedApiClient.fetchAllBrands.mockImplementation(
       async () => new Response(JSON.stringify(mockBrands), { status: 200 }),
     );
-    render(<AdminBrandManager />);
+    renderWithProviders(<AdminBrandManager />);
     console.log('TEST ACTION: Waiting for initial brands to render.');
     await waitFor(() => expect(screen.getByText('No Frills')).toBeInTheDocument());
 
@@ -291,7 +292,7 @@ describe('AdminBrandManager', () => {
     mockedApiClient.fetchAllBrands.mockImplementation(
       async () => new Response(JSON.stringify([]), { status: 200 }),
     );
-    render(<AdminBrandManager />);
+    renderWithProviders(<AdminBrandManager />);
 
     await waitFor(() => {
       expect(screen.getByRole('heading', { name: /brand management/i })).toBeInTheDocument();
@@ -309,7 +310,7 @@ describe('AdminBrandManager', () => {
     );
     mockedToast.loading.mockReturnValue('toast-fallback');
 
-    render(<AdminBrandManager />);
+    renderWithProviders(<AdminBrandManager />);
     await waitFor(() => expect(screen.getByText('No Frills')).toBeInTheDocument());
 
     const file = new File(['logo'], 'logo.png', { type: 'image/png' });
@@ -333,7 +334,7 @@ describe('AdminBrandManager', () => {
     );
     mockedToast.loading.mockReturnValue('toast-opt');
 
-    render(<AdminBrandManager />);
+    renderWithProviders(<AdminBrandManager />);
     await waitFor(() => expect(screen.getByText('No Frills')).toBeInTheDocument());
 
     // Brand 1: No Frills (initially null logo)

src/pages/admin/components/AuthView.test.tsx

@@ -1,11 +1,12 @@
 // src/pages/admin/components/AuthView.test.tsx
 import React from 'react';
-import { render, screen, fireEvent, waitFor, act } from '@testing-library/react';
+import { screen, fireEvent, waitFor } from '@testing-library/react';
 import { describe, it, expect, vi, beforeEach, type Mock } from 'vitest';
 import { AuthView } from './AuthView';
 import * as apiClient from '../../../services/apiClient';
 import { notifySuccess, notifyError } from '../../../services/notificationService';
 import { createMockUserProfile } from '../../../tests/utils/mockFactories';
+import { renderWithProviders } from '../../../tests/utils/renderWithProviders';
 
 const mockedApiClient = vi.mocked(apiClient, true);
 
@@ -46,7 +47,7 @@ describe('AuthView', () => {
 
   describe('Initial Render and Login', () => {
     it('should render the Sign In form by default', () => {
-      render(<AuthView {...defaultProps} />);
+      renderWithProviders(<AuthView {...defaultProps} />);
       expect(screen.getByRole('heading', { name: /sign in/i })).toBeInTheDocument();
       expect(screen.getByLabelText(/email address/i)).toBeInTheDocument();
       expect(screen.getByLabelText(/^password$/i)).toBeInTheDocument();
@@ -54,7 +55,7 @@ describe('AuthView', () => {
     });
 
     it('should allow typing in email and password fields', () => {
-      render(<AuthView {...defaultProps} />);
+      renderWithProviders(<AuthView {...defaultProps} />);
       const emailInput = screen.getByLabelText(/email address/i);
       const passwordInput = screen.getByLabelText(/^password$/i);
 
@@ -66,7 +67,7 @@ describe('AuthView', () => {
     });
 
     it('should call loginUser and onLoginSuccess on successful login', async () => {
-      render(<AuthView {...defaultProps} />);
+      renderWithProviders(<AuthView {...defaultProps} />);
       fireEvent.change(screen.getByLabelText(/email address/i), {
         target: { value: 'test@example.com' },
       });
@@ -94,7 +95,7 @@ describe('AuthView', () => {
 
     it('should display an error on failed login', async () => {
       (mockedApiClient.loginUser as Mock).mockRejectedValueOnce(new Error('Invalid credentials'));
-      render(<AuthView {...defaultProps} />);
+      renderWithProviders(<AuthView {...defaultProps} />);
       fireEvent.submit(screen.getByTestId('auth-form'));
 
       await waitFor(() => {
@@ -107,7 +108,7 @@ describe('AuthView', () => {
       (mockedApiClient.loginUser as Mock).mockResolvedValueOnce(
         new Response(JSON.stringify({ message: 'Unauthorized' }), { status: 401 }),
       );
-      render(<AuthView {...defaultProps} />);
+      renderWithProviders(<AuthView {...defaultProps} />);
       fireEvent.submit(screen.getByTestId('auth-form'));
 
       await waitFor(() => {
@@ -120,7 +121,7 @@ describe('AuthView', () => {
 
   describe('Registration', () => {
     it('should switch to the registration form', () => {
-      render(<AuthView {...defaultProps} />);
+      renderWithProviders(<AuthView {...defaultProps} />);
       fireEvent.click(screen.getByRole('button', { name: /don't have an account\? register/i }));
 
       expect(screen.getByRole('heading', { name: /create an account/i })).toBeInTheDocument();
@@ -129,7 +130,7 @@ describe('AuthView', () => {
     });
 
     it('should call registerUser on successful registration', async () => {
-      render(<AuthView {...defaultProps} />);
+      renderWithProviders(<AuthView {...defaultProps} />);
       fireEvent.click(screen.getByRole('button', { name: /don't have an account\? register/i }));
 
       fireEvent.change(screen.getByLabelText(/full name/i), { target: { value: 'Test User' } });
@@ -157,7 +158,7 @@ describe('AuthView', () => {
     });
 
     it('should allow registration without providing a full name', async () => {
-      render(<AuthView {...defaultProps} />);
+      renderWithProviders(<AuthView {...defaultProps} />);
       fireEvent.click(screen.getByRole('button', { name: /don't have an account\? register/i }));
 
       // Do not fill in the full name, which is marked as optional
@@ -184,7 +185,7 @@ describe('AuthView', () => {
       (mockedApiClient.registerUser as Mock).mockRejectedValueOnce(
         new Error('Email already exists'),
       );
-      render(<AuthView {...defaultProps} />);
+      renderWithProviders(<AuthView {...defaultProps} />);
       fireEvent.click(screen.getByRole('button', { name: /don't have an account\? register/i }));
       fireEvent.submit(screen.getByTestId('auth-form'));
 
@@ -197,7 +198,7 @@ describe('AuthView', () => {
       (mockedApiClient.registerUser as Mock).mockResolvedValueOnce(
         new Response(JSON.stringify({ message: 'User exists' }), { status: 409 }),
       );
-      render(<AuthView {...defaultProps} />);
+      renderWithProviders(<AuthView {...defaultProps} />);
       fireEvent.click(screen.getByRole('button', { name: /don't have an account\? register/i }));
       fireEvent.submit(screen.getByTestId('auth-form'));
 
@@ -209,7 +210,7 @@ describe('AuthView', () => {
 
   describe('Forgot Password', () => {
     it('should switch to the reset password form', () => {
-      render(<AuthView {...defaultProps} />);
+      renderWithProviders(<AuthView {...defaultProps} />);
       fireEvent.click(screen.getByRole('button', { name: /forgot password\?/i }));
 
       expect(screen.getByRole('heading', { name: /reset password/i })).toBeInTheDocument();
@@ -217,7 +218,7 @@ describe('AuthView', () => {
     });
 
     it('should call requestPasswordReset and show success message', async () => {
-      render(<AuthView {...defaultProps} />);
+      renderWithProviders(<AuthView {...defaultProps} />);
       fireEvent.click(screen.getByRole('button', { name: /forgot password\?/i }));
 
       fireEvent.change(screen.getByLabelText(/email address/i), {
@@ -238,7 +239,7 @@ describe('AuthView', () => {
       (mockedApiClient.requestPasswordReset as Mock).mockRejectedValueOnce(
         new Error('User not found'),
       );
-      render(<AuthView {...defaultProps} />);
+      renderWithProviders(<AuthView {...defaultProps} />);
       fireEvent.click(screen.getByRole('button', { name: /forgot password\?/i }));
       fireEvent.submit(screen.getByTestId('reset-password-form'));
 
@@ -251,7 +252,7 @@ describe('AuthView', () => {
       (mockedApiClient.requestPasswordReset as Mock).mockResolvedValueOnce(
         new Response(JSON.stringify({ message: 'Rate limit exceeded' }), { status: 429 }),
       );
-      render(<AuthView {...defaultProps} />);
+      renderWithProviders(<AuthView {...defaultProps} />);
       fireEvent.click(screen.getByRole('button', { name: /forgot password\?/i }));
       fireEvent.submit(screen.getByTestId('reset-password-form'));
 
@@ -261,7 +262,7 @@ describe('AuthView', () => {
     });
 
     it('should switch back to sign in from forgot password', () => {
-      render(<AuthView {...defaultProps} />);
+      renderWithProviders(<AuthView {...defaultProps} />);
       fireEvent.click(screen.getByRole('button', { name: /forgot password\?/i }));
       fireEvent.click(screen.getByRole('button', { name: /back to sign in/i }));
 
@@ -287,13 +288,13 @@ describe('AuthView', () => {
     });
 
     it('should set window.location.href for Google OAuth', () => {
-      render(<AuthView {...defaultProps} />);
+      renderWithProviders(<AuthView {...defaultProps} />);
       fireEvent.click(screen.getByRole('button', { name: /sign in with google/i }));
       expect(window.location.href).toBe('/api/auth/google');
     });
 
     it('should set window.location.href for GitHub OAuth', () => {
-      render(<AuthView {...defaultProps} />);
+      renderWithProviders(<AuthView {...defaultProps} />);
       fireEvent.click(screen.getByRole('button', { name: /sign in with github/i }));
       expect(window.location.href).toBe('/api/auth/github');
     });
@@ -301,7 +302,7 @@ describe('AuthView', () => {
 
   describe('UI Logic and Loading States', () => {
     it('should toggle "Remember me" checkbox', () => {
-      render(<AuthView {...defaultProps} />);
+      renderWithProviders(<AuthView {...defaultProps} />);
       const rememberMeCheckbox = screen.getByRole('checkbox', { name: /remember me/i });
 
       expect(rememberMeCheckbox).not.toBeChecked();
@@ -316,7 +317,7 @@ describe('AuthView', () => {
     it('should show loading state during login submission', async () => {
       // Mock a promise that doesn't resolve immediately
       (mockedApiClient.loginUser as Mock).mockReturnValue(new Promise(() => {}));
-      render(<AuthView {...defaultProps} />);
+      renderWithProviders(<AuthView {...defaultProps} />);
 
       fireEvent.change(screen.getByLabelText(/email address/i), {
         target: { value: 'test@example.com' },
@@ -341,7 +342,7 @@ describe('AuthView', () => {
 
     it('should show loading state during password reset submission', async () => {
       (mockedApiClient.requestPasswordReset as Mock).mockReturnValue(new Promise(() => {}));
-      render(<AuthView {...defaultProps} />);
+      renderWithProviders(<AuthView {...defaultProps} />);
 
       fireEvent.click(screen.getByRole('button', { name: /forgot password\?/i }));
 
@@ -362,7 +363,7 @@ describe('AuthView', () => {
   it('should show loading state during registration submission', async () => {
     // Mock a promise that doesn't resolve immediately
     (mockedApiClient.registerUser as Mock).mockReturnValue(new Promise(() => {}));
-    render(<AuthView {...defaultProps} />);
+    renderWithProviders(<AuthView {...defaultProps} />);
 
     // Switch to registration view
     fireEvent.click(screen.getByRole('button', { name: /don't have an account\? register/i }));

src/pages/admin/components/CorrectionRow.test.tsx

@@ -1,7 +1,7 @@
 // src/pages/admin/components/CorrectionRow.test.tsx
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { render, screen, fireEvent, waitFor } from '@testing-library/react';
+import { screen, fireEvent, waitFor } from '@testing-library/react';
 import { describe, it, expect, vi, beforeEach, type Mocked } from 'vitest';
 import { CorrectionRow } from './CorrectionRow';
 import * as apiClient from '../../../services/apiClient';
@@ -10,15 +10,11 @@ import {
   createMockMasterGroceryItem,
   createMockCategory,
 } from '../../../tests/utils/mockFactories';
+import { renderWithProviders } from '../../../tests/utils/renderWithProviders';
 
-// Cast the mocked module to its mocked type to retain type safety and autocompletion.
-// The apiClient is now mocked globally via src/tests/setup/tests-setup-unit.ts.
-const mockedApiClient = apiClient as Mocked<typeof apiClient>;
-
-// Mock the logger
-vi.mock('../../../services/logger', () => ({
-  logger: { info: vi.fn(), error: vi.fn() },
-}));
+// The apiClient and logger are mocked globally.
+// We can get a typed reference to the apiClient for individual test overrides.
+const mockedApiClient = vi.mocked(apiClient);
 
 // Mock the ConfirmationModal to test its props and interactions
 // The ConfirmationModal is now in a different directory.
@@ -80,7 +76,7 @@ const defaultProps = {
 
 // Helper to render the component inside a table structure
 const renderInTable = (props = defaultProps) => {
-  return render(
+  return renderWithProviders(
     <table>
       <tbody>
         <CorrectionRow {...props} />

src/pages/admin/components/ProfileManager.test.tsx

@@ -21,25 +21,10 @@ vi.mock('../../../components/PasswordInput', () => ({
   PasswordInput: (props: any) => <input {...props} data-testid="password-input" />,
 }));
 
+// The apiClient, notificationService, react-hot-toast, and logger are all mocked globally.
+// We can get a typed reference to the apiClient for individual test overrides.
 const mockedApiClient = vi.mocked(apiClient, true);
 
-vi.mock('../../../services/notificationService');
-vi.mock('react-hot-toast', () => ({
-  __esModule: true,
-  default: {
-    success: vi.fn(),
-    error: vi.fn(),
-  },
-}));
-vi.mock('../../../services/logger.client', () => ({
-  logger: {
-    debug: vi.fn(),
-    info: vi.fn(),
-    warn: vi.fn(),
-    error: vi.fn(),
-  },
-}));
-
 const mockOnClose = vi.fn();
 const mockOnLoginSuccess = vi.fn();
 const mockOnSignOut = vi.fn();
@@ -883,6 +868,12 @@ describe('ProfileManager', () => {
       });
     });
 
+    it('should not render auth views when the user is already authenticated', () => {
+      render(<ProfileManager {...defaultAuthenticatedProps} />);
+      expect(screen.queryByText('Sign In')).not.toBeInTheDocument();
+      expect(screen.queryByText('Create an Account')).not.toBeInTheDocument();
+    });
+
     it('should log warning if address fetch returns null', async () => {
       console.log('[TEST DEBUG] Running: should log warning if address fetch returns null');
       const loggerSpy = vi.spyOn(logger.logger, 'warn');
@@ -905,5 +896,113 @@ describe('ProfileManager', () => {
         );
       });
     });
+
+    it('should handle updating the user profile and address with empty strings', async () => {
+      mockedApiClient.updateUserProfile.mockImplementation(async (data) =>
+        new Response(JSON.stringify({ ...authenticatedProfile, ...data })),
+      );
+      mockedApiClient.updateUserAddress.mockImplementation(async (data) =>
+        new Response(JSON.stringify({ ...mockAddress, ...data })),
+      );
+
+      render(<ProfileManager {...defaultAuthenticatedProps} />);
+
+      await waitFor(() => {
+        expect(screen.getByLabelText(/full name/i)).toHaveValue(authenticatedProfile.full_name);
+      });
+      await waitFor(() => expect(screen.getByLabelText(/city/i)).toHaveValue(mockAddress.city));
+
+      fireEvent.change(screen.getByLabelText(/full name/i), { target: { value: '' } });
+      fireEvent.change(screen.getByLabelText(/city/i), { target: { value: '' } });
+
+      const saveButton = screen.getByRole('button', { name: /save profile/i });
+      fireEvent.click(saveButton);
+
+      await waitFor(() => {
+        expect(mockedApiClient.updateUserProfile).toHaveBeenCalledWith(
+          { full_name: '', avatar_url: authenticatedProfile.avatar_url },
+          expect.objectContaining({ signal: expect.anything() }),
+        );
+        expect(mockedApiClient.updateUserAddress).toHaveBeenCalledWith(
+          expect.objectContaining({ city: '' }),
+          expect.objectContaining({ signal: expect.anything() }),
+        );
+        expect(mockOnProfileUpdate).toHaveBeenCalledWith(
+          expect.objectContaining({ full_name: '' })
+        );
+        expect(notifySuccess).toHaveBeenCalledWith('Profile updated successfully!');
+      });
+    });
+
+    it('should correctly clear the form when userProfile.address_id is null', async () => {
+      const profileNoAddress = { ...authenticatedProfile, address_id: null };
+      render(
+        <ProfileManager
+          {...defaultAuthenticatedProps}
+          userProfile={profileNoAddress as any} // Forcefully override the type to simulate address_id: null
+        />,
+      );
+
+      await waitFor(() => {
+        expect(screen.getByLabelText(/address line 1/i)).toHaveValue('');
+        expect(screen.getByLabelText(/city/i)).toHaveValue('');
+        expect(screen.getByLabelText(/province \/ state/i)).toHaveValue('');
+        expect(screen.getByLabelText(/postal \/ zip code/i)).toHaveValue('');
+        expect(screen.getByLabelText(/country/i)).toHaveValue('');
+      });
+    });
+
+    it('should show error notification when manual geocoding fails', async () => {
+      render(<ProfileManager {...defaultAuthenticatedProps} />);
+      await waitFor(() => expect(screen.getByLabelText(/city/i)).toHaveValue(mockAddress.city));
+
+      (mockedApiClient.geocodeAddress as Mock).mockRejectedValue(new Error('Geocoding failed'));
+
+      fireEvent.click(screen.getByRole('button', { name: /re-geocode/i }));
+
+      await waitFor(() => {
+        expect(notifyError).toHaveBeenCalledWith('Geocoding failed');
+      });
+    });
+
+    it('should show error notification when auto-geocoding fails', async () => {
+      vi.useFakeTimers();
+      // FIX: Mock getUserAddress to return an address *without* coordinates.
+      // This is the condition required to trigger the auto-geocoding logic.
+      const addressWithoutCoords = { ...mockAddress, latitude: undefined, longitude: undefined };
+      mockedApiClient.getUserAddress.mockResolvedValue(
+        new Response(JSON.stringify(addressWithoutCoords)),
+      );
+
+      render(<ProfileManager {...defaultAuthenticatedProps} />);
+
+      // Wait for initial load
+      await act(async () => {
+        await vi.runAllTimersAsync();
+      });
+
+      (mockedApiClient.geocodeAddress as Mock).mockRejectedValue(new Error('Auto-geocode error'));
+
+      fireEvent.change(screen.getByLabelText(/city/i), { target: { value: 'ErrorCity' } });
+
+      await act(async () => {
+        await vi.runAllTimersAsync();
+      });
+
+      expect(notifyError).toHaveBeenCalledWith('Auto-geocode error');
+    });
+
+    it('should handle permission denied error during geocoding', async () => {
+      render(<ProfileManager {...defaultAuthenticatedProps} />);
+      await waitFor(() => expect(screen.getByLabelText(/city/i)).toHaveValue(mockAddress.city));
+
+      (mockedApiClient.geocodeAddress as Mock).mockRejectedValue(new Error('Permission denied'));
+
+      fireEvent.click(screen.getByRole('button', { name: /re-geocode/i }));
+
+      await waitFor(() => {
+        expect(notifyError).toHaveBeenCalledWith('Permission denied');
+      });
+    });
   });
 });

src/pages/admin/components/StatCard.test.tsx

@@ -1,18 +1,19 @@
 import React from 'react';
-import { render, screen } from '@testing-library/react';
+import { screen } from '@testing-library/react';
 import { describe, it, expect } from 'vitest';
 import { StatCard } from './StatCard';
+import { renderWithProviders } from '../../../tests/utils/renderWithProviders';
 
 describe('StatCard', () => {
   it('should render the title and value correctly', () => {
-    render(<StatCard title="Test Stat" value="1,234" icon={<div data-testid="icon" />} />);
+    renderWithProviders(<StatCard title="Test Stat" value="1,234" icon={<div data-testid="icon" />} />);
 
     expect(screen.getByText('Test Stat')).toBeInTheDocument();
     expect(screen.getByText('1,234')).toBeInTheDocument();
   });
 
   it('should render the icon', () => {
-    render(
+    renderWithProviders(
       <StatCard title="Test Stat" value={100} icon={<div data-testid="test-icon">Icon</div>} />,
     );
 

src/pages/admin/components/SystemCheck.test.tsx

@@ -1,47 +1,18 @@
 // src/pages/admin/components/SystemCheck.test.tsx
 import React from 'react';
-import { render, screen, waitFor, cleanup, fireEvent, act } from '@testing-library/react';
+import { screen, waitFor, cleanup, fireEvent, act } from '@testing-library/react';
 import { describe, it, expect, vi, beforeEach, afterEach, type Mock } from 'vitest';
 import { SystemCheck } from './SystemCheck';
 import * as apiClient from '../../../services/apiClient';
 import toast from 'react-hot-toast';
 import { createMockUser } from '../../../tests/utils/mockFactories';
+import { renderWithProviders } from '../../../tests/utils/renderWithProviders';
 
-// Mock the entire apiClient module to ensure all exports are defined.
-// This is the primary fix for the error: [vitest] No "..." export is defined on the mock.
-vi.mock('../../../services/apiClient', () => ({
-  pingBackend: vi.fn(),
-  checkStorage: vi.fn(),
-  checkDbPoolHealth: vi.fn(),
-  checkPm2Status: vi.fn(),
-  checkRedisHealth: vi.fn(),
-  checkDbSchema: vi.fn(),
-  loginUser: vi.fn(),
-  triggerFailingJob: vi.fn(),
-  clearGeocodeCache: vi.fn(),
-}));
-
-// Get a type-safe mocked version of the apiClient module.
+// The apiClient is mocked globally in `src/tests/setup/globalApiMock.ts`.
+// We can get a type-safe mocked version of the module to override functions for specific tests.
 const mockedApiClient = vi.mocked(apiClient);
 
-// Correct the relative path to the logger module.
-vi.mock('../../../services/logger', () => ({
-  logger: {
-    info: vi.fn(),
-    warn: vi.fn(),
-    error: vi.fn(),
-    debug: vi.fn(),
-  },
-}));
-
-// Mock toast to check for notifications
-vi.mock('react-hot-toast', () => ({
-  __esModule: true,
-  default: {
-    success: vi.fn(),
-    error: vi.fn(),
-  },
-}));
+// The logger and react-hot-toast are mocked globally.
 
 describe('SystemCheck', () => {
   // Store original env variable
@@ -100,7 +71,7 @@ describe('SystemCheck', () => {
 
   it('should render initial idle state and then run checks automatically on mount', async () => {
     setGeminiApiKey('mock-api-key');
-    render(<SystemCheck />);
+    renderWithProviders(<SystemCheck />);
 
     // Initially, all checks should be in 'running' state due to auto-run
     // However, the API key check is synchronous and resolves immediately.
@@ -126,7 +97,7 @@ describe('SystemCheck', () => {
 
   it('should show API key as failed if GEMINI_API_KEY is not set', async () => {
     setGeminiApiKey(undefined);
-    render(<SystemCheck />);
+    renderWithProviders(<SystemCheck />);
 
     // Wait for the specific error message to appear.
     expect(
@@ -139,7 +110,7 @@ describe('SystemCheck', () => {
   it('should show backend connection as failed if pingBackend fails', async () => {
     setGeminiApiKey('mock-api-key');
     (mockedApiClient.pingBackend as Mock).mockRejectedValueOnce(new Error('Network error'));
-    render(<SystemCheck />);
+    renderWithProviders(<SystemCheck />);
 
     await waitFor(() => {
       expect(screen.getByText('Network error')).toBeInTheDocument();
@@ -164,7 +135,7 @@ describe('SystemCheck', () => {
         new Response(JSON.stringify({ success: false, message: 'PM2 process not found' })),
       ),
     );
-    render(<SystemCheck />);
+    renderWithProviders(<SystemCheck />);
 
     await waitFor(() => {
       expect(screen.getByText('PM2 process not found')).toBeInTheDocument();
@@ -174,7 +145,7 @@ describe('SystemCheck', () => {
   it('should show database pool check as failed if checkDbPoolHealth fails', async () => {
     setGeminiApiKey('mock-api-key'); // This was missing
     mockedApiClient.checkDbPoolHealth.mockRejectedValueOnce(new Error('DB connection refused'));
-    render(<SystemCheck />);
+    renderWithProviders(<SystemCheck />);
 
     await waitFor(() => {
       expect(screen.getByText('DB connection refused')).toBeInTheDocument();
@@ -184,7 +155,7 @@ describe('SystemCheck', () => {
   it('should show Redis check as failed if checkRedisHealth fails', async () => {
     setGeminiApiKey('mock-api-key');
     mockedApiClient.checkRedisHealth.mockRejectedValueOnce(new Error('Redis connection refused'));
-    render(<SystemCheck />);
+    renderWithProviders(<SystemCheck />);
 
     await waitFor(() => {
       expect(screen.getByText('Redis connection refused')).toBeInTheDocument();
@@ -197,7 +168,7 @@ describe('SystemCheck', () => {
     mockedApiClient.checkDbPoolHealth.mockImplementationOnce(() =>
       Promise.reject(new Error('DB connection refused')),
     );
-    render(<SystemCheck />);
+    renderWithProviders(<SystemCheck />);
 
     await waitFor(() => {
       // Verify the specific "skipped" messages for DB-dependent checks
@@ -214,7 +185,7 @@ describe('SystemCheck', () => {
     mockedApiClient.checkDbSchema.mockImplementationOnce(() =>
       Promise.resolve(new Response(JSON.stringify({ success: false, message: 'Schema mismatch' }))),
     );
-    render(<SystemCheck />);
+    renderWithProviders(<SystemCheck />);
 
     await waitFor(() => {
       expect(screen.getByText('Schema mismatch')).toBeInTheDocument();
@@ -224,7 +195,7 @@ describe('SystemCheck', () => {
   it('should show seeded user check as failed if loginUser fails', async () => {
     setGeminiApiKey('mock-api-key');
     mockedApiClient.loginUser.mockRejectedValueOnce(new Error('Incorrect email or password'));
-    render(<SystemCheck />);
+    renderWithProviders(<SystemCheck />);
 
     await waitFor(() => {
       expect(
@@ -236,7 +207,7 @@ describe('SystemCheck', () => {
   it('should show a generic failure message for other login errors', async () => {
     setGeminiApiKey('mock-api-key');
     mockedApiClient.loginUser.mockRejectedValueOnce(new Error('Server is on fire'));
-    render(<SystemCheck />);
+    renderWithProviders(<SystemCheck />);
 
     await waitFor(() => {
       expect(screen.getByText('Failed: Server is on fire')).toBeInTheDocument();
@@ -246,7 +217,7 @@ describe('SystemCheck', () => {
   it('should show storage directory check as failed if checkStorage fails', async () => {
     setGeminiApiKey('mock-api-key');
     mockedApiClient.checkStorage.mockRejectedValueOnce(new Error('Storage not writable'));
-    render(<SystemCheck />);
+    renderWithProviders(<SystemCheck />);
 
     await waitFor(() => {
       expect(screen.getByText('Storage not writable')).toBeInTheDocument();
@@ -262,7 +233,7 @@ describe('SystemCheck', () => {
     });
     mockedApiClient.pingBackend.mockImplementation(() => mockPromise);
 
-    render(<SystemCheck />);
+    renderWithProviders(<SystemCheck />);
 
     // The button text changes to "Running Checks..."
     const runningButton = screen.getByRole('button', { name: /running checks/i });
@@ -283,7 +254,7 @@ describe('SystemCheck', () => {
 
   it('should re-run checks when the "Re-run Checks" button is clicked', async () => {
     setGeminiApiKey('mock-api-key');
-    render(<SystemCheck />);
+    renderWithProviders(<SystemCheck />);
 
     // Wait for initial auto-run to complete
     await waitFor(() => expect(screen.getByText(/finished in/i)).toBeInTheDocument());
@@ -328,7 +299,7 @@ describe('SystemCheck', () => {
     mockedApiClient.checkDbSchema.mockImplementationOnce(() =>
       Promise.resolve(new Response(JSON.stringify({ success: false, message: 'Schema mismatch' }))),
     );
-    const { container } = render(<SystemCheck />);
+    const { container } = renderWithProviders(<SystemCheck />);
 
     await waitFor(() => {
       // Instead of test-ids, we check for the result: the icon's color class.
@@ -344,7 +315,7 @@ describe('SystemCheck', () => {
 
   it('should display elapsed time after checks complete', async () => {
     setGeminiApiKey('mock-api-key');
-    render(<SystemCheck />);
+    renderWithProviders(<SystemCheck />);
 
     await waitFor(() => {
       const elapsedTimeText = screen.getByText(/finished in \d+\.\d{2} seconds\./i);
@@ -357,7 +328,7 @@ describe('SystemCheck', () => {
 
   describe('Integration: Job Queue Retries', () => {
     it('should call triggerFailingJob and show a success toast', async () => {
-      render(<SystemCheck />);
+      renderWithProviders(<SystemCheck />);
       const triggerButton = screen.getByRole('button', { name: /trigger failing job/i });
       fireEvent.click(triggerButton);
 
@@ -374,7 +345,7 @@ describe('SystemCheck', () => {
       });
       mockedApiClient.triggerFailingJob.mockImplementation(() => mockPromise);
 
-      render(<SystemCheck />);
+      renderWithProviders(<SystemCheck />);
       const triggerButton = screen.getByRole('button', { name: /trigger failing job/i });
       fireEvent.click(triggerButton);
 
@@ -390,7 +361,7 @@ describe('SystemCheck', () => {
 
     it('should show an error toast if triggering the job fails', async () => {
       mockedApiClient.triggerFailingJob.mockRejectedValueOnce(new Error('Queue is down'));
-      render(<SystemCheck />);
+      renderWithProviders(<SystemCheck />);
       const triggerButton = screen.getByRole('button', { name: /trigger failing job/i });
       fireEvent.click(triggerButton);
 
@@ -403,7 +374,7 @@ describe('SystemCheck', () => {
       mockedApiClient.triggerFailingJob.mockResolvedValueOnce(
         new Response(JSON.stringify({ message: 'Server error' }), { status: 500 }),
       );
-      render(<SystemCheck />);
+      renderWithProviders(<SystemCheck />);
       const triggerButton = screen.getByRole('button', { name: /trigger failing job/i });
       fireEvent.click(triggerButton);
 
@@ -420,7 +391,7 @@ describe('SystemCheck', () => {
     });
 
     it('should call clearGeocodeCache and show a success toast', async () => {
-      render(<SystemCheck />);
+      renderWithProviders(<SystemCheck />);
       // Wait for checks to run and Redis to be OK
       await waitFor(() => expect(screen.getByText('Redis OK')).toBeInTheDocument());
 
@@ -435,7 +406,7 @@ describe('SystemCheck', () => {
 
     it('should show an error toast if clearing the cache fails', async () => {
       mockedApiClient.clearGeocodeCache.mockRejectedValueOnce(new Error('Redis is busy'));
-      render(<SystemCheck />);
+      renderWithProviders(<SystemCheck />);
       await waitFor(() => expect(screen.getByText('Redis OK')).toBeInTheDocument());
       fireEvent.click(screen.getByRole('button', { name: /clear geocode cache/i }));
       await waitFor(() => expect(vi.mocked(toast).error).toHaveBeenCalledWith('Redis is busy'));
@@ -443,7 +414,7 @@ describe('SystemCheck', () => {
 
     it('should not call clearGeocodeCache if user cancels confirmation', async () => {
       vi.spyOn(window, 'confirm').mockReturnValue(false);
-      render(<SystemCheck />);
+      renderWithProviders(<SystemCheck />);
       await waitFor(() => expect(screen.getByText('Redis OK')).toBeInTheDocument());
 
       const clearButton = screen.getByRole('button', { name: /clear geocode cache/i });
@@ -456,7 +427,7 @@ describe('SystemCheck', () => {
       mockedApiClient.clearGeocodeCache.mockResolvedValueOnce(
         new Response(JSON.stringify({ message: 'Cache clear failed' }), { status: 500 }),
       );
-      render(<SystemCheck />);
+      renderWithProviders(<SystemCheck />);
       await waitFor(() => expect(screen.getByText('Redis OK')).toBeInTheDocument());
 
       fireEvent.click(screen.getByRole('button', { name: /clear geocode cache/i }));
@@ -470,7 +441,7 @@ describe('SystemCheck', () => {
       mockedApiClient.checkRedisHealth.mockResolvedValueOnce(
         new Response(JSON.stringify({ success: false, message: 'Redis down' })),
       );
-      render(<SystemCheck />);
+      renderWithProviders(<SystemCheck />);
 
       await waitFor(() => expect(screen.getByText('Redis down')).toBeInTheDocument());
 
@@ -486,7 +457,7 @@ describe('SystemCheck', () => {
       mockedApiClient.pingBackend.mockResolvedValueOnce(
         new Response('unexpected response', { status: 200 }),
       );
-      render(<SystemCheck />);
+      renderWithProviders(<SystemCheck />);
 
       await waitFor(() => {
         expect(
@@ -499,7 +470,7 @@ describe('SystemCheck', () => {
       mockedApiClient.checkStorage.mockResolvedValueOnce(
         new Response(JSON.stringify({ message: 'Permission denied' }), { status: 403 }),
       );
-      render(<SystemCheck />);
+      renderWithProviders(<SystemCheck />);
 
       await waitFor(() => {
         expect(screen.getByText('Permission denied')).toBeInTheDocument();
@@ -511,7 +482,7 @@ describe('SystemCheck', () => {
       mockedApiClient.checkDbSchema.mockResolvedValueOnce(
         new Response(JSON.stringify({ message: 'Schema check failed 500' }), { status: 500 }),
       );
-      render(<SystemCheck />);
+      renderWithProviders(<SystemCheck />);
 
       await waitFor(() => {
         expect(screen.getByText('Schema check failed 500')).toBeInTheDocument();
@@ -523,7 +494,7 @@ describe('SystemCheck', () => {
       mockedApiClient.checkDbPoolHealth.mockResolvedValueOnce(
         new Response(JSON.stringify({ message: 'DB Pool check failed 500' }), { status: 500 }),
       );
-      render(<SystemCheck />);
+      renderWithProviders(<SystemCheck />);
 
       await waitFor(() => {
         expect(screen.getByText('DB Pool check failed 500')).toBeInTheDocument();
@@ -535,7 +506,7 @@ describe('SystemCheck', () => {
       mockedApiClient.checkPm2Status.mockResolvedValueOnce(
         new Response(JSON.stringify({ message: 'PM2 check failed 500' }), { status: 500 }),
       );
-      render(<SystemCheck />);
+      renderWithProviders(<SystemCheck />);
 
       await waitFor(() => {
         expect(screen.getByText('PM2 check failed 500')).toBeInTheDocument();
@@ -547,7 +518,7 @@ describe('SystemCheck', () => {
       mockedApiClient.checkRedisHealth.mockResolvedValueOnce(
         new Response(JSON.stringify({ message: 'Redis check failed 500' }), { status: 500 }),
       );
-      render(<SystemCheck />);
+      renderWithProviders(<SystemCheck />);
 
       await waitFor(() => {
         expect(screen.getByText('Redis check failed 500')).toBeInTheDocument();
@@ -559,7 +530,7 @@ describe('SystemCheck', () => {
       mockedApiClient.checkRedisHealth.mockResolvedValueOnce(
         new Response(JSON.stringify({ success: false, message: 'Redis is down' })),
       );
-      render(<SystemCheck />);
+      renderWithProviders(<SystemCheck />);
 
       await waitFor(() => {
         expect(screen.getByText('Redis is down')).toBeInTheDocument();
@@ -571,7 +542,7 @@ describe('SystemCheck', () => {
       mockedApiClient.loginUser.mockResolvedValueOnce(
         new Response(JSON.stringify({ message: 'Invalid credentials' }), { status: 401 }),
       );
-      render(<SystemCheck />);
+      renderWithProviders(<SystemCheck />);
 
       await waitFor(() => {
         expect(screen.getByText('Failed: Invalid credentials')).toBeInTheDocument();

src/providers/ApiProvider.test.tsx

@@ -6,14 +6,8 @@ import { ApiProvider } from './ApiProvider';
 import { ApiContext } from '../contexts/ApiContext';
 import * as apiClient from '../services/apiClient';
 
-// Mock the apiClient module.
-// Since ApiProvider and ApiContext import * as apiClient, mocking it ensures
-// we control the reference identity and can verify it's being passed correctly.
-vi.mock('../services/apiClient', () => ({
-  fetchFlyers: vi.fn(),
-  fetchMasterItems: vi.fn(),
-  // Add other mocked methods as needed for the shape to be valid-ish
-}));
+// The apiClient is mocked globally in `src/tests/setup/globalApiMock.ts`.
+// This test verifies that the ApiProvider correctly provides this mocked module.
 
 describe('ApiProvider & ApiContext', () => {
   const TestConsumer = () => {

src/providers/AppProviders.test.tsx

@@ -0,0 +1,72 @@
+// src/providers/AppProviders.test.tsx
+import React from 'react';
+import { render, screen } from '@testing-library/react';
+import { describe, it, expect, vi } from 'vitest';
+import { AppProviders } from './AppProviders';
+
+// Mock all the providers to avoid their side effects and isolate AppProviders logic.
+// We render a simple div with a data-testid for each to verify nesting.
+vi.mock('./ModalProvider', () => ({
+  ModalProvider: ({ children }: { children: React.ReactNode }) => (
+    <div data-testid="modal-provider">{children}</div>
+  ),
+}));
+
+vi.mock('./AuthProvider', () => ({
+  AuthProvider: ({ children }: { children: React.ReactNode }) => (
+    <div data-testid="auth-provider">{children}</div>
+  ),
+}));
+
+vi.mock('./FlyersProvider', () => ({
+  FlyersProvider: ({ children }: { children: React.ReactNode }) => (
+    <div data-testid="flyers-provider">{children}</div>
+  ),
+}));
+
+vi.mock('./MasterItemsProvider', () => ({
+  MasterItemsProvider: ({ children }: { children: React.ReactNode }) => (
+    <div data-testid="master-items-provider">{children}</div>
+  ),
+}));
+
+vi.mock('./UserDataProvider', () => ({
+  UserDataProvider: ({ children }: { children: React.ReactNode }) => (
+    <div data-testid="user-data-provider">{children}</div>
+  ),
+}));
+
+describe('AppProviders', () => {
+  it('renders children correctly', () => {
+    render(
+      <AppProviders>
+        <div data-testid="test-child">Test Child</div>
+      </AppProviders>,
+    );
+
+    expect(screen.getByTestId('test-child')).toBeInTheDocument();
+    expect(screen.getByText('Test Child')).toBeInTheDocument();
+  });
+
+  it('renders providers in the correct nesting order', () => {
+    render(
+      <AppProviders>
+        <div data-testid="test-child">Test Child</div>
+      </AppProviders>,
+    );
+
+    const modalProvider = screen.getByTestId('modal-provider');
+    const authProvider = screen.getByTestId('auth-provider');
+    const flyersProvider = screen.getByTestId('flyers-provider');
+    const masterItemsProvider = screen.getByTestId('master-items-provider');
+    const userDataProvider = screen.getByTestId('user-data-provider');
+    const child = screen.getByTestId('test-child');
+
+    // Verify nesting structure: Modal -> Auth -> Flyers -> MasterItems -> UserData -> Child
+    expect(modalProvider).toContainElement(authProvider);
+    expect(authProvider).toContainElement(flyersProvider);
+    expect(flyersProvider).toContainElement(masterItemsProvider);
+    expect(masterItemsProvider).toContainElement(userDataProvider);
+    expect(userDataProvider).toContainElement(child);
+  });
+});

src/providers/AuthProvider.test.tsx

@@ -0,0 +1,245 @@
+// src/providers/AuthProvider.test.tsx
+import React, { useContext, useState } from 'react';
+import { render, screen, waitFor, fireEvent, act } from '@testing-library/react';
+import { describe, it, expect, vi, beforeEach, type Mocked } from 'vitest';
+import { AuthProvider } from './AuthProvider';
+import { AuthContext } from '../contexts/AuthContext';
+import * as tokenStorage from '../services/tokenStorage';
+import { createMockUserProfile } from '../tests/utils/mockFactories';
+import * as apiClient from '../services/apiClient';
+
+// Mocks
+// The apiClient is mocked globally in `src/tests/setup/globalApiMock.ts`.
+vi.mock('../services/tokenStorage');
+vi.mock('../services/logger.client', () => ({
+  logger: {
+    info: vi.fn(),
+    warn: vi.fn(),
+    error: vi.fn(),
+    debug: vi.fn(),
+  },
+}));
+
+const mockedApiClient = vi.mocked(apiClient);
+const mockedTokenStorage = tokenStorage as Mocked<typeof tokenStorage>;
+
+const mockProfile = createMockUserProfile({
+  user: { user_id: 'user-123', email: 'test@example.com' },
+});
+
+// A simple consumer component to access and display context values
+const TestConsumer = () => {
+  const context = useContext(AuthContext);
+  const [error, setError] = useState<string | null>(null);
+  if (!context) {
+    return <div>No Context</div>;
+  }
+
+  const handleLoginWithoutProfile = async () => {
+    try {
+      await context.login('test-token-no-profile');
+    } catch (e) {
+      setError(e instanceof Error ? e.message : String(e));
+    }
+  };
+
+  return (
+    <div>
+      <div data-testid="auth-status">{context.authStatus}</div>
+      <div data-testid="user-email">{context.userProfile?.user.email ?? 'No User'}</div>
+      <div data-testid="is-loading">{context.isLoading.toString()}</div>
+      {error && <div data-testid="error-display">{error}</div>}
+      <button onClick={() => context.login('test-token', mockProfile)}>Login with Profile</button>
+      <button onClick={handleLoginWithoutProfile}>Login without Profile</button>
+      <button onClick={context.logout}>Logout</button>
+      <button onClick={() => context.updateProfile({ full_name: 'Updated Name' })}>
+        Update Profile
+      </button>
+    </div>
+  );
+};
+
+const renderWithProvider = () => {
+  return render(
+    <AuthProvider>
+      <TestConsumer />
+    </AuthProvider>,
+  );
+};
+
+describe('AuthProvider', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  it('should start in "Determining..." state and transition to "SIGNED_OUT" if no token exists', async () => {
+    mockedTokenStorage.getToken.mockReturnValue(null);
+    renderWithProvider();
+
+    // The transition happens synchronously in the effect when no token is present,
+    // so 'Determining...' might be skipped or flashed too quickly for the test runner.
+    // We check that it settles correctly.
+
+    await waitFor(() => {
+      expect(screen.getByTestId('auth-status')).toHaveTextContent('SIGNED_OUT');
+      expect(screen.getByTestId('is-loading')).toHaveTextContent('false');
+    });
+
+    expect(mockedApiClient.getAuthenticatedUserProfile).not.toHaveBeenCalled();
+  });
+
+  it('should transition to "AUTHENTICATED" if a valid token exists', async () => {
+    mockedTokenStorage.getToken.mockReturnValue('valid-token');
+    mockedApiClient.getAuthenticatedUserProfile.mockResolvedValue(
+      new Response(JSON.stringify(mockProfile)),
+    );
+
+    renderWithProvider();
+
+    await waitFor(() => {
+      expect(screen.getByTestId('auth-status')).toHaveTextContent('AUTHENTICATED');
+      expect(screen.getByTestId('user-email')).toHaveTextContent('test@example.com');
+      expect(screen.getByTestId('is-loading')).toHaveTextContent('false');
+    });
+
+    expect(mockedApiClient.getAuthenticatedUserProfile).toHaveBeenCalledTimes(1);
+  });
+
+  it('should handle token validation failure by signing out', async () => {
+    mockedTokenStorage.getToken.mockReturnValue('invalid-token');
+    mockedApiClient.getAuthenticatedUserProfile.mockRejectedValue(new Error('Invalid Token'));
+
+    renderWithProvider();
+
+    await waitFor(() => {
+      expect(screen.getByTestId('auth-status')).toHaveTextContent('SIGNED_OUT');
+    });
+
+    expect(mockedTokenStorage.removeToken).toHaveBeenCalled();
+  });
+
+  it('should handle a valid token that returns no profile by signing out', async () => {
+    // This test covers lines 51-55
+    mockedTokenStorage.getToken.mockReturnValue('valid-token-no-profile');
+    mockedApiClient.getAuthenticatedUserProfile.mockResolvedValue(
+      new Response(JSON.stringify(null)),
+    );
+
+    renderWithProvider();
+
+    expect(screen.getByTestId('auth-status')).toHaveTextContent('Determining...');
+
+    await waitFor(() => {
+      expect(screen.getByTestId('auth-status')).toHaveTextContent('SIGNED_OUT');
+    });
+
+    expect(mockedTokenStorage.removeToken).toHaveBeenCalled();
+    expect(screen.getByTestId('user-email')).toHaveTextContent('No User');
+    expect(screen.getByTestId('is-loading')).toHaveTextContent('false');
+  });
+
+  it('should log in a user with provided profile data', async () => {
+    mockedTokenStorage.getToken.mockReturnValue(null);
+    renderWithProvider();
+    await waitFor(() => expect(screen.getByTestId('auth-status')).toHaveTextContent('SIGNED_OUT'));
+
+    const loginButton = screen.getByRole('button', { name: 'Login with Profile' });
+    await act(async () => {
+      fireEvent.click(loginButton);
+    });
+
+    expect(mockedTokenStorage.setToken).toHaveBeenCalledWith('test-token');
+    expect(screen.getByTestId('auth-status')).toHaveTextContent('AUTHENTICATED');
+    expect(screen.getByTestId('user-email')).toHaveTextContent('test@example.com');
+    // API should not be called if profile is provided
+    expect(mockedApiClient.getAuthenticatedUserProfile).not.toHaveBeenCalled();
+  });
+
+  it('should log in a user and fetch profile if not provided', async () => {
+    mockedTokenStorage.getToken.mockReturnValue(null);
+    mockedApiClient.getAuthenticatedUserProfile.mockResolvedValue(
+      new Response(JSON.stringify(mockProfile)),
+    );
+    renderWithProvider();
+    await waitFor(() => expect(screen.getByTestId('auth-status')).toHaveTextContent('SIGNED_OUT'));
+
+    const loginButton = screen.getByRole('button', { name: 'Login without Profile' });
+    await act(async () => {
+      fireEvent.click(loginButton);
+    });
+
+    await waitFor(() => {
+      expect(screen.getByTestId('auth-status')).toHaveTextContent('AUTHENTICATED');
+      expect(screen.getByTestId('user-email')).toHaveTextContent('test@example.com');
+    });
+
+    expect(mockedTokenStorage.setToken).toHaveBeenCalledWith('test-token-no-profile');
+    expect(mockedApiClient.getAuthenticatedUserProfile).toHaveBeenCalledTimes(1);
+  });
+
+  it('should throw an error and log out if profile fetch fails after login', async () => {
+    // This test covers lines 109-111
+    mockedTokenStorage.getToken.mockReturnValue(null);
+    const fetchError = new Error('API is down');
+    mockedApiClient.getAuthenticatedUserProfile.mockRejectedValue(fetchError);
+
+    renderWithProvider();
+
+    await waitFor(() => {
+      expect(screen.getByTestId('auth-status')).toHaveTextContent('SIGNED_OUT');
+    });
+
+    const loginButton = screen.getByRole('button', { name: 'Login without Profile' });
+
+    // Click the button that triggers the failing login
+    fireEvent.click(loginButton);
+
+    // After the error is thrown, the state should be rolled back
+    await waitFor(() => {
+      // The error is now caught and displayed by the TestConsumer
+      expect(screen.getByTestId('error-display')).toHaveTextContent(
+        'Login succeeded, but failed to fetch your data: Received null or undefined profile from API.',
+      );
+
+      expect(mockedTokenStorage.setToken).toHaveBeenCalledWith('test-token-no-profile');
+      expect(mockedTokenStorage.removeToken).toHaveBeenCalled();
+      expect(screen.getByTestId('auth-status')).toHaveTextContent('SIGNED_OUT');
+    });
+  });
+
+  it('should log out the user', async () => {
+    mockedTokenStorage.getToken.mockReturnValue('valid-token');
+    mockedApiClient.getAuthenticatedUserProfile.mockResolvedValue(
+      new Response(JSON.stringify(mockProfile)),
+    );
+    renderWithProvider();
+    await waitFor(() => expect(screen.getByTestId('auth-status')).toHaveTextContent('AUTHENTICATED'));
+
+    const logoutButton = screen.getByRole('button', { name: 'Logout' });
+    fireEvent.click(logoutButton);
+
+    expect(screen.getByTestId('auth-status')).toHaveTextContent('SIGNED_OUT');
+    expect(screen.getByTestId('user-email')).toHaveTextContent('No User');
+    expect(mockedTokenStorage.removeToken).toHaveBeenCalled();
+  });
+
+  it('should update the user profile', async () => {
+    mockedTokenStorage.getToken.mockReturnValue('valid-token');
+    mockedApiClient.getAuthenticatedUserProfile.mockResolvedValue(
+      new Response(JSON.stringify(mockProfile)),
+    );
+    renderWithProvider();
+    await waitFor(() => expect(screen.getByTestId('auth-status')).toHaveTextContent('AUTHENTICATED'));
+
+    const updateButton = screen.getByRole('button', { name: 'Update Profile' });
+    fireEvent.click(updateButton);
+
+    await waitFor(() => {
+      // The profile object is internal, so we can't directly check it.
+      // A good proxy is to see if a component that uses it would re-render.
+      // Since our consumer doesn't display the name, we just confirm the function was called.
+      // In a real app, we'd check the updated UI element.
+      expect(screen.getByTestId('auth-status')).toHaveTextContent('AUTHENTICATED');
+    });
+  });
+});

src/routes/passport.routes.test.ts

@@ -482,8 +482,8 @@ describe('Passport Configuration', () => {
       const mockReq: Partial<Request> = {
         // An object that is not a valid UserProfile (e.g., missing 'role')
         user: {
-          user_id: 'invalid-user-id',
-        } as any,
+          user: { user_id: 'invalid-user-id' }, // Missing 'role' property
+        } as unknown as UserProfile, // Cast to UserProfile to satisfy req.user type, but it's intentionally malformed
       };
 
       // Act
@@ -618,21 +618,19 @@ describe('Passport Configuration', () => {
 
   describe('mockAuth Middleware', () => {
     const mockNext: NextFunction = vi.fn();
-    let mockRes: Partial<Response>;
-    let originalNodeEnv: string | undefined;
+    const mockRes: Partial<Response> = {
+      status: vi.fn().mockReturnThis(),
+      json: vi.fn(),
+    };
 
     beforeEach(() => {
-      mockRes = { status: vi.fn().mockReturnThis(), json: vi.fn() };
-      originalNodeEnv = process.env.NODE_ENV;
-    });
-
-    afterEach(() => {
-      process.env.NODE_ENV = originalNodeEnv;
+      // Unstub env variables before each test in this block to ensure a clean state.
+      vi.unstubAllEnvs();
     });
 
     it('should attach a mock admin user to req when NODE_ENV is "test"', () => {
       // Arrange
-      process.env.NODE_ENV = 'test';
+      vi.stubEnv('NODE_ENV', 'test');
       const mockReq = {} as Request;
 
       // Act
@@ -646,7 +644,7 @@ describe('Passport Configuration', () => {
 
     it('should do nothing and call next() when NODE_ENV is not "test"', () => {
       // Arrange
-      process.env.NODE_ENV = 'production';
+      vi.stubEnv('NODE_ENV', 'production');
       const mockReq = {} as Request;
 
       // Act

src/routes/reactions.routes.test.ts

@@ -0,0 +1,211 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import supertest from 'supertest';
+import { createTestApp } from '../tests/utils/createTestApp';
+import { createMockUserProfile } from '../tests/utils/mockFactories';
+
+// 1. Mock the Service Layer directly.
+vi.mock('../services/db/index.db', () => ({
+  reactionRepo: {
+    getReactions: vi.fn(),
+    getReactionSummary: vi.fn(),
+    toggleReaction: vi.fn(),
+  },
+}));
+
+// Mock the logger to keep test output clean
+vi.mock('../services/logger.server', async () => ({
+  logger: (await import('../tests/utils/mockLogger')).mockLogger,
+}));
+
+// Mock Passport middleware
+vi.mock('./passport.routes', () => ({
+  default: {
+    authenticate: vi.fn(
+      () => (req: any, res: any, next: any) => {
+        // If we are testing the unauthenticated state (no user injected), simulate 401.
+        if (!req.user) {
+          return res.status(401).json({ message: 'Unauthorized' });
+        }
+        next();
+      },
+    ),
+  },
+}));
+
+// Import the router and mocked DB AFTER all mocks are defined.
+import reactionsRouter from './reactions.routes';
+import { reactionRepo } from '../services/db/index.db';
+import { mockLogger } from '../tests/utils/mockLogger';
+
+const expectLogger = expect.objectContaining({
+  info: expect.any(Function),
+  error: expect.any(Function),
+});
+
+describe('Reaction Routes (/api/reactions)', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  describe('GET /', () => {
+    const app = createTestApp({ router: reactionsRouter, basePath: '/api/reactions' });
+
+    it('should return a list of reactions', async () => {
+      const mockReactions = [{ id: 1, reaction_type: 'like', entity_id: '123' }];
+      vi.mocked(reactionRepo.getReactions).mockResolvedValue(mockReactions as any);
+
+      const response = await supertest(app).get('/api/reactions');
+
+      expect(response.status).toBe(200);
+      expect(response.body).toEqual(mockReactions);
+      expect(reactionRepo.getReactions).toHaveBeenCalledWith({}, expectLogger);
+    });
+
+    it('should filter by query parameters', async () => {
+      const mockReactions = [{ id: 1, reaction_type: 'like' }];
+      vi.mocked(reactionRepo.getReactions).mockResolvedValue(mockReactions as any);
+      
+      const validUuid = '123e4567-e89b-12d3-a456-426614174000';
+      const query = { userId: validUuid, entityType: 'recipe', entityId: '1' };
+
+      const response = await supertest(app).get('/api/reactions').query(query);
+
+      expect(response.status).toBe(200);
+      expect(reactionRepo.getReactions).toHaveBeenCalledWith(
+        expect.objectContaining(query),
+        expectLogger
+      );
+    });
+
+    it('should return 500 on database error', async () => {
+      const error = new Error('DB Error');
+      vi.mocked(reactionRepo.getReactions).mockRejectedValue(error);
+
+      const response = await supertest(app).get('/api/reactions');
+
+      expect(response.status).toBe(500);
+      expect(mockLogger.error).toHaveBeenCalledWith(
+        { error },
+        'Error fetching user reactions'
+      );
+    });
+  });
+
+  describe('GET /summary', () => {
+    const app = createTestApp({ router: reactionsRouter, basePath: '/api/reactions' });
+
+    it('should return reaction summary for an entity', async () => {
+      const mockSummary = { like: 10, love: 5 };
+      vi.mocked(reactionRepo.getReactionSummary).mockResolvedValue(mockSummary as any);
+
+      const response = await supertest(app)
+        .get('/api/reactions/summary')
+        .query({ entityType: 'recipe', entityId: '123' });
+
+      expect(response.status).toBe(200);
+      expect(response.body).toEqual(mockSummary);
+      expect(reactionRepo.getReactionSummary).toHaveBeenCalledWith(
+        'recipe',
+        '123',
+        expectLogger
+      );
+    });
+
+    it('should return 400 if required parameters are missing', async () => {
+      const response = await supertest(app).get('/api/reactions/summary');
+      expect(response.status).toBe(400);
+      expect(response.body.errors[0].message).toContain('required');
+    });
+
+    it('should return 500 on database error', async () => {
+      const error = new Error('DB Error');
+      vi.mocked(reactionRepo.getReactionSummary).mockRejectedValue(error);
+
+      const response = await supertest(app)
+        .get('/api/reactions/summary')
+        .query({ entityType: 'recipe', entityId: '123' });
+
+      expect(response.status).toBe(500);
+      expect(mockLogger.error).toHaveBeenCalledWith(
+        { error },
+        'Error fetching reaction summary'
+      );
+    });
+  });
+
+  describe('POST /toggle', () => {
+    const mockUser = createMockUserProfile({ user: { user_id: 'user-123' } });
+    const app = createTestApp({
+      router: reactionsRouter,
+      basePath: '/api/reactions',
+      authenticatedUser: mockUser,
+    });
+
+    const validBody = {
+      entity_type: 'recipe',
+      entity_id: '123',
+      reaction_type: 'like',
+    };
+
+    it('should return 201 when a reaction is added', async () => {
+      const mockResult = { ...validBody, id: 1, user_id: 'user-123' };
+      vi.mocked(reactionRepo.toggleReaction).mockResolvedValue(mockResult as any);
+
+      const response = await supertest(app)
+        .post('/api/reactions/toggle')
+        .send(validBody);
+
+      expect(response.status).toBe(201);
+      expect(response.body).toEqual({ message: 'Reaction added.', reaction: mockResult });
+      expect(reactionRepo.toggleReaction).toHaveBeenCalledWith(
+        { user_id: 'user-123', ...validBody },
+        expectLogger
+      );
+    });
+
+    it('should return 200 when a reaction is removed', async () => {
+      // Returning null/false from toggleReaction implies the reaction was removed
+      vi.mocked(reactionRepo.toggleReaction).mockResolvedValue(null);
+
+      const response = await supertest(app)
+        .post('/api/reactions/toggle')
+        .send(validBody);
+
+      expect(response.status).toBe(200);
+      expect(response.body).toEqual({ message: 'Reaction removed.' });
+    });
+
+    it('should return 400 if body is invalid', async () => {
+      const response = await supertest(app)
+        .post('/api/reactions/toggle')
+        .send({ entity_type: 'recipe' }); // Missing other required fields
+
+      expect(response.status).toBe(400);
+      expect(response.body.errors).toBeDefined();
+    });
+
+    it('should return 401 if not authenticated', async () => {
+      const unauthApp = createTestApp({ router: reactionsRouter, basePath: '/api/reactions' });
+      const response = await supertest(unauthApp)
+        .post('/api/reactions/toggle')
+        .send(validBody);
+
+      expect(response.status).toBe(401);
+    });
+
+    it('should return 500 on database error', async () => {
+      const error = new Error('DB Error');
+      vi.mocked(reactionRepo.toggleReaction).mockRejectedValue(error);
+
+      const response = await supertest(app)
+        .post('/api/reactions/toggle')
+        .send(validBody);
+
+      expect(response.status).toBe(500);
+      expect(mockLogger.error).toHaveBeenCalledWith(
+        { error, body: validBody },
+        'Error toggling user reaction'
+      );
+    });
+  });
+});

src/routes/recipe.routes.test.ts

@@ -1,7 +1,7 @@
 // src/routes/recipe.routes.test.ts
 import { describe, it, expect, vi, beforeEach } from 'vitest';
 import supertest from 'supertest';
-import { createMockRecipe, createMockRecipeComment } from '../tests/utils/mockFactories';
+import { createMockRecipe, createMockRecipeComment, createMockUserProfile } from '../tests/utils/mockFactories';
 import { NotFoundError } from '../services/db/errors.db';
 import { createTestApp } from '../tests/utils/createTestApp';
 
@@ -16,9 +16,31 @@ vi.mock('../services/db/index.db', () => ({
   },
 }));
 
+// Mock AI Service
+vi.mock('../services/aiService.server', () => ({
+  aiService: {
+    generateRecipeSuggestion: vi.fn(),
+  },
+}));
+
+// Mock Passport
+vi.mock('./passport.routes', () => ({
+  default: {
+    authenticate: vi.fn(
+      () => (req: any, res: any, next: any) => {
+        if (!req.user) {
+          return res.status(401).json({ message: 'Unauthorized' });
+        }
+        next();
+      },
+    ),
+  },
+}));
+
 // Import the router and mocked DB AFTER all mocks are defined.
 import recipeRouter from './recipe.routes';
 import * as db from '../services/db/index.db';
+import { aiService } from '../services/aiService.server';
 import { mockLogger } from '../tests/utils/mockLogger';
 
 // Mock the logger to keep test output clean
@@ -229,4 +251,71 @@ describe('Recipe Routes (/api/recipes)', () => {
       expect(response.body.errors[0].message).toContain('received NaN');
     });
   });
+
+  describe('POST /suggest', () => {
+    const mockUser = createMockUserProfile({ user: { user_id: 'user-123' } });
+    const authApp = createTestApp({
+      router: recipeRouter,
+      basePath: '/api/recipes',
+      authenticatedUser: mockUser,
+    });
+
+    it('should return a recipe suggestion', async () => {
+      const ingredients = ['chicken', 'rice'];
+      const mockSuggestion = 'Chicken and Rice Casserole...';
+      vi.mocked(aiService.generateRecipeSuggestion).mockResolvedValue(mockSuggestion);
+
+      const response = await supertest(authApp)
+        .post('/api/recipes/suggest')
+        .send({ ingredients });
+
+      expect(response.status).toBe(200);
+      expect(response.body).toEqual({ suggestion: mockSuggestion });
+      expect(aiService.generateRecipeSuggestion).toHaveBeenCalledWith(ingredients, expectLogger);
+    });
+
+    it('should return 503 if AI service returns null', async () => {
+      vi.mocked(aiService.generateRecipeSuggestion).mockResolvedValue(null);
+
+      const response = await supertest(authApp)
+        .post('/api/recipes/suggest')
+        .send({ ingredients: ['water'] });
+
+      expect(response.status).toBe(503);
+      expect(response.body.message).toContain('unavailable');
+    });
+
+    it('should return 400 if ingredients list is empty', async () => {
+      const response = await supertest(authApp)
+        .post('/api/recipes/suggest')
+        .send({ ingredients: [] });
+
+      expect(response.status).toBe(400);
+      expect(response.body.errors[0].message).toContain('At least one ingredient is required');
+    });
+
+    it('should return 401 if not authenticated', async () => {
+      const unauthApp = createTestApp({ router: recipeRouter, basePath: '/api/recipes' });
+      const response = await supertest(unauthApp)
+        .post('/api/recipes/suggest')
+        .send({ ingredients: ['chicken'] });
+
+      expect(response.status).toBe(401);
+    });
+
+    it('should return 500 on service error', async () => {
+      const error = new Error('AI Error');
+      vi.mocked(aiService.generateRecipeSuggestion).mockRejectedValue(error);
+
+      const response = await supertest(authApp)
+        .post('/api/recipes/suggest')
+        .send({ ingredients: ['chicken'] });
+
+      expect(response.status).toBe(500);
+      expect(mockLogger.error).toHaveBeenCalledWith(
+        { error },
+        'Error generating recipe suggestion'
+      );
+    });
+  });
 });

src/routes/recipe.routes.ts

@@ -2,6 +2,8 @@
 import { Router } from 'express';
 import { z } from 'zod';
 import * as db from '../services/db/index.db';
+import { aiService } from '../services/aiService.server';
+import passport from './passport.routes';
 import { validateRequest } from '../middleware/validation.middleware';
 import { requiredString, numericIdParam, optionalNumeric } from '../utils/zodUtils';
 
@@ -28,6 +30,12 @@ const byIngredientAndTagSchema = z.object({
 
 const recipeIdParamsSchema = numericIdParam('recipeId');
 
+const suggestRecipeSchema = z.object({
+  body: z.object({
+    ingredients: z.array(z.string().min(1)).nonempty('At least one ingredient is required.'),
+  }),
+});
+
 /**
  * GET /api/recipes/by-sale-percentage - Get recipes based on the percentage of their ingredients on sale.
  */
@@ -121,4 +129,31 @@ router.get('/:recipeId', validateRequest(recipeIdParamsSchema), async (req, res,
   }
 });
 
+/**
+ * POST /api/recipes/suggest - Generates a simple recipe suggestion from a list of ingredients.
+ * This is a protected endpoint.
+ */
+router.post(
+  '/suggest',
+  passport.authenticate('jwt', { session: false }),
+  validateRequest(suggestRecipeSchema),
+  async (req, res, next) => {
+    try {
+      const { body } = req as unknown as z.infer<typeof suggestRecipeSchema>;
+      const suggestion = await aiService.generateRecipeSuggestion(body.ingredients, req.log);
+
+      if (!suggestion) {
+        return res
+          .status(503)
+          .json({ message: 'AI service is currently unavailable or failed to generate a suggestion.' });
+      }
+
+      res.json({ suggestion });
+    } catch (error) {
+      req.log.error({ error }, 'Error generating recipe suggestion');
+      next(error);
+    }
+  },
+);
+
 export default router;

src/routes/user.routes.test.ts

@@ -122,10 +122,10 @@ describe('User Routes (/api/users)', () => {
   describe('Avatar Upload Directory Creation', () => {
     it('should log an error if avatar directory creation fails', async () => {
       // Arrange
-      const mkdirError = new Error('EACCES: permission denied');
+      const mkdirError = new Error('EACCES: permission denied'); // This error is specific to the fs.mkdir mock.
       // Reset modules to force re-import with a new mock implementation
       vi.resetModules();
-      // Set up the mock *before* the module is re-imported
+      // Set up the mock *before* the module is re-imported.
       vi.doMock('node:fs/promises', () => ({
         default: {
           // We only need to mock mkdir for this test.
@@ -133,6 +133,10 @@ describe('User Routes (/api/users)', () => {
         },
       }));
       const { logger } = await import('../services/logger.server');
+      // Stub NODE_ENV to ensure the relevant code path is executed if it depends on it.
+      // Although the mkdir call itself doesn't depend on NODE_ENV, this is good practice
+      // when re-importing modules that might have conditional logic based on it.
+      vi.stubEnv('NODE_ENV', 'test');
 
       // Act: Dynamically import the router to trigger the top-level fs.mkdir call
       await import('./user.routes');
@@ -142,6 +146,7 @@ describe('User Routes (/api/users)', () => {
         { error: mkdirError },
         'Failed to create multer storage directories on startup.',
       );
+      vi.unstubAllEnvs(); // Clean up the stubbed environment variable.
       vi.doUnmock('node:fs/promises'); // Clean up
     });
   });
@@ -482,6 +487,12 @@ describe('User Routes (/api/users)', () => {
 
         expect(response.status).toBe(201);
         expect(response.body).toEqual(mockAddedItem);
+        expect(db.shoppingRepo.addShoppingListItem).toHaveBeenCalledWith(
+          listId,
+          mockUserProfile.user.user_id,
+          itemData,
+          expectLogger,
+        );
       });
 
       it('should return 400 on foreign key error when adding an item', async () => {
@@ -519,6 +530,12 @@ describe('User Routes (/api/users)', () => {
 
         expect(response.status).toBe(200);
         expect(response.body).toEqual(mockUpdatedItem);
+        expect(db.shoppingRepo.updateShoppingListItem).toHaveBeenCalledWith(
+          itemId,
+          mockUserProfile.user.user_id,
+          updates,
+          expectLogger,
+        );
       });
 
       it('should return 404 if item to update is not found', async () => {
@@ -554,6 +571,11 @@ describe('User Routes (/api/users)', () => {
           vi.mocked(db.shoppingRepo.removeShoppingListItem).mockResolvedValue(undefined);
           const response = await supertest(app).delete('/api/users/shopping-lists/items/101');
           expect(response.status).toBe(204);
+          expect(db.shoppingRepo.removeShoppingListItem).toHaveBeenCalledWith(
+            101,
+            mockUserProfile.user.user_id,
+            expectLogger,
+          );
         });
 
         it('should return 404 if item to delete is not found', async () => {

src/routes/user.routes.ts

@@ -478,10 +478,16 @@ router.post(
   validateRequest(addShoppingListItemSchema),
   async (req, res, next: NextFunction) => {
     logger.debug(`[ROUTE] POST /api/users/shopping-lists/:listId/items - ENTER`);
+    const userProfile = req.user as UserProfile;
     // Apply ADR-003 pattern for type safety
     const { params, body } = req as unknown as AddShoppingListItemRequest;
     try {
-      const newItem = await db.shoppingRepo.addShoppingListItem(params.listId, body, req.log);
+      const newItem = await db.shoppingRepo.addShoppingListItem(
+        params.listId,
+        userProfile.user.user_id,
+        body,
+        req.log,
+      );
       res.status(201).json(newItem);
     } catch (error) {
       if (error instanceof ForeignKeyConstraintError) {
@@ -512,11 +518,13 @@ router.put(
   validateRequest(updateShoppingListItemSchema),
   async (req, res, next: NextFunction) => {
     logger.debug(`[ROUTE] PUT /api/users/shopping-lists/items/:itemId - ENTER`);
+    const userProfile = req.user as UserProfile;
     // Apply ADR-003 pattern for type safety
     const { params, body } = req as unknown as UpdateShoppingListItemRequest;
     try {
       const updatedItem = await db.shoppingRepo.updateShoppingListItem(
         params.itemId,
+        userProfile.user.user_id,
         body,
         req.log,
       );
@@ -541,10 +549,11 @@ router.delete(
   validateRequest(shoppingListItemIdSchema),
   async (req, res, next: NextFunction) => {
     logger.debug(`[ROUTE] DELETE /api/users/shopping-lists/items/:itemId - ENTER`);
+    const userProfile = req.user as UserProfile;
     // Apply ADR-003 pattern for type safety
     const { params } = req as unknown as DeleteShoppingListItemRequest;
     try {
-      await db.shoppingRepo.removeShoppingListItem(params.itemId, req.log);
+      await db.shoppingRepo.removeShoppingListItem(params.itemId, userProfile.user.user_id, req.log);
       res.status(204).send();
     } catch (error: unknown) {
       logger.error(

src/services/aiService.server.test.ts

@@ -1,5 +1,6 @@
 // src/services/aiService.server.test.ts
 import { describe, it, expect, vi, beforeEach, afterEach, type Mock } from 'vitest';
+import type { Job } from 'bullmq';
 import { createMockLogger } from '../tests/utils/mockLogger';
 import type { Logger } from 'pino';
 import type { FlyerStatus, MasterGroceryItem, UserProfile } from '../types';
@@ -10,7 +11,7 @@ import {
   DuplicateFlyerError,
   type RawFlyerItem,
 } from './aiService.server';
-import { createMockMasterGroceryItem } from '../tests/utils/mockFactories';
+import { createMockMasterGroceryItem, createMockFlyer } from '../tests/utils/mockFactories';
 import { ValidationError } from './db/errors.db';
 import { AiFlyerDataSchema } from '../types/ai';
 
@@ -113,6 +114,7 @@ describe('AI Service (Server)', () => {
     // Restore all environment variables and clear all mocks before each test
     vi.restoreAllMocks();
     vi.clearAllMocks();
+    mockGenerateContent.mockReset();
     // Reset modules to ensure the service re-initializes with the mocks
 
     mockAiClient.generateContent.mockResolvedValue({
@@ -134,45 +136,29 @@ describe('AI Service (Server)', () => {
   });
 
   describe('Constructor', () => {
-    const originalEnv = process.env;
-
     beforeEach(() => {
       // Reset process.env before each test in this block
       vi.unstubAllEnvs();
-      vi.unstubAllEnvs(); // Force-removes all environment mocking
       vi.resetModules(); // Important to re-evaluate the service file
-      process.env = { ...originalEnv };
-      console.log('CONSTRUCTOR beforeEach: process.env reset.');
     });
 
     afterEach(() => {
       // Restore original environment variables
       vi.unstubAllEnvs();
-      process.env = originalEnv;
-      console.log('CONSTRUCTOR afterEach: process.env restored.');
     });
 
     it('should throw an error if GEMINI_API_KEY is not set in a non-test environment', async () => {
-      console.log("TEST START: 'should throw an error if GEMINI_API_KEY is not set...'");
-      console.log(
-        `PRE-TEST ENV: NODE_ENV=${process.env.NODE_ENV}, VITEST_POOL_ID=${process.env.VITEST_POOL_ID}`,
-      );
       // Simulate a non-test environment
-      process.env.NODE_ENV = 'production';
-      delete process.env.GEMINI_API_KEY;
-      delete process.env.VITEST_POOL_ID;
-      console.log(
-        `POST-MANIPULATION ENV: NODE_ENV=${process.env.NODE_ENV}, VITEST_POOL_ID=${process.env.VITEST_POOL_ID}`,
-      );
+      vi.stubEnv('NODE_ENV', 'production');
+      vi.stubEnv('GEMINI_API_KEY', '');
+      vi.stubEnv('VITEST_POOL_ID', '');
 
       let error: Error | undefined;
       // Dynamically import the class to re-evaluate the constructor logic
       try {
-        console.log('Attempting to import and instantiate AIService which is expected to throw...');
         const { AIService } = await import('./aiService.server');
         new AIService(mockLoggerInstance);
       } catch (e) {
-        console.log('Successfully caught an error during instantiation.');
         error = e as Error;
       }
       expect(error).toBeInstanceOf(Error);
@@ -183,8 +169,8 @@ describe('AI Service (Server)', () => {
 
     it('should use a mock placeholder if API key is missing in a test environment', async () => {
       // Arrange: Simulate a test environment without an API key
-      process.env.NODE_ENV = 'test';
-      delete process.env.GEMINI_API_KEY;
+      vi.stubEnv('NODE_ENV', 'test');
+      vi.stubEnv('GEMINI_API_KEY', '');
 
       // Act: Dynamically import and instantiate the service
       const { AIService } = await import('./aiService.server');
@@ -200,7 +186,7 @@ describe('AI Service (Server)', () => {
     });
 
     it('should use the adapter to call generateContent when using real GoogleGenAI client', async () => {
-      process.env.GEMINI_API_KEY = 'test-key';
+      vi.stubEnv('GEMINI_API_KEY', 'test-key');
       // We need to force the constructor to use the real client logic, not the injected mock.
       // So we instantiate AIService without passing aiClient.
 
@@ -222,7 +208,7 @@ describe('AI Service (Server)', () => {
     });
 
     it('should throw error if adapter is called without content', async () => {
-      process.env.GEMINI_API_KEY = 'test-key';
+      vi.stubEnv('GEMINI_API_KEY', 'test-key');
       vi.resetModules();
       const { AIService } = await import('./aiService.server');
       const service = new AIService(mockLoggerInstance);
@@ -235,16 +221,14 @@ describe('AI Service (Server)', () => {
   });
 
   describe('Model Fallback Logic', () => {
-    const originalEnv = process.env;
-
     beforeEach(() => {
       vi.unstubAllEnvs();
-      process.env = { ...originalEnv, GEMINI_API_KEY: 'test-key' };
+      vi.stubEnv('GEMINI_API_KEY', 'test-key');
       vi.resetModules(); // Re-import to use the new env var and re-instantiate the service
+      mockGenerateContent.mockReset();
     });
 
     afterEach(() => {
-      process.env = originalEnv;
       vi.unstubAllEnvs();
     });
 
@@ -276,8 +260,8 @@ describe('AI Service (Server)', () => {
       });
 
       // Check second call
-      expect(mockGenerateContent).toHaveBeenNthCalledWith(2, { // The second model in the list is 'gemini-2.5-flash'
-        model: 'gemini-2.5-flash',
+      expect(mockGenerateContent).toHaveBeenNthCalledWith(2, { // The second model in the list is 'gemini-2.5-pro'
+        model: 'gemini-2.5-pro',
         ...request,
       });
 
@@ -319,41 +303,174 @@ describe('AI Service (Server)', () => {
       const { logger } = await import('./logger.server');
       const serviceWithFallback = new AIService(logger);
 
-      const quotaError1 = new Error('Quota exhausted for model 1');
-      const quotaError2 = new Error('429 Too Many Requests for model 2');
-      const quotaError3 = new Error('RESOURCE_EXHAUSTED for model 3');
+      // Access private property for testing purposes to ensure test stays in sync with implementation
+      const models = (serviceWithFallback as any).models as string[];
+      // Use a quota error to trigger the fallback logic for each model
+      const errors = models.map((model, i) => new Error(`Quota error for model ${model} (${i})`));
+      const lastError = errors[errors.length - 1];
 
-      mockGenerateContent
-        .mockRejectedValueOnce(quotaError1)
-        .mockRejectedValueOnce(quotaError2)
-        .mockRejectedValueOnce(quotaError3);
+      // Dynamically setup mocks
+      errors.forEach((err) => {
+        mockGenerateContent.mockRejectedValueOnce(err);
+      });
 
       const request = { contents: [{ parts: [{ text: 'test prompt' }] }] };
 
       // Act & Assert
       await expect((serviceWithFallback as any).aiClient.generateContent(request)).rejects.toThrow(
-        quotaError3,
+        lastError,
       );
 
-      expect(mockGenerateContent).toHaveBeenCalledTimes(3);
-      expect(mockGenerateContent).toHaveBeenNthCalledWith(1, { // The first model in the list is now 'gemini-3-flash-preview'
-        model: 'gemini-3-flash-preview',
-        ...request,
-      });
-      expect(mockGenerateContent).toHaveBeenNthCalledWith(2, { // The second model in the list is 'gemini-2.5-flash'
-        model: 'gemini-2.5-flash',
-        ...request,
-      });
-      expect(mockGenerateContent).toHaveBeenNthCalledWith(3, { // The third model in the list is 'gemini-2.5-flash-lite'
-        model: 'gemini-2.5-flash-lite',
-        ...request,
+      expect(mockGenerateContent).toHaveBeenCalledTimes(models.length);
+
+      models.forEach((model, index) => {
+        expect(mockGenerateContent).toHaveBeenNthCalledWith(index + 1, {
+          model: model,
+          ...request,
+        });
       });
 
       expect(logger.error).toHaveBeenCalledWith(
-        { lastError: quotaError3 },
+        { lastError },
         '[AIService Adapter] All AI models failed. Throwing last known error.',
       );
     });
+
+    it('should use lite models and throw the last error if all lite models fail', async () => {
+      // Arrange
+      const { AIService } = await import('./aiService.server');
+      const { logger } = await import('./logger.server');
+      // We instantiate with the real logger to test the production fallback logic
+      const serviceWithFallback = new AIService(logger);
+
+      // Access private property for testing purposes
+      const modelsLite = (serviceWithFallback as any).models_lite as string[];
+      // Use a quota error to trigger the fallback logic for each model
+      const errors = modelsLite.map((model, i) => new Error(`Quota error for lite model ${model} (${i})`));
+      const lastError = errors[errors.length - 1];
+
+      // Dynamically setup mocks
+      errors.forEach((err) => {
+        mockGenerateContent.mockRejectedValueOnce(err);
+      });
+
+      const request = {
+        contents: [{ parts: [{ text: 'test prompt' }] }],
+        useLiteModels: true, // This is the key to trigger the lite model list
+      };
+      // The adapter strips `useLiteModels` before calling the underlying client,
+      // so we prepare the expected request shape for our assertions.
+      const { useLiteModels, ...apiReq } = request;
+
+      // Act & Assert
+      // Expect the entire operation to reject with the error from the very last model attempt.
+      await expect((serviceWithFallback as any).aiClient.generateContent(request)).rejects.toThrow(
+        lastError,
+      );
+
+      // Verify that all lite models were attempted in the correct order.
+      expect(mockGenerateContent).toHaveBeenCalledTimes(modelsLite.length);
+
+      modelsLite.forEach((model, index) => {
+        expect(mockGenerateContent).toHaveBeenNthCalledWith(index + 1, {
+          model: model,
+          ...apiReq,
+        });
+      });
+    });
+
+    it('should dynamically try the next model if the first one fails and succeed if the second one works', async () => {
+      // Arrange
+      const { AIService } = await import('./aiService.server');
+      const { logger } = await import('./logger.server');
+      const serviceWithFallback = new AIService(logger);
+
+      // Access private property for testing purposes
+      const models = (serviceWithFallback as any).models as string[];
+      // Ensure we have enough models to test fallback
+      expect(models.length).toBeGreaterThanOrEqual(2);
+
+      const error1 = new Error('Quota exceeded for model 1');
+      const successResponse = { text: 'Success', candidates: [] };
+
+      mockGenerateContent
+        .mockRejectedValueOnce(error1)
+        .mockResolvedValueOnce(successResponse);
+
+      const request = { contents: [{ parts: [{ text: 'test prompt' }] }] };
+
+      // Act
+      const result = await (serviceWithFallback as any).aiClient.generateContent(request);
+
+      // Assert
+      expect(result).toEqual(successResponse);
+      expect(mockGenerateContent).toHaveBeenCalledTimes(2);
+
+      expect(mockGenerateContent).toHaveBeenNthCalledWith(1, {
+        model: models[0],
+        ...request,
+      });
+      expect(mockGenerateContent).toHaveBeenNthCalledWith(2, {
+        model: models[1],
+        ...request,
+      });
+
+      expect(logger.warn).toHaveBeenCalledWith(
+        expect.stringContaining(`Model '${models[0]}' failed`),
+      );
+    });
+
+    it('should retry on a 429 error and succeed on the next model', async () => {
+      // Arrange
+      const { AIService } = await import('./aiService.server');
+      const { logger } = await import('./logger.server');
+      const serviceWithFallback = new AIService(logger);
+      const models = (serviceWithFallback as any).models as string[];
+
+      const retriableError = new Error('429 Too Many Requests');
+      const successResponse = { text: 'Success from second model', candidates: [] };
+
+      mockGenerateContent
+        .mockRejectedValueOnce(retriableError)
+        .mockResolvedValueOnce(successResponse);
+
+      const request = { contents: [{ parts: [{ text: 'test prompt' }] }] };
+
+      // Act
+      const result = await (serviceWithFallback as any).aiClient.generateContent(request);
+
+      // Assert
+      expect(result).toEqual(successResponse);
+      expect(mockGenerateContent).toHaveBeenCalledTimes(2);
+      expect(mockGenerateContent).toHaveBeenNthCalledWith(1, { model: models[0], ...request });
+      expect(mockGenerateContent).toHaveBeenNthCalledWith(2, { model: models[1], ...request });
+      expect(logger.warn).toHaveBeenCalledWith(expect.stringContaining(`Model '${models[0]}' failed due to quota/rate limit.`));
+    });
+
+    it('should fail immediately on a 400 Bad Request error without retrying', async () => {
+      // Arrange
+      const { AIService } = await import('./aiService.server');
+      const { logger } = await import('./logger.server');
+      const serviceWithFallback = new AIService(logger);
+      const models = (serviceWithFallback as any).models as string[];
+
+      const nonRetriableError = new Error('400 Bad Request: Invalid input');
+      mockGenerateContent.mockRejectedValueOnce(nonRetriableError);
+
+      const request = { contents: [{ parts: [{ text: 'test prompt' }] }] };
+
+      // Act & Assert
+      await expect((serviceWithFallback as any).aiClient.generateContent(request)).rejects.toThrow(nonRetriableError);
+
+      expect(mockGenerateContent).toHaveBeenCalledTimes(1);
+      expect(mockGenerateContent).toHaveBeenCalledWith({ model: models[0], ...request });
+      expect(logger.error).toHaveBeenCalledWith(
+        { error: nonRetriableError },
+        `[AIService Adapter] Model '${models[0]}' failed with a non-retriable error.`,
+      );
+      // Ensure it didn't log a warning about trying the next model
+      expect(logger.warn).not.toHaveBeenCalledWith(expect.stringContaining('Trying next model'));
+    });
   });
 
   describe('extractItemsFromReceiptImage', () => {
@@ -783,7 +900,7 @@ describe('AI Service (Server)', () => {
     } as UserProfile;
 
     it('should throw DuplicateFlyerError if flyer already exists', async () => {
-      vi.mocked(dbModule.flyerRepo.findFlyerByChecksum).mockResolvedValue({ flyer_id: 99 } as any);
+      vi.mocked(dbModule.flyerRepo.findFlyerByChecksum).mockResolvedValue({ flyer_id: 99, checksum: 'checksum123', file_name: 'test.pdf', image_url: '/flyer-images/test.pdf', icon_url: '/flyer-images/icons/test.webp', store_id: 1, status: 'processed', item_count: 0, created_at: new Date().toISOString(), updated_at: new Date().toISOString() });
 
       await expect(
         aiServiceInstance.enqueueFlyerProcessing(
@@ -798,7 +915,7 @@ describe('AI Service (Server)', () => {
 
     it('should enqueue job with user address if profile exists', async () => {
       vi.mocked(dbModule.flyerRepo.findFlyerByChecksum).mockResolvedValue(undefined);
-      vi.mocked(flyerQueue.add).mockResolvedValue({ id: 'job123' } as any);
+      vi.mocked(flyerQueue.add).mockResolvedValue({ id: 'job123' } as unknown as Job);
 
       const result = await aiServiceInstance.enqueueFlyerProcessing(
         mockFile,
@@ -821,7 +938,7 @@ describe('AI Service (Server)', () => {
 
     it('should enqueue job without address if profile is missing', async () => {
       vi.mocked(dbModule.flyerRepo.findFlyerByChecksum).mockResolvedValue(undefined);
-      vi.mocked(flyerQueue.add).mockResolvedValue({ id: 'job456' } as any);
+      vi.mocked(flyerQueue.add).mockResolvedValue({ id: 'job456' } as unknown as Job);
 
       await aiServiceInstance.enqueueFlyerProcessing(
         mockFile,
@@ -850,7 +967,7 @@ describe('AI Service (Server)', () => {
     const mockProfile = { user: { user_id: 'u1' } } as UserProfile;
 
     beforeEach(() => {
-      // Default success mocks
+      // Default success mocks. Use createMockFlyer for a more complete mock.
       vi.mocked(dbModule.flyerRepo.findFlyerByChecksum).mockResolvedValue(undefined);
       vi.mocked(generateFlyerIcon).mockResolvedValue('icon.jpg');
       vi.mocked(createFlyerAndItems).mockResolvedValue({
@@ -887,7 +1004,7 @@ describe('AI Service (Server)', () => {
     });
 
     it('should throw DuplicateFlyerError if checksum exists', async () => {
-      vi.mocked(dbModule.flyerRepo.findFlyerByChecksum).mockResolvedValue({ flyer_id: 55 } as any);
+      vi.mocked(dbModule.flyerRepo.findFlyerByChecksum).mockResolvedValue(createMockFlyer({ flyer_id: 55 }));
       const body = { checksum: 'dup-sum' };
 
       await expect(

src/services/aiService.server.ts

@@ -62,6 +62,7 @@ interface IAiClient {
   generateContent(request: {
     contents: Content[];
     tools?: Tool[];
+    useLiteModels?: boolean;
   }): Promise<GenerateContentResponse>;
 }
 
@@ -93,7 +94,8 @@ export class AIService {
   // The fallback list is ordered by preference (speed/cost vs. power).
   // We try the fastest models first, then the more powerful 'pro' model as a high-quality fallback,
   // and finally the 'lite' model as a last resort.
-  private readonly models = [ 'gemini-3-flash-preview', 'gemini-2.5-flash', 'gemini-2.5-flash-lite'];
+  private readonly models = [ 'gemini-3-flash-preview','gemini-2.5-pro', 'gemini-2.5-flash', 'gemini-2.5-flash-lite','gemini-2.0-flash-001','gemini-2.0-flash','gemini-2.0-flash-exp','gemini-2.0-flash-lite-001','gemini-2.0-flash-lite', 'gemma-3-27b-it', 'gemma-3-12b-it'];
+  private readonly models_lite = ["gemma-3-4b-it", "gemma-3-2b-it", "gemma-3-1b-it"];
 
   constructor(logger: Logger, aiClient?: IAiClient, fs?: IFileSystem) {
     this.logger = logger;
@@ -156,7 +158,9 @@ export class AIService {
                 throw new Error('AIService.generateContent requires at least one content element.');
               }
 
-              return this._generateWithFallback(genAI, request);
+              const { useLiteModels, ...apiReq } = request;
+              const models = useLiteModels ? this.models_lite : this.models;
+              return this._generateWithFallback(genAI, apiReq, models);
             },
           }
         : {
@@ -194,10 +198,11 @@ export class AIService {
   private async _generateWithFallback(
     genAI: GoogleGenAI,
     request: { contents: Content[]; tools?: Tool[] },
+    models: string[] = this.models,
   ): Promise<GenerateContentResponse> {
     let lastError: Error | null = null;
 
-    for (const modelName of this.models) {
+    for (const modelName of models) {
       try {
         this.logger.info(
           `[AIService Adapter] Attempting to generate content with model: ${modelName}`,
@@ -668,6 +673,33 @@ export class AIService {
     }
   }
 
+  /**
+   * Generates a simple recipe suggestion based on a list of ingredients.
+   * Uses the 'lite' models for faster/cheaper generation.
+   * @param ingredients List of available ingredients.
+   * @param logger Logger instance.
+   * @returns The recipe suggestion text.
+   */
+  async generateRecipeSuggestion(
+    ingredients: string[],
+    logger: Logger = this.logger,
+  ): Promise<string | null> {
+    const prompt = `Suggest a simple recipe using these ingredients: ${ingredients.join(', ')}. Keep it brief.`;
+
+    try {
+      const result = await this.rateLimiter(() =>
+        this.aiClient.generateContent({
+          contents: [{ parts: [{ text: prompt }] }],
+          useLiteModels: true,
+        }),
+      );
+      return result.text || null;
+    } catch (error) {
+      logger.error({ err: error }, 'Failed to generate recipe suggestion');
+      return null;
+    }
+  }
+
   /**
    * SERVER-SIDE FUNCTION
    * Uses Google Maps grounding to find nearby stores and plan a shopping trip.

src/services/apiClient.test.ts

@@ -543,6 +543,13 @@ describe('API Client', () => {
       await apiClient.deleteRecipe(recipeId);
       expect(capturedUrl?.pathname).toBe(`/api/recipes/${recipeId}`);
     });
+
+    it('suggestRecipe should send a POST request with ingredients', async () => {
+      const ingredients = ['chicken', 'rice'];
+      await apiClient.suggestRecipe(ingredients);
+      expect(capturedUrl?.pathname).toBe('/api/recipes/suggest');
+      expect(capturedBody).toEqual({ ingredients });
+    });
   });
 
   describe('User Profile and Settings API Functions', () => {
@@ -933,7 +940,7 @@ describe('API Client', () => {
 
     it('logSearchQuery should send a POST request with query data', async () => {
       const queryData = createMockSearchQueryPayload({ query_text: 'apples', result_count: 10, was_successful: true });
-      await apiClient.logSearchQuery(queryData);
+      await apiClient.logSearchQuery(queryData as any);
       expect(capturedUrl?.pathname).toBe('/api/search/log');
       expect(capturedBody).toEqual(queryData);
     });
@@ -960,7 +967,7 @@ describe('API Client', () => {
         result_count: 0,
         was_successful: false,
       });
-      await apiClient.logSearchQuery(queryData);
+      await apiClient.logSearchQuery(queryData as any);
       expect(logger.warn).toHaveBeenCalledWith('Failed to log search query', { error: apiError });
     });
   });

src/services/apiClient.ts

@@ -636,6 +636,20 @@ export const addRecipeComment = (
 ): Promise<Response> =>
   authedPost(`/recipes/${recipeId}/comments`, { content, parentCommentId }, { tokenOverride });
 
+/**
+ * Requests a simple recipe suggestion from the AI based on a list of ingredients.
+ * @param ingredients An array of ingredient strings.
+ * @param tokenOverride Optional token for testing.
+ * @returns A promise that resolves to the API response containing the suggestion.
+ */
+export const suggestRecipe = (
+  ingredients: string[],
+  tokenOverride?: string,
+): Promise<Response> => {
+  // This is a protected endpoint, so we use authedPost.
+  return authedPost('/recipes/suggest', { ingredients }, { tokenOverride });
+};
+
 /**
  * Deletes a recipe.
  * @param recipeId The ID of the recipe to delete.

src/services/authService.test.ts

@@ -1,4 +1,5 @@
-import { describe, it, expect, vi, beforeEach } from 'vitest';
+// src/services/authService.test.ts
+import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
 import type { UserProfile } from '../types';
 import type * as jsonwebtoken from 'jsonwebtoken';
 
@@ -17,6 +18,11 @@ describe('AuthService', () => {
     user_id: 'user-123',
     email: 'test@example.com',
     password_hash: 'hashed-password',
+    failed_login_attempts: 0,
+    last_failed_login: null,
+    created_at: new Date().toISOString(),
+    updated_at: new Date().toISOString(),
+    refresh_token: null,
   };
   const mockUserProfile: UserProfile = {
     user: mockUser,
@@ -28,8 +34,8 @@ describe('AuthService', () => {
     vi.resetModules();
 
     // Set environment variables before any modules are imported
-    process.env.JWT_SECRET = 'test-secret';
-    process.env.FRONTEND_URL = 'http://localhost:3000';
+    vi.stubEnv('JWT_SECRET', 'test-secret');
+    vi.stubEnv('FRONTEND_URL', 'http://localhost:3000');
 
     // Mock all dependencies before dynamically importing the service
     // Core modules like bcrypt, jsonwebtoken, and crypto are now mocked globally in tests-setup-unit.ts
@@ -72,6 +78,10 @@ describe('AuthService', () => {
     UniqueConstraintError = (await import('./db/errors.db')).UniqueConstraintError;
   });
 
+  afterEach(() => {
+    vi.unstubAllEnvs();
+  });
+
   describe('registerUser', () => {
     it('should successfully register a new user', async () => {
       vi.mocked(bcrypt.hash).mockImplementation(async () => 'hashed-password');
@@ -205,7 +215,7 @@ describe('AuthService', () => {
 
   describe('resetPassword', () => {
     it('should process password reset for existing user', async () => {
-      vi.mocked(userRepo.findUserByEmail).mockResolvedValue(mockUser as any);
+      vi.mocked(userRepo.findUserByEmail).mockResolvedValue(mockUser);
       vi.mocked(bcrypt.hash).mockImplementation(async () => 'hashed-token');
 
       const result = await authService.resetPassword('test@example.com', reqLog);
@@ -284,7 +294,7 @@ describe('AuthService', () => {
 
   describe('getUserByRefreshToken', () => {
     it('should return user profile if token exists', async () => {
-      vi.mocked(userRepo.findUserByRefreshToken).mockResolvedValue({ user_id: 'user-123' } as any);
+      vi.mocked(userRepo.findUserByRefreshToken).mockResolvedValue({ user_id: 'user-123', email: 'test@example.com', created_at: new Date().toISOString(), updated_at: new Date().toISOString() });
       vi.mocked(userRepo.findUserProfileById).mockResolvedValue(mockUserProfile);
 
       const result = await authService.getUserByRefreshToken('valid-token', reqLog);
@@ -318,7 +328,7 @@ describe('AuthService', () => {
 
   describe('refreshAccessToken', () => {
     it('should return new access token if user found', async () => {
-      vi.mocked(userRepo.findUserByRefreshToken).mockResolvedValue({ user_id: 'user-123' } as any);
+      vi.mocked(userRepo.findUserByRefreshToken).mockResolvedValue({ user_id: 'user-123', email: 'test@example.com', created_at: new Date().toISOString(), updated_at: new Date().toISOString() });
       vi.mocked(userRepo.findUserProfileById).mockResolvedValue(mockUserProfile);
       // FIX: The global mock for jsonwebtoken provides a `default` export.
       // The code under test (`authService`) uses `import jwt from 'jsonwebtoken'`, so it gets the default export.

src/services/db/admin.db.test.ts

@@ -203,7 +203,11 @@ describe('Admin DB Service', () => {
         .mockRejectedValueOnce(new Error('DB Read Error'));
 
       // The Promise.all should reject, and the function should re-throw the error
-      await expect(adminRepo.getApplicationStats(mockLogger)).rejects.toThrow('DB Read Error');
+      // The handleDbError function wraps the original error in a new one with a default message,
+      // so we should test for that specific message.
+      await expect(adminRepo.getApplicationStats(mockLogger)).rejects.toThrow(
+        'Failed to retrieve application statistics.',
+      );
       expect(mockLogger.error).toHaveBeenCalledWith(
         { err: expect.any(Error) },
         'Database error in getApplicationStats',
@@ -277,7 +281,7 @@ describe('Admin DB Service', () => {
         'Failed to get most frequent sale items.',
       );
       expect(mockLogger.error).toHaveBeenCalledWith(
-        { err: dbError },
+        { err: dbError, days: 30, limit: 10 },
         'Database error in getMostFrequentSaleItems',
       );
     });
@@ -688,7 +692,9 @@ describe('Admin DB Service', () => {
     it('should re-throw a generic error if the database query fails for other reasons', async () => {
       const dbError = new Error('DB Error');
       mockDb.query.mockRejectedValue(dbError);
-      await expect(adminRepo.updateUserRole('1', 'admin', mockLogger)).rejects.toThrow('DB Error');
+      await expect(adminRepo.updateUserRole('1', 'admin', mockLogger)).rejects.toThrow(
+        'Failed to update user role.',
+      );
       expect(mockLogger.error).toHaveBeenCalledWith(
         { err: dbError, userId: '1', role: 'admin' },
         'Database error in updateUserRole',

src/services/db/budget.db.test.ts

@@ -249,6 +249,17 @@ describe('Budget DB Service', () => {
       expect(result).toEqual(mockUpdatedBudget);
     });
 
+    it('should prevent a user from updating a budget they do not own', async () => {
+      // Arrange: Mock the query to return 0 rows affected
+      mockDb.query.mockResolvedValue({ rows: [], rowCount: 0 });
+
+      // Act & Assert: Attempt to update with a different user ID should throw an error.
+      await expect(
+        budgetRepo.updateBudget(1, 'another-user', { name: 'Updated Groceries' }, mockLogger),
+      ).rejects.toThrow('Budget not found or user does not have permission to update.');
+    });
+
+
     it('should throw an error if no rows are updated', async () => {
       // Arrange: Mock the query to return 0 rows affected
       mockDb.query.mockResolvedValue({ rows: [], rowCount: 0 });

src/services/db/deals.db.test.ts

@@ -82,15 +82,15 @@ describe('Deals DB Service', () => {
       expect(result).toEqual([]);
     });
 
-    it('should re-throw the error if the database query fails', async () => {
+    it('should throw a generic error if the database query fails', async () => {
       const dbError = new Error('DB Connection Error');
       mockDb.query.mockRejectedValue(dbError);
 
       await expect(dealsRepo.findBestPricesForWatchedItems('user-1', mockLogger)).rejects.toThrow(
-        dbError,
+        'Failed to find best prices for watched items.',
       );
       expect(mockLogger.error).toHaveBeenCalledWith(
-        { err: dbError },
+        { err: dbError, userId: 'user-1' },
         'Database error in findBestPricesForWatchedItems',
       );
     });

src/services/db/flyer.db.test.ts

@@ -51,67 +51,72 @@ describe('Flyer DB Service', () => {
 
   describe('findOrCreateStore', () => {
     it('should find an existing store and return its ID', async () => {
-      mockPoolInstance.query.mockResolvedValue({ rows: [{ store_id: 1 }] });
+      // 1. INSERT...ON CONFLICT does nothing. 2. SELECT finds the store.
+      mockPoolInstance.query
+        .mockResolvedValueOnce({ rows: [], rowCount: 0 })
+        .mockResolvedValueOnce({ rows: [{ store_id: 1 }] });
+
       const result = await flyerRepo.findOrCreateStore('Existing Store', mockLogger);
       expect(result).toBe(1);
+      expect(mockPoolInstance.query).toHaveBeenCalledTimes(2);
       expect(mockPoolInstance.query).toHaveBeenCalledWith(
-        expect.stringContaining('SELECT store_id FROM public.stores WHERE name = $1'),
+        'INSERT INTO public.stores (name) VALUES ($1) ON CONFLICT (name) DO NOTHING',
+        ['Existing Store'],
+      );
+      expect(mockPoolInstance.query).toHaveBeenCalledWith(
+        'SELECT store_id FROM public.stores WHERE name = $1',
         ['Existing Store'],
       );
     });
 
-    it('should create a new store if it does not exist', async () => {
+    it('should create a new store if it does not exist and return its ID', async () => {
+      // 1. INSERT...ON CONFLICT creates the store. 2. SELECT finds it.
       mockPoolInstance.query
-        .mockResolvedValueOnce({ rows: [] }) // First SELECT finds nothing
-        .mockResolvedValueOnce({ rows: [{ store_id: 2 }] })
+        .mockResolvedValueOnce({ rows: [], rowCount: 1 }) // INSERT affects 1 row
+        .mockResolvedValueOnce({ rows: [{ store_id: 2 }] }); // SELECT finds the new store
+
       const result = await flyerRepo.findOrCreateStore('New Store', mockLogger);
       expect(result).toBe(2);
+      expect(mockPoolInstance.query).toHaveBeenCalledTimes(2);
       expect(mockPoolInstance.query).toHaveBeenCalledWith(
-        expect.stringContaining('INSERT INTO public.stores (name) VALUES ($1) RETURNING store_id'),
+        'INSERT INTO public.stores (name) VALUES ($1) ON CONFLICT (name) DO NOTHING',
+        ['New Store'],
+      );
+      expect(mockPoolInstance.query).toHaveBeenCalledWith(
+        'SELECT store_id FROM public.stores WHERE name = $1',
         ['New Store'],
       );
     });
 
-    it('should handle race condition where store is created between SELECT and INSERT', async () => {
-      const uniqueConstraintError = new Error('duplicate key value violates unique constraint');
-      (uniqueConstraintError as Error & { code: string }).code = '23505';
-
-      mockPoolInstance.query
-        .mockResolvedValueOnce({ rows: [] }) // First SELECT finds nothing
-        .mockRejectedValueOnce(uniqueConstraintError) // INSERT fails due to race condition
-        .mockResolvedValueOnce({ rows: [{ store_id: 3 }] }); // Second SELECT finds the store
-
-      const result = await flyerRepo.findOrCreateStore('Racy Store', mockLogger);
-    expect(result).toBe(3);
-      //expect(mockDb.query).toHaveBeenCalledTimes(3);
-        });
-
-     it('should throw an error if the database query fails', async () => {
+    it('should throw an error if the database query fails', async () => {
       const dbError = new Error('DB Error');
       mockPoolInstance.query.mockRejectedValue(dbError);
+      // The new implementation uses handleDbError, which will throw a generic Error with the default message.
       await expect(flyerRepo.findOrCreateStore('Any Store', mockLogger)).rejects.toThrow(
         'Failed to find or create store in database.',
       );
+      // handleDbError also logs the error.
       expect(mockLogger.error).toHaveBeenCalledWith(
         { err: dbError, storeName: 'Any Store' },
         'Database error in findOrCreateStore',
       );
     });
 
-    it('should throw an error if race condition recovery fails', async () => {
-      const uniqueConstraintError = new Error('duplicate key value violates unique constraint');
-      (uniqueConstraintError as Error & { code: string }).code = '23505';
-
+    it('should throw an error if store is not found after upsert (edge case)', async () => {
+      // This simulates a very unlikely scenario where the store is deleted between the
+      // INSERT...ON CONFLICT and the subsequent SELECT.
       mockPoolInstance.query
-        .mockResolvedValueOnce({ rows: [] }) // First SELECT
-        .mockRejectedValueOnce(uniqueConstraintError) // INSERT fails
-        .mockRejectedValueOnce(new Error('Second select fails')); // Recovery SELECT fails
+        .mockResolvedValueOnce({ rows: [], rowCount: 1 }) // INSERT succeeds
+        .mockResolvedValueOnce({ rows: [] }); // SELECT finds nothing
 
-      await expect(flyerRepo.findOrCreateStore('Racy Store', mockLogger)).rejects.toThrow(
+      await expect(flyerRepo.findOrCreateStore('Weird Store', mockLogger)).rejects.toThrow(
         'Failed to find or create store in database.',
       );
       expect(mockLogger.error).toHaveBeenCalledWith(
-        { err: expect.any(Error), storeName: 'Racy Store' },
+        {
+          err: new Error('Failed to find store immediately after upsert operation.'),
+          storeName: 'Weird Store',
+        },
         'Database error in findOrCreateStore',
       );
     });
@@ -274,7 +279,7 @@ describe('Flyer DB Service', () => {
         ForeignKeyConstraintError,
       );
       await expect(flyerRepo.insertFlyerItems(999, itemsData, mockLogger)).rejects.toThrow(
-        'The specified flyer does not exist.',
+        'The specified flyer, category, master item, or product does not exist.',
       );
       expect(mockLogger.error).toHaveBeenCalledWith(
         { err: dbError, flyerId: 999 },
@@ -285,10 +290,10 @@ describe('Flyer DB Service', () => {
     it('should throw a generic error if the database query fails', async () => {
       const dbError = new Error('DB Connection Error');
       mockPoolInstance.query.mockRejectedValue(dbError);
-      // The implementation now re-throws the original error, so we should expect that.
+      // The implementation wraps the error using handleDbError
       await expect(
         flyerRepo.insertFlyerItems(1, [{ item: 'Test' } as FlyerItemInsert], mockLogger),
-      ).rejects.toThrow(dbError);
+      ).rejects.toThrow('An unknown error occurred while inserting flyer items.');
       expect(mockLogger.error).toHaveBeenCalledWith(
         { err: dbError, flyerId: 1 },
         'Database error in insertFlyerItems',
@@ -691,11 +696,7 @@ describe('Flyer DB Service', () => {
       );
 
       await expect(flyerRepo.deleteFlyer(999, mockLogger)).rejects.toThrow(
-        'Failed to delete flyer.',
-      );
-      expect(mockLogger.error).toHaveBeenCalledWith(
-        { err: expect.any(NotFoundError), flyerId: 999 },
-        'Database transaction error in deleteFlyer',
+        'Flyer with ID 999 not found.',
       );
     });
 

src/services/db/flyer.db.ts

@@ -28,46 +28,32 @@ export class FlyerRepository {
    * @returns A promise that resolves to the store's ID.
    */
   async findOrCreateStore(storeName: string, logger: Logger): Promise<number> {
-    // Note: This method should be called within a transaction if the caller
-    // needs to ensure atomicity with other operations.
     try {
-      // First, try to find the store.
-      let result = await this.db.query<{ store_id: number }>(
+      // Atomically insert the store if it doesn't exist. This is safe from race conditions.
+      await this.db.query(
+        'INSERT INTO public.stores (name) VALUES ($1) ON CONFLICT (name) DO NOTHING',
+        [storeName],
+      );
+
+      // Now, the store is guaranteed to exist, so we can safely select its ID.
+      const result = await this.db.query<{ store_id: number }>(
         'SELECT store_id FROM public.stores WHERE name = $1',
         [storeName],
       );
 
-      if (result.rows.length > 0) {
-        return result.rows[0].store_id;
-      } else {
-        // If not found, create it.
-        result = await this.db.query<{ store_id: number }>(
-          'INSERT INTO public.stores (name) VALUES ($1) RETURNING store_id',
-          [storeName],
-        );
-        return result.rows[0].store_id;
+      // This case should be virtually impossible if the INSERT...ON CONFLICT logic is correct,
+      // as it would mean the store was deleted between the two queries. We throw an error to be safe.
+      if (result.rows.length === 0) {
+        throw new Error('Failed to find store immediately after upsert operation.');
       }
+
+      return result.rows[0].store_id;
     } catch (error) {
-      // Check for a unique constraint violation on name, which could happen in a race condition
-      // if two processes try to create the same store at the same time.
-      if (error instanceof Error && 'code' in error && error.code === '23505') {
-        try {
-          logger.warn(
-            { storeName },
-            `Race condition avoided: Store was created by another process. Refetching.`,
-          );
-          const result = await this.db.query<{ store_id: number }>(
-            'SELECT store_id FROM public.stores WHERE name = $1',
-            [storeName],
-          );
-          if (result.rows.length > 0) return result.rows[0].store_id;
-        } catch (recoveryError) {
-          // If recovery fails, log a warning and fall through to the generic error handler
-          logger.warn({ err: recoveryError, storeName }, 'Race condition recovery failed');
-        }
-      }
-      logger.error({ err: error, storeName }, 'Database error in findOrCreateStore');
-      throw new Error('Failed to find or create store in database.');
+      // Use the centralized error handler for any unexpected database errors.
+      handleDbError(error, logger, 'Database error in findOrCreateStore', { storeName }, {
+        // Any error caught here is unexpected, so we use a generic message.
+        defaultMessage: 'Failed to find or create store in database.',
+      });
     }
   }
 
@@ -97,16 +83,28 @@ export class FlyerRepository {
         flyerData.store_address, // $8
         flyerData.status, // $9
         flyerData.item_count, // $10
-        flyerData.uploaded_by, // $11
+        flyerData.uploaded_by ?? null, // $11
       ];
 
       const result = await this.db.query<Flyer>(query, values);
       return result.rows[0];
     } catch (error) {
+      const errorMessage = error instanceof Error ? error.message : '';
+      let checkMsg = 'A database check constraint failed.';
+
+      if (errorMessage.includes('flyers_checksum_check')) {
+        checkMsg =
+          'The provided checksum is invalid or does not meet format requirements (e.g., must be a 64-character SHA-256 hash).';
+      } else if (errorMessage.includes('flyers_status_check')) {
+        checkMsg = 'Invalid status provided for flyer.';
+      } else if (errorMessage.includes('url_check')) {
+        checkMsg = 'Invalid URL format provided for image or icon.';
+      }
+
       handleDbError(error, logger, 'Database error in insertFlyer', { flyerData }, {
         uniqueMessage: 'A flyer with this checksum already exists.',
         fkMessage: 'The specified user or store for this flyer does not exist.',
-        checkMessage: 'Invalid status provided for flyer.',
+        checkMessage: checkMsg,
         defaultMessage: 'Failed to insert flyer into database.',
       });
     }

src/services/db/notification.db.test.ts

@@ -195,7 +195,7 @@ describe('Notification DB Service', () => {
         notificationRepo.createBulkNotifications(notificationsToCreate, mockLogger),
       ).rejects.toThrow(ForeignKeyConstraintError);
       expect(mockLogger.error).toHaveBeenCalledWith(
-        { err: dbError },
+        { err: dbError, notifications: notificationsToCreate },
         'Database error in createBulkNotifications',
       );
     });
@@ -208,7 +208,7 @@ describe('Notification DB Service', () => {
         notificationRepo.createBulkNotifications(notificationsToCreate, mockLogger),
       ).rejects.toThrow('Failed to create bulk notifications.');
       expect(mockLogger.error).toHaveBeenCalledWith(
-        { err: dbError },
+        { err: dbError, notifications: notificationsToCreate },
         'Database error in createBulkNotifications',
       );
     });
@@ -264,6 +264,16 @@ describe('Notification DB Service', () => {
     });
   });
 
+  describe('markNotificationAsRead - Ownership Check', () => {
+    it('should not mark a notification as read if the user does not own it', async () => {
+      mockPoolInstance.query.mockResolvedValue({ rowCount: 0 });
+
+      await expect(notificationRepo.markNotificationAsRead(1, 'wrong-user', mockLogger)).rejects.toThrow(
+        'Notification not found or user does not have permission.',
+      );
+    });
+  });
+
   describe('markAllNotificationsAsRead', () => {
     it('should execute an UPDATE query to mark all notifications as read for a user', async () => {
       mockPoolInstance.query.mockResolvedValue({ rowCount: 3 });

src/services/db/recipe.db.test.ts

@@ -268,6 +268,17 @@ describe('Recipe DB Service', () => {
       );
     });
   });
+   describe('deleteRecipe - Ownership Check', () => {
+    it('should not delete recipe if the user does not own it and is not an admin', async () => {
+      mockQuery.mockResolvedValue({ rowCount: 0 });
+
+      await expect(recipeRepo.deleteRecipe(1, 'wrong-user', false, mockLogger)).rejects.toThrow(
+        'Recipe not found or user does not have permission to delete.',
+      );
+    });
+
+  });
+
 
   describe('updateRecipe', () => {
     it('should execute an UPDATE query with the correct fields', async () => {
@@ -442,10 +453,6 @@ describe('Recipe DB Service', () => {
       await expect(recipeRepo.forkRecipe('user-123', 1, mockLogger)).rejects.toThrow(
         'Recipe is not public and cannot be forked.',
       );
-      expect(mockLogger.error).toHaveBeenCalledWith(
-        { err: dbError, userId: 'user-123', originalRecipeId: 1 },
-        'Database error in forkRecipe',
-      );
     });
 
     it('should throw a generic error if the database query fails', async () => {

src/services/db/recipe.db.ts

@@ -239,6 +239,10 @@ export class RecipeRepository {
       }
       return res.rows[0];
     } catch (error) {
+      // Explicitly re-throw the "No fields" error before it gets caught by the generic handler.
+      if (error instanceof Error && error.message === 'No fields provided to update.') {
+        throw error;
+      }
       handleDbError(error, logger, 'Database error in updateRecipe', { recipeId, userId, updates }, {
         defaultMessage: 'Failed to update recipe.',
       });

src/services/db/shopping.db.test.ts

@@ -190,13 +190,14 @@ describe('Shopping DB Service', () => {
 
       const result = await shoppingRepo.addShoppingListItem(
         1,
+        'user-1',
         { customItemName: 'Custom Item' },
         mockLogger,
       );
 
       expect(mockPoolInstance.query).toHaveBeenCalledWith(
         expect.stringContaining('INSERT INTO public.shopping_list_items'),
-        [1, null, 'Custom Item'],
+        [1, null, 'Custom Item', 'user-1'],
       );
       expect(result).toEqual(mockItem);
     });
@@ -205,11 +206,11 @@ describe('Shopping DB Service', () => {
       const mockItem = createMockShoppingListItem({ master_item_id: 123 });
       mockPoolInstance.query.mockResolvedValue({ rows: [mockItem] });
 
-      const result = await shoppingRepo.addShoppingListItem(1, { masterItemId: 123 }, mockLogger);
+      const result = await shoppingRepo.addShoppingListItem(1, 'user-1', { masterItemId: 123 }, mockLogger);
 
       expect(mockPoolInstance.query).toHaveBeenCalledWith(
         expect.stringContaining('INSERT INTO public.shopping_list_items'),
-        [1, 123, null],
+        [1, 123, null, 'user-1'],
       );
       expect(result).toEqual(mockItem);
     });
@@ -223,19 +224,20 @@ describe('Shopping DB Service', () => {
 
       const result = await shoppingRepo.addShoppingListItem(
         1,
+        'user-1',
         { masterItemId: 123, customItemName: 'Organic Apples' },
         mockLogger,
       );
 
       expect(mockPoolInstance.query).toHaveBeenCalledWith(
         expect.stringContaining('INSERT INTO public.shopping_list_items'),
-        [1, 123, 'Organic Apples'],
+        [1, 123, 'Organic Apples', 'user-1'],
       );
       expect(result).toEqual(mockItem);
     });
 
     it('should throw an error if both masterItemId and customItemName are missing', async () => {
-      await expect(shoppingRepo.addShoppingListItem(1, {}, mockLogger)).rejects.toThrow(
+      await expect(shoppingRepo.addShoppingListItem(1, 'user-1', {}, mockLogger)).rejects.toThrow(
         'Either masterItemId or customItemName must be provided.',
       );
     });
@@ -244,19 +246,19 @@ describe('Shopping DB Service', () => {
       const dbError = new Error('violates foreign key constraint');
       (dbError as Error & { code: string }).code = '23503';
       mockPoolInstance.query.mockRejectedValue(dbError);
-      await expect(
-        shoppingRepo.addShoppingListItem(999, { masterItemId: 999 }, mockLogger),
-      ).rejects.toThrow('Referenced list or item does not exist.');
+      await expect(shoppingRepo.addShoppingListItem(999, 'user-1', { masterItemId: 999 }, mockLogger)).rejects.toThrow(
+        'Referenced list or item does not exist.',
+      );
     });
 
     it('should throw a generic error if the database query fails', async () => {
       const dbError = new Error('DB Connection Error');
       mockPoolInstance.query.mockRejectedValue(dbError);
       await expect(
-        shoppingRepo.addShoppingListItem(1, { customItemName: 'Test' }, mockLogger),
+        shoppingRepo.addShoppingListItem(1, 'user-1', { customItemName: 'Test' }, mockLogger),
       ).rejects.toThrow('Failed to add item to shopping list.');
       expect(mockLogger.error).toHaveBeenCalledWith(
-        { err: dbError, listId: 1, item: { customItemName: 'Test' } },
+        { err: dbError, listId: 1, userId: 'user-1', item: { customItemName: 'Test' } },
         'Database error in addShoppingListItem',
       );
     });
@@ -269,13 +271,14 @@ describe('Shopping DB Service', () => {
 
       const result = await shoppingRepo.updateShoppingListItem(
         1,
+        'user-1',
         { is_purchased: true },
         mockLogger,
       );
 
       expect(mockPoolInstance.query).toHaveBeenCalledWith(
-        'UPDATE public.shopping_list_items SET is_purchased = $1 WHERE shopping_list_item_id = $2 RETURNING *',
-        [true, 1],
+        expect.stringContaining('UPDATE public.shopping_list_items sli'),
+        [true, 1, 'user-1'],
       );
       expect(result).toEqual(mockItem);
     });
@@ -285,11 +288,11 @@ describe('Shopping DB Service', () => {
       const mockItem = createMockShoppingListItem({ shopping_list_item_id: 1, ...updates });
       mockPoolInstance.query.mockResolvedValue({ rows: [mockItem], rowCount: 1 });
 
-      const result = await shoppingRepo.updateShoppingListItem(1, updates, mockLogger);
+      const result = await shoppingRepo.updateShoppingListItem(1, 'user-1', updates, mockLogger);
 
       expect(mockPoolInstance.query).toHaveBeenCalledWith(
-        'UPDATE public.shopping_list_items SET quantity = $1, is_purchased = $2, notes = $3 WHERE shopping_list_item_id = $4 RETURNING *',
-        [updates.quantity, updates.is_purchased, updates.notes, 1],
+        expect.stringContaining('UPDATE public.shopping_list_items sli'),
+        [updates.quantity, updates.is_purchased, updates.notes, 1, 'user-1'],
       );
       expect(result).toEqual(mockItem);
     });
@@ -297,13 +300,13 @@ describe('Shopping DB Service', () => {
     it('should throw an error if the item to update is not found', async () => {
       mockPoolInstance.query.mockResolvedValue({ rowCount: 0, rows: [], command: 'UPDATE' });
       await expect(
-        shoppingRepo.updateShoppingListItem(999, { quantity: 5 }, mockLogger),
+        shoppingRepo.updateShoppingListItem(999, 'user-1', { quantity: 5 }, mockLogger),
       ).rejects.toThrow('Shopping list item not found.');
     });
 
     it('should throw an error if no valid fields are provided to update', async () => {
       // The function should throw before even querying the database.
-      await expect(shoppingRepo.updateShoppingListItem(1, {}, mockLogger)).rejects.toThrow(
+      await expect(shoppingRepo.updateShoppingListItem(1, 'user-1', {}, mockLogger)).rejects.toThrow(
         'No valid fields to update.',
       );
     });
@@ -312,44 +315,65 @@ describe('Shopping DB Service', () => {
       const dbError = new Error('DB Connection Error');
       mockPoolInstance.query.mockRejectedValue(dbError);
       await expect(
-        shoppingRepo.updateShoppingListItem(1, { is_purchased: true }, mockLogger),
+        shoppingRepo.updateShoppingListItem(1, 'user-1', { is_purchased: true }, mockLogger),
       ).rejects.toThrow('Failed to update shopping list item.');
       expect(mockLogger.error).toHaveBeenCalledWith(
-        { err: dbError, itemId: 1, updates: { is_purchased: true } },
+        { err: dbError, itemId: 1, userId: 'user-1', updates: { is_purchased: true } },
         'Database error in updateShoppingListItem',
       );
     });
   });
 
+  describe('updateShoppingListItem - Ownership Check', () => {
+    it('should not update an item if the user does not own the shopping list', async () => {
+      mockPoolInstance.query.mockResolvedValue({ rowCount: 0 });
+
+      await expect(
+        shoppingRepo.updateShoppingListItem(1, 'wrong-user', { is_purchased: true }, mockLogger),
+      ).rejects.toThrow('Shopping list item not found.');
+    });
+  });
+
+
   describe('removeShoppingListItem', () => {
     it('should delete an item if rowCount is 1', async () => {
       mockPoolInstance.query.mockResolvedValue({ rowCount: 1, rows: [], command: 'DELETE' });
-      await expect(shoppingRepo.removeShoppingListItem(1, mockLogger)).resolves.toBeUndefined();
+      await expect(shoppingRepo.removeShoppingListItem(1, 'user-1', mockLogger)).resolves.toBeUndefined();
       expect(mockPoolInstance.query).toHaveBeenCalledWith(
-        'DELETE FROM public.shopping_list_items WHERE shopping_list_item_id = $1',
-        [1],
+        expect.stringContaining('DELETE FROM public.shopping_list_items sli'),
+        [1, 'user-1'],
       );
     });
 
     it('should throw an error if no rows are deleted (item not found)', async () => {
       mockPoolInstance.query.mockResolvedValue({ rowCount: 0, rows: [], command: 'DELETE' });
-      await expect(shoppingRepo.removeShoppingListItem(999, mockLogger)).rejects.toThrow(
-        'Shopping list item not found.',
+      await expect(shoppingRepo.removeShoppingListItem(999, 'user-1', mockLogger)).rejects.toThrow(
+        'Shopping list item not found or user does not have permission.',
       );
     });
 
     it('should throw a generic error if the database query fails', async () => {
       const dbError = new Error('DB Connection Error');
       mockPoolInstance.query.mockRejectedValue(dbError);
-      await expect(shoppingRepo.removeShoppingListItem(1, mockLogger)).rejects.toThrow(
+      await expect(shoppingRepo.removeShoppingListItem(1, 'user-1', mockLogger)).rejects.toThrow(
         'Failed to remove item from shopping list.',
       );
       expect(mockLogger.error).toHaveBeenCalledWith(
-        { err: dbError, itemId: 1 },
+        { err: dbError, itemId: 1, userId: 'user-1' },
         'Database error in removeShoppingListItem',
       );
     });
   });
+  describe('removeShoppingListItem - Ownership Check', () => {
+    it('should not remove an item if the user does not own the shopping list', async () => {
+      mockPoolInstance.query.mockResolvedValue({ rowCount: 0 });
+
+      await expect(shoppingRepo.removeShoppingListItem(1, 'wrong-user', mockLogger)).rejects.toThrow(
+        'Shopping list item not found or user does not have permission.',
+      );
+    });
+  });
+
 
   describe('completeShoppingList', () => {
     it('should call the complete_shopping_list database function', async () => {

src/services/db/shopping.db.ts

@@ -156,6 +156,7 @@ export class ShoppingRepository {
    */
   async addShoppingListItem(
     listId: number,
+    userId: string,
     item: { masterItemId?: number; customItemName?: string },
     logger: Logger,
   ): Promise<ShoppingListItem> {
@@ -165,13 +166,29 @@ export class ShoppingRepository {
     }
 
     try {
-      const res = await this.db.query<ShoppingListItem>(
-        'INSERT INTO public.shopping_list_items (shopping_list_id, master_item_id, custom_item_name) VALUES ($1, $2, $3) RETURNING *',
-        [listId, item.masterItemId ?? null, item.customItemName ?? null],
-      );
+      const query = `
+        INSERT INTO public.shopping_list_items (shopping_list_id, master_item_id, custom_item_name)
+        SELECT $1, $2, $3
+        WHERE EXISTS (
+          SELECT 1 FROM public.shopping_lists WHERE shopping_list_id = $1 AND user_id = $4
+        )
+        RETURNING *;
+      `;
+      const res = await this.db.query<ShoppingListItem>(query, [
+        listId,
+        item.masterItemId ?? null,
+        item.customItemName ?? null,
+        userId,
+      ]);
+
+      if (res.rowCount === 0) {
+        throw new NotFoundError('Shopping list not found or user does not have permission.');
+      }
+
       return res.rows[0];
     } catch (error) {
-      handleDbError(error, logger, 'Database error in addShoppingListItem', { listId, item }, {
+      if (error instanceof NotFoundError) throw error;
+      handleDbError(error, logger, 'Database error in addShoppingListItem', { listId, userId, item }, {
         fkMessage: 'Referenced list or item does not exist.',
         checkMessage: 'Shopping list item must have a master item or a custom name.',
         defaultMessage: 'Failed to add item to shopping list.',
@@ -183,19 +200,23 @@ export class ShoppingRepository {
    * Removes an item from a shopping list.
    * @param itemId The ID of the shopping list item to remove.
    */
-  async removeShoppingListItem(itemId: number, logger: Logger): Promise<void> {
+  async removeShoppingListItem(itemId: number, userId: string, logger: Logger): Promise<void> {
     try {
-      const res = await this.db.query(
-        'DELETE FROM public.shopping_list_items WHERE shopping_list_item_id = $1',
-        [itemId],
-      );
-      // The patch requested this specific error handling.
+      const query = `
+        DELETE FROM public.shopping_list_items sli
+        WHERE sli.shopping_list_item_id = $1
+          AND EXISTS (
+            SELECT 1 FROM public.shopping_lists sl
+            WHERE sl.shopping_list_id = sli.shopping_list_id AND sl.user_id = $2
+          );
+      `;
+      const res = await this.db.query(query, [itemId, userId]);
       if (res.rowCount === 0) {
-        throw new NotFoundError('Shopping list item not found.');
+        throw new NotFoundError('Shopping list item not found or user does not have permission.');
       }
     } catch (error) {
       if (error instanceof NotFoundError) throw error;
-      handleDbError(error, logger, 'Database error in removeShoppingListItem', { itemId }, {
+      handleDbError(error, logger, 'Database error in removeShoppingListItem', { itemId, userId }, {
         defaultMessage: 'Failed to remove item from shopping list.',
       });
     }
@@ -312,6 +333,7 @@ export class ShoppingRepository {
    */
   async updateShoppingListItem(
     itemId: number,
+    userId: string,
     updates: Partial<ShoppingListItem>,
     logger: Logger,
   ): Promise<ShoppingListItem> {
@@ -341,10 +363,19 @@ export class ShoppingRepository {
       }
 
       values.push(itemId);
-      const query = `UPDATE public.shopping_list_items SET ${setClauses.join(', ')} WHERE shopping_list_item_id = $${valueIndex} RETURNING *`;
+      values.push(userId);
+
+      const query = `
+        UPDATE public.shopping_list_items sli
+        SET ${setClauses.join(', ')}
+        FROM public.shopping_lists sl
+        WHERE sli.shopping_list_item_id = $${valueIndex}
+          AND sli.shopping_list_id = sl.shopping_list_id
+          AND sl.user_id = $${valueIndex + 1}
+        RETURNING sli.*;
+      `;
 
       const res = await this.db.query<ShoppingListItem>(query, values);
-      // The patch requested this specific error handling.
       if (res.rowCount === 0) {
         throw new NotFoundError('Shopping list item not found.');
       }
@@ -357,7 +388,7 @@ export class ShoppingRepository {
       ) {
         throw error;
       }
-      handleDbError(error, logger, 'Database error in updateShoppingListItem', { itemId, updates }, {
+      handleDbError(error, logger, 'Database error in updateShoppingListItem', { itemId, userId, updates }, {
         defaultMessage: 'Failed to update shopping list item.',
       });
     }

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

@@ -73,8 +73,12 @@ describe('User DB Service', () => {
       const mockUser = {
         user_id: '123',
         email: 'test@example.com',
+        password_hash: 'some-hash',
+        failed_login_attempts: 0,
+        last_failed_login: null,
         created_at: new Date().toISOString(),
         updated_at: new Date().toISOString(),
+        refresh_token: null,
       };
       mockPoolInstance.query.mockResolvedValue({ rows: [mockUser] });
 
@@ -233,9 +237,7 @@ describe('User DB Service', () => {
       }
 
       expect(withTransaction).toHaveBeenCalledTimes(1);
-      expect(mockLogger.warn).toHaveBeenCalledWith(
-        `Attempted to create a user with an existing email: exists@example.com`,
-      );
+      expect(mockLogger.warn).toHaveBeenCalledWith(`Attempted to create a user with an existing email: exists@example.com`);
     });
 
     it('should throw an error if profile is not found after user creation', async () => {
@@ -836,9 +838,7 @@ describe('User DB Service', () => {
       );
 
       // Act & Assert: The outer function catches the NotFoundError and re-throws it.
-      await expect(exportUserData('123', mockLogger)).rejects.toThrow(
-        'Failed to export user data.',
-      );
+      await expect(exportUserData('123', mockLogger)).rejects.toThrow('Profile not found');
       expect(withTransaction).toHaveBeenCalledTimes(1);
     });
 

src/services/db/user.db.ts

@@ -2,7 +2,7 @@
 import { Pool, PoolClient } from 'pg';
 import { getPool } from './connection.db';
 import type { Logger } from 'pino';
-import { NotFoundError, handleDbError } from './errors.db';
+import { NotFoundError, handleDbError, UniqueConstraintError } from './errors.db';
 import {
   Profile,
   MasterGroceryItem,
@@ -127,6 +127,12 @@ export class UserRepository {
       logger.debug({ user: fullUserProfile }, `[DB createUser] Fetched full profile for new user:`);
       return fullUserProfile;
     }).catch((error) => {
+      // Specific handling for unique constraint violation on user creation
+      if (error instanceof Error && 'code' in error && (error as any).code === '23505') {
+        logger.warn(`Attempted to create a user with an existing email: ${email}`);
+        throw new UniqueConstraintError('A user with this email address already exists.');
+      }
+      // Fallback to generic handler for all other errors
       handleDbError(error, logger, 'Error during createUser transaction', { email }, {
         uniqueMessage: 'A user with this email address already exists.',
         defaultMessage: 'Failed to create user in database.',

src/services/flyerAiProcessor.server.test.ts

@@ -100,7 +100,7 @@ describe('FlyerAiProcessor', () => {
       valid_to: null,
       store_address: null,
     };
-    vi.mocked(mockAiService.extractCoreDataFromFlyerImage).mockResolvedValue(mockAiResponse as any);
+    vi.mocked(mockAiService.extractCoreDataFromFlyerImage).mockResolvedValue(mockAiResponse);
     const { logger } = await import('./logger.server');
 
     const imagePaths = [{ path: 'page1.jpg', mimetype: 'image/jpeg' }];

src/services/flyerDataTransformer.test.ts

@@ -21,6 +21,11 @@ describe('FlyerDataTransformer', () => {
   beforeEach(() => {
     vi.clearAllMocks();
     transformer = new FlyerDataTransformer();
+    // Stub environment variables to ensure consistency and predictability.
+    // Prioritize FRONTEND_URL to match the updated service logic.
+    vi.stubEnv('FRONTEND_URL', 'http://localhost:3000');
+    vi.stubEnv('BASE_URL', ''); // Ensure this is not used to confirm priority logic
+    vi.stubEnv('PORT', '');     // Ensure this is not used
 
     // Provide a default mock implementation for generateFlyerIcon
     vi.mocked(generateFlyerIcon).mockResolvedValue('icon-flyer-page-1.webp');
@@ -70,6 +75,9 @@ describe('FlyerDataTransformer', () => {
       mockLogger,
     );
 
+    // Dynamically construct the expected base URL, mirroring the logic in the transformer.
+    const expectedBaseUrl = `http://localhost:3000`;
+
     // Assert
     // 0. Check logging
     expect(mockLogger.info).toHaveBeenCalledWith(
@@ -83,8 +91,8 @@ describe('FlyerDataTransformer', () => {
     // 1. Check flyer data
     expect(flyerData).toEqual({
       file_name: originalFileName,
-      image_url: '/flyer-images/flyer-page-1.jpg',
-      icon_url: '/flyer-images/icons/icon-flyer-page-1.webp',
+      image_url: `${expectedBaseUrl}/flyer-images/flyer-page-1.jpg`,
+      icon_url: `${expectedBaseUrl}/flyer-images/icons/icon-flyer-page-1.webp`,
       checksum,
       store_name: 'Test Store',
       valid_from: '2024-01-01',
@@ -151,6 +159,9 @@ describe('FlyerDataTransformer', () => {
       mockLogger,
     );
 
+    // Dynamically construct the expected base URL, mirroring the logic in the transformer.
+    const expectedBaseUrl = `http://localhost:3000`;
+
     // Assert
     // 0. Check logging
     expect(mockLogger.info).toHaveBeenCalledWith(
@@ -167,8 +178,8 @@ describe('FlyerDataTransformer', () => {
     expect(itemsForDb).toHaveLength(0);
     expect(flyerData).toEqual({
       file_name: originalFileName,
-      image_url: '/flyer-images/another.png',
-      icon_url: '/flyer-images/icons/icon-another.webp',
+      image_url: `${expectedBaseUrl}/flyer-images/another.png`,
+      icon_url: `${expectedBaseUrl}/flyer-images/icons/icon-another.webp`,
       checksum,
       store_name: 'Unknown Store (auto)', // Should use fallback
       valid_from: null,
@@ -176,7 +187,7 @@ describe('FlyerDataTransformer', () => {
       store_address: null,
       item_count: 0,
       status: 'needs_review',
-      uploaded_by: undefined, // Should be undefined
+      uploaded_by: null, // Should be null
     });
   });
 

src/services/flyerDataTransformer.ts

@@ -23,14 +23,14 @@ export class FlyerDataTransformer {
   ): FlyerItemInsert {
     return {
       ...item,
-      // Use logical OR to default falsy values (null, undefined, '') to a fallback.
-      // The trim is important for cases where the AI returns only whitespace.
-      item: String(item.item || '').trim() || 'Unknown Item',
-      // Use nullish coalescing to default only null/undefined to an empty string.
-      price_display: String(item.price_display ?? ''),
-      quantity: String(item.quantity ?? ''),
-      // Use logical OR to default falsy category names (null, undefined, '') to a fallback.
-      category_name: String(item.category_name || 'Other/Miscellaneous'),
+      // Use nullish coalescing and trim for robustness.
+      // An empty or whitespace-only name falls back to 'Unknown Item'.
+      item: (item.item ?? '').trim() || 'Unknown Item',
+      // Default null/undefined to an empty string and trim.
+      price_display: (item.price_display ?? '').trim(),
+      quantity: (item.quantity ?? '').trim(),
+      // An empty or whitespace-only category falls back to 'Other/Miscellaneous'.
+      category_name: (item.category_name ?? '').trim() || 'Other/Miscellaneous',
       // Use nullish coalescing to convert null to undefined for the database.
       master_item_id: item.master_item_id ?? undefined,
       view_count: 0,
@@ -75,17 +75,38 @@ export class FlyerDataTransformer {
         logger.warn('AI did not return a store name. Using fallback "Unknown Store (auto)".');
       }
 
+      // Construct proper URLs including protocol and host to satisfy DB constraints.
+      // This logic is made more robust to handle cases where env vars might be present but invalid (e.g., whitespace or missing protocol).
+      let baseUrl = (process.env.FRONTEND_URL || process.env.BASE_URL || '').trim();
+
+      if (!baseUrl || !baseUrl.startsWith('http')) {
+        const port = process.env.PORT || 3000;
+        const fallbackUrl = `http://localhost:${port}`;
+        if (baseUrl) {
+          // It was set but invalid
+          logger.warn(
+            `FRONTEND_URL/BASE_URL is invalid or incomplete ('${baseUrl}'). Falling back to default local URL: ${fallbackUrl}`,
+          );
+        }
+        baseUrl = fallbackUrl;
+      }
+
+      baseUrl = baseUrl.endsWith('/') ? baseUrl.slice(0, -1) : baseUrl;
+
       const flyerData: FlyerInsert = {
         file_name: originalFileName,
-        image_url: `/flyer-images/${path.basename(firstImage)}`,
-        icon_url: `/flyer-images/icons/${iconFileName}`,
+        image_url: `${baseUrl}/flyer-images/${path.basename(firstImage)}`,
+        icon_url: `${baseUrl}/flyer-images/icons/${iconFileName}`,
         checksum,
         store_name: storeName,
         valid_from: extractedData.valid_from,
         valid_to: extractedData.valid_to,
         store_address: extractedData.store_address, // The number of items is now calculated directly from the transformed data.
         item_count: itemsForDb.length,
-        uploaded_by: userId,
+        // Defensively handle the userId. An empty string ('') is not a valid UUID,
+        // but `null` is. This ensures that any falsy value for userId (undefined, null, '')
+        // is converted to `null` for the database, preventing a 22P02 error.
+        uploaded_by: userId || null,
         status: needsReview ? 'needs_review' : 'processed',
       };
 

src/services/geocodingService.server.test.ts

@@ -35,15 +35,13 @@ vi.mock('./logger.server', () => ({
 import { logger } from './logger.server';
 
 describe('Geocoding Service', () => {
-  const originalEnv = process.env;
   let geocodingService: GeocodingService;
   let mockGoogleService: GoogleGeocodingService;
   let mockNominatimService: NominatimGeocodingService;
 
   beforeEach(() => {
     vi.clearAllMocks();
-    // Restore process.env to its original state before each test
-    process.env = { ...originalEnv };
+    vi.unstubAllEnvs();
 
     // Create a mock instance of the Google service
     mockGoogleService = { geocode: vi.fn() } as unknown as GoogleGeocodingService;
@@ -53,8 +51,7 @@ describe('Geocoding Service', () => {
   });
 
   afterEach(() => {
-    // Restore process.env after each test
-    process.env = originalEnv;
+    vi.unstubAllEnvs();
   });
 
   describe('geocodeAddress', () => {
@@ -77,7 +74,7 @@ describe('Geocoding Service', () => {
 
     it('should log an error but continue if Redis GET fails', async () => {
       // Arrange: Mock Redis 'get' to fail, but Google API to succeed
-      process.env.GOOGLE_MAPS_API_KEY = 'test-key';
+      vi.stubEnv('GOOGLE_MAPS_API_KEY', 'test-key');
       mocks.mockRedis.get.mockRejectedValue(new Error('Redis down'));
       vi.mocked(mockGoogleService.geocode).mockResolvedValue(coordinates);
 
@@ -95,7 +92,7 @@ describe('Geocoding Service', () => {
 
     it('should proceed to fetch if cached data is invalid JSON', async () => {
       // Arrange: Mock Redis to return a malformed JSON string
-      process.env.GOOGLE_MAPS_API_KEY = 'test-key';
+      vi.stubEnv('GOOGLE_MAPS_API_KEY', 'test-key');
       mocks.mockRedis.get.mockResolvedValue('{ "lat": 45.0, "lng": -75.0 '); // Missing closing brace
       vi.mocked(mockGoogleService.geocode).mockResolvedValue(coordinates);
 
@@ -115,7 +112,7 @@ describe('Geocoding Service', () => {
 
     it('should fetch from Google, return coordinates, and cache the result on cache miss', async () => {
       // Arrange
-      process.env.GOOGLE_MAPS_API_KEY = 'test-key';
+      vi.stubEnv('GOOGLE_MAPS_API_KEY', 'test-key');
       mocks.mockRedis.get.mockResolvedValue(null); // Cache miss
       vi.mocked(mockGoogleService.geocode).mockResolvedValue(coordinates);
 
@@ -136,7 +133,7 @@ describe('Geocoding Service', () => {
 
     it('should fall back to Nominatim if Google API key is missing', async () => {
       // Arrange
-      delete process.env.GOOGLE_MAPS_API_KEY;
+      vi.stubEnv('GOOGLE_MAPS_API_KEY', '');
       mocks.mockRedis.get.mockResolvedValue(null);
       vi.mocked(mockNominatimService.geocode).mockResolvedValue(coordinates);
 
@@ -155,7 +152,7 @@ describe('Geocoding Service', () => {
 
     it('should fall back to Nominatim if Google API returns a non-OK status', async () => {
       // Arrange
-      process.env.GOOGLE_MAPS_API_KEY = 'test-key';
+      vi.stubEnv('GOOGLE_MAPS_API_KEY', 'test-key');
       mocks.mockRedis.get.mockResolvedValue(null);
       vi.mocked(mockGoogleService.geocode).mockResolvedValue(null); // Google returns no results
       vi.mocked(mockNominatimService.geocode).mockResolvedValue(coordinates);
@@ -174,7 +171,7 @@ describe('Geocoding Service', () => {
 
     it('should fall back to Nominatim if Google API fetch call fails', async () => {
       // Arrange
-      process.env.GOOGLE_MAPS_API_KEY = 'test-key';
+      vi.stubEnv('GOOGLE_MAPS_API_KEY', 'test-key');
       mocks.mockRedis.get.mockResolvedValue(null);
       vi.mocked(mockGoogleService.geocode).mockRejectedValue(new Error('Network Error'));
       vi.mocked(mockNominatimService.geocode).mockResolvedValue(coordinates);
@@ -193,7 +190,7 @@ describe('Geocoding Service', () => {
 
     it('should return null and log an error if both Google and Nominatim fail', async () => {
       // Arrange
-      process.env.GOOGLE_MAPS_API_KEY = 'test-key';
+      vi.stubEnv('GOOGLE_MAPS_API_KEY', 'test-key');
       mocks.mockRedis.get.mockResolvedValue(null);
       vi.mocked(mockGoogleService.geocode).mockRejectedValue(new Error('Network Error'));
       vi.mocked(mockNominatimService.geocode).mockResolvedValue(null); // Nominatim also fails
@@ -209,7 +206,7 @@ describe('Geocoding Service', () => {
 
     it('should return coordinates even if Redis SET fails', async () => {
       // Arrange
-      process.env.GOOGLE_MAPS_API_KEY = 'test-key';
+      vi.stubEnv('GOOGLE_MAPS_API_KEY', 'test-key');
       mocks.mockRedis.get.mockResolvedValue(null); // Cache miss
       vi.mocked(mockGoogleService.geocode).mockResolvedValue(coordinates);
       // Mock Redis 'set' to fail

src/services/googleGeocodingService.server.test.ts

@@ -20,25 +20,22 @@ import { logger as mockLogger } from './logger.server';
 
 describe('Google Geocoding Service', () => {
   let googleGeocodingService: GoogleGeocodingService;
-  const originalEnv = process.env;
 
   beforeEach(() => {
     vi.clearAllMocks();
     // Mock the global fetch function before each test
     vi.stubGlobal('fetch', vi.fn());
-    // Restore process.env to a clean state for each test
-    process.env = { ...originalEnv };
+    vi.unstubAllEnvs();
     googleGeocodingService = new GoogleGeocodingService();
   });
 
   afterEach(() => {
-    // Restore original environment variables after each test
-    process.env = originalEnv;
+    vi.unstubAllEnvs();
   });
 
   it('should return coordinates for a valid address when API key is present', async () => {
     // Arrange
-    process.env.GOOGLE_MAPS_API_KEY = 'test-api-key';
+    vi.stubEnv('GOOGLE_MAPS_API_KEY', 'test-api-key');
     const mockApiResponse = {
       status: 'OK',
       results: [
@@ -70,7 +67,7 @@ describe('Google Geocoding Service', () => {
 
   it('should throw an error if GOOGLE_MAPS_API_KEY is not set', async () => {
     // Arrange
-    delete process.env.GOOGLE_MAPS_API_KEY;
+    vi.stubEnv('GOOGLE_MAPS_API_KEY', '');
 
     // Act & Assert
     await expect(googleGeocodingService.geocode('Any Address', mockLogger)).rejects.toThrow(
@@ -81,7 +78,7 @@ describe('Google Geocoding Service', () => {
 
   it('should return null if the API returns a status other than "OK"', async () => {
     // Arrange
-    process.env.GOOGLE_MAPS_API_KEY = 'test-api-key';
+    vi.stubEnv('GOOGLE_MAPS_API_KEY', 'test-api-key');
     const mockApiResponse = { status: 'ZERO_RESULTS', results: [] };
     vi.mocked(fetch).mockResolvedValue({
       ok: true,
@@ -101,7 +98,7 @@ describe('Google Geocoding Service', () => {
 
   it('should throw an error if the fetch response is not ok', async () => {
     // Arrange
-    process.env.GOOGLE_MAPS_API_KEY = 'test-api-key';
+    vi.stubEnv('GOOGLE_MAPS_API_KEY', 'test-api-key');
     vi.mocked(fetch).mockResolvedValue({
       ok: false,
       status: 403,
@@ -119,7 +116,7 @@ describe('Google Geocoding Service', () => {
 
   it('should throw an error if the fetch call itself fails', async () => {
     // Arrange
-    process.env.GOOGLE_MAPS_API_KEY = 'test-api-key';
+    vi.stubEnv('GOOGLE_MAPS_API_KEY', 'test-api-key');
     const networkError = new Error('Network request failed');
     vi.mocked(fetch).mockRejectedValue(networkError);
 

src/services/logger.server.test.ts

@@ -1,5 +1,5 @@
 // src/services/logger.server.test.ts
-import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
 
 // Mock pino before importing the logger
 const pinoMock = vi.fn(() => ({
@@ -15,16 +15,21 @@ describe('Server Logger', () => {
     // Reset modules to ensure process.env changes are applied to new module instances
     vi.resetModules();
     vi.clearAllMocks();
+    vi.unstubAllEnvs();
+  });
+
+  afterEach(() => {
+    vi.unstubAllEnvs();
   });
 
   it('should initialize pino with the correct level for production', async () => {
-    process.env.NODE_ENV = 'production';
+    vi.stubEnv('NODE_ENV', 'production');
     await import('./logger.server');
     expect(pinoMock).toHaveBeenCalledWith(expect.objectContaining({ level: 'info' }));
   });
 
   it('should initialize pino with pretty-print transport for development', async () => {
-    process.env.NODE_ENV = 'development';
+    vi.stubEnv('NODE_ENV', 'development');
     await import('./logger.server');
     expect(pinoMock).toHaveBeenCalledWith(
       expect.objectContaining({ transport: expect.any(Object) }),

src/services/workers.server.ts

@@ -92,6 +92,8 @@ export const flyerWorker = new Worker<FlyerJobData>(
   {
     connection,
     concurrency: parseInt(process.env.WORKER_CONCURRENCY || '1', 10),
+    // Increase lock duration to prevent jobs from being re-processed prematurely.
+    lockDuration: parseInt(process.env.WORKER_LOCK_DURATION || '30000', 10),
   },
 );
 

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

@@ -174,6 +174,11 @@ describe('Authentication E2E Flow', () => {
       expect(registerResponse.status).toBe(201);
       createdUserIds.push(registerData.userprofile.user.user_id);
 
+      // Add a small delay to mitigate potential DB replication lag or race conditions
+      // in the test environment. Increased from 2s to 5s to improve stability.
+      // The root cause is likely environmental slowness in the CI database.
+      await new Promise((resolve) => setTimeout(resolve, 5000));
+
       // Act 1: Request a password reset.
       // The test environment returns the token directly in the response for E2E testing.
       const forgotResponse = await apiClient.requestPasswordReset(email);

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

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

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

@@ -163,9 +163,11 @@ describe('Admin API Routes Integration Tests', () => {
     // Before each modification test, create a fresh flyer item and a correction for it.
     beforeEach(async () => {
       const flyerRes = await getPool().query(
-        `INSERT INTO public.flyers (store_id, file_name, image_url, item_count, checksum) 
-         VALUES ($1, 'admin-test.jpg', 'http://test.com/img.jpg', 1, $2) RETURNING flyer_id`,
-        [testStoreId, `checksum-${Date.now()}-${Math.random()}`],
+        `INSERT INTO public.flyers (store_id, file_name, image_url, icon_url, item_count, checksum) 
+         VALUES ($1, 'admin-test.jpg', 'https://example.com/flyer-images/asdmin-test.jpg', 'https://example.com/flyer-images/icons/admin-test.jpg', 1, $2) RETURNING flyer_id`,
+        // The checksum must be a unique 64-character string to satisfy the DB constraint.
+        // We generate a dynamic string and pad it to 64 characters.
+        [testStoreId, `checksum-${Date.now()}-${Math.random()}`.padEnd(64, '0')],
       );
       const flyerId = flyerRes.rows[0].flyer_id;
 

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

@@ -1,5 +1,5 @@
 // src/tests/integration/flyer-processing.integration.test.ts
-import { describe, it, expect, beforeAll, afterAll } from 'vitest';
+import { describe, it, expect, beforeAll, afterAll, vi } from 'vitest';
 import supertest from 'supertest';
 import app from '../../../server';
 import fs from 'node:fs/promises';
@@ -8,7 +8,7 @@ import * as db from '../../services/db/index.db';
 import { getPool } from '../../services/db/connection.db';
 import { generateFileChecksum } from '../../utils/checksum';
 import { logger } from '../../services/logger.server';
-import type { UserProfile } from '../../types';
+import type { UserProfile, ExtractedFlyerItem } from '../../types';
 import { createAndLoginUser } from '../utils/testHelpers';
 import { cleanupDb } from '../utils/cleanup';
 import { cleanupFiles } from '../utils/cleanupFiles';
@@ -16,12 +16,16 @@ import piexif from 'piexifjs';
 import exifParser from 'exif-parser';
 import sharp from 'sharp';
 
+
 /**
  * @vitest-environment node
  */
 
 const request = supertest(app);
 
+// Import the mocked service to control its behavior in tests.
+import { aiService } from '../../services/aiService.server';
+
 describe('Flyer Processing Background Job Integration Test', () => {
   const createdUserIds: string[] = [];
   const createdFlyerIds: number[] = [];
@@ -29,6 +33,23 @@ describe('Flyer Processing Background Job Integration Test', () => {
 
   beforeAll(async () => {
     // This setup is now simpler as the worker handles fetching master items.
+    // Setup default mock response for AI service
+    const mockItems: ExtractedFlyerItem[] = [
+      {
+        item: 'Mocked Integration Item',
+        price_display: '$1.99',
+        price_in_cents: 199,
+        quantity: 'each',
+        category_name: 'Mock Category',
+      },
+    ];
+    vi.spyOn(aiService, 'extractCoreDataFromFlyerImage').mockResolvedValue({
+      store_name: 'Mock Store',
+      valid_from: null,
+      valid_to: null,
+      store_address: null,
+      items: mockItems,
+    });
   });
 
   afterAll(async () => {
@@ -80,7 +101,9 @@ describe('Flyer Processing Background Job Integration Test', () => {
 
     // Act 2: Poll for the job status until it completes.
     let jobStatus;
-    const maxRetries = 30; // Poll for up to 90 seconds (30 * 3s)
+    // Poll for up to 210 seconds (70 * 3s). This should be greater than the worker's
+    // lockDuration (120s) to patiently wait for long-running jobs.
+    const maxRetries = 70;
     for (let i = 0; i < maxRetries; i++) {
       console.log(`Polling attempt ${i + 1}...`);
       await new Promise((resolve) => setTimeout(resolve, 3000)); // Wait 3 seconds between polls
@@ -149,12 +172,12 @@ describe('Flyer Processing Background Job Integration Test', () => {
 
     // Act & Assert
     await runBackgroundProcessingTest(authUser, token);
-  }, 120000); // Increase timeout to 120 seconds for this long-running test
+  }, 240000); // Increase timeout to 240 seconds for this long-running test
 
   it('should successfully process a flyer for an ANONYMOUS user via the background queue', async () => {
     // Act & Assert: Call the test helper without a user or token.
     await runBackgroundProcessingTest();
-  }, 120000); // Increase timeout to 120 seconds for this long-running test
+  }, 240000); // Increase timeout to 240 seconds for this long-running test
 
   it(
     'should strip EXIF data from uploaded JPEG images during processing',
@@ -202,7 +225,7 @@ describe('Flyer Processing Background Job Integration Test', () => {
 
       // Poll for job completion
       let jobStatus;
-      const maxRetries = 30; // Poll for up to 90 seconds
+      const maxRetries = 60; // Poll for up to 180 seconds
       for (let i = 0; i < maxRetries; i++) {
         await new Promise((resolve) => setTimeout(resolve, 3000));
         const statusResponse = await request
@@ -238,7 +261,7 @@ describe('Flyer Processing Background Job Integration Test', () => {
       expect(exifResult.tags).toEqual({});
       expect(exifResult.tags.Software).toBeUndefined();
     },
-    120000,
+    240000,
   );
 
   it(
@@ -288,7 +311,7 @@ describe('Flyer Processing Background Job Integration Test', () => {
 
       // Poll for job completion
       let jobStatus;
-      const maxRetries = 30;
+      const maxRetries = 60; // Poll for up to 180 seconds
       for (let i = 0; i < maxRetries; i++) {
         await new Promise((resolve) => setTimeout(resolve, 3000));
         const statusResponse = await request
@@ -322,6 +345,6 @@ describe('Flyer Processing Background Job Integration Test', () => {
       // The `exif` property should be undefined after the fix.
       expect(savedImageMetadata.exif).toBeUndefined();
     },
-    120000,
+    240000,
   );
 });

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

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

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

@@ -1,5 +1,5 @@
 // src/tests/integration/gamification.integration.test.ts
-import { describe, it, expect, beforeAll, afterAll } from 'vitest';
+import { describe, it, expect, beforeAll, afterAll, vi } from 'vitest';
 import supertest from 'supertest';
 import app from '../../../server';
 import path from 'path';
@@ -9,7 +9,13 @@ import { generateFileChecksum } from '../../utils/checksum';
 import * as db from '../../services/db/index.db';
 import { cleanupDb } from '../utils/cleanup';
 import { logger } from '../../services/logger.server';
-import type { UserProfile, UserAchievement, LeaderboardUser, Achievement  } from '../../types';
+import type {
+  UserProfile,
+  UserAchievement,
+  LeaderboardUser,
+  Achievement,
+  ExtractedFlyerItem,
+} from '../../types';
 import { cleanupFiles } from '../utils/cleanupFiles';
 
 /**
@@ -18,6 +24,9 @@ import { cleanupFiles } from '../utils/cleanupFiles';
 
 const request = supertest(app);
 
+// Import the mocked service to control its behavior in tests.
+import { aiService } from '../../services/aiService.server';
+
 describe('Gamification Flow Integration Test', () => {
   let testUser: UserProfile;
   let authToken: string;
@@ -31,6 +40,28 @@ describe('Gamification Flow Integration Test', () => {
       fullName: 'Gamification Tester',
       request,
     }));
+
+    // Mock the AI service's method to prevent actual API calls during integration tests.
+    // This is crucial for making the integration test reliable. We don't want to
+    // depend on the external Gemini API, which has quotas and can be slow.
+    // By mocking this, we test our application's internal flow:
+    // API -> Queue -> Worker -> DB -> Gamification Logic
+    const mockExtractedItems: ExtractedFlyerItem[] = [
+      {
+        item: 'Integration Test Milk',
+        price_display: '$4.99',
+        price_in_cents: 499,
+        quantity: '2L',
+        category_name: 'Dairy',
+      },
+    ];
+    vi.spyOn(aiService, 'extractCoreDataFromFlyerImage').mockResolvedValue({
+      store_name: 'Gamification Test Store',
+      valid_from: null,
+      valid_to: null,
+      store_address: null,
+      items: mockExtractedItems,
+    });
   });
 
   afterAll(async () => {
@@ -70,7 +101,7 @@ describe('Gamification Flow Integration Test', () => {
 
       // --- Act 2: Poll for job completion ---
       let jobStatus;
-      const maxRetries = 30; // Poll for up to 90 seconds
+      const maxRetries = 60; // Poll for up to 180 seconds
       for (let i = 0; i < maxRetries; i++) {
         await new Promise((resolve) => setTimeout(resolve, 3000));
         const statusResponse = await request
@@ -81,12 +112,17 @@ describe('Gamification Flow Integration Test', () => {
           break;
         }
       }
+    if (!jobStatus) {
+      console.error('[DEBUG] Gamification test job timed out: No job status received.');
+      throw new Error('Gamification test job timed out: No job status received.');
+    }
 
       // --- Assert 1: Verify the job completed successfully ---
       if (jobStatus?.state === 'failed') {
         console.error('[DEBUG] Gamification test job failed:', jobStatus.failedReason);
       }
       expect(jobStatus?.state).toBe('completed');
+
       const flyerId = jobStatus?.returnValue?.flyerId;
       expect(flyerId).toBeTypeOf('number');
       createdFlyerIds.push(flyerId); // Track for cleanup
@@ -126,6 +162,6 @@ describe('Gamification Flow Integration Test', () => {
         firstUploadAchievement!.points_value,
       );
     },
-    120000, // Increase timeout to 120 seconds for this long-running test
+    240000, // Increase timeout to 240s to match other long-running processing tests
   );
 });

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

@@ -34,23 +34,23 @@ describe('Price History API Integration Test (/api/price-history)', () => {
 
     // 3. Create two flyers with different dates
     const flyerRes1 = await pool.query(
-      `INSERT INTO public.flyers (store_id, file_name, image_url, item_count, checksum, valid_from) 
-       VALUES ($1, 'price-test-1.jpg', 'http://test.com/price-1.jpg', 1, $2, '2025-01-01') RETURNING flyer_id`,
-      [storeId, `checksum-price-1-${Date.now()}`],
+      `INSERT INTO public.flyers (store_id, file_name, image_url, icon_url, item_count, checksum, valid_from) 
+       VALUES ($1, 'price-test-1.jpg', 'https://example.com/flyer-images/price-test-1.jpg', 'https://example.com/flyer-images/icons/price-test-1.jpg', 1, $2, '2025-01-01') RETURNING flyer_id`,
+      [storeId, `${Date.now().toString(16)}1`.padEnd(64, '0')],
     );
     flyerId1 = flyerRes1.rows[0].flyer_id;
 
     const flyerRes2 = await pool.query(
-      `INSERT INTO public.flyers (store_id, file_name, image_url, item_count, checksum, valid_from) 
-       VALUES ($1, 'price-test-2.jpg', 'http://test.com/price-2.jpg', 1, $2, '2025-01-08') RETURNING flyer_id`,
-      [storeId, `checksum-price-2-${Date.now()}`],
+      `INSERT INTO public.flyers (store_id, file_name, image_url, icon_url, item_count, checksum, valid_from) 
+       VALUES ($1, 'price-test-2.jpg', 'https://example.com/flyer-images/price-test-2.jpg', 'https://example.com/flyer-images/icons/price-test-2.jpg', 1, $2, '2025-01-08') RETURNING flyer_id`,
+      [storeId, `${Date.now().toString(16)}2`.padEnd(64, '0')],
     );
     flyerId2 = flyerRes2.rows[0].flyer_id; // This was a duplicate, fixed.
 
     const flyerRes3 = await pool.query(
-      `INSERT INTO public.flyers (store_id, file_name, image_url, item_count, checksum, valid_from) 
-       VALUES ($1, 'price-test-3.jpg', 'http://test.com/price-3.jpg', 1, $2, '2025-01-15') RETURNING flyer_id`,
-      [storeId, `checksum-price-3-${Date.now()}`],
+      `INSERT INTO public.flyers (store_id, file_name, image_url, icon_url, item_count, checksum, valid_from) 
+       VALUES ($1, 'price-test-3.jpg', 'https://example.com/flyer-images/price-test-3.jpg', 'https://example.com/flyer-images/icons/price-test-3.jpg', 1, $2, '2025-01-15') RETURNING flyer_id`,
+      [storeId, `${Date.now().toString(16)}3`.padEnd(64, '0')],
     );
     flyerId3 = flyerRes3.rows[0].flyer_id;
 

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

@@ -77,9 +77,9 @@ describe('Public API Routes Integration Tests', () => {
     );
     testStoreId = storeRes.rows[0].store_id;
     const flyerRes = await pool.query(
-      `INSERT INTO public.flyers (store_id, file_name, image_url, item_count, checksum) 
-       VALUES ($1, 'public-routes-test.jpg', 'http://test.com/public-routes.jpg', 1, $2) RETURNING *`,
-      [testStoreId, `checksum-public-routes-${Date.now()}`],
+      `INSERT INTO public.flyers (store_id, file_name, image_url, icon_url, item_count, checksum) 
+       VALUES ($1, 'public-routes-test.jpg', 'https://example.com/flyer-images/public-routes-test.jpg', 'https://example.com/flyer-images/icons/public-routes-test.jpg', 1, $2) RETURNING *`,
+      [testStoreId, `${Date.now().toString(16)}`.padEnd(64, '0')],
     );
     testFlyer = flyerRes.rows[0];
 

src/tests/integration/recipe.integration.test.ts

@@ -1,5 +1,5 @@
 // src/tests/integration/recipe.integration.test.ts
-import { describe, it, expect, beforeAll, afterAll } from 'vitest';
+import { describe, it, expect, beforeAll, afterAll, vi } from 'vitest';
 import supertest from 'supertest';
 import app from '../../../server';
 import { createAndLoginUser } from '../utils/testHelpers';
@@ -7,6 +7,8 @@ import { cleanupDb } from '../utils/cleanup';
 import type { UserProfile, Recipe, RecipeComment } from '../../types';
 import { getPool } from '../../services/db/connection.db';
 
+import { aiService } from '../../services/aiService.server';
+
 /**
  * @vitest-environment node
  */
@@ -31,6 +33,9 @@ describe('Recipe API Routes Integration Tests', () => {
     authToken = token;
     createdUserIds.push(user.user.user_id);
 
+    // Mock the AI service method using spyOn to preserve other exports like DuplicateFlyerError
+    vi.spyOn(aiService, 'generateRecipeSuggestion').mockResolvedValue('Default Mock Suggestion');
+
     // Create a recipe owned by the test user
     const recipeRes = await getPool().query(
       `INSERT INTO public.recipes (name, instructions, user_id, status, description) 
@@ -124,4 +129,24 @@ describe('Recipe API Routes Integration Tests', () => {
   it.todo('should prevent a user from deleting another user\'s recipe');
   it.todo('should allow an authenticated user to post a comment on a recipe');
   it.todo('should allow an authenticated user to fork a recipe');
+
+  describe('POST /api/recipes/suggest', () => {
+    it('should return a recipe suggestion based on ingredients', async () => {
+      const ingredients = ['chicken', 'rice', 'broccoli'];
+      const mockSuggestion = 'Chicken and Broccoli Stir-fry with Rice';
+      vi.mocked(aiService.generateRecipeSuggestion).mockResolvedValue(mockSuggestion);
+
+      const response = await request
+        .post('/api/recipes/suggest')
+        .set('Authorization', `Bearer ${authToken}`)
+        .send({ ingredients });
+
+      expect(response.status).toBe(200);
+      expect(response.body).toEqual({ suggestion: mockSuggestion });
+      expect(aiService.generateRecipeSuggestion).toHaveBeenCalledWith(
+        ingredients,
+        expect.anything(),
+      );
+    });
+  });
 });

src/tests/setup/globalApiMock.ts

@@ -0,0 +1,80 @@
+// src/tests/setup/globalApiMock.ts
+import { vi } from 'vitest';
+
+/**
+ * Mocks the entire apiClient module.
+ * This global mock is loaded for all tests via the `setupFiles` config in vitest.config.ts.
+ * It prevents test failures in components that use providers (like FlyersProvider, AuthProvider)
+ * which make API calls on mount when using `renderWithProviders`.
+ *
+ * Individual tests can override specific functions as needed, for example:
+ *
+ * import { vi } from 'vitest';
+ * import * as apiClient from '../services/apiClient';
+ *
+ * const mockedApiClient = vi.mocked(apiClient);
+ *
+ * it('should test something', () => {
+ *   mockedApiClient.someFunction.mockResolvedValue({ ... });
+ *   // ... rest of the test
+ * });
+ */
+vi.mock('../../services/apiClient', () => ({
+  // --- Provider Mocks (with default successful responses) ---
+  // These are essential for any test using renderWithProviders, as AppProviders
+  // will mount all these data providers.
+  fetchFlyers: vi.fn(() => Promise.resolve(new Response(JSON.stringify({ flyers: [], hasMore: false })))),
+  fetchMasterItems: vi.fn(() => Promise.resolve(new Response(JSON.stringify([])))),
+  fetchWatchedItems: vi.fn(() => Promise.resolve(new Response(JSON.stringify([])))),
+  fetchShoppingLists: vi.fn(() => Promise.resolve(new Response(JSON.stringify([])))),
+  getAuthenticatedUserProfile: vi.fn(() => Promise.resolve(new Response(JSON.stringify(null)))),
+  fetchCategories: vi.fn(() => Promise.resolve(new Response(JSON.stringify([])))), // For CorrectionsPage
+  fetchAllBrands: vi.fn(() => Promise.resolve(new Response(JSON.stringify([])))), // For AdminBrandManager
+
+  // --- General Mocks (return empty vi.fn() by default) ---
+  // These functions are commonly used and can be implemented in specific tests.
+  suggestRecipe: vi.fn(),
+  getApplicationStats: vi.fn(),
+  getSuggestedCorrections: vi.fn(),
+  approveCorrection: vi.fn(),
+  rejectCorrection: vi.fn(),
+  updateSuggestedCorrection: vi.fn(),
+  pingBackend: vi.fn(),
+  checkStorage: vi.fn(),
+  checkDbPoolHealth: vi.fn(),
+  checkPm2Status: vi.fn(),
+  checkRedisHealth: vi.fn(),
+  checkDbSchema: vi.fn(),
+  loginUser: vi.fn(),
+  registerUser: vi.fn(),
+  requestPasswordReset: vi.fn(),
+  triggerFailingJob: vi.fn(),
+  clearGeocodeCache: vi.fn(),
+  uploadBrandLogo: vi.fn(),
+  fetchActivityLog: vi.fn(),
+  updateUserProfile: vi.fn(),
+  updateUserPassword: vi.fn(),
+  updateUserPreferences: vi.fn(),
+  exportUserData: vi.fn(),
+  deleteUserAccount: vi.fn(),
+  getUserAddress: vi.fn(),
+  updateUserAddress: vi.fn(),
+  geocodeAddress: vi.fn(),
+  getFlyersForReview: vi.fn(),
+  fetchLeaderboard: vi.fn(),
+  // --- Added to fix "No export is defined on the mock" errors ---
+  fetchFlyerItems: vi.fn(),
+  createShoppingList: vi.fn(),
+  deleteShoppingList: vi.fn(),
+  addShoppingListItem: vi.fn(),
+  updateShoppingListItem: vi.fn(),
+  removeShoppingListItem: vi.fn(),
+  addWatchedItem: vi.fn(),
+  removeWatchedItem: vi.fn(),
+  fetchBestSalePrices: vi.fn(),
+  resetPassword: vi.fn(),
+  getUserAchievements: vi.fn(),
+  uploadAvatar: vi.fn(),
+  countFlyerItemsForFlyers: vi.fn(),
+  fetchFlyerItemsForFlyers: vi.fn(),
+}));

src/tests/setup/tests-setup-unit.ts

@@ -257,67 +257,6 @@ vi.mock('@google/genai', () => {
   };
 });
 
-/**
- * Mocks the entire apiClient module.
- * This ensures that all test files that import from apiClient will get this mocked version.
- */
-vi.mock('../../services/apiClient', () => ({
-  // --- Auth ---
-  registerUser: vi.fn(),
-  loginUser: vi.fn(),
-  getAuthenticatedUserProfile: vi.fn(),
-  requestPasswordReset: vi.fn(),
-  resetPassword: vi.fn(),
-  updateUserPassword: vi.fn(),
-  deleteUserAccount: vi.fn(),
-  updateUserPreferences: vi.fn(),
-  updateUserProfile: vi.fn(),
-  // --- Data Fetching & Manipulation ---
-  fetchFlyers: vi.fn(),
-  fetchFlyerItems: vi.fn(),
-  // Provide a default implementation that returns a valid Response object to prevent timeouts.
-  fetchFlyerItemsForFlyers: vi.fn(() => Promise.resolve(new Response(JSON.stringify([])))),
-  countFlyerItemsForFlyers: vi.fn(() =>
-    Promise.resolve(new Response(JSON.stringify({ count: 0 }))),
-  ),
-  fetchMasterItems: vi.fn(),
-  fetchWatchedItems: vi.fn(),
-  addWatchedItem: vi.fn(),
-  removeWatchedItem: vi.fn(),
-  fetchShoppingLists: vi.fn(),
-  createShoppingList: vi.fn(),
-  deleteShoppingList: vi.fn(),
-  addShoppingListItem: vi.fn(),
-  updateShoppingListItem: vi.fn(),
-  removeShoppingListItem: vi.fn(),
-  fetchHistoricalPriceData: vi.fn(),
-  processFlyerFile: vi.fn(),
-  uploadLogoAndUpdateStore: vi.fn(),
-  exportUserData: vi.fn(),
-  // --- Address ---
-  getUserAddress: vi.fn(),
-  updateUserAddress: vi.fn(),
-  geocodeAddress: vi.fn(() => Promise.resolve(new Response(JSON.stringify({ lat: 0, lng: 0 })))),
-  // --- Admin ---
-  getSuggestedCorrections: vi.fn(),
-  fetchCategories: vi.fn(),
-  approveCorrection: vi.fn(),
-  rejectCorrection: vi.fn(),
-  updateSuggestedCorrection: vi.fn(),
-  getApplicationStats: vi.fn(),
-  fetchActivityLog: vi.fn(),
-  fetchAllBrands: vi.fn(),
-  uploadBrandLogo: vi.fn(),
-  // --- System ---
-  pingBackend: vi.fn(),
-  checkDbSchema: vi.fn(),
-  checkStorage: vi.fn(),
-  checkDbPoolHealth: vi.fn(),
-  checkRedisHealth: vi.fn(),
-  checkPm2Status: vi.fn(),
-  fetchLeaderboard: vi.fn(),
-}));
-
 // FIX: Mock the aiApiClient module as well, which is used by AnalysisPanel
 vi.mock('../../services/aiApiClient', () => ({
   // Provide a default implementation that returns a valid Response object to prevent timeouts.

src/tests/utils/renderWithProviders.tsx

@@ -0,0 +1,31 @@
+// src/tests/utils/renderWithProviders.tsx
+import React, { ReactElement } from 'react';
+import { render, RenderOptions } from '@testing-library/react';
+import { AppProviders } from '../../providers/AppProviders';
+import { MemoryRouter } from 'react-router-dom';
+
+interface ExtendedRenderOptions extends Omit<RenderOptions, 'wrapper'> {
+  initialEntries?: string[];
+}
+
+/**
+ * A custom render function that wraps the component with all application providers.
+ * This is useful for testing components that rely on context values (Auth, Modal, etc.).
+ *
+ * @param ui The component to render
+ * @param options Additional render options
+ * @returns The result of the render function
+ */
+export const renderWithProviders = (
+  ui: ReactElement,
+  options?: ExtendedRenderOptions,
+) => {
+  const { initialEntries, ...renderOptions } = options || {};
+  // console.log('[renderWithProviders] Wrapping component with AppProviders context.');
+  const Wrapper = ({ children }: { children: React.ReactNode }) => (
+    <MemoryRouter initialEntries={initialEntries}>
+      <AppProviders>{children}</AppProviders>
+    </MemoryRouter>
+  );
+  return render(ui, { wrapper: Wrapper, ...renderOptions });
+};