@flowselections/logistiek-engine 1.0.230 → 1.0.233

package/db/schema/logistiek-engine.sql

@@ -12860,36 +12860,7 @@ EXCEPTION WHEN undefined_object OR undefined_table OR undefined_function OR inva
   RAISE NOTICE 'logistiek-engine: functie public.logistics_order_is_topick overgeslagen (onderdeel van andere module ontbreekt): %', SQLERRM;
 END $fsdo$;
 
-DO $fsdo$ BEGIN
-  EXECUTE $fsdef$CREATE OR REPLACE FUNCTION public.logistics_order_item_autolink()
- RETURNS trigger
- LANGUAGE plpgsql
- SECURITY DEFINER
- SET search_path TO 'public'
-AS $function$
-DECLARE m record;
-BEGIN
-  IF NEW.product_id IS NULL THEN
-    m := public.logistics_resolve_product_match(NEW.product_name::text);
-    NEW.product_id := m.product_id;
-    IF m.match_type IN ('naam', 'onbekend')
-       AND (TG_OP = 'INSERT' OR NEW.product_name IS DISTINCT FROM OLD.product_name) THEN
-      BEGIN
-        INSERT INTO public.logistics_autolink_audit
-          (order_id, order_item_id, order_source, product_name, product_id, match_type, product_floriday_id)
-        SELECT NEW.order_id, NEW.id, o.order_source, NEW.product_name::text, m.product_id, m.match_type,
-               (SELECT p.floriday_trade_item_id::text FROM public.products p WHERE p.id = m.product_id)
-          FROM (SELECT NEW.order_id AS id) x LEFT JOIN public.orders o ON o.id = x.id;
-      EXCEPTION WHEN others THEN NULL;  -- loggen mag een orderregel nooit laten mislukken
-      END;
-    END IF;
-  END IF;
-  RETURN NEW;
-END $function$
-$fsdef$;
-EXCEPTION WHEN undefined_object OR undefined_table OR undefined_function OR invalid_schema_name THEN
-  RAISE NOTICE 'logistiek-engine: functie public.logistics_order_item_autolink overgeslagen (onderdeel van andere module ontbreekt): %', SQLERRM;
-END $fsdo$;
+-- logistics_order_item_autolink: zie blok 1.0.231 onderaan (hoogste niveau, geen DO-blok).
 
 DO $fsdo$ BEGIN
   EXECUTE $fsdef$CREATE OR REPLACE FUNCTION public.logistics_order_line_allocation(p_order_item_id uuid)
@@ -39729,3 +39700,112 @@ BEGIN
 END $function$;
 REVOKE ALL ON FUNCTION public.logistics_ladingdrager_resolve_plan(text) FROM authenticated;
 
+-- logistiek-engine 1.0.231: de Engine is de enige eigenaar van het koppelen van orderregels.
+-- Floriday-regels (met source_line_key) koppelen alleen via Voorraad (voorraad_orderregel_trade_item_bron), nooit op naam.
+-- Functies staan op het hoogste niveau (geen DO-blok), zodat het update-dashboard ze meeneemt.
+
+ALTER TABLE IF EXISTS public.logistics_autolink_audit ADD COLUMN IF NOT EXISTS bron text;
+ALTER TABLE IF EXISTS public.logistics_autolink_audit ADD COLUMN IF NOT EXISTS status text;
+ALTER TABLE IF EXISTS public.logistics_autolink_audit ADD COLUMN IF NOT EXISTS source_line_key text;
+ALTER TABLE IF EXISTS public.logistics_autolink_audit ADD COLUMN IF NOT EXISTS melding text;
+
+CREATE OR REPLACE FUNCTION public.logistics_order_item_autolink()
+ RETURNS trigger
+ LANGUAGE plpgsql
+ SECURITY DEFINER
+ SET search_path TO 'public'
+AS $function$
+DECLARE
+  m record;
+  v_key text := NULLIF(btrim(COALESCE(NEW.source_line_key, '')), '');
+  v_res jsonb;
+  v_status text;
+  v_pid uuid;
+  v_melding text;
+BEGIN
+  -- Een al gevulde product_id nooit overschrijven.
+  IF NEW.product_id IS NOT NULL THEN RETURN NEW; END IF;
+
+  IF v_key IS NOT NULL THEN
+    -- Floriday-regel: alleen bij het aanmaken via Voorraad koppelen; nooit op naam gokken.
+    IF TG_OP <> 'INSERT' THEN RETURN NEW; END IF;
+    BEGIN
+      IF to_regprocedure('public.voorraad_orderregel_trade_item_bron(uuid,text)') IS NULL THEN
+        v_status := 'voorraad_ontbreekt';
+        v_melding := 'Voorraad-functie voorraad_orderregel_trade_item_bron ontbreekt; regel opgeslagen zonder artikel';
+      ELSE
+        EXECUTE 'SELECT public.voorraad_orderregel_trade_item_bron($1, $2)' INTO v_res USING NEW.order_id, v_key;
+        v_status := COALESCE(NULLIF(v_res->>'status', ''), 'onbekend');
+        IF v_status IN ('eenduidig', 'ok') THEN
+          BEGIN
+            v_pid := NULLIF(v_res->>'product_id', '')::uuid;
+          EXCEPTION WHEN others THEN v_pid := NULL;
+          END;
+          -- Alleen een bestaand artikel (ook gearchiveerd) koppelen.
+          IF v_pid IS NOT NULL AND EXISTS (SELECT 1 FROM public.products p WHERE p.id = v_pid) THEN
+            NEW.product_id := v_pid;
+          ELSE
+            v_melding := 'Voorraad gaf een artikel dat niet bestaat; regel opgeslagen zonder artikel';
+            v_pid := NULL;
+          END IF;
+        END IF;
+      END IF;
+    EXCEPTION WHEN others THEN
+      v_status := 'voorraad_fout';
+      v_melding := left(SQLERRM, 500);
+      v_pid := NULL;
+      NEW.product_id := NULL;
+    END;
+    BEGIN
+      INSERT INTO public.logistics_autolink_audit
+        (order_id, order_item_id, order_source, product_name, product_id, match_type, product_floriday_id,
+         bron, status, source_line_key, melding)
+      SELECT NEW.order_id, NEW.id, o.order_source, NEW.product_name::text, v_pid, v_status,
+             COALESCE(v_res->>'trade_item_id', (SELECT p.floriday_trade_item_id::text FROM public.products p WHERE p.id = v_pid)),
+             'voorraad_floriday', v_status, v_key, v_melding
+        FROM (SELECT NEW.order_id AS id) x LEFT JOIN public.orders o ON o.id = x.id;
+    EXCEPTION WHEN others THEN NULL;  -- loggen mag een orderregel nooit laten mislukken
+    END;
+    RETURN NEW;
+  END IF;
+
+  -- Mailbox- en handmatige orders (zonder source_line_key): koppelen op naam, zoals voorheen.
+  BEGIN
+    m := public.logistics_resolve_product_match(NEW.product_name::text);
+    NEW.product_id := m.product_id;
+  EXCEPTION WHEN others THEN
+    NEW.product_id := NULL;
+    RETURN NEW;
+  END;
+  IF m.match_type IN ('naam', 'onbekend')
+     AND (TG_OP = 'INSERT' OR NEW.product_name IS DISTINCT FROM OLD.product_name) THEN
+    BEGIN
+      INSERT INTO public.logistics_autolink_audit
+        (order_id, order_item_id, order_source, product_name, product_id, match_type, product_floriday_id, bron, status)
+      SELECT NEW.order_id, NEW.id, o.order_source, NEW.product_name::text, m.product_id, m.match_type,
+             (SELECT p.floriday_trade_item_id::text FROM public.products p WHERE p.id = m.product_id),
+             'naam', m.match_type
+        FROM (SELECT NEW.order_id AS id) x LEFT JOIN public.orders o ON o.id = x.id;
+    EXCEPTION WHEN others THEN NULL;
+    END;
+  END IF;
+  RETURN NEW;
+END $function$;
+
+REVOKE ALL ON FUNCTION public.logistics_order_item_autolink() FROM PUBLIC, anon, authenticated;
+GRANT EXECUTE ON FUNCTION public.logistics_order_item_autolink() TO service_role;
+
+CREATE OR REPLACE FUNCTION public.logistics_install_check_231()
+RETURNS TABLE(punt text, ok boolean, uitleg text) LANGUAGE sql STABLE SET search_path TO 'public' AS $$
+  SELECT 'koppelen via Voorraad', position('voorraad_orderregel_trade_item_bron' IN pg_get_functiondef('public.logistics_order_item_autolink()'::regprocedure)) > 0,
+         'Floriday-regels koppelen via Voorraad, nooit op naam'
+  UNION ALL SELECT 'audit-kolommen', EXISTS (SELECT 1 FROM information_schema.columns
+           WHERE table_schema = 'public' AND table_name = 'logistics_autolink_audit' AND column_name = 'bron'),
+         'Koppelaudit heeft bron en status'
+  UNION ALL SELECT 'triggervolgorde', 'trg_logistics_order_item_autolink' < 'trg_order_items_autolink',
+         'Engine-koppeling vuurt vóór de Voorraad-trigger'
+  UNION ALL SELECT 'vingerafdruk met artikel', position('product_id' IN pg_get_functiondef('public.logistics_plan_inhoud_fp(uuid)'::regprocedure)) > 0,
+         'Een later gekoppeld artikel biedt de order opnieuw aan'
+$$;
+REVOKE ALL ON FUNCTION public.logistics_install_check_231() FROM PUBLIC, anon, authenticated;
+GRANT EXECUTE ON FUNCTION public.logistics_install_check_231() TO service_role;

package/dist-lib/integrations/supabase/client.js

@@ -45,7 +45,7 @@ function createSupabaseClient() {
 }
 let _supabase;
 // Import the supabase client like this:
-// import { supabase } from "./client.js";
+// import { supabase } from "../../integrations/supabase/client.js";
 export const supabase = new Proxy({}, {
     get(_, prop, receiver) {
         if (!_supabase)

package/dist-lib/integrations/supabase/client.server.js

@@ -20,7 +20,7 @@ function createSupabaseAdminClient() {
 let _supabaseAdmin;
 // Server-side Supabase client with service role - bypasses RLS
 // SECURITY: Only use this for trusted server-side operations, never expose to client code
-// Import like: import { supabaseAdmin } from "./client.server.js";
+// Import like: import { supabaseAdmin } from "../../integrations/supabase/client.server.js";
 export const supabaseAdmin = new Proxy({}, {
     get(_, prop, receiver) {
         if (!_supabaseAdmin)