@flowselections/floriday-verkoop-module 1.0.159 → 1.0.161
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist-lib/components/verkoop/OrderKarindelingCard.d.ts +1 -0
- package/dist-lib/components/verkoop/OrderKarindelingCard.d.ts.map +1 -1
- package/dist-lib/components/verkoop/OrderKarindelingCard.js +7 -2
- package/dist-lib/components/verkoop/OrderTransportCard.d.ts.map +1 -1
- package/dist-lib/components/verkoop/OrderTransportCard.js +6 -4
- package/dist-lib/components/verkoop/SalesOrderDetailPage.js +1 -1
- package/dist-lib/components/verkoop/SalesOrderDetailView.js +7 -4
- package/dist-lib/components/verkoop/VerkoopOrdersPage.d.ts.map +1 -1
- package/dist-lib/components/verkoop/VerkoopOrdersPage.js +11 -1
- package/dist-lib/components/verkoop/klok/KlokOrderPage.d.ts.map +1 -1
- package/dist-lib/components/verkoop/klok/KlokOrderPage.js +21 -6
- package/dist-lib/components/verkoop/klok/KlokOrdersList.d.ts.map +1 -1
- package/dist-lib/components/verkoop/klok/KlokOrdersList.js +3 -3
- package/dist-lib/integrations/supabase/types.d.ts +1860 -0
- package/dist-lib/integrations/supabase/types.d.ts.map +1 -1
- package/dist-lib/lib/cart-replan.functions.d.ts +6 -0
- package/dist-lib/lib/cart-replan.functions.d.ts.map +1 -1
- package/dist-lib/lib/cart-replan.functions.js +18 -8
- package/dist-lib/lib/cron/sync-salesorders-now.d.ts +1 -0
- package/dist-lib/lib/cron/sync-salesorders-now.d.ts.map +1 -1
- package/dist-lib/lib/cron/sync-salesorders-now.js +26 -2
- package/dist-lib/lib/cron/sync-salesorders.d.ts.map +1 -1
- package/dist-lib/lib/cron/sync-salesorders.js +12 -0
- package/dist-lib/lib/engine-block-alerts.server.d.ts.map +1 -1
- package/dist-lib/lib/engine-block-alerts.server.js +3 -1
- package/dist-lib/lib/floriday-actual-carriers.d.ts +18 -0
- package/dist-lib/lib/floriday-actual-carriers.d.ts.map +1 -0
- package/dist-lib/lib/floriday-actual-carriers.js +26 -0
- package/dist-lib/lib/floriday-actual-carriers.server.d.ts +6 -0
- package/dist-lib/lib/floriday-actual-carriers.server.d.ts.map +1 -0
- package/dist-lib/lib/floriday-actual-carriers.server.js +31 -0
- package/dist-lib/lib/floriday-backfill.d.ts +26 -0
- package/dist-lib/lib/floriday-backfill.d.ts.map +1 -0
- package/dist-lib/lib/floriday-backfill.js +43 -0
- package/dist-lib/lib/floriday-backfill.server.d.ts +2 -0
- package/dist-lib/lib/floriday-backfill.server.d.ts.map +1 -0
- package/dist-lib/lib/floriday-backfill.server.js +32 -0
- package/dist-lib/lib/floriday-mirror.server.d.ts +2 -1
- package/dist-lib/lib/floriday-mirror.server.d.ts.map +1 -1
- package/dist-lib/lib/floriday-mirror.server.js +30 -49
- package/dist-lib/lib/floriday-status.d.ts +9 -0
- package/dist-lib/lib/floriday-status.d.ts.map +1 -1
- package/dist-lib/lib/floriday-status.js +12 -0
- package/dist-lib/lib/invoice-timing.d.ts +9 -0
- package/dist-lib/lib/invoice-timing.d.ts.map +1 -1
- package/dist-lib/lib/invoice-timing.js +15 -0
- package/dist-lib/lib/invoice-timing.server.d.ts.map +1 -1
- package/dist-lib/lib/invoice-timing.server.js +8 -3
- package/dist-lib/lib/klok-labels.d.ts +4 -1
- package/dist-lib/lib/klok-labels.d.ts.map +1 -1
- package/dist-lib/lib/klok-labels.js +10 -1
- package/dist-lib/lib/list-own-rows.d.ts +9 -0
- package/dist-lib/lib/list-own-rows.d.ts.map +1 -0
- package/dist-lib/lib/list-own-rows.js +20 -0
- package/dist-lib/lib/order-departure.d.ts +1 -1
- package/dist-lib/lib/order-departure.d.ts.map +1 -1
- package/dist-lib/lib/order-departure.js +1 -1
- package/dist-lib/lib/order-status.d.ts +15 -1
- package/dist-lib/lib/order-status.d.ts.map +1 -1
- package/dist-lib/lib/order-status.js +17 -1
- package/dist-lib/lib/salesorders-list.server.d.ts.map +1 -1
- package/dist-lib/lib/salesorders-list.server.js +70 -4
- package/dist-lib/lib/salesorders-mapping.d.ts +2 -0
- package/dist-lib/lib/salesorders-mapping.d.ts.map +1 -1
- package/dist-lib/lib/salesorders-mapping.js +1 -1
- package/dist-lib/lib/salesorders.functions.d.ts.map +1 -1
- package/dist-lib/lib/salesorders.functions.js +12 -3
- package/dist-lib/lib/sync-melding.d.ts +11 -0
- package/dist-lib/lib/sync-melding.d.ts.map +1 -0
- package/dist-lib/lib/sync-melding.functions.d.ts +8 -0
- package/dist-lib/lib/sync-melding.functions.d.ts.map +1 -0
- package/dist-lib/lib/sync-melding.functions.js +19 -0
- package/dist-lib/lib/sync-melding.js +19 -0
- package/package.json +26 -1
- package/schema/verkoop.sql +929 -1
package/schema/verkoop.sql
CHANGED
|
@@ -3403,4 +3403,932 @@ BEGIN
|
|
|
3403
3403
|
DELETE FROM public.verkoop_klok_events WHERE created_at < now() - interval '90 days';
|
|
3404
3404
|
END $$;
|
|
3405
3405
|
REVOKE ALL ON FUNCTION public.verkoop_klok_log(uuid, text, boolean, text, jsonb, uuid) FROM PUBLIC, anon, authenticated;
|
|
3406
|
-
GRANT EXECUTE ON FUNCTION public.verkoop_klok_log(uuid, text, boolean, text, jsonb, uuid) TO service_role;
|
|
3406
|
+
GRANT EXECUTE ON FUNCTION public.verkoop_klok_log(uuid, text, boolean, text, jsonb, uuid) TO service_role;
|
|
3407
|
+
-- Bewaking Floriday-omzetting, wachtjob en inhaal-voorbeeld (Verkoop 1.0.159).
|
|
3408
|
+
ALTER TABLE public.verkoop_sync_state ADD COLUMN IF NOT EXISTS last_ok_at timestamptz;
|
|
3409
|
+
ALTER TABLE public.verkoop_sync_state ADD COLUMN IF NOT EXISTS last_error_at timestamptz;
|
|
3410
|
+
ALTER TABLE public.verkoop_sync_state ADD COLUMN IF NOT EXISTS last_error text;
|
|
3411
|
+
|
|
3412
|
+
CREATE TABLE IF NOT EXISTS public.verkoop_alerts (
|
|
3413
|
+
id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
|
|
3414
|
+
soort text NOT NULL,
|
|
3415
|
+
bericht text NOT NULL,
|
|
3416
|
+
details jsonb NOT NULL DEFAULT '{}'::jsonb,
|
|
3417
|
+
created_at timestamptz NOT NULL DEFAULT now(),
|
|
3418
|
+
resolved_at timestamptz
|
|
3419
|
+
);
|
|
3420
|
+
GRANT SELECT ON public.verkoop_alerts TO authenticated;
|
|
3421
|
+
GRANT ALL ON public.verkoop_alerts TO service_role;
|
|
3422
|
+
ALTER TABLE public.verkoop_alerts ENABLE ROW LEVEL SECURITY;
|
|
3423
|
+
DO $$ BEGIN
|
|
3424
|
+
IF NOT EXISTS (SELECT 1 FROM pg_policies WHERE schemaname='public' AND tablename='verkoop_alerts' AND policyname='Ingelogde gebruikers lezen Verkoop-meldingen') THEN
|
|
3425
|
+
CREATE POLICY "Ingelogde gebruikers lezen Verkoop-meldingen" ON public.verkoop_alerts FOR SELECT TO authenticated USING (true);
|
|
3426
|
+
END IF;
|
|
3427
|
+
END $$;
|
|
3428
|
+
CREATE INDEX IF NOT EXISTS verkoop_alerts_open_idx ON public.verkoop_alerts (soort, created_at DESC) WHERE resolved_at IS NULL;
|
|
3429
|
+
|
|
3430
|
+
-- Floriday-bestellingen in de cache zonder order (gemist). Alleen lezen.
|
|
3431
|
+
CREATE OR REPLACE FUNCTION public.verkoop_fo_zonder_order(p_sinds timestamptz, p_min_leeftijd interval)
|
|
3432
|
+
RETURNS TABLE(floriday_id text, ontvangen_at timestamptz, leverdatum date, categorie text)
|
|
3433
|
+
LANGUAGE plpgsql STABLE SECURITY DEFINER SET search_path = public
|
|
3434
|
+
AS $$
|
|
3435
|
+
BEGIN
|
|
3436
|
+
IF NOT public.verkoop_is_server() THEN
|
|
3437
|
+
PERFORM public.verkoop_assert_caller('rol', '{admin,superadmin}'::public.app_role[]);
|
|
3438
|
+
END IF;
|
|
3439
|
+
IF to_regclass('public.floriday_salesorders_cache') IS NULL THEN RETURN; END IF;
|
|
3440
|
+
RETURN QUERY
|
|
3441
|
+
WITH kand AS MATERIALIZED (
|
|
3442
|
+
SELECT c.floriday_id AS fid, c.created_at AS ontv, c.status AS st,
|
|
3443
|
+
c.data->>'salesOrderGroupId' AS gid, c.buyer_organization_id AS org,
|
|
3444
|
+
c.data->'delivery'->>'latestDeliveryDateTime' AS lev
|
|
3445
|
+
FROM public.floriday_salesorders_cache c
|
|
3446
|
+
WHERE NOT coalesce(c.is_deleted, false)
|
|
3447
|
+
AND c.created_at >= p_sinds
|
|
3448
|
+
AND c.created_at < now() - p_min_leeftijd
|
|
3449
|
+
AND NOT EXISTS (SELECT 1 FROM public.orders o WHERE o.floriday_sales_order_id = c.floriday_id)
|
|
3450
|
+
), rest AS MATERIALIZED (
|
|
3451
|
+
SELECT k.* FROM kand k
|
|
3452
|
+
WHERE NOT (k.gid IS NOT NULL AND EXISTS (SELECT 1 FROM public.orders o
|
|
3453
|
+
WHERE o.floriday_order_group_key = 'fo|g|' || coalesce(k.org,'') || '|' || k.gid))
|
|
3454
|
+
)
|
|
3455
|
+
SELECT r.fid, r.ontv,
|
|
3456
|
+
CASE WHEN r.lev ~ '^\d{4}-\d{2}-\d{2}T' THEN (r.lev::timestamptz AT TIME ZONE 'Europe/Amsterdam')::date END,
|
|
3457
|
+
CASE WHEN upper(coalesce(r.st,'')) IN ('CANCELLED','CANCELED','DELETED','REJECTED') THEN 'geannuleerd'
|
|
3458
|
+
WHEN EXISTS (SELECT 1 FROM public.verkoop_fulfillment_index f WHERE f.sales_order_id = r.fid AND NOT coalesce(f.is_deleted,false)) THEN 'afgehandeld'
|
|
3459
|
+
WHEN r.lev ~ '^\d{4}-\d{2}-\d{2}T'
|
|
3460
|
+
AND (r.lev::timestamptz AT TIME ZONE 'Europe/Amsterdam')::date < (now() AT TIME ZONE 'Europe/Amsterdam')::date THEN 'verleden'
|
|
3461
|
+
ELSE 'toekomst' END
|
|
3462
|
+
FROM rest r
|
|
3463
|
+
WHERE NOT EXISTS (SELECT 1 FROM public.orders o
|
|
3464
|
+
WHERE jsonb_typeof(o.custom_fields->'floriday_sales_order_ids') = 'array'
|
|
3465
|
+
AND o.custom_fields->'floriday_sales_order_ids' ? r.fid);
|
|
3466
|
+
END $$;
|
|
3467
|
+
REVOKE ALL ON FUNCTION public.verkoop_fo_zonder_order(timestamptz, interval) FROM PUBLIC, anon;
|
|
3468
|
+
GRANT EXECUTE ON FUNCTION public.verkoop_fo_zonder_order(timestamptz, interval) TO authenticated, service_role;
|
|
3469
|
+
|
|
3470
|
+
-- Inhalen van gemiste Floriday-orders (backfill) via de gewone omzetroute.
|
|
3471
|
+
CREATE TABLE IF NOT EXISTS public.verkoop_inhaal_items (
|
|
3472
|
+
sales_order_id text PRIMARY KEY,
|
|
3473
|
+
run_id uuid NOT NULL,
|
|
3474
|
+
sinds timestamptz NOT NULL,
|
|
3475
|
+
categorie text NOT NULL,
|
|
3476
|
+
status text NOT NULL DEFAULT 'aangevraagd',
|
|
3477
|
+
melding text,
|
|
3478
|
+
order_id uuid,
|
|
3479
|
+
pogingen integer NOT NULL DEFAULT 1,
|
|
3480
|
+
aangevraagd_at timestamptz NOT NULL DEFAULT now(),
|
|
3481
|
+
verwerkt_at timestamptz,
|
|
3482
|
+
created_at timestamptz NOT NULL DEFAULT now(),
|
|
3483
|
+
updated_at timestamptz NOT NULL DEFAULT now()
|
|
3484
|
+
);
|
|
3485
|
+
GRANT ALL ON public.verkoop_inhaal_items TO service_role;
|
|
3486
|
+
ALTER TABLE public.verkoop_inhaal_items ENABLE ROW LEVEL SECURITY;
|
|
3487
|
+
DROP TRIGGER IF EXISTS verkoop_inhaal_items_updated_at ON public.verkoop_inhaal_items;
|
|
3488
|
+
CREATE TRIGGER verkoop_inhaal_items_updated_at BEFORE UPDATE ON public.verkoop_inhaal_items
|
|
3489
|
+
FOR EACH ROW EXECUTE FUNCTION public.update_updated_at_column();
|
|
3490
|
+
|
|
3491
|
+
-- Ondersteunen Voorraad en Engine backfill-orders? Controle op functienaam.
|
|
3492
|
+
CREATE OR REPLACE FUNCTION public.verkoop_inhaal_ondersteund()
|
|
3493
|
+
RETURNS jsonb LANGUAGE sql STABLE SECURITY DEFINER SET search_path = public
|
|
3494
|
+
AS $$
|
|
3495
|
+
SELECT jsonb_build_object(
|
|
3496
|
+
'engine', to_regprocedure('public.logistics_order_is_backfill(uuid)') IS NOT NULL,
|
|
3497
|
+
'voorraad', to_regprocedure('public.voorraad_order_is_backfill(uuid)') IS NOT NULL,
|
|
3498
|
+
'ok', to_regprocedure('public.logistics_order_is_backfill(uuid)') IS NOT NULL
|
|
3499
|
+
AND to_regprocedure('public.voorraad_order_is_backfill(uuid)') IS NOT NULL);
|
|
3500
|
+
$$;
|
|
3501
|
+
REVOKE ALL ON FUNCTION public.verkoop_inhaal_ondersteund() FROM PUBLIC, anon;
|
|
3502
|
+
GRANT EXECUTE ON FUNCTION public.verkoop_inhaal_ondersteund() TO authenticated, service_role;
|
|
3503
|
+
|
|
3504
|
+
-- Voorbeeld: aantallen per categorie plus nieuwe klanten. Alleen lezen.
|
|
3505
|
+
CREATE OR REPLACE FUNCTION public.verkoop_inhaal_preview(p_sinds timestamptz)
|
|
3506
|
+
RETURNS jsonb LANGUAGE plpgsql STABLE SECURITY DEFINER SET search_path = public
|
|
3507
|
+
AS $$
|
|
3508
|
+
DECLARE v jsonb;
|
|
3509
|
+
BEGIN
|
|
3510
|
+
IF NOT public.verkoop_is_server() THEN
|
|
3511
|
+
PERFORM public.verkoop_assert_caller('rol', '{admin,superadmin}'::public.app_role[]);
|
|
3512
|
+
END IF;
|
|
3513
|
+
WITH kand AS MATERIALIZED (
|
|
3514
|
+
SELECT * FROM public.verkoop_fo_zonder_order(p_sinds, interval '0')
|
|
3515
|
+
), nk AS (
|
|
3516
|
+
SELECT c.buyer_organization_id AS org,
|
|
3517
|
+
coalesce(max(fc.data->>'name'), max(fc.data->>'commercialName'), c.buyer_organization_id) AS naam,
|
|
3518
|
+
count(*) AS n
|
|
3519
|
+
FROM kand z
|
|
3520
|
+
JOIN public.floriday_salesorders_cache c ON c.floriday_id = z.floriday_id
|
|
3521
|
+
LEFT JOIN public.floriday_customers_cache fc ON fc.organization_id = c.buyer_organization_id
|
|
3522
|
+
WHERE z.categorie IN ('afgehandeld','verleden')
|
|
3523
|
+
AND c.buyer_organization_id IS NOT NULL
|
|
3524
|
+
AND NOT EXISTS (SELECT 1 FROM public.customers cu WHERE cu.floriday_organization_id = c.buyer_organization_id)
|
|
3525
|
+
GROUP BY c.buyer_organization_id
|
|
3526
|
+
), kl AS (
|
|
3527
|
+
SELECT coalesce(jsonb_agg(jsonb_build_object('organisatie_id', org, 'naam', naam, 'orders', n) ORDER BY naam), '[]'::jsonb) AS lijst FROM nk
|
|
3528
|
+
)
|
|
3529
|
+
SELECT jsonb_build_object(
|
|
3530
|
+
'sinds', p_sinds,
|
|
3531
|
+
'totaal', (SELECT count(*) FROM kand),
|
|
3532
|
+
'afgehandeld', (SELECT count(*) FROM kand WHERE categorie='afgehandeld'),
|
|
3533
|
+
'verleden', (SELECT count(*) FROM kand WHERE categorie='verleden'),
|
|
3534
|
+
'toekomst', (SELECT count(*) FROM kand WHERE categorie='toekomst'),
|
|
3535
|
+
'geannuleerd', (SELECT count(*) FROM kand WHERE categorie='geannuleerd'),
|
|
3536
|
+
'oudste', (SELECT min(ontvangen_at) FROM kand), 'nieuwste', (SELECT max(ontvangen_at) FROM kand),
|
|
3537
|
+
'nieuwe_klanten', jsonb_build_object('aantal', jsonb_array_length(kl.lijst), 'klanten', kl.lijst))
|
|
3538
|
+
INTO v FROM kl;
|
|
3539
|
+
RETURN v;
|
|
3540
|
+
END $$;
|
|
3541
|
+
REVOKE ALL ON FUNCTION public.verkoop_inhaal_preview(timestamptz) FROM PUBLIC, anon;
|
|
3542
|
+
GRANT EXECUTE ON FUNCTION public.verkoop_inhaal_preview(timestamptz) TO authenticated, service_role;
|
|
3543
|
+
|
|
3544
|
+
-- Inhalen uitvoeren: zet hooguit p_max orders in de inhaallijst en vraagt de
|
|
3545
|
+
-- gewone omzetroute aan (eigen Verkoop-sleutel via verkoop_cron_post).
|
|
3546
|
+
CREATE OR REPLACE FUNCTION public.verkoop_inhaal_uitvoeren(p_sinds timestamptz, p_max integer DEFAULT 100)
|
|
3547
|
+
RETURNS jsonb LANGUAGE plpgsql VOLATILE SECURITY DEFINER SET search_path = public
|
|
3548
|
+
AS $$
|
|
3549
|
+
DECLARE
|
|
3550
|
+
v_ok jsonb; v_run uuid := gen_random_uuid(); v_max int := least(greatest(coalesce(p_max,100),1),200);
|
|
3551
|
+
v_ids text[]; v_part text[]; v_req jsonb := '[]'::jsonb; v_al int := 0; v_opnieuw int := 0; i int;
|
|
3552
|
+
BEGIN
|
|
3553
|
+
IF NOT public.verkoop_is_server() THEN
|
|
3554
|
+
PERFORM public.verkoop_assert_caller('rol', '{admin,superadmin}'::public.app_role[]);
|
|
3555
|
+
END IF;
|
|
3556
|
+
IF p_sinds IS NULL THEN RAISE EXCEPTION 'Inhalen geweigerd: geef een begintijd op (p_sinds).'; END IF;
|
|
3557
|
+
v_ok := public.verkoop_inhaal_ondersteund();
|
|
3558
|
+
IF NOT coalesce((v_ok->>'ok')::boolean, false) THEN
|
|
3559
|
+
RAISE EXCEPTION 'Inhalen geweigerd: %. Werk die module eerst bij; er is niets gewijzigd.',
|
|
3560
|
+
concat_ws(' en ',
|
|
3561
|
+
CASE WHEN NOT (v_ok->>'voorraad')::boolean THEN 'Voorraad slaat ingehaalde orders nog niet over (voorraad_order_is_backfill ontbreekt)' END,
|
|
3562
|
+
CASE WHEN NOT (v_ok->>'engine')::boolean THEN 'de Logistiek Engine slaat ingehaalde orders nog niet over (logistics_order_is_backfill ontbreekt)' END);
|
|
3563
|
+
END IF;
|
|
3564
|
+
IF NOT pg_try_advisory_xact_lock(hashtext('verkoop_inhaal_uitvoeren')) THEN
|
|
3565
|
+
RETURN jsonb_build_object('bezig', true, 'melding', 'Er loopt al een inhaalaanroep; probeer het over een minuut opnieuw.');
|
|
3566
|
+
END IF;
|
|
3567
|
+
|
|
3568
|
+
-- Al omgezet (door een eerdere aanvraag of de minuutronde): bijwerken.
|
|
3569
|
+
UPDATE public.verkoop_inhaal_items it
|
|
3570
|
+
SET status = CASE WHEN o.custom_fields ? 'backfill' THEN 'aangemaakt' ELSE 'al_aanwezig' END,
|
|
3571
|
+
order_id = o.id, verwerkt_at = coalesce(it.verwerkt_at, now()), melding = NULL
|
|
3572
|
+
FROM public.orders o
|
|
3573
|
+
WHERE it.status IN ('aangevraagd','fout')
|
|
3574
|
+
AND (o.floriday_sales_order_id = it.sales_order_id
|
|
3575
|
+
OR (jsonb_typeof(o.custom_fields->'floriday_sales_order_ids') = 'array' AND o.custom_fields->'floriday_sales_order_ids' ? it.sales_order_id));
|
|
3576
|
+
GET DIAGNOSTICS v_al = ROW_COUNT;
|
|
3577
|
+
|
|
3578
|
+
-- Kandidaten: nieuw, of fout/vastgelopen (>10 min aangevraagd). Geannuleerd en toekomst nooit.
|
|
3579
|
+
SELECT array_agg(z.floriday_id ORDER BY z.ontvangen_at) INTO v_ids
|
|
3580
|
+
FROM (SELECT z.* FROM public.verkoop_fo_zonder_order(p_sinds, interval '0') z
|
|
3581
|
+
LEFT JOIN public.verkoop_inhaal_items it ON it.sales_order_id = z.floriday_id
|
|
3582
|
+
WHERE z.categorie IN ('afgehandeld','verleden')
|
|
3583
|
+
AND (it.sales_order_id IS NULL OR it.status = 'fout'
|
|
3584
|
+
OR (it.status = 'aangevraagd' AND it.aangevraagd_at < now() - interval '10 minutes'))
|
|
3585
|
+
ORDER BY z.ontvangen_at LIMIT v_max) z;
|
|
3586
|
+
|
|
3587
|
+
IF coalesce(array_length(v_ids,1),0) > 0 THEN
|
|
3588
|
+
INSERT INTO public.verkoop_inhaal_items AS it (sales_order_id, run_id, sinds, categorie, status)
|
|
3589
|
+
SELECT z.floriday_id, v_run, p_sinds, z.categorie, 'aangevraagd'
|
|
3590
|
+
FROM public.verkoop_fo_zonder_order(p_sinds, interval '0') z WHERE z.floriday_id = ANY(v_ids)
|
|
3591
|
+
ON CONFLICT (sales_order_id) DO UPDATE
|
|
3592
|
+
SET run_id = EXCLUDED.run_id, status = 'aangevraagd', melding = NULL, aangevraagd_at = now(),
|
|
3593
|
+
pogingen = it.pogingen + 1, categorie = EXCLUDED.categorie;
|
|
3594
|
+
SELECT count(*) INTO v_opnieuw FROM public.verkoop_inhaal_items WHERE run_id = v_run AND pogingen > 1;
|
|
3595
|
+
|
|
3596
|
+
i := 1;
|
|
3597
|
+
WHILE i <= array_length(v_ids,1) LOOP
|
|
3598
|
+
v_part := v_ids[i:i+49];
|
|
3599
|
+
v_req := v_req || jsonb_build_array(public.verkoop_cron_post('/api/public/cron/sync-salesorders-now',
|
|
3600
|
+
jsonb_build_object('salesOrderIds', to_jsonb(v_part), 'backfill', true), 55000));
|
|
3601
|
+
i := i + 50;
|
|
3602
|
+
END LOOP;
|
|
3603
|
+
END IF;
|
|
3604
|
+
|
|
3605
|
+
RETURN jsonb_build_object(
|
|
3606
|
+
'run_id', v_run, 'sinds', p_sinds, 'max', v_max,
|
|
3607
|
+
'aangevraagd', coalesce(array_length(v_ids,1),0),
|
|
3608
|
+
'waarvan_opnieuw', v_opnieuw,
|
|
3609
|
+
'net_bijgewerkt_als_omgezet', v_al,
|
|
3610
|
+
'verzoeken', v_req,
|
|
3611
|
+
'resterend', (SELECT count(*) FROM public.verkoop_fo_zonder_order(p_sinds, interval '0') z
|
|
3612
|
+
LEFT JOIN public.verkoop_inhaal_items it ON it.sales_order_id = z.floriday_id
|
|
3613
|
+
WHERE z.categorie IN ('afgehandeld','verleden') AND it.sales_order_id IS NULL),
|
|
3614
|
+
'overgeslagen_geannuleerd', (SELECT count(*) FROM public.verkoop_fo_zonder_order(p_sinds, interval '0') WHERE categorie = 'geannuleerd'),
|
|
3615
|
+
'melding', 'Aangevraagd. Bekijk de uitkomst over een minuut met verkoop_inhaal_status().');
|
|
3616
|
+
END $$;
|
|
3617
|
+
REVOKE ALL ON FUNCTION public.verkoop_inhaal_uitvoeren(timestamptz, integer) FROM PUBLIC, anon;
|
|
3618
|
+
GRANT EXECUTE ON FUNCTION public.verkoop_inhaal_uitvoeren(timestamptz, integer) TO authenticated, service_role;
|
|
3619
|
+
|
|
3620
|
+
-- Uitkomst per order (alleen lezen).
|
|
3621
|
+
CREATE OR REPLACE FUNCTION public.verkoop_inhaal_status(p_run_id uuid DEFAULT NULL)
|
|
3622
|
+
RETURNS jsonb LANGUAGE plpgsql STABLE SECURITY DEFINER SET search_path = public
|
|
3623
|
+
AS $$
|
|
3624
|
+
DECLARE v jsonb;
|
|
3625
|
+
BEGIN
|
|
3626
|
+
IF NOT public.verkoop_is_server() THEN
|
|
3627
|
+
PERFORM public.verkoop_assert_caller('rol', '{admin,superadmin}'::public.app_role[]);
|
|
3628
|
+
END IF;
|
|
3629
|
+
WITH it AS (
|
|
3630
|
+
SELECT i.*, (i.status = 'aangevraagd' AND i.aangevraagd_at < now() - interval '10 minutes') AS vast
|
|
3631
|
+
FROM public.verkoop_inhaal_items i WHERE p_run_id IS NULL OR i.run_id = p_run_id)
|
|
3632
|
+
SELECT jsonb_build_object(
|
|
3633
|
+
'totaal', count(*),
|
|
3634
|
+
'aangemaakt', count(*) FILTER (WHERE status = 'aangemaakt'),
|
|
3635
|
+
'al_aanwezig', count(*) FILTER (WHERE status = 'al_aanwezig'),
|
|
3636
|
+
'fout', count(*) FILTER (WHERE status = 'fout'),
|
|
3637
|
+
'wacht', count(*) FILTER (WHERE status = 'aangevraagd' AND NOT vast),
|
|
3638
|
+
'vastgelopen', count(*) FILTER (WHERE vast),
|
|
3639
|
+
'per_order', coalesce(jsonb_agg(jsonb_build_object(
|
|
3640
|
+
'sales_order_id', sales_order_id, 'categorie', categorie,
|
|
3641
|
+
'status', CASE WHEN vast THEN 'vastgelopen' ELSE status END,
|
|
3642
|
+
'order_id', order_id, 'melding', melding, 'pogingen', pogingen,
|
|
3643
|
+
'aangevraagd_at', aangevraagd_at, 'verwerkt_at', verwerkt_at) ORDER BY aangevraagd_at, sales_order_id), '[]'::jsonb),
|
|
3644
|
+
'tip', 'Vastgelopen of fout? Roep verkoop_inhaal_uitvoeren opnieuw aan; die vraagt ze opnieuw aan.')
|
|
3645
|
+
INTO v FROM it;
|
|
3646
|
+
RETURN v;
|
|
3647
|
+
END $$;
|
|
3648
|
+
REVOKE ALL ON FUNCTION public.verkoop_inhaal_status(uuid) FROM PUBLIC, anon;
|
|
3649
|
+
GRANT EXECUTE ON FUNCTION public.verkoop_inhaal_status(uuid) TO authenticated, service_role;
|
|
3650
|
+
|
|
3651
|
+
-- Bewaking (alleen SQL): cron herstellen, stilstand en achterstand melden.
|
|
3652
|
+
CREATE OR REPLACE FUNCTION public.verkoop_sync_bewaking()
|
|
3653
|
+
RETURNS jsonb LANGUAGE plpgsql SECURITY DEFINER SET search_path = public
|
|
3654
|
+
AS $$
|
|
3655
|
+
DECLARE v_bad int := 0; v_heal jsonb; v_job boolean := false; v_ok_at timestamptz; v_err_at timestamptz; v_err text;
|
|
3656
|
+
v_n int := 0; v_oudste timestamptz; v_route_fout boolean; v_achter boolean; v_401 int;
|
|
3657
|
+
BEGIN
|
|
3658
|
+
IF NOT public.verkoop_is_server() THEN
|
|
3659
|
+
PERFORM public.verkoop_assert_caller('rol', '{admin,superadmin}'::public.app_role[]);
|
|
3660
|
+
END IF;
|
|
3661
|
+
IF to_regclass('cron.job') IS NOT NULL THEN
|
|
3662
|
+
EXECUTE $q$SELECT count(*)::int FROM cron.job WHERE jobname IN ('verkoop-salesorders-sync-1min','invoice-due-verkoop')
|
|
3663
|
+
AND (command NOT LIKE '%verkoop_cron_post(%' OR NOT active)$q$ INTO v_bad;
|
|
3664
|
+
EXECUTE $q$SELECT EXISTS (SELECT 1 FROM cron.job WHERE jobname='verkoop-salesorders-sync-1min')$q$ INTO v_job;
|
|
3665
|
+
IF v_bad > 0 OR NOT v_job THEN
|
|
3666
|
+
BEGIN
|
|
3667
|
+
v_heal := public.verkoop_ensure_cron();
|
|
3668
|
+
EXCEPTION WHEN OTHERS THEN
|
|
3669
|
+
v_heal := jsonb_build_object('ok', false, 'error', SQLERRM);
|
|
3670
|
+
RAISE WARNING '[verkoop] cron herstellen mislukt: %', SQLERRM;
|
|
3671
|
+
END;
|
|
3672
|
+
END IF;
|
|
3673
|
+
END IF;
|
|
3674
|
+
|
|
3675
|
+
SELECT last_ok_at, last_error_at, last_error INTO v_ok_at, v_err_at, v_err
|
|
3676
|
+
FROM public.verkoop_sync_state WHERE key = 'salesorders-heartbeat';
|
|
3677
|
+
SELECT count(*)::int, min(ontvangen_at) INTO v_n, v_oudste
|
|
3678
|
+
FROM public.verkoop_fo_zonder_order(now() - interval '14 days', interval '15 minutes') WHERE categorie <> 'geannuleerd';
|
|
3679
|
+
IF to_regclass('net._http_response') IS NOT NULL THEN
|
|
3680
|
+
EXECUTE $q$SELECT count(*)::int FROM net._http_response WHERE status_code = 401 AND created > now() - interval '15 minutes'$q$ INTO v_401;
|
|
3681
|
+
END IF;
|
|
3682
|
+
|
|
3683
|
+
v_route_fout := coalesce((v_ok_at IS NULL AND v_n > 0) OR v_ok_at < now() - interval '10 minutes'
|
|
3684
|
+
OR (v_err_at IS NOT NULL AND v_err_at > coalesce(v_ok_at, '-infinity'::timestamptz)), false);
|
|
3685
|
+
v_achter := v_n > 0;
|
|
3686
|
+
|
|
3687
|
+
IF v_route_fout THEN
|
|
3688
|
+
IF NOT EXISTS (SELECT 1 FROM public.verkoop_alerts WHERE soort='sync_route' AND resolved_at IS NULL AND created_at > now() - interval '4 hours') THEN
|
|
3689
|
+
INSERT INTO public.verkoop_alerts(soort, bericht, details) VALUES ('sync_route',
|
|
3690
|
+
'De omzetting van Floriday-orders geeft geen geldig antwoord.',
|
|
3691
|
+
jsonb_build_object('laatste_ok', v_ok_at, 'laatste_fout', v_err_at, 'fout', v_err, 'http_401_15min', v_401, 'herstel', v_heal));
|
|
3692
|
+
END IF;
|
|
3693
|
+
ELSE
|
|
3694
|
+
UPDATE public.verkoop_alerts SET resolved_at = now() WHERE soort='sync_route' AND resolved_at IS NULL;
|
|
3695
|
+
END IF;
|
|
3696
|
+
IF v_achter THEN
|
|
3697
|
+
IF NOT EXISTS (SELECT 1 FROM public.verkoop_alerts WHERE soort='achterstand' AND resolved_at IS NULL AND created_at > now() - interval '4 hours') THEN
|
|
3698
|
+
INSERT INTO public.verkoop_alerts(soort, bericht, details) VALUES ('achterstand',
|
|
3699
|
+
format('%s Floriday-order(s) wachten langer dan 15 minuten op omzetting.', v_n),
|
|
3700
|
+
jsonb_build_object('aantal', v_n, 'oudste', v_oudste));
|
|
3701
|
+
END IF;
|
|
3702
|
+
ELSE
|
|
3703
|
+
UPDATE public.verkoop_alerts SET resolved_at = now() WHERE soort='achterstand' AND resolved_at IS NULL;
|
|
3704
|
+
END IF;
|
|
3705
|
+
DELETE FROM public.verkoop_alerts WHERE resolved_at < now() - interval '90 days';
|
|
3706
|
+
|
|
3707
|
+
INSERT INTO public.verkoop_sync_state(key, updated_at) VALUES ('bewaking', now())
|
|
3708
|
+
ON CONFLICT (key) DO UPDATE SET updated_at = now();
|
|
3709
|
+
RETURN jsonb_build_object('route_ok', NOT v_route_fout, 'laatste_ok', v_ok_at, 'wachten', v_n, 'oudste', v_oudste,
|
|
3710
|
+
'http_401_15min', v_401, 'herstel', v_heal);
|
|
3711
|
+
END $$;
|
|
3712
|
+
REVOKE ALL ON FUNCTION public.verkoop_sync_bewaking() FROM PUBLIC, anon, authenticated;
|
|
3713
|
+
GRANT EXECUTE ON FUNCTION public.verkoop_sync_bewaking() TO service_role;
|
|
3714
|
+
|
|
3715
|
+
-- Melding voor het scherm: alleen beheerders zien iets; anderen krijgen zichtbaar=false.
|
|
3716
|
+
CREATE OR REPLACE FUNCTION public.verkoop_sync_melding()
|
|
3717
|
+
RETURNS jsonb LANGUAGE plpgsql STABLE SECURITY DEFINER SET search_path = public
|
|
3718
|
+
AS $$
|
|
3719
|
+
DECLARE v_open boolean; v_n int; v_oudste timestamptz; v_ok_at timestamptz;
|
|
3720
|
+
BEGIN
|
|
3721
|
+
IF auth.uid() IS NULL OR NOT (public.has_role(auth.uid(), 'admin') OR public.has_role(auth.uid(), 'superadmin')) THEN
|
|
3722
|
+
RETURN jsonb_build_object('zichtbaar', false);
|
|
3723
|
+
END IF;
|
|
3724
|
+
SELECT EXISTS (SELECT 1 FROM public.verkoop_alerts WHERE resolved_at IS NULL AND soort IN ('sync_route','achterstand')) INTO v_open;
|
|
3725
|
+
IF NOT v_open THEN RETURN jsonb_build_object('zichtbaar', false); END IF;
|
|
3726
|
+
SELECT (details->>'aantal')::int, (details->>'oudste')::timestamptz INTO v_n, v_oudste
|
|
3727
|
+
FROM public.verkoop_alerts WHERE soort='achterstand' AND resolved_at IS NULL ORDER BY created_at DESC LIMIT 1;
|
|
3728
|
+
SELECT last_ok_at INTO v_ok_at FROM public.verkoop_sync_state WHERE key='salesorders-heartbeat';
|
|
3729
|
+
RETURN jsonb_build_object('zichtbaar', true, 'sinds', coalesce(v_oudste, v_ok_at), 'wachten', coalesce(v_n, 0));
|
|
3730
|
+
END $$;
|
|
3731
|
+
REVOKE ALL ON FUNCTION public.verkoop_sync_melding() FROM PUBLIC, anon;
|
|
3732
|
+
GRANT EXECUTE ON FUNCTION public.verkoop_sync_melding() TO authenticated, service_role;
|
|
3733
|
+
|
|
3734
|
+
-- Cronjobs: ook de wachtjob (alleen SQL).
|
|
3735
|
+
CREATE OR REPLACE FUNCTION public.verkoop_ensure_cron()
|
|
3736
|
+
RETURNS jsonb LANGUAGE plpgsql SECURITY DEFINER SET search_path TO 'public'
|
|
3737
|
+
AS $function$
|
|
3738
|
+
DECLARE j record; v_id bigint; v_cmd text; v_out jsonb := '[]'::jsonb; v_jobid bigint; v_sched text; v_curcmd text; v_status jsonb;
|
|
3739
|
+
BEGIN
|
|
3740
|
+
IF NOT public.verkoop_is_server() THEN
|
|
3741
|
+
PERFORM public.verkoop_assert_caller('rol', '{admin,superadmin}'::public.app_role[]);
|
|
3742
|
+
END IF;
|
|
3743
|
+
IF to_regclass('cron.job') IS NULL THEN
|
|
3744
|
+
RAISE EXCEPTION 'pg_cron ontbreekt in deze database';
|
|
3745
|
+
END IF;
|
|
3746
|
+
v_status := public.verkoop_cron_post_status();
|
|
3747
|
+
INSERT INTO public.verkoop_sync_state (key, ensure_cron_at) VALUES ('cron', now())
|
|
3748
|
+
ON CONFLICT (key) DO UPDATE SET ensure_cron_at = now(), updated_at = now();
|
|
3749
|
+
FOR j IN SELECT * FROM (VALUES
|
|
3750
|
+
('verkoop-salesorders-sync-1min', '* * * * *', '/api/public/cron/sync-salesorders'),
|
|
3751
|
+
('invoice-due-verkoop', '*/15 * * * *', '/api/public/cron/invoice-due'),
|
|
3752
|
+
('verkoop-cron-guard-5min', '*/5 * * * *', NULL)
|
|
3753
|
+
) t(name, sched, path) LOOP
|
|
3754
|
+
v_cmd := CASE WHEN j.path IS NULL THEN 'SELECT public.verkoop_sync_bewaking();'
|
|
3755
|
+
ELSE format('SELECT public.verkoop_cron_post(%L, ''{}''::jsonb, 15000);', j.path) END;
|
|
3756
|
+
v_jobid := NULL;
|
|
3757
|
+
EXECUTE 'SELECT jobid, schedule, command FROM cron.job WHERE jobname = $1 ORDER BY jobid LIMIT 1' INTO v_jobid, v_sched, v_curcmd USING j.name;
|
|
3758
|
+
IF v_jobid IS NULL THEN
|
|
3759
|
+
EXECUTE 'SELECT cron.schedule($1, $2, $3)' INTO v_id USING j.name, j.sched, v_cmd;
|
|
3760
|
+
v_out := v_out || jsonb_build_object('job', j.name, 'actie', 'aangemaakt', 'jobid', v_id);
|
|
3761
|
+
ELSIF v_sched IS DISTINCT FROM j.sched OR rtrim(btrim(v_curcmd), ';') IS DISTINCT FROM rtrim(v_cmd, ';') THEN
|
|
3762
|
+
EXECUTE 'SELECT cron.alter_job(job_id := $1, schedule := $2, command := $3, active := true)' USING v_jobid, j.sched, v_cmd;
|
|
3763
|
+
v_out := v_out || jsonb_build_object('job', j.name, 'actie', 'bijgewerkt', 'jobid', v_jobid);
|
|
3764
|
+
ELSE
|
|
3765
|
+
v_out := v_out || jsonb_build_object('job', j.name, 'actie', 'ongewijzigd', 'jobid', v_jobid);
|
|
3766
|
+
END IF;
|
|
3767
|
+
END LOOP;
|
|
3768
|
+
RETURN jsonb_build_object('ok', coalesce((v_status->>'ok')::boolean, false), 'sleutel', v_status, 'jobs', v_out);
|
|
3769
|
+
END $function$;
|
|
3770
|
+
|
|
3771
|
+
-- Installatiecontrole: wachtjob, laatste ronde en achterstand erbij.
|
|
3772
|
+
CREATE OR REPLACE FUNCTION public.verkoop_health_checks()
|
|
3773
|
+
RETURNS TABLE(naam text, ok boolean, opm text)
|
|
3774
|
+
LANGUAGE plpgsql SECURITY DEFINER SET search_path TO 'public'
|
|
3775
|
+
AS $function$
|
|
3776
|
+
DECLARE v_bad integer; v_cnt integer; v_idx integer; v_has_cache boolean := to_regclass('public.floriday_fulfillment_orders_cache') IS NOT NULL;
|
|
3777
|
+
v_status jsonb; v_ok boolean; j record; v_trg integer; v_unl integer; v_dup integer;
|
|
3778
|
+
v_ok_at timestamptz; v_err_at timestamptz; v_err text; v_n int; v_oudste timestamptz;
|
|
3779
|
+
BEGIN
|
|
3780
|
+
IF NOT public.verkoop_is_server() THEN
|
|
3781
|
+
PERFORM public.verkoop_assert_caller('rol', '{admin,superadmin}'::public.app_role[]);
|
|
3782
|
+
END IF;
|
|
3783
|
+
v_status := public.verkoop_cron_post_status();
|
|
3784
|
+
v_ok := coalesce((v_status->>'ok')::boolean, false);
|
|
3785
|
+
RETURN QUERY SELECT 'Verkoop: geheime cron-sleutel'::text, v_ok,
|
|
3786
|
+
CASE WHEN v_ok THEN 'aanwezig; cronroutes eisen x-verkoop-cron-key'
|
|
3787
|
+
ELSE 'NIET in orde: ' || (v_status->>'reden') || '. De cronroutes weigeren dan elke aanroep (geen terugval op de openbare sleutel); de minuutronde staat stil tot dit is opgelost' END;
|
|
3788
|
+
IF to_regclass('cron.job') IS NULL THEN
|
|
3789
|
+
RETURN QUERY SELECT 'Verkoop: cronjobs sturen de sleutel mee'::text, false, 'pg_cron ontbreekt'::text;
|
|
3790
|
+
ELSE
|
|
3791
|
+
FOR j IN SELECT * FROM (VALUES ('verkoop-salesorders-sync-1min'),('invoice-due-verkoop')) n(name) LOOP
|
|
3792
|
+
EXECUTE 'SELECT count(*)::int FROM cron.job c WHERE c.jobname = $1 AND c.active AND c.command LIKE ''%verkoop_cron_post(%'' AND c.command NOT ILIKE ''%http%''' INTO v_cnt USING j.name;
|
|
3793
|
+
RETURN QUERY SELECT ('Verkoop: cron ' || j.name || ' stuurt de sleutel mee')::text, v_cnt > 0,
|
|
3794
|
+
CASE WHEN v_cnt > 0 THEN 'via verkoop_cron_post (x-verkoop-cron-key), geen vaste host'
|
|
3795
|
+
ELSE 'ontbreekt, staat uit of roept niet via verkoop_cron_post aan (oude opdracht flowselections_cron_post/anon geeft 401); de wachtjob herstelt dit binnen 5 minuten, of voer verkoop_ensure_cron() uit' END;
|
|
3796
|
+
END LOOP;
|
|
3797
|
+
EXECUTE 'SELECT count(*)::int FROM cron.job c WHERE c.jobname = ''verkoop-cron-guard-5min'' AND c.active AND c.command LIKE ''%verkoop_sync_bewaking()%''' INTO v_cnt;
|
|
3798
|
+
RETURN QUERY SELECT 'Verkoop: wachtjob verkoop-cron-guard-5min'::text, v_cnt > 0,
|
|
3799
|
+
CASE WHEN v_cnt > 0 THEN 'actief (alleen SQL): herstelt cronopdrachten en meldt stilstand/achterstand'
|
|
3800
|
+
ELSE 'ontbreekt of staat uit; voer verkoop_ensure_cron() uit' END;
|
|
3801
|
+
END IF;
|
|
3802
|
+
SELECT s.last_ok_at, s.last_error_at, s.last_error INTO v_ok_at, v_err_at, v_err FROM public.verkoop_sync_state s WHERE s.key = 'salesorders-heartbeat';
|
|
3803
|
+
RETURN QUERY SELECT 'Verkoop: minuutronde geeft geldig antwoord'::text,
|
|
3804
|
+
v_ok_at IS NOT NULL AND v_ok_at > now() - interval '10 minutes' AND (v_err_at IS NULL OR v_err_at <= v_ok_at),
|
|
3805
|
+
CASE WHEN v_ok_at IS NULL THEN 'nog nooit een geslaagde ronde vastgelegd (route geweigerd, bijv. 401 door een cronopdracht zonder x-verkoop-cron-key, of nog niet gedraaid)'
|
|
3806
|
+
WHEN v_err_at > v_ok_at THEN format('laatste fout %s: %s', to_char(v_err_at AT TIME ZONE 'Europe/Amsterdam','DD-MM HH24:MI'), left(coalesce(v_err,''),200))
|
|
3807
|
+
WHEN v_ok_at < now() - interval '10 minutes' THEN format('laatste geslaagde ronde %s; sindsdien geen geldig antwoord (controleer net._http_response op 401)', to_char(v_ok_at AT TIME ZONE 'Europe/Amsterdam','DD-MM HH24:MI'))
|
|
3808
|
+
ELSE format('laatste geslaagde ronde %s', to_char(v_ok_at AT TIME ZONE 'Europe/Amsterdam','DD-MM HH24:MI')) END;
|
|
3809
|
+
SELECT count(*)::int, min(z.ontvangen_at) INTO v_n, v_oudste
|
|
3810
|
+
FROM public.verkoop_fo_zonder_order(now() - interval '14 days', interval '15 minutes') z WHERE z.categorie <> 'geannuleerd';
|
|
3811
|
+
RETURN QUERY SELECT 'Verkoop: Floriday-orders worden omgezet (achterstand > 15 min)'::text, v_n = 0,
|
|
3812
|
+
CASE WHEN v_n = 0 THEN 'geen achterstand'
|
|
3813
|
+
ELSE format('%s Floriday-order(s) zonder order, oudste ontvangen %s; zie verkoop_inhaal_preview', v_n, to_char(v_oudste AT TIME ZONE 'Europe/Amsterdam','DD-MM HH24:MI')) END;
|
|
3814
|
+
SELECT count(*)::int INTO v_trg FROM pg_trigger t
|
|
3815
|
+
WHERE t.tgname IN ('verkoop_salesorders_direct_ins','verkoop_salesorders_direct_upd') AND NOT t.tgisinternal
|
|
3816
|
+
AND t.tgrelid = to_regclass('public.floriday_salesorders_cache');
|
|
3817
|
+
RETURN QUERY SELECT 'Verkoop: direct omzetten actief'::text, (v_ok AND v_trg = 2),
|
|
3818
|
+
CASE WHEN to_regclass('public.floriday_salesorders_cache') IS NULL THEN 'nee (geen Floriday-cache in deze shell)'
|
|
3819
|
+
WHEN v_trg < 2 THEN 'nee (triggers op floriday_salesorders_cache ontbreken); de minuutronde vangt de orders op'
|
|
3820
|
+
WHEN NOT v_ok THEN 'nee (' || (v_status->>'reden') || '); de minuutronde vangt de orders op'
|
|
3821
|
+
ELSE 'ja' END;
|
|
3822
|
+
SELECT count(*)::int,
|
|
3823
|
+
count(*) FILTER (WHERE EXISTS (SELECT 1 FROM public.order_items k WHERE k.order_id = oi.order_id
|
|
3824
|
+
AND k.source_line_key IS NOT NULL AND k.quarantined_at IS NULL
|
|
3825
|
+
AND k.product_id IS NOT DISTINCT FROM oi.product_id))::int
|
|
3826
|
+
INTO v_unl, v_dup
|
|
3827
|
+
FROM public.order_items oi JOIN public.orders o ON o.id = oi.order_id
|
|
3828
|
+
WHERE o.floriday_sales_order_id IS NOT NULL AND oi.source_line_key IS NULL AND oi.quarantined_at IS NULL;
|
|
3829
|
+
RETURN QUERY SELECT 'Verkoop: orderregels zonder Floriday-koppeling'::text, v_unl = 0,
|
|
3830
|
+
CASE WHEN v_unl = 0 THEN 'ok: 0'
|
|
3831
|
+
ELSE format('%s regel(s) zonder koppeling op Floriday-orders, waarvan %s met een gekoppelde tegenhanger (dubbel geteld in lijst en karindeling); opruimen alleen na akkoord per shell', v_unl, v_dup) END;
|
|
3832
|
+
IF NOT v_has_cache THEN
|
|
3833
|
+
RETURN QUERY SELECT 'Verkoop: geen volledige cache-scan per minuut'::text, true, 'geen Floriday-afhandelingen in deze shell'::text;
|
|
3834
|
+
ELSE
|
|
3835
|
+
SELECT count(*)::int INTO v_idx FROM public.verkoop_fulfillment_index;
|
|
3836
|
+
EXECUTE 'SELECT count(*)::int FROM public.floriday_fulfillment_orders_cache WHERE jsonb_typeof(data->''loadCarriers'')=''array'' AND jsonb_array_length(data->''loadCarriers'')>0' INTO v_cnt;
|
|
3837
|
+
RETURN QUERY SELECT 'Verkoop: geen volledige cache-scan per minuut'::text,
|
|
3838
|
+
EXISTS (SELECT 1 FROM pg_trigger WHERE tgname='verkoop_fulfillment_index_sync' AND tgrelid='public.floriday_fulfillment_orders_cache'::regclass)
|
|
3839
|
+
AND (v_cnt = 0 OR v_idx > 0),
|
|
3840
|
+
format('index %s rijen, afhandelingen met karren %s', v_idx, v_cnt);
|
|
3841
|
+
END IF;
|
|
3842
|
+
SELECT count(*)::int INTO v_bad FROM public.verkoop_engine_event_log l WHERE NOT l.ok AND l.created_at > now() - interval '24 hours';
|
|
3843
|
+
RETURN QUERY SELECT 'Verkoop: engine-event schrijft zonder fout'::text, v_bad = 0,
|
|
3844
|
+
CASE WHEN v_bad = 0 THEN 'geen mislukte meldingen in 24 uur' ELSE v_bad || ' mislukte melding(en) in 24 uur, zie verkoop_engine_event_log' END;
|
|
3845
|
+
END $function$;
|
|
3846
|
+
|
|
3847
|
+
|
|
3848
|
+
-- Herstelstap verkoop_ensure_cron_heal, meldingsmail en 401-controle (Verkoop 1.0.159).
|
|
3849
|
+
ALTER TABLE public.verkoop_sync_state ADD COLUMN IF NOT EXISTS last_status integer;
|
|
3850
|
+
ALTER TABLE public.verkoop_sync_state ADD COLUMN IF NOT EXISTS details jsonb;
|
|
3851
|
+
|
|
3852
|
+
-- Mail via de bestaande meldingsroute (e-mailmodule, doel "internal"). Geeft de uitkomst als tekst; nooit stil.
|
|
3853
|
+
CREATE OR REPLACE FUNCTION public.verkoop_alert_mail(p_onderwerp text, p_tekst text)
|
|
3854
|
+
RETURNS text LANGUAGE plpgsql SECURITY DEFINER SET search_path = public
|
|
3855
|
+
AS $$
|
|
3856
|
+
DECLARE v_id uuid; v_to text;
|
|
3857
|
+
BEGIN
|
|
3858
|
+
IF NOT public.verkoop_is_server() THEN
|
|
3859
|
+
PERFORM public.verkoop_assert_caller('rol', '{admin,superadmin}'::public.app_role[]);
|
|
3860
|
+
END IF;
|
|
3861
|
+
IF to_regprocedure('public.email_auth_for_purpose(text,text)') IS NULL OR to_regclass('public.email_auth_outbox') IS NULL THEN
|
|
3862
|
+
RETURN 'geen e-mailmodule';
|
|
3863
|
+
END IF;
|
|
3864
|
+
BEGIN
|
|
3865
|
+
EXECUTE 'SELECT id, account_email FROM public.email_auth_for_purpose($1, $2) LIMIT 1' INTO v_id, v_to USING 'internal', 'send';
|
|
3866
|
+
IF v_id IS NULL OR v_to IS NULL THEN
|
|
3867
|
+
RAISE WARNING '[verkoop] geen actieve e-mailverbinding met doel internal; melding niet gemaild';
|
|
3868
|
+
RETURN 'geen e-mailverbinding (doel internal)';
|
|
3869
|
+
END IF;
|
|
3870
|
+
EXECUTE 'INSERT INTO public.email_auth_outbox(purpose, connection_id, to_addresses, subject, text_body, html_body, headers) VALUES ($1,$2,$3,$4,$5,$6,$7)'
|
|
3871
|
+
USING 'internal', v_id, ARRAY[v_to], p_onderwerp, p_tekst,
|
|
3872
|
+
'<p>' || replace(replace(replace(replace(p_tekst,'&','&'),'<','<'),'>','>'), E'\n', '<br/>') || '</p>',
|
|
3873
|
+
jsonb_build_object('X-Verkoop-Alert', p_onderwerp);
|
|
3874
|
+
RETURN 'klaargezet voor ' || v_to;
|
|
3875
|
+
EXCEPTION WHEN OTHERS THEN
|
|
3876
|
+
RAISE WARNING '[verkoop] melding mailen mislukt: %', SQLERRM;
|
|
3877
|
+
RETURN 'mislukt: ' || SQLERRM;
|
|
3878
|
+
END;
|
|
3879
|
+
END $$;
|
|
3880
|
+
REVOKE ALL ON FUNCTION public.verkoop_alert_mail(text, text) FROM PUBLIC, anon, authenticated;
|
|
3881
|
+
GRANT EXECUTE ON FUNCTION public.verkoop_alert_mail(text, text) TO service_role;
|
|
3882
|
+
|
|
3883
|
+
CREATE OR REPLACE FUNCTION public.verkoop_sync_bewaking()
|
|
3884
|
+
RETURNS jsonb LANGUAGE plpgsql SECURITY DEFINER SET search_path = public
|
|
3885
|
+
AS $$
|
|
3886
|
+
DECLARE v_heal jsonb; v_ok_at timestamptz; v_err_at timestamptz; v_err text;
|
|
3887
|
+
v_n int := 0; v_oudste timestamptz; v_route_fout boolean; v_achter boolean; v_401 int; v_mail text; v_bericht text;
|
|
3888
|
+
BEGIN
|
|
3889
|
+
IF NOT public.verkoop_is_server() THEN
|
|
3890
|
+
PERFORM public.verkoop_assert_caller('rol', '{admin,superadmin}'::public.app_role[]);
|
|
3891
|
+
END IF;
|
|
3892
|
+
SELECT details INTO v_heal FROM public.verkoop_sync_state WHERE key = 'cron-heal';
|
|
3893
|
+
SELECT last_ok_at, last_error_at, last_error INTO v_ok_at, v_err_at, v_err
|
|
3894
|
+
FROM public.verkoop_sync_state WHERE key = 'salesorders-heartbeat';
|
|
3895
|
+
SELECT count(*)::int, min(ontvangen_at) INTO v_n, v_oudste
|
|
3896
|
+
FROM public.verkoop_fo_zonder_order(now() - interval '14 days', interval '15 minutes') WHERE categorie <> 'geannuleerd';
|
|
3897
|
+
IF to_regclass('net._http_response') IS NOT NULL THEN
|
|
3898
|
+
EXECUTE $q$SELECT count(*)::int FROM net._http_response WHERE status_code = 401 AND created > now() - interval '15 minutes'$q$ INTO v_401;
|
|
3899
|
+
END IF;
|
|
3900
|
+
|
|
3901
|
+
v_route_fout := coalesce((v_ok_at IS NULL AND v_n > 0) OR v_ok_at < now() - interval '10 minutes'
|
|
3902
|
+
OR (v_err_at IS NOT NULL AND v_err_at > coalesce(v_ok_at, '-infinity'::timestamptz)), false);
|
|
3903
|
+
v_achter := v_n > 0;
|
|
3904
|
+
|
|
3905
|
+
IF v_route_fout THEN
|
|
3906
|
+
IF NOT EXISTS (SELECT 1 FROM public.verkoop_alerts WHERE soort='sync_route' AND resolved_at IS NULL AND created_at > now() - interval '4 hours') THEN
|
|
3907
|
+
v_bericht := 'De omzetting van Floriday-orders geeft geen geldig antwoord.';
|
|
3908
|
+
v_mail := public.verkoop_alert_mail('Verkoop: Floriday-orders worden niet omgezet',
|
|
3909
|
+
v_bericht || E'\n' || format('Laatste geslaagde ronde: %s.', coalesce(to_char(v_ok_at AT TIME ZONE 'Europe/Amsterdam','DD-MM HH24:MI'), 'onbekend'))
|
|
3910
|
+
|| E'\n' || format('Geweigerde aanroepen (401) laatste 15 minuten: %s.', coalesce(v_401, 0))
|
|
3911
|
+
|| E'\nZie de installatiecontrole van Verkoop voor details.');
|
|
3912
|
+
INSERT INTO public.verkoop_alerts(soort, bericht, details) VALUES ('sync_route', v_bericht,
|
|
3913
|
+
jsonb_build_object('laatste_ok', v_ok_at, 'laatste_fout', v_err_at, 'fout', v_err, 'http_401_15min', v_401, 'herstel', v_heal, 'mail', v_mail));
|
|
3914
|
+
END IF;
|
|
3915
|
+
ELSE
|
|
3916
|
+
UPDATE public.verkoop_alerts SET resolved_at = now() WHERE soort='sync_route' AND resolved_at IS NULL;
|
|
3917
|
+
END IF;
|
|
3918
|
+
IF v_achter THEN
|
|
3919
|
+
IF NOT EXISTS (SELECT 1 FROM public.verkoop_alerts WHERE soort='achterstand' AND resolved_at IS NULL AND created_at > now() - interval '4 hours') THEN
|
|
3920
|
+
v_bericht := format('%s Floriday-order(s) wachten langer dan 15 minuten op omzetting.', v_n);
|
|
3921
|
+
v_mail := public.verkoop_alert_mail('Verkoop: Floriday-orders wachten op omzetting',
|
|
3922
|
+
v_bericht || E'\n' || format('Oudste ontvangen: %s.', coalesce(to_char(v_oudste AT TIME ZONE 'Europe/Amsterdam','DD-MM HH24:MI'), 'onbekend'))
|
|
3923
|
+
|| E'\nZie de installatiecontrole van Verkoop voor details.');
|
|
3924
|
+
INSERT INTO public.verkoop_alerts(soort, bericht, details) VALUES ('achterstand', v_bericht,
|
|
3925
|
+
jsonb_build_object('aantal', v_n, 'oudste', v_oudste, 'mail', v_mail));
|
|
3926
|
+
END IF;
|
|
3927
|
+
ELSE
|
|
3928
|
+
UPDATE public.verkoop_alerts SET resolved_at = now() WHERE soort='achterstand' AND resolved_at IS NULL;
|
|
3929
|
+
END IF;
|
|
3930
|
+
DELETE FROM public.verkoop_alerts WHERE resolved_at < now() - interval '90 days';
|
|
3931
|
+
|
|
3932
|
+
INSERT INTO public.verkoop_sync_state(key, updated_at) VALUES ('bewaking', now())
|
|
3933
|
+
ON CONFLICT (key) DO UPDATE SET updated_at = now();
|
|
3934
|
+
RETURN jsonb_build_object('route_ok', NOT v_route_fout, 'laatste_ok', v_ok_at, 'wachten', v_n, 'oudste', v_oudste,
|
|
3935
|
+
'http_401_15min', v_401, 'herstel', v_heal);
|
|
3936
|
+
END $$;
|
|
3937
|
+
REVOKE ALL ON FUNCTION public.verkoop_sync_bewaking() FROM PUBLIC, anon, authenticated;
|
|
3938
|
+
GRANT EXECUTE ON FUNCTION public.verkoop_sync_bewaking() TO service_role;
|
|
3939
|
+
|
|
3940
|
+
-- Herstel buiten de route om (alleen SQL): verkeerde Verkoop-cronopdrachten terug naar verkoop_cron_post, daarna bewaking.
|
|
3941
|
+
CREATE OR REPLACE FUNCTION public.verkoop_ensure_cron_heal()
|
|
3942
|
+
RETURNS jsonb LANGUAGE plpgsql SECURITY DEFINER SET search_path = public
|
|
3943
|
+
AS $$
|
|
3944
|
+
DECLARE v_bad int := 0; v_job boolean := false; v_heal jsonb; v_bew jsonb;
|
|
3945
|
+
BEGIN
|
|
3946
|
+
IF NOT public.verkoop_is_server() THEN
|
|
3947
|
+
PERFORM public.verkoop_assert_caller('rol', '{admin,superadmin}'::public.app_role[]);
|
|
3948
|
+
END IF;
|
|
3949
|
+
IF to_regclass('cron.job') IS NOT NULL THEN
|
|
3950
|
+
EXECUTE $q$SELECT count(*)::int FROM cron.job
|
|
3951
|
+
WHERE (jobname IN ('verkoop-salesorders-sync-1min','invoice-due-verkoop')
|
|
3952
|
+
AND (command NOT LIKE '%verkoop_cron_post(%' OR command ILIKE '%flowselections_cron_post%' OR NOT active))
|
|
3953
|
+
OR (jobname = 'verkoop-cron-guard-5min' AND (command NOT LIKE '%verkoop_ensure_cron_heal()%' OR NOT active))$q$ INTO v_bad;
|
|
3954
|
+
EXECUTE $q$SELECT EXISTS (SELECT 1 FROM cron.job WHERE jobname='verkoop-salesorders-sync-1min')$q$ INTO v_job;
|
|
3955
|
+
IF v_bad > 0 OR NOT v_job THEN
|
|
3956
|
+
BEGIN
|
|
3957
|
+
v_heal := public.verkoop_ensure_cron();
|
|
3958
|
+
INSERT INTO public.verkoop_sync_state(key, last_ok_at, details, updated_at)
|
|
3959
|
+
VALUES ('cron-heal', now(), jsonb_build_object('at', now(), 'fout_jobs', v_bad, 'sync_job_ontbrak', NOT v_job, 'uitkomst', v_heal), now())
|
|
3960
|
+
ON CONFLICT (key) DO UPDATE SET last_ok_at = EXCLUDED.last_ok_at, details = EXCLUDED.details, updated_at = now();
|
|
3961
|
+
EXCEPTION WHEN OTHERS THEN
|
|
3962
|
+
v_heal := jsonb_build_object('ok', false, 'error', SQLERRM);
|
|
3963
|
+
RAISE WARNING '[verkoop] cron herstellen mislukt: %', SQLERRM;
|
|
3964
|
+
INSERT INTO public.verkoop_sync_state(key, last_error_at, last_error, details, updated_at)
|
|
3965
|
+
VALUES ('cron-heal', now(), left(SQLERRM, 500), jsonb_build_object('at', now(), 'uitkomst', v_heal), now())
|
|
3966
|
+
ON CONFLICT (key) DO UPDATE SET last_error_at = EXCLUDED.last_error_at, last_error = EXCLUDED.last_error, details = EXCLUDED.details, updated_at = now();
|
|
3967
|
+
END;
|
|
3968
|
+
END IF;
|
|
3969
|
+
END IF;
|
|
3970
|
+
v_bew := public.verkoop_sync_bewaking();
|
|
3971
|
+
RETURN jsonb_build_object('herstel', v_heal, 'bewaking', v_bew);
|
|
3972
|
+
END $$;
|
|
3973
|
+
REVOKE ALL ON FUNCTION public.verkoop_ensure_cron_heal() FROM PUBLIC, anon, authenticated;
|
|
3974
|
+
GRANT EXECUTE ON FUNCTION public.verkoop_ensure_cron_heal() TO service_role;
|
|
3975
|
+
|
|
3976
|
+
CREATE OR REPLACE FUNCTION public.verkoop_ensure_cron()
|
|
3977
|
+
RETURNS jsonb LANGUAGE plpgsql SECURITY DEFINER SET search_path TO 'public'
|
|
3978
|
+
AS $function$
|
|
3979
|
+
DECLARE j record; v_id bigint; v_cmd text; v_out jsonb := '[]'::jsonb; v_jobid bigint; v_sched text; v_curcmd text; v_status jsonb;
|
|
3980
|
+
BEGIN
|
|
3981
|
+
IF NOT public.verkoop_is_server() THEN
|
|
3982
|
+
PERFORM public.verkoop_assert_caller('rol', '{admin,superadmin}'::public.app_role[]);
|
|
3983
|
+
END IF;
|
|
3984
|
+
IF to_regclass('cron.job') IS NULL THEN
|
|
3985
|
+
RAISE EXCEPTION 'pg_cron ontbreekt in deze database';
|
|
3986
|
+
END IF;
|
|
3987
|
+
v_status := public.verkoop_cron_post_status();
|
|
3988
|
+
INSERT INTO public.verkoop_sync_state (key, ensure_cron_at) VALUES ('cron', now())
|
|
3989
|
+
ON CONFLICT (key) DO UPDATE SET ensure_cron_at = now(), updated_at = now();
|
|
3990
|
+
FOR j IN SELECT * FROM (VALUES
|
|
3991
|
+
('verkoop-salesorders-sync-1min', '* * * * *', '/api/public/cron/sync-salesorders'),
|
|
3992
|
+
('invoice-due-verkoop', '*/15 * * * *', '/api/public/cron/invoice-due'),
|
|
3993
|
+
('verkoop-cron-guard-5min', '*/5 * * * *', NULL)
|
|
3994
|
+
) t(name, sched, path) LOOP
|
|
3995
|
+
v_cmd := CASE WHEN j.path IS NULL THEN 'SELECT public.verkoop_ensure_cron_heal();'
|
|
3996
|
+
ELSE format('SELECT public.verkoop_cron_post(%L, ''{}''::jsonb, 15000);', j.path) END;
|
|
3997
|
+
v_jobid := NULL;
|
|
3998
|
+
EXECUTE 'SELECT jobid, schedule, command FROM cron.job WHERE jobname = $1 ORDER BY jobid LIMIT 1' INTO v_jobid, v_sched, v_curcmd USING j.name;
|
|
3999
|
+
IF v_jobid IS NULL THEN
|
|
4000
|
+
EXECUTE 'SELECT cron.schedule($1, $2, $3)' INTO v_id USING j.name, j.sched, v_cmd;
|
|
4001
|
+
v_out := v_out || jsonb_build_object('job', j.name, 'actie', 'aangemaakt', 'jobid', v_id);
|
|
4002
|
+
ELSIF v_sched IS DISTINCT FROM j.sched OR rtrim(btrim(v_curcmd), ';') IS DISTINCT FROM rtrim(v_cmd, ';') THEN
|
|
4003
|
+
EXECUTE 'SELECT cron.alter_job(job_id := $1, schedule := $2, command := $3, active := true)' USING v_jobid, j.sched, v_cmd;
|
|
4004
|
+
v_out := v_out || jsonb_build_object('job', j.name, 'actie', 'bijgewerkt', 'jobid', v_jobid);
|
|
4005
|
+
ELSE
|
|
4006
|
+
v_out := v_out || jsonb_build_object('job', j.name, 'actie', 'ongewijzigd', 'jobid', v_jobid);
|
|
4007
|
+
END IF;
|
|
4008
|
+
END LOOP;
|
|
4009
|
+
RETURN jsonb_build_object('ok', coalesce((v_status->>'ok')::boolean, false), 'sleutel', v_status, 'jobs', v_out);
|
|
4010
|
+
END $function$;
|
|
4011
|
+
|
|
4012
|
+
CREATE OR REPLACE FUNCTION public.verkoop_health_checks()
|
|
4013
|
+
RETURNS TABLE(naam text, ok boolean, opm text)
|
|
4014
|
+
LANGUAGE plpgsql SECURITY DEFINER SET search_path TO 'public'
|
|
4015
|
+
AS $function$
|
|
4016
|
+
DECLARE v_bad integer; v_cnt integer; v_idx integer; v_has_cache boolean := to_regclass('public.floriday_fulfillment_orders_cache') IS NOT NULL;
|
|
4017
|
+
v_status jsonb; v_ok boolean; j record; v_trg integer; v_unl integer; v_dup integer;
|
|
4018
|
+
v_ok_at timestamptz; v_err_at timestamptz; v_err text; v_n int; v_oudste timestamptz;
|
|
4019
|
+
BEGIN
|
|
4020
|
+
IF NOT public.verkoop_is_server() THEN
|
|
4021
|
+
PERFORM public.verkoop_assert_caller('rol', '{admin,superadmin}'::public.app_role[]);
|
|
4022
|
+
END IF;
|
|
4023
|
+
v_status := public.verkoop_cron_post_status();
|
|
4024
|
+
v_ok := coalesce((v_status->>'ok')::boolean, false);
|
|
4025
|
+
RETURN QUERY SELECT 'Verkoop: geheime cron-sleutel'::text, v_ok,
|
|
4026
|
+
CASE WHEN v_ok THEN 'aanwezig; cronroutes eisen x-verkoop-cron-key'
|
|
4027
|
+
ELSE 'NIET in orde: ' || (v_status->>'reden') || '. De cronroutes weigeren dan elke aanroep (geen terugval op de openbare sleutel); de minuutronde staat stil tot dit is opgelost' END;
|
|
4028
|
+
IF to_regclass('cron.job') IS NULL THEN
|
|
4029
|
+
RETURN QUERY SELECT 'Verkoop: cronjobs sturen de sleutel mee'::text, false, 'pg_cron ontbreekt'::text;
|
|
4030
|
+
ELSE
|
|
4031
|
+
FOR j IN SELECT * FROM (VALUES ('verkoop-salesorders-sync-1min'),('invoice-due-verkoop')) n(name) LOOP
|
|
4032
|
+
EXECUTE 'SELECT count(*)::int FROM cron.job c WHERE c.jobname = $1 AND c.active AND c.command LIKE ''%verkoop_cron_post(%'' AND c.command NOT ILIKE ''%http%''' INTO v_cnt USING j.name;
|
|
4033
|
+
RETURN QUERY SELECT ('Verkoop: cron ' || j.name || ' stuurt de sleutel mee')::text, v_cnt > 0,
|
|
4034
|
+
CASE WHEN v_cnt > 0 THEN 'via verkoop_cron_post (x-verkoop-cron-key), geen vaste host'
|
|
4035
|
+
ELSE 'ontbreekt, staat uit of roept niet via verkoop_cron_post aan (oude opdracht flowselections_cron_post/anon geeft 401); de wachtjob herstelt dit binnen 5 minuten, of voer verkoop_ensure_cron() uit' END;
|
|
4036
|
+
END LOOP;
|
|
4037
|
+
EXECUTE 'SELECT count(*)::int FROM cron.job c WHERE c.jobname = ''verkoop-cron-guard-5min'' AND c.active AND c.command LIKE ''%verkoop_ensure_cron_heal()%''' INTO v_cnt;
|
|
4038
|
+
RETURN QUERY SELECT 'Verkoop: wachtjob verkoop-cron-guard-5min'::text, v_cnt > 0,
|
|
4039
|
+
CASE WHEN v_cnt > 0 THEN 'actief (alleen SQL): herstelt cronopdrachten en meldt stilstand/achterstand'
|
|
4040
|
+
ELSE 'ontbreekt of staat uit; voer verkoop_ensure_cron() uit' END;
|
|
4041
|
+
END IF;
|
|
4042
|
+
IF to_regclass('net._http_response') IS NOT NULL THEN
|
|
4043
|
+
EXECUTE 'SELECT count(*)::int FROM net._http_response WHERE status_code = 401 AND created > now() - interval ''15 minutes''' INTO v_cnt;
|
|
4044
|
+
RETURN QUERY SELECT 'Verkoop: laatste http-antwoorden zonder 401'::text, v_cnt = 0,
|
|
4045
|
+
CASE WHEN v_cnt = 0 THEN 'geen geweigerde aanroepen in 15 minuten'
|
|
4046
|
+
ELSE v_cnt || ' aanroep(en) met 401 in 15 minuten: een cronopdracht stuurt de geheime sleutel niet mee (oude opdracht flowselections_cron_post/anon?)' END;
|
|
4047
|
+
END IF;
|
|
4048
|
+
SELECT s.last_ok_at, s.last_error_at, s.last_error INTO v_ok_at, v_err_at, v_err FROM public.verkoop_sync_state s WHERE s.key = 'salesorders-heartbeat';
|
|
4049
|
+
RETURN QUERY SELECT 'Verkoop: minuutronde geeft geldig antwoord'::text,
|
|
4050
|
+
v_ok_at IS NOT NULL AND v_ok_at > now() - interval '10 minutes' AND (v_err_at IS NULL OR v_err_at <= v_ok_at),
|
|
4051
|
+
CASE WHEN v_ok_at IS NULL THEN 'nog nooit een geslaagde ronde vastgelegd (route geweigerd, bijv. 401 door een cronopdracht zonder x-verkoop-cron-key, of nog niet gedraaid)'
|
|
4052
|
+
WHEN v_err_at > v_ok_at THEN format('laatste fout %s: %s', to_char(v_err_at AT TIME ZONE 'Europe/Amsterdam','DD-MM HH24:MI'), left(coalesce(v_err,''),200))
|
|
4053
|
+
WHEN v_ok_at < now() - interval '10 minutes' THEN format('laatste geslaagde ronde %s; sindsdien geen geldig antwoord (controleer net._http_response op 401)', to_char(v_ok_at AT TIME ZONE 'Europe/Amsterdam','DD-MM HH24:MI'))
|
|
4054
|
+
ELSE format('laatste geslaagde ronde %s', to_char(v_ok_at AT TIME ZONE 'Europe/Amsterdam','DD-MM HH24:MI')) END;
|
|
4055
|
+
SELECT count(*)::int, min(z.ontvangen_at) INTO v_n, v_oudste
|
|
4056
|
+
FROM public.verkoop_fo_zonder_order(now() - interval '14 days', interval '15 minutes') z WHERE z.categorie <> 'geannuleerd';
|
|
4057
|
+
RETURN QUERY SELECT 'Verkoop: Floriday-orders worden omgezet (achterstand > 15 min)'::text, v_n = 0,
|
|
4058
|
+
CASE WHEN v_n = 0 THEN 'geen achterstand'
|
|
4059
|
+
ELSE format('%s Floriday-order(s) zonder order, oudste ontvangen %s; zie verkoop_inhaal_preview', v_n, to_char(v_oudste AT TIME ZONE 'Europe/Amsterdam','DD-MM HH24:MI')) END;
|
|
4060
|
+
SELECT count(*)::int INTO v_trg FROM pg_trigger t
|
|
4061
|
+
WHERE t.tgname IN ('verkoop_salesorders_direct_ins','verkoop_salesorders_direct_upd') AND NOT t.tgisinternal
|
|
4062
|
+
AND t.tgrelid = to_regclass('public.floriday_salesorders_cache');
|
|
4063
|
+
RETURN QUERY SELECT 'Verkoop: direct omzetten actief'::text, (v_ok AND v_trg = 2),
|
|
4064
|
+
CASE WHEN to_regclass('public.floriday_salesorders_cache') IS NULL THEN 'nee (geen Floriday-cache in deze shell)'
|
|
4065
|
+
WHEN v_trg < 2 THEN 'nee (triggers op floriday_salesorders_cache ontbreken); de minuutronde vangt de orders op'
|
|
4066
|
+
WHEN NOT v_ok THEN 'nee (' || (v_status->>'reden') || '); de minuutronde vangt de orders op'
|
|
4067
|
+
ELSE 'ja' END;
|
|
4068
|
+
SELECT count(*)::int,
|
|
4069
|
+
count(*) FILTER (WHERE EXISTS (SELECT 1 FROM public.order_items k WHERE k.order_id = oi.order_id
|
|
4070
|
+
AND k.source_line_key IS NOT NULL AND k.quarantined_at IS NULL
|
|
4071
|
+
AND k.product_id IS NOT DISTINCT FROM oi.product_id))::int
|
|
4072
|
+
INTO v_unl, v_dup
|
|
4073
|
+
FROM public.order_items oi JOIN public.orders o ON o.id = oi.order_id
|
|
4074
|
+
WHERE o.floriday_sales_order_id IS NOT NULL AND oi.source_line_key IS NULL AND oi.quarantined_at IS NULL;
|
|
4075
|
+
RETURN QUERY SELECT 'Verkoop: orderregels zonder Floriday-koppeling'::text, v_unl = 0,
|
|
4076
|
+
CASE WHEN v_unl = 0 THEN 'ok: 0'
|
|
4077
|
+
ELSE format('%s regel(s) zonder koppeling op Floriday-orders, waarvan %s met een gekoppelde tegenhanger (dubbel geteld in lijst en karindeling); opruimen alleen na akkoord per shell', v_unl, v_dup) END;
|
|
4078
|
+
IF NOT v_has_cache THEN
|
|
4079
|
+
RETURN QUERY SELECT 'Verkoop: geen volledige cache-scan per minuut'::text, true, 'geen Floriday-afhandelingen in deze shell'::text;
|
|
4080
|
+
ELSE
|
|
4081
|
+
SELECT count(*)::int INTO v_idx FROM public.verkoop_fulfillment_index;
|
|
4082
|
+
EXECUTE 'SELECT count(*)::int FROM public.floriday_fulfillment_orders_cache WHERE jsonb_typeof(data->''loadCarriers'')=''array'' AND jsonb_array_length(data->''loadCarriers'')>0' INTO v_cnt;
|
|
4083
|
+
RETURN QUERY SELECT 'Verkoop: geen volledige cache-scan per minuut'::text,
|
|
4084
|
+
EXISTS (SELECT 1 FROM pg_trigger WHERE tgname='verkoop_fulfillment_index_sync' AND tgrelid='public.floriday_fulfillment_orders_cache'::regclass)
|
|
4085
|
+
AND (v_cnt = 0 OR v_idx > 0),
|
|
4086
|
+
format('index %s rijen, afhandelingen met karren %s', v_idx, v_cnt);
|
|
4087
|
+
END IF;
|
|
4088
|
+
SELECT count(*)::int INTO v_bad FROM public.verkoop_engine_event_log l WHERE NOT l.ok AND l.created_at > now() - interval '24 hours';
|
|
4089
|
+
RETURN QUERY SELECT 'Verkoop: engine-event schrijft zonder fout'::text, v_bad = 0,
|
|
4090
|
+
CASE WHEN v_bad = 0 THEN 'geen mislukte meldingen in 24 uur' ELSE v_bad || ' mislukte melding(en) in 24 uur, zie verkoop_engine_event_log' END;
|
|
4091
|
+
END $function$;
|
|
4092
|
+
|
|
4093
|
+
|
|
4094
|
+
-- ===== Spoed samenvoegen (inhalen stil, bestaand via orderregels, bewaking verwijderd, startdatum factureren) =====
|
|
4095
|
+
-- 1. Inhalen stil tot vrijgave
|
|
4096
|
+
CREATE OR REPLACE FUNCTION public.verkoop_inhaal_vrijgegeven()
|
|
4097
|
+
RETURNS boolean LANGUAGE sql STABLE SECURITY DEFINER SET search_path = public
|
|
4098
|
+
AS $$ SELECT coalesce((SELECT (details->>'aan')::boolean FROM public.verkoop_sync_state WHERE key = 'inhaal-vrijgave'), false) $$;
|
|
4099
|
+
REVOKE ALL ON FUNCTION public.verkoop_inhaal_vrijgegeven() FROM PUBLIC, anon;
|
|
4100
|
+
GRANT EXECUTE ON FUNCTION public.verkoop_inhaal_vrijgegeven() TO authenticated, service_role;
|
|
4101
|
+
|
|
4102
|
+
CREATE OR REPLACE FUNCTION public.verkoop_inhaal_vrijgave(p_aan boolean)
|
|
4103
|
+
RETURNS jsonb LANGUAGE plpgsql VOLATILE SECURITY DEFINER SET search_path = public
|
|
4104
|
+
AS $$
|
|
4105
|
+
BEGIN
|
|
4106
|
+
IF NOT public.verkoop_is_server() THEN
|
|
4107
|
+
PERFORM public.verkoop_assert_caller('rol', '{admin,superadmin}'::public.app_role[]);
|
|
4108
|
+
END IF;
|
|
4109
|
+
INSERT INTO public.verkoop_sync_state(key, details, updated_at)
|
|
4110
|
+
VALUES ('inhaal-vrijgave', jsonb_build_object('aan', coalesce(p_aan,false), 'door', auth.uid(), 'at', now()), now())
|
|
4111
|
+
ON CONFLICT (key) DO UPDATE SET details = EXCLUDED.details, updated_at = now();
|
|
4112
|
+
RETURN jsonb_build_object('inhalen', CASE WHEN coalesce(p_aan,false) THEN 'vrijgegeven' ELSE 'stil' END);
|
|
4113
|
+
END $$;
|
|
4114
|
+
REVOKE ALL ON FUNCTION public.verkoop_inhaal_vrijgave(boolean) FROM PUBLIC, anon;
|
|
4115
|
+
GRANT EXECUTE ON FUNCTION public.verkoop_inhaal_vrijgave(boolean) TO authenticated, service_role;
|
|
4116
|
+
|
|
4117
|
+
CREATE OR REPLACE FUNCTION public.verkoop_inhaal_uitvoeren(p_sinds timestamptz, p_max integer DEFAULT 100)
|
|
4118
|
+
RETURNS jsonb LANGUAGE plpgsql VOLATILE SECURITY DEFINER SET search_path = public
|
|
4119
|
+
AS $$
|
|
4120
|
+
DECLARE
|
|
4121
|
+
v_ok jsonb; v_run uuid := gen_random_uuid(); v_max int := least(greatest(coalesce(p_max,100),1),200);
|
|
4122
|
+
v_ids text[]; v_part text[]; v_req jsonb := '[]'::jsonb; v_al int := 0; v_opnieuw int := 0; i int;
|
|
4123
|
+
BEGIN
|
|
4124
|
+
IF NOT public.verkoop_is_server() THEN
|
|
4125
|
+
PERFORM public.verkoop_assert_caller('rol', '{admin,superadmin}'::public.app_role[]);
|
|
4126
|
+
END IF;
|
|
4127
|
+
IF NOT public.verkoop_inhaal_vrijgegeven() THEN
|
|
4128
|
+
RAISE EXCEPTION 'Inhalen staat stil. Er is niets gewijzigd. Vrijgeven: SELECT public.verkoop_inhaal_vrijgave(true);';
|
|
4129
|
+
END IF;
|
|
4130
|
+
IF p_sinds IS NULL THEN RAISE EXCEPTION 'Inhalen geweigerd: geef een begintijd op (p_sinds).'; END IF;
|
|
4131
|
+
v_ok := public.verkoop_inhaal_ondersteund();
|
|
4132
|
+
IF NOT coalesce((v_ok->>'ok')::boolean, false) THEN
|
|
4133
|
+
RAISE EXCEPTION 'Inhalen geweigerd: %. Werk die module eerst bij; er is niets gewijzigd.',
|
|
4134
|
+
concat_ws(' en ',
|
|
4135
|
+
CASE WHEN NOT (v_ok->>'voorraad')::boolean THEN 'Voorraad slaat ingehaalde orders nog niet over (voorraad_order_is_backfill ontbreekt)' END,
|
|
4136
|
+
CASE WHEN NOT (v_ok->>'engine')::boolean THEN 'de Logistiek Engine slaat ingehaalde orders nog niet over (logistics_order_is_backfill ontbreekt)' END);
|
|
4137
|
+
END IF;
|
|
4138
|
+
IF NOT pg_try_advisory_xact_lock(hashtext('verkoop_inhaal_uitvoeren')) THEN
|
|
4139
|
+
RETURN jsonb_build_object('bezig', true, 'melding', 'Er loopt al een inhaalaanroep; probeer het over een minuut opnieuw.');
|
|
4140
|
+
END IF;
|
|
4141
|
+
|
|
4142
|
+
UPDATE public.verkoop_inhaal_items it
|
|
4143
|
+
SET status = CASE WHEN o.custom_fields ? 'backfill' THEN 'aangemaakt' ELSE 'al_aanwezig' END,
|
|
4144
|
+
order_id = o.id, verwerkt_at = coalesce(it.verwerkt_at, now()), melding = NULL
|
|
4145
|
+
FROM public.orders o
|
|
4146
|
+
WHERE it.status IN ('aangevraagd','fout')
|
|
4147
|
+
AND (o.floriday_sales_order_id = it.sales_order_id
|
|
4148
|
+
OR (jsonb_typeof(o.custom_fields->'floriday_sales_order_ids') = 'array' AND o.custom_fields->'floriday_sales_order_ids' ? it.sales_order_id));
|
|
4149
|
+
GET DIAGNOSTICS v_al = ROW_COUNT;
|
|
4150
|
+
|
|
4151
|
+
SELECT array_agg(z.floriday_id ORDER BY z.ontvangen_at) INTO v_ids
|
|
4152
|
+
FROM (SELECT z.* FROM public.verkoop_fo_zonder_order(p_sinds, interval '0') z
|
|
4153
|
+
LEFT JOIN public.verkoop_inhaal_items it ON it.sales_order_id = z.floriday_id
|
|
4154
|
+
WHERE z.categorie IN ('afgehandeld','verleden')
|
|
4155
|
+
AND (it.sales_order_id IS NULL OR it.status = 'fout'
|
|
4156
|
+
OR (it.status = 'aangevraagd' AND it.aangevraagd_at < now() - interval '10 minutes'))
|
|
4157
|
+
ORDER BY z.ontvangen_at LIMIT v_max) z;
|
|
4158
|
+
|
|
4159
|
+
IF coalesce(array_length(v_ids,1),0) > 0 THEN
|
|
4160
|
+
INSERT INTO public.verkoop_inhaal_items AS it (sales_order_id, run_id, sinds, categorie, status)
|
|
4161
|
+
SELECT z.floriday_id, v_run, p_sinds, z.categorie, 'aangevraagd'
|
|
4162
|
+
FROM public.verkoop_fo_zonder_order(p_sinds, interval '0') z WHERE z.floriday_id = ANY(v_ids)
|
|
4163
|
+
ON CONFLICT (sales_order_id) DO UPDATE
|
|
4164
|
+
SET run_id = EXCLUDED.run_id, status = 'aangevraagd', melding = NULL, aangevraagd_at = now(),
|
|
4165
|
+
pogingen = it.pogingen + 1, categorie = EXCLUDED.categorie;
|
|
4166
|
+
SELECT count(*) INTO v_opnieuw FROM public.verkoop_inhaal_items WHERE run_id = v_run AND pogingen > 1;
|
|
4167
|
+
i := 1;
|
|
4168
|
+
WHILE i <= array_length(v_ids,1) LOOP
|
|
4169
|
+
v_part := v_ids[i:i+49];
|
|
4170
|
+
v_req := v_req || jsonb_build_array(public.verkoop_cron_post('/api/public/cron/sync-salesorders-now',
|
|
4171
|
+
jsonb_build_object('salesOrderIds', to_jsonb(v_part), 'backfill', true), 55000));
|
|
4172
|
+
i := i + 50;
|
|
4173
|
+
END LOOP;
|
|
4174
|
+
END IF;
|
|
4175
|
+
|
|
4176
|
+
RETURN jsonb_build_object(
|
|
4177
|
+
'run_id', v_run, 'sinds', p_sinds, 'max', v_max,
|
|
4178
|
+
'aangevraagd', coalesce(array_length(v_ids,1),0),
|
|
4179
|
+
'waarvan_opnieuw', v_opnieuw,
|
|
4180
|
+
'net_bijgewerkt_als_omgezet', v_al,
|
|
4181
|
+
'verzoeken', v_req,
|
|
4182
|
+
'resterend', (SELECT count(*) FROM public.verkoop_fo_zonder_order(p_sinds, interval '0') z
|
|
4183
|
+
LEFT JOIN public.verkoop_inhaal_items it ON it.sales_order_id = z.floriday_id
|
|
4184
|
+
WHERE z.categorie IN ('afgehandeld','verleden') AND it.sales_order_id IS NULL),
|
|
4185
|
+
'overgeslagen_geannuleerd', (SELECT count(*) FROM public.verkoop_fo_zonder_order(p_sinds, interval '0') WHERE categorie = 'geannuleerd'),
|
|
4186
|
+
'melding', 'Aangevraagd. Bekijk de uitkomst over een minuut met verkoop_inhaal_status().');
|
|
4187
|
+
END $$;
|
|
4188
|
+
REVOKE ALL ON FUNCTION public.verkoop_inhaal_uitvoeren(timestamptz, integer) FROM PUBLIC, anon;
|
|
4189
|
+
GRANT EXECUTE ON FUNCTION public.verkoop_inhaal_uitvoeren(timestamptz, integer) TO authenticated, service_role;
|
|
4190
|
+
|
|
4191
|
+
-- 2. Bestaand = ook een order (ook verwijderd/samengevoegd/hersteld) die de regels van deze salesOrderId draagt
|
|
4192
|
+
CREATE OR REPLACE FUNCTION public.verkoop_fo_zonder_order(p_sinds timestamp with time zone, p_min_leeftijd interval)
|
|
4193
|
+
RETURNS TABLE(floriday_id text, ontvangen_at timestamp with time zone, leverdatum date, categorie text)
|
|
4194
|
+
LANGUAGE plpgsql STABLE SECURITY DEFINER SET search_path TO 'public'
|
|
4195
|
+
AS $function$
|
|
4196
|
+
BEGIN
|
|
4197
|
+
IF NOT public.verkoop_is_server() THEN
|
|
4198
|
+
PERFORM public.verkoop_assert_caller('rol', '{admin,superadmin}'::public.app_role[]);
|
|
4199
|
+
END IF;
|
|
4200
|
+
IF to_regclass('public.floriday_salesorders_cache') IS NULL THEN RETURN; END IF;
|
|
4201
|
+
RETURN QUERY
|
|
4202
|
+
WITH kand AS MATERIALIZED (
|
|
4203
|
+
SELECT c.floriday_id AS fid, c.created_at AS ontv, c.status AS st,
|
|
4204
|
+
c.data->>'salesOrderGroupId' AS gid, c.buyer_organization_id AS org,
|
|
4205
|
+
c.data->'delivery'->>'latestDeliveryDateTime' AS lev
|
|
4206
|
+
FROM public.floriday_salesorders_cache c
|
|
4207
|
+
WHERE NOT coalesce(c.is_deleted, false)
|
|
4208
|
+
AND c.created_at >= p_sinds
|
|
4209
|
+
AND c.created_at < now() - p_min_leeftijd
|
|
4210
|
+
AND NOT EXISTS (SELECT 1 FROM public.orders o WHERE o.floriday_sales_order_id = c.floriday_id)
|
|
4211
|
+
), rest AS MATERIALIZED (
|
|
4212
|
+
SELECT k.* FROM kand k
|
|
4213
|
+
WHERE NOT (k.gid IS NOT NULL AND EXISTS (SELECT 1 FROM public.orders o
|
|
4214
|
+
WHERE o.floriday_order_group_key = 'fo|g|' || coalesce(k.org,'') || '|' || k.gid))
|
|
4215
|
+
AND NOT EXISTS (SELECT 1 FROM public.order_items oi WHERE oi.source_line_key = k.fid)
|
|
4216
|
+
)
|
|
4217
|
+
SELECT r.fid, r.ontv,
|
|
4218
|
+
CASE WHEN r.lev ~ '^\d{4}-\d{2}-\d{2}T' THEN (r.lev::timestamptz AT TIME ZONE 'Europe/Amsterdam')::date END,
|
|
4219
|
+
CASE WHEN upper(coalesce(r.st,'')) IN ('CANCELLED','CANCELED','DELETED','REJECTED') THEN 'geannuleerd'
|
|
4220
|
+
WHEN EXISTS (SELECT 1 FROM public.verkoop_fulfillment_index f WHERE f.sales_order_id = r.fid AND NOT coalesce(f.is_deleted,false)) THEN 'afgehandeld'
|
|
4221
|
+
WHEN r.lev ~ '^\d{4}-\d{2}-\d{2}T'
|
|
4222
|
+
AND (r.lev::timestamptz AT TIME ZONE 'Europe/Amsterdam')::date < (now() AT TIME ZONE 'Europe/Amsterdam')::date THEN 'verleden'
|
|
4223
|
+
ELSE 'toekomst' END
|
|
4224
|
+
FROM rest r
|
|
4225
|
+
WHERE NOT EXISTS (SELECT 1 FROM public.orders o
|
|
4226
|
+
WHERE jsonb_typeof(o.custom_fields->'floriday_sales_order_ids') = 'array'
|
|
4227
|
+
AND o.custom_fields->'floriday_sales_order_ids' ? r.fid);
|
|
4228
|
+
END $function$;
|
|
4229
|
+
|
|
4230
|
+
-- 3. Bewaking: nieuwe Floriday-orders die meteen verwijderd zijn
|
|
4231
|
+
CREATE OR REPLACE FUNCTION public.verkoop_bewaking_verwijderd()
|
|
4232
|
+
RETURNS jsonb LANGUAGE plpgsql SECURITY DEFINER SET search_path = public
|
|
4233
|
+
AS $$
|
|
4234
|
+
DECLARE v_n int; v_mail text; v_b text := 'Nieuwe orders worden als verwijderd opgeslagen; ze krijgen geen karindeling.';
|
|
4235
|
+
BEGIN
|
|
4236
|
+
IF NOT public.verkoop_is_server() THEN
|
|
4237
|
+
PERFORM public.verkoop_assert_caller('rol', '{admin,superadmin}'::public.app_role[]);
|
|
4238
|
+
END IF;
|
|
4239
|
+
SELECT count(*)::int INTO v_n FROM public.orders o
|
|
4240
|
+
WHERE o.created_at > now() - interval '30 minutes' AND o.deleted_at IS NOT NULL
|
|
4241
|
+
AND (o.floriday_sales_order_id IS NOT NULL OR lower(coalesce(o.order_source,'')) = 'floriday')
|
|
4242
|
+
AND NOT (o.custom_fields ? 'backfill');
|
|
4243
|
+
IF v_n >= 3 THEN
|
|
4244
|
+
IF NOT EXISTS (SELECT 1 FROM public.verkoop_alerts WHERE soort='verwijderd_binnen' AND resolved_at IS NULL) THEN
|
|
4245
|
+
v_mail := public.verkoop_alert_mail('Verkoop: nieuwe orders worden als verwijderd opgeslagen',
|
|
4246
|
+
v_b || E'\n' || format('%s nieuwe Floriday-order(s) in de laatste 30 minuten.', v_n));
|
|
4247
|
+
INSERT INTO public.verkoop_alerts(soort, bericht, details)
|
|
4248
|
+
VALUES ('verwijderd_binnen', v_b, jsonb_build_object('aantal', v_n, 'mail', v_mail));
|
|
4249
|
+
END IF;
|
|
4250
|
+
ELSE
|
|
4251
|
+
UPDATE public.verkoop_alerts SET resolved_at = now() WHERE soort='verwijderd_binnen' AND resolved_at IS NULL;
|
|
4252
|
+
END IF;
|
|
4253
|
+
RETURN jsonb_build_object('verwijderd_30min', v_n);
|
|
4254
|
+
END $$;
|
|
4255
|
+
REVOKE ALL ON FUNCTION public.verkoop_bewaking_verwijderd() FROM PUBLIC, anon, authenticated;
|
|
4256
|
+
GRANT EXECUTE ON FUNCTION public.verkoop_bewaking_verwijderd() TO service_role;
|
|
4257
|
+
|
|
4258
|
+
CREATE OR REPLACE FUNCTION public.verkoop_ensure_cron_heal()
|
|
4259
|
+
RETURNS jsonb LANGUAGE plpgsql SECURITY DEFINER SET search_path = public
|
|
4260
|
+
AS $$
|
|
4261
|
+
DECLARE v_bad int := 0; v_job boolean := false; v_heal jsonb; v_bew jsonb; v_del jsonb;
|
|
4262
|
+
BEGIN
|
|
4263
|
+
IF NOT public.verkoop_is_server() THEN
|
|
4264
|
+
PERFORM public.verkoop_assert_caller('rol', '{admin,superadmin}'::public.app_role[]);
|
|
4265
|
+
END IF;
|
|
4266
|
+
IF to_regclass('cron.job') IS NOT NULL THEN
|
|
4267
|
+
EXECUTE $q$SELECT count(*)::int FROM cron.job
|
|
4268
|
+
WHERE (jobname IN ('verkoop-salesorders-sync-1min','invoice-due-verkoop')
|
|
4269
|
+
AND (command NOT LIKE '%verkoop_cron_post(%' OR command ILIKE '%flowselections_cron_post%' OR NOT active))
|
|
4270
|
+
OR (jobname = 'verkoop-cron-guard-5min' AND (command NOT LIKE '%verkoop_ensure_cron_heal()%' OR NOT active))$q$ INTO v_bad;
|
|
4271
|
+
EXECUTE $q$SELECT EXISTS (SELECT 1 FROM cron.job WHERE jobname='verkoop-salesorders-sync-1min')$q$ INTO v_job;
|
|
4272
|
+
IF v_bad > 0 OR NOT v_job THEN
|
|
4273
|
+
BEGIN
|
|
4274
|
+
v_heal := public.verkoop_ensure_cron();
|
|
4275
|
+
INSERT INTO public.verkoop_sync_state(key, last_ok_at, details, updated_at)
|
|
4276
|
+
VALUES ('cron-heal', now(), jsonb_build_object('at', now(), 'fout_jobs', v_bad, 'sync_job_ontbrak', NOT v_job, 'uitkomst', v_heal), now())
|
|
4277
|
+
ON CONFLICT (key) DO UPDATE SET last_ok_at = EXCLUDED.last_ok_at, details = EXCLUDED.details, updated_at = now();
|
|
4278
|
+
EXCEPTION WHEN OTHERS THEN
|
|
4279
|
+
v_heal := jsonb_build_object('ok', false, 'error', SQLERRM);
|
|
4280
|
+
RAISE WARNING '[verkoop] cron herstellen mislukt: %', SQLERRM;
|
|
4281
|
+
INSERT INTO public.verkoop_sync_state(key, last_error_at, last_error, details, updated_at)
|
|
4282
|
+
VALUES ('cron-heal', now(), left(SQLERRM, 500), jsonb_build_object('at', now(), 'uitkomst', v_heal), now())
|
|
4283
|
+
ON CONFLICT (key) DO UPDATE SET last_error_at = EXCLUDED.last_error_at, last_error = EXCLUDED.last_error, details = EXCLUDED.details, updated_at = now();
|
|
4284
|
+
END;
|
|
4285
|
+
END IF;
|
|
4286
|
+
END IF;
|
|
4287
|
+
v_bew := public.verkoop_sync_bewaking();
|
|
4288
|
+
BEGIN
|
|
4289
|
+
v_del := public.verkoop_bewaking_verwijderd();
|
|
4290
|
+
EXCEPTION WHEN OTHERS THEN
|
|
4291
|
+
RAISE WARNING '[verkoop] bewaking verwijderde orders mislukt: %', SQLERRM;
|
|
4292
|
+
v_del := jsonb_build_object('ok', false, 'error', SQLERRM);
|
|
4293
|
+
END;
|
|
4294
|
+
RETURN jsonb_build_object('herstel', v_heal, 'bewaking', v_bew, 'verwijderd', v_del);
|
|
4295
|
+
END $$;
|
|
4296
|
+
REVOKE ALL ON FUNCTION public.verkoop_ensure_cron_heal() FROM PUBLIC, anon, authenticated;
|
|
4297
|
+
GRANT EXECUTE ON FUNCTION public.verkoop_ensure_cron_heal() TO service_role;
|
|
4298
|
+
|
|
4299
|
+
CREATE OR REPLACE FUNCTION public.verkoop_sync_melding()
|
|
4300
|
+
RETURNS jsonb LANGUAGE plpgsql STABLE SECURITY DEFINER SET search_path = public
|
|
4301
|
+
AS $$
|
|
4302
|
+
DECLARE v_open boolean; v_del boolean; v_n int; v_oudste timestamptz; v_ok_at timestamptz;
|
|
4303
|
+
BEGIN
|
|
4304
|
+
IF auth.uid() IS NULL OR NOT (public.has_role(auth.uid(), 'admin') OR public.has_role(auth.uid(), 'superadmin')) THEN
|
|
4305
|
+
RETURN jsonb_build_object('zichtbaar', false);
|
|
4306
|
+
END IF;
|
|
4307
|
+
SELECT EXISTS (SELECT 1 FROM public.verkoop_alerts WHERE resolved_at IS NULL AND soort IN ('sync_route','achterstand')) INTO v_open;
|
|
4308
|
+
SELECT EXISTS (SELECT 1 FROM public.verkoop_alerts WHERE resolved_at IS NULL AND soort = 'verwijderd_binnen') INTO v_del;
|
|
4309
|
+
IF NOT v_open AND NOT v_del THEN RETURN jsonb_build_object('zichtbaar', false); END IF;
|
|
4310
|
+
IF NOT v_open THEN RETURN jsonb_build_object('zichtbaar', false, 'verwijderd', true); END IF;
|
|
4311
|
+
SELECT (details->>'aantal')::int, (details->>'oudste')::timestamptz INTO v_n, v_oudste
|
|
4312
|
+
FROM public.verkoop_alerts WHERE soort='achterstand' AND resolved_at IS NULL ORDER BY created_at DESC LIMIT 1;
|
|
4313
|
+
SELECT last_ok_at INTO v_ok_at FROM public.verkoop_sync_state WHERE key='salesorders-heartbeat';
|
|
4314
|
+
RETURN jsonb_build_object('zichtbaar', true, 'sinds', coalesce(v_oudste, v_ok_at), 'wachten', coalesce(v_n, 0), 'verwijderd', v_del);
|
|
4315
|
+
END $$;
|
|
4316
|
+
REVOKE ALL ON FUNCTION public.verkoop_sync_melding() FROM PUBLIC, anon;
|
|
4317
|
+
GRANT EXECUTE ON FUNCTION public.verkoop_sync_melding() TO authenticated, service_role;
|
|
4318
|
+
|
|
4319
|
+
-- 4. Startdatum automatisch factureren (factuurmoment van Verkoop)
|
|
4320
|
+
ALTER TABLE public.invoice_timing_settings ADD COLUMN IF NOT EXISTS start_date date;
|
|
4321
|
+
|
|
4322
|
+
CREATE OR REPLACE FUNCTION public.invoice_timing_settings_start_date()
|
|
4323
|
+
RETURNS trigger LANGUAGE plpgsql SET search_path = public
|
|
4324
|
+
AS $$
|
|
4325
|
+
BEGIN
|
|
4326
|
+
IF NEW.enabled IS TRUE AND (TG_OP = 'INSERT' OR OLD.enabled IS DISTINCT FROM true)
|
|
4327
|
+
AND (TG_OP = 'INSERT' OR NEW.start_date IS NOT DISTINCT FROM OLD.start_date) THEN
|
|
4328
|
+
NEW.start_date := (now() AT TIME ZONE 'Europe/Amsterdam')::date;
|
|
4329
|
+
END IF;
|
|
4330
|
+
RETURN NEW;
|
|
4331
|
+
END $$;
|
|
4332
|
+
DROP TRIGGER IF EXISTS trg_invoice_timing_settings_start_date ON public.invoice_timing_settings;
|
|
4333
|
+
CREATE TRIGGER trg_invoice_timing_settings_start_date BEFORE INSERT OR UPDATE ON public.invoice_timing_settings
|
|
4334
|
+
FOR EACH ROW EXECUTE FUNCTION public.invoice_timing_settings_start_date();
|