index.js

@@ -157,9 +157,9 @@ server.get('/list_changes', bodyParser.json(), function(req, res) {
         console.log(new Date().toISOString() +"-------------------------list changes:------------------------------")
         console.log(req.body);
         //parse the where clause into the main sql statement
-        sql = sql.replace(new RegExp("replace_user", 'g'), JSON.stringify(req.body.quota_rep_descr))
+        sql = sql.replace(new RegExp("replace_user",'g'),JSON.stringify(req.body))
         //execute the sql and send the result
-        console.log(sql);
+        //console.log(sql);
         Postgres.FirstRow(sql,[],res)
     };
 })
@@ -480,11 +480,13 @@ function build_where(req, c, w, d, args) {
                 d = d + 1;
             }
             w = w + ")";
-        } else {
+        }
+        else {
             w = w + i + " = '" + req.body.scenario[i] + "'";
         }
         args.push(req.body.scenario[i]);
         c = c + 1;
-    };
+    }
+    ;
     return { c, w, d };
 }

route_sql/list_changes.sql

@@ -1,37 +1,21 @@
 WITH 
-list AS materialized (
+list AS (
 SELECT
-    l.doc->>'user' "user",
+    iterdef->>'user' "user",
-    jsonb_path_query_first(l.doc,'$.scenario.quota_rep_descr')->>0 quota_rep_descr,
+    iterdef->>'stamp' "stamp",
-    to_char((l.doc->>'stamp')::timestamptz,'YYYY-MM-DD HH:MI:SS') "stamp",
+    iterdef->>'mesasage' "comment",
-    l.doc->>'message' "comment",
+    round(SUM(fb_val_loc * r_rate)::numeric,2) sales,
-    jsonb_pretty(l.doc) def,
+    jsonb_pretty(iterdef) def
-    l.id
 FROM
-    rlarp.osm_log l
+    rlarp.osm_fcpool
 WHERE
-    l.doc @? '$.scenario.quota_rep_descr ? (@ == replace_user)'
+    iterdef IS NOT NULL
-)
+    AND iterdef @> $$replace_user$$::jsonb
-,agg as (
+GROUP BY
-SELECT 
+    iterdef->>'user',
-    list.user
+    iterdef->>'stamp',
-    ,list.quota_rep_descr
+    iterdef->>'message',
-    ,list.stamp
+    iterdef
-    ,list.comment
-    ,list.def
-    ,list.id
-    ,to_char(round(sum(value_usd),2),'$999,999,999D00') sales
-from
-    LIST
-    inner join rlarp.osm_pool on
-        id = logid
-group BY    
-    list.user
-    ,list.quota_rep_descr
-    ,list.stamp
-    ,list.comment
-    ,list.def
-    ,list.id
 )
 SELECT
-    jsonb_agg(row_to_json(agg)::jsonb ORDER BY agg.stamp desc) x from agg
+    jsonb_agg(row_to_json(list)::jsonb) x from list

route_sql/new_basket.sql

@@ -254,9 +254,9 @@ SELECT
         LEFT OUTER JOIN gld od ON
             od.drange @> make_date(mxm.yr + 2021,mxm.cal,mxm.odom)
         LEFT OUTER JOIN gld rd ON
-            rd.drange @> (make_date(mxm.yr + 2021,mxm.cal,mxm.odom) + rlag)
+            od.drange @> (make_date(mxm.yr + 2021,mxm.cal,mxm.odom) + rlag)
         LEFT OUTER JOIN gld sd ON
-            sd.drange @> (make_date(mxm.yr + 2021,mxm.cal,mxm.odom) + rlag + slag)
+            od.drange @> (make_date(mxm.yr + 2021,mxm.cal,mxm.odom) + rlag + slag)
 )
 --SELECT * FROM basemix
 ,log AS (