index.js

@@ -217,50 +217,6 @@ server.post('/swap', bodyParser.json(), function(req, res) {
     };
 })
 
-server.post('/cust_swap', bodyParser.json(), function(req, res) {
-
-    var sql = "";
-    var w = "";
-    var c = 1;
-    var d = 1;
-    var args = [];
-    var path = './route_sql/swap_cust.sql';
-
-    fs.readFile(path, 'utf8', function(err, data) {
-        if (!err) {
-            callback(data);
-        } else {
-            console.log("fatal error pulling sql file")
-            callback(err);
-        }
-    });
-
-    var callback = function(arg) {
-        sql = arg;
-
-        //parse request body into a where clause
-        ({ c, w, d } = build_where(req, c, w, d, args));
-
-        //if there was no body sent, return with nothing
-        if (c == 1) {
-            res.send("no body was sent");
-            return;
-        }
-        console.log(new Date().toISOString() + "-------------------------get swap fit:------------------------------")
-        console.log(req.body);
-        //parse the where clause into the main sql statement
-        sql = sql.replace(new RegExp("where_clause", 'g'), w);
-        sql = sql.replace(new RegExp("swap_doc", 'g'), JSON.stringify(req.body.swap));
-        sql = sql.replace(new RegExp("replace_version", 'g'), req.body.scenario.version);
-        sql = sql.replace(new RegExp("replace_source", 'g'), req.body.source);
-        sql = sql.replace(new RegExp("replace_iterdef", 'g'), JSON.stringify(req.body));
-        //execute the sql and send the result
-        console.log(sql);
-        res.json(null);
-        //Postgres.FirstRow(sql, [], res)
-    };
-})
-
 server.get('/list_changes', bodyParser.json(), function(req, res) {
 
     var sql = "";
@@ -282,19 +238,10 @@ server.get('/list_changes', bodyParser.json(), function(req, res) {
     var callback = function(arg) {
         sql = arg;
 
-        //parse request body into a where clause
-        ({ c, w, d } = build_where(req, c, w, d, args));
-
-
-        //if there was no body sent, return with nothing
-        if (c == 1) {
-            res.send("no body was sent");
-            return;
-        }
         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("where_clause", 'g'), w)
+        sql = sql.replace(new RegExp("replace_user", 'g'), req.body.quota_rep_descr)
             //execute the sql and send the result
         console.log(sql);
         Postgres.FirstRow(sql, [], res)

route_sql/list_changes.sql

@@ -14,7 +14,7 @@ from
     inner join rlarp.osm_pool on
         id = logid
 WHERE
-    where_clause
+    quota_rep_descr = 'replace_user'
     AND tag <> 'Initial Build'
 group BY
     ol.doc->>'user'

route_sql/swap_cust.sql

@@ -17,17 +17,17 @@ target AS (SELECT $$swap_doc$$::jsonb swap)
     SELECT
         billto
         ,bill_r
-        ,bc.bvadr6 bill_dba
+        ,bill_dba
         ,shipto
         ,ship_r
-        ,sc.bvadr6 ship_dba
+        ,ship_dba
         --other stuff doesn't matter becuase it's getting overridden anyways
     FROM
         swap
         LEFT out JOIN lgdat.cust bc ON
             bc.bvcust = swap.bill_r
         LEFT out JOIN lgdat.cust sc ON
-            sc.bvcust = swap.ship_r
+            bc.bvcust = swap.ship_r
 )
 --put bill to and ship to back together and join in channel, terms, descriptions, etc
 ,seg AS (
@@ -112,9 +112,8 @@ target AS (SELECT $$swap_doc$$::jsonb swap)
     FROM
         rlarp.osm_pool o
         CROSS JOIN log
-        INNER JOIN swap ON
-            swap.bill_to = SUBSTRING(o.bill_cust_descr,1,8)
-            swap.bill_to = SUBSTRING(o.ship_cust_descr,1,8)
+        INNER JOIN pl ON
+            pl.original = o.part
     WHERE
         -----------------scenario----------------------------
         where_clause