From cdba942e9e4928cfffe450ba9c0d60d2144524fd Mon Sep 17 00:00:00 2001 From: Paul Trowbridge Date: Fri, 25 May 2018 10:09:12 -0400 Subject: [PATCH] develop map values set --- deploy/setup.sql | 76 +++++++++- interface/map_values/map_rv_set.sql | 93 +++++++++---- interface/map_values/test/vals.json | 206 ++++++++++++++++++---------- 3 files changed, 269 insertions(+), 106 deletions(-) diff --git a/deploy/setup.sql b/deploy/setup.sql index 9db4d91..34ce6c6 100644 --- a/deploy/setup.sql +++ b/deploy/setup.sql @@ -154,6 +154,7 @@ ALTER TABLE ONLY tps.trans -------------create functions------------------------------------------------------------------------------------------------------------------------ -----set source +DROP FUNCTION IF EXISTS tps.srce_set(jsonb); CREATE FUNCTION tps.srce_set(_defn jsonb) RETURNS jsonb AS $f$ @@ -222,6 +223,7 @@ $f$ LANGUAGE plpgsql; -----generate sql to create select based on schema +DROP FUNCTION IF EXISTS tps.build_srce_view_sql(text, text); CREATE FUNCTION tps.build_srce_view_sql(_srce text, _schema text) RETURNS TEXT AS $f$ @@ -353,7 +355,7 @@ CREATE AGGREGATE tps.jsonb_concat_obj(jsonb) ( ); -DROP FUNCTION IF EXISTS tps.report_unmapped; +DROP FUNCTION IF EXISTS tps.report_unmapped(text); CREATE FUNCTION tps.report_unmapped(_srce text) RETURNS TABLE ( source text, @@ -1055,7 +1057,7 @@ EXCEPTION WHEN OTHERS THEN return _message; END; $f$ -LANGUAGE plpgsql +LANGUAGE plpgsql; ---------------overwrite maps-------------------------------------------------------------------------------------------------------------- @@ -1314,4 +1316,72 @@ EXCEPTION WHEN OTHERS THEN RETURN _message; END; $f$ -language plpgsql; \ No newline at end of file +language plpgsql; + +---------------------set map values from json array of json objects----------------------------------------------------- + + +DROP FUNCTION IF EXISTS tps.map_rv_set; +CREATE OR REPLACE FUNCTION tps.map_rv_set(_defn jsonb) RETURNS jsonb +AS +$f$ +DECLARE + _message jsonb; + _MESSAGE_TEXT text; + _PG_EXCEPTION_DETAIL text; + _PG_EXCEPTION_HINT text; +BEGIN + INSERT INTO + tps.map_rv (srce, target, retval, map, hist) + SELECT + r.source + ,r.map + ,r.ret_val + ,r.mapped + ,jsonb_build_object( + 'hist_defn',mapped + ,'effective',jsonb_build_array(CURRENT_TIMESTAMP,null::timestamptz) + ) || '[]'::jsonb + FROM + JSONB_ARRAY_ELEMENTS(_defn) WITH ORDINALITY ae(r,s) + JOIN LATERAL jsonb_to_record(ae.r) r(source TEXT,map TEXT, ret_val jsonb, mapped jsonb) ON TRUE + ON CONFLICT ON CONSTRAINT map_rv_pk DO UPDATE + SET + map = excluded.map + ,hist = + --the new definition going to position -0- + jsonb_build_object( + 'hist_defn',excluded.map + ,'effective',jsonb_build_array(CURRENT_TIMESTAMP,null::timestamptz) + ) + --the previous definition, set upper bound of effective range which was previously null + || jsonb_set( + map_rv.hist + ,'{0,effective,1}'::text[] + ,to_jsonb(CURRENT_TIMESTAMP) + ); + + -------return message-------------------------------------------------------------------------------------------------- + _message:= jsonb_build_object('status','complete'); + RETURN _message; + +EXCEPTION WHEN OTHERS THEN + + GET STACKED DIAGNOSTICS + _MESSAGE_TEXT = MESSAGE_TEXT, + _PG_EXCEPTION_DETAIL = PG_EXCEPTION_DETAIL, + _PG_EXCEPTION_HINT = PG_EXCEPTION_HINT; + _message:= + ($$ + { + "status":"fail", + "message":"error setting map value" + } + $$::jsonb) + ||jsonb_build_object('message_text',_MESSAGE_TEXT) + ||jsonb_build_object('pg_exception_detail',_PG_EXCEPTION_DETAIL); + + RETURN _message; +END; +$f$ +LANGUAGE plpgsql; \ No newline at end of file diff --git a/interface/map_values/map_rv_set.sql b/interface/map_values/map_rv_set.sql index 5e8370d..a98780f 100644 --- a/interface/map_values/map_rv_set.sql +++ b/interface/map_values/map_rv_set.sql @@ -1,31 +1,64 @@ -INSERT INTO - tps.map_rv (srce, target, retval, map, hist) -SELECT - r.source - ,r.map - ,r.ret_val - ,r.mapped - ,jsonb_build_object( - 'hist_defn',mapped - ,'effective',jsonb_build_array(CURRENT_TIMESTAMP,null::timestamptz) - ) || '[]'::jsonb -FROM - JSONB_ARRAY_ELEMENTS( - $$[{"source":"DCARD","map":"First 20","ret_val":{"f20":"DISCOUNT DRUG MART 3"},"mapped":{"party":"Discount Drug Mart","reason":"groceries"}},{"source":"DCARD","map":"First 20","ret_val":{"f20":"TARGET STOW OH"},"mapped":{"party":"Target","reason":"groceries"}},{"source":"DCARD","map":"First 20","ret_val":{"f20":"WALMART GROCERY 800-"},"mapped":{"party":"Walmart","reason":"groceries"}},{"source":"DCARD","map":"First 20","ret_val":{"f20":"CIRCLE K 05416 STOW "},"mapped":{"party":"Circle K","reason":"gasoline"}},{"source":"DCARD","map":"First 20","ret_val":{"f20":"TARGET.COM * 800-591"},"mapped":{"party":"Target","reason":"home supplies"}},{"source":"DCARD","map":"First 20","ret_val":{"f20":"ACME NO. 17 STOW OH"},"mapped":{"party":"Acme","reason":"groceries"}},{"source":"DCARD","map":"First 20","ret_val":{"f20":"AT&T *PAYMENT 800-28"},"mapped":{"party":"AT&T","reason":"internet"}},{"source":"DCARD","map":"First 20","ret_val":{"f20":"AUTOZONE #0722 STOW "},"mapped":{"party":"Autozone","reason":"auto maint"}},{"source":"DCARD","map":"First 20","ret_val":{"f20":"BESTBUYCOM8055267948"},"mapped":{"party":"BestBuy","reason":"home supplies"}},{"source":"DCARD","map":"First 20","ret_val":{"f20":"BUFFALO WILD WINGS K"},"mapped":{"party":"Buffalo Wild Wings","reason":"restaurante"}},{"source":"DCARD","map":"First 20","ret_val":{"f20":"CASHBACK BONUS REDEM"},"mapped":{"party":"Discover Card","reason":"financing"}},{"source":"DCARD","map":"First 20","ret_val":{"f20":"CLE CLINIC PT PMTS 2"},"mapped":{"party":"Cleveland Clinic","reason":"medical"}}]$$::JSONB - ) WITH ORDINALITY ae(r,s) - JOIN LATERAL jsonb_to_record(ae.r) r(source TEXT,map TEXT, ret_val jsonb, mapped jsonb) ON TRUE -ON CONFLICT ON CONSTRAINT map_rv_pk DO UPDATE - SET - map = excluded.map - ,hist = - --the new definition going to position -0- - jsonb_build_object( - 'hist_defn',excluded.map +DROP FUNCTION IF EXISTS tps.map_rv_set; +CREATE OR REPLACE FUNCTION tps.map_rv_set(_defn jsonb) RETURNS jsonb +AS +$f$ +DECLARE + _message jsonb; + _MESSAGE_TEXT text; + _PG_EXCEPTION_DETAIL text; + _PG_EXCEPTION_HINT text; +BEGIN + INSERT INTO + tps.map_rv (srce, target, retval, map, hist) + SELECT + r.source + ,r.map + ,r.ret_val + ,r.mapped + ,jsonb_build_object( + 'hist_defn',mapped ,'effective',jsonb_build_array(CURRENT_TIMESTAMP,null::timestamptz) - ) - --the previous definition, set upper bound of effective range which was previously null - || jsonb_set( - map_rv.hist - ,'{0,effective,1}'::text[] - ,to_jsonb(CURRENT_TIMESTAMP) - ); + ) || '[]'::jsonb + FROM + JSONB_ARRAY_ELEMENTS(_defn) WITH ORDINALITY ae(r,s) + JOIN LATERAL jsonb_to_record(ae.r) r(source TEXT,map TEXT, ret_val jsonb, mapped jsonb) ON TRUE + ON CONFLICT ON CONSTRAINT map_rv_pk DO UPDATE + SET + map = excluded.map + ,hist = + --the new definition going to position -0- + jsonb_build_object( + 'hist_defn',excluded.map + ,'effective',jsonb_build_array(CURRENT_TIMESTAMP,null::timestamptz) + ) + --the previous definition, set upper bound of effective range which was previously null + || jsonb_set( + map_rv.hist + ,'{0,effective,1}'::text[] + ,to_jsonb(CURRENT_TIMESTAMP) + ); + + -------return message-------------------------------------------------------------------------------------------------- + _message:= jsonb_build_object('status','complete'); + RETURN _message; + +EXCEPTION WHEN OTHERS THEN + + GET STACKED DIAGNOSTICS + _MESSAGE_TEXT = MESSAGE_TEXT, + _PG_EXCEPTION_DETAIL = PG_EXCEPTION_DETAIL, + _PG_EXCEPTION_HINT = PG_EXCEPTION_HINT; + _message:= + ($$ + { + "status":"fail", + "message":"error setting map value" + } + $$::jsonb) + ||jsonb_build_object('message_text',_MESSAGE_TEXT) + ||jsonb_build_object('pg_exception_detail',_PG_EXCEPTION_DETAIL); + + RETURN _message; +END; +$f$ +LANGUAGE plpgsql; \ No newline at end of file diff --git a/interface/map_values/test/vals.json b/interface/map_values/test/vals.json index 45a6187..fc171d6 100644 --- a/interface/map_values/test/vals.json +++ b/interface/map_values/test/vals.json @@ -1,74 +1,134 @@ [ - { - "source": "DCARD", - "map": "First 20", - "ret_val": { "f20": "DISCOUNT DRUG MART 3" }, - "mapped": { "party": "Discount Drug Mart", "reason": "groceries" } - }, - { - "source": "DCARD", - "map": "First 20", - "ret_val": { "f20": "TARGET STOW OH" }, - "mapped": { "party": "Target", "reason": "groceries" } - }, - { - "source": "DCARD", - "map": "First 20", - "ret_val": { "f20": "WALMART GROCERY 800-" }, - "mapped": { "party": "Walmart", "reason": "groceries" } - }, - { - "source": "DCARD", - "map": "First 20", - "ret_val": { "f20": "CIRCLE K 05416 STOW " }, - "mapped": { "party": "Circle K", "reason": "gasoline" } - }, - { - "source": "DCARD", - "map": "First 20", - "ret_val": { "f20": "TARGET.COM * 800-591" }, - "mapped": { "party": "Target", "reason": "home supplies" } - }, - { - "source": "DCARD", - "map": "First 20", - "ret_val": { "f20": "ACME NO. 17 STOW OH" }, - "mapped": { "party": "Acme", "reason": "groceries" } - }, - { - "source": "DCARD", - "map": "First 20", - "ret_val": { "f20": "AT&T *PAYMENT 800-28" }, - "mapped": { "party": "AT&T", "reason": "internet" } - }, - { - "source": "DCARD", - "map": "First 20", - "ret_val": { "f20": "AUTOZONE #0722 STOW " }, - "mapped": { "party": "Autozone", "reason": "auto maint" } - }, - { - "source": "DCARD", - "map": "First 20", - "ret_val": { "f20": "BESTBUYCOM8055267948" }, - "mapped": { "party": "BestBuy", "reason": "home supplies" } - }, - { - "source": "DCARD", - "map": "First 20", - "ret_val": { "f20": "BUFFALO WILD WINGS K" }, - "mapped": { "party": "Buffalo Wild Wings", "reason": "restaurante" } - }, - { - "source": "DCARD", - "map": "First 20", - "ret_val": { "f20": "CASHBACK BONUS REDEM" }, - "mapped": { "party": "Discover Card", "reason": "financing" } - }, - { - "source": "DCARD", - "map": "First 20", - "ret_val": { "f20": "CLE CLINIC PT PMTS 2" }, - "mapped": { "party": "Cleveland Clinic", "reason": "medical" } - } -] + { + "source": "dcard", + "map": "First 20", + "ret_val": { + "f20": "DISCOUNT DRUG MART 3" + }, + "mapped": { + "party": "Discount Drug Mart", + "reason": "groceries" + } + }, + { + "source": "dcard", + "map": "First 20", + "ret_val": { + "f20": "TARGET STOW OH" + }, + "mapped": { + "party": "Target", + "reason": "groceries" + } + }, + { + "source": "dcard", + "map": "First 20", + "ret_val": { + "f20": "WALMART GROCERY 800-" + }, + "mapped": { + "party": "Walmart", + "reason": "groceries" + } + }, + { + "source": "dcard", + "map": "First 20", + "ret_val": { + "f20": "CIRCLE K 05416 STOW " + }, + "mapped": { + "party": "Circle K", + "reason": "gasoline" + } + }, + { + "source": "dcard", + "map": "First 20", + "ret_val": { + "f20": "TARGET.COM * 800-591" + }, + "mapped": { + "party": "Target", + "reason": "home supplies" + } + }, + { + "source": "dcard", + "map": "First 20", + "ret_val": { + "f20": "ACME NO. 17 STOW OH" + }, + "mapped": { + "party": "Acme", + "reason": "groceries" + } + }, + { + "source": "dcard", + "map": "First 20", + "ret_val": { + "f20": "AT&T *PAYMENT 800-28" + }, + "mapped": { + "party": "AT&T", + "reason": "internet" + } + }, + { + "source": "dcard", + "map": "First 20", + "ret_val": { + "f20": "AUTOZONE #0722 STOW " + }, + "mapped": { + "party": "Autozone", + "reason": "auto maint" + } + }, + { + "source": "dcard", + "map": "First 20", + "ret_val": { + "f20": "BESTBUYCOM8055267948" + }, + "mapped": { + "party": "BestBuy", + "reason": "home supplies" + } + }, + { + "source": "dcard", + "map": "First 20", + "ret_val": { + "f20": "BUFFALO WILD WINGS K" + }, + "mapped": { + "party": "Buffalo Wild Wings", + "reason": "restaurante" + } + }, + { + "source": "dcard", + "map": "First 20", + "ret_val": { + "f20": "CASHBACK BONUS REDEM" + }, + "mapped": { + "party": "Discover Card", + "reason": "financing" + } + }, + { + "source": "dcard", + "map": "First 20", + "ret_val": { + "f20": "CLE CLINIC PT PMTS 2" + }, + "mapped": { + "party": "Cleveland Clinic", + "reason": "medical" + } + } +] \ No newline at end of file