From 5027c792ae571de0b3cfc627bdc7abac2f5aea3f Mon Sep 17 00:00:00 2001
From: Paul Trowbridge <fleetside72@hotmail.com>
Date: Fri, 8 Jun 2018 00:48:07 -0400
Subject: [PATCH] try modifying the mult map set function

---
 interface/map_def/srce_map_def_set.sql        | 109 ++++++++++++------
 interface/map_def/srce_map_def_set_single.sql |   9 +-
 2 files changed, 78 insertions(+), 40 deletions(-)

diff --git a/interface/map_def/srce_map_def_set.sql b/interface/map_def/srce_map_def_set.sql
index 471f7ec..62a7288 100644
--- a/interface/map_def/srce_map_def_set.sql
+++ b/interface/map_def/srce_map_def_set.sql
@@ -10,44 +10,81 @@ DECLARE
 
 BEGIN
 
-
-    INSERT INTO
-        tps.map_rm (srce, target, regex, seq, hist)
-    SELECT
-        --data source
-        ae.r->>'srce'
-        --map name
-        ,ae.r->>'name'
-        --map definition
-        ,ae.r
-        --map aggregation sequence
-        ,(ae.r->>'sequence')::INTEGER
-        --history definition
-        ,jsonb_build_object(
-            'hist_defn',ae.r
-            ,'effective',jsonb_build_array(CURRENT_TIMESTAMP,null::timestamptz)
-        ) || '[]'::jsonb
+    WITH 
+    ------------------------------------------stage rows to insert-----------------------------------------------------
+    stg AS (
+        SELECT
+            --data source
+            ae.r->>'srce' srce
+            --map name
+            ,ae.r->>'name' target
+            --map definition
+            ,ae.r regex
+            --map aggregation sequence
+            ,(ae.r->>'sequence')::INTEGER seq
+            --history definition
+            ,jsonb_build_object(
+                'hist_defn',ae.r
+                ,'effective',jsonb_build_array(CURRENT_TIMESTAMP,null::timestamptz)
+            ) || '[]'::jsonb hist
+            --determine if the rows are new or match
+            ,(m.regex->>'regex' = ae.r->>'regex')::BOOLEAN rebuild
+        FROM
+            jsonb_array_elements(_defn) ae(r)
+            LEFT OUTER JOIN tps.map_rm m ON
+                m.srce = ae.r->>'srce'
+                AND m.target = ae.t->>'name'
+    )
+    ---------------------------------------do the upsert-------------------------------------------------------------------
+    ,ins AS (
+        INSERT INTO
+            tps.map_rm (srce, target, regex, seq, hist)
+        SELECT
+            srce
+            ,target
+            ,regex
+            ,seq
+            ,hist
+        FROM
+            stg
+        ON CONFLICT ON CONSTRAINT map_rm_pk DO UPDATE SET
+            srce = excluded.srce
+            ,target = excluded.target
+            ,regex = excluded.regex
+            ,seq = excluded.seq
+            ,hist = 
+                    --the new definition going to position -0-
+                    jsonb_build_object(
+                        'hist_defn',excluded.regex
+                        ,'effective',jsonb_build_array(CURRENT_TIMESTAMP,null::timestamptz)
+                    ) 
+                    --the previous definition, set upper bound of effective range which was previously null
+                    || jsonb_set(
+                        map_rm.hist
+                        ,'{0,effective,1}'::text[]
+                        ,to_jsonb(CURRENT_TIMESTAMP)
+                    )
+    )
+    ---------------------------get list of sources that had maps change--------------------------------------------------------
+    , to_update AS (
+    SELECT DISTINCT
+        srce
     FROM
-        jsonb_array_elements(_defn) ae(r)
-    ON CONFLICT ON CONSTRAINT map_rm_pk DO UPDATE SET
-        srce = excluded.srce
-        ,target = excluded.target
-        ,regex = excluded.regex
-        ,seq = excluded.seq
-        ,hist = 
-                --the new definition going to position -0-
-                jsonb_build_object(
-                    'hist_defn',excluded.regex
-                    ,'effective',jsonb_build_array(CURRENT_TIMESTAMP,null::timestamptz)
-                ) 
-                --the previous definition, set upper bound of effective range which was previously null
-                || jsonb_set(
-                    map_rm.hist
-                    ,'{0,effective,1}'::text[]
-                    ,to_jsonb(CURRENT_TIMESTAMP)
-                );
+        ins
+    WHERE
+        rebuild = TRUE
+    )
+    --------------------------call the map overwrite for each source and return all the messages into message----------------
+    /*the whole source must be overwritten because if an element is no longer returned it shoudl be wiped from the data*/
+    SELECT
+        jsonb_agg(x.message)
+    INTO
+        _message
+    FROM
+        to_update
+        JOIN LATERAL tps.srce_map_overwrite(to_update.srce) AS x(message) ON TRUE;
 
-     _message:= jsonb_build_object('status','complete','message','definition has been set');
+    _message:= jsonb_build_object('status','complete','message','definition has been set');
     return _message;
 
 
diff --git a/interface/map_def/srce_map_def_set_single.sql b/interface/map_def/srce_map_def_set_single.sql
index 72ee223..fa9afb7 100644
--- a/interface/map_def/srce_map_def_set_single.sql
+++ b/interface/map_def/srce_map_def_set_single.sql
@@ -19,7 +19,7 @@ BEGIN
             $$
                 {
                 "status":"complete",
-                "message":"source was not different no action taken"
+                "message":"map was not different no action taken"
                 }
             $$::jsonb
         );
@@ -69,14 +69,15 @@ BEGIN
     INTO
         _message
     FROM
-        tps.srce_map_overwrite as X(message)
+        tps.srce_map_overwrite as X(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:= 
+
+    _message:= 
         ($$
             {
                 "status":"fail",
@@ -85,7 +86,7 @@ BEGIN
         $$::jsonb)
         ||jsonb_build_object('message_text',_MESSAGE_TEXT)
         ||jsonb_build_object('pg_exception_detail',_PG_EXCEPTION_DETAIL);
-        return _message;
+    return _message;