Compare commits

...

4 Commits

Author SHA1 Message Date
pt
834d52a2a2 customer swap route will do nothing 2020-05-12 16:55:37 -04:00
Paul Trowbridge
3592120b54 Merge branch 'hist_list' into feature/cust_swap 2020-05-12 15:27:23 -04:00
Paul Trowbridge
17dc465cdc Merge branch 'dev' into hist_list 2020-05-12 14:30:37 -04:00
Paul Trowbridge
e3205a94c1 setup history listing to be based on a where clause to allow for director level 2020-04-02 09:55:53 -04:00
3 changed files with 61 additions and 7 deletions

View File

@ -217,6 +217,50 @@ 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) { server.get('/list_changes', bodyParser.json(), function(req, res) {
var sql = ""; var sql = "";
@ -238,10 +282,19 @@ server.get('/list_changes', bodyParser.json(), function(req, res) {
var callback = function(arg) { var callback = function(arg) {
sql = 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(new Date().toISOString() + "-------------------------list changes:------------------------------")
console.log(req.body); console.log(req.body);
//parse the where clause into the main sql statement //parse the where clause into the main sql statement
sql = sql.replace(new RegExp("replace_user", 'g'), req.body.quota_rep_descr) sql = sql.replace(new RegExp("where_clause", 'g'), w)
//execute the sql and send the result //execute the sql and send the result
console.log(sql); console.log(sql);
Postgres.FirstRow(sql, [], res) Postgres.FirstRow(sql, [], res)

View File

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

View File

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