include updated gl handling in main deploy

db_deploy.sql

@@ -176,46 +176,55 @@ CREATE TRIGGER log_insert
 ---------------------------handle new gl lines----------------------------------------
 
 CREATE OR REPLACE FUNCTION evt.gl_insert() RETURNS trigger
-    LANGUAGE plpgsql
+LANGUAGE plpgsql
-    AS 
+AS 
-    $func$
+$func$
-    BEGIN
+DECLARE
+    _mind timestamptz;
+    _maxd timestamptz;
+BEGIN    
+    SELECT 
+        (SELECT min(lower(f.dur)) FROM ins INNER JOIN evt.fspr f ON f.id = ins.fspr)
+        ,GREATEST(
+            (SELECT max(lower(f.dur)) FROM ins INNER JOIN evt.fspr f ON f.id = ins.fspr),
+            COALESCE(
+                (SELECT max(lower(dur)) FROM evt.fspr WHERE prop @> '{"gltouch":"yes"}'),
+                (SELECT max(lower(f.dur)) FROM ins INNER JOIN evt.fspr f ON f.id = ins.fspr)
+            )
+        )
+    INTO
+        _mind
+        ,_maxd;
+
     WITH
     agg AS (
         SELECT
             acct
             ,fspr
+            ,dur
             ,coalesce(sum(amount) FILTER (WHERE amount > 0),0) debits
             ,coalesce(sum(amount) FILTER (WHERE amount < 0),0) credits
         FROM
             ins
+            INNER JOIN evt.fspr f ON
+                f.id = ins.fspr
         GROUP BY
             acct
             ,fspr
+            ,dur
     )
-        ,list AS (
+    --get every account involved in target range
-            SELECT 
+    ,arng AS (
-                b.acct
+        SELECT DISTINCT
-                ,least(min(lower(f.dur)),min(lower(g.dur))) minp
+            acct
-                ,greatest(max(lower(f.dur)),max(lower(g.dur))) maxp
         FROM
             agg b
-                INNER JOIN evt.fspr f ON
-                    f.id = b.fspr
-                LEFT OUTER JOIN evt.bal e ON
-                    e.acct = b.acct
-                LEFT OUTER JOIN evt.fspr g ON
-                    e.fspr = g.id
-            GROUP BY
-                b.acct
     )
     ,seq AS (
-            WITH RECURSIVE rf (acct, minp, maxp, id, dur, obal, debits, credits, cbal) AS
+        WITH RECURSIVE rf (acct, id, dur, obal, debits, credits, cbal) AS
         (
             SELECT
-                    list.acct
+                arng.acct
-                    ,list.minp
-                    ,list.maxp
                 ,f.id
                 ,f.dur
                 ,COALESCE(b.obal::numeric(12,2),0)
@@ -223,22 +232,20 @@ CREATE OR REPLACE FUNCTION evt.gl_insert() RETURNS trigger
                 ,COALESCE(b.credits::numeric(12,2),0) + COALESCE(agg.credits,0)
                 ,COALESCE(b.cbal::numeric(12,2),0) + COALESCE(agg.debits,0) + COALESCE(agg.credits,0)
             FROM
-                    list
+                arng
                 INNER JOIN evt.fspr f ON
-                        upper(f.dur) = list.minp
+                    upper(f.dur) = _mind
                 LEFT OUTER JOIN evt.bal b ON
-                        b.acct = list.acct
+                    b.acct = arng.acct
                     AND b.fspr = f.id
                 LEFT OUTER JOIN agg ON
-                        agg.acct = list.acct
+                    agg.acct = arng.acct
                     AND agg.fspr = f.id
             
             UNION ALL
 
             SELECT
                 rf.acct
-                    ,rf.minp
-                    ,rf.maxp
                 ,f.id
                 ,f.dur
                 ,COALESCE(rf.cbal,0)::numeric(12,2) 
@@ -256,10 +263,11 @@ CREATE OR REPLACE FUNCTION evt.gl_insert() RETURNS trigger
                     agg.acct = rf.acct
                     AND agg.fspr = f.id
             WHERE
-                    lower(f.dur) <= rf.maxp
+                lower(f.dur) <= _maxd
         )
-            SELECT * FROM rf WHERE lower(dur) >= minp
+        SELECT * FROM rf WHERE lower(dur) >= _mind
     )
+    ,bali AS (
         INSERT INTO
             evt.bal (acct, fspr, obal, debits, credits, cbal)
         SELECT
@@ -275,10 +283,27 @@ CREATE OR REPLACE FUNCTION evt.gl_insert() RETURNS trigger
             obal = EXCLUDED.obal
             ,debits = EXCLUDED.debits
             ,credits = EXCLUDED.credits
-            ,cbal = EXCLUDED.cbal;
+            ,cbal = EXCLUDED.cbal
+            ,prop = evt.bal.prop || EXCLUDED.prop
+        RETURNING * 
+    )
+    ,n as (
+        SELECT DISTINCT
+            fspr
+        FROM
+            bali
+    )
+    UPDATE
+        evt.fspr f
+    SET
+        prop = COALESCE(f.prop,'{}'::JSONB) || '{"gltouch":"yes"}'::jsonb
+    FROM
+        n
+    WHERE
+        f.id = n.fspr;
     RETURN NULL;
-    END;
+END;
-    $func$;
+$func$;
 
 CREATE TRIGGER gl_insert 
     AFTER INSERT ON evt.gl