@flowselections/floriday-verkoop-module 1.0.129 → 1.0.130
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/CreateOrderPage.d.ts.map +1 -1
- package/dist-lib/components/verkoop/CreateOrderPage.js +2 -1
- package/dist-lib/components/verkoop/OrderKarindelingCard.d.ts.map +1 -1
- package/dist-lib/components/verkoop/OrderKarindelingCard.js +1 -1
- package/dist-lib/components/verkoop/OrderLinePackingCard.d.ts.map +1 -1
- package/dist-lib/components/verkoop/OrderLinePackingCard.js +31 -17
- package/dist-lib/integrations/supabase/types.d.ts +94 -0
- package/dist-lib/integrations/supabase/types.d.ts.map +1 -1
- package/dist-lib/lib/cron/cron-auth.check.d.ts +2 -0
- package/dist-lib/lib/cron/cron-auth.check.d.ts.map +1 -0
- package/dist-lib/lib/cron/cron-auth.check.js +25 -0
- package/dist-lib/lib/cron/cron-auth.server.d.ts +6 -0
- package/dist-lib/lib/cron/cron-auth.server.d.ts.map +1 -0
- package/dist-lib/lib/cron/cron-auth.server.js +53 -0
- package/dist-lib/lib/cron/invoice-due.d.ts.map +1 -1
- package/dist-lib/lib/cron/invoice-due.js +4 -5
- package/dist-lib/lib/cron/sync-salesorders-now.d.ts +8 -0
- package/dist-lib/lib/cron/sync-salesorders-now.d.ts.map +1 -1
- package/dist-lib/lib/cron/sync-salesorders-now.js +40 -13
- package/dist-lib/lib/cron/sync-salesorders.d.ts.map +1 -1
- package/dist-lib/lib/cron/sync-salesorders.js +4 -5
- package/dist-lib/lib/delivery-location.check.js +8 -2
- package/dist-lib/lib/module-version.d.ts +1 -1
- package/dist-lib/lib/module-version.js +1 -1
- package/dist-lib/lib/order-item-packing.functions.d.ts +34 -4
- package/dist-lib/lib/order-item-packing.functions.d.ts.map +1 -1
- package/dist-lib/lib/order-item-packing.functions.js +54 -6
- package/dist-lib/lib/plan-coverage.d.ts +22 -1
- package/dist-lib/lib/plan-coverage.d.ts.map +1 -1
- package/dist-lib/lib/plan-coverage.js +48 -5
- package/dist-lib/lib/plan-coverage.server.d.ts.map +1 -1
- package/dist-lib/lib/plan-coverage.server.js +12 -2
- package/dist-lib/lib/product-plannable.functions.d.ts +3 -4
- package/dist-lib/lib/product-plannable.functions.d.ts.map +1 -1
- package/dist-lib/lib/product-plannable.functions.js +23 -13
- package/package.json +1 -1
- package/schema/verkoop.sql +265 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"product-plannable.functions.d.ts","sourceRoot":"","sources":["../../src/lib/product-plannable.functions.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"product-plannable.functions.d.ts","sourceRoot":"","sources":["../../src/lib/product-plannable.functions.ts"],"names":[],"mappings":"AAQA,eAAO,MAAM,sBAAsB;;;;8CAET,OAAO;;;;;;;GAyB7B,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
|
-
// Oordeel van de Logistiek Engine per product
|
|
2
|
-
//
|
|
3
|
-
//
|
|
1
|
+
// Oordeel van de Logistiek Engine per product. Alleen lezen, nooit zelf beoordelen.
|
|
2
|
+
// - impossible: logistics_product_oordeel_many (Engine 1.0.201+), oordeel "onmogelijk".
|
|
3
|
+
// Ontbreekt die functie: geen waarschuwing.
|
|
4
|
+
// - missing: ontbrekende gegevens via logistics_product_maten.missing_reason.
|
|
4
5
|
import { createServerFn } from "@tanstack/react-start";
|
|
5
6
|
import { z } from "zod";
|
|
6
7
|
import { requireSupabaseAuth } from "../integrations/supabase/auth-middleware.js";
|
|
@@ -9,16 +10,25 @@ export const getProductPlannability = createServerFn({ method: "POST" })
|
|
|
9
10
|
.inputValidator((input) => z.object({ productIds: z.array(z.string().uuid()).max(200) }).parse(input))
|
|
10
11
|
.handler(async ({ data, context }) => {
|
|
11
12
|
const impossible = {};
|
|
13
|
+
const missing = {};
|
|
12
14
|
if (!data.productIds.length)
|
|
13
|
-
return { impossible, available: true };
|
|
14
|
-
const
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
15
|
+
return { impossible, missing, available: true, oordeelAvailable: true };
|
|
16
|
+
const sb = context.supabase;
|
|
17
|
+
const [oordeel, maten] = await Promise.all([
|
|
18
|
+
sb.rpc("logistics_product_oordeel_many", { p_product_ids: data.productIds }),
|
|
19
|
+
sb.rpc("logistics_product_maten", { p_product_ids: data.productIds }),
|
|
20
|
+
]);
|
|
21
|
+
if (!oordeel.error) {
|
|
22
|
+
for (const r of (oordeel.data ?? [])) {
|
|
23
|
+
if (r?.product_id && String(r.oordeel ?? "").toLowerCase() === "onmogelijk")
|
|
24
|
+
impossible[String(r.product_id)] = typeof r.tekst === "string" && r.tekst.trim() ? r.tekst.trim() : "De Engine noemt dit product onmogelijk.";
|
|
25
|
+
}
|
|
22
26
|
}
|
|
23
|
-
|
|
27
|
+
if (!maten.error) {
|
|
28
|
+
for (const r of (maten.data ?? [])) {
|
|
29
|
+
if (r?.product_id && typeof r.missing_reason === "string" && r.missing_reason.trim())
|
|
30
|
+
missing[String(r.product_id)] = r.missing_reason.trim();
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
return { impossible, missing, available: !maten.error, oordeelAvailable: !oordeel.error };
|
|
24
34
|
});
|
package/package.json
CHANGED
package/schema/verkoop.sql
CHANGED
|
@@ -2848,3 +2848,268 @@ BEGIN
|
|
|
2848
2848
|
REFERENCING OLD TABLE AS old_rows NEW TABLE AS new_rows FOR EACH STATEMENT EXECUTE FUNCTION public.verkoop_salesorders_direct_upd_trg()$q$;
|
|
2849
2849
|
END IF;
|
|
2850
2850
|
END $$;
|
|
2851
|
+
|
|
2852
|
+
-- ===== 1.0.128 (vervolg): eigen geheime cron-sleutel voor alle Verkoop-cronroutes =====
|
|
2853
|
+
-- De sleutel staat alleen in de vault van deze database (verkoop_cron_key), wordt
|
|
2854
|
+
-- per shell zelf aangemaakt en staat nooit in code of SQL. De routes eisen hem in
|
|
2855
|
+
-- de kop x-verkoop-cron-key; zonder sleutel wordt er niets aangeroepen (fail closed).
|
|
2856
|
+
|
|
2857
|
+
CREATE OR REPLACE FUNCTION public.verkoop_cron_key()
|
|
2858
|
+
RETURNS text
|
|
2859
|
+
LANGUAGE plpgsql
|
|
2860
|
+
VOLATILE
|
|
2861
|
+
SECURITY DEFINER
|
|
2862
|
+
SET search_path TO 'public', 'extensions', 'vault'
|
|
2863
|
+
AS $function$
|
|
2864
|
+
DECLARE v text;
|
|
2865
|
+
BEGIN
|
|
2866
|
+
IF NOT public.verkoop_is_server() THEN
|
|
2867
|
+
RAISE EXCEPTION 'verkoop_cron_key: alleen server' USING ERRCODE = '42501';
|
|
2868
|
+
END IF;
|
|
2869
|
+
IF to_regclass('vault.decrypted_secrets') IS NULL THEN RETURN NULL; END IF;
|
|
2870
|
+
SELECT decrypted_secret INTO v FROM vault.decrypted_secrets WHERE name = 'verkoop_cron_key' LIMIT 1;
|
|
2871
|
+
IF v IS NULL OR v = '' THEN
|
|
2872
|
+
IF to_regprocedure('vault.create_secret(text,text,text,uuid)') IS NULL
|
|
2873
|
+
AND to_regprocedure('vault.create_secret(text,text,text)') IS NULL THEN
|
|
2874
|
+
RETURN NULL;
|
|
2875
|
+
END IF;
|
|
2876
|
+
PERFORM vault.create_secret(encode(extensions.gen_random_bytes(32), 'hex'), 'verkoop_cron_key', 'Verkoop: geheime sleutel voor eigen cronroutes (automatisch aangemaakt)');
|
|
2877
|
+
SELECT decrypted_secret INTO v FROM vault.decrypted_secrets WHERE name = 'verkoop_cron_key' LIMIT 1;
|
|
2878
|
+
END IF;
|
|
2879
|
+
RETURN nullif(v, '');
|
|
2880
|
+
END
|
|
2881
|
+
$function$;
|
|
2882
|
+
|
|
2883
|
+
REVOKE ALL ON FUNCTION public.verkoop_cron_key() FROM PUBLIC, anon, authenticated;
|
|
2884
|
+
GRANT EXECUTE ON FUNCTION public.verkoop_cron_key() TO service_role;
|
|
2885
|
+
|
|
2886
|
+
-- Status van de cron-aanroep (adres + sleutels), zonder iets te versturen.
|
|
2887
|
+
CREATE OR REPLACE FUNCTION public.verkoop_cron_post_status()
|
|
2888
|
+
RETURNS jsonb
|
|
2889
|
+
LANGUAGE plpgsql
|
|
2890
|
+
VOLATILE
|
|
2891
|
+
SECURITY DEFINER
|
|
2892
|
+
SET search_path TO 'public', 'extensions', 'vault'
|
|
2893
|
+
AS $function$
|
|
2894
|
+
DECLARE v_base text; v_anon text; v_key text;
|
|
2895
|
+
BEGIN
|
|
2896
|
+
IF NOT public.verkoop_is_server() THEN
|
|
2897
|
+
PERFORM public.verkoop_assert_caller('rol', '{admin,superadmin}'::public.app_role[]);
|
|
2898
|
+
END IF;
|
|
2899
|
+
IF to_regnamespace('net') IS NULL THEN
|
|
2900
|
+
RETURN jsonb_build_object('ok', false, 'reden', 'pg_net ontbreekt in deze database');
|
|
2901
|
+
END IF;
|
|
2902
|
+
IF to_regclass('public.module_runtime_config') IS NOT NULL THEN
|
|
2903
|
+
SELECT rtrim(btrim(value::text), '/') INTO v_base FROM public.module_runtime_config WHERE key = 'shell_base_url' LIMIT 1;
|
|
2904
|
+
END IF;
|
|
2905
|
+
IF v_base IS NULL OR v_base !~ '^https:[/][/][a-z0-9]([a-z0-9.-]*[a-z0-9])?(:[0-9]{1,5})?$' THEN
|
|
2906
|
+
RETURN jsonb_build_object('ok', false, 'reden', 'shell-adres ontbreekt of is ongeldig (module_runtime_config, key shell_base_url)');
|
|
2907
|
+
END IF;
|
|
2908
|
+
IF to_regclass('vault.decrypted_secrets') IS NOT NULL THEN
|
|
2909
|
+
SELECT decrypted_secret INTO v_anon FROM vault.decrypted_secrets WHERE name = 'flowselections_anon_key';
|
|
2910
|
+
END IF;
|
|
2911
|
+
IF v_anon IS NULL THEN
|
|
2912
|
+
RETURN jsonb_build_object('ok', false, 'reden', 'vault-geheim flowselections_anon_key ontbreekt');
|
|
2913
|
+
END IF;
|
|
2914
|
+
BEGIN
|
|
2915
|
+
v_key := public.verkoop_cron_key();
|
|
2916
|
+
EXCEPTION WHEN OTHERS THEN
|
|
2917
|
+
RETURN jsonb_build_object('ok', false, 'reden', 'geheime cron-sleutel kon niet worden aangemaakt: ' || left(SQLERRM, 160));
|
|
2918
|
+
END;
|
|
2919
|
+
IF v_key IS NULL THEN
|
|
2920
|
+
RETURN jsonb_build_object('ok', false, 'reden', 'geheime cron-sleutel kon niet worden aangemaakt (vault niet beschikbaar)');
|
|
2921
|
+
END IF;
|
|
2922
|
+
RETURN jsonb_build_object('ok', true, 'reden', 'adres, anon-sleutel en geheime cron-sleutel aanwezig');
|
|
2923
|
+
END
|
|
2924
|
+
$function$;
|
|
2925
|
+
|
|
2926
|
+
REVOKE ALL ON FUNCTION public.verkoop_cron_post_status() FROM PUBLIC, anon;
|
|
2927
|
+
GRANT EXECUTE ON FUNCTION public.verkoop_cron_post_status() TO authenticated, service_role;
|
|
2928
|
+
|
|
2929
|
+
-- Eigen POST naar een Verkoop-cronroute, met dezelfde adresbron als flowselections_cron_post
|
|
2930
|
+
-- (module_runtime_config.key = 'shell_base_url'; in dev eventueel flowselections_cron_override)
|
|
2931
|
+
-- plus de kop x-verkoop-cron-key. Ontbreekt iets: logregel en niets versturen.
|
|
2932
|
+
CREATE OR REPLACE FUNCTION public.verkoop_cron_post(p_path text, p_body jsonb DEFAULT '{}'::jsonb, p_timeout_ms integer DEFAULT 15000)
|
|
2933
|
+
RETURNS bigint
|
|
2934
|
+
LANGUAGE plpgsql
|
|
2935
|
+
VOLATILE
|
|
2936
|
+
SECURITY DEFINER
|
|
2937
|
+
SET search_path TO 'public', 'extensions', 'vault', 'net'
|
|
2938
|
+
AS $function$
|
|
2939
|
+
DECLARE v_base text; v_anon text; v_key text; v_status text; v_detail text;
|
|
2940
|
+
BEGIN
|
|
2941
|
+
IF NOT public.verkoop_is_server() THEN
|
|
2942
|
+
RAISE EXCEPTION 'verkoop_cron_post: alleen server' USING ERRCODE = '42501';
|
|
2943
|
+
END IF;
|
|
2944
|
+
IF p_path IS NULL OR p_path !~ '^/api/public/cron/[A-Za-z0-9/_.-]+$' THEN
|
|
2945
|
+
v_status := 'pad_ongeldig'; v_detail := 'alleen /api/public/cron/-paden';
|
|
2946
|
+
ELSIF to_regnamespace('net') IS NULL THEN
|
|
2947
|
+
v_status := 'pg_net_ontbreekt'; v_detail := 'pg_net ontbreekt';
|
|
2948
|
+
ELSE
|
|
2949
|
+
IF to_regclass('public.flowselections_cron_override') IS NOT NULL AND to_regclass('public.module_runtime_config') IS NOT NULL THEN
|
|
2950
|
+
EXECUTE $q$SELECT o.base_url FROM public.flowselections_cron_override o
|
|
2951
|
+
WHERE left($1, length(o.path_prefix)) = o.path_prefix
|
|
2952
|
+
AND EXISTS (SELECT 1 FROM public.module_runtime_config c WHERE c.key = 'environment' AND c.value = 'dev')
|
|
2953
|
+
ORDER BY length(o.path_prefix) DESC LIMIT 1$q$ INTO v_base USING p_path;
|
|
2954
|
+
END IF;
|
|
2955
|
+
IF v_base IS NULL AND to_regclass('public.module_runtime_config') IS NOT NULL THEN
|
|
2956
|
+
SELECT rtrim(btrim(value::text), '/') INTO v_base FROM public.module_runtime_config WHERE key = 'shell_base_url' LIMIT 1;
|
|
2957
|
+
END IF;
|
|
2958
|
+
v_base := rtrim(v_base, '/');
|
|
2959
|
+
IF v_base IS NULL OR v_base !~ '^https:[/][/][a-z0-9]([a-z0-9.-]*[a-z0-9])?(:[0-9]{1,5})?$' THEN
|
|
2960
|
+
v_status := 'host_ontbreekt'; v_detail := 'shell_base_url ontbreekt of is ongeldig; niets aangeroepen';
|
|
2961
|
+
ELSE
|
|
2962
|
+
SELECT decrypted_secret INTO v_anon FROM vault.decrypted_secrets WHERE name = 'flowselections_anon_key';
|
|
2963
|
+
v_key := public.verkoop_cron_key();
|
|
2964
|
+
IF v_anon IS NULL THEN
|
|
2965
|
+
v_status := 'sleutel_ontbreekt'; v_detail := 'vault-geheim flowselections_anon_key ontbreekt; niets aangeroepen';
|
|
2966
|
+
ELSIF v_key IS NULL THEN
|
|
2967
|
+
v_status := 'cron_key_ontbreekt'; v_detail := 'geheime cron-sleutel van Verkoop ontbreekt; niets aangeroepen';
|
|
2968
|
+
ELSE
|
|
2969
|
+
RETURN net.http_post(
|
|
2970
|
+
url := v_base || p_path,
|
|
2971
|
+
headers := jsonb_build_object('Content-Type', 'application/json', 'apikey', v_anon, 'x-verkoop-cron-key', v_key),
|
|
2972
|
+
body := coalesce(p_body, '{}'::jsonb),
|
|
2973
|
+
timeout_milliseconds := greatest(1000, least(coalesce(p_timeout_ms, 15000), 120000)));
|
|
2974
|
+
END IF;
|
|
2975
|
+
END IF;
|
|
2976
|
+
END IF;
|
|
2977
|
+
IF to_regclass('public.flowselections_cron_log') IS NOT NULL THEN
|
|
2978
|
+
EXECUTE 'INSERT INTO public.flowselections_cron_log (path, status, detail) VALUES ($1, $2, $3)'
|
|
2979
|
+
USING left(coalesce(p_path, ''), 200), v_status, 'verkoop: ' || v_detail;
|
|
2980
|
+
END IF;
|
|
2981
|
+
RAISE WARNING '[verkoop] cron % niet verstuurd: %', p_path, v_detail;
|
|
2982
|
+
RETURN NULL;
|
|
2983
|
+
END
|
|
2984
|
+
$function$;
|
|
2985
|
+
|
|
2986
|
+
REVOKE ALL ON FUNCTION public.verkoop_cron_post(text, jsonb, integer) FROM PUBLIC, anon, authenticated;
|
|
2987
|
+
GRANT EXECUTE ON FUNCTION public.verkoop_cron_post(text, jsonb, integer) TO service_role;
|
|
2988
|
+
|
|
2989
|
+
-- Directe omzetting: nu via de eigen post, per verzoek hooguit 50 ID's.
|
|
2990
|
+
CREATE OR REPLACE FUNCTION public.verkoop_salesorders_direct_post(p_ids text[])
|
|
2991
|
+
RETURNS void
|
|
2992
|
+
LANGUAGE plpgsql
|
|
2993
|
+
SECURITY DEFINER
|
|
2994
|
+
SET search_path = public
|
|
2995
|
+
AS $$
|
|
2996
|
+
DECLARE i integer := 1; n integer;
|
|
2997
|
+
BEGIN
|
|
2998
|
+
IF p_ids IS NULL OR cardinality(p_ids) = 0 THEN RETURN; END IF;
|
|
2999
|
+
n := cardinality(p_ids);
|
|
3000
|
+
WHILE i <= n LOOP
|
|
3001
|
+
PERFORM public.verkoop_cron_post(
|
|
3002
|
+
'/api/public/cron/sync-salesorders-now',
|
|
3003
|
+
jsonb_build_object('salesOrderIds', to_jsonb(p_ids[i:i + 49])),
|
|
3004
|
+
15000);
|
|
3005
|
+
i := i + 50;
|
|
3006
|
+
END LOOP;
|
|
3007
|
+
EXCEPTION WHEN OTHERS THEN
|
|
3008
|
+
RAISE WARNING '[verkoop] directe omzetting niet verstuurd: %', SQLERRM;
|
|
3009
|
+
END
|
|
3010
|
+
$$;
|
|
3011
|
+
|
|
3012
|
+
REVOKE ALL ON FUNCTION public.verkoop_salesorders_direct_post(text[]) FROM PUBLIC, anon, authenticated;
|
|
3013
|
+
|
|
3014
|
+
-- Cronjobs van Verkoop via de eigen post (met geheime sleutel). Geen vaste host.
|
|
3015
|
+
CREATE OR REPLACE FUNCTION public.verkoop_ensure_cron()
|
|
3016
|
+
RETURNS jsonb
|
|
3017
|
+
LANGUAGE plpgsql
|
|
3018
|
+
SECURITY DEFINER
|
|
3019
|
+
SET search_path TO 'public'
|
|
3020
|
+
AS $function$
|
|
3021
|
+
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;
|
|
3022
|
+
BEGIN
|
|
3023
|
+
IF NOT public.verkoop_is_server() THEN
|
|
3024
|
+
PERFORM public.verkoop_assert_caller('rol', '{admin,superadmin}'::public.app_role[]);
|
|
3025
|
+
END IF;
|
|
3026
|
+
IF to_regclass('cron.job') IS NULL THEN
|
|
3027
|
+
RAISE EXCEPTION 'pg_cron ontbreekt in deze database';
|
|
3028
|
+
END IF;
|
|
3029
|
+
v_status := public.verkoop_cron_post_status();
|
|
3030
|
+
INSERT INTO public.verkoop_sync_state (key, ensure_cron_at) VALUES ('cron', now())
|
|
3031
|
+
ON CONFLICT (key) DO UPDATE SET ensure_cron_at = now(), updated_at = now();
|
|
3032
|
+
FOR j IN SELECT * FROM (VALUES
|
|
3033
|
+
('verkoop-salesorders-sync-1min', '* * * * *', '/api/public/cron/sync-salesorders'),
|
|
3034
|
+
('invoice-due-verkoop', '*/15 * * * *', '/api/public/cron/invoice-due')
|
|
3035
|
+
) t(name, sched, path) LOOP
|
|
3036
|
+
v_cmd := format('SELECT public.verkoop_cron_post(%L, ''{}''::jsonb, 15000);', j.path);
|
|
3037
|
+
v_jobid := NULL;
|
|
3038
|
+
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;
|
|
3039
|
+
IF v_jobid IS NULL THEN
|
|
3040
|
+
EXECUTE 'SELECT cron.schedule($1, $2, $3)' INTO v_id USING j.name, j.sched, v_cmd;
|
|
3041
|
+
v_out := v_out || jsonb_build_object('job', j.name, 'actie', 'aangemaakt', 'jobid', v_id);
|
|
3042
|
+
ELSIF v_sched IS DISTINCT FROM j.sched OR rtrim(btrim(v_curcmd), ';') IS DISTINCT FROM rtrim(v_cmd, ';') THEN
|
|
3043
|
+
EXECUTE 'SELECT cron.alter_job(job_id := $1, schedule := $2, command := $3)' USING v_jobid, j.sched, v_cmd;
|
|
3044
|
+
v_out := v_out || jsonb_build_object('job', j.name, 'actie', 'bijgewerkt', 'jobid', v_jobid);
|
|
3045
|
+
ELSE
|
|
3046
|
+
v_out := v_out || jsonb_build_object('job', j.name, 'actie', 'ongewijzigd', 'jobid', v_jobid);
|
|
3047
|
+
END IF;
|
|
3048
|
+
END LOOP;
|
|
3049
|
+
RETURN jsonb_build_object('ok', coalesce((v_status->>'ok')::boolean, false), 'sleutel', v_status, 'jobs', v_out);
|
|
3050
|
+
END $function$;
|
|
3051
|
+
|
|
3052
|
+
-- Gezondheidscontroles: per cron of hij de sleutel meestuurt, de sleutel zelf en direct omzetten.
|
|
3053
|
+
CREATE OR REPLACE FUNCTION public.verkoop_health_checks()
|
|
3054
|
+
RETURNS TABLE(naam text, ok boolean, opm text)
|
|
3055
|
+
LANGUAGE plpgsql
|
|
3056
|
+
VOLATILE SECURITY DEFINER
|
|
3057
|
+
SET search_path TO 'public'
|
|
3058
|
+
AS $function$
|
|
3059
|
+
DECLARE v_bad integer; v_cnt integer; v_idx integer; v_has_cache boolean := to_regclass('public.floriday_fulfillment_orders_cache') IS NOT NULL;
|
|
3060
|
+
v_status jsonb; v_ok boolean; j record; v_trg integer;
|
|
3061
|
+
BEGIN
|
|
3062
|
+
IF NOT public.verkoop_is_server() THEN
|
|
3063
|
+
PERFORM public.verkoop_assert_caller('rol', '{admin,superadmin}'::public.app_role[]);
|
|
3064
|
+
END IF;
|
|
3065
|
+
v_status := public.verkoop_cron_post_status();
|
|
3066
|
+
v_ok := coalesce((v_status->>'ok')::boolean, false);
|
|
3067
|
+
RETURN QUERY SELECT 'Verkoop: geheime cron-sleutel'::text, v_ok,
|
|
3068
|
+
CASE WHEN v_ok THEN 'aanwezig; cronroutes eisen x-verkoop-cron-key'
|
|
3069
|
+
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;
|
|
3070
|
+
IF to_regclass('cron.job') IS NULL THEN
|
|
3071
|
+
RETURN QUERY SELECT 'Verkoop: cronjobs sturen de sleutel mee'::text, false, 'pg_cron ontbreekt'::text;
|
|
3072
|
+
ELSE
|
|
3073
|
+
FOR j IN SELECT * FROM (VALUES ('verkoop-salesorders-sync-1min'),('invoice-due-verkoop')) n(name) LOOP
|
|
3074
|
+
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;
|
|
3075
|
+
RETURN QUERY SELECT ('Verkoop: cron ' || j.name || ' stuurt de sleutel mee')::text, v_cnt > 0,
|
|
3076
|
+
CASE WHEN v_cnt > 0 THEN 'via verkoop_cron_post (x-verkoop-cron-key), geen vaste host'
|
|
3077
|
+
ELSE 'ontbreekt, staat uit of roept niet via verkoop_cron_post aan; voer verkoop_ensure_cron() uit' END;
|
|
3078
|
+
END LOOP;
|
|
3079
|
+
END IF;
|
|
3080
|
+
SELECT count(*)::int INTO v_trg FROM pg_trigger t
|
|
3081
|
+
WHERE t.tgname IN ('verkoop_salesorders_direct_ins','verkoop_salesorders_direct_upd') AND NOT t.tgisinternal
|
|
3082
|
+
AND t.tgrelid = to_regclass('public.floriday_salesorders_cache');
|
|
3083
|
+
RETURN QUERY SELECT 'Verkoop: direct omzetten actief'::text, (v_ok AND v_trg = 2),
|
|
3084
|
+
CASE WHEN to_regclass('public.floriday_salesorders_cache') IS NULL THEN 'nee (geen Floriday-cache in deze shell)'
|
|
3085
|
+
WHEN v_trg < 2 THEN 'nee (triggers op floriday_salesorders_cache ontbreken); de minuutronde vangt de orders op'
|
|
3086
|
+
WHEN NOT v_ok THEN 'nee (' || (v_status->>'reden') || '); de minuutronde vangt de orders op'
|
|
3087
|
+
ELSE 'ja' END;
|
|
3088
|
+
IF NOT v_has_cache THEN
|
|
3089
|
+
RETURN QUERY SELECT 'Verkoop: geen volledige cache-scan per minuut'::text, true, 'geen Floriday-afhandelingen in deze shell'::text;
|
|
3090
|
+
ELSE
|
|
3091
|
+
SELECT count(*)::int INTO v_idx FROM public.verkoop_fulfillment_index;
|
|
3092
|
+
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;
|
|
3093
|
+
RETURN QUERY SELECT 'Verkoop: geen volledige cache-scan per minuut'::text,
|
|
3094
|
+
EXISTS (SELECT 1 FROM pg_trigger WHERE tgname='verkoop_fulfillment_index_sync' AND tgrelid='public.floriday_fulfillment_orders_cache'::regclass)
|
|
3095
|
+
AND (v_cnt = 0 OR v_idx > 0),
|
|
3096
|
+
format('index %s rijen, afhandelingen met karren %s', v_idx, v_cnt);
|
|
3097
|
+
END IF;
|
|
3098
|
+
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';
|
|
3099
|
+
RETURN QUERY SELECT 'Verkoop: engine-event schrijft zonder fout'::text, v_bad = 0,
|
|
3100
|
+
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;
|
|
3101
|
+
END $function$;
|
|
3102
|
+
|
|
3103
|
+
-- install_check roept health_checks aan, die nu sleutels kan aanmaken: niet meer STABLE.
|
|
3104
|
+
ALTER FUNCTION public.verkoop_install_check() VOLATILE;
|
|
3105
|
+
|
|
3106
|
+
-- Zelfde installatiestap: cronjobs direct omzetten naar de eigen post met sleutel.
|
|
3107
|
+
DO $do$
|
|
3108
|
+
BEGIN
|
|
3109
|
+
IF to_regclass('cron.job') IS NOT NULL THEN
|
|
3110
|
+
PERFORM public.verkoop_ensure_cron();
|
|
3111
|
+
END IF;
|
|
3112
|
+
EXCEPTION WHEN OTHERS THEN
|
|
3113
|
+
RAISE WARNING '[verkoop] cronjobs omzetten mislukt: %', SQLERRM;
|
|
3114
|
+
END
|
|
3115
|
+
$do$;
|